exframe (11jan20)

git-svn-id: svn://tug.org/texlive/trunk@53369 c570f23f-e606-0410-a88d-b1316a301751

12 files changed, 87 insertions, 87 deletions

diff --git a/Master/texmf-dist/doc/latex/exframe/README.txt b/Master/texmf-dist/doc/latex/exframe/README.txt
index cea7a5c2709..86c71316ab1 100644
--- a/Master/texmf-dist/doc/latex/exframe/README.txt
+++ b/Master/texmf-dist/doc/latex/exframe/README.txt
@@ -1,5 +1,5 @@
-exframe v3.3
-Copyright 2011-2019 Niklas Beisert
+exframe v3.31
+Copyright 2011-2020 Niklas Beisert
 
 exframe is a LaTeX2e package which provides a general purpose
 framework to describe and typeset exercises and exam questions
diff --git a/Master/texmf-dist/doc/latex/exframe/exframe.pdf b/Master/texmf-dist/doc/latex/exframe/exframe.pdf
index 84e39f432b1..e9886cb9309 100644
--- a/Master/texmf-dist/doc/latex/exframe/exframe.pdf
+++ b/Master/texmf-dist/doc/latex/exframe/exframe.pdf
diff --git a/Master/texmf-dist/doc/latex/exframe/exfsamp.tex b/Master/texmf-dist/doc/latex/exframe/exfsamp.tex
index a71d2f19413..b837f9b4e33 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfsamp.tex
+++ b/Master/texmf-dist/doc/latex/exframe/exfsamp.tex
@@ -6,7 +6,7 @@
 %%
 %% exframe.dtx  (with options: `samplesingle')
 %% 
-%% Copyright (C) 2011-2019 Niklas Beisert
+%% Copyright (C) 2011-2020 Niklas Beisert
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -17,7 +17,7 @@
 %% version 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1996/12/01]
-\ProvidesFile{exfsamp.tex}[2019/06/15 v3.3 standalone sample for exframe]
+\ProvidesFile{exfsamp.tex}[2020/01/11 v3.31 standalone sample for exframe]
 \documentclass[12pt]{article}
 
 \usepackage{geometry}
diff --git a/Master/texmf-dist/doc/latex/exframe/exfser01.tex b/Master/texmf-dist/doc/latex/exframe/exfser01.tex
index ceeb75023c6..2e563eb552e 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfser01.tex
+++ b/Master/texmf-dist/doc/latex/exframe/exfser01.tex
@@ -6,7 +6,7 @@
 %%
 %% exframe.dtx  (with options: `samplemultisheet1')
 %% 
-%% Copyright (C) 2011-2019 Niklas Beisert
+%% Copyright (C) 2011-2020 Niklas Beisert
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/exframe/exfser02.tex b/Master/texmf-dist/doc/latex/exframe/exfser02.tex
index e6f9ad15624..e355ae852e2 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfser02.tex
+++ b/Master/texmf-dist/doc/latex/exframe/exfser02.tex
@@ -6,7 +6,7 @@
 %%
 %% exframe.dtx  (with options: `samplemultisheet2')
 %% 
-%% Copyright (C) 2011-2019 Niklas Beisert
+%% Copyright (C) 2011-2020 Niklas Beisert
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/exframe/exfser03.tex b/Master/texmf-dist/doc/latex/exframe/exfser03.tex
index 1cb46859cbc..d77ed7c76de 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfser03.tex
+++ b/Master/texmf-dist/doc/latex/exframe/exfser03.tex
@@ -6,7 +6,7 @@
 %%
 %% exframe.dtx  (with options: `samplemultisheet3')
 %% 
-%% Copyright (C) 2011-2019 Niklas Beisert
+%% Copyright (C) 2011-2020 Niklas Beisert
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/exframe/exfseraa.tex b/Master/texmf-dist/doc/latex/exframe/exfseraa.tex
index 238fbd825ac..c80dbf46475 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfseraa.tex
+++ b/Master/texmf-dist/doc/latex/exframe/exfseraa.tex
@@ -6,7 +6,7 @@
 %%
 %% exframe.dtx  (with options: `samplemultisheeta')
 %% 
-%% Copyright (C) 2011-2019 Niklas Beisert
+%% Copyright (C) 2011-2020 Niklas Beisert
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/exframe/exfserm.tex b/Master/texmf-dist/doc/latex/exframe/exfserm.tex
index ee144b3f929..aa96b3da0fe 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfserm.tex
+++ b/Master/texmf-dist/doc/latex/exframe/exfserm.tex
@@ -6,7 +6,7 @@
 %%
 %% exframe.dtx  (with options: `samplemultimain')
 %% 
-%% Copyright (C) 2011-2019 Niklas Beisert
+%% Copyright (C) 2011-2020 Niklas Beisert
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
@@ -17,7 +17,7 @@
 %% version 2005/12/01 or later.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1996/12/01]
-\ProvidesFile{exfserm.tex}[2019/06/15 v3.3 multipart sample for exframe]
+\ProvidesFile{exfserm.tex}[2020/01/11 v3.31 multipart sample for exframe]
 \input{childdoc.def}
 \childdocmain{exfserm}
 
@@ -160,12 +160,11 @@ xu:=1cm;
   \getexercisedata{author}. \copyrightmessage{} \licensemessage}}
 \ifdefined\sourceurl\hypersetup{pdflicenseurl={\sourceurl}}\else
 \ifdefined\licenseurl\hypersetup{pdflicenseurl={\licenseurl}}\fi\fi
-\ifdefined\XMPLangAlt
+\hypersetup{keeppdfinfo=true}
 \hypersetup{pdfsource={}}
 \XMPLangAlt{en}{pdfcopyright={Copyright \getexercisedata{date}
   \getexercisedata{author}. \copyrightmessage{} \licensemessage}}
 \fi
-\fi
 
 \begin{document}
 
diff --git a/Master/texmf-dist/doc/latex/exframe/exfsermk.mak b/Master/texmf-dist/doc/latex/exframe/exfsermk.mak
index af8b29063e4..f6b9f3800b4 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfsermk.mak
+++ b/Master/texmf-dist/doc/latex/exframe/exfsermk.mak
@@ -1,48 +1,47 @@
-MAIN = exfserm
-SOURCE = exfser
-PROBLEM = exfserp
+SRCMAIN = exfserm
+SRCSEC = exfser
+SRCPRB = exfserp
 SCRIPT = exfsermk.sh
 MAKEFILE = exfsermk.mak
-TARGETLIST = Problems Solutions
-SHEETNUM = 01 02 03 aa
-PREREQS = $(MAIN).tex
-SOURCES = $(SHEETNUM:%=$(SOURCE)%.tex)
-SHEETS = $(foreach trg,$(TARGETLIST),$(trg).pdf $(SHEETNUM:%=$(trg)%.pdf))
-TARGETS = $(foreach trg,$(TARGETLIST),$(trg).pdf)
-GENFILES = $(foreach trg,$(TARGETLIST),$(trg).tex $(SHEETNUM:%=$(trg)%.tex))
-BAKFILES = $(SOURCES) $(MAIN).tex $(MAKEFILE) $(SCRIPT) $(PROBLEM)*
+TRGLIST = Problems Solutions
+SECNUM = 01 02 03 aa
+PREREQS = $(SRCMAIN).tex
+
+SRCSECFILES = $(SECNUM:%=$(SRCSEC)%.tex)
+TRGMAINFILES = $(foreach trg,$(TRGLIST),$(trg).pdf)
+TRGSECFILES = $(foreach trg,$(TRGLIST),$(trg).pdf $(SECNUM:%=$(trg)%.pdf))
+GENFILES = $(foreach trg,$(TRGLIST),$(trg).tex $(SECNUM:%=$(trg)%.tex))
+BAKFILES = $(PREREQS) $(SRCSECFILES) $(GENFILES) $(MAKEFILE) $(SCRIPT) $(SRCPRB)*
 
 default: sheets ;
-sheets: $(SHEETS) ;
-main: $(TARGETS) ;
-sheet%: $(foreach trg,$(TARGETLIST),$(trg)%.pdf) ;
+main: $(TRGMAINFILES) ;
+sheets: $(TRGSECFILES) ;
+sheet%: $(foreach trg,$(TRGLIST),$(trg)%.pdf) ;
 all: main sheets ;
 sources: $(GENFILES) ;
 
-$(TARGETS): $(SOURCES) $(PREREQS)
+$(TRGMAINFILES): $(SRCSECFILES) $(PREREQS)
 	bash ./$(SCRIPT) $@
-$(word 1,$(TARGETLIST))%.pdf: $(SOURCE)%.tex $(PREREQS)
+$(word 1,$(TRGLIST))%.pdf: $(SRCSEC)%.tex $(PREREQS)
 	bash ./$(SCRIPT) $@
-$(word 2,$(TARGETLIST))%.pdf: $(SOURCE)%.tex $(PREREQS)
+$(word 2,$(TRGLIST))%.pdf: $(SRCSEC)%.tex $(PREREQS)
 	bash ./$(SCRIPT) $@
 $(GENFILES):
 	bash ./$(SCRIPT) $@
 
 touch:
-	touch $(MAIN).tex
+	touch $(SRCMAIN).tex
 clean:
-	rm -f $(SHEETNUM:%=$(SOURCE)%.aux)
-	rm -f $(SHEETNUM:%=$(SOURCE)%.log)
-	rm -f $(foreach trg,$(TARGETLIST),$(SHEETNUM:%=$(trg)%.log) $(trg).log)
-	rm -f $(patsubst %,$(MAIN)%,.aux .log .out .toc)
-	rm -f $(patsubst %,$(MAIN)%,.mp .mpx -*.mps -tmp.log -tmp.mp -tmp.mpx)
+	rm -f $(foreach ext,.aux .log,$(SECNUM:%=$(SRCSEC)%$(ext)))
+	rm -f $(foreach trg,$(TRGLIST),$(SECNUM:%=$(trg)%.log) $(trg).log)
+	rm -f $(foreach ext,.aux .log .out .toc,$(SRCMAIN)$(ext))
+	rm -f $(foreach ext,.mp .mpx -*.mps -tmp.log -tmp.mp -tmp.mpx,$(SRCMAIN)$(ext))
 	rm -f mpxerr.tex mpxerr.log mpxerr.dvi texput.log
-	rm -f $(patsubst %,$(PROBLEM)*%,.aux .log .mp .mpx -*.mps)
-	rm -f $(patsubst %,$(PROBLEM)*%,-tmp.log -tmp.mp -tmp.mpx)
+	rm -f $(patsubst %,$(SRCPRB)*%,.aux .log .mp .mpx -*.mps)
+	rm -f $(patsubst %,$(SRCPRB)*%,-tmp.log -tmp.mp -tmp.mpx)
 clean-bak:
 	rm -f $(BAKFILES:%=%~) $(BAKFILES:%=%.bak)
 clean-all:  clean
-	rm -f $(SHEETS) $(TARGETS)
-	rm -f $(SHEETNUM:%=$(SOURCE)%.pdf) $(MAIN).pdf
-	rm -f $(foreach trg,$(TARGETLIST),$(SHEETNUM:%=$(trg)%.tex) $(trg).tex)
-	rm -f $(PROBLEM)*.pdf
+	rm -f $(TRGSECFILES) $(TRGMAINFILES) $(GENFILES)
+	rm -f $(SECNUM:%=$(SRCSEC)%.pdf) $(SRCMAIN).pdf
+	rm -f $(SRCPRB)*.pdf
diff --git a/Master/texmf-dist/doc/latex/exframe/exfsermk.sh b/Master/texmf-dist/doc/latex/exframe/exfsermk.sh
index 1003fa32522..a92683034a8 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfsermk.sh
+++ b/Master/texmf-dist/doc/latex/exframe/exfsermk.sh
@@ -1,11 +1,17 @@
 #!/bin/bash
 
+srcmain="exfserm"
+srcsec="exfser"
+trglist=(Problems Solutions)
+trgsol=(n y)
+secnum="01 02 03 aa"
+
 if [ -z $1 ]
 then
   echo "Usage:
   $0 number [version]
     number: number of sheet, 0 for combined document
-    version: 1 for problems, 2 for solutions
+    version: 0 for problems, 1 for solutions
   $0 filename
     filename: target file to be compiled"
   exit 1
@@ -13,16 +19,11 @@ fi
 
 num="$1"
 ver="$2"
-main="exfserm"
-source="exfser"
-target1="Problems"
-target2="Solutions"
-sheets="01 02 03 aa"
 nl=$'\n'
-sheetokay=""
+secokay=""
 make=".pdf"
 
-for v in $target1 $target2
+for v in "${trglist[@]}"
 do
   if [[ $num =~ ^$v ]]
   then
@@ -36,66 +37,67 @@ done
 if [[ $num =~ ^[0-9]$ ]]; then num="0$num"; fi
 if [[ $num == "00" ]]; then num=""; fi
 
-if [[ -z $num ]]; then sheetokay="okay"; fi
-for v in $sheets
+if [[ -z $num ]]; then secokay="okay"; fi
+for v in $secnum
 do
-  if [[ "$num" == "$v" ]]; then sheetokay="okay"; fi
+  if [[ "$num" == "$v" ]]; then secokay="okay"; fi
 done
 
-if [[ -z $sheetokay ]]
+if [[ -z $secokay ]]
 then
   echo "error: unknown sheet"
   exit 1
 fi
 
+if [[ "$make" == ".pdf" ]]; then nl=""; fi
+
 function docompile
 {
-  if [[ -z $num ]]; then job=$main; else job=$source$num; fi
-  for par in -draftmode ""
+  if [[ -z $num ]]
+  then
+    job="$srcmain"
+    fwd="\\childdocforward{$srcmain}"
+  else
+    job="$srcsec$num"
+    fwd="\\childdocforward[$srcmain]{$srcsec$num}"
+  fi
+  body="\\def\\jobname{$job}$optdef\\input{childdoc.def}$fwd"
+  for pass in first main
   do
-    body="\\def\\jobname{$job}\\def\\draftver{n}\\def\\printsol{$sol}"
-    body="$body\\input{childdoc.def}"
-    if [[ -z $num ]]
-    then
-      body="$body\\childdocforward{$main}"
-    else
-      body="$body\\childdocforward[$main]{$source$num}"
-    fi
+    par="";
+    if [[ "$pass" == "first" ]]; then par="-draftmode"; fi
     drop="This is|entering extended mode|\\write18"
     drop="$drop|Preloading the plain mem file|mpost\.mp|plain\.mp"
     pdflatex -shell-escape -interaction=batchmode $par \
-      -jobname "$target$num" "$body" | grep -vE "$drop"
+      -jobname "$trg" "$body" | grep -vE "$drop"
+    if [[ "$pass" != "main" ]]; then continue; fi
+    if ! (grep -E -q "may have changed|rerunfilecheck Warning" "$trg.log"); then break; fi
   done
-  grep -E "Warning|Error|Undefined|Overfull|Underfull" "$target$num.log"
+  grep -E "^! |Warning|Error|Undefined|Overfull|Underfull" "$trg.log"
 }
 
 function writesource
 {
-  body="\\def\\draftver{n}$nl\\def\\printsol{$sol}$nl"
-  body="$body\\input{childdoc.def}$nl"
   if [[ -z $num ]]
   then
-    body="$body\\childdocforward{$main}"
+    fwd="\\childdocforward{$srcmain}"
   else
-    body="$body\\childdocforwardprefix[$main]{$target}{$source}"
+    fwd="\\childdocforwardprefix[$srcmain]{$target}{$srcsec}"
   fi
-  echo "$body" > $target$num.tex
-}
-
-function process
-{
-  target=$1
-  sol=$2
-  if [[ "$make" == ".pdf" ]]; then docompile; else writesource; fi
+  body="$optdef\\input{childdoc.def}$nl$fwd"
+  echo "$body" > $trg.tex
 }
 
-if [[ -z $ver || "$ver" == "$target1" || $ver = 1 ]]
-then
-  process $target1 n
-fi
-if [[ -z $ver || "$ver" == "$target2" || $ver = 2 ]]
-then
-  process $target2 y
-fi
+for i in "${!trglist[@]}"
+do
+  if [[ -z $ver || "$ver" == "${trglist[$i]}" || $ver = $i ]]
+  then
+    target="${trglist[$i]}"
+    sol="${trgsol[$i]}"
+    trg="$target$num"
+    optdef="\\def\\draftver{n}$nl\\def\\printsol{$sol}$nl"
+    if [[ "$make" == ".pdf" ]]; then docompile; else writesource; fi
+  fi
+done
 
 echo
diff --git a/Master/texmf-dist/doc/latex/exframe/exfserpe.tex b/Master/texmf-dist/doc/latex/exframe/exfserpe.tex
index 0a1867f2ef5..8c4aa9f2832 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfserpe.tex
+++ b/Master/texmf-dist/doc/latex/exframe/exfserpe.tex
@@ -6,7 +6,7 @@
 %%
 %% exframe.dtx  (with options: `samplemultiprobleme')
 %% 
-%% Copyright (C) 2011-2019 Niklas Beisert
+%% Copyright (C) 2011-2020 Niklas Beisert
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/exframe/exfserpf.tex b/Master/texmf-dist/doc/latex/exframe/exfserpf.tex
index efb298501a2..4df699f02e9 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfserpf.tex
+++ b/Master/texmf-dist/doc/latex/exframe/exfserpf.tex
@@ -6,7 +6,7 @@
 %%
 %% exframe.dtx  (with options: `samplemultiproblemf')
 %% 
-%% Copyright (C) 2011-2019 Niklas Beisert
+%% Copyright (C) 2011-2020 Niklas Beisert
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3