Merge pull request #1095 from hmenke/flattened-doc

Flattened doc

.github/workflows/main.yml

@@ -111,7 +111,7 @@ jobs:
       if: matrix.engine == 'luatex'
       with:
         name: pgfmanual
-        path: doc/generic/pgf/version-for-${{ matrix.engine }}/en/pgfmanual.pdf
+        path: doc/generic/pgf/pgfmanual.pdf
 
     - name: "ZIP: Build"
       if: matrix.engine == 'luatex'
@@ -150,7 +150,7 @@ jobs:
       run: |
         sudo apt-get update -qq
         sudo apt-get install -qq libxml-parser-perl libxml-xpath-perl libtext-unidecode-perl tree
-        cp doc/generic/pgf/version-for-luatex/en/pgfmanual.pdf ../
+        cp doc/generic/pgf/pgfmanual.pdf ../
         bash ci/update_tlcontrib.sh
 
     - name: "Release: create"
@@ -171,7 +171,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: doc/generic/pgf/version-for-${{ matrix.engine }}/en/pgfmanual.pdf
+        asset_path: doc/generic/pgf/pgfmanual.pdf
         asset_name: pgfmanual-${{ env.GIT_TAG }}.pdf
         asset_content_type: application/pdf
 

build.lua

@@ -72,7 +72,7 @@ function lfs.copy(src, dest, verbose)
         f:close()
 
         local dirname = lfs.basename(dest)
-        if not lfs.exists(dirname) then
+        if dirname and not lfs.exists(dirname) then
             lfs.rmkdir(dirname)
         end
         f = io.open(dest, "wb")
@@ -161,13 +161,16 @@ local function manual()
     -- Always generate this
     revisionfile()
 
-    local engine = assert(arg[2], "Specify engine")
+    local engine = arg[2] or "luatex"
 
     local cwd = lfs.currentdir()
-    lfs.chdir("doc/generic/pgf/version-for-" .. engine .. "/en")
+    lfs.chdir("doc/generic/pgf/")
+    if lfs.exists("pgfmanual-" .. engine .. ".cfg") then
+        lfs.copy("pgfmanual-" .. engine .. ".cfg", "pgfmanual.cfg")
+    end
 
     local TEXINPUTS = os.getenv("TEXINPUTS") or ""
-    os.setenv("TEXINPUTS", "../../text-en:../../images:" .. TEXINPUTS)
+    os.setenv("TEXINPUTS", "images:" .. TEXINPUTS)
 
     -- Automatic rerun to get cross-references right
     local run = 0
@@ -280,10 +283,8 @@ local function generate_TDSzip(filename)
     FILES:close()
 
     -- Check that the manual has been built
-    if lfs.isfile("doc/generic/pgf/version-for-luatex/en/pgfmanual.pdf") then
-        lfs.copy("doc/generic/pgf/version-for-luatex/en/pgfmanual.pdf", "doc/generic/pgf/pgfmanual.pdf")
-    else
-        error("doc/generic/pgf/version-for-luatex/en/pgfmanual.pdf is missing")
+    if not lfs.isfile("doc/generic/pgf/pgfmanual.pdf") then
+        error("doc/generic/pgf/pgfmanual.pdf is missing")
     end
 
     -- Copy the README into the TDS archive
@@ -389,5 +390,5 @@ tasks.help = function()
         print("  " .. task)
     end
 end
-local task = tasks[arg[1] or "help"]
+local task = tasks[arg[1]] or tasks.help
 task()

doc/generic/pgf/color.cfg

@@ -0,0 +1,5 @@
+% xcolor inputs this file and ignores the global document options to choose the engine
+% Here we just make sure that a driver is selected
+\expandafter\ifx\csname Gin@driver\endcsname\relax
+  \errmessage{No graphics driver has been selected. Load graphicx before xcolor.}%
+\fi

doc/generic/pgf/version-for-dvisvgm/pgfmanual-dvisvgm.cfg → doc/generic/pgf/pgfmanual-dvisvgm.cfg

@@ -19,7 +19,9 @@
 }
 \makeatother
 
-\usepackage{graphicx,xcolor}
+\usepackage[dvisvgm]{graphicx}
+
+\usepackage[dvisvgm]{xcolor}
 
 \def\graphicsdvisvgmtext{dvisvgm.def}
 

doc/generic/pgf/version-for-tex4ht/pgfmanual-tex4ht.cfg → doc/generic/pgf/pgfmanual-tex4ht.cfg

@@ -13,6 +13,10 @@
 \usepackage{tex4ht}
 \def\pgfsysdriver{pgfsys-tex4ht.def}
 
+\usepackage{graphicx}
+
+\usepackage{xcolor}
+
 \usepackage{xkeyval}
 \usepackage{colortbl}
 

doc/generic/pgf/version-for-pdftex/en/pgfmanual.tex → doc/generic/pgf/pgfmanual.tex

@@ -12,5 +12,5 @@
 % pgf version is defined in \pgfversion in file
 % generic/pgf/utilities/pgfrcs.code.tex
 
-\input{../pgfmanual-pdftex.cfg}
-\input{../../text-en/pgfmanual-en-main.tex}
+\input{pgfmanual.cfg}
+\input{pgfmanual-en-main.tex}