summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/exframe
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-25 22:03:03 +0000
committerKarl Berry <karl@freefriends.org>2020-02-25 22:03:03 +0000
commitec44a8cec262bd339e0632be731402e9ebaa3992 (patch)
tree33e0ae8f16d9376e3db863683aafc699ac52025a /Master/texmf-dist/doc/latex/exframe
parent072492d86e05a2508a21d958e5a3045f32a77cae (diff)
exframe (25feb20)
git-svn-id: svn://tug.org/texlive/trunk@53911 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/exframe')
-rw-r--r--Master/texmf-dist/doc/latex/exframe/README.txt2
-rw-r--r--Master/texmf-dist/doc/latex/exframe/exframe.pdfbin390818 -> 409753 bytes
-rw-r--r--Master/texmf-dist/doc/latex/exframe/exfsamp.tex109
-rw-r--r--Master/texmf-dist/doc/latex/exframe/exfser01.tex17
-rw-r--r--Master/texmf-dist/doc/latex/exframe/exfser02.tex17
-rw-r--r--Master/texmf-dist/doc/latex/exframe/exfseraa.tex17
-rw-r--r--Master/texmf-dist/doc/latex/exframe/exfserm.tex143
-rw-r--r--Master/texmf-dist/doc/latex/exframe/exfsermk.mak6
-rw-r--r--Master/texmf-dist/doc/latex/exframe/exfsermk.sh5
-rw-r--r--Master/texmf-dist/doc/latex/exframe/exfserpe.tex17
10 files changed, 231 insertions, 102 deletions
diff --git a/Master/texmf-dist/doc/latex/exframe/README.txt b/Master/texmf-dist/doc/latex/exframe/README.txt
index 86c71316ab1..c2c506613e5 100644
--- a/Master/texmf-dist/doc/latex/exframe/README.txt
+++ b/Master/texmf-dist/doc/latex/exframe/README.txt
@@ -1,4 +1,4 @@
-exframe v3.31
+exframe v3.4
Copyright 2011-2020 Niklas Beisert
exframe is a LaTeX2e package which provides a general purpose
diff --git a/Master/texmf-dist/doc/latex/exframe/exframe.pdf b/Master/texmf-dist/doc/latex/exframe/exframe.pdf
index e9886cb9309..fe95c96fec0 100644
--- a/Master/texmf-dist/doc/latex/exframe/exframe.pdf
+++ b/Master/texmf-dist/doc/latex/exframe/exframe.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/exframe/exfsamp.tex b/Master/texmf-dist/doc/latex/exframe/exfsamp.tex
index b837f9b4e33..2709c4c090c 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfsamp.tex
+++ b/Master/texmf-dist/doc/latex/exframe/exfsamp.tex
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}[1996/12/01]
-\ProvidesFile{exfsamp.tex}[2020/01/11 v3.31 standalone sample for exframe]
+\ProvidesFile{exfsamp.tex}[2020/02/24 v3.4 standalone sample for exframe]
\documentclass[12pt]{article}
\usepackage{geometry}
@@ -29,10 +29,18 @@
\usepackage{amsmath}
\usepackage{hyperref}
+
+\PassOptionsToPackage{loadlang=en|de}{metastr}
+\PassOptionsToPackage{course=true}{metastr}
+%%\usepackage{metastr}
+%%\metasetlang{de}
+
\usepackage[extstyle]{exframe}
-\exercisesetup{solutions=true}
-%%\exercisesetup{solutions=false}
+%%\exercisesetup{solutions=true}
+\exercisesetup{solutions=false}
+
+\exercisesetup{autolabelproblem=true}
\exercisestyle{plainheader}
\exerciseconfig{composeheaderbelowright}{\getsheetdata{points}}%
@@ -46,13 +54,20 @@
\hspace{-\getexerciseconfig{skipsubprobleminfo}}*}}%
{}{}{\getsubproblempoints{}}}
+\ifdefined\metaset
+\metasetterm[en]{sheet}{Exercise Sheet}
+\metasetterm[en]{sheets}{Exercise Sheets}
+\metasetterm[de]{sheet}{\"Ubungsblatt}
+\metasetterm[de]{sheets}{\"Ubungsbl\"atter}
+\else
\exerciseconfig{termsheet}{\"Ubungsblatt}
\exerciseconfig{termsheets}{\"Ubungsbl\"atter}
+\fi
\exercisestyle{problempointsat=margin}
\reversemarginpar
\exerciseconfig{composepointsmargin}[1]{#1p.}
-\exerciseconfig{composepointspairmargin}[2]{
+\exerciseconfig{composepointspairmargin}[2]{%
\ifdim#2pt=0pt#1p.%
\else\ifdim#1pt=0pt+#2p.%
\else#1+#2p.%
@@ -66,27 +81,65 @@
\exercisestyle{solutionbelow=problem}
\exercisestyle{solutionsep}
+\exercisesetup{pdfdata=sheet}
+
+\ifdefined\metaset
+\metaset[sep]{subtitle}{, }
+\metaset{subtitle}{\ifsolutions\metatranslate[#1]{solutions} \fi%
+ \metaif[use]{sheettitle}
+ {\metapick[#1]{sheettitle}}
+ {\metapick[#1]{material}}}
+\metaset{author}{\exerciseifempty{\getsheetdata{author}}%
+ {\metapick[#1]{instructor}}{\metapick[#1]{sheetauthor}},
+ \metapick[#1]{institution}}
+\else
\exerciseconfig{composemetasheet}[2]{\getexercisedata{course},
+ \ifsolutions\getexerciseconfig{termsolutions} \fi%
\exerciseifempty{#2}{\getexerciseconfig{termsheet} #1}{#2}}
-
-\exercisesetup{pdfdata=sheet}
\exercisedata{title=%
- {\getexercisedata{course}, \getexercisedata{material}}}
+ {\getexercisedata{course},
+ \ifsolutions\getexercisedata{solutions} \fi%
+ \getexercisedata{material}}}
\exercisedata{author=%
{\getexercisedata{instructor}, \getexercisedata{institution}}}
-
+\fi
+
+\ifdefined\metaset
+\metaset{institution}{Katharinen-Volksschule}
+\metaset[de]{course}{Mathematik}
+\metaset[en]{course}{Mathematics}
+\metaset{instructor}{J.\ G.\ B\"uttner}
+\metaset{period}{ca.\ 1786}
+\metaset[de]{material}{\"Ubungsaufgaben}
+\metaset[en]{material}{Exercise Problems}
+\else
\exercisedata{institution={Katharinen-Volksschule}}
\exercisedata{course={Mathematik}}
\exercisedata{instructor={J.\ G.\ B\"uttner}}
\exercisedata{period={ca.\ 1786}}
\exercisedata{material={\"Ubungsaufgaben}}
+\fi
\begin{document}
-\begin{sheet}[number=5]
+\begin{sheet}[number=5,label={sheet5}]
\begin{problem}[title={Sums},points=99+4]
+\exerciseloopstr{\getsubproblemlist{}}{c}%
+\hfill\begin{tabular}{c|\exerciseloopret|c}
+\exerciseloop{\getsubproblemlist{}}
+ {&\ref{\getexerciseconfig{labelsubproblem}{#1}}}
+&\ref{prob:\problemtag}\\\hline
+\getexerciseconfig{termpoints}
+\exerciseloop{\getsubproblemlist{}}{&\extractpoints{\getsubproblempoints{#1}}}
+&\extractpoints{\getproblempoints{}}
+\\
+extra
+\exerciseloop{\getsubproblemlist{}}{&\extractpoints*{\getsubproblempoints{#1}}}
+&\extractpoints*{\getproblempoints{}}
+\end{tabular}
+
This problem deals with sums and series.
\begin{subproblem}[points=2,difficulty=simple,label={\problemtag-simplesum}]
@@ -215,6 +268,44 @@ This is beyond the scope of this example.
\marginpar{\footnotesize\raggedright does not fit here.\par}
\end{solution}
+\ifsolutions\else
+\textbf{Grading:}\par
+\exerciseloopstr{\getproblemlist{}}{|c}
+\begin{tabular}{|c|\exerciseloopret||c|}\hline
+\getexerciseconfig{termsheet} \ref{sheet5}
+\exerciseloop{\getproblemlist{*}}
+ {&\ref{\getexerciseconfig{labelproblem}{#1}}}
+&total
+\\\hline
+value
+\exerciseloop{\getproblemlist{*}}
+ {&\extractpoints{\getproblempoints{#1}}}%
+&\extractpoints{\getsheetpoints{}}
+\\\hline
+\exerciseloop{\getproblemlist{*}}{&}
+&\\\hline
+\end{tabular}\qquad
+\exerciseloop{\getproblemlist{*}}{
+ \exerciseloopstr{\getsubproblemlist{#1}}{|c}
+ \ifnum\value{exerciseloop}>0\relax
+ \begin{tabular}{|c|\exerciseloopret||c|}\hline
+ \getexerciseconfig{termproblem} \ref{\getexerciseconfig{labelproblem}{#1}}
+ \exerciseloop{\getsubproblemlist{#1}}
+ {&\ref{\getexerciseconfig{labelsubproblem}{##1}}}
+ &total
+ \\\hline
+ value
+ \exerciseloop{\getsubproblemlist{#1}}
+ {&\extractpoints{\getsubproblempoints{##1}}}%
+ &\extractpoints{\getproblempoints{#1}}
+ \\\hline
+ \exerciseloop{\getsubproblemlist{#1}}{&}
+ &\\\hline
+ \end{tabular}\quad
+ \fi
+}
+\fi
+
\end{sheet}
\end{document}
diff --git a/Master/texmf-dist/doc/latex/exframe/exfser01.tex b/Master/texmf-dist/doc/latex/exframe/exfser01.tex
index 2e563eb552e..9c840aee92b 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfser01.tex
+++ b/Master/texmf-dist/doc/latex/exframe/exfser01.tex
@@ -28,10 +28,19 @@
\begin{mpostfig}[label={\problemtag-fig}]
interim xu:=1.5cm;
paths[1]:=fullcircle scaled 1xu;
-fill paths[1] withgreyscale 0.7;
-draw paths[1] withpen pencircle scaled 1pt;
+fillshape(paths[1], 0.7white) pensize(1pt);
label(btex \figure etex, center(paths[1]));
\end{mpostfig}
+\begin{onlysolutions}
+\begin{mpostfig}[label={\problemtag-solfig}]
+interim xu:=1.5cm;
+paths[1]:=fullcircle scaled 1xu;
+paths[2]:=((subpath (-2,2) of paths[1])--cycle) shifted (+0.5xu,0);
+paths[3]:=((subpath (2,6) of paths[1])--cycle) shifted (-0.5xu,0);
+fillshape(paths[2], 0.7white) pensize(1pt);
+fillshape(paths[3], 0.7white) pensize(1pt);
+\end{mpostfig}
+\end{onlysolutions}
\fi
\lorem
@@ -46,6 +55,10 @@ label(btex \figure etex, center(paths[1]));
\begin{solution}
\lorem
+\begin{center}
+\ifdefined\mpostuse\mpostuse{\problemtag-solfig}\else figure\fi
+\end{center}
+\lorem
\end{solution}
\begin{subproblem}
diff --git a/Master/texmf-dist/doc/latex/exframe/exfser02.tex b/Master/texmf-dist/doc/latex/exframe/exfser02.tex
index e355ae852e2..7bb5bd86861 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfser02.tex
+++ b/Master/texmf-dist/doc/latex/exframe/exfser02.tex
@@ -26,10 +26,19 @@
\begin{mpostfig}[label={\problemtag-fig}]
interim xu:=1.5cm;
paths[1]:=fullcircle scaled 1xu;
-fill paths[1] withgreyscale 0.7;
-draw paths[1] withpen pencircle scaled 1pt;
+fillshape(paths[1], 0.7white) pensize(1pt);
label(btex \figure etex, center(paths[1]));
\end{mpostfig}
+\begin{onlysolutions}
+\begin{mpostfig}[label={\problemtag-solfig}]
+interim xu:=1.5cm;
+paths[1]:=fullcircle scaled 1xu;
+paths[2]:=((subpath (-2,2) of paths[1])--cycle) shifted (+0.5xu,0);
+paths[3]:=((subpath (2,6) of paths[1])--cycle) shifted (-0.5xu,0);
+fillshape(paths[2], 0.7white) pensize(1pt);
+fillshape(paths[3], 0.7white) pensize(1pt);
+\end{mpostfig}
+\end{onlysolutions}
\fi
\lorem
@@ -44,6 +53,10 @@ label(btex \figure etex, center(paths[1]));
\begin{solution}
\lorem
+\begin{center}
+\ifdefined\mpostuse\mpostuse{\problemtag-solfig}\else figure\fi
+\end{center}
+\lorem
\end{solution}
\begin{subproblem}
diff --git a/Master/texmf-dist/doc/latex/exframe/exfseraa.tex b/Master/texmf-dist/doc/latex/exframe/exfseraa.tex
index c80dbf46475..4f4117c949b 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfseraa.tex
+++ b/Master/texmf-dist/doc/latex/exframe/exfseraa.tex
@@ -26,10 +26,19 @@
\begin{mpostfig}[label={\problemtag-fig}]
interim xu:=1.5cm;
paths[1]:=fullcircle scaled 1xu;
-fill paths[1] withgreyscale 0.7;
-draw paths[1] withpen pencircle scaled 1pt;
+fillshape(paths[1], 0.7white) pensize(1pt);
label(btex \figure etex, center(paths[1]));
\end{mpostfig}
+\begin{onlysolutions}
+\begin{mpostfig}[label={\problemtag-solfig}]
+interim xu:=1.5cm;
+paths[1]:=fullcircle scaled 1xu;
+paths[2]:=((subpath (-2,2) of paths[1])--cycle) shifted (+0.5xu,0);
+paths[3]:=((subpath (2,6) of paths[1])--cycle) shifted (-0.5xu,0);
+fillshape(paths[2], 0.7white) pensize(1pt);
+fillshape(paths[3], 0.7white) pensize(1pt);
+\end{mpostfig}
+\end{onlysolutions}
\fi
\lorem
@@ -44,6 +53,10 @@ label(btex \figure etex, center(paths[1]));
\begin{solution}
\lorem
+\begin{center}
+\ifdefined\mpostuse\mpostuse{\problemtag-solfig}\else figure\fi
+\end{center}
+\lorem
\end{solution}
\begin{subproblem}
diff --git a/Master/texmf-dist/doc/latex/exframe/exfserm.tex b/Master/texmf-dist/doc/latex/exframe/exfserm.tex
index aa96b3da0fe..356a36fcf3f 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfserm.tex
+++ b/Master/texmf-dist/doc/latex/exframe/exfserm.tex
@@ -17,16 +17,17 @@
%% version 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}[1996/12/01]
-\ProvidesFile{exfserm.tex}[2020/01/11 v3.31 multipart sample for exframe]
+\ProvidesFile{exfserm.tex}[2020/02/24 v3.4 multipart sample for exframe]
\input{childdoc.def}
\childdocmain{exfserm}
-\providecommand{\draftver}{y}
\ifchilddoc
\providecommand{\printsol}{y}
\else
\providecommand{\printsol}{n}
\fi
+\providecommand{\draftver}{y}
+\newif\ifdraft\if\draftver y\drafttrue\else\draftfalse\fi
\documentclass[12pt]{article}
@@ -35,7 +36,14 @@
\PassOptionsToPackage{bookmarks=\ifchilddoc false\else true\fi}{hyperref}
\PassOptionsToPackage{bookmarksopen=true}{hyperref}
\RequirePackage{hyperref}
-\IfFileExists{hyperxmp.sty}{\RequirePackage{hyperxmp}}{}
+
+\ifdraft
+\PassOptionsToPackage{draft}{metastr}
+\fi
+\IfFileExists{hyperxmp.sty}{}{\PassOptionsToPackage{hyperxmp=false}{metastr}}
+\RequirePackage[course]{metastr}
+\metaset[aux]{writepdf}{}
+\metaset[rights]{writepdf}{}
\RequirePackage[extdata,extstyle]{exframe}
@@ -45,6 +53,9 @@
\else
\exercisesetup{solutions=true}
\exercisesetup{twoside=false}
+\ifdraft
+\exercisesetup{solutionbuf=false}
+\fi
\fi
%%\if\printsol n\else\showprobleminfo{author,source,recycle}\fi
@@ -57,6 +68,13 @@
\exercisestyle{solutionbelow={problem}}
\ifchilddoc\ifchilddocmanual\else\exercisesetup{pdfdata=sheet}\fi\fi
+\metasetlang{en-GB}
+
+\metasetterm[en]{sheet}{sheet}
+\metasetterm[en]{sheets}{sample sheets}
+\metasetterm[en]{solution}{Solution}
+\metasetterm[en]{solutions}{solutions}
+
\RequirePackage[a4paper,margin=2.5cm]{geometry}
\pagestyle{plain}
\setlength\parindent{0pt}
@@ -86,9 +104,8 @@
\ifdefined\mpostsetup
\mpostsetup{checksum}
-\if\draftver y\mpostsetup{now,nowall}\fi
+\ifchilddoc\ifdraft\mpostsetup{now,nowall}\fi\fi
\ifchilddocmanual\else\mpostsetup{numberwithin={sheet}}\fi
-\ifsolutions\else\mpostsetup{warnunused=false}\fi
\mpostsetup{globaldef=true}
\begin{mposttex}
@@ -98,73 +115,52 @@
path paths[];
newinternal numeric xu;
xu:=1cm;
+def pensize(expr s)=withpen pencircle scaled s enddef;
+def fillshape(expr p,c)=
+ fill p withcolor c;
+ draw p
+enddef;
\end{mpostdef}
\mpostsetup{globaldef=false}
\fi
-\exercisedata{course={exframe package samples}}
-\exercisedata{instructor={N.\ Beisert}}
-\exercisedata{institution={exframe academy}}
-\exercisedata{period={spring 2019}}
-\exercisedata{date={2019}}
+\metaset{course}{exframe package samples}
+\metaset{instructor}{N.\ Beisert}
+\metaset{author}{Niklas Beisert, \metapick[#1]{institution}}
+\metaset{institution}{exframe academy}
+\metaset{period}{spring 2019}
+\metaset{copyrightdate}{2019--2020}
-\exercisedata{material={\ifsolutions\getexerciseconfig{termsolutions}%
- \else\getexerciseconfig{termsheets}\fi}}
+\metaset{material}{\metatranslate[#1]{sheets}}
\exerciseconfig{composetitlesheet}[2]{\exerciseifempty{#2}%
- {\ifsolutions\getexerciseconfig{termsolutions}\else%
- \getexerciseconfig{termsheet}\fi\ #1}%
- {\ifsolutions\getexerciseconfig{termsolutions}\fi\ #2}}
-\exerciseconfig{composemetasheet}[2]{\if\draftver yDRAFT: \fi%
- \getexercisedata{course},
- \getexerciseconfig{composetitlesheet}{#1}{#2}}
-
-\exercisedata{title={\if\draftver yDRAFT: \fi%
- \getexercisedata{course}, \getexercisedata{material}}}
-\exercisedata{author={Niklas Beisert, \getexercisedata{institution}}}
-\exercisedata{subject={lecture series at \getexercisedata{institution},
- \getexercisedata{period}}}
-
-\exerciseconfig{termsheet}{sheet}
-\exerciseconfig{termsheets}{sample sheets}
-\exerciseconfig{termsolution}{Solution}
-\exerciseconfig{termsolutions}{solutions}
-
-\def\copyrightmessage
- {This document as well as its parts is protected by copyright.}
-\def\licensemessage
- {Reproduction of any part of this work in any form
- without prior written consent of \getexercisedata{institution}
- is not permissible.}
-
-\ifsolutions\else\if\draftver y\else
-\def\licensecctype{by-sa}
-\def\licenseccname{Attribution-ShareAlike \licenseccver{} International}
-\fi\fi
+ {\ifsolutions\metaterm{solutions}\else%
+ \metaterm{sheet}\fi\ #1}%
+ {\ifsolutions\metaterm{solutions} \fi #2}}
-\ifdefined\licensecctype
-\ifdefined\licenseccver\else\def\licenseccver{4.0}\fi
-\def\licenseurl
- {https://creativecommons.org/licenses/\licensecctype/\licenseccver}
-\def\licensemessage{\texorpdfstring
- {This work is licensed under the Creative Commons ``\licenseccname'' License
- (CC \MakeUppercase{\licensecctype} \licenseccver).\par
- \IfFileExists{doclicense.sty}{
- \begin{center}\includegraphics{doclicense-CC-\licensecctype}\end{center}}{}
- To view a copy of this license, visit: \url{\licenseurl}}
- {This work is licensed under the Creative Commons \licenseccname{} License.}}
+\ifchilddoc
+\metaset{partof}{\metatranslate[#1]{sheets} \metapick[#1]{course}}
\fi
-\ifdefined\xmptilde
-\hypersetup{pdfcopyright={Copyright \getexercisedata{date}
- \getexercisedata{author}. \copyrightmessage{} \licensemessage}}
-\ifdefined\sourceurl\hypersetup{pdflicenseurl={\sourceurl}}\else
-\ifdefined\licenseurl\hypersetup{pdflicenseurl={\licenseurl}}\fi\fi
-\hypersetup{keeppdfinfo=true}
-\hypersetup{pdfsource={}}
-\XMPLangAlt{en}{pdfcopyright={Copyright \getexercisedata{date}
- \getexercisedata{author}. \copyrightmessage{} \licensemessage}}
+\metaset[sep]{draft}{ -- }
+\metaset[sep]{subtitle}{, }
+\metaset{subtitle}{\ifsolutions\metatranslate[#1]{solutions} \fi%
+ \metaif[use]{sheettitle}{\metapick[#1]{sheettitle}}{\metapick[#1]{material}}}
+\metaset{subject}{Lecture Series,
+ \metapick[#1]{institution}, \metapick[#1]{period}}
+
+\metaset{copyrightowner}{\metapick[#1]{author}}
+\ifchilddoc
+\metacopyright{doc}
+\else
+\metacopyright{doc-parts}
\fi
+\metaset{licenseprovider}{of \metapick[#1]{institution}}
+\metalicense{consent}
+
+\ifsolutions\else\ifdraft\else
+\metalicensecc{by-sa}
+\fi\fi
\begin{document}
@@ -178,40 +174,27 @@ xu:=1cm;
\begingroup\ifchilddoc\else
\renewcommand{\thepage}{\arabic{page}}
-\pdfbookmark[1]{Title Page}{title}
+\pdfbookmark[1]{\metaterm{title}}{title}
\thispagestyle{empty}
\vspace*{\fill}
\begin{center}
-\begingroup\bfseries\LARGE\getexercisedata{course}\par\endgroup
-\vspace{0.5cm}
-\begingroup\large\getexercisedata{material}\par\endgroup
-\vspace{0.5cm}
-\begingroup\large\getexercisedata{institution},
- \getexercisedata{period}\par\endgroup
-\vspace{2cm}
-\begingroup\scshape\Large\getexercisedata{instructor}\par\endgroup
+\metapick[course]{titletext}
\end{center}
\vspace*{\fill}\vspace*{\fill}
\newpage
-\phantomsection\pdfbookmark[1]{Copyright}{copyright}
+\phantomsection\pdfbookmark[1]{\metaterm{copyright}}{copyright}
\thispagestyle{empty}
\vspace*{\fill}\vspace*{\fill}
-\begin{center}
-\begin{minipage}{11cm}\raggedright
-{\copyright} \getexercisedata{date} \getexercisedata{author}
-\par\medskip
-\copyrightmessage{}
-\licensemessage
-\ifdefined\sourcemessage\par\medskip\sourcemessage\fi
-\ifdefined\attributionmessage\par\medskip\attributionmessage\fi
+\begin{center}\begin{minipage}{11cm}\raggedright
+\metapick[print]{rightstext}
\end{minipage}\end{center}
\vspace*{\fill}\vspace*{\fill}\vspace*{\fill}
\newpage
\makeatletter\renewcommand\@pnumwidth{2.4em}\makeatother
\setcounter{tocdepth}{2}
-\phantomsection\pdfbookmark[1]{Contents}{contents}
+\phantomsection\pdfbookmark[1]{\metaterm{contents}}{contents}
{\parskip0pt\tableofcontents}
\exercisecleardoublepage\setcounter{page}{1}
diff --git a/Master/texmf-dist/doc/latex/exframe/exfsermk.mak b/Master/texmf-dist/doc/latex/exframe/exfsermk.mak
index f6b9f3800b4..b3a5822abf7 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfsermk.mak
+++ b/Master/texmf-dist/doc/latex/exframe/exfsermk.mak
@@ -11,7 +11,8 @@ 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)*
+BAKFILES = $(PREREQS) $(SRCSECFILES) $(GENFILES)\
+ $(MAKEFILE) $(SCRIPT) $(SRCPRB)*
default: sheets ;
main: $(TRGMAINFILES) ;
@@ -35,7 +36,8 @@ clean:
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 $(foreach ext,.mp .mpx -*.mps,$(SRCMAIN)$(ext))
+ rm -f $(foreach ext,-tmp.log -tmp.mp -tmp.mpx,$(SRCMAIN)$(ext))
rm -f mpxerr.tex mpxerr.log mpxerr.dvi texput.log
rm -f $(patsubst %,$(SRCPRB)*%,.aux .log .mp .mpx -*.mps)
rm -f $(patsubst %,$(SRCPRB)*%,-tmp.log -tmp.mp -tmp.mpx)
diff --git a/Master/texmf-dist/doc/latex/exframe/exfsermk.sh b/Master/texmf-dist/doc/latex/exframe/exfsermk.sh
index a92683034a8..2117a0a1260 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfsermk.sh
+++ b/Master/texmf-dist/doc/latex/exframe/exfsermk.sh
@@ -62,7 +62,7 @@ function docompile
fwd="\\childdocforward[$srcmain]{$srcsec$num}"
fi
body="\\def\\jobname{$job}$optdef\\input{childdoc.def}$fwd"
- for pass in first main
+ for pass in first main extra
do
par="";
if [[ "$pass" == "first" ]]; then par="-draftmode"; fi
@@ -71,7 +71,8 @@ function docompile
pdflatex -shell-escape -interaction=batchmode $par \
-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
+ if ! (grep -E -q "may have changed|rerunfilecheck Warning" "$trg.log")
+ then break; fi
done
grep -E "^! |Warning|Error|Undefined|Overfull|Underfull" "$trg.log"
}
diff --git a/Master/texmf-dist/doc/latex/exframe/exfserpe.tex b/Master/texmf-dist/doc/latex/exframe/exfserpe.tex
index 8c4aa9f2832..87b00bf6f82 100644
--- a/Master/texmf-dist/doc/latex/exframe/exfserpe.tex
+++ b/Master/texmf-dist/doc/latex/exframe/exfserpe.tex
@@ -25,10 +25,19 @@
\begin{mpostfig}[label={\problemtag-fig}]
interim xu:=1.5cm;
paths[1]:=fullcircle scaled 1xu;
-fill paths[1] withgreyscale 0.7;
-draw paths[1] withpen pencircle scaled 1pt;
+fillshape(paths[1], 0.7white) pensize(1pt);
label(btex \figure etex, center(paths[1]));
\end{mpostfig}
+\begin{onlysolutions}
+\begin{mpostfig}[label={\problemtag-solfig}]
+interim xu:=1.5cm;
+paths[1]:=fullcircle scaled 1xu;
+paths[2]:=((subpath (-2,2) of paths[1])--cycle) shifted (+0.5xu,0);
+paths[3]:=((subpath (2,6) of paths[1])--cycle) shifted (-0.5xu,0);
+fillshape(paths[2], 0.7white) pensize(1pt);
+fillshape(paths[3], 0.7white) pensize(1pt);
+\end{mpostfig}
+\end{onlysolutions}
\fi
\lorem
@@ -43,6 +52,10 @@ label(btex \figure etex, center(paths[1]));
\begin{solution}
\lorem
+\begin{center}
+\ifdefined\mpostuse\mpostuse{\problemtag-solfig}\else figure\fi
+\end{center}
+\lorem
\end{solution}
\begin{subproblem}