diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-01-25 01:09:28 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-01-25 01:09:28 +0000 |
| commit | 927914a2cfa825a4d1d7917e5291afbf016bd324 (patch) | |
| tree | 8750c525d7a79fa4bf2ad358751ffacf681a674e /docbook | |
| parent | 4c5bb90167009981489cb35e72454b7b4db3d9a8 (diff) | |
Fix xpath selector. Clean up whitespace.
svn path=/trunk/; revision=54955
Diffstat (limited to 'docbook')
| -rw-r--r-- | docbook/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | docbook/Makefile.am | 3 | ||||
| -rw-r--r-- | docbook/Makefile.nmake | 2 | ||||
| -rw-r--r-- | docbook/wsdg_src/WSDG_chapter_sources.asciidoc | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt index 055ac4b7e5..ddecc337f0 100644 --- a/docbook/CMakeLists.txt +++ b/docbook/CMakeLists.txt @@ -225,6 +225,7 @@ set(WSUG_SOURCE SET( WSDG_GENERATED_FILES ) # Convert an AsciiDoc document to a Docbook chapter +# .asciidoc -> whole book (.dbk) -> chapter (.xml) MACRO( ASCIIDOC2CHAPTER _asciidocsource _conffile ) GET_FILENAME_COMPONENT( _source_base_name ${_asciidocsource} NAME_WE ) set( A2X_HTML_OPTS --stylesheet=ws.css ) @@ -246,7 +247,7 @@ MACRO( ASCIIDOC2CHAPTER _asciidocsource _conffile ) ${_output_xml} ${_output_dbk} COMMAND ${XMLLINT_EXECUTABLE} - --xpath chapter + --xpath //chapter ${_output_dbk} > ${_output_xml} DEPENDS diff --git a/docbook/Makefile.am b/docbook/Makefile.am index 2208a5ddb9..dd4dad35e7 100644 --- a/docbook/Makefile.am +++ b/docbook/Makefile.am @@ -56,6 +56,7 @@ else endif # Convert an AsciiDoc document to a Docbook chapter +# .asciidoc -> whole book (.dbk) -> chapter (.xml) .asciidoc.xml: $(A2X) --verbose \ --asciidoc-opts="--conf-file=asciidoc.conf" \ @@ -63,7 +64,7 @@ endif --format=docbook --doctype=book \ $< mv $*.xml $*.dbk - xmllint --xpath chapter $*.dbk > $@ + xmllint --xpath //chapter $*.dbk > $@ if HAVE_XSLTPROC ALL_TARGETS=git_version_check wsug wsdg release_notes diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake index b42b6f55f2..e226a3af02 100644 --- a/docbook/Makefile.nmake +++ b/docbook/Makefile.nmake @@ -33,6 +33,7 @@ A2X_TEXT_OPTS=$(A2X_TEXT_OPTS) --lynx .SUFFIXES: .fo .pdf # Convert an AsciiDoc document to a Docbook chapter +# .asciidoc -> whole book (.dbk) -> chapter (.xml) .asciidoc.xml: $(SH) << PATH=/usr/bin @@ -43,6 +44,7 @@ A2X_TEXT_OPTS=$(A2X_TEXT_OPTS) --lynx $< << mv $*.xml $*.dbk + # We want the top-level <chapter/>, not the whole book. xmllint --xpath //chapter $*.dbk > $@ .SUFFIXES: .asciidoc .xml diff --git a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc index 6fa67aab80..3f313d206e 100644 --- a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc +++ b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc @@ -1,10 +1,7 @@ - ++++++++++++++++++++++++++++++++++++++ <!-- WSDG Chapter Sources --> ++++++++++++++++++++++++++++++++++++++ - - ++++++++++++++++++++++++++++++++++++++ <!-- $Id$ --> |