[Plplot-cvs] SF.net SVN: plplot:[12483] trunk/doc/docbook

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

Revision: 12483
          http://sourceforge.net/p/plplot/code/12483
Author:   airwin
Date:     2013-08-14 20:58:11 +0000 (Wed, 14 Aug 2013)
Log Message:
-----------
Generate info form of documentation using utf-8 encoding rather than 
us-ascii encoding.

This change means we don't have to replace the entities defined in
math.ent by their written out (in ascii) equivalents for the info
case, and Table 3-4 looks correct (for the first time ever) in the generated
info form of our documentation.

Tested by: Alan W. Irwin <ai...@us...> using the
cmake -DBUILD_DOC=ON option and the "info" target.

Modified Paths:
--------------
    trunk/doc/docbook/bin/info-clean.pl
    trunk/doc/docbook/src/CMakeLists.txt
    trunk/doc/docbook/src/inline-info.ent

Modified: trunk/doc/docbook/bin/info-clean.pl
===================================================================
--- trunk/doc/docbook/bin/info-clean.pl	2013-08-13 11:40:19 UTC (rev 12482)
+++ trunk/doc/docbook/bin/info-clean.pl	2013-08-14 20:58:11 UTC (rev 12483)
@@ -47,8 +47,7 @@
   if (m{(.*)%([^;]+);(.*)}) {
     print "$1";
     $tmp = "$3\n";
-    print `cat $sysent{$2}`
-      if (not m{%Math-Entities;});
+    print `cat $sysent{$2}`;
     $_ = $tmp;
     redo
   }

Modified: trunk/doc/docbook/src/CMakeLists.txt
===================================================================
--- trunk/doc/docbook/src/CMakeLists.txt	2013-08-13 11:40:19 UTC (rev 12482)
+++ trunk/doc/docbook/src/CMakeLists.txt	2013-08-14 20:58:11 UTC (rev 12483)
@@ -375,7 +375,7 @@
 
     add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi
-    COMMAND ${DB2X_TEXIXML} ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.txml
+    COMMAND ${DB2X_TEXIXML} --encoding=utf-8 ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.txml
     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi_raw
     COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi
     COMMAND sed "s?The PLplot Plotting Library: (plplotdoc)?PLplot: (plplotdoc)?" < ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi_raw > ${CMAKE_CURRENT_BINARY_DIR}/plplotdoc.texi

Modified: trunk/doc/docbook/src/inline-info.ent
===================================================================
--- trunk/doc/docbook/src/inline-info.ent	2013-08-13 11:40:19 UTC (rev 12482)
+++ trunk/doc/docbook/src/inline-info.ent	2013-08-14 20:58:11 UTC (rev 12483)
@@ -1,57 +1,5 @@
-<!ENTITY Alpha    "Alpha">
-<!ENTITY Beta     "Beta">
-<!ENTITY Gamma    "Gamma">
-<!ENTITY Delta    "Delta">
-<!ENTITY Epsilon  "Epsilon">
-<!ENTITY Zeta     "Zeta">
-<!ENTITY Eta      "Eta">
-<!ENTITY Theta    "Theta">
-<!ENTITY Iota     "Iota">
-<!ENTITY Kappa    "Kappa">
-<!ENTITY Lambda   "Lambda">
-<!ENTITY Mu       "Mu">
-<!ENTITY Nu       "Nu">
-<!ENTITY Xi       "Xi">
-<!ENTITY Omicron  "Omicron">
-<!ENTITY Pi       "Pi">
-<!ENTITY Rho      "Rho">
-<!ENTITY Sigma    "Sigma">
-<!ENTITY Tau      "Tau">
-<!ENTITY Upsilon  "Upsilon">
-<!ENTITY Phi      "Phi">
-<!ENTITY Chi      "Chi">
-<!ENTITY Psi      "Psi">
-<!ENTITY Omega    "Omega">
-<!ENTITY alpha    "alpha">
-<!ENTITY beta     "beta">
-<!ENTITY gamma    "gamma">
-<!ENTITY delta    "delta">
-<!ENTITY epsilon  "epsilon">
-<!ENTITY zeta     "zeta">
-<!ENTITY eta      "eta">
-<!ENTITY theta    "theta">
-<!ENTITY iota     "iota">
-<!ENTITY kappa    "kappa">
-<!ENTITY lambda   "lambda">
-<!ENTITY mu       "mu">
-<!ENTITY nu       "nu">
-<!ENTITY xi       "xi">
-<!ENTITY omicron  "omicron">
-<!ENTITY pi       "pi">
-<!ENTITY rho      "rho">
-<!ENTITY varsigma "varsigma">
-<!ENTITY sigma    "sigma">
-<!ENTITY tau      "tau">
-<!ENTITY upsilon  "upsilon">
-<!ENTITY phi      "phi">
-<!ENTITY chi      "chi">
-<!ENTITY psi      "psi">
-<!ENTITY omega    "omega">
 <!ENTITY deg      " degrees">
-<!ENTITY less     "&lt;">
-<!ENTITY leq      "&lt;=">
 <!ENTITY ndash    "--">
 <!ENTITY nbsp     " ">
 <!ENTITY mdash    "---">
-<!ENTITY egrave   "e">
 <!ENTITY over-under "S-freq">

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