[Plplot-cvs] SF.net SVN: plplot:[12481] trunk

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

Revision: 12481
          http://sourceforge.net/p/plplot/code/12481
Author:   airwin
Date:     2013-08-12 23:11:08 +0000 (Mon, 12 Aug 2013)
Log Message:
-----------
Change DocBook configuration and source files so that

xmllint --noout --nonet --xinclude --postvalid --noent plplotdoc.xml

validates without errors.  

It appears this validation command (also used by the xmlto script) is
more sensitive to DocBook XML issues than the onsgmls validator which
we currently use to validate our DocBook source.  For example, before
and after the current changes our validate target showed no validation
issues.

Modified Paths:
--------------
    trunk/cmake/modules/docbook.cmake
    trunk/doc/docbook/src/advanced.xml
    trunk/doc/docbook/src/plplotdoc.xml.in

Modified: trunk/cmake/modules/docbook.cmake
===================================================================
--- trunk/cmake/modules/docbook.cmake	2013-08-12 22:59:06 UTC (rev 12480)
+++ trunk/cmake/modules/docbook.cmake	2013-08-12 23:11:08 UTC (rev 12481)
@@ -51,6 +51,8 @@
 # Required for validation regardless of whether BUILD_DOC is set
 set(XML_DECL "/usr/share/xml/declaration/xml.dcl" CACHE STRING "Full path to xml.dcl file.")
 set(DOCBOOK_DTD_PUBID "-//OASIS//DTD DocBook XML V4.5//EN")
+set(DOCBOOK_DTD_SYSID "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd")
+
 find_program(ONSGMLS onsgmls)
 
 if(ONSGMLS )

Modified: trunk/doc/docbook/src/advanced.xml
===================================================================
--- trunk/doc/docbook/src/advanced.xml	2013-08-12 22:59:06 UTC (rev 12480)
+++ trunk/doc/docbook/src/advanced.xml	2013-08-12 23:11:08 UTC (rev 12481)
@@ -2321,17 +2321,19 @@
       <literal>(X, Y, Z)</literal> in terms of some meaningful
       user-specified coordinate system.  These are called
       <emphasis>three-dimensional world coordinates</emphasis>.  We need to
-      specify the ranges of these coordinates, so that the entire surface
-      is contained within the cuboid defined by <literal>xmin &less; x &less;
-      xmax</literal>, <literal>ymin &less; y &less; ymax</literal>, and
-      <literal>zmin &less; z &less; zmax</literal>.  Typically, we shall want
-      to view the surface from a variety of angles, and to facilitate this,
-      a two-stage mapping of the enclosing cuboid is performed.  Firstly,
-      it is mapped into another cuboid called the <emphasis>normalized
-      box</emphasis> whose size must also be specified by the user, and
-      secondly this normalized box is viewed from a particular azimuth and
-      elevation so that it can be projected onto the two-dimensional
-      window.
+      specify the ranges of these coordinates, so that the entire surface is
+      contained within the cuboid defined by <literal>xmin</literal> &lt;
+      <literal>x</literal> &lt; <literal>xmax</literal>,
+      <literal>ymin</literal> &lt; <literal>y</literal> &lt;
+      <literal>ymax</literal>, and <literal>zmin</literal> &lt;
+      <literal>z</literal> &lt; <literal>zmax</literal>.  Typically, we
+      shall want to view the surface from a variety of angles, and to
+      facilitate this, a two-stage mapping of the enclosing cuboid is
+      performed.  Firstly, it is mapped into another cuboid called the
+      <emphasis>normalized box</emphasis> whose size must also be specified
+      by the user, and secondly this normalized box is viewed from a
+      particular azimuth and elevation so that it can be projected onto the
+      two-dimensional window.
     </para>
 
     <para>

Modified: trunk/doc/docbook/src/plplotdoc.xml.in
===================================================================
--- trunk/doc/docbook/src/plplotdoc.xml.in	2013-08-12 22:59:06 UTC (rev 12480)
+++ trunk/doc/docbook/src/plplotdoc.xml.in	2013-08-12 23:11:08 UTC (rev 12481)
@@ -40,7 +40,7 @@
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<!DOCTYPE book PUBLIC "@DOCBOOK_DTD_PUBID@" [
+<!DOCTYPE book PUBLIC "@DOCBOOK_DTD_PUBID@" "@DOCBOOK_DTD_SYSID@" [
 
 <!ENTITY Project-Version "@VERSION@">
 <!ENTITY Project-Date "$Date$">
@@ -431,5 +431,4 @@
     &chap-os-notes;
     &chap-libraries;
   </part>
-
 </book>

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