summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/ccfonts/README (renamed from macros/latex/contrib/ccfonts/readme)6
-rw-r--r--macros/latex/contrib/ccfonts/ccfonts.dtx43
-rw-r--r--macros/latex/contrib/ccfonts/ccfonts.pdfbin201048 -> 195982 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/CHANGES9
-rw-r--r--macros/latex/contrib/glossaries-extra/README2
-rw-r--r--macros/latex/contrib/glossaries-extra/glossaries-extra-code.pdfbin1374903 -> 1374458 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/glossaries-extra-manual.html4
-rw-r--r--macros/latex/contrib/glossaries-extra/glossaries-extra-manual.pdfbin801554 -> 801550 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/glossaries-extra-manual.tex4
-rw-r--r--macros/latex/contrib/glossaries-extra/glossaries-extra.dtx57
-rw-r--r--macros/latex/contrib/glossaries-extra/glossaries-extra.ins2
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.pdfbin537720 -> 537732 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-abbrv.pdfbin44741 -> 44753 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-accsupp.pdfbin82831 -> 82844 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-acronym-desc.pdfbin50351 -> 50363 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-acronym.pdfbin36728 -> 36739 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-alias.pdfbin43857 -> 43869 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-altmodifier.pdfbin35289 -> 35301 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-alttree-marginpar.pdfbin90983 -> 90995 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-alttree-sym.pdfbin69521 -> 69534 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-alttree.pdfbin54908 -> 54920 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-autoindex-hyp.pdfbin141502 -> 141398 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-autoindex.pdfbin161049 -> 160937 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-crossref.pdfbin41274 -> 41287 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-crossref2.pdfbin41603 -> 41613 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-docdef.pdfbin45244 -> 45256 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-entrycount.pdfbin54604 -> 54617 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-external.pdfbin34170 -> 34181 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-fmt.pdfbin75247 -> 75259 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-footnote.pdfbin63214 -> 63227 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-header.pdfbin125901 -> 125913 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-indexhook.pdfbin42710 -> 42721 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-initialisms.pdfbin81573 -> 81588 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-linkcount.pdfbin38218 -> 38230 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-mixed-abbrv-styles.pdfbin57809 -> 57823 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.pdfbin45142 -> 45155 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-mixture.pdfbin159470 -> 159361 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-name-font.pdfbin224726 -> 224741 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-nested.pdfbin67720 -> 67732 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-noidx-restricteddocdefs.pdfbin47573 -> 47583 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-onelink.pdfbin44500 -> 44513 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-onthefly-utf8.pdfbin106052 -> 106065 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-onthefly-xetex.pdfbin19640 -> 19644 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-onthefly.pdfbin43470 -> 43482 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-pages.pdfbin38791 -> 38802 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-postdot.pdfbin37045 -> 37059 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-postlink.pdfbin67872 -> 67884 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-prefix.pdfbin33107 -> 33119 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-record-nameref.pdfbin71295 -> 71307 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-record.pdfbin50214 -> 50225 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-restricteddocdefs.pdfbin47883 -> 47895 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-suppl-hyp.pdfbin34925 -> 34937 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-suppl-main-hyp.pdfbin46383 -> 46396 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-suppl-main.pdfbin31596 -> 31607 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-suppl.pdfbin13411 -> 13423 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-trans.pdfbin49436 -> 49449 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-undef.pdfbin33215 -> 33226 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.pdfbin61037 -> 61049 bytes
-rw-r--r--macros/latex/contrib/glossaries-extra/samples/sample.pdfbin45727 -> 45741 bytes
-rw-r--r--macros/latex/contrib/iodhbwm/README.md21
-rw-r--r--macros/latex/contrib/iodhbwm/doc/iodhbwm.pdfbin633935 -> 624361 bytes
-rw-r--r--macros/latex/contrib/iodhbwm/doc/iodhbwm.tex23
-rw-r--r--macros/latex/contrib/iodhbwm/tex/i18n.def36
-rw-r--r--macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-declaration.def37
-rw-r--r--macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-ba.def57
-rw-r--r--macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-pa.def59
-rw-r--r--macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-sa.def59
-rw-r--r--macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage.def55
-rw-r--r--macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-declaration.def (renamed from macros/latex/contrib/iodhbwm/tex/dhbw-declaration.def)0
-rw-r--r--macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage-ba.def (renamed from macros/latex/contrib/iodhbwm/tex/dhbw-titlepage-ba.def)4
-rw-r--r--macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage-pa.def (renamed from macros/latex/contrib/iodhbwm/tex/dhbw-titlepage-pa.def)2
-rw-r--r--macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage-sa.def (renamed from macros/latex/contrib/iodhbwm/tex/dhbw-titlepage-sa.def)2
-rw-r--r--macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage.def (renamed from macros/latex/contrib/iodhbwm/tex/dhbw-titlepage.def)45
-rw-r--r--macros/latex/contrib/iodhbwm/tex/iodhbwm-templates.sty32
-rw-r--r--macros/latex/contrib/iodhbwm/tex/iodhbwm.cls6
-rw-r--r--macros/latex/required/psnfss/00readme.txt264
-rw-r--r--[l---------]macros/latex/required/psnfss/README265
-rw-r--r--macros/latex/required/psnfss/changes.txt161
-rw-r--r--macros/latex/required/psnfss/manifest.txt4
-rw-r--r--macros/latex/required/psnfss/psfonts.dtx36
-rw-r--r--macros/latex/required/psnfss/psnfss2e.pdfbin151708 -> 243463 bytes
-rw-r--r--macros/latex/required/psnfss/psnfss2e.tex172
-rw-r--r--macros/latex/required/psnfss/test1.tex4
-rw-r--r--macros/luatex/optex/README6
-rw-r--r--macros/luatex/optex/colors.opm31
-rw-r--r--macros/luatex/optex/doc/optex-doc.pdfbin163979 -> 172562 bytes
-rw-r--r--macros/luatex/optex/doc/optex-doc.tex128
-rw-r--r--macros/luatex/optex/fnotes.opm14
-rw-r--r--macros/luatex/optex/fonts-opmac.opm3
-rw-r--r--macros/luatex/optex/graphics.opm249
-rw-r--r--macros/luatex/optex/lists.opm29
-rw-r--r--macros/luatex/optex/makeindex.opm12
-rw-r--r--macros/luatex/optex/multicolumns.opm10
-rw-r--r--macros/luatex/optex/op-slides.tex20
-rw-r--r--macros/luatex/optex/optex.ini4
-rw-r--r--macros/luatex/optex/others.opm5
-rw-r--r--macros/luatex/optex/output.opm15
-rw-r--r--macros/luatex/optex/parameters.opm29
-rw-r--r--macros/luatex/optex/sections.opm58
-rw-r--r--macros/luatex/optex/slides.opm6
-rw-r--r--macros/luatex/optex/styles.opm4
-rw-r--r--macros/luatex/optex/verbatim.opm4
102 files changed, 1455 insertions, 643 deletions
diff --git a/macros/latex/contrib/ccfonts/readme b/macros/latex/contrib/ccfonts/README
index 74e92756a6..561711effc 100644
--- a/macros/latex/contrib/ccfonts/readme
+++ b/macros/latex/contrib/ccfonts/README
@@ -2,10 +2,10 @@
* LaTeX support for the Concrete fonts *
* *
* cc.fdd: 1999/11/22 v1.0a *
-* ccfonts.dtx: 2000/06/30 v1.1 *
+* ccfonts.dtx: 2020/03/25 v1.2 *
* *
************************************************************
-Copyright (c) Walter Schmidt 1997--2000
+Copyright (c) Walter Schmidt 1997--2020
This program may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -22,6 +22,8 @@ ccfonts.ins.
What's new?
===========
+2020/03/25: (UF) adapted boldsans version to new LaTeX handling of series defaults.
+ see https://github.com/latex3/latex2e/issues/299
2000/05/30: bug fix wrt/ amsfonts.sty
diff --git a/macros/latex/contrib/ccfonts/ccfonts.dtx b/macros/latex/contrib/ccfonts/ccfonts.dtx
index 2480f1f986..5135d128ac 100644
--- a/macros/latex/contrib/ccfonts/ccfonts.dtx
+++ b/macros/latex/contrib/ccfonts/ccfonts.dtx
@@ -1,4 +1,4 @@
-%\CheckSum{144}
+%\CheckSum{146}
%
% \iffalse meta comment
%
@@ -23,9 +23,9 @@
\ProvidesFile{ccfonts.drv}
%</driver>
%<package>\ProvidesPackage{ccfonts}
- [2000/06/30 v1.1 (WaS)]
+ [2020/03/25 v1.2 (WaS)]
%
-%<*driver>
+%<*driver>
\documentclass[11pt]{ltxdoc}
\usepackage{mflogo,url}
\CodelineNumbered
@@ -38,7 +38,7 @@
% \GetFileInfo{ccfonts.drv}
% \DeleteShortVerb{\|}
% \MakeShortVerb{\+}
-%
+%
% \title{The \LaTeXe{} package \texttt{ccfonts}}
% \author{Walter Schmidt\thanks{\texttt{walter.schmidt@arcormail.de}}}
% \date{(\fileversion{} -- \filedate)}
@@ -57,7 +57,7 @@
% (CTAN: \path{fonts/concmath/})
% \item The +.fd+ files for the traditional and mathematical
% Concrete fonts (CTAN: \path{macros/latex/contrib/supported/concmath/})
-% \item The +.fd+ files for the European Concrete fonts,
+% \item The +.fd+ files for the European Concrete fonts,
% which are distributed and installed in conjunction
% with the +ccfonts+ package
% \end{itemize}
@@ -68,7 +68,7 @@
%
%
% \section{Using the package}
-% The \LaTeX{} macro package +ccfonts+
+% The \LaTeX{} macro package +ccfonts+
% supports typesetting with the font family `Concrete'.
% Loading this package through
% \begin{verse}
@@ -86,7 +86,7 @@
%
% Notice that you may still have to specify the option +psamsfonts+
% for these packages, so as to prevent them from using design sizes
-% of the Euler Fraktur fonts, which may be
+% of the Euler Fraktur fonts, which may be
% unavailable within your TeX system; this works flawlessly with
% version 1.1 of the +ccfonts+ package now. (You need not care for this
% subject, unless Euler Fraktur is actually used.)
@@ -97,12 +97,12 @@
% \begin{description}
% \oitem{boldsans} The semibold series of CM Sans is used
% as a replacement for the missing bold series of Concrete.
-% (The default behaviour is to use the bold extended version of
+% (The default behaviour is to use the bold extended version of
% CM Roman.)
% \oitem{standard-baselineskips} disables the increased leading.
% This can be useful, e.g., when typesetting in narrow columns.
% \oitem{exscale} implements scaling of the math extension font.
-% For a discussion of this feature see the file +exscale.dtx+.
+% For a discussion of this feature see the file +exscale.dtx+.
% \oitem{slantedGreek} makes uppercase Greek letters slanted by default.
% Regardless of this option, the new commands +\upDelta+ and +\upOmega+
% will always produce an upright \( \Delta \) and \( \Omega \).
@@ -123,7 +123,7 @@
% There are no bold math fonts available.
% \item
% In order to enlarge the default +\baselineskip+, the size-changing
-% macros have been redefined, and they are no longer as robust as the
+% macros have been redefined, and they are no longer as robust as the
% original definitions. This may result in \LaTeX\ errors with
% `moving arguments'. As a workaround, you may protect any font-related
% commands in moving arguments with a +\protect+ command. In case this
@@ -148,14 +148,14 @@
% OMX & ccex & m & n \\ \hline \hline
% \multicolumn{4}{|c|}{\textit{Concrete AMS A, B}}\\ \hline
% U & msa & m & n \\ \hline
-% U & msb & m & n \\ \hline
+% U & msb & m & n \\ \hline
% \end{tabular}
% \end{center}
-% Notice, that
+% Notice, that
% \begin{itemize}
% \item the series c (condensed) is available as slanted
% and with a font size of 9\,pt only;
-% \item the Concrete AMS fonts are only defined
+% \item the Concrete AMS fonts are only defined
% through the package \textsf{ccfonts},
% i.e., there are no related \texttt{.fd} files.
% \end{itemize}
@@ -217,7 +217,7 @@
% \end{macrocode}
%
% \subsubsection{The option \texttt{exscale}}
-% The code is simply copied from \texttt{exscale.sty},
+% The code is simply copied from \texttt{exscale.sty},
% with \texttt{xccex} instead of \texttt{cmex}.
% \begin{macrocode}
\DeclareOption{exscale}{
@@ -262,7 +262,9 @@
% \subsection{The option \texttt{boldsans}}
% \begin{macrocode}
\DeclareOption{boldsans}{%
- \renewcommand{\bfdefault}{sbc}}
+ \@ifundefined{DeclareFontSeriesDefault}{%
+ \renewcommand{\bfdefault}{sbc}}{%
+ \DeclareFontSeriesDefault[rm]{bf}{sbc}}}
% \end{macrocode}
%
% \subsubsection{Processing options}
@@ -282,10 +284,10 @@
% \end{macrocode}
%
% In case the package +amsfonts+ is loaded additionally,
-% we must ensure that the Concrete versions of the
+% we must ensure that the Concrete versions of the
% AMS symbol fonts are used. We execute the font definitions
-% AtBeginDocument, so that loading +amsfonts+ with the
-% option +psamsfonts+ cannot do any harm. Notice that the option may
+% AtBeginDocument, so that loading +amsfonts+ with the
+% option +psamsfonts+ cannot do any harm. Notice that the option may
% be required for getting the Euler Fraktur fonts right.
% \begin{macrocode}
\AtBeginDocument{
@@ -294,13 +296,13 @@
<5><6><7><8><9><10>gen*xccam%
<10.95><12><14.4><17.28><20.74><24.88>xccam10}{}
\DeclareFontFamily{U}{msb}{}
- \DeclareFontShape{U}{msb}{m}{n}{%
+ \DeclareFontShape{U}{msb}{m}{n}{%
<5><6><7><8><9><10>gen*xccbm%
<10.95><12><14.4><17.28><20.74><24.88>xccbm10}{}
}
% \end{macrocode}
%
-%
+%
% \subsection{Initialization}
% We ensure that any package loaded after \texttt{ccfonts}
% will find the new value of +\baselineskip+.
@@ -331,4 +333,3 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
%%
-
diff --git a/macros/latex/contrib/ccfonts/ccfonts.pdf b/macros/latex/contrib/ccfonts/ccfonts.pdf
index f55e83e5c3..ec8997b00f 100644
--- a/macros/latex/contrib/ccfonts/ccfonts.pdf
+++ b/macros/latex/contrib/ccfonts/ccfonts.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/CHANGES b/macros/latex/contrib/glossaries-extra/CHANGES
index 3972b207c4..ea884160d6 100644
--- a/macros/latex/contrib/glossaries-extra/CHANGES
+++ b/macros/latex/contrib/glossaries-extra/CHANGES
@@ -1,3 +1,12 @@
+1.45 (2020-04-01):
+
+ * glossaries-extra-stylemods.sty:
+
+ - Bug fix: removed duplication of description in treenoname style
+
+ - New command: \glstreenonameChildDescLoc
+
+
1.44 (2020-03-23):
* glossaries-extra.sty:
diff --git a/macros/latex/contrib/glossaries-extra/README b/macros/latex/contrib/glossaries-extra/README
index 6710e081c8..8c1893e335 100644
--- a/macros/latex/contrib/glossaries-extra/README
+++ b/macros/latex/contrib/glossaries-extra/README
@@ -1,4 +1,4 @@
-LaTeX Package : glossaries-extra v1.44 (2020-03-23)
+LaTeX Package : glossaries-extra v1.45 (2020-04-01)
Author : Nicola Talbot
https://www.dickimaw-books.com/contact
diff --git a/macros/latex/contrib/glossaries-extra/glossaries-extra-code.pdf b/macros/latex/contrib/glossaries-extra/glossaries-extra-code.pdf
index 48d6bff21e..a7bac16a1d 100644
--- a/macros/latex/contrib/glossaries-extra/glossaries-extra-code.pdf
+++ b/macros/latex/contrib/glossaries-extra/glossaries-extra-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.html b/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.html
index d0813adde4..a01186aa3d 100644
--- a/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.html
+++ b/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.html
@@ -219,7 +219,7 @@ a span.HoLogo-TeX span.HoLogo-e{text-decoration:none;}
>
<!--l. 235--><p class="noindent" >
</p><!--l. 235--><p class="noindent" ><span
-class="cmr-17">glossaries-extra.sty v1.44: an extension to the</span>
+class="cmr-17">glossaries-extra.sty v1.45: an extension to the</span>
<span
class="cmr-17">glossaries package</span>
</p>
@@ -243,7 +243,7 @@ href="http://www.dickimaw-books.com/" class="url" ><span
class="cmtt-12">http://www.dickimaw-books.com/</span></a></td></tr></table>
</div>
<!--l. 235--><p class="noindent" ><span
-class="cmr-12">2020-03-23</span></p></div>
+class="cmr-12">2020-04-01</span></p></div>
<div
class="abstract"
>
diff --git a/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.pdf b/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.pdf
index c0a595de52..e72737a6dd 100644
--- a/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.pdf
+++ b/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.tex b/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.tex
index b720b1aaa0..0920f2ff4c 100644
--- a/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.tex
+++ b/macros/latex/contrib/glossaries-extra/glossaries-extra-manual.tex
@@ -225,13 +225,13 @@ styles (glossaries):>#1={\protect\ttfamily#1}|main}}
\DeleteShortVerb{\|}
\MakeShortVerb{"}
- \title{glossaries-extra.sty v1.44:
+ \title{glossaries-extra.sty v1.45:
an extension to the glossaries package}
\author{Nicola L.C. Talbot\\[10pt]
Dickimaw Books\\
\url{http://www.dickimaw-books.com/}}
- \date{2020-03-23}
+ \date{2020-04-01}
\maketitle
\begin{abstract}
diff --git a/macros/latex/contrib/glossaries-extra/glossaries-extra.dtx b/macros/latex/contrib/glossaries-extra/glossaries-extra.dtx
index c2dcfe0ecb..b9f90f6ca8 100644
--- a/macros/latex/contrib/glossaries-extra/glossaries-extra.dtx
+++ b/macros/latex/contrib/glossaries-extra/glossaries-extra.dtx
@@ -1,6 +1,12 @@
%\iffalse
% glossaries-extra.dtx generated using makedtx version 1.2 (c) Nicola Talbot
% Command line args:
+% -setambles ".*\.bib=>\nopreamble\nopostamble"
+% -section "chapter"
+% -doc "glossaries-extra-codedoc.tex"
+% -author "Nicola Talbot"
+% -macrocode ".*\.tex"
+% -macrocode ".*\.bib"
% -src "glossaries-extra.sty\Z=>glossaries-extra.sty"
% -src "glossaries-extra-bib2gls.sty\Z=>glossaries-extra-bib2gls.sty"
% -src "glossaries-extra-stylemods.sty\Z=>glossaries-extra-stylemods.sty"
@@ -9,17 +15,11 @@
% -src "glossary-topic.sty\Z=>glossary-topic.sty"
% -src "(example-glossaries-.+\.tex)\Z=>\1"
% -src "(example-glossaries-.+\.bib)\Z=>\1"
-% -doc "glossaries-extra-codedoc.tex"
-% -section "chapter"
-% -setambles ".*\.bib=>\nopreamble\nopostamble"
% -comment ".*\.tex"
% -comment ".*\.bib"
% -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})"
-% -author "Nicola Talbot"
-% -macrocode ".*\.tex"
-% -macrocode ".*\.bib"
% glossaries-extra
-% Created on 2020/3/23 20:29
+% Created on 2020/4/1 13:56
%\fi
%\iffalse
%<*package>
@@ -142,7 +142,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\setcounter{IndexColumns}{2}
-\CheckSum{27175}
+\CheckSum{27181}
\newcommand*{\ifirstuse}{\iterm{first use}}
\newcommand*{\firstuse}{\gls{firstuse}}
@@ -182,13 +182,13 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\raggedright
}
-\title{glossaries-extra.sty v1.44:
+\title{glossaries-extra.sty v1.45:
documented code}
\author{Nicola L.C. Talbot\\[10pt]
Dickimaw Books\\
\url{http://www.dickimaw-books.com/}}
-\date{2020-03-23}
+\date{2020-04-01}
\begin{document}
\DocInput{glossaries-extra.dtx}
@@ -233,7 +233,7 @@ Dickimaw Books\\
%\section{Package Initialisation and Options}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2020/03/23 v1.44 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2020/04/01 v1.45 (NLCT)]
% \end{macrocode}
% Requires \sty{xkeyval} to define package options.
% \begin{macrocode}
@@ -25645,7 +25645,7 @@ defined}{}%
%automatically loaded by the record option.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-bib2gls}[2020/03/23 v1.44 (NLCT)]
+\ProvidesPackage{glossaries-extra-bib2gls}[2020/04/01 v1.45 (NLCT)]
% \end{macrocode}
%Provide convenient shortcut commands for predefined glossary types.
%\begin{macro}{\printunsrtacronyms}
@@ -28730,7 +28730,7 @@ defined}{}%
% First identify package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2020/03/23 v1.44 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2020/04/01 v1.45 (NLCT)]
% \end{macrocode}
% Provide package options to automatically load required predefined
% styles. The simplest method is to just test for the existence of
@@ -29800,6 +29800,14 @@ defined}{}%
}%
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\glstreenonameDescLoc}
+%\changes{1.45}{2020-04-01}{new}
+% \begin{macrocode}
+ \newcommand{\glstreenonameDescLoc}[2]{%
+ \glstreenonamedesc{#1}\glstreeprelocation#2%
+ }
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\glstreenonamechilddesc}
%\changes{1.31}{2018-05-09}{new}
%The child entry doesn't have the pre-description separator as the
@@ -29810,6 +29818,14 @@ defined}{}%
}%
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\glstreenonameChildDescLoc}
+%\changes{1.45}{2020-04-01}{new}
+% \begin{macrocode}
+ \newcommand{\glstreenonameChildDescLoc}[2]{%
+ \glstreenonamechilddesc{#1}\glstreechildprelocation#2%
+ }
+% \end{macrocode}
+%\end{macro}
% \begin{macrocode}
\renewglossarystyle{treenoname}{%
\renewenvironment{theglossary}%
@@ -29823,8 +29839,10 @@ defined}{}%
\parindent0pt\relax
\glsentryitem{##1}\glstreenamefmt{\glstarget{##1}{\glossentryname{##1}}}%
\glstreenonamesymbol{##1}%
- \glstreenonamedesc{##1}%
- \glstreeDescLoc{##1}{##2}\par
+% \end{macrocode}
+%\changes{1.45}{2020-04-01}{removed duplicate description}
+% \begin{macrocode}
+ \glstreenonameDescLoc{##1}{##2}\par
}%
\renewcommand{\subglossentry}[3]{%
\hangindent##1\glstreeindent\relax
@@ -29833,8 +29851,7 @@ defined}{}%
\glssubentryitem{##2}%
\fi
\glstarget{##2}{\strut}%
- \glstreenonamechilddesc{##2}%
- \glstreechildprelocation##3\par
+ \glstreenonameChildDescLoc{##2}{##3}\par
}%
\renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\glstreegroupskip\fi}%
}
@@ -31036,7 +31053,7 @@ defined}{}%
%\section{Package Initialisation and Options}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-bookindex}[2020/03/23 v1.44 (NLCT)]
+\ProvidesPackage{glossary-bookindex}[2020/04/01 v1.45 (NLCT)]
% \end{macrocode}
%Load required packages.
% \begin{macrocode}
@@ -31532,7 +31549,7 @@ defined}{}%
%Provides additional long styles.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-longextra}[2020/03/23 v1.44 (NLCT)]
+\ProvidesPackage{glossary-longextra}[2020/04/01 v1.45 (NLCT)]
% \end{macrocode}
%Load required packages.
% \begin{macrocode}
@@ -32961,7 +32978,7 @@ defined}{}%
%topic.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossary-topic}[2020/03/23 v1.44 (NLCT)]
+\ProvidesPackage{glossary-topic}[2020/04/01 v1.45 (NLCT)]
% \end{macrocode}
%Load required package.
% \begin{macrocode}
diff --git a/macros/latex/contrib/glossaries-extra/glossaries-extra.ins b/macros/latex/contrib/glossaries-extra/glossaries-extra.ins
index f1a3cb82b0..cc2f94010c 100644
--- a/macros/latex/contrib/glossaries-extra/glossaries-extra.ins
+++ b/macros/latex/contrib/glossaries-extra/glossaries-extra.ins
@@ -1,4 +1,4 @@
-% glossaries-extra.ins generated using makedtx version 1.2 2020/3/23 20:29
+% glossaries-extra.ins generated using makedtx version 1.2 2020/4/1 13:56
\input docstrip
\preamble
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.pdf
index 067fefffb0..f90e2bf9e0 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-abbrv.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-abbrv.pdf
index 75dbbba4ea..3ba4c0d2c3 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-abbrv.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-abbrv.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-accsupp.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-accsupp.pdf
index dcfa99bf2a..c070b1a1c1 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-accsupp.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-accsupp.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-acronym-desc.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-acronym-desc.pdf
index c2475f0895..b1ca94ef98 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-acronym-desc.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-acronym-desc.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-acronym.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-acronym.pdf
index 9240549091..e5d3aabee0 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-acronym.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-acronym.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-alias.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-alias.pdf
index af769c2904..5f95e8c10d 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-alias.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-alias.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-altmodifier.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-altmodifier.pdf
index fea6372359..4bf0cfc14b 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-altmodifier.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-altmodifier.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-alttree-marginpar.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-alttree-marginpar.pdf
index e1b1b380e7..d87c56c028 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-alttree-marginpar.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-alttree-marginpar.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-alttree-sym.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-alttree-sym.pdf
index 0a15892f04..6b2326755e 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-alttree-sym.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-alttree-sym.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-alttree.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-alttree.pdf
index 0b4c4eb9bf..5ace7e5e2e 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-alttree.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-alttree.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-autoindex-hyp.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-autoindex-hyp.pdf
index 5ffe8cdc19..cf75773e80 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-autoindex-hyp.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-autoindex-hyp.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-autoindex.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-autoindex.pdf
index a6659eb0ab..44d3c2df33 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-autoindex.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-autoindex.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-crossref.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-crossref.pdf
index 8807a83295..6656a68b92 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-crossref.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-crossref.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-crossref2.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-crossref2.pdf
index ca7017a576..0dc9e3931c 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-crossref2.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-crossref2.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-docdef.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-docdef.pdf
index 3ba1d7d804..1b88b47f31 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-docdef.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-docdef.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-entrycount.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-entrycount.pdf
index da5ad2f50c..f376f4b6e8 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-entrycount.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-entrycount.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-external.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-external.pdf
index bc6c45aee0..cdcf6be76a 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-external.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-external.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-fmt.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-fmt.pdf
index 2fad6052c9..9d57d9290a 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-fmt.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-fmt.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-footnote.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-footnote.pdf
index 8f6cb1c9a3..4b0605157c 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-footnote.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-footnote.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-header.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-header.pdf
index a84fa9e505..f48bb2ab24 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-header.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-header.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-indexhook.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-indexhook.pdf
index 6e7bee8038..78849f09e4 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-indexhook.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-indexhook.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-initialisms.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-initialisms.pdf
index 138c930a14..3ccebde9f1 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-initialisms.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-initialisms.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-linkcount.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-linkcount.pdf
index 9cf9ba11ff..d0bd830ca0 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-linkcount.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-linkcount.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-mixed-abbrv-styles.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-mixed-abbrv-styles.pdf
index 4398fabf49..ead60a83b4 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-mixed-abbrv-styles.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-mixed-abbrv-styles.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.pdf
index 800e23fc95..6aedfbfd3b 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-mixture.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-mixture.pdf
index 1ab4d05a3b..642c20dbf7 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-mixture.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-mixture.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-name-font.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-name-font.pdf
index 148f025b1e..32a0b98094 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-name-font.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-name-font.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-nested.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-nested.pdf
index 73ae97a0e1..5da7a933d6 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-nested.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-nested.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-noidx-restricteddocdefs.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-noidx-restricteddocdefs.pdf
index b85e9628db..28bdb492a3 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-noidx-restricteddocdefs.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-noidx-restricteddocdefs.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-onelink.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-onelink.pdf
index 84b11de45b..3a408d73d1 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-onelink.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-onelink.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-utf8.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-utf8.pdf
index 7b66ce9069..e381014d44 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-utf8.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-utf8.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-xetex.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-xetex.pdf
index a4ddbadfec..5c4220a185 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-xetex.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly-xetex.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly.pdf
index c4ec898bac..eee065e89a 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-onthefly.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-onthefly.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-pages.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-pages.pdf
index c8f28cd6c3..e86ecc0201 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-pages.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-pages.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-postdot.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-postdot.pdf
index b3338a5a3d..8d4c7cdc2e 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-postdot.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-postdot.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-postlink.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-postlink.pdf
index 9f41dfa065..a4c0b17bda 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-postlink.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-postlink.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-prefix.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-prefix.pdf
index 8831ce5d7a..3eede737cf 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-prefix.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-prefix.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-record-nameref.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-record-nameref.pdf
index b0cc53ec5a..e37e644536 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-record-nameref.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-record-nameref.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-record.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-record.pdf
index c4b42d1791..d003fbd686 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-record.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-record.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-restricteddocdefs.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-restricteddocdefs.pdf
index ac6c68db0a..4b702408d2 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-restricteddocdefs.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-restricteddocdefs.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-hyp.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-hyp.pdf
index da9bf5b1c0..2b624456f4 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-hyp.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-hyp.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main-hyp.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main-hyp.pdf
index 724d7d4fd7..f4123f6561 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main-hyp.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main-hyp.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main.pdf
index 307d4ba2c9..63142c9f26 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-suppl-main.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-suppl.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-suppl.pdf
index f50bc9cacb..b3978b8883 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-suppl.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-suppl.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-trans.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-trans.pdf
index 8f0b50a01f..f2f7259725 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-trans.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-trans.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-undef.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-undef.pdf
index 50be7ebdf4..82d972fd7d 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-undef.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-undef.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.pdf b/macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.pdf
index d8f7ce0b59..ad37602acd 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries-extra/samples/sample.pdf b/macros/latex/contrib/glossaries-extra/samples/sample.pdf
index 0896f120ef..61564941cd 100644
--- a/macros/latex/contrib/glossaries-extra/samples/sample.pdf
+++ b/macros/latex/contrib/glossaries-extra/samples/sample.pdf
Binary files differ
diff --git a/macros/latex/contrib/iodhbwm/README.md b/macros/latex/contrib/iodhbwm/README.md
index fff5878e17..9716853bf5 100644
--- a/macros/latex/contrib/iodhbwm/README.md
+++ b/macros/latex/contrib/iodhbwm/README.md
@@ -1,33 +1,34 @@
-iodhbwm
-=======
+# iodhbwm
[![CTAN](https://img.shields.io/ctan/v/iodhbwm.svg)](https://www.ctan.org/pkg/iodhbwm)
[![GitHub license](https://img.shields.io/github/license/faltfe/iodhbwm.svg?style=flat-square)](https://github.com/faltfe/iodhbwm/blob/master/LICENSE)
[![Build Status](https://img.shields.io/travis/faltfe/iodhbwm/master.svg?style=flat-square)](https://travis-ci.org/faltfe/iodhbwm)
---------------------------------------------------------------------------
+---
+
This project provides the _unofficial_ template of the [DHBW Mannheim](http://www.dhbw-mannheim.de) for
the creation of bachelor thesis, studies or project work with _LaTeX_. The goal of the package is
the quick creation of a basic framework without much effort.
The documentation is currently only available in German.
---------------------------------------------------------------------------
+---
Felix Faltin
-Web: <https://github.com/faltfe/iodhbwm>
+Web: <https://github.com/faltfe/iodhbwm>
E-Mail: ffaltin91@gmail.com
---------------------------------------------------------------------------
-Copyright 2018-2019 Felix Faltin
+---
+
+Copyright 2018-2020 Felix Faltin
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
of this license or (at your option) any later version.
The latest version of this license is in
- <http://www.latex-project.org/lppl.txt>
+<http://www.latex-project.org/lppl.txt>
and version 1.3 or later is part of all distributions of LaTeX
version 2005/12/01 or later.
@@ -35,9 +36,9 @@ This work has the LPPL maintenance status `maintained'.
The Current Maintainer of this work is Felix Faltin.
---------------------------------------------------------------------------
+---
If you have any ideas, questions, suggestions or bugs to report, please
feel free to contact me.
---------------------------------------------------------------------------
+---
diff --git a/macros/latex/contrib/iodhbwm/doc/iodhbwm.pdf b/macros/latex/contrib/iodhbwm/doc/iodhbwm.pdf
index 1de10b8c49..2c383a577c 100644
--- a/macros/latex/contrib/iodhbwm/doc/iodhbwm.pdf
+++ b/macros/latex/contrib/iodhbwm/doc/iodhbwm.pdf
Binary files differ
diff --git a/macros/latex/contrib/iodhbwm/doc/iodhbwm.tex b/macros/latex/contrib/iodhbwm/doc/iodhbwm.tex
index d26a35aa24..fd7f206f61 100644
--- a/macros/latex/contrib/iodhbwm/doc/iodhbwm.tex
+++ b/macros/latex/contrib/iodhbwm/doc/iodhbwm.tex
@@ -9,7 +9,7 @@
%\usepackage{showframe}
\package[vcs=https://github.com/faltfe/iodhbwm,ctan=iodhbwm]{iodhbwm}
-\version{1.1.1}
+\version{1.2}
\title{iodhbwm Klasse}
\author{Felix Faltin}
@@ -150,9 +150,9 @@
\newcommand{\Version}[1]{\marginpar[\raggedleft v#1]{\raggedright v#1}}
\begin{document}
- \changes{0.4-alpha}{Add print option, auto-intro-pages and some new commands}
- \changes{0.4a-alpha}{Rename \opt{intro/add custom list} into \opt{intro/append custom content}}%
- \changes{0.4.1-alpha}{Unterstützung eines Anhang wurde hinzugefügt}%
+ \changes{1.1}{Erweiterung der Optionen}%
+ \changes{1.1.1}{Kleinere Fehlerbehebungen innerhalb von listings}
+ \changes{1.2}{Bereitstellung Englischer Vorlagen (Danke an mickmack1213)}
\maketitle
@@ -173,7 +173,11 @@
\clearpage
\tableofcontents
-
+
+ \clearpage
+ \PrintChanges
+ \clearpage
+
\section{Konventionen}
% \begin{sourcecode}[listing side comment, comment={Ich bin ein Kommentar},title={Hello world example}]
%% Hello again
@@ -679,12 +683,11 @@
Um die Autovervollständigung für \thepackage{} zu aktiveren, müssen die Dateien \file{iodhbwm.cwl} und \file{iodhbwm-template.cwl} nach \path|%appdata%\texstudio\completion\user| beziehungsweise nach \path|.config/texstudio/completion/user| kopiert werden.
\section{Installation}
+ \subsection{CTAN}
+ Das Bundle wird ebenfalls über CTAN zur Verfügung gestellt und kann deshalb über die offiziellen Paketquellen heruntergeladen und installiert werden. Diese Variante ist zu bevorzugen.
\subsection{Lokale Installation}
Eine eigene Installation des Pakets kann in einem lokalen texmf Ordner (lokales Repository) erfolgen. Das Bundle kann manuell aus dem Git-Repository heruntergeladen werden.
-
- \subsection{CTAN}
- Das Bundle wird ebenfalls über CTAN (mit Release der Version v1.0) zur Verfügung gestellt und kann deshalb über die offiziellen Paketquellen heruntergeladen und installiert werden. Diese Variante ist zu bevorzugen.
-
+
\subsubsection{MiKTeX}
\begin{enumerate}
\item Lokales Repository anlegen, welches der \href{http://tug.ctan.org/tds/tds.html}{Verzeichnisstruktur für \LaTeX{} Dateien} entspricht. Die Verzeichnisstruktur könnte wie folgt aussehen:\par \verb|C:\Users\<username>\localtexmf\tex\latex\iodhbwm|
@@ -708,8 +711,6 @@
Eine ausführliche Beschreibung befindet sich auf \url{https://tex.stackexchange.com/a/73017/142408}.
-% \PrintChanges
-
\PrintIndex
\end{document}
diff --git a/macros/latex/contrib/iodhbwm/tex/i18n.def b/macros/latex/contrib/iodhbwm/tex/i18n.def
new file mode 100644
index 0000000000..42dda7a3ff
--- /dev/null
+++ b/macros/latex/contrib/iodhbwm/tex/i18n.def
@@ -0,0 +1,36 @@
+\newcommand{\@addlanguage}[7]{%
+ \iflanguage{#1}{
+ \renewcommand*{\iodhbwm@file@prefix}{i18n/#1/dhbw}
+
+ \def\iodhbwm@bachelor@type@boe{#2}
+ \def\iodhbwm@bachelor@type@bos{#3}
+ \def\iodhbwm@bachelor@type@boa{#4}
+
+ \def\iodhbwm@thesis@type@ba{#5}
+ \def\iodhbwm@thesis@type@pa{#6}
+ \def\iodhbwm@thesis@type@sa{#7}
+
+ \booltrue{iodhbwm@if@supported@language}
+ }%
+ {}%
+}
+
+% ################################################################
+% ### ADD SUPPORTED LANGUAGES HERE
+% ################################################################
+
+% english
+\@addlanguage{english}
+ {Bachelor of Engineering}
+ {Bachelor of Science}
+ {Bachelor of Arts}
+ {bachelor's thesis}
+ {project report}
+ {study report}
+
+% ################################################################
+
+% Print waring if an unsupported language is used
+\ifbool{iodhbwm@if@supported@language}{}{%
+ \PackageWarning{\iodhbwm@pkg@name}{The passed language `\iodhbwm@main@language` was not found.\MessageBreak Using ngerman instead.}
+}
diff --git a/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-declaration.def b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-declaration.def
new file mode 100644
index 0000000000..83412c1939
--- /dev/null
+++ b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-declaration.def
@@ -0,0 +1,37 @@
+\clearpage
+
+\ifcsdef{chapter}%
+{\chapter*{Declaration}}%
+{\section*{Declaration}}
+
+\thispagestyle{empty}
+
+\bigskip
+
+I hereby assure you that I have written my \getThesisType{} on the\bigskip
+
+\textsc{Subject \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
+
+{\bfseries \getThesisTitle}
+
+\ifcsempty{iodhbwm@thesis@second@title}{}{%
+\bigskip
+\textsc{Subject B}\par%
+{\bfseries \getThesisSecondTitle}%
+}{}\bigskip
+
+independently and that I have not used any other sources and aids than those indicated.
+
+
+I also assure you that the electronic version submitted is the same as the printed version.$^\ast$
+
+{\small$^\ast$ if both versions are required.}
+
+\vfill
+
+\begin{tabular}{l}
+\hline
+\getLocation, \getDate
+\end{tabular}
+
+\clearpage \ No newline at end of file
diff --git a/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-ba.def b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-ba.def
new file mode 100644
index 0000000000..0d72435ca4
--- /dev/null
+++ b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-ba.def
@@ -0,0 +1,57 @@
+\begin{titlepage}
+ \centering
+ \ifcsempty{iodhbwm@institute@logo}{%
+ \includegraphics[height=1.7cm]{\getDHBWLogo}
+ }{%
+ \begin{minipage}[c]{.25\textwidth}
+ \includegraphics[width=\linewidth,keepaspectratio]{\getDHBWLogo}
+ \end{minipage}
+ \hfill
+ \begin{minipage}[c]{.25\textwidth}
+ \centering
+ \includegraphics[width=\linewidth,keepaspectratio]{\getInstituteLogo}
+ \end{minipage}
+ }
+
+ \bigskip
+
+ \rule{\textwidth}{.5mm}\bigskip
+
+ {\bfseries \getThesisTitle}\smallskip
+
+ \rule{\textwidth}{.5mm}\bigskip
+
+ \textsc{\Large Bachelor's thesis}
+
+ \bigskip
+ for the degree
+
+ \textsc{\large \getBachelorDegree}
+
+ \bigskip
+ of the course \getCourseName\par
+ at the Baden-Wuerttemberg Cooperative State University \getDHBWLocation
+
+ \vfill
+
+ by\par
+ {\bfseries\large \getAuthor}\bigskip
+
+ Submission on \getSubmissionDate
+
+ \vfill
+
+ \small{%
+ \begin{tabularx}{\textwidth}{@{}lX@{}}
+ \toprule
+ Processing Period: & \getProcessingPeriod\\
+ Student id, course: & \getStudentId, \getCourseId\\
+ \ifcsempty{iodhbwm@institute@section}{}{Department: & \getInstituteSection\\}%
+ Apprenticing company: & \getInstitute\\
+ \ifbool{iodhbwm@if@print@location}{Ort: & \getLocation\\}{}%
+ Company's supervisor: & \getSupervisor\\
+ University's reviewer: & \getReviewer\\
+ \end{tabularx}
+ }
+ \cleardoublepage
+\end{titlepage}
diff --git a/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-pa.def b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-pa.def
new file mode 100644
index 0000000000..31254bc505
--- /dev/null
+++ b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-pa.def
@@ -0,0 +1,59 @@
+\begin{titlepage}
+ \centering
+ \ifcsempty{iodhbwm@institute@logo}{%
+ \includegraphics[height=1.5cm]{\getDHBWLogo}
+ }{%
+ \begin{minipage}[c]{.25\textwidth}
+ \includegraphics[width=\linewidth,keepaspectratio]{\getDHBWLogo}
+ \end{minipage}
+ \hfill
+ \begin{minipage}[c]{.25\textwidth}
+ \raggedleft
+ \includegraphics[width=\linewidth,keepaspectratio]{\getInstituteLogo}
+ \end{minipage}
+ }
+
+ \bigskip
+
+ \Large\textsc{Project report}
+
+ \normalsize
+ of the course \getCourseName\par
+ at the Baden-Wuerttemberg Cooperative State University \getDHBWLocation
+
+ \rule{\textwidth}{.5mm}\bigskip
+
+ \textsc{\large Subject \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
+
+ {\bfseries \getThesisTitle}\bigskip
+
+ \ifcsempty{iodhbwm@thesis@second@title}{}{%
+ \textsc{\large Subject B}\par
+ %\tikz{\node (1) [draw, rounded rectangle] {Colloquium};}
+ {\bfseries \getThesisSecondTitle}
+ }{}
+
+ \rule{\textwidth}{.5mm}
+
+ \vfill
+
+ \par
+ {\bfseries\large \getAuthor}\par
+ \getDate
+
+ \vfill
+
+ \small{%
+ \begin{tabularx}{\textwidth}{@{}lX@{}}
+ \toprule
+ Processing Period: & \getProcessingPeriod\\
+ Student id, course: & \getStudentId, \getCourseId\\
+ \ifcsempty{iodhbwm@institute@section}{}{Department: & \getInstituteSection\\}%
+ Apprenticing company: & \getInstitute\\
+ \ifbool{iodhbwm@if@print@location}{Location: & \getLocation\\}{}%
+ Supervisor: & \getSupervisor\\
+ Signature of supervisor & \rule[-.5cm]{.5\columnwidth}{.5pt}
+ \end{tabularx}
+ }
+ \cleardoublepage
+\end{titlepage}
diff --git a/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-sa.def b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-sa.def
new file mode 100644
index 0000000000..51a2c29e6d
--- /dev/null
+++ b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage-sa.def
@@ -0,0 +1,59 @@
+\begin{titlepage}
+ \centering
+ \ifcsempty{iodhbwm@institute@logo}{%
+ \includegraphics[height=1.5cm]{\getDHBWLogo}
+ }{%
+ \begin{minipage}[c]{.25\textwidth}
+ \includegraphics[width=\linewidth,keepaspectratio]{\getDHBWLogo}
+ \end{minipage}
+ \hfill
+ \begin{minipage}[c]{.25\textwidth}
+ \raggedleft
+ \includegraphics[width=\linewidth,keepaspectratio]{\getInstituteLogo}
+ \end{minipage}
+ }
+
+ \bigskip
+
+ \Large\textsc{Study report}
+
+ \normalsize
+ of the course \getCourseName\par
+ at the Baden-Wuerttemberg Cooperative State University \getDHBWLocation
+
+ \rule{\textwidth}{.5mm}\bigskip
+
+ \textsc{\large Subject \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
+
+ {\bfseries \getThesisTitle}\bigskip
+
+ \ifcsempty{iodhbwm@thesis@second@title}{}{%
+ \textsc{\large Subject B}\par
+ %\tikz{\node (1) [draw, rounded rectangle] {Colloquium};}
+ {\bfseries \getThesisSecondTitle}
+ }{}
+
+ \rule{\textwidth}{.5mm}
+
+ \vfill
+
+ \par
+ {\bfseries\large \getAuthor}\par
+ \getDate
+
+ \vfill
+
+ \small{%
+ \begin{tabularx}{\textwidth}{@{}lX@{}}
+ \toprule
+ Processing Period: & \getProcessingPeriod\\
+ Student id, course: & \getStudentId, \getCourseId\\
+ \ifcsempty{iodhbwm@institute@section}{}{Department: & \getInstituteSection\\}%
+% Apprenticing company: & \getInstitute\\
+ \ifbool{iodhbwm@if@print@location}{Location: & \getLocation\\}{}%
+ Supervisor: & \getSupervisor\\
+% Signature of supervisor & \rule[-.5cm]{.5\columnwidth}{.5pt}
+ \end{tabularx}
+ }
+ \cleardoublepage
+\end{titlepage}
diff --git a/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage.def b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage.def
new file mode 100644
index 0000000000..efd704204f
--- /dev/null
+++ b/macros/latex/contrib/iodhbwm/tex/i18n/english/dhbw-titlepage.def
@@ -0,0 +1,55 @@
+\begin{titlepage}
+ \centering
+ \begin{minipage}[c]{.25\textwidth}
+ \includegraphics[width=\linewidth,keepaspectratio]{dhbw-logo}
+ \end{minipage}
+ \hfill
+ \begin{minipage}[c]{.25\textwidth}
+ \raggedleft
+ \includegraphics[width=\linewidth,keepaspectratio]{example-image}
+ \end{minipage}
+
+ \bigskip
+
+ \Large\textsc{Report}
+
+ \normalsize
+ of the course Information Technology\par
+ at the Baden-Wuerttemberg Cooperative State University \getDHBWLocation
+
+ \rule{\textwidth}{.5mm}\bigskip
+
+ \textsc{\large Subject \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
+
+ {\bfseries \getThesisTitle}\bigskip
+
+ \ifcsempty{iodhbwm@thesis@second@title}{}{%
+ \textsc{\large Subject B}\par
+ %\tikz{\node (1) [draw, rounded rectangle] {Colloquium};}
+ {\bfseries \getThesisSecondTitle}
+ }{}
+
+ \rule{\textwidth}{.5mm}
+
+ \vfill
+
+ \par
+ {\bfseries\large \getAuthor}\par
+ \today
+
+ \vfill
+
+ \small{%
+ \begin{tabularx}{\textwidth}{@{}lX@{}}
+ \toprule
+ Processing Period: & \getProcessingPeriod\\
+ Student id, course: & \getStudentId, \getCourseId\\
+ Department: & \getInstituteSection\\
+ Apprenticing company: & \getInstitute\\
+ Location: & \getLocation\\
+ Supervisor: & \getSupervisor\\
+ Signature of supervisor & \rule[-.5cm]{.5\columnwidth}{.5pt}
+ \end{tabularx}
+ }
+ \cleardoublepage
+\end{titlepage}
diff --git a/macros/latex/contrib/iodhbwm/tex/dhbw-declaration.def b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-declaration.def
index 93c915f9d1..93c915f9d1 100644
--- a/macros/latex/contrib/iodhbwm/tex/dhbw-declaration.def
+++ b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-declaration.def
diff --git a/macros/latex/contrib/iodhbwm/tex/dhbw-titlepage-ba.def b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage-ba.def
index f8e05ce8df..5bf27cb638 100644
--- a/macros/latex/contrib/iodhbwm/tex/dhbw-titlepage-ba.def
+++ b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage-ba.def
@@ -47,9 +47,9 @@
Bearbeitungszeitraum: & \getProcessingPeriod\\
Matrikelnummer, Kurs: & \getStudentId, \getCourseId\\
\ifcsempty{iodhbwm@institute@section}{}{Abteilung: & \getInstituteSection\\}%
- Ausbildungsfirma: & \getInstitute\\
+ Ausbildungsbetrieb: & \getInstitute\\
\ifbool{iodhbwm@if@print@location}{Ort: & \getLocation\\}{}%
- Betreuer der Ausbildungsfirma: & \getSupervisor\\
+ Betreuer des Ausbildungsbetriebs: & \getSupervisor\\
Gutachter der Dualen Hochschule: & \getReviewer\\
\end{tabularx}
}
diff --git a/macros/latex/contrib/iodhbwm/tex/dhbw-titlepage-pa.def b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage-pa.def
index 790563eceb..1c05221abb 100644
--- a/macros/latex/contrib/iodhbwm/tex/dhbw-titlepage-pa.def
+++ b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage-pa.def
@@ -49,7 +49,7 @@
Bearbeitungszeitraum: & \getProcessingPeriod\\
Matrikelnummer, Kurs: & \getStudentId, \getCourseId\\
\ifcsempty{iodhbwm@institute@section}{}{Abteilung: & \getInstituteSection\\}%
- Ausbildungsfirma: & \getInstitute\\
+ Ausbildungsbetrieb: & \getInstitute\\
\ifbool{iodhbwm@if@print@location}{Ort: & \getLocation\\}{}%
Betreuer: & \getSupervisor\\
Unterschrift Betreuer & \rule[-.5cm]{.5\columnwidth}{.5pt}
diff --git a/macros/latex/contrib/iodhbwm/tex/dhbw-titlepage-sa.def b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage-sa.def
index b1cab1a480..c58239db3a 100644
--- a/macros/latex/contrib/iodhbwm/tex/dhbw-titlepage-sa.def
+++ b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage-sa.def
@@ -36,7 +36,7 @@
Bearbeitungszeitraum: & \getProcessingPeriod\\
Matrikelnummer, Kurs: & \getStudentId, \getCourseId\\
% Abteilung: & \getInstituteSection\\
- Ausbildungsfirma: & \getInstitute\\
+ Ausbildungsbetrieb: & \getInstitute\\
\ifbool{iodhbwm@if@print@location}{Ort: & \getLocation\\}{}%
Betreuer: & \getSupervisor\\
% Unterschrift Betreuer & \rule[-.5cm]{.5\columnwidth}{.5pt}
diff --git a/macros/latex/contrib/iodhbwm/tex/dhbw-titlepage.def b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage.def
index 33b50837a2..1c34e5bf48 100644
--- a/macros/latex/contrib/iodhbwm/tex/dhbw-titlepage.def
+++ b/macros/latex/contrib/iodhbwm/tex/i18n/ngerman/dhbw-titlepage.def
@@ -1,42 +1,25 @@
\begin{titlepage}
- \begin{minipage}[c]{.30\textwidth}
- \includegraphics[height=1.7cm]{dhbw-logo}
- \end{minipage}
- \hfill
- \begin{minipage}[c]{.30\textwidth}
- \centering
- \includegraphics[height=1.7cm]{example-image}
- \end{minipage}
- \hfill
- \begin{minipage}[c]{.30\textwidth}
- \raggedleft
- \includegraphics[height=1.7cm]{example-image}
- \end{minipage}
+ \centering
+ \begin{minipage}[c]{.25\textwidth}
+ \includegraphics[width=\linewidth,keepaspectratio]{dhbw-logo}
+ \end{minipage}
+ \hfill
+ \begin{minipage}[c]{.25\textwidth}
+ \raggedleft
+ \includegraphics[width=\linewidth,keepaspectratio]{example-image}
+ \end{minipage}
+
+ \bigskip
- \begin{center}
\Large\textsc{Arbeit}
\normalsize
des Studiengangs Informationstechnik\par
der Dualen Hochschule Baden-Württemberg \getDHBWLocation
- \end{center}
\rule{\textwidth}{.5mm}\bigskip
- % \begin{minipage}[t]{.45\textwidth}
- % \centering\textsc{Thema A}
- %
- % \bfseries\large \dots
- % \hfill
- % \begin{minipage}[t]{.45\textwidth}
- % \centering\textsc{Thema B}
- %
- % \tikz{\node (1) [draw, rounded rectangle] {Kolloquium};}\par
- %
- % \bfseries\large \dots
- % \end{minipage}
- % \\[1em]
- \centering\textsc{\large Thema \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
+ \textsc{\large Thema \ifcsempty{iodhbwm@thesis@second@title}{}{A}}
{\bfseries \getThesisTitle}\bigskip
@@ -50,11 +33,9 @@
\vfill
- \begin{center}
- von\par
+ \par
\centering{\bfseries\large \getAuthor}\par
\today
- \end{center}
\vfill
diff --git a/macros/latex/contrib/iodhbwm/tex/iodhbwm-templates.sty b/macros/latex/contrib/iodhbwm/tex/iodhbwm-templates.sty
index 3f9a6e7b06..b52807439e 100644
--- a/macros/latex/contrib/iodhbwm/tex/iodhbwm-templates.sty
+++ b/macros/latex/contrib/iodhbwm/tex/iodhbwm-templates.sty
@@ -7,7 +7,7 @@
% Felix Faltin
% E-Mail: ffaltin91@gmail.com
% ----------------------------------------------------------
-% Copyright 2017-2019 Felix Faltin
+% Copyright 2017-2020 Felix Faltin
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -23,8 +23,8 @@
%
% ----------------------------------------------------------
-\newcommand*{\iodhbwm@pkg@version}{v1.1.1}
-\newcommand*{\iodhbwm@pkg@date}{2019-09-08}
+\newcommand*{\iodhbwm@pkg@version}{v1.2}
+\newcommand*{\iodhbwm@pkg@date}{2020-04-01}
\newcommand*{\iodhbwm@pkg@info}{Inoffical DHBW Mannheim thesis package}
\newcommand*{\iodhbwm@pkg@name}{iodhbwm-templates}
@@ -67,11 +67,28 @@
\newbool{iodhbwm@if@print@lof}
\newbool{iodhbwm@if@print@location}
\newbool{iodhbwm@if@oldpagestyle}
+\newbool{iodhbwm@if@supported@language}
+
+% ----------------------------------------------------------
+% Define language depended settings
+% ----------------------------------------------------------
+% Default language: ngerman
+\newcommand*{\iodhbwm@file@prefix}{i18n/ngerman/dhbw}
+
+\def\iodhbwm@bachelor@type@boe{Bachelor of Engineering}
+\def\iodhbwm@bachelor@type@bos{Bachelor of Science}
+\def\iodhbwm@bachelor@type@boa{Bachelor of Arts}
+
+\def\iodhbwm@thesis@type@ba{Bachelorarbeit}
+\def\iodhbwm@thesis@type@pa{Projektarbeit}
+\def\iodhbwm@thesis@type@sa{Studienarbeit}
+
+\iflanguage{ngerman}{\booltrue{iodhbwm@if@supported@language}}{}
+\input{i18n.def}
% ----------------------------------------------------------
% Define internal commands
% ----------------------------------------------------------
-\newcommand*{\iodhbwm@file@prefix}{dhbw}
\newcommand*{\iodhbwm@file@ending}{.def}
\edef\iodhbwm@file@titlepage@default{\iodhbwm@file@prefix-titlepage\iodhbwm@file@ending}
\edef\iodhbwm@file@titlepage@ba{\iodhbwm@file@prefix-titlepage-ba\iodhbwm@file@ending}
@@ -80,13 +97,6 @@
\edef\iodhbwm@file@declaration@default{\iodhbwm@file@prefix-declaration\iodhbwm@file@ending}
\edef\iodhbwm@file@abstract@default{\iodhbwm@file@prefix-abstract.inc}
-\def\iodhbwm@bachelor@type@boe{Bachelor of Engineering}
-\def\iodhbwm@bachelor@type@bos{Bachelor of Science}
-\def\iodhbwm@bachelor@type@boa{Bachelor of Arts}
-
-\def\iodhbwm@thesis@type@ba{Bachelorarbeit}
-\def\iodhbwm@thesis@type@pa{Projektarbeit}
-\def\iodhbwm@thesis@type@sa{Studienarbeit}
\def\iodhbwm@dhbw@location@default{Mannheim}
\def\iodhbwm@dhbw@logo@default{dhbw-logo}
diff --git a/macros/latex/contrib/iodhbwm/tex/iodhbwm.cls b/macros/latex/contrib/iodhbwm/tex/iodhbwm.cls
index 86d6340ed3..c1ffa62ff6 100644
--- a/macros/latex/contrib/iodhbwm/tex/iodhbwm.cls
+++ b/macros/latex/contrib/iodhbwm/tex/iodhbwm.cls
@@ -7,7 +7,7 @@
% Felix Faltin
% E-Mail: ffaltin91@gmail.com
% ----------------------------------------------------------
-% Copyright 2017-2019 Felix Faltin
+% Copyright 2017-2020 Felix Faltin
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -23,8 +23,8 @@
%
% ----------------------------------------------------------
-\newcommand*{\iodhbwm@cls@version}{v1.1.1}
-\newcommand*{\iodhbwm@cls@date}{2019-09-08}
+\newcommand*{\iodhbwm@cls@version}{v1.2}
+\newcommand*{\iodhbwm@cls@date}{2020-04-01}
\newcommand*{\iodhbwm@cls@info}{Inoffical DHBW Mannheim thesis class}
\ProvidesClass{iodhbwm}[%
diff --git a/macros/latex/required/psnfss/00readme.txt b/macros/latex/required/psnfss/00readme.txt
deleted file mode 100644
index 572e6df2a3..0000000000
--- a/macros/latex/required/psnfss/00readme.txt
+++ /dev/null
@@ -1,264 +0,0 @@
-------------------------------------------------------------
- PSNFSS 9.2 -- installation instructions
-------------------------------------------------------------
- 2004-09-15
- Walter Schmidt
-
-
-Contents
---------
-
-- Overview
-- Removing obsolete files
-- Installing the virtual fonts, metrics and .fd files
-- Installing the PSNFSS macro packages
-- Installing the documentation
-- Fonts required for PSNFSS
-- Font map files
-- The encoding vector 8r.enc
-- Extra packages required for PSNFSS
-- Making sure that everything works
-- Files from PSNFSS v7.x, which are no longer part of the
- distribution.
-
-
-
-Overview
---------
-
-PSNFSS, originally developed by Sebastian Rahtz, is a set of
-LaTeX2e package files to use common PostScript text and
-symbol fonts, together with packages for typesetting math
-using virtual math fonts to match Times and Palatino.
-
-The macro packages are useless without the font description
-(fd) files, virtual fonts (vf) and font metric (tfm) files
-for the font families used. On CTAN, those for the Base 35
-fonts are provided in the archive lw35nfss.zip. The
-metrics, fd's and font map files for the free Utopia,
-Charter, FPL and Pazo fonts are provided in the archive file
-freenfss.zip.
-
-The PSNFSS collection does, however, NOT include the actual
-PostScript fonts, i.e., the .pfb and .afm files. See the
-below section "Fonts required for PSNFSS" .
-
-This document describes how to _install_ or _update_ PSNFSS.
-Detailed instructions how to _use_ PSNFSS with LaTeX can be
-found in the PDF document psnfss2e.pdf.
-
-
-
-Removing obsolete files
------------------------
-
-* If your current version of PSNFSS is 7.0 or older, you
-should remove manually _all_ macro files, .fd files, font
-metrics and virtual fonts, that have to do with the PSNFSS
-system or with the Base35, Utopia, Charter or Pazo fonts.
-
-* If your current version of PSNFSS is 8.x or 9.1, delete
-the files ot1fplmbb.fd and t1fplmbb.fd. In a TDS-compliant
-TeX system, they should reside in the directory
-texmf/tex/latex/psnfss.
-
-* Previous distributions of PSNFSS 9.0x would erroneously
-comprise a number of files named *8a.tfm in the directory
-texmf/fonts/tfm/adobe/palatino. These files did not do any
-harm, yet they are useless and should be deleted -- unless
-you are using VTeX, which does require them.
-
-
-
-Installing the virtual fonts, metrics and .fd files
----------------------------------------------------
-Obtain the archive files lw35nfss.zip and freenfss.zip from
-CTAN:macros/latex/required/psnfss. If the file system
-layout of your TeX system complies with TDS, unzip them in
-the texmf root directory (usually named texmf) of your TeX
-system; all files will be unpacked into the right
-directories then. Otherwise you have to sort out manually
-the files from the .zip archives and copy them to the
-appropriate directories of your TeX system.
-
-The archives do _not_ include TFM files for the "raw" (= not
-re-encoded) PostScript text fonts. These files are required
-by VTeX only (and they are not PSNFSS-specific, anyway).
-
-
-
-Installing the PSNFSS macro packages
-------------------------------------
-
-Copy the files
-
- 00readme.txt
- changes.txt
- manifest.txt
- mathtest.tex
- pitest.tex
- psfonts.dtx
- psfonts.ins
- psnfss2e.tex
- test0.tex
- test1.tex
- test2.tex
- test3.tex
-
-to a directory where you keep documented LaTeX sources.
-In a TDS-compliant system this should be the directory
-
- texmf/source/latex/psnfss/ .
-
-Run LaTeX on the installation script psfonts.ins to create
-the package (.sty) files. Move them to a directory where
-LaTeX will find them. In a TDS-compliant system this should
-be the directory
-
- texmf/tex/latex/psnfss/ .
-
-The latter step is executed automagically by the
-installation script, provided that your DocStrip program has
-been configured appropriately and the target directory
-exists already.
-
-
-
-Installing the documentation
-----------------------------
-
-Copy the documentation file psnfss2e.pdf to a suitable
-directory; in a TDS-compliant system this should be
-
- texmf/doc/latex/psnfss .
-
-
-
-Fonts required for PSNFSS
--------------------------
-
-The "Base 35" fonts
- Free substitutes for the commercial PostScript Base fonts
- are available from the CTAN directory fonts/urw/base35.
-
-Adobe Utopia
-Bitstream Charter
- The Type1 font files can be obtained for free from various
- sources, e.g., CTAN:fonts/utopia and CTAN:fonts/charter.
-
-| The Utopia fonts are no longer a "required" component of
-| the LaTeX system, because of their license conditions.
-| Yet YOU MUST NOT OMIT the related font metrics and map
-| file records, regardless of whether or not the Type1 font
-| files are actually installed. Thus, the user will be
-| able to add the fonts without any further changes;
-| besides, other packages or virtual fonts may rely on
-| these TFMs.
-
-FPL (=Palatino SC/OsF)
- Free substitutes for the commercial Palatino SC/OsF fonts
- are available from CTAN:fonts/fpl
-
-Pazo
- The Type1 fonts can be obtained from the CTAN directory
- fonts/mathpazo. Notice that PSNFSS 9 needs version 1.003
- (2002-05-17) of the Pazo fonts.
-
-Computer Modern
-RSFS (Ralph Smith's Formal Script)
-Euler Math
- These font families are required when typesetting math
- using the packages mathptm, mathptmx, mathpple, or
- mathpazo. They are available in Type1 as well as METAFONT
- format Make sure to install at least the Type1 variants,
- possibly beside .mf.
-
-
-
-Font map files
---------------
-
-The following font map files (in a format that suits dvips
-and pdfTeX) are provided in the PSNFSS distribution. Use
-them immediately or merge them into one common map file:
-
- psnfss.map: for the Base35 fonts, eurmo10 and eurbo10
- charter.map: for Bitstream Charter
- utopia.map: for Adobe Utopia
- pazo.map for the Pazo math fonts
- fpls.map for the free substitutes (FPL) of the
- Palatino SC/OsF fonts
-
-psnfss.map is primarily destined for use with dvips. The
-entries for the fonts "eurmo10" and "eurbo10" may need to be
-customized: Feel free to change the /FontName's (EURM10 and
-EURB10) to lower case, if you have got the Type1 fonts from
-MicroPress rather than the BlueSky collection. This
-particular change is _not_ regarded as a violation of the
-license conditions.
-
-psnfss.map does _not_ make dvips embed the Base35 fonts.
-For use with pdfTeX you will, most likely, have to create a
-modified copy, which specifies embedding of all Base fonts.
-The other map files are equally suitable for use with either
-dvips or pdfTeX.
-
-Other applications, such as VTeX, need a different format of
-the font map files. They may also require entries for the
-raw (= not reencoded) fonts. When creating these map files,
-take those for dvips/pdfTeX as a model!
-
-
-
-The encoding vector 8r.enc
---------------------------
-
-Most Type1 text fonts, when used from TeX, are reencoded to
-the so-called TeXBase1 encoding, in order to make all glyphs
-accessible. This is performed using the reencoding file
-
- 8r.enc
-
-which distributed with PSNFSS. Consult the documentation of
-your TeX system, where to store this file!
-
-|
-| PSNFSS 9.x includes version 2.0 of 8r.enc. Make sure
-| that there exist no other, obsolete, instances of 8r.enc
-| in the applicable search path of your TeX system
-|
-
-
-
-Extra packages required for PSNFSS
-----------------------------------
-
-The "Graphics" bundle must be installed, since PSNFSS makes
-use of the package keyval.sty.
-
-
-
-Making sure that everything works
----------------------------------
-
-Run the test following files through LaTeX:
-
- test0.tex
- test1.tex
- test2.tex
- test3.tex
- mathtest.tex
- pitest.tex
-
-
-
-Files from PSNFSS v7.x, which are no longer part of the
-distribution
--------------------------------------------------------
-
-The files to support the commercial Lucida Bright and
-MathTime fonts are now distributed from the CTAN directories
-macros/latex/contrib/psnfssx/ and fonts/metrics/bh/lucida/.
-
-
--- finis
diff --git a/macros/latex/required/psnfss/README b/macros/latex/required/psnfss/README
index 5d84037450..26dab86127 120000..100644
--- a/macros/latex/required/psnfss/README
+++ b/macros/latex/required/psnfss/README
@@ -1 +1,264 @@
-00readme.txt \ No newline at end of file
+------------------------------------------------------------
+ PSNFSS 9.3 -- installation instructions
+------------------------------------------------------------
+ 2020-03-25
+ Walter Schmidt
+
+
+Contents
+--------
+
+- Overview
+- Removing obsolete files
+- Installing the virtual fonts, metrics and .fd files
+- Installing the PSNFSS macro packages
+- Installing the documentation
+- Fonts required for PSNFSS
+- Font map files
+- The encoding vector 8r.enc
+- Extra packages required for PSNFSS
+- Making sure that everything works
+- Files from PSNFSS v7.x, which are no longer part of the
+ distribution.
+
+
+
+Overview
+--------
+
+PSNFSS, originally developed by Sebastian Rahtz, is a set of
+LaTeX2e package files to use common PostScript text and
+symbol fonts, together with packages for typesetting math
+using virtual math fonts to match Times and Palatino.
+
+The macro packages are useless without the font description
+(fd) files, virtual fonts (vf) and font metric (tfm) files
+for the font families used. On CTAN, those for the Base 35
+fonts are provided in the archive lw35nfss.zip. The
+metrics, fd's and font map files for the free Utopia,
+Charter, FPL and Pazo fonts are provided in the archive file
+freenfss.zip.
+
+The PSNFSS collection does, however, NOT include the actual
+PostScript fonts, i.e., the .pfb and .afm files. See the
+below section "Fonts required for PSNFSS" .
+
+This document describes how to _install_ or _update_ PSNFSS.
+Detailed instructions how to _use_ PSNFSS with LaTeX can be
+found in the PDF document psnfss2e.pdf.
+
+
+
+Removing obsolete files
+-----------------------
+
+* If your current version of PSNFSS is 7.0 or older, you
+should remove manually _all_ macro files, .fd files, font
+metrics and virtual fonts, that have to do with the PSNFSS
+system or with the Base35, Utopia, Charter or Pazo fonts.
+
+* If your current version of PSNFSS is 8.x or 9.1, delete
+the files ot1fplmbb.fd and t1fplmbb.fd. In a TDS-compliant
+TeX system, they should reside in the directory
+texmf/tex/latex/psnfss.
+
+* Previous distributions of PSNFSS 9.0x would erroneously
+comprise a number of files named *8a.tfm in the directory
+texmf/fonts/tfm/adobe/palatino. These files did not do any
+harm, yet they are useless and should be deleted -- unless
+you are using VTeX, which does require them.
+
+
+
+Installing the virtual fonts, metrics and .fd files
+---------------------------------------------------
+Obtain the archive files lw35nfss.zip and freenfss.zip from
+CTAN:macros/latex/required/psnfss. If the file system
+layout of your TeX system complies with TDS, unzip them in
+the texmf root directory (usually named texmf) of your TeX
+system; all files will be unpacked into the right
+directories then. Otherwise you have to sort out manually
+the files from the .zip archives and copy them to the
+appropriate directories of your TeX system.
+
+The archives do _not_ include TFM files for the "raw" (= not
+re-encoded) PostScript text fonts. These files are required
+by VTeX only (and they are not PSNFSS-specific, anyway).
+
+
+
+Installing the PSNFSS macro packages
+------------------------------------
+
+Copy the files
+
+ 00readme.txt
+ changes.txt
+ manifest.txt
+ mathtest.tex
+ pitest.tex
+ psfonts.dtx
+ psfonts.ins
+ psnfss2e.tex
+ test0.tex
+ test1.tex
+ test2.tex
+ test3.tex
+
+to a directory where you keep documented LaTeX sources.
+In a TDS-compliant system this should be the directory
+
+ texmf/source/latex/psnfss/ .
+
+Run LaTeX on the installation script psfonts.ins to create
+the package (.sty) files. Move them to a directory where
+LaTeX will find them. In a TDS-compliant system this should
+be the directory
+
+ texmf/tex/latex/psnfss/ .
+
+The latter step is executed automagically by the
+installation script, provided that your DocStrip program has
+been configured appropriately and the target directory
+exists already.
+
+
+
+Installing the documentation
+----------------------------
+
+Copy the documentation file psnfss2e.pdf to a suitable
+directory; in a TDS-compliant system this should be
+
+ texmf/doc/latex/psnfss .
+
+
+
+Fonts required for PSNFSS
+-------------------------
+
+The "Base 35" fonts
+ Free substitutes for the commercial PostScript Base fonts
+ are available from the CTAN directory fonts/urw/base35.
+
+Adobe Utopia
+Bitstream Charter
+ The Type1 font files can be obtained for free from various
+ sources, e.g., CTAN:fonts/utopia and CTAN:fonts/charter.
+
+| The Utopia fonts are no longer a "required" component of
+| the LaTeX system, because of their license conditions.
+| Yet YOU MUST NOT OMIT the related font metrics and map
+| file records, regardless of whether or not the Type1 font
+| files are actually installed. Thus, the user will be
+| able to add the fonts without any further changes;
+| besides, other packages or virtual fonts may rely on
+| these TFMs.
+
+FPL (=Palatino SC/OsF)
+ Free substitutes for the commercial Palatino SC/OsF fonts
+ are available from CTAN:fonts/fpl
+
+Pazo
+ The Type1 fonts can be obtained from the CTAN directory
+ fonts/mathpazo. Notice that PSNFSS 9 needs version 1.003
+ (2002-05-17) of the Pazo fonts.
+
+Computer Modern
+RSFS (Ralph Smith's Formal Script)
+Euler Math
+ These font families are required when typesetting math
+ using the packages mathptm, mathptmx, mathpple, or
+ mathpazo. They are available in Type1 as well as METAFONT
+ format Make sure to install at least the Type1 variants,
+ possibly beside .mf.
+
+
+
+Font map files
+--------------
+
+The following font map files (in a format that suits dvips
+and pdfTeX) are provided in the PSNFSS distribution. Use
+them immediately or merge them into one common map file:
+
+ psnfss.map: for the Base35 fonts, eurmo10 and eurbo10
+ charter.map: for Bitstream Charter
+ utopia.map: for Adobe Utopia
+ pazo.map for the Pazo math fonts
+ fpls.map for the free substitutes (FPL) of the
+ Palatino SC/OsF fonts
+
+psnfss.map is primarily destined for use with dvips. The
+entries for the fonts "eurmo10" and "eurbo10" may need to be
+customized: Feel free to change the /FontName's (EURM10 and
+EURB10) to lower case, if you have got the Type1 fonts from
+MicroPress rather than the BlueSky collection. This
+particular change is _not_ regarded as a violation of the
+license conditions.
+
+psnfss.map does _not_ make dvips embed the Base35 fonts.
+For use with pdfTeX you will, most likely, have to create a
+modified copy, which specifies embedding of all Base fonts.
+The other map files are equally suitable for use with either
+dvips or pdfTeX.
+
+Other applications, such as VTeX, need a different format of
+the font map files. They may also require entries for the
+raw (= not reencoded) fonts. When creating these map files,
+take those for dvips/pdfTeX as a model!
+
+
+
+The encoding vector 8r.enc
+--------------------------
+
+Most Type1 text fonts, when used from TeX, are reencoded to
+the so-called TeXBase1 encoding, in order to make all glyphs
+accessible. This is performed using the reencoding file
+
+ 8r.enc
+
+which distributed with PSNFSS. Consult the documentation of
+your TeX system, where to store this file!
+
+|
+| PSNFSS 9.x includes version 2.0 of 8r.enc. Make sure
+| that there exist no other, obsolete, instances of 8r.enc
+| in the applicable search path of your TeX system
+|
+
+
+
+Extra packages required for PSNFSS
+----------------------------------
+
+The "Graphics" bundle must be installed, since PSNFSS makes
+use of the package keyval.sty.
+
+
+
+Making sure that everything works
+---------------------------------
+
+Run the test following files through LaTeX:
+
+ test0.tex
+ test1.tex
+ test2.tex
+ test3.tex
+ mathtest.tex
+ pitest.tex
+
+
+
+Files from PSNFSS v7.x, which are no longer part of the
+distribution
+-------------------------------------------------------
+
+The files to support the commercial Lucida Bright and
+MathTime fonts are now distributed from the CTAN directories
+macros/latex/contrib/psnfssx/ and fonts/metrics/bh/lucida/.
+
+
+-- finis
diff --git a/macros/latex/required/psnfss/changes.txt b/macros/latex/required/psnfss/changes.txt
index e4da98f6fb..c60511c4b0 100644
--- a/macros/latex/required/psnfss/changes.txt
+++ b/macros/latex/required/psnfss/changes.txt
@@ -1,119 +1,128 @@
+2020-03-25 PSNFSS 9.3 (UF)
+ * lw35nfss.zip: changed in fd-files of phv "mc" to "c", see
+ https://github.com/latex3/latex2e/issues/299.
+ Adapted test1.tex to the change
+ * lw35nfss.zip: changed in fd-files pf pcz "mb" to "m" (the
+ font is medium).
+ * renamed 00readme.txt to README
+
+
2005-04-12 PSNFSS 9.2a
- fix for psnfss/3773, affecting only helvet.sty:
+ fix for psnfss/3773, affecting only helvet.sty:
the package can now be loaded before \documentclass
-
+
2004-10-18
* freenfss.zip: fixed a major bug in the Charter font metrics
(will I ever get them right?)
-
+
2004-09-15 PSNFSS 9.2
* Charter: improved kerning data (once again...)
-
+
* Palatino: additional font families pplx and pplj with real
smallcaps and oldstyle figures and improved kerning tables;
- the free FPL fonts can be used as a substitute for te required
+ the free FPL fonts can be used as a substitute for te required
Palatino SC/OsF fonts
-
+
* mathpazo, mathptmx: beside \upDelta and \upOmega also the
other upright uppercase Greek letters are explicitly accessible.
-
- * documentation psnfss2e.tex(.pdf) updated
-
+
+ * documentation psnfss2e.tex(.pdf) updated
+
* font map files: new file fpls.map for the FPL fonts.
-
+
* minor changes to mathtest.tex
-
+
(* lw35nfss.zip is unchanged)
2004-01-26 PSNFSS 9.1b
* freenfss.zip with fixed VFs and metrics for the Bitstream
Charter fonts: New kerning pairs Y-g and Y-s; corrected
- \fontdimen1 of the italic shapes; improved italic Euro symbols
-
+ \fontdimen1 of the italic shapes; improved italic Euro symbols
+
* helvet.sty: Fixed implementation of the key-value interface.
-
+
* Warning messages added to obsolete packages.
-
+
2003-11-17 PSNFSS 9.1
* Updated VFs for all Adobe text font families, except Utopia:
Added \texteuro, fixed zdot and \textasteriskcentered.
-
+
* Courier: normal asterisk (*) is now vertically centered.
-
- * New VFs for Bitstream Charter with revised kerning data and
- faked \texteuro. In particular, the overly tight kerning
+
+ * New VFs for Bitstream Charter with revised kerning data and
+ faked \texteuro. In particular, the overly tight kerning
between L and quoteright has been abolished.
* The Pazo doublestroke font is now assigned the encoding U,
rather than T1 and OT1. The files t1fplmbb.fd and ot1fplm.fd
are replaced by ufplmbb.fd.
-
- * The Utopia fonts are no longer regarded as "required"; the
+
+ * The Utopia fonts are no longer regarded as "required"; the
package utopia.sty is marked as "obsolete".
-
+
* Documentation psnfss2e.* updated accordingly.
* Test files enhanced to test the Euro symbols and the Pazo
doublestroke font, while Utopia is omitted now.
-
-
+
+
2003-03-02 PSNFSS 9.0c
* mathptmx,sty, mathpazo.sty: \upOmega and \UpDelta are of
type \mathord now, to make sure that they are always upright
-
+
* pifont.sty: \Pifill and \dingfill should no longer fail at
the beginning or end of a paragraph. (Bug fix suggested by FMi.)
-
+
* mathptm(x).sty: \jmath, \coprod, and \amalg will now generate
error messages rather than print black squares. (Suggested by
FMi.)
-
+
* Small changes to the documentation psnfss2e.*.
-
+
* Enhanced test0.tex to test also the math alphabets.
-
+
* 8r.enc: version 2.0, comprising all of the Mac Roman
character set, too.
-
+
* The *.map files and the file 8r.enc have been moved out of the
ZIP archives, since their final location in the texmf tree may
vary wrt/ changes in the TDS specs.
-
+
2002-09-08 PSNFSS 9.0a
* Fixed TFM and VF files for mathpazo. The size of certain
symbols was wrong, because of a bug in the fontinst program.
-
+
* psfonts.dtx: Changed definition of \hbar in mathpazo.sty
to improve spacing.
-
+
* Fixed identification strings in 8rpcr.fd and t1put.fd.
-
+
* Fixed comments in 8r.enc.
-
+
* Removed one unneeded file from lw35nfss.zip.
-
+
2002-07-04
* Improved installation instructions (file 00readme.txt)
-
+
2002-05-17 Pazo fonts v1.003
* Changed the positioning of the double stroke in X and Z in
Pazo Math Blackboard Bold (suggested by Marco Kuhlmann).
The font metrics are unchanged.
-
+
2002-04-24 PSNFSS-9.0
- * mathptmx.sty: Improved \hbar. Added missing redefinitions
+ * mathptmx.sty: Improved \hbar. Added missing redefinitions
of \defaultscriptratio and \defaultscriptscriptratio.
-
+
* psnfss2e.pdf: All fonts are embedded now.
2002-04-10 PSNFSS-9.0 pre-release
@@ -121,93 +130,93 @@
* 8r.enc: The TeXBase1Encoding includes the Euro symbol in
slot 128 now. Thus, future fonts that provide the Euro, can
be supported. This does, however, NOT affect the present
- Base35, Charter and Utopia fonts.
+ Base35, Charter and Utopia fonts.
* mathpazo.sty: The undocumented macro ppljeuro is no longer
- provided.
-
+ provided.
+
* freenfss.zip: The VFs and TFMs are to be used with version
1.002 of the Pazo fonts now.
-
+
* Palatino text fonts: The textcompanion fonts of the
Palatino family provide the Euro symbol \texteuro as well as
the Omega \textohm now. The letters are actually taken from
- the Pazo fonts.
-
- * Documentation psnfss2e.tex updated and slightly improved.
+ the Pazo fonts.
+
+ * Documentation psnfss2e.tex updated and slightly improved.
2002-02-28 Pazo fonts v1.002
* Added all the remaining uppercase latin letters and digit
"one" to Pazo Math Blackboard Bold.
-
+
* Re-designed \Phi to make it better proportioned
-
+
* Re-designed \varsigma to give it a more recognisable shape
(suggested by Pablo Rodriguez). Re-designed \xi and \zeta to
match the new \varsigma.
-
+
2001-06-04 PSNFSS-v8.2
-
+
* mathpazo.sty: Changed behavior of the options sc and osf.
\jmath and \imath changed back to type 'mathord', as in normal
LaTeX.
-
+
* mathptm.sty: Revoked the changes re. AMS fonts, since the
package is only provided for use with legacy douments, anyway.
-
+
* Many changes to the documentation (psnfss2e.*).
-
+
* test1.tex, test2.tex, test3.tex: Fixed typo.
-
+
2001/05/27 PSNFSS-v8.2beta
- * mathpazo.sty:
+ * mathpazo.sty:
An improved version of this package is now part of the PSNFSS
distribution.
-
+
* freenfss.zip:
Added TFM, VF and FD files for the Pazo fonts.
* mathptmx.sty
New option: [slantedGreek]
-
+
* The AMS fonts are scaled properly now, when used together
with the packages mathptm, mathptmx, mathpple or mathpazo.
Specifying the [psamsfonts] option for the packages amsfonts or
amssymb may be needed wrt/ the Euler Fraktur fonts, but will not
affect the scaling of the others.
-
+
* ot1*.fd:
additional font shape substitition bx/ui -> b/it
-
+
* fixed TFM file zptmcm7y.tfm so as to raise the subscripts
generated by mathptmx (pr/3279)
-
+
* fixed FD files for Adobe Courier so as to disable hyphenation
(I wonder why this bug was never noticed...)
-
+
* test files completely revised
-
+
2000-01-12 PSNFSS-v8.1
-
- * support for commercial fonts is no longer part of the basic
+
+ * support for commercial fonts is no longer part of the basic
PSNFSS distribution.
* new, enhanced user documentation
-
+
* freenfss.zip:
new file, containing metrics, vf's, fd's and map files for
Bitstream Charter and Adobe Utopia
-
- * lw35nfss.zip:
+
+ * lw35nfss.zip:
removed tfm's and vf's for `raw' fonts and the duplicate
psyr.tfm; removed tfm's and vf's for Helvetica Light, which
isn't free; removed the related entries from the .fd files, too;
added the fd/tfm/vf files of the mathpple collection.
- * metrics (general):
+ * metrics (general):
removed the checksums, which are useless anyway; added missing
macron accent to all sc fonts; removed 1-1 kern pair from
Palatino.
@@ -216,27 +225,27 @@
fonts plus mathpple.map to one single psnfss.map; removed
duplicate entries; the map file will unpack to dvips/psnfss/
now.
-
+
* 8r.enc: the file is now distributed as part of lw35nfss.zip
and will unpack to the directory dvips/psnfss/.
- * psfonts.dtx:
+ * psfonts.dtx:
added courier.sty, which was previously not generated from a
.dtx source; added charter.sty and utopia.sty, which were
previously generated from dtx's of their own; added
mathpple.sty.
-
- * mathptm.sty, mathptmx.sty:
+
+ * mathptm.sty, mathptmx.sty:
fixed problems in conjunction with latexsym.sty and amssymb.sty
(pr/2910, pr/2762) as FMi had suggested; fixed the weird warning
message with \boldmath (pr/2994); made \hbar work with Times;
fixed \big & friends for font sizes <> 10pt;
-
+
* mathpple.sty:
- this package is now part of the PSNFSS distribution;
+ this package is now part of the PSNFSS distribution;
slightly enlarged font sizes for super- and subscripts in math;
\Re, \Im, \infty taken from Euler now.
* helvet.sty: new option for scaling Helvetica
-
+
%% finis
diff --git a/macros/latex/required/psnfss/manifest.txt b/macros/latex/required/psnfss/manifest.txt
index 473ac3dc9a..13bd3ab7fa 100644
--- a/macros/latex/required/psnfss/manifest.txt
+++ b/macros/latex/required/psnfss/manifest.txt
@@ -1,10 +1,10 @@
The following files constitute the PSNFSS bundle and must be
-distributed as a whole.
+distributed as a whole.
This restriction does NOT affect 8r.enc, which is originally
distributed from <http://tug.org/fontname/8r.enc> and is
included here for the sake of completeness only.
-00readme.txt
+README
changes.txt
freenfss.zip (or all files included in this archive)
lw35nfss.zip (or all files included in this archive)
diff --git a/macros/latex/required/psnfss/psfonts.dtx b/macros/latex/required/psnfss/psfonts.dtx
index 2be328867b..a0cf4ab001 100644
--- a/macros/latex/required/psnfss/psfonts.dtx
+++ b/macros/latex/required/psnfss/psfonts.dtx
@@ -5,7 +5,7 @@
% file: psfonts.dtx
%
% Copyright 1995--1998 Sebastian Rahtz
-% Copyright 1999--2005 Sebastian Rahtz, Walter Schmidt
+% Copyright 1999--2020 Sebastian Rahtz, Walter Schmidt
%
% This program may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.2
@@ -38,7 +38,7 @@
%<charter>\ProvidesPackage{charter}%
%<utopia>\ProvidesPackage{utopia}%
%<mathpazo>\ProvidesPackage{mathpazo}%
-[2005/04/12 PSNFSS-v9.2a
+[2020/03/25 PSNFSS-v9.3
%<times>(SPQR)
%<mathptm>Times w/ Math (SPQR, WaS)
%<mathptmx>Times w/ Math, improved (SPQR, WaS)
@@ -73,10 +73,10 @@
% \maketitle
%
% \noindent
-% The source file \texttt{psfonts.dtx} contains suitable package files
+% The source file \texttt{psfonts.dtx} contains suitable package files
% to use common PostScript fonts with \LaTeX.
-% See the file \texttt{00readme.txt} for the installation instructions;
-% it also explains how to obtain the
+% See the file \texttt{README} for the installation instructions;
+% it also explains how to obtain the
% related Type1 fonts, font definition files, font metrics and virtual fonts.
%
% See the document `Using common PostScript fonts with \LaTeX',
@@ -225,7 +225,7 @@
\fi
}{\endlist}
% \end{macrocode}
-% All the old Dingbat commands still work;
+% All the old Dingbat commands still work;
% they are now implemented using the +\Pi...+ commands.
% \begin{macrocode}
\newcommand{\ding}{\Pisymbol{pzd}}
@@ -295,12 +295,12 @@
\PackageError
%<mathptm> {mathptm}
%<mathptmx> {mathptmx}
- {The symbols \protect\jmath, \protect\amalg\space and
+ {The symbols \protect\jmath, \protect\amalg\space and
\protect\coprod\MessageBreak
are not available with this package}
- {Type \space <return> \space to proceed;
+ {Type \space <return> \space to proceed;
your command will be ignored.}}
-\let\amalg=\jmath
+\let\amalg=\jmath
\let\coprod=\jmath
% \end{macrocode}
%
@@ -318,7 +318,7 @@
\def\hbar{{\mskip1.6mu\mathchar'26\mkern-7.6muh}}
%</mathptm>
% \end{macrocode}
-% With \textsf{mathptmx}, PSNFSS 9.0 and later is using an improved definition,
+% With \textsf{mathptmx}, PSNFSS 9.0 and later is using an improved definition,
% which was adopted from Frank Mittelbach's \textsf{mathtime} package:
% \begin{macrocode}
%<*mathptmx>
@@ -656,7 +656,7 @@
% `BlueSky' distribution.
% \end{itemize}
% Special thanks to Daniel Schlieper, who suggested the
-% development of the \textsf{mathpple} package,
+% development of the \textsf{mathpple} package,
% contributed many good ideas and helped with testing.
%
%
@@ -703,7 +703,7 @@
% \end{macrocode}
%
% Make Palatino (+ppl+) the default roman font.
-% If the options +osf+ or +sc+ were specified,
+% If the options +osf+ or +sc+ were specified,
% use +pplj+ or +pplx+ instead,
% and make sure that +\oldstylenums+ switches to +pplj+, too.
% \begin{macrocode}
@@ -721,7 +721,7 @@
% \end{macrocode}
%
% The Pazo fonts provide an Euro symbol, which is now available in the
-% Palatino text companion fonts. For the sake of compatibility, we still define
+% Palatino text companion fonts. For the sake of compatibility, we still define
% the macro +\ppleuro+, which was introduced with version 8.2, and
% we make it work with the
% \textsf{eurofont} and \textsf{europs} packages:
@@ -731,14 +731,14 @@
% \end{macrocode}
%
% Now we declare the math fonts. The \textsf{mathpazo} package uses
-% a Palatino text font family with OT1 encoding
+% a Palatino text font family with OT1 encoding
% as the +operators+ and +\mathit+ alphabets.
% If the +sc+ option was specified, we use the family +pplx+.
% Otherwise we just take +ppl+, thus making sure that no oldstyle digits are
% used in math mode. Note that specifying both +sc+ and +osf+ gives
% oldstyle numbers in text and uses the family +pplx+ in math mode,
% so that the +ppl+ family is not required at all. Thus, the number
-% of TFM's loaded by \TeX{} is minimized.
+% of TFM's loaded by \TeX{} is minimized.
% \begin{macrocode}
\ifpazo@sc
\DeclareSymbolFont{operators} {OT1}{pplx}{m}{n}
@@ -752,7 +752,7 @@
\SetMathAlphabet{\mathit}{bold} {OT1}{ppl}{b}{it}
\fi
% \end{macrocode}
-% Uppercase upright Greek
+% Uppercase upright Greek
% and math symbols such as `plus', `equal' and others
% are taken from a new symbol font named +upright+.
% Its spacing is less tight than in the text font.
@@ -808,7 +808,7 @@
% As to uppercase Greek, see below!
%
% The follwowing symbols used to come from `letters'.
-% Now they are taken from `operators', with respect to
+% Now they are taken from `operators', with respect to
% correct spacing of decimal numbers:
% \begin{macrocode}
\DeclareMathSymbol{,}{\mathpunct}{operators}{44}
@@ -990,7 +990,7 @@
% \end{macrocode}
%
% \subsection*{Credits}
-% The Pazo fonts and the related virtual fonts
+% The Pazo fonts and the related virtual fonts
% were created by Diego Puga.
% The \textsf{mathpazo} package was written by D.~Puga and W.~Schmidt.
% \Finale
diff --git a/macros/latex/required/psnfss/psnfss2e.pdf b/macros/latex/required/psnfss/psnfss2e.pdf
index c7f27997cd..cc34d5fb51 100644
--- a/macros/latex/required/psnfss/psnfss2e.pdf
+++ b/macros/latex/required/psnfss/psnfss2e.pdf
Binary files differ
diff --git a/macros/latex/required/psnfss/psnfss2e.tex b/macros/latex/required/psnfss/psnfss2e.tex
index 2e60445264..c7dc0dafa7 100644
--- a/macros/latex/required/psnfss/psnfss2e.tex
+++ b/macros/latex/required/psnfss/psnfss2e.tex
@@ -1,6 +1,6 @@
-% file: psnfss2e.tex as of 2004-09-15
+% file: psnfss2e.tex as of 2020-03-25
%
-% Copyright 2000--2004 Walter Schmidt
+% Copyright 2000--2020 Walter Schmidt
%
% This file may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.2
@@ -12,7 +12,7 @@
\newif\ifutopia
-% \utopiatrue
+% \utopiatrue
% If you have got the Utopia fonts, uncomment the above line,
% or put \utopiatrue into your ltxguide.cfg.
@@ -94,7 +94,7 @@
\newcommand{\Lpack}[1]{\textsf{#1}}
% the macros for the typeface samples:
-\newlength{\rightwidth}
+\newlength{\rightwidth}
\rightwidth=11cm
\newlength{\leftwidth}
\leftwidth=\textwidth
@@ -116,7 +116,7 @@
And when one looked up again at the mountains there was the whole
unbearable glory of the risen sun.
\par}}
- \par
+ \par
\medskip}
@@ -124,12 +124,12 @@
\author{Walter Schmidt}
-\date{PSNFSS version 9.2 \\ 2004-09-15}
+\date{PSNFSS version 9.3 \\ 2020-03-25}
\hypersetup{pdfauthor={Walter Schmidt},
pdftitle={Using common PostScript fonts with LaTeX},
- pdfsubject={PSNFSS v9.2},
+ pdfsubject={PSNFSS v9.3},
pdfkeywords={LaTeX PSNFSS PostScript fonts}}
@@ -158,16 +158,16 @@ a number of free fonts.
\section{Package overview}
The easiest way to make use of the above-mentioned typefaces is to completely
-replace one or more of the font families used by \LaTeX{} as
+replace one or more of the font families used by \LaTeX{} as
`roman', `sans serif' and `typewriter' family and for math.
-This is accomplished by the packages listed in table \ref{tab:packages}.
+This is accomplished by the packages listed in table \ref{tab:packages}.
Its first row lists the default (Computer Modern) font families.
-An empty column indicates that a package does not change the particular
+An empty column indicates that a package does not change the particular
font family. Some of these packages need more detailed explanation and
are described in the below sections \ref{sec:helvet}, \ref{sec:mathpazo}
and \ref{sec:mathptmx}.
-The PSNFSS distribution includes also a package
+The PSNFSS distribution includes also a package
\Lpack{pifont}, which serves for accessing symbol fonts (aka `Pi~fonts'),
such as Symbol and Zapf Dingbats, see section~\ref{sec:pifont}.
@@ -183,29 +183,29 @@ such as Symbol and Zapf Dingbats, see section~\ref{sec:pifont}.
\hline
\textbf{package} & \textbf{roman} & \textbf{sans serif} & \textbf{typewriter} & \textbf{formulas} \\\hline\hline
(none) & CM Roman & CM Sans Serif & CM Typewriter & $\approx$ CM Roman\\\hline
-\Lpack{mathpazo} & Palatino
+\Lpack{mathpazo} & Palatino
&
&
& $\approx$ Palatino\\\hline
-\Lpack{mathptmx} & Times
+\Lpack{mathptmx} & Times
&
&
& $\approx$ Times\\\hline
-\Lpack{helvet} &
+\Lpack{helvet} &
& Helvetica
&
& \\\hline
-\Lpack{avant} &
+\Lpack{avant} &
& Avant~Garde
&
& \\\hline
\Lpack{courier} &
&
- & Courier
+ & Courier
& \\\hline
\Lpack{chancery} & Zapf Chancery
- &
- &
+ &
+ &
& \\\hline
\Lpack{bookman} & Bookman
& Avant~Garde
@@ -216,8 +216,8 @@ such as Symbol and Zapf Dingbats, see section~\ref{sec:pifont}.
& Courier
& \\\hline
\Lpack{charter} & Charter
- &
- &
+ &
+ &
& \\\hline
\end{tabular}
\end{center}
@@ -231,17 +231,17 @@ such as Symbol and Zapf Dingbats, see section~\ref{sec:pifont}.
\subsection{Output font encoding}
None of the packages listed in table~\ref{tab:packages} changes the
output font encoding from its default setting OT1.
-It is, however, highly recommended to use the fonts with the extended
+It is, however, highly recommended to use the fonts with the extended
T1 and TS1 (text symbols) encodings by means of the commands:
\begin{quote}
+\usepackage[T1]{fontenc}+\\
+\usepackage{textcomp}+
\end{quote}
When using \ps\ fonts that come from `outside the \TeX{} world',
-there is no reason at all to stay with the obsolete OT1~encoding,
+there is no reason at all to stay with the obsolete OT1~encoding,
which would not provide access to all available glyphs.
-However, since these fonts were not particularly designed
-for use with \TeX{}, they do \emph{not} include all of the
+However, since these fonts were not particularly designed
+for use with \TeX{}, they do \emph{not} include all of the
text companion (TS1) symbols.
@@ -254,13 +254,13 @@ Using this command requires the \Lpack{textcomp} package; see above.
\subsection{Inter-line spacing}
-With certain font families, the leading of the standard \LaTeX{}
-document classes may be too small.
-This results from the larger x-height of these typefaces, as compared with
+With certain font families, the leading of the standard \LaTeX{}
+document classes may be too small.
+This results from the larger x-height of these typefaces, as compared with
Computer Modern.
Since it is a question of document design and line width,
-the packages of the PSNFSS bundle do \emph{not} take care of this.
-Issuing the command
+the packages of the PSNFSS bundle do \emph{not} take care of this.
+Issuing the command
\begin{quote}
+\linespread+ \arg{factor}
\end{quote}
@@ -269,7 +269,7 @@ Typical values for \m{factor} are in the range of $1.04\dots1.1$.
\subsection{Using sans serif fonts}
-The packages \Lpack{helvet} and \Lpack{avant} do not change the
+The packages \Lpack{helvet} and \Lpack{avant} do not change the
default text font family from `roman'.
If required, the additional command
\begin{quote}
@@ -284,9 +284,9 @@ used in the formulas!
\section{The package \Lpack{helvet}}
\label{sec:helvet}
Helvetica is actually somewhat larger than other typefaces
-of the same nominal size.
+of the same nominal size.
As a result, mixing, \eg Times and Helvetica within running text
-may look bad.
+may look bad.
\begin{decl}
\texttt{[scaled=}\m{scale}\texttt{]}\\
\texttt{[scaled]}
@@ -295,7 +295,7 @@ This can be fixed by loading the package with the option
\texttt{[scaled=}\m{scale}\texttt{]},
for instance:
+\usepackage[scaled=.92]{helvet}+.
-As a result, the font family \texttt{phv} (Helvetica) will be
+As a result, the font family \texttt{phv} (Helvetica) will be
scaled down to 92\% of its `natural' size, which is suitable
for use with Adobe Times.
Specifying +[scaled]+ alone is equivalent to +[scaled=0.95]+% and makes
@@ -309,8 +309,8 @@ Specifying +[scaled]+ alone is equivalent to +[scaled=0.95]+% and makes
\label{sec:mathpazo}
Loading
%% \NEWfeature{2001-06-04 v8.2}
-this package changes the default roman font family
-to Adobe Palatino, and the virtual `mathpazo' fonts will be used
+this package changes the default roman font family
+to Adobe Palatino, and the virtual `mathpazo' fonts will be used
for math.
These virtual fonts are made up basically from Palatino Italic, with the
missing math symbols coming from the CM and Pazo math fonts.
@@ -324,14 +324,14 @@ missing math symbols coming from the CM and Pazo math fonts.
By default, the package \Lpack{mathpazo} uses
the typeface family +ppl+ as the roman text font family.
The option +[sc]+ selects Palatino with real smallcaps (family +pplx+) insread.
-Correspondingly, the option +[osf]+ selects Palatino with smallcaps and default
-oldstyle figures (family +pplj+).
+Correspondingly, the option +[osf]+ selects Palatino with smallcaps and default
+oldstyle figures (family +pplj+).
Of course, oldstyle figures will be used only in text mode, as opposed to formulas.
\NEWfeature{2004-09-15 v9.2}
Using either option is strongly recommended:
Beside the real smallcaps, the font families +pplx+ and +pplj+ show further
-improvements over +ppl+: Increased word space, enhanced kerning tables,
-additional `dotlessj' glyph.
+improvements over +ppl+: Increased word space, enhanced kerning tables,
+additional `dotlessj' glyph.
\begin{decl}
+[slantedGreek]+
@@ -362,13 +362,13 @@ Upright \emph{lowercase} Greek is, however, not available.
+\mathbb+
\end{decl}
+\mathbold+ is a math alphabet for typesetting variables (incl.\ Greek)
-in a {\bfseries\itshape bold italic} style. Do not mix this up with +\mathbf+,
+in a {\bfseries\itshape bold italic} style. Do not mix this up with +\mathbf+,
which selects a {\bfseries\upshape bold upright} text font
for use in math!
+\mathbb+ is a `blackboard bold' alphabet, whose characters
-are taken from the Pazo fonts. %% \NEWfeature{2002-04-10 v9.0}
-All upper case letters and the numeral `1' are available.
+are taken from the Pazo fonts. %% \NEWfeature{2002-04-10 v9.0}
+All upper case letters and the numeral `1' are available.
If you want to use a different, external, doublestroke alphabet,
load the package \Lpack{mathpazo} with the package option +[noBBppl]+, see above.
@@ -386,29 +386,29 @@ one of these packages, using the +\euro+ command from the
\subsection{Font size of the `large' math symbols}
-With \Lpack{mathpazo}, the `large' math symbols are automatically
-scaled to fit the base font size.
-In contrast to standard \LaTeX{} you need not
+With \Lpack{mathpazo}, the `large' math symbols are automatically
+scaled to fit the base font size.
+In contrast to standard \LaTeX{} you need not
load the package \Lpack{exscale} for this purpose!
\subsection{Known problems}
In contrast to the standard CM fonts, the virtual \Lpack{mathpazo} fonts
-do not provide any Greek letters in the math alphabet +\mathrm+.
-Applying this math alphabet command to Greek letters
+do not provide any Greek letters in the math alphabet +\mathrm+.
+Applying this math alphabet command to Greek letters
will result in garbage output.
\section{The package \Lpack{mathptmx}}
\label{sec:mathptmx}
-Loading this package changes the default roman font family
-to Times, and the virtual `mathptmx' fonts will be used
-for math.
+Loading this package changes the default roman font family
+to Times, and the virtual `mathptmx' fonts will be used
+for math.
These virtual fonts are made up basically from Times Italic, with the
-missing math symbols coming from CM, RSFS (for +\mathcal+) and
-Adobe~Symbol.
+missing math symbols coming from CM, RSFS (for +\mathcal+) and
+Adobe~Symbol.
\subsection{Package options}
\begin{decl}
@@ -429,8 +429,8 @@ Upright \emph{lowercase} Greek is, however, not available.
\subsection{Font size of the `large' math symbols}
-With \Lpack{mathptmx}, the `large' math symbols are automatically scaled
-to fit the base font size. In contrast to standard \LaTeX{} you need not
+With \Lpack{mathptmx}, the `large' math symbols are automatically scaled
+to fit the base font size. In contrast to standard \LaTeX{} you need not
load the package \Lpack{exscale} for this purpose!
@@ -439,7 +439,7 @@ load the package \Lpack{exscale} for this purpose!
\item There are no bold math fonts, and +\boldmath+ has no effect.
Use of the package \Lpack{bm} in conjunction with \Lpack{mathptmx}
is not recommended.
- \item The symbols
+ \item The symbols
+\jmath+, +\coprod +and +\amalg+
are not available.
\end{itemize}
@@ -449,10 +449,10 @@ load the package \Lpack{exscale} for this purpose!
\section{The package \Lpack{pifont}}
\label{sec:pifont}
-Using symbol fonts is supported by means of the
+Using symbol fonts is supported by means of the
\Lpack{pifont} package, providing commands for using the Zapf Dingbats font,
as well as an interface to other families.\footnote{%
-This section was adopted, with minor changes,
+This section was adopted, with minor changes,
from \cite{companion}, 1st ed.}
\subsection{Commands for using Zapf Dingbats}
@@ -462,8 +462,8 @@ from \cite{companion}, 1st ed.}
\end{decl}
A given character can be chosen via the +\ding+ command.
-Its parameter is an integer that specifies the character to be
-typeset. For example, +\ding{38}+ gives \ding{38};
+Its parameter is an integer that specifies the character to be
+typeset. For example, +\ding{38}+ gives \ding{38};
see table~\vref{tab:dingbats}.
\begin{decl}
@@ -524,7 +524,7 @@ with a little space on the left and right:
\caption{The characters in the \ps{} font Zapf Dingbats}
\label{tab:dingbats}
\medskip
-
+
{\footnotesize
\begin{tabular}{|rr|rr|rr|rr|rr|rr|rr|rr|}
\hline
@@ -609,14 +609,14 @@ the specified symbol, with some space at the left and right
\section{NFSS classification}
-Table~\vref{tab:families} lists all text and symbol font shapes
+Table~\vref{tab:families} lists all text and symbol font shapes
supported by the basic PSNFSS distribution,
and the related \ps\ fonts.
\NEWdescription{2004-09-15 v9.2}
-With the exception of Charter and Utopia, these fonts are commercial products.
+With the exception of Charter and Utopia, these fonts are commercial products.
Therefore, most \TeX\ systems include free substitutes instead.
-Available encodings are OT1, T1 and TS1, except for
+Available encodings are OT1, T1 and TS1, except for
Symbol and Zapf~Dingbats, which are implemented with encoding U.
See \cite{fntguide} for how to access a given font shape directly.
@@ -628,14 +628,14 @@ whose typographical quality is -- at least -- questionable.
The math font families loaded by the
\Lpack{mathptm}, \Lpack{mathptmx}, \Lpack{mathpazo} and \Lpack{mathpple} packages
are not listed here.
-See the documented source file \texttt{psfonts.dtx}
+See the documented source file \texttt{psfonts.dtx}
for information on this topic.
\begin{table}[p]
\caption{Font shapes supported by the basic PSNFSS distribution}
\label{tab:families}
\medskip
-
+
{\small
\begin{tabularx}{\linewidth}{|l|l|l|>{\raggedright\arraybackslash}X|}
\hline
@@ -663,9 +663,9 @@ for information on this topic.
pnc & b & n, sl, it, sc & NewCenturySchlbk-Bold, NewCenturySchlbk-BoldItalic\\ \hline \hline
\multicolumn{4}{|c|}{\textit{Palatino}}\\ \hline
ppl & m & n, sl, it, sc & Palatino-Roman, Palatino-Italic\\ \hline
- ppl & b & n, sl, it, sc & Palatino-Bold, Palatino-BoldItalic\\ \hline
+ ppl & b & n, sl, it, sc & Palatino-Bold, Palatino-BoldItalic\\ \hline
pplx & m & n, it, sc & Palatino-Roman, Palatino-Italic, Palatino-SC\\ \hline
- pplx & b & n, it & Palatino-Bold, Palatino-BoldItalic\\ \hline
+ pplx & b & n, it & Palatino-Bold, Palatino-BoldItalic\\ \hline
pplj & m & n, it, sc & Palatino-Roman, Palatino-SC, Palatino-Italic, Palatino-ItalicOsF\\ \hline
pplj & b & n, it & Palatino-Bold, Palatino-BoldOsF, Palatino-BoldItalic, Palatino-BoldItalicOsF\\ \hline \hline
\multicolumn{4}{|c|}{\textit{Times}}\\ \hline
@@ -700,7 +700,7 @@ They are provided for compatibility with existing documents only.
\begin{tabular}{|l|p{1.8cm}p{2.2cm}p{2.4cm}p{2.2cm}|}
\hline
\textbf{package} & \textbf{roman} & \textbf{sans serif} & \textbf{typewriter} & \textbf{math} \\\hline\hline
-\Lpack{times} & Times
+\Lpack{times} & Times
& Helvetica
& Courier
& \\\hline
@@ -708,11 +708,11 @@ They are provided for compatibility with existing documents only.
& Helvetica
& Courier
& \\\hline
-\Lpack{mathptm} & Times
+\Lpack{mathptm} & Times
&
&
& $\approx$ Times\\\hline
-\Lpack{mathpple} & Palatino
+\Lpack{mathpple} & Palatino
&
&
& $\approx$ Palatino\\\hline
@@ -727,10 +727,10 @@ They are provided for compatibility with existing documents only.
\subsection{The packages \Lpack{times} and \Lpack{palatino}}
-These packages do not load suitable math fonts,
-and they do not scale the Helvetica fonts appropriately
+These packages do not load suitable math fonts,
+and they do not scale the Helvetica fonts appropriately
to match Times and Palatino -- see section \ref{sec:helvet}.
-Use \Lpack{mathptmx} or \Lpack{mathpazo} in conjunction with
+Use \Lpack{mathptmx} or \Lpack{mathpazo} in conjunction with
\Lpack{helvet} and \Lpack{courier} instead!
In case you need to load Times or Palatino \emph{without} the
@@ -740,7 +740,7 @@ basic NFSS commands. For instance,
+\renewcommand{\rmdefault}{ptm}+
\end{quote}
changes only the default roman font family to
-\texttt{ptm}, i.e.\ Times.
+\texttt{ptm}, i.e.\ Times.
\subsection{The package \Lpack{mathptm}}
The package \Lpack{mathptm} is a predecessor to \Lpack{mathptmx}.
@@ -755,7 +755,7 @@ be available in Type~1 format.
\Lpack{mathpple} is a predecessor to \Lpack{mathpazo},
using also a set of virtual math fonts to go with Palatino.
The Greek alphabet is, however, taken from the
-Euler fonts (which get slanted), rather than from the Pazo fonts.
+Euler fonts (which get slanted), rather than from the Pazo fonts.
The package \Lpack{mathpple} does not support the
Palatino SC/OsF fonts, and there is no `blackboard bold' math alphabet.
Further flaws are:
@@ -766,31 +766,31 @@ Further flaws are:
\item There are no bold variants of +\partial+ and +\infty+.
\item +\jmath+ is taken from the CM math italic font, which does
not blend well with Palatino.
- \item DVI viewers may exhibit problems as to rendering of the artificially slanted
+ \item DVI viewers may exhibit problems as to rendering of the artificially slanted
Greek letters.
\end{itemize}
The newer \Lpack{mathpazo} package can be considered as
-superior; yet you may still use \Lpack{mathpple}, if you prefer
+superior; yet you may still use \Lpack{mathpple}, if you prefer
the shape of its Greek letters.
\subsection{The package \Lpack{utopia}}
-Use %%\NEWdescription{2003-11-17 v9.1}
-of the \Lpack{utopia}
-package is no longer recommended, because
+Use %%\NEWdescription{2003-11-17 v9.1}
+of the \Lpack{utopia}
+package is no longer recommended, because
the newer package \Lpack{fourier} provides a basically improved
-interface to the Utopia typeface and loads suitable math fonts, too.
+interface to the Utopia typeface and loads suitable math fonts, too.
Notice that this package does \emph{not} belong to the PSNFSS collection!
-Furthermore, the \LaTeX3 team does no longer regard the Utopia
+Furthermore, the \LaTeX3 team does no longer regard the Utopia
fonts as a \emph{required} component of \LaTeX{},
-because their license does not comply with the strict
+because their license does not comply with the strict
guidelines of the FSF.
\section{Typeface samples}
The following samples show the regular font of each typeface family
-supported by PSNFSS.
+supported by PSNFSS.
The particular font size and baselineskip is indicated below the font name.
Notice that Helvetica is scaled to 92\,\% of the nominal size.
@@ -853,11 +853,11 @@ The PSNFSS system was originally developed by Sebastian Rahtz.
The virtual \Lpack{mathptm} and \Lpack{mathptmx} fonts and the related packages
were created by Alan Jeffrey, Sebastian Rathz and Ulrik Vieth.
-The \Lpack{mathpple} package and its virtual fonts are based
+The \Lpack{mathpple} package and its virtual fonts are based
on earlier work by Aloysius Helminck. Special thanks to Daniel Schlieper
without whose initiative the package would not have been developed.
-The Pazo math fonts and the related virtual fonts were created
+The Pazo math fonts and the related virtual fonts were created
by Diego Puga.
diff --git a/macros/latex/required/psnfss/test1.tex b/macros/latex/required/psnfss/test1.tex
index 77be282aeb..3e981080da 100644
--- a/macros/latex/required/psnfss/test1.tex
+++ b/macros/latex/required/psnfss/test1.tex
@@ -15,7 +15,7 @@
\maketitle
\def\Try#1#2{%
{\fontfamily{#1}\selectfont
-This is typeset in #2 (#1):
+This is typeset in #2 (#1):
\begin{quote}
\raggedright
A regular f\'ee costs 123\,\texteuro.\\
@@ -39,7 +39,7 @@ A regular f\'ee costs 123\,\texteuro.\\
Poppe for putting this in.}}
\begin{quote}
\raggedright
-\fontfamily{phv}\fontseries{mc}\selectfont
+\fontfamily{phv}\fontseries{c}\selectfont
\upshape A narrow f\'ee costs 123\,\texteuro.\\
\slshape A narrow slanted f\'ee costs 123\,\texteuro.\\
{\fontseries{bc}\selectfont
diff --git a/macros/luatex/optex/README b/macros/luatex/optex/README
index 5217287f83..2c8fa6652c 100644
--- a/macros/luatex/optex/README
+++ b/macros/luatex/optex/README
@@ -8,6 +8,12 @@ See http://petr.olsak.net/optex
History:
+<0.08> \numberedpar implmented. \emergencystretch=20pt added as default.
+ \inoval, \incircle, \clipinoval, \clipincircle imlemented.
+ \puttext, \putpic x,y instead -y,x (incompatible change!)
+ footnotes have separated color stack now.
+ \fnotelinks implemented.
+ Lists by \begitems...\enditems improved (\novspaces \_vspacehalf, \ilevel).
<0.07> demos: op-letter.tex and op-slides.tex added.
\inkinspic, \transformbox, \slides added.
documentation improved and updated.
diff --git a/macros/luatex/optex/colors.opm b/macros/luatex/optex/colors.opm
index c4ce83ecd9..90d3d6d7a3 100644
--- a/macros/luatex/optex/colors.opm
+++ b/macros/luatex/optex/colors.opm
@@ -37,9 +37,9 @@
\_def\_setcmykcolor#1{\_setcolor{\_formatcmyk{#1}}}
\_def\_setrgbcolor#1{\_setcolor{\_formatrgb{#1}}}
\_def\_setgreycolor#1{\_setcolor{\_formatgrey{#1}}}
-\_def\_formatcmyk#1{#1 k #1 K}
-\_def\_formatrgb#1{#1 rg #1 RG}
-\_def\_formatgrey#1{#1 g #1 G}
+\_def\_formatcmyk#1{\_fillstroke{#1 k}{#1 K}}
+\_def\_formatrgb#1{\_fillstroke{#1 rg}{#1 RG}}
+\_def\_formatgrey#1{\_fillstroke{#1 g}{#1 G}}
\_public \setcmykcolor \setrgbcolor \setgreycolor ;
\_doc -----------------------------
@@ -50,15 +50,19 @@
The `\onlycmyk` macro does a similar work, it re-defines `\_formatrgb`
macro. The Grey color space is unnchanged and works in both main
settings (RGB or CMYK) without collisions.
+ The `\_fillstroke` uses the same color for fills and strokes.
+ If only fills are needed to declare do `\def\_fillstroke#1#2{#1}`.
+ If only strokes are needed to declare do `\def\_fillstroke#1#2{#2}`.
\_cod -----------------------------
+\_def\_fillstroke#1#2{#1 #2}
\_def\_onlyrgb{\_def\Red{\_setrgbcolor{1 0 0}}%
\_def\Green{\_setrgbcolor{0 1 0}}\_def\Blue{\_setrgbcolor{0 0 1}}%
\_let\_colordef=\_rgbcolordef
- \_def\_formatrgb##1{##1 rg ##1 RG}%
- \_def\_formatcmyk##1{\_cmyktorgb ##1 ; rg \_cmyktorgb ##1 ; RG}}
-\_def\_onlycmyk{\_def\_formatcmyk##1{##1 k ##1 K}%
- \_def\_formatrgb##1{\_rgbtocmyk ##1 ; k \_rgbtocmyk ##1 ; K}}
+ \_def\_formatrgb##1{\_fillstroke{##1 rg}{##1 RG}}%
+ \_def\_formatcmyk##1{\_fillstroke{\_cmyktorgb ##1 ; rg}{\_cmyktorgb ##1 ; RG}}}
+\_def\_onlycmyk{\_def\_formatcmyk##1{\_fillstroke{##1 k}{##1 K}}%
+ \_def\_formatrgb##1{\_fillstroke{\_rgbtocmyk ##1 ; k}{\_rgbtocmyk ##1 ; K}}}
\_public \onlyrgb \onlycmyk ;
\_doc -----------------------------
@@ -81,7 +85,8 @@
}
\_def\_pdfblackcolor{0 g 0 G}
\_edef\_currentcolor{\_pdfblackcolor}
-\_def\_ensureblackA#1{\_colorstackpush\_pdfblackcolor #1\_colorstackpop}
+\_def\_ensureblackA#1{\_global\_let\_openfnotestack=\_openfnotestackA
+ \_colorstackpush\_pdfblackcolor #1\_colorstackpop}
\_doc -----------------------------
The colorstack is initialized here and basic macros
@@ -95,6 +100,16 @@
\_def\_colorstackset#1{\_pdfcolorstack\_colorstackcnt set{#1}}
\_doc -----------------------------
+ We need to open a special color stack for footnotes, because footnotes
+ can follow on next pages and their colors are independent on colors
+ used in man page-body.
+ \_cod -----------------------------
+
+%\_mathchardef\_fnotestack=\_pdfcolorstackinit page {0 g 0 G}
+% must be in \everyjob^^^
+\_def \_openfnotestackA {\_pdfcolorstack\_fnotestack current}
+
+ \_doc -----------------------------
We use lua codes for RGB to CMYK or CMYK to RGB conversions and for
addition color components in the `\colordef` macro.
`\_rgbtocmyk <R> <G> <B> ;` expands to <C> <M> <Y> <K>.
diff --git a/macros/luatex/optex/doc/optex-doc.pdf b/macros/luatex/optex/doc/optex-doc.pdf
index 8ce027841f..b366233d9f 100644
--- a/macros/luatex/optex/doc/optex-doc.pdf
+++ b/macros/luatex/optex/doc/optex-doc.pdf
Binary files differ
diff --git a/macros/luatex/optex/doc/optex-doc.tex b/macros/luatex/optex/doc/optex-doc.tex
index 7035a0866f..0a1b6b5d8a 100644
--- a/macros/luatex/optex/doc/optex-doc.tex
+++ b/macros/luatex/optex/doc/optex-doc.tex
@@ -22,7 +22,7 @@
\tit \OpTeX/\nl Format Based on Plain \TeX/ and OPmac\fnotemark1
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\hfill Version 0.07
+\hfill Version 0.08
\centerline{\it Petr Olšák, 2020}
@@ -529,10 +529,10 @@ contents if `\notoc` precedes.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Apart from chapters, sections and subsections, there are another
-automatically numbered objects: equations and captions for tables and
-figures.
+automatically numbered objects: equations, captions for tables and
+figures. The user can declare more numbered object.
-If user writes the `\eqmark` as the last element of the display mode then
+If the user writes the `\eqmark` as the last element of the display mode then
this equation is numbered. The equation number is printed in brackets. This number
resets in each section by default.
@@ -556,7 +556,7 @@ The `\cskip` creates appropriate vertical space between them. Example:
\begtt
\caption/t The dependency of the computer-dependency on the age.
\cskip
-\hfil\table{rl}{
+\noindent\hfil\table{rl}{
age & value \crl\noalign{\smallskip}
0--1 & unmeasured \cr
1--6 & observable \cr
@@ -572,7 +572,8 @@ This example produces:
\medskip
\caption/t The dependency of the computer-dependency on the age.
\cskip
-\hfil\table{rl}{age & value \crl\noalign{\smallskip}
+\noindent\hfil\table{rl}{
+ age & value \crl\noalign{\smallskip}
0--1 & unmeasured \cr
1--6 & observable \cr
6--12 & significant \cr
@@ -602,6 +603,28 @@ Example:
\endinsert
\endtt
+\new
+There are five prepared counters `A`, `B`, `C`, `D` and `E`.
+They are reset in each chapter and section\fnote
+{This feature can be changed, see the `sections.opm` in the technical documentation.}.
+They can be used in context of `\numberedpar <letter>{<text>}`
+macro. For example:
+\begtt
+\def\theorem {\numberedpar A{Theorem}}
+\def\corollary {\numberedpar A{Corollary}}
+\def\definition {\numberedpar B{Definition}}
+\def\example {\numberedpar C{Example}}
+\endtt
+%
+Three independent numbers are used in this example. One for Theorems and Corollaries
+second for Definitions and third for Examples. The user can write
+`\theorem Let $M$ be...` and the new paragraph is started with the text:
+{\bf Theorem 2.3.1.} Let $M$ be...
+You can add an optional parameter in brackets. For example,
+`\theorem [(L'Hôpital's rule)] Let $f$, $g$ be...`
+is printed like {\bf Theorem 2.4.2 (L'Hôpital's rule).} Let $f$, $g$ be...
+
+
\secc References
%%%%%%%%%%%%%%%
@@ -618,7 +641,7 @@ Example:
\begtt
\sec[beatle] About Beatles
-\hfil\table{rl}{...} % the table
+\noindent\hfil\table{rl}{...} % the table
\cskip
\caption/t [comp-depend] The dependency of the computer-dependency on the age.
@@ -634,6 +657,11 @@ If there are forward referenced objects then user have to run \TeX{} twice.
During each pass, the working `*.ref` file (with references data) is created
and this file is used (if it exists) at the beginning of the document.
+You can use `\label[<label>]` before `\theorem`, `\definition` (macros defined by
+`\numberedpar`) if you want to reference these numbered objects.
+You can't use `\theorem[<label>]` because the optional parameter
+is reserved to another purpose.
+
You can create a reference to whatever else by commands
`\label[<label>]\wlabel{<text>}`. The connection between <label> and
<text> is established. The `\ref[<label>]` will print <text>.
@@ -642,6 +670,7 @@ By default, labels are not printed, of course. But if you are preparing a
draft version of document, you can declare `\showlabels`. The labels
are printed at their destination places after such declaration.
+
\secc Hyperlinks, outlines
%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -677,6 +706,11 @@ color. Example:
By default these macros are not defined. It means that no frames are created.
+The hyperlinked footnotes can be activated by `\fnotelinks <color-fnt> <color-fnf>`
+where footnote marks in text have `<color-fnt>` and the same footnote marks
+in footnotes have <color-fnf>. You can define relevant borders
+`\fntborder` and `\fnfborder` analogically as `\pgboreder` (for example).
+
There are \"low level" commands to create the links. You can specify the
destination of the internal link by `\dest[<type>:<label>]`. The
active text linked to the `\dest` can be created by
@@ -774,7 +808,16 @@ Another style can be defined by the command `\sdef{_item:<style>}{<text>}`.
Default item can be set by `\defaultitem={<text>}`.
The list environments can be nested. Each new level of item is indented by
next multiple of `\iindent` which is set to `\parindent` by default.
-More information about design of lists of items are in the `lists.opm` file.
+The `\ilevel` register says what level of items is currently processed.
+Each `\begitems` starts `\everylist` tokens register. You can set, for
+example:
+\begtt
+\everylist={\ifcase\ilevel\or \style X \or \style x \else \style - \fi}
+\endtt
+
+You can say `\begitems \novspaces` if you don't want vertical spaces above
+and below the list.
+More information about design of lists of items should be found in the `lists.opm` file.
\secc Tables
%%%%%%%%%%%
@@ -795,7 +838,7 @@ These letters can be combined by the `|` character (vertical line). Example
generates the following result:
\bigskip
-\hfil\table{||lc|r||}{ \crl
+\noindent\hfil\table{||lc|r||}{ \crl
Month & commodity & price \crli \tskip2pt
January & notebook & \$ 700 \cr
February & skateboard & \$ 100 \cr
@@ -1428,6 +1471,7 @@ third: \pdfsave \pdfrotate{-15.3}\pdfsetmatrix{2 0 1.5 2}\rlap{text3}\pdfrestore
You can see that \TeX/ knows nothing about dimensions of transfomed material,
it treats it as with a zero dimension object.
+\new
This problem is solved by the `\transformbox{<transformation>}{<text>}`
macro which puts the transformed
material to a box with relevant dimension. The <transfromation> parameter
@@ -1440,6 +1484,70 @@ creates \frame{\transformbox{\pdfscale{1}{1.5}\pdfrotate{-10}}{moj}}.
The `\rotbox{<deg>}{<text>}` is a shortcut for
`\transformbox{\pdfrotate{<deg>}}{<text>}`.
+\secc Ovals, circles
+%%%%%%%%%%%%%%%%%%%%
+
+\new
+The `\inoval{<text>}` creates a box like this: \inoval{text}.
+Multiline text can be put in an oval by the command `\inoval{\vbox{<text>}}`.
+Local settings can be set by
+`\inoval[<settings>]{<text>}` or you can re-declare global settings by
+`\ovalparams={<settings>}`. The default settings are:
+
+\begtt
+\ovalparams={\roudness=2pt % diameter of circles in the corners
+ \fcolor=\Yellow % color used for filling oval
+ \lcolor=\Red % line color used in the border
+ \lwidth=0.5bp % line width in the border
+ \shadow=N % use a shadow effect
+ \overlapmargins=N % ignore margins by surrounding text
+ \hhkern=0pt \vvkern=0pt} % left-righ margin, top-bottom margin
+\endtt
+The total distance from text to oval boundary is `\hhkern+\roudness` at the left and right
+sides and
+`\vvkern+\roundness` at the top and bottom sides of the text.
+
+If you need a setting for the `<text>` (color, size, font etc.), use
+`\oval{<text settings><text>}`.
+
+\new
+The `\incircle[\ratio=1.8]{<text>}` creates a box like this \incircle[\ratio=1.8]{text}.
+The `\ratio` is width/height. The usage is analogical like for oval.
+The default settings of parameters are
+
+\begtt
+\circleparams={\ratio=1 \fcolor=\Yellow \lcolor=\Red \lwidth=0.5bp
+ \shadow=N \ignoremargins=N \hhkern=2pt \vvkern=2pt}
+\endtt
+
+\new
+The macros `\clipinoval <x> <y> <width> <height> {<text>}`
+and `\clipincircle` (with the same parameters)
+print the `<text>` when a clipping path (oval or cirle) with given
+`<with>` and `<height>` shifted its center by `<x>` to right and by `<y>` to up
+is used.
+The `\roundness=5mm` is default for `\clipingoval` and user can change it.
+Example:
+
+\begtt
+\clipingcircle 3cm 3.5cm 6cm 7cm {\picw=6cm \inspic{myphoto.jpg}}
+\endtt
+
+\secc Putting images and texts wherever
+
+\new
+The `\puttext <x> <y> {<text>}` puts the `<text>` shifted by `<x>` right and by
+`<y>` up from current point of typesetting and does'n not change the
+position of the current point. Assume coordinate system with origin in the
+current point. Then `\puttext <x> <y> {<text>}` puts the text at the
+coordinates `<x>`, `<y>`. More exactly the left edge of its baseline is at that
+position.
+
+\new
+The `\putpic <x> <y> <width> <height> {<image>}` puts the `<image>` of given
+`<width>` and `<height>` at given position (its left-bottom corner).
+You can write `\nospec` instead `<width>` or `<height>` if this parameter is
+not given.
\sec Others
%%%%%%%%%%%
@@ -1503,7 +1611,7 @@ You can simply define your own quotes as shown in `languages.opm` file.
The `\"` is used for quotes visualy more similar to the `"` character which
can be primary quotes or secondary quotes depending on the language rules.
May be you want to alternate meaning of these two types of quotes. Use
-`\<isocode>quotes\atlquotes` in such case.
+`\<isocode>quotes\altquotes` in such case.
\secc Pre-defined styles
%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/macros/luatex/optex/fnotes.opm b/macros/luatex/optex/fnotes.opm
index 9f9a9d3f5e..91365879a9 100644
--- a/macros/luatex/optex/fnotes.opm
+++ b/macros/luatex/optex/fnotes.opm
@@ -1,6 +1,6 @@
%% This is part of OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \fnote {Footnotes, marginal notes OpTeX <2020-03-19>} % loaded in format
+\_codedecl \fnote {Footnotes, marginal notes OpTeX <2020-03-20>} % loaded in format
\_doc -----------------------------
\begitems
@@ -41,16 +41,20 @@
footnote itself, then you can define `\_printfnotemarkA` and `\_printfnotemarkB`.
The following example shows an implementation of hyperlinked footnotes
(from text to footnote and bacward):
- \begtt
- \def\_printfnotemarkA{\ilink[fnB:\the\gfnotenum]{\_printfnotemark}\dest[fnA::\the\gfnotenum]}
- \def\_printfnotemarkB{\ilink[fnA:\the\gfnotenum]{\_printfnotemark}\dest[fnB::\the\gfnotenum]}
- \endtt
\_cod -----------------------------
\_def \_printfnotemark {$^{\_fnotenum}$} % default footnote mark
\_def \_printfnotemarkA {\_printfnotemark} % footnote marks used in text
\_def \_printfnotemarkB {\_printfnotemark} % footnote marks used in front of footnotes
+\_def \_fnotelinks#1#2{% <inText color> <inFootnote color>
+ \_def\_printfnotemarkA{\_link[fnt:\the\_gfnotenum]{\_localcolor#1}{\_printfnotemark}%
+ \_dest[fnf:\the\_gfnotenum]}%
+ \_def\_printfnotemarkB{\_link[fnf:\the\_gfnotenum]{\_localcolor#2}{\_printfnotemark}%
+ \_dest[fnt:\the\_gfnotenum]}%
+}
+\public \fnotelinks ;
+
\_doc ----------------------------
Each footnote saves the `\_Xfnote` (without parameter) to the `.ref`
file (if `\openref`). We can create the mapping from <gfnotenum> to <pgfnotenum>
diff --git a/macros/luatex/optex/fonts-opmac.opm b/macros/luatex/optex/fonts-opmac.opm
index 20d6d45bf3..7827d76c65 100644
--- a/macros/luatex/optex/fonts-opmac.opm
+++ b/macros/luatex/optex/fonts-opmac.opm
@@ -1,6 +1,6 @@
%% This is part of OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \typosize {Font managing macros from OPmac <2020-02-29>} % loaded in format
+\_codedecl \typosize {Font managing macros from OPmac <2020-03-27>} % loaded in format
\_protected\_def \_typosize [#1/#2]{%
\_textfontsize{#1}\_mathfontsize{#1}\_setbaselineskip{#2}%
@@ -45,6 +45,7 @@
\_def\_setmainvalues {%
\_mainbaselineskip=\_baselineskip
\_mainfosize=\_optsize
+ \_topskip=\_mainfosize \_splittopskip=\_topskip % added 2020-03-27
\_bf \_it \_bi \_rm \_normalmath % load fonts if \typosize is running firstly
\_let \_setmainvalues =\_setmainvaluesL
}
diff --git a/macros/luatex/optex/graphics.opm b/macros/luatex/optex/graphics.opm
index d4a868a3d1..92a1a7a804 100644
--- a/macros/luatex/optex/graphics.opm
+++ b/macros/luatex/optex/graphics.opm
@@ -1,13 +1,13 @@
%% This is part of OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \inspic {Graphics <2020-03-18>} % preloaded in format
+\_codedecl \inspic {Graphics <2020-03-29>} % preloaded in format
\_doc -----------------------------
`\inspic` accepts old syntax `\inspic <filename><space>`
or new syntax `\inspic{<filename>}`. So, we need to define
two auxiliary macros `\_inspicA` and `\_inspicB`.
- You can include more `\pdfximage` parameters (like `page=`)
+ You can include more `\pdfximage` parameters (like `page<number>`)
in the `\_picparams` macro.
All `\inspic` macros are surrounded in `\hbox` in order user can
@@ -146,11 +146,11 @@
The `\_scantwodimens` scans two objects with the syntactic rule <dimen>
and returns `{<number>}{<number>}` in sp unit.
- The `\puttext <down> <right>{<text>}` puts the <text> to desired place:
+ The `\puttext <right> <up>{<text>}` puts the <text> to desired place:
From current point moves <down> and <right>, puts the <text> and returns
back. The cuuren tpoint is unchanged after this macro ends.
- The `\putpic <down> <right> <width> <height> {<image-file>}`
+ The `\putpic <right> <up> <width> <height> {<image-file>}`
does `\puttext` with the image scaled to desired <width> and <height>.
If <with> or <height> is zero, natural dimension is used.
The `\nospec` is a shortcut to such natural dimension.
@@ -158,18 +158,18 @@
\_def\_scantwodimens{%
\_directlua{tex.print(string.format('{\_pcent d}{\_pcent d}',
- token.scan_dimen(),token.scan_dimen{}))}%
+ token.scan_dimen(),token.scan_dimen()))}%
}
\_def\_puttext{\_ea\_ea\_ea\_puttextA\_scantwodimens}
\_def\_puttextA#1#2#3{\_setbox0=\_hbox{{#3}}\_dimen1=#1sp \_dimen2=#2sp \_puttextB}
\_def\_puttextB{%
- \_ifvmode
+ \_ifvmode
\_ifdim\_prevdepth>0pt \_vskip-\_prevdepth \_relax \_fi
\_nointerlineskip
\_fi
\_wd0=0pt \_ht0=0pt \_dp0=0pt
- \_vbox to0pt{\_kern\_dimen1 \_hbox to0pt{\_kern\_dimen2 \_box0\_hss}\_vss}}
+ \_vbox to0pt{\_kern-\_dimen2 \_hbox to0pt{\_kern\_dimen1 \_box0\_hss}\_vss}}
\_def\_putpic{\_ea\_ea\_ea\_putpicA\_scantwodimens}
\_def\_putpicA#1#2{\_dimen1=#1sp \_dimen2=#2sp \_ea\_ea\_ea\_putpicB\_scantwodimens}
@@ -183,5 +183,240 @@
\_def\nospec{0pt}
\_public \puttext \putpic \backgroundpic ;
+ \_doc -----------------------------
+ You can use expandable `\_bp{<dimen>}` convertor from
+ \TeX/ `<dimen>` (or from an expression accepted by
+ `\dimexpr` primitive) to a decimal value in big points
+ (used as natural unit in the PDF format). So, you can write, for example:
+ \begtt
+ \pdfliteral{q \_bp{.3\hsize-2mm} \_bp{2mm} m 0 \_bp{-4mm} l S Q}
+ \endtt
+ You can use expandable `\_expr{<expression>}` for analogical purposes.
+ The `<expression>` can include `+-*/()` and decimal numbers in common syntax.
+ \_cod -----------------------------
+
+\_def\_decdigits{3} % digits after decimal point in \_bp and \_expr outputs.
+\_def\_pttopb{%
+ \_directlua{tex.print(string.format('\_pcent.\_decdigits f',
+ token.scan_dimen()/65781.76))}% pt to bp conversion
+}
+\def\_bp#1{\_ea\_pttopb\_dimexpr#1\_relax}
+\def\_expr#1{\_directlua{tex.print(string.format('\_pcent.\_decdigits f',#1))}}
+
+ \_doc -----------------------------
+ `\)circle<x><y>` creates an ellipse with `<x>` axis and `<y>` axix.
+ The origin is in the center.
+ `\_oval<x><y><roudness>` creates an oval with `<x>`, `<y>` size and with
+ given `<roundness>`. The real size is bigger by 2`<roundness>`. The
+ orgigin is at the left bottom corner.
+ `\_mv<x><y>{<curve>}` moves current point to `<x>`, `<y>`, crates the
+ `<curve>` and retuns back the current point.
+ All these macros are fully expandable and they can be used in the
+ `\pdfliteral` argument.
+ \_cod -----------------------------
+
+\def\_circle#1#2{\_expr{.5*(#1)} 0 m
+ \_expr{.5*(#1)} \_expr{.276*(#2)} \_expr{.276*(#1)} \_expr{.5*(#2)} 0 \_expr{.5*(#2)} c
+ \_expr{-.276*(#1)} \_expr{.5*(#2)} \_expr{-.5*(#1)} \_expr{.276*(#2)} \_expr{-.5*(#1)} 0 c
+ \_expr{-.5*(#1)} \_expr{-.276*(#2)} \_expr{-.276*(#1)} \_expr{-.5*(#2)} 0 \_expr{-.5*(#2)} c
+ \_expr{.276*(#1)} \_expr{-.5*(#2)} \_expr{.5*(#1)} \_expr{-.276*(#2)} \_expr{.5*(#1)} 0 c h}
+
+\def\_oval#1#2#3{0 \_expr{-(#3)} m \_expr{#1} \_expr{-(#3)} l
+ \_expr{(#1)+.552*(#3)} \_expr{-(#3)} \_expr{(#1)+(#3)} \_expr{-.552*(#3)}
+ \_expr{(#1)+(#3)} 0 c
+ \_expr{(#1)+(#3)} \_expr{#2} l
+ \_expr{(#1)+(#3)} \_expr{(#2)+.552*(#3)} \_expr{(#1)+.552*(#3)} \_expr{(#2)+(#3)}
+ \_expr{#1} \_expr{(#2)+(#3)} c
+ 0 \_expr{(#2)+(#3)} l
+ \_expr{-.552*(#3)} \_expr{(#2)+(#3)} \_expr{-(#3)} \_expr{(#2)+.552*(#3)}
+ \_expr{-(#3)} \_expr{#2} c
+ \_expr{-(#3)} 0 l
+ \_expr{-(#3)} \_expr{-.552*(#3)} \_expr{-.552*(#3)} \_expr{-(#3)} 0 \_expr{-(#3)} c h}
+
+\def\_mv#1#2#3{1 0 0 1 \_expr{#1} \_expr{#2} cm #3 1 0 0 1 \_expr{-(#1)} \_expr{-(#2)} cm}
+
+ \_doc -----------------------------
+ The `\inoval` is an example of `\_oval` usage.
+ The `\incircle` is an example of `\_circle` usage.
+ \_cod -----------------------------
+
+\_newdimen \_lwidth
+\_def\_fcolor{\_let\_fcolorvalue}
+\_def\_lcolor{\_let\_lcolorvalue}
+\_def\_shadow{\_let\_shadowvalue}
+\_def\_overlapmargins{\_let\_overlapmarginsvalue}
+\_def\_ratio{\isnextchar ={\_ratioA}{\_ratioA=}}
+\_def\_ratioA =#1 {\_def\_ratiovalue{#1}}
+\_def\_touppervalue#1{\_ifx#1n\_let#1=N\_fi}
+
+\_def\_setflcolors#1{% use only in a group
+ \_def\_setcolor##1{##1}%
+ \_def\_fillstroke##1##2{##1}%
+ \_edef#1{\_fcolorvalue}%
+ \_def\_fillstroke##1##2{##2}%
+ \_edef#1{#1\_space\_lcolorvalue\_space}%
+}
+
+\_optdef\_inoval[]{\_vbox\_bgroup
+ \_roundness=2pt \_fcolor=\Yellow \_lcolor=\Red \_lwidth=.5bp
+ \_shadow=N \_overlapmargins=N \_hhkern=0pt \_vvkern=0pt
+ \_the\_ovalparams \_relax \_the\_opt \_relax
+ \_touppervalue\_overlapmarginsvalue \_touppervalue\_shadowvalue
+ \_ifx\_overlapmarginsvalue N%
+ \_advance\_hsize by-2\_hhkern \_advance\_hsize by-2\_roundness \_fi
+ \_setbox0=\_hbox\_bgroup\_bgroup \_aftergroup\_inovalA \_kern\_hhkern \_let\_next=%
+}
+\_def\_inovalA{\_isnextchar\_colorstackpop\_inovalB\_inovalC}
+\_def\_inovalB#1{#1\_isnextchar\_colorstackpop\_inovalB\_inovalC}
+\_def\_inovalC{\_egroup % of \setbox0=\hbox\bgroup
+ \_ifdim\_vvkern=0pt \_else \_ht0=\_dimexpr\_ht0+\_vvkern \_relax
+ \_dp0=\_dimexpr\_dp0+\_vvkern \_relax \_fi
+ \_ifdim\_hhkern=0pt \_else \_wd0=\_dimexpr\_wd0+\_hhkern \_relax \_fi
+ \_ifx\_overlapmarginsvalue N\_dimen0=\_roundness \_dimen1=\_roundness
+ \_else \_dimen0=-\_hhkern \_dimen1=-\_vvkern \_fi
+ \_setflcolors\_tmp
+ \_hbox{\_kern\_dimen0
+ \_vbox to0pt{\_kern\_dp0
+ \_ifx\_shadowvalue N\_else
+ \_edef\_tmpb{{\_bp{\_wd0+\_lwidth}}{\_bp{\_ht0+\_dp0+\_lwidth}}{\_bp{\_roundness}}}%
+ \_doshadow\_oval
+ \_fi
+ \_pdfliteral{q \_bp{\_lwidth} w \_tmp
+ \_oval{\_bp{\wd0}}{\_bp{\_ht0+\_dp0}}{\_bp{\_roundness}} B Q}\_vss}%
+ \_ht0=\_dimexpr\_ht0+\_dimen1 \_relax \_dp0=\_dimexpr\_dp0+\_dimen1 \_relax
+ \_box0
+ \_kern\_dimen0}%
+ \_egroup % of \vbox\bgroup
+}
+\_optdef\_incircle[]{\_vbox\_bgroup
+ \_ratio=1 \_fcolor=\Yellow \_lcolor=\Red \_lwidth=.5bp
+ \_shadow=N \_overlapmargins=N \_hhkern=3pt \_vvkern=3pt
+ \_ea\_the \_ea\_circleparams \_space \_relax
+ \_ea\_the \_ea\_opt \_space \_relax
+ \_touppervalue\_overlapmarginsvalue \_touppervalue\_shadowvalue
+ \_setbox0=\_hbox\_bgroup\_bgroup \_aftergroup\_incircleA \_kern\_hhkern \_let\_next=%
+}
+\_def\_incircleA {\_isnextchar\_colorstackpop\_incircleB\_incircleC}
+\_def\_incircleB #1{#1\_isnextchar\_colorstackpop\_incircleB\_incircleC}
+\_def\_incircleC {\_egroup % of \setbox0=\hbox\bgroup
+ \_wd0=\dimexpr \_wd0+\_hhkern \_relax
+ \_ht0=\dimexpr \_ht0+\_vvkern \_relax \_dp0=\dimexpr \_dp0+\_vvkern \_relax
+ \_ifdim \_ratiovalue\_dimexpr \_ht0+\_dp0 > \_wd0
+ \_dimen3=\_dimexpr \_ht0+\_dp0 \_relax \_dimen2=\_ratiovalue\_dimen3
+ \_else \_dimen2=\_wd0 \_dimen3=\_expr{1/\_ratiovalue}\_dimen2 \fi
+ \_setflcolors\_tmp
+ \_ifx\_overlapmarginsvalue N\_dimen0=0pt \_dimen1=0pt
+ \_else \_dimen0=-\hhkern \_dimen1=-\vvkern \_fi
+ \_hbox{\_kern\dimen0
+ \_ifx\_shadowvalue N\_else
+ \_edef\_tmpb{{\_bp{\_dimen2+\_lwidth}}{\_bp{\_dimen3+\_lwidth}}{}}%
+ \_doshadow\_circlet
+ \_fi
+ \_pdfliteral{q \_bp{\_lwidth} w \_tmp \_mv{\_bp{.5\_wd0}}{\_bp{(\ht0-\dp0)/2}}
+ {\_circle{\_bp{\_dimen2}}{\_bp{\_dimen3}} B} Q}%
+ \_ifdim\_dimen1=0pt \_else
+ \_ht0=\dimexpr \_ht0+\_dimen1 \_relax \_dp0=\dimexpr \_dp0+\_dimen1 \_relax \_fi
+ \_box0
+ \_kern\_dimen0}
+ \_egroup % of \vbox\bgroup
+}
+\_def\_circlet#1#2#3{\_circle{#1}{#2}}
+
+\_public
+ \inoval \incircle \ratio \lwidth \fcolor \lcolor \shadow \overlapmargins ;
+
+ \_doc -----------------------------
+ A shadow effect is implemented here. The shadow is equal to the
+ silhouette of the given path in gray-transparent color shifted by
+ `\shadowmoveto` vector and with blurred boundary.
+ A waistline with the width 2*`\shadowb` around the boundary is blurred.
+ The `\shadowlevels` levels of transparent shapes is used for creating
+ this effect. The `\shadowlevels+1/2` level is equal to the shifted given path.
+ \_cod -----------------------------
+
+\_def\_shadowlevels{9} % number of layers for blurr effect
+\_def\_shadowdarknessA{0.025} % transparency of first shadowlevels/2 layers
+\_def\_shadowdarknessB{0.07} % transparency of second half of layers
+\_def\_shadowmoveto{1.8 -2.5} % vector defines shifting layer (in bp)
+\_def\_shadowb{1} % 2*shadowb = blurring area thickness
+
+ \_doc -----------------------------
+ The `\_pdfpageresources` primitive is used to define transparency.
+ It does not work when used in a box. So, we use it at begining of
+ output routine. The modification of output routine is done only once
+ when the shadow effect is used first.
+ \_cod -----------------------------
+
+\_def\_insertshadowresources{%
+ \_global\_addto\_begoutput{\_setshadowresources}%
+ \_xdef\_setshadowresources{%
+ \_pdfpageresources{/ExtGState
+ <<
+ /op1 << /Type /ExtGState /ca \_shadowdarknessA >>
+ /op2 << /Type /ExtGState /ca \_shadowdarknessB >>
+ >>
+ }%
+ }%
+ \_global\_let\_insertshadowresources=\_relax
+}
+\_def\_doshadow#1{\_vbox{%
+ \_insertshadowresources
+ \_tmpnum=\_numexpr (\_shadowlevels-1)/2 \_relax
+ \_edef\_tmpfin{\_the\_tmpnum}%
+ \_ifnum\_tmpfin=0 \_def\_shadowb{0}\_def\_shadowstep{0}%
+ \_else \_edef\_shadowstep{\_expr{\_shadowb/\_tmpfin}}\_fi
+ \_def\_tmpa##1##2##3{\_def\_tmpb
+ {#1{##1+2*\_the\_tmpnum*\_shadowstep}{##2+2*\_the\_tmpnum*\_shadowstep}{##3}}}%
+ \_ea \_tmpa \_tmpb
+ \_def\_shadowlayer{%
+ \_ifnum\_tmpnum=0 /op2 gs \_fi
+ \_tmpb\_space f
+ \_immediateassignment\_advance\_tmpnum by-1
+ \_ifnum-\_tmpfin<\_tmpnum
+ \_ifx#1\_oval 1 0 0 1 \_shadowstep\_space \_shadowstep\_space cm \_fi
+ \_ea \_shadowlayer \_fi
+ }%
+ \_pdfliteral{q /op1 gs 0 g 1 0 0 1 \_shadowmoveto\_space cm
+ \_ifx#1\_circlet 1 0 0 1 \_expr{\_bp{.5\_wd0}} \_expr{\_bp{(\_ht0-\_dp0)/2}} cm
+ \_else 1 0 0 1 -\_shadowb\_space -\_shadowb\_space cm \_fi
+ \_shadowlayer Q}
+}}
+
+ \_doc -----------------------------
+ A generic macro `\clipinpath{<x>}{<y>}{<curve>}{<text>}` declares
+ a clipping path by <curve> shifted by <x>, <y>. The <text> is typesset
+ when such clipping path is active. Dimensions are given by bp without the unit here.
+ Macros `\clipinoval <x> <y> <width> <height> {<text>}` and
+ `\clipincircle <x> <y> <width> <height> {<text>}` are defined here.
+ These marcos read normal \TeX/ dimensions in their parameters.
+ \_cod -----------------------------
+
+\_def\_clipinpath#1#2#3#4{% #1=x-pos[bp], #2=y-pos[bp], #3=curve, #4=text
+ \_hbox{\setbox0=\hbox{{#4}}%
+ \_tmpdim=\wd0 \wd0=0pt
+ \_pdfliteral{q \_mv{#1}{#2}{#3 W n}}%
+ \_box0\_pdfliteral{Q}\_kern\_tmpdim
+ }%
+}
+
+\_def\_clipinoval {\_ea\_ea\_ea\_clipinovalA\_scantwodimens}
+\_def\_clipinovalA #1#2{%
+ \_def\_tmp{{#1/65781.76}{#2/65781.76}}%
+ \_ea\_ea\_ea\_clipinovalB\_scantwodimens
+}
+\_def\_clipinovalB{\_ea\_clipinovalC\_tmp}
+\_def\_clipinovalC#1#2#3#4{%
+ \_ea\_clipinpath{#1-(#3/131563.52)+(\_bp{\_roundness})}{#2-(#4/131563.52)+(\_bp{\_roundness})}%
+ {\_oval{#3/65781.76-(\_bp{2\_roundness})}{#4/65781.76-(\_bp{2\_roundness})}{\_bp{\_roundness}}}%
+}
+\_def\_clipincircle {\_ea\_ea\_ea\_clipincircleA\_scantwodimens}
+\_def\_clipincircleA #1#2{%
+ \_def\_tmp{{#1/65781.76}{#2/65781.76}}%
+ \_ea\_ea\_ea\_clipincircleB\_scantwodimens
+}
+\_def\_clipincircleB#1#2{%
+ \_ea\_clipinpath\_tmp{\_circle{#1/65781.76}{#2/65781.76}}%
+}
+
\_endcode % -------------------------------------
diff --git a/macros/luatex/optex/lists.opm b/macros/luatex/optex/lists.opm
index adc28a3617..067fa4a7d9 100644
--- a/macros/luatex/optex/lists.opm
+++ b/macros/luatex/optex/lists.opm
@@ -6,11 +6,20 @@
`\aboveliskip` is used above the list of items,
`\belowliskip` is used below the list of items and
`\interliskip` is used between items.
+ `\listskipA` is used as `\listskipamount` at level 1 of items.
+ `\listskipB` is used as `\listskipamount` at other levels.
\_cod -----------------------------
-\_def\_aboveliskip {\_removelastskip \_penalty-100 \_medskip}
-\_def\_belowliskip {\_penalty-200 \_medskip}
+\_def\_aboveliskip {\_removelastskip \_penalty-100 \_vskip\_listskipamount}
+\_def\_belowliskip {\_penalty-200 \_vskip\_listskipamount}
\_def\_interliskip {}
+\_def\_listskipA {\_medskipamount}
+\_def\_listskipB {0pt plus.5\smallskipamount}
+
+\_def\_setlistskip {%
+ \_ifnum \_ilevel = 1 \_listskipamount = \_listskipA \_relax
+ \_else \_listskipamount = \_listskipB \_relax
+ \_fi}
\_doc -----------------------------
The `\itemnum` is localy reset to zero in each group declared by
@@ -27,20 +36,30 @@
\_newcount\_itemnum \_itemnum=0
\_newtoks\_printitem
-\_def\_begitems{\_par \_ifnum\_lastpenalty<10000 \_aboveliskip \_fi
+\_def\_begitems{\_par
\_bgroup
+ \_advance \_ilevel by1
+ \_setlistskip
+ \_ifnum\_lastpenalty<10000 \_aboveliskip \_fi
\_itemnum=0 \_adef*{\_startitem}
\_advance\_leftskip by\_iindent
\_printitem=\_defaultitem
- \_the\_everybegitems
+ \_the\_everylist \_relax
}
-\_def\_enditems{\_par\_egroup\_belowliskip}
+\_def\_enditems{\_par\_belowliskip\_egroup}
\_def\_startitem{\_par \_ifnum\_itemnum>0 \_interliskip \_fi
\_advance\_itemnum by1
\_the\_everyitem \_noindent\_llap{\_the\_printitem}\_ignorespaces
}
+ \_doc ----------------------------
+ `\novspaces` sets `\listsipamount` to 0pt.
+ \_cod ----------------------------
+
+\_def\_novspaces {\_removelastskip \_listskipamount=0pt \_relax}
+\_public \novspaces ;
+
\_doc -----------------------------
Various item marks are saved in `\_item:<letter>` macros.
You ca re-define then or define more such macros.
diff --git a/macros/luatex/optex/makeindex.opm b/macros/luatex/optex/makeindex.opm
index 5f13f5ca5a..2a783d8895 100644
--- a/macros/luatex/optex/makeindex.opm
+++ b/macros/luatex/optex/makeindex.opm
@@ -1,6 +1,6 @@
%% This is part of OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \makeindex {Makeindex and sorting <2020-03-16>} % loaded in format
+\_codedecl \makeindex {Makeindex and sorting <2020-04-26>} % loaded in format
\_doc -----------------------------
`\makeindex` implements sorting algorithm at \TeX/ macrolanguage level.
@@ -67,8 +67,10 @@
these declared characters are used.
The characters declared in `\_ignoredchars` are ignored in first pass
- without additional condidion. They are ignored in second pass only if
- they are not mentioned in the `\_sortingdata<iso-code>` macro.
+ without additional condidion. All characters are taken into acount in
+ second pass: ASCII characters with code $<65$ are sorted first if they
+ are not mentioned in the `\_sortingdata<iso-code>` macro.
+ Others not mentioned characters have undefined behavior during sorting.
\_cod -----------------------------
\_def \_ignoredcharscs {.,;?!:'"|()[]<>=+}
@@ -116,7 +118,7 @@
\_ifx##1,\_advance\_tmpnum by1
\_else \_lccode`##1=\_tmpnum \_fi
\_ea\_act \_fi}%
- \_tmpnum=60 \_ea\_act \_sortingdata \_relax
+ \_tmpnum=65 \_ea\_act \_sortingdata \_relax
\_def \_act ##1{\_ifx##1\_relax \_else
\_lccode`##1=`\^^I
\_ea\_act \_fi}%
@@ -131,7 +133,7 @@
\_def \_act ##1{\_ifx##1\_relax \_else
\_ifx##1,\_else \_advance\_tmpnum by1 \_lccode`##1=\_tmpnum \_fi
\_ea\_act \_fi}%
- \_tmpnum=60 \_ea\_act \_sortingdata \_relax
+ \_tmpnum=65 \_ea\_act \_sortingdata \_relax
}
\_doc -----------------------------
diff --git a/macros/luatex/optex/multicolumns.opm b/macros/luatex/optex/multicolumns.opm
index 291eb1cfd0..cf4d26bbb4 100644
--- a/macros/luatex/optex/multicolumns.opm
+++ b/macros/luatex/optex/multicolumns.opm
@@ -1,6 +1,6 @@
%% This is part of OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \begmulti {Balanced columns <2020-03-08>} % preloaded in format
+\_codedecl \begmulti {Balanced columns <2020-03-26>} % preloaded in format
\_doc -----------------------------
This code is documented in detail in the \"\TeX/book naruby", pages 244--246,
@@ -33,7 +33,7 @@
\_def\par{\_ifhmode\_endgraf\_global\_advance\_mullines by\_prevgraf\_fi}%
}
\_def\_endmulti{\_vskip-\_prevdepth\_vfil
- \_expandafter\_egroup\_expandafter\_baselineskip\_the\_baselineskip\_relax
+ \_ea\_egroup\_ea\_baselineskip\_the\_baselineskip\_relax
\_dimen0=.8\_maxdimen \_tmpnum=\_dimen0 \_divide\_tmpnum by\_baselineskip
\_splittopskip=\_baselineskip
\_setbox1=\_vsplit6 to0pt
@@ -68,10 +68,10 @@
\_divide\_dimen0 by\_Ncols \_relax
\_ifx\_balancecolumns\_flushcolumns \_advance\_dimen0 by-.5\_vsize \_fi
\_dimen1=\_vsize \_corrsize{\_dimen1}\_dimen2=\_dimen1
- \_advance\_dimen2 by-\_Ncols\_baselineskip
+ \_advance\_dimen2 by-\_baselineskip
%% split the material to more pages?
\_ifvoid6 \_else
- \_ifdim \_dimen0>\_dimen2 \_expandafter\_expandafter\_expandafter \_splitpart
+ \_ifdim \_dimen0>\_dimen2 \_ea\_ea\_ea \_splitpart
\_else \_balancecolumns % last balancing
\_fi \_fi
}
@@ -88,7 +88,7 @@
\_ifvoid6 \_else
\_advance \_dimen0 by.2\_baselineskip
\_setbox6=\_copy7
- \_expandafter \_tmp \_fi}\_tmp
+ \_ea \_tmp \_fi}\_tmp
\_hbox{}\_nobreak\_vskip-\_splittopskip \_nointerlineskip
\_hbox to\_hsize{\_unhbox1\_unskip}%
\_egroup
diff --git a/macros/luatex/optex/op-slides.tex b/macros/luatex/optex/op-slides.tex
index fb691fcd9d..1787cf3aff 100644
--- a/macros/luatex/optex/op-slides.tex
+++ b/macros/luatex/optex/op-slides.tex
@@ -167,32 +167,32 @@ The previous page was created by:
\pg; %------------------------------------------------------------------
-\sec Putting images and text wherever
+\sec Putting images and texts wherever
-* `\puttext <down> <right> {<text>}` puts a <text> to the desired place:
- It moves the current point <down> and <right>, puts the <text> and returns
+* `\puttext <right> <up> {<text>}` puts a <text> to the desired place:
+ It moves the current point <right> and <up>, puts the <text> and returns
back, so the typesetting continues from previous position. The parameters
- <down> and <right> are dimensions. For example
+ <right> and <up> are dimensions. For example
\begtt
-\puttext -50mm 0mm {\Red HELLO}
+\puttext 0mm 50mm {\Red HELLO}
\endtt
- \puttext -50mm 0mm {\Red HELLO}
+ \puttext 0mm 50mm {\Red HELLO}
prints red HELLO, as shown here.\pg+
-* `\putpic <down> <right> <width> <height> {<image-file>}`
+* `\putpic <right> <up> <width> <height> {<image-file>}`
puts the image with desired <width> and <height> at the position like
`\puttext` puts the text.
- \putpic -20mm .8\hsize 30mm \nospec {op-ring.png}
+ \putpic .8\hsize 20mm 30mm \nospec {op-ring.png}
* The ring above is the result of
\begtt
-\putpic -20mm .8\hsize 30mm \nospec {op-ring.png}
+\putpic .8\hsize 20mm 30mm \nospec {op-ring.png}
\endtt
%
- used ad beginning of this paragraph.\pg+
+ used at beginning of this paragraph.\pg+
* Use `\nospec` for <width> or <height> of the image if you don't want to specify both
dimensions (because you don't want to change the image aspect ratio).
diff --git a/macros/luatex/optex/optex.ini b/macros/luatex/optex/optex.ini
index e4a09eec0a..31d5f5171a 100644
--- a/macros/luatex/optex/optex.ini
+++ b/macros/luatex/optex/optex.ini
@@ -16,11 +16,12 @@
\catcode `\^^I=10 % ascii tab is a blank space
\catcode `\_=11 % underline can be used in control sequences
\catcode `\~=13 % tilde is active
+\catcode `\^^a0=13 % non breaking space in Unicode
\catcode 127=12 % normal character
% OpTeX version
-\def\optexversion{Alpha 0.07 Mar 2020}
+\def\optexversion{Alpha 0.08 Mar 2020}
% Engine testing:
@@ -86,6 +87,7 @@
\_everyjob = {%
\_message{This is OpTeX (Olsak's Plain TeX), version <\optexversion>^^J}%
+ \_mathchardef\_fnotestack=\_pdfcolorstackinit page {0 g 0 G}%
\_mathsbon % replaces \int_a^b to \int _a^b
\_inputref % inputs \jobname.ref if exists
}
diff --git a/macros/luatex/optex/others.opm b/macros/luatex/optex/others.opm
index 4c6b49dd2d..6c656ec0e0 100644
--- a/macros/luatex/optex/others.opm
+++ b/macros/luatex/optex/others.opm
@@ -27,11 +27,16 @@
\_let\chyph=\cslang \_let\shyph=\sklang
\_let\csUnicode=\csPatt \_let\czUnicode=\csPatt \_let\skUnicode=\skPatt
+% classical \ten* macros (keeps only preloaded fonts!)
+
\_let \letfont = \_fontlet
\_let \tenrm = \_tenrm \_let \tenbf = \_tenbf
\_let \tenit = \_tenit \_let \tenbi = \_tenbi
\_let \tentt = \_tentt
+% non breaking space in Unicode
+
+\let ^^a0=~
% TikZ needs these control sequences:
diff --git a/macros/luatex/optex/output.opm b/macros/luatex/optex/output.opm
index a81e5e8c0a..a10779e7a8 100644
--- a/macros/luatex/optex/output.opm
+++ b/macros/luatex/optex/output.opm
@@ -1,6 +1,6 @@
%% This is part of OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \nopagenumbers {Output routine <2020-03-15>} % preloaded in format
+\_codedecl \nopagenumbers {Output routine <2020-03-28>} % preloaded in format
\_doc -----------------------------
`\_optexouput` is default output routine. You can create another...
@@ -59,6 +59,7 @@
\_ensureblack{\_makefootline}}%
}
\_def \_ensureblack #1{#1} % will be re-defined by color macros
+\_let \_openfnotestack = \_relax % will be re-defined by color macros
\_def \_backgroundbox #1{\_moveleft\_hoffset\_vbox to0pt{\_kern-\voffset #1\_vss}}
\_doc -----------------------------
@@ -94,7 +95,7 @@
\_dimen0=\dp255 \_unvbox255 % open up \box255
\_ifvoid\_footins \_else % footnote info is present
\_vskip\_skip\_footins
- \_ensureblack{\_footnoterule \_unvbox\_footins}\fi
+ \_ensureblack{\_footnoterule \_openfnotestack \_unvbox\_footins}\fi
\_ifraggedbottom \kern-\_dimen0 \_vfil \_fi
}
\_def \_pagedest {{\_def\_destheight{25pt}\_dest[pg:\_the\_gpageno]}}
@@ -132,14 +133,18 @@
\_def \_opfootnote #1#2{\_insert\_footins\_bgroup
\_interlinepenalty=\_interfootnotelinepenalty
\_leftskip=0pt \_rightskip=0pt \_spaceskip=0pt \_xspaceskip=0pt \_relax
+ \_let\_colorstackcnt=\_fnotestack % special color stack for footnotes
#1\_relax % local settings used by \fnote macro
\_splittopskip=\_ht\_strutbox % top baseline for broken footnotes
\_splitmaxdepth=\_dp\_strutbox \_floatingpenalty=20000
\_textindent{#2}\_footstrut
- \_isnextchar \_bgroup {\_bgroup \_aftergroup\_vfootA \_let\_next=}{\_vfootB}%
+ \_isnextchar \_bgroup
+ {\_bgroup \_aftergroup\_vfootA \_afterassignment\_ignorespaces \_let\_next=}{\_vfootB}%
}
-\_def\_vfootA{\_strut\_egroup}
-\_def\_vfootB #1{#1\_vfootA}
+\_def\_vfootA{\_unskip\_strut\_isnextchar\_colorstackpop\_closefncolor\_vfootF}
+\_def\_vfootB #1{#1\_uskip\_strut\_vfootF}
+\_def\_vfootF{\_egroup} % close \_insert\_footins\_bgroup
+\_def\_closefncolor#1{#1\_isnextchar\_colorstackpop\_closefncolor\_vfootF}
\_def \_footstrut {\_vbox to\_splittopskip{}}
\_skip\_footins=\_bigskipamount % space added when footnote is present
\_count\_footins=1000 % footnote magnification factor (1 to 1)
diff --git a/macros/luatex/optex/parameters.opm b/macros/luatex/optex/parameters.opm
index 4ae0aa4d98..2a85a08159 100644
--- a/macros/luatex/optex/parameters.opm
+++ b/macros/luatex/optex/parameters.opm
@@ -97,6 +97,9 @@
and set default page dimensions as A4, no letter.
\_cod -----------------------------
+\_emergencystretch=20pt % we want to use third pass of aparagraph building algoritmh
+ % we need not to keep the compatibility with old documents
+
\_clubpenalty=10000 % after first line of paragraph
\_widowpenalty=10000 % before last line of paragraph
@@ -121,6 +124,7 @@
\_cod -----------------------------
\_def\_plaintexsetting{%
+ \_emergencystretch=0pt
\_clubpenalty=150
\_widowpenalty=150
\_pdfvorigin=1in
@@ -242,14 +246,16 @@
The default item mark used between `\bgitems` and `\enditems` is bullet.
The `\everyitem` token list is applied in vertical mode
at the start of each item.
- The `\everybegitems` token list is applied after group is openem by
+ The `\everylist` token list is applied after group is openem by
`\begitems`.
\_cod -----------------------------
\_newtoks\_defaultitem \_defaultitem={$\_bullet$\_enspace}
\_newtoks\_everyitem
-\_newtoks\_everybegitems
-\_public \defaultitem \everyitem \everybegitems ;
+\_newtoks\_everylist
+\_newskip \_listskipamount \_listskipamount=\_medskipamount
+\_newcount \_ilevel
+\_public \defaultitem \everyitem \everylist \listskipamount \ilevel ;
\_doc -----------------------------
The `\tit` macro includes `\vglue\titskip` above the title of the document.
@@ -417,6 +423,23 @@
\_newtoks \_pgbackground \_pgbackground={} % for page background
\_public \pgbackground ;
+ \_doc -----------------------------
+ The parameters used in `\inoval` and `\incircle` macros.
+ The default values (documented in user manual) are set in the macros.
+ User can re-set thse values using tokens \ovalparams, \circleparams.
+ \_cod -----------------------------
+
+\_newtoks \_ovalparams
+\_newtoks \_circleparams
+%\_ovalparams={\_roundness=2pt \_fcolor=\Yellow \_lcolor=\Red \_lwidth=.5bp
+% \_shadow=N \_overlapmargins=N \_hhkern=0pt \_vvkern=0pt }
+%\_circleparams={\_ratio=1 \_fcolor=\Yellow \_lcolor=\Red \_lwidth=.5bp
+% \_shadow=N \_overlapmargins=N \_hhkern=3pt \_vvkern=3pt}
+
+\_newdimen \_roundness \_roundness=5mm % used in \clippingoval macro
+
+\_public \ovalparams \circleparams \roundness ;
+
\_endcode %----------------------------------------------------
diff --git a/macros/luatex/optex/sections.opm b/macros/luatex/optex/sections.opm
index dae71df77a..2a7629560c 100644
--- a/macros/luatex/optex/sections.opm
+++ b/macros/luatex/optex/sections.opm
@@ -128,10 +128,13 @@
\_newcount \_fnum % figure numbers
\_newcount \_dnum % numbered display maths
-\_def \_chapx {\_incr\_chapnum \_secnum=0 \_seccnum=0 \_tnum=0 \_fnum=0 \_dnum=0 \_lfnotenum=0 }
-\_def \_secx {\_incr\_secnum \_seccnum=0 \_tnum=0 \_fnum=0 \_dnum=0 }
+\_def \_chapx {\_incr\_chapnum \_secnum=0 \_seccnum=0 \_resetcountchap \_lfnotenum=0 }
+\_def \_secx {\_incr\_secnum \_seccnum=0 \_resetcountsec }
\_def \_seccx {\_incr\_seccnum }
+\_def \_resetcountchap {\_tnum=0 \_fnum=0 \_dnum=0 }
+\_def \_resetcountsec {\_tnum=0 \_fnum=0 }
+
\_def \_thechapnum {\_the\_chapnum}
\_def \_thesecnum {\_othe\_chapnum.\_the\_secnum}
\_def \_theseccnum {\_othe\_chapnum.\_the\_secnum.\_the\_seccnum}
@@ -350,6 +353,55 @@
}
\_public \eqmark ;
-\_endcode % -------------------------------------
+ \_doc -----------------------------
+ The `\numberedpar <letter>{<name>}` is implemented here.
+ You can say `\let\resetcountsec=\relax` if you don't want to reset
+ counters A, B, C, D, E nor `\fnum` nor `\tnum` in sections, but only in
+ chapters. Or you can define you own concept of `\_chapx` and `\_secx`
+ macros (see above). Then you will want to re-define `\_theAnum`, `\_thefnum`
+ etc. macros.
+ \_cod -----------------------------
+
+\_newcount\_counterA \_newcount\_counterB \_newcount\_counterC
+\_newcount\_counterD \_newcount\_counterE
+
+\_def\_resetcounters{\_counterA=0 \_counterB=0 \_counterC=0 \_counterD=0 \_counterE=0 }
+\_addto \_resetcountchap {\_resetcounters}
+\_addto \_resetcountsec {\_resetcounters}
+
+\_def \_theAnum {\_othe\_chapnum.\_othe\_secnum.\_the\_counterA}
+\_def \_theBnum {\_othe\_chapnum.\_othe\_secnum.\_the\_counterB}
+\_def \_theCnum {\_othe\_chapnum.\_othe\_secnum.\_the\_counterC}
+\_def \_theDnum {\_othe\_chapnum.\_othe\_secnum.\_the\_counterD}
+\_def \_theEnum {\_othe\_chapnum.\_othe\_secnum.\_the\_counterE}
+
+\_def\_numberedpar#1#2{\_ea \_incr \_csname _counter#1\_endcsname
+ \_def\_tmpa{#1}\_def\_tmpb{#2}\_numberedparparam}
+\_optdef\_numberedparparam[]{%
+ \_ea \_printnumberedpar \_csname _the\_tmpa num\_ea\_endcsname\_ea{\_tmpb}}
+ \_doc -----------------------------
+ The `\_printnumberedpar \theXnum {<name>}` opens numbered paragraph and
+ prints it. The optional parameter is in `\_the\_opt`. You can re-define
+ it if you need another design.
+
+ `\_printnumberedpar` need not to be re-define if you only need to print
+ Theorems in italic and to insert vertical skips (for example). You can do this
+ by the following:
+ \_begtt
+ \def\theorem {\medskip\bgroup\it \numberedpar A{Theorem}}
+ \def\endtheorem {\par\egroup\medskip}
+ \_endtt
+ \theorem Let $M$ be... \endtheorem
+ \_cod -----------------------------
+
+\_def \_printnumberedpar #1#2{\_par
+ \_noindent\_wlabel #1%
+ {\bf #2 #1\_istoksempty\_opt\_iffalse \_space \_the\_opt \_fi.}\_space
+ \_ignorespaces
+}
+\_public \numberedpar ;
+
+
+\_endcode % -------------------------------------
diff --git a/macros/luatex/optex/slides.opm b/macros/luatex/optex/slides.opm
index faff579798..135a2bdce4 100644
--- a/macros/luatex/optex/slides.opm
+++ b/macros/luatex/optex/slides.opm
@@ -69,15 +69,15 @@
the next text after `\pg+`.
\_cod -----------------------------
-\_newcount\_ilevel \_newcount\_gilevel
+\_newcount\_gilevel
\_def\*{*}
\_adef*{\_startitem}
\_sdef{_item:X}{\Blue\_raise.2ex\_fullrectangle{.8ex}\_kern.5em}
\_sdef{_item:x}{\Blue\_raise.3ex\_fullrectangle{.6ex}\_kern.4em}
\_style X
-\_addto\_begitems{\_style x }\public \begitems ;
\_def\_egroups{\_par\_global\_gilevel=\_ilevel \_egroup}
-\_everybegitems={\_advance\_ilevel by1 \_addto\_egroups{\_egroup}}
+\_everylist={\_novspaces \_ifcase\_ilevel \_or \_style x \_else \_style - \_fi
+ \_addto\_egroups{\_egroup}}
\_doc -----------------------------
The default values of `\pg;`, `\pg+` and `\pg.` are very simple.
diff --git a/macros/luatex/optex/styles.opm b/macros/luatex/optex/styles.opm
index 13aaec91b2..d2ef38a013 100644
--- a/macros/luatex/optex/styles.opm
+++ b/macros/luatex/optex/styles.opm
@@ -1,6 +1,6 @@
%% This is part of OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \report {Basic styles of OpTeX <2020-03-18>} % preloaded in format
+\_codedecl \report {Basic styles of OpTeX <2020-03-28>} % preloaded in format
\_doc -----------------------------
The `{\boxlines <line-1><eol><line-2><eol>...<line-n><eol>}`
@@ -28,6 +28,7 @@
\_def\_report{
\_typosize[11/13.2]
+ \_vsize=\_dimexpr \_topskip + 52\_baselineskip \_relax % added 2020-03-28
\_let\_titfont=\_chapfont
\_titskip=3ex
\_eoldef\_author##1{\_removelastskip\_bigskip
@@ -42,6 +43,7 @@
\_def\_subject{{\_bf \_mtext{subj}: }}
\_public \address \subject ;
\_typosize[11/14]
+ \_vsize=\_dimexpr \_topskip + 49\_baselineskip \_relax % added 2020-03-28
\_parindent=0pt
\_parskip=\_medskipamount
\_nopagenumbers
diff --git a/macros/luatex/optex/verbatim.opm b/macros/luatex/optex/verbatim.opm
index c7593a7d7a..cfd9ed4354 100644
--- a/macros/luatex/optex/verbatim.opm
+++ b/macros/luatex/optex/verbatim.opm
@@ -1,6 +1,6 @@
%% This is part of OpTeX project, see http://petr.olsak.net/optex
-\_codedecl \begtt {Verbatim <2020-03-18>} % preloaded in format
+\_codedecl \begtt {Verbatim <2020-03-21>} % preloaded in format
\_doc ----------------------------
The internal parameters for verbatim macros are set.
@@ -146,7 +146,7 @@
\_fi
}
\_def\_prepareverbdata#1#2{\_def#1{#2}}
-\_def\_printverbline#1{\_penalty \_ttpenalty \_indent \_printverblinenum #1 \par}
+\_def\_printverbline#1{\_penalty \_ttpenalty \_indent \_printverblinenum #1\par}
\_def\_initverblinenum{\_tenrm \_thefontscale[700]\_ea\_let\_ea\_sevenrm\_the\_font}
\_def\_printverblinenum{\_global\_advance\_ttline by1 \_llap{\_sevenrm \_the\_ttline\_kern.9em}}