Merge pull request #1507 from mathics/latexdoc-fixes

Small LaTeX doc fixes

Author: rocky

mathics/builtin/optiondoc.py

@@ -59,7 +59,7 @@ class Axis(Builtin):
       <dd>is a possible value for the 'Filling' option.
     </dl>
 
-    >> ListLinePlot[Table[Sin[x], {x, -5, 5, 0.5}], Filling->Axis]
+    >> ListLinePlot[Table[Sin[x], {x, -5, 5, 0.2}], Filling->Axis]
      = -Graphics-
     """
 
@@ -247,6 +247,6 @@ class Top(Builtin):
         <dd>is a possible value for the 'Filling' option.
     </dl>
 
-    >> ListLinePlot[Table[Sin[x], {x, -5, 5, 0.5}], Filling->Axis|Top|Bottom]
+    >> ListLinePlot[Table[Sin[x], {x, -5, 5, 0.2}], Filling->Axis|Top|Bottom]
      = -Graphics-
     """

mathics/doc/tex/README.rst

@@ -27,8 +27,8 @@ Here is a flow of the data::
     bultins/*.py  -------------+--> doc/tex/doc_tex_data.pcl ---> documentation.tex -+
                    docpipeline.py                          doc2latex.py              |
                                                                                      |
-    doc/images/*.svg -------------> doc/tex/log*.pdf --------------------------------+---------------------> mathics.pdf
-                     images.sh                                                       |  xetex,asyptote,gv
+    doc/images/*.svg -------------> doc/tex/log*.pdf --------------------------------+------------------------------> mathics.pdf
+                     images.sh                                                       |  latexmk,xetex,asyptote,gv
                                                                                      |
     doc/tex/mathics.tex -------------------------------------------------------------+
 

mathics/doc/tex/latexmkrc

@@ -1,4 +1,51 @@
+# -*- Perl -*-
+# This is a configuration read and used by latexmk.
+# Specifically, we use it to direct how to process Asymptote (asy) vector graphics.
+
+# Note the following is actually Perl code.
+
+
+# Check whether the Asymptote (asy) is new enough.
+my $min_asy_version = "2.71";
+my $out = `asy --version 2>&1 | head -1`;
+if ($? >> 8 == 0) {
+    # Continue checking the version number
+    if ($out =~ /version (\d.\d+)/) {
+	my $version = "$1";
+	if ($version < $min_asy_version) {
+	    print("Warning - your Asymptote version, ${version}, may be too old to handle everything.\n");
+	    print("We would like version ${min_asy_version}. Continuing with fingers crossed...\n");
+	}
+    }
+} else {
+    print("Trouble checking Aymptote version -- skipping version check for ${min_asy_version}\n");
+}
+
+# Check whether the Ghostscript (gs) is new enough.
+my $min_gs_version = "9.54";
+$out = `gs --version 2>&1`;
+if ($? >> 8 == 0) {
+    # Continue checking the version number
+    if ($out =~ /(\d.\d+)/) {
+	my $version = "$1";
+	if ($version < $min_gs_version) {
+	    print("Warning - your Ghostscript version, ${version}, may be too old to handle everything.\n");
+	    print("We would like version ${min_gs_version}. Continuing with fingers crossed...\n");
+	}
+    }
+} else {
+    print("Trouble checking GhostScript version -- skipping version check for ${min_gs_version}\n");
+}
+
+
+# The Redefinition of function asy below allows us to customize how to call
+# asy (asymptote).
 sub asy {return system("asy '$_[0]' -render=0 -nosafe -noprc --gsOptions='-P'");}
+
+# The following add custom dependencies for Asymptote:
+# Basically the parameters are
+# from extension, to_extension, must (0=file does not have to exist), name of function
+# See the section "Custom Dependencies" under "man latexmk".
 add_cus_dep("asy","eps",0,"asy");
 add_cus_dep("asy","pdf",0,"asy");
 add_cus_dep("asy","tex",0,"asy");