[Plplot-cvs] SF.net SVN: plplot:[11336] trunk/doc/docbook/src/CMakeLists.txt

[<ai...@us...>]

Revision: 11336
          http://plplot.svn.sourceforge.net/plplot/?rev=11336&view=rev
Author:   airwin
Date:     2010-11-19 20:08:26 +0000 (Fri, 19 Nov 2010)

Log Message:
-----------
Small cleanup: plplotdoc.xml --> ${MASTER_XML}

Use -b utf-8 option for all openjade calls.  This does not appear to
hurt anything while allowing the egrave entity to work properly.

N.B. For some reason (most likely the result of the dated DocBook tool
chain we are using?) utf-8 still does not work in our DocBook source
despite clear documentation that it should.

Modified Paths:
--------------
    trunk/doc/docbook/src/CMakeLists.txt

Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt	2010-11-17 18:12:23 UTC (rev 11335)
+++ trunk/doc/docbook/src/CMakeLists.txt	2010-11-19 20:08:26 UTC (rev 11336)
@@ -196,9 +196,9 @@
     COMMAND ${CMAKE_COMMAND} -E create_symlink 
     ${CMAKE_CURRENT_SOURCE_DIR}/inline-html.ent
     ${CMAKE_CURRENT_BINARY_DIR}/inline.ent
-    COMMAND ${ONSGMLS} ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.xml > ${VALIDATE_OUTPUT}
+    COMMAND ${ONSGMLS} ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML} > ${VALIDATE_OUTPUT}
     DEPENDS 
-    ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.xml
+    ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML}
     ${CMAKE_CURRENT_SOURCE_DIR}/inline-html.ent
     )
     add_dependencies(validate
@@ -238,7 +238,7 @@
     COMMAND ${CMAKE_COMMAND} -E create_symlink 
     ${CMAKE_CURRENT_SOURCE_DIR}/inline-print.ent
     ${CMAKE_CURRENT_BINARY_DIR}/inline.ent
-    COMMAND ${OPENJADE} 
+    COMMAND ${OPENJADE} -b utf-8
     ${SGML_CATALOGS} -d ${CMAKE_CURRENT_BINARY_DIR}/${STYLESHEET_PRINT} 
     -t tex -o ${CMAKE_CURRENT_BINARY_DIR}/${BASE}.jadetex 
     ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML}
@@ -448,7 +448,7 @@
     COMMAND ${CMAKE_COMMAND} -E create_symlink 
     ${CMAKE_CURRENT_SOURCE_DIR}/inline-html.ent 
     ${CMAKE_CURRENT_BINARY_DIR}/inline.ent
-    COMMAND ${OPENJADE}
+    COMMAND ${OPENJADE} -b utf-8
     ${SGML_CATALOGS} -d ${STYLESHEET_HTML} -t sgml ${XML_DECL} ${CMAKE_CURRENT_BINARY_DIR}/${MASTER_XML}
     COMMAND ${PERL_EXECUTABLE}
     -pi -e 's/&\#13;//g' `cat ${CMAKE_CURRENT_BINARY_DIR}/${HTML_MANIFEST}`


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.