Simplify code using "nopdf" option added in GAPDoc 1.6.3

Author: fingolfin

PackageInfo.g

@@ -118,7 +118,7 @@ PackageDoc := rec(
 
 Dependencies := rec(
   GAP := ">= 4.5",
-  NeededOtherPackages := [ [ "GAPDoc", ">= 1.5" ] ],
+  NeededOtherPackages := [ [ "GAPDoc", ">= 1.6.3" ] ],
   SuggestedOtherPackages := [ ],
   ExternalConditions := []
 

gap/Magic.gi

@@ -73,7 +73,7 @@ function( arg )
           pkgdirstr, docdirstr,
           title_page, tree, is_worksheet,
           position_document_class,
-          makeDocFun, args;
+          args;
 
     if Length( arg ) >= 3 then
         Error( "too many arguments" );
@@ -552,13 +552,6 @@ function( arg )
         GAPDoc2LaTeXProcs.Tail := Concatenation(
             "\\immediate\\write\\pagenrlog{[\"Ind\", 0, 0], \\arabic{page},}\n",
             GAPDoc2LaTeXProcs.Tail );
-        
-        # Choose how we call GAPDoc
-        if Filename( DirectoriesSystemPrograms(), "pdflatex" ) <> fail then
-            makeDocFun := MakeGAPDocDoc;
-        else
-            makeDocFun := AutoDoc_MakeGAPDocDoc_WithoutLatex;
-        fi;
 
         # Process Chunks.xml file, if present
         if IsString(_AUTODOC_GLOBAL_CHUNKS_FILE) then
@@ -568,6 +561,11 @@ function( arg )
         # Default parameters for MakeGAPDocDoc
         args := [ doc_dir, gapdoc.main, gapdoc.files, gapdoc.bookname, "MathJax" ];
 
+        # Don't try to generate PDFs if pdflatex is not available
+        if Filename( DirectoriesSystemPrograms(), "pdflatex" ) = fail then
+            Add(args, "nopdf" );
+        fi;
+
         # The global option "relativePath" can be set to ensure the manual
         # is built in such a way that all references to the GAP reference manual
         # are using relative file paths. This is mainly useful when building
@@ -586,7 +584,7 @@ function( arg )
         fi;
 
         # Finally, invoke GAPDoc
-        CallFuncList( makeDocFun, args );
+        CallFuncList( MakeGAPDocDoc, args );
 
         # NOTE: We cannot just write CopyHTMLStyleFiles(doc_dir) here, as
         # CopyHTMLStyleFiles its argument directly to Directory(), leading

gap/ToolFunctions.gd

@@ -11,7 +11,6 @@ DeclareGlobalFunction( "AUTODOC_AbsolutePath" );
 
 DeclareGlobalFunction( "AUTODOC_OutputTextFile" );
 DeclareGlobalFunction( "AutoDoc_WriteDocEntry" );
-DeclareGlobalFunction( "AutoDoc_MakeGAPDocDoc_WithoutLatex" );
 DeclareGlobalFunction( "AutoDoc_CreatePrintOnceFunction" );
 
 DeclareGlobalFunction( "AUTODOC_Diff" );

gap/ToolFunctions.gi

@@ -144,85 +144,6 @@ InstallGlobalFunction( AutoDoc_WriteDocEntry,
     AppendTo( filestream, "</ManSection>\n\n" );
 end );
 
-InstallGlobalFunction( AutoDoc_MakeGAPDocDoc_WithoutLatex,
-
-  function(arg)
-  local htmlspecial, path, main, files, bookname, gaproot, str,
-        r, t, l, latex, null, log, pos, h, i, j;
-  htmlspecial := Filtered(arg, a-> a in ["MathML", "Tth", "MathJax"]);
-  if Length(htmlspecial) > 0 then
-    arg := Filtered(arg, a-> not a in ["MathML", "Tth", "MathJax"]);
-  fi;
-  path := arg[1];
-  main := arg[2];
-  files := arg[3];
-  bookname := arg[4];
-  if IsBound(arg[5]) then
-    gaproot := arg[5];
-  else
-    gaproot := false;
-  fi;
-  # ensure that path is directory object
-  if IsString(path) then
-    path := Directory(path);
-  fi;
-  # ensure that .xml is stripped from name of main file
-  if Length(main)>3 and main{[Length(main)-3..Length(main)]} = ".xml" then
-    main := main{[1..Length(main)-4]};
-  fi;
-  # compose the XML document
-  Info(InfoGAPDoc, 1, "#I Composing XML document . . .\n");
-  str := ComposedDocument("GAPDoc", path,
-                             Concatenation(main, ".xml"), files, true);
-  # parse the XML document
-  Info(InfoGAPDoc, 1, "#I Parsing XML document . . .\n");
-  r := ParseTreeXMLString(str[1], str[2]);
-  # clean the result
-  Info(InfoGAPDoc, 1, "#I Checking XML structure . . .\n");
-  CheckAndCleanGapDocTree(r);
-  # produce text version
-  Info(InfoGAPDoc, 1,
-                   "#I Text version (also produces labels for hyperlinks):\n");
-  t := GAPDoc2Text(r, path);
-  GAPDoc2TextPrintTextFiles(t, path);
-  # produce LaTeX version
-  Info(InfoGAPDoc, 1, "#I Constructing LaTeX version and calling pdflatex:\n");
-  r.bibpath := path;
-  l := GAPDoc2LaTeX(r);
-  Info(InfoGAPDoc, 1, "#I Writing LaTeX file, \c");
-  Info(InfoGAPDoc, 2, Concatenation(main, ".tex"), "\n#I     ");
-  FileString(Filename(path, Concatenation(main, ".tex")), l);
-  # print manual.six file
-  PrintSixFile(Filename(path, "manual.six"), r, bookname);
-  # produce html version
-  Info(InfoGAPDoc, 1, "#I Finally the HTML version . . .\n");
-  # if MathJax version is also produced we include links to them
-  if "MathJax"  in htmlspecial then
-    r.LinkToMathJax := true;
-  fi;
-  h := GAPDoc2HTML(r, path, gaproot);
-  GAPDoc2HTMLPrintHTMLFiles(h, path);
-  Unbind(r.LinkToMathJax);
-  if "Tth" in htmlspecial then
-    Info(InfoGAPDoc, 1,
-            "#I - also HTML version with 'tth' translated formulae . . .\n");
-    h := GAPDoc2HTML(r, path, gaproot, "Tth");
-    GAPDoc2HTMLPrintHTMLFiles(h, path);
-  fi;
-  if "MathML" in htmlspecial then
-    Info(InfoGAPDoc, 1, "#I - also HTML + MathML version with 'ttm' . . .\n");
-    h := GAPDoc2HTML(r, path, gaproot, "MathML");
-    GAPDoc2HTMLPrintHTMLFiles(h, path);
-  fi;
-  if "MathJax" in htmlspecial then
-    Info(InfoGAPDoc, 1, "#I - also HTML version for MathJax . . .\n");
-    h := GAPDoc2HTML(r, path, gaproot, "MathJax");
-    GAPDoc2HTMLPrintHTMLFiles(h, path);
-  fi;
-
-  return r;
-end);
-
 InstallGlobalFunction( AutoDoc_CreatePrintOnceFunction,
   function( message )
     local x;