Hello community,
here is the log from the commit of package texlive-specs-q for openSUSE:Factory checked in at 2020-05-29 21:18:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-q (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-q.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-q"
Fri May 29 21:18:42 2020 rev:40 rq:806925 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-q/texlive-specs-q.changes 2019-11-07 23:11:40.172215585 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-q.new.3606/texlive-specs-q.changes 2020-05-29 21:30:43.121460681 +0200
@@ -1,0 +2,60 @@
+Mon May 18 08:47:10 UTC 2020 - Dr. Werner Fink
+
+- Enhance spec file generator to find missing .so man page
+ links for better dependency resolution (bsc#1171682)
+
+-------------------------------------------------------------------
+Wed May 13 13:59:14 UTC 2020 - Dr. Werner Fink
+
+- Modify patch texdoc_cnf.dif to ignore tlpkg/texlive.tlpdb as
+ kpathsea uses the ls-R files as well
+
+-------------------------------------------------------------------
+Tue May 12 09:03:38 UTC 2020 - Dr. Werner Fink
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Wed May 6 11:27:35 UTC 2020 - Dr. Werner Fink
+
+- Scan *.def files as well for RequirePackage
+
+-------------------------------------------------------------------
+Tue May 5 13:55:07 UTC 2020 - Dr. Werner Fink
+
+- Add Requires to tex(epstopdf-base.sty) to fix package split
+ of texlive-epstopdf
+
+-------------------------------------------------------------------
+Mon May 4 09:00:25 UTC 2020 - Dr. Werner Fink
+
+- Skip *-dev packages from file dependendcy scanner as otherwise
+ we see doubling name space for some style files like amsmath.sty
+
+-------------------------------------------------------------------
+Mon Apr 27 06:52:15 UTC 2020 - Dr. Werner Fink
+
+- Add patch pythontex_p2top3.dif and a removes file to fully
+ switch pythontex packages of TeXLive to python3
+
+-------------------------------------------------------------------
+Mon Apr 20 10:29:02 UTC 2020 - Dr. Werner Fink
+
+- Update to TeXLive 2020
+ * Port patches
+ kpathsea_cnf.dif
+ latexpand_perl.dif
+ luaotfload_varfonts.dif
+ luatex_cnf.dif
+ musixtex_various.dif
+ * Delete patches not needed anymore as files have moved
+ tetex_scripts.dif
+ * Delete patche updmap-map_roboto.dif as fixed upstream
+ * Add new patches to catch moved files
+ texlive-scripts-extra_scripts.dif
+ texlive-scripts_scripts.dif
+ * Add new patch xetex_conf.dif to fit FHS location
+ * Remove TeXLive installer files breaking rpm database
+ texlive-scripts.removes
+
+-------------------------------------------------------------------
New:
----
nanicolle.doc.tar.xz
nanicolle.tar.xz
newcomputermodern.doc.tar.xz
newcomputermodern.tar.xz
newfloat.doc.tar.xz
newfloat.tar.xz
noto-emoji.doc.tar.xz
noto-emoji.tar.xz
nth.tar.xz
numberpt.doc.tar.xz
numberpt.tar.xz
optex.doc.tar.xz
optex.tar.xz
outerhbox.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-q.spec ++++++
++++ 40436 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-q/texlive-specs-q.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-q.new.3606/texlive-specs-q.spec
++++++ nameauth.doc.tar.xz ++++++
++++ 1934 lines of diff (skipped)
++++++ nameauth.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nameauth/nameauth.sty new/tex/latex/nameauth/nameauth.sty
--- old/tex/latex/nameauth/nameauth.sty 2017-03-23 22:29:07.000000000 +0100
+++ new/tex/latex/nameauth/nameauth.sty 2020-02-27 23:05:40.000000000 +0100
@@ -9,17 +9,18 @@
%% --------:| ----------------------------------------------------------------
%% nameauth:| Name authority mechanism for consistency in text and index
%% Author:| Charles P. Schaum
-%% E-mail:| charles dot schaum at comcast dot net
+%% E-mail:| charles dot schaum@comcast.net
%% License:| Released under the LaTeX Project Public License 1.3c or later
%% See:| http://www.latex-project.org/lppl.txt
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{nameauth}
- [2017/03/22 3.2 Name authority mechanism for consistency in text and index]
+ [2020/02/26 3.4 Name authority mechanism for consistency in text and index]
\newif\if@nameauth@InAKA
\newif\if@nameauth@InName
\newif\if@nameauth@Xref
\newif\if@nameauth@Lock
+\newif\if@nameauth@BigLock
\newif\if@nameauth@InHook
\newif\if@nameauth@DoIndex
\newif\if@nameauth@SkipIndex
@@ -29,6 +30,8 @@
\newif\if@nameauth@MainFormat
\newif\if@nameauth@AKAFormat
\newif\if@nameauth@LocalNames
+\newif\if@nameauth@OldReset
+\newif\if@nameauth@OldPass
\newif\if@nameauth@Forget
\newif\if@nameauth@Subvert
\newif\if@nameauth@FirstFormat
@@ -76,6 +79,8 @@
\DeclareOption{frontmatter}{\@nameauth@MainFormatfalse}
\DeclareOption{formatAKA}{\@nameauth@AKAFormattrue}
\DeclareOption{oldAKA}{\@nameauth@OldAKAtrue}
+\DeclareOption{oldreset}{\@nameauth@OldResettrue}
+\DeclareOption{oldpass}{\@nameauth@OldPasstrue}
\DeclareOption{index}{\@nameauth@DoIndextrue}
\DeclareOption{noindex}{\@nameauth@DoIndexfalse}
\DeclareOption{pretag}{\@nameauth@Pretagtrue}
@@ -187,8 +192,8 @@
}
\newcommand*\@nameauth@Error[2]
{%
- \edef\msga{#2 SNN field empty}%
- \edef\msgb{#2 SNN field malformed}%
+ \edef\msga{#2 SNN arg empty}%
+ \edef\msgb{#2 SNN arg malformed}%
\protected@edef\testname{\trim@spaces{#1}}%
\protected@edef\testroot{\@nameauth@Root{#1}}%
\ifx\testname\@empty
@@ -200,15 +205,26 @@
}
\newcommandx*\@nameauth@Name[3][1=\@empty, 3=\@empty]
{%
+ \if@nameauth@BigLock\@nameauth@Locktrue\fi
\unless\if@nameauth@Lock
\@nameauth@Locktrue%
\@nameauth@InNametrue%
\@nameauth@Error{#2}{macro \string\@nameauth@name}%
\if@nameauth@JustIndex
\IndexName[#1]{#2}[#3]%
- \@nameauth@InNamefalse%
- \@nameauth@Lockfalse%
- \@nameauth@JustIndexfalse%
+ \if@nameauth@OldPass
+ \@nameauth@JustIndexfalse%
+ \else
+ \if@nameauth@OldReset
+ \@nameauth@FullNamefalse%
+ \@nameauth@FirstNamefalse%
+ \@nameauth@JustIndexfalse%
+ \else
+ \global\@nameauth@FullNamefalse%
+ \global\@nameauth@FirstNamefalse%
+ \global\@nameauth@JustIndexfalse%
+ \fi
+ \fi
\else
\if@nameauth@Forget
\ForgetName[#1]{#2}[#3]%
@@ -225,28 +241,46 @@
\@nameauth@Parse[#1]{#2}[#3]{!NF}%
\fi
\unless\if@nameauth@SkipIndex\IndexName[#1]{#2}[#3]\fi
- \@nameauth@SkipIndexfalse%
- \@nameauth@Forgetfalse%
- \@nameauth@Subvertfalse%
- \@nameauth@Lockfalse%
- \@nameauth@InNamefalse%
- \@nameauth@NBSPfalse%
- \@nameauth@NBSPXfalse%
- \@nameauth@DoCapsfalse%
- \@nameauth@Accentfalse%
- \@nameauth@AllThisfalse%
- \@nameauth@ShowCommafalse%
- \@nameauth@NoCommafalse%
- \@nameauth@RevThisfalse%
- \@nameauth@RevThisCommafalse%
- \@nameauth@ShortSNNfalse%
- \@nameauth@EastFNfalse%
+ \if@nameauth@OldReset
+ \@nameauth@SkipIndexfalse%
+ \@nameauth@Forgetfalse%
+ \@nameauth@Subvertfalse%
+ \@nameauth@NBSPfalse%
+ \@nameauth@NBSPXfalse%
+ \@nameauth@DoCapsfalse%
+ \@nameauth@Accentfalse%
+ \@nameauth@AllThisfalse%
+ \@nameauth@ShowCommafalse%
+ \@nameauth@NoCommafalse%
+ \@nameauth@RevThisfalse%
+ \@nameauth@RevThisCommafalse%
+ \@nameauth@ShortSNNfalse%
+ \@nameauth@EastFNfalse%
+ \else
+ \global\@nameauth@SkipIndexfalse%
+ \global\@nameauth@Forgetfalse%
+ \global\@nameauth@Subvertfalse%
+ \global\@nameauth@NBSPfalse%
+ \global\@nameauth@NBSPXfalse%
+ \global\@nameauth@DoCapsfalse%
+ \global\@nameauth@Accentfalse%
+ \global\@nameauth@AllThisfalse%
+ \global\@nameauth@ShowCommafalse%
+ \global\@nameauth@NoCommafalse%
+ \global\@nameauth@RevThisfalse%
+ \global\@nameauth@RevThisCommafalse%
+ \global\@nameauth@ShortSNNfalse%
+ \global\@nameauth@EastFNfalse%
+ \fi
\fi
+ \@nameauth@Lockfalse%
+ \@nameauth@InNamefalse%
\fi
\if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi
}
\newcommandx*\@nameauth@Parse[4][1=\@empty, 3=\@empty]
{%
+ \if@nameauth@BigLock\@nameauth@Lockfalse\fi
\if@nameauth@Lock
\let\ex\expandafter%
\protected@edef\arga{\trim@spaces{#1}}%
@@ -365,6 +399,7 @@
}
\newcommand*\@nameauth@NonWest[1]
{%
+ \if@nameauth@BigLock\@nameauth@Lockfalse\fi
\if@nameauth@Lock
\unless\ifcsname#1\endcsname
\@nameauth@FirstFormattrue%
@@ -411,12 +446,18 @@
\unless\ifcsname#1\endcsname
\unless\if@nameauth@InAKA\csgdef{#1}{}\fi
\fi
- \@nameauth@FullNamefalse%
- \@nameauth@FirstNamefalse%
+ \if@nameauth@OldReset
+ \@nameauth@FullNamefalse%
+ \@nameauth@FirstNamefalse%
+ \else
+ \global\@nameauth@FullNamefalse%
+ \global\@nameauth@FirstNamefalse%
+ \fi
\fi
}
\newcommand*\@nameauth@West[1]
{%
+ \if@nameauth@BigLock\@nameauth@Lockfalse\fi
\if@nameauth@Lock
\unless\ifcsname#1\endcsname
\@nameauth@FirstFormattrue%
@@ -459,12 +500,18 @@
\unless\ifcsname#1\endcsname
\unless\if@nameauth@InAKA\csgdef{#1}{}\fi
\fi
- \@nameauth@FullNamefalse%
- \@nameauth@FirstNamefalse%
+ \if@nameauth@OldReset
+ \@nameauth@FullNamefalse%
+ \@nameauth@FirstNamefalse%
+ \else
+ \global\@nameauth@FullNamefalse%
+ \global\@nameauth@FirstNamefalse%
+ \fi
\fi
}
\newcommand*\@nameauth@Hook[1]
{%
+ \if@nameauth@BigLock\@nameauth@Lockfalse\fi
\if@nameauth@Lock
\@nameauth@InHooktrue%
\protected@edef\test{#1}%
@@ -507,45 +554,124 @@
\fi
\fi
\fi
- \@nameauth@FirstFormatfalse%
+ \if@nameauth@OldReset
+ \@nameauth@FirstFormatfalse%
+ \else
+ \global\@nameauth@FirstFormatfalse%
+ \fi
\@nameauth@InHookfalse%
\fi
}
\newcommand*\@nameauth@Index[2]
{%
- \def\cseq{#1}%
\let\ex\expandafter%
- \ifcsname\cseq!TAG\endcsname
- \protected@edef\Tag{\csname#1!TAG\endcsname}%
- \ex\def\ex\ShortTag\ex{\ex\@nameauth@TrimTag\ex{\Tag}}%
- \fi
\if@nameauth@DoIndex
- \ifcsname\cseq!TAG\endcsname
- \ifcsname\cseq!PRE\endcsname
- \if@nameauth@Xref%
- \index%
- {\csname\cseq!PRE\endcsname#2\ShortTag}%
+ \ifcsname#1!TAG\endcsname
+ \protected@edef\Tag{\csname#1!TAG\endcsname}%
+ \ex\def\ex\ShortTag\ex{\ex\@nameauth@TrimTag\ex{\Tag}}%
+ \ifcsname#1!PRE\endcsname
+ \protected@edef\Pre{\csname#1!PRE\endcsname}%
+ \if@nameauth@Xref
+ \protected@edef\Entry{\Pre#2\ShortTag}%
\else
- \index%
- {\csname\cseq!PRE\endcsname#2\csname\cseq!TAG\endcsname}%
+ \protected@edef\Entry{\Pre#2\Tag}%
\fi
\else
\if@nameauth@Xref
- \index{#2\ShortTag}%
+ \protected@edef\Entry{#2\ShortTag}%
\else
- \index{#2\csname\cseq!TAG\endcsname}%
+ \protected@edef\Entry{#2\Tag}%
\fi
\fi
\else
- \ifcsname\cseq!PRE\endcsname
- \index{\csname\cseq!PRE\endcsname#2}%
+ \ifcsname#1!PRE\endcsname
+ \protected@edef\Pre{\csname#1!PRE\endcsname}%
+ \protected@edef\Entry{\Pre#2}%
\else
- \index{#2}%
+ \protected@edef\Entry{#2}%
\fi
\fi
+ \ex\index\ex{\Entry}%
\fi
}
\newcommand*\@nameauth@Actual{@}
+\newcommandx*\@nameauth@Debug[3][1=\@empty, 3=\@empty]
+{%
+ \bgroup%
+ \def\index##1{##1}%
+ \@nameauth@DoIndextrue%
+ \protected@edef\arga{\trim@spaces{#1}}%
+ \protected@edef\argc{\trim@spaces{#3}}%
+ \protected@edef\suffb{\@nameauth@Suffix{#2}}%
+ \def\csb{\@nameauth@Clean{#2}}%
+ \def\csbc{\@nameauth@Clean{#2,#3}}%
+ \def\csab{\@nameauth@Clean{#1!#2}}%
+ \@nameauth@Error{#2}{macro \string\@nameauth@Debug}%
+ \ifx\arga\@empty
+ \ifx\argc\@empty
+ \ifdefined\ShortIdxEntry
+ \csundef{\csb!PRE}%
+ \csundef{\csb!TAG}%
+ \csundef{\csb!PN}%
+ \IndexName[#1]{#2}[#3]%
+ \else
+ \ifdefined\LongIdxEntry
+ \csundef{\csb!PN}%
+ \IndexName[#1]{#2}[#3]%
+ \else
+ \csb%
+ \fi
+ \fi
+ \else
+ \ifx\suffb\@empty
+ \ifdefined\ShortIdxEntry
+ \csundef{\csbc!PRE}%
+ \csundef{\csbc!TAG}%
+ \csundef{\csbc!PN}%
+ \IndexName[#1]{#2}[#3]%
+ \else
+ \ifdefined\LongIdxEntry
+ \csundef{\csbc!PN}%
+ \IndexName[#1]{#2}[#3]%
+ \else
+ \csbc%
+ \fi
+ \fi
+ \else
+ \ifdefined\ShortIdxEntry
+ \csundef{\csb!PRE}%
+ \csundef{\csb!TAG}%
+ \csundef{\csb!PN}%
+ \IndexName[#1]{#2}[#3]%
+ \else
+ \ifdefined\LongIdxEntry
+ \csundef{\csb!PN}%
+ \IndexName[#1]{#2}[#3]%
+ \else
+ \csb%
+ \fi
+ \fi
+ \fi
+ \fi
+ \else
+ \ifdefined\ShortIdxEntry
+ \csundef{\csab!PRE}%
+ \csundef{\csab!TAG}%
+ \csundef{\csab!PN}%
+ \IndexName[#1]{#2}[#3]%
+ \else
+ \ifdefined\LongIdxEntry
+ \csundef{\csab!PN}%
+ \IndexName[#1]{#2}[#3]%
+ \else
+ \csab%
+ \fi
+ \fi
+ \fi
+ \global\undef{\LongIdxEntry}%
+ \global\undef{\ShortIdxEntry}%
+ \egroup%
+}
\newcommand*\CapThis{\@nameauth@DoCapstrue}
\newcommand*\AccentCapThis%
{\@nameauth@Accenttrue\@nameauth@DoCapstrue}
@@ -617,6 +743,11 @@
\newcommand*\IndexActual[1]
{\global\renewcommand*\@nameauth@Actual{#1}}
\newcommand*\SeeAlso{\@nameauth@SeeAlsotrue}
+\newcommand*\ShowPattern{\@nameauth@Debug}
+\newcommand*\ShowIdxPageref%
+ {\def\LongIdxEntry{}\ShowPattern}
+\WithSuffix{\newcommand*}\ShowIdxPageref*%
+ {\def\ShortIdxEntry{}\ShowPattern}
\newcommand*\NameParser
{%
\if@nameauth@InHook
@@ -705,6 +836,11 @@
\newcommand\FName{\@nameauth@FirstNametrue\NameauthFName}
\WithSuffix{\newcommand*}\FName*%
{\@nameauth@FirstNametrue\NameauthFName}
+\newcommand*\IndexProtect
+{%
+ \@nameauth@DoIndexfalse%
+ \@nameauth@BigLocktrue%
+}
\newcommandx*\IndexName[3][1=\@empty, 3=\@empty]
{%
\protected@edef\arga{\trim@spaces{#1}}%
@@ -796,9 +932,11 @@
\fi
\else
\if@nameauth@SeeAlso
- \@nameauth@Index{\csb}{\rootb\space\suffb|seealso{\target}}%
+ \@nameauth@Index{\csb}%
+ {\rootb\space\suffb|seealso{\target}}%
\else
- \@nameauth@Index{\csb}{\rootb\space\suffb|see{\target}}%
+ \@nameauth@Index{\csb}%
+ {\rootb\space\suffb|see{\target}}%
\fi
\fi
\csgdef{\csb!PN}{}%
@@ -865,8 +1003,12 @@
\csgdef{\csab!PN}{}%
\fi
\fi
- \@nameauth@SeeAlsofalse%
\@nameauth@Xreffalse%
+ \if@nameauth@OldReset
+ \@nameauth@SeeAlsofalse%
+ \else
+ \global\@nameauth@SeeAlsofalse%
+ \fi
}
\newcommandx*\ExcludeName[3][1=\@empty, 3=\@empty]
{%
@@ -913,7 +1055,7 @@
\ifcsname\csbc!PN\endcsname
\if@nameauth@Verbose
\PackageWarning{nameauth}%
- {macro \ExcludeName: Xref: #2 exists}%
+ {macro \ExcludeName: Xref: #2 #3 exists}%
\fi
\else
\csgdef{\csbc!PN}{!}%
@@ -953,7 +1095,7 @@
\ifcsname\csab!PN\endcsname
\if@nameauth@Verbose
\PackageWarning{nameauth}%
- {macro \ExcludeName: Xref: #2 exists}%
+ {macro \ExcludeName: Xref: #1 #2 exists}%
\fi
\else
\csgdef{\csab!PN}{!}%
@@ -973,25 +1115,49 @@
\ifx\argc\@empty
\ifcsname\csb!PN\endcsname
\edef\testex{\csname\csb!PN\endcsname}%
- \unless\ifx\testex\@empty\global\csundef{\csb!PN}\fi
+ \unless\ifx\testex\@empty\global\csundef{\csb!PN}%
+ \else
+ \if@nameauth@Verbose
+ \PackageWarning{nameauth}%
+ {macro \IncludeName: Xref: #2 exists}%
+ \fi
+ \fi
\fi
\else
\ifx\suffb\@empty
\ifcsname\csbc!PN\endcsname
\edef\testex{\csname\csbc!PN\endcsname}%
- \unless\ifx\testex\@empty\global\csundef{\csbc!PN}\fi
+ \unless\ifx\testex\@empty\global\csundef{\csbc!PN}%
+ \else
+ \if@nameauth@Verbose
+ \PackageWarning{nameauth}%
+ {macro \IncludeName: Xref: #2 #3 exists}%
+ \fi
+ \fi
\fi
\else
\ifcsname\csb!PN\endcsname
\edef\testex{\csname\csb!PN\endcsname}%
- \unless\ifx\testex\@empty\global\csundef{\csb!PN}\fi
+ \unless\ifx\testex\@empty\global\csundef{\csb!PN}%
+ \else
+ \if@nameauth@Verbose
+ \PackageWarning{nameauth}%
+ {macro \IncludeName: Xref: #2 exists}%
+ \fi
+ \fi
\fi
\fi
\fi
\else
\ifcsname\csab!PN\endcsname
\edef\testex{\csname\csab!PN\endcsname}%
- \unless\ifx\testex\@empty\global\csundef{\csab!PN}\fi
+ \unless\ifx\testex\@empty\global\csundef{\csab!PN}%
+ \else
+ \if@nameauth@Verbose
+ \PackageWarning{nameauth}%
+ {macro \IncludeName: Xref: #1 #2 exists}%
+ \fi
+ \fi
\fi
\fi
}
@@ -1170,19 +1336,21 @@
\def\csb{\@nameauth@Clean{#2}}%
\def\csbc{\@nameauth@Clean{#2,#3}}%
\def\csab{\@nameauth@Clean{#1!#2}}%
- \@nameauth@Error{#2}{macro \string\NameQueryInfo}%
- \ifx\arga\@empty
- \ifx\argc\@empty
- \ifcsname\csb!DB\endcsname\csname\csb!DB\endcsname\fi
- \else
- \ifx\Suff\@empty
- \ifcsname\csbc!DB\endcsname\csname\csbc!DB\endcsname\fi
- \else
+ \unless\if@nameauth@BigLock
+ \@nameauth@Error{#2}{macro \string\NameQueryInfo}%
+ \ifx\arga\@empty
+ \ifx\argc\@empty
\ifcsname\csb!DB\endcsname\csname\csb!DB\endcsname\fi
+ \else
+ \ifx\Suff\@empty
+ \ifcsname\csbc!DB\endcsname\csname\csbc!DB\endcsname\fi
+ \else
+ \ifcsname\csb!DB\endcsname\csname\csb!DB\endcsname\fi
+ \fi
\fi
+ \else
+ \ifcsname\csab!DB\endcsname\csname\csab!DB\endcsname\fi
\fi
- \else
- \ifcsname\csab!DB\endcsname\csname\csab!DB\endcsname\fi
\fi
}
\newcommandx*\NameClearInfo[3][1=\@empty, 3=\@empty]
@@ -1409,47 +1577,68 @@
}
\newcommandx*\AKA[5][1=\@empty, 3=\@empty, 5=\@empty]
{%
+ \if@nameauth@BigLock\@nameauth@Locktrue\fi
\unless\if@nameauth@Lock
- \@nameauth@Locktrue%
- \@nameauth@JustIndexfalse%
- \@nameauth@InAKAtrue%
- \@nameauth@Error{#2}{macro \string\AKA}%
- \@nameauth@Error{#4}{macro \string\AKA}%
- \leavevmode\hbox{}%
- \protected@edef\argi{\trim@spaces{#1}}%
- \protected@edef\rooti{\@nameauth@Root{#2}}%
- \protected@edef\suffi{\@nameauth@Suffix{#2}}%
- \@nameauth@Parse[#3]{#4}[#5]{!PN}%
- \unless\if@nameauth@SkipIndex
- \ifx\argi\@empty
- \ifx\suffi\@empty
- \IndexRef[#3]{#4}[#5]{\rooti}%
- \else
- \IndexRef[#3]{#4}[#5]{\rooti\space\suffi}%
- \fi
- \else
- \ifx\suffi\@empty
- \IndexRef[#3]{#4}[#5]{\rooti,\space\argi}%
- \else
- \IndexRef[#3]{#4}[#5]{\rooti,\space\argi,\space\suffi}%
+ \@nameauth@Locktrue%
+ \@nameauth@InAKAtrue%
+ \if@nameauth@OldReset
+ \@nameauth@JustIndexfalse%
+ \else
+ \global\@nameauth@JustIndexfalse%
+ \fi
+ \@nameauth@Error{#2}{macro \string\AKA}%
+ \@nameauth@Error{#4}{macro \string\AKA}%
+ \leavevmode\hbox{}%
+ \protected@edef\argi{\trim@spaces{#1}}%
+ \protected@edef\rooti{\@nameauth@Root{#2}}%
+ \protected@edef\suffi{\@nameauth@Suffix{#2}}%
+ \@nameauth@Parse[#3]{#4}[#5]{!PN}%
+ \unless\if@nameauth@SkipIndex
+ \ifx\argi\@empty
+ \ifx\suffi\@empty
+ \IndexRef[#3]{#4}[#5]{\rooti}%
+ \else
+ \IndexRef[#3]{#4}[#5]{\rooti\space\suffi}%
+ \fi
+ \else
+ \ifx\suffi\@empty
+ \IndexRef[#3]{#4}[#5]{\rooti,\space\argi}%
+ \else
+ \IndexRef[#3]{#4}[#5]{\rooti,\space\argi,\space\suffi}%
+ \fi
\fi
\fi
- \fi
- \@nameauth@SkipIndexfalse%
- \@nameauth@Lockfalse%
- \@nameauth@InAKAfalse%
- \@nameauth@AltAKAfalse%
- \@nameauth@NBSPfalse%
- \@nameauth@NBSPXfalse%
- \@nameauth@DoCapsfalse%
- \@nameauth@Accentfalse%
- \@nameauth@AllThisfalse%
- \@nameauth@ShowCommafalse%
- \@nameauth@NoCommafalse%
- \@nameauth@RevThisfalse%
- \@nameauth@RevThisCommafalse%
- \@nameauth@ShortSNNfalse%
- \@nameauth@EastFNfalse%
+ \if@nameauth@OldReset
+ \@nameauth@SkipIndexfalse%
+ \@nameauth@AltAKAfalse%
+ \@nameauth@NBSPfalse%
+ \@nameauth@NBSPXfalse%
+ \@nameauth@DoCapsfalse%
+ \@nameauth@Accentfalse%
+ \@nameauth@AllThisfalse%
+ \@nameauth@ShowCommafalse%
+ \@nameauth@NoCommafalse%
+ \@nameauth@RevThisfalse%
+ \@nameauth@RevThisCommafalse%
+ \@nameauth@ShortSNNfalse%
+ \@nameauth@EastFNfalse%
+ \else
+ \global\@nameauth@SkipIndexfalse%
+ \global\@nameauth@AltAKAfalse%
+ \global\@nameauth@NBSPfalse%
+ \global\@nameauth@NBSPXfalse%
+ \global\@nameauth@DoCapsfalse%
+ \global\@nameauth@Accentfalse%
+ \global\@nameauth@AllThisfalse%
+ \global\@nameauth@ShowCommafalse%
+ \global\@nameauth@NoCommafalse%
+ \global\@nameauth@RevThisfalse%
+ \global\@nameauth@RevThisCommafalse%
+ \global\@nameauth@ShortSNNfalse%
+ \global\@nameauth@EastFNfalse%
+ \fi
+ \@nameauth@Lockfalse%
+ \@nameauth@InAKAfalse%
\fi
\if@nameauth@Punct\expandafter\@nameauth@CheckDot\fi
}
@@ -1482,78 +1671,86 @@
\ifcsname\@arga\endcsname
\PackageWarning{nameauth}%
{environment nameauth: Shorthand macro already exists}%
- \fi
- \ifx\@testd\@empty
+ \fi
+ \ifx\@testd\@empty
\ifx\@testb\@empty
- \ex\csgdef\ex{\ex\@arga\ex}\ex{\ex\NameauthName\ex{%
- \the\@nameauth@etoksc}}%
- \ex\csgdef\ex{\ex L\ex\@arga\ex}\ex{%
- \ex\@nameauth@FullNametrue%
+ \ex\csgdef\ex{\ex\@arga\ex}%
+ \ex{\ex\NameauthName\ex{\the\@nameauth@etoksc}}%
+ \ex\csgdef\ex{\ex L\ex\@arga\ex}%
+ \ex{\ex\@nameauth@FullNametrue%
\ex\NameauthLName\ex{\the\@nameauth@etoksc}}%
- \ex\csgdef\ex{\ex S\ex\@arga\ex}\ex{%
- \ex\@nameauth@FirstNametrue%
+ \ex\csgdef\ex{\ex S\ex\@arga\ex}%
+ \ex{\ex\@nameauth@FirstNametrue%
\ex\NameauthFName\ex{\the\@nameauth@etoksc}}%
\else
\ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex\@arga\ex\ex\ex}%
- \ex\ex\ex{\ex\ex\ex\NameauthName\ex\ex\ex[%
- \ex\the\ex\@nameauth@etoksb\ex]\ex{\the\@nameauth@etoksc}}%
+ \ex\ex\ex{\ex\ex\ex\NameauthName%
+ \ex\ex\ex[\ex\the\ex\@nameauth@etoksb\ex]%
+ \ex{\the\@nameauth@etoksc}}%
\ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex L\ex\ex\ex\@arga%
\ex\ex\ex}\ex\ex\ex{\ex\ex\ex\@nameauth@FullNametrue%
- \ex\ex\ex\NameauthLName\ex\ex\ex[%
- \ex\the\ex\@nameauth@etoksb\ex]\ex{\the\@nameauth@etoksc}}%
+ \ex\ex\ex\NameauthLName%
+ \ex\ex\ex[\ex\the\ex\@nameauth@etoksb\ex]%
+ \ex{\the\@nameauth@etoksc}}%
\ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex S\ex\ex\ex\@arga%
\ex\ex\ex}\ex\ex\ex{\ex\ex\ex\@nameauth@FirstNametrue%
- \ex\ex\ex\NameauthFName\ex\ex\ex[%
- \ex\the\ex\@nameauth@etoksb\ex]\ex{\the\@nameauth@etoksc}}%
+ \ex\ex\ex\NameauthFName%
+ \ex\ex\ex[\ex\the\ex\@nameauth@etoksb\ex]%
+ \ex{\the\@nameauth@etoksc}}%
\fi
\else
\ifx\@testb\@empty
\ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex\@arga\ex\ex\ex}%
- \ex\ex\ex{\ex\ex\ex\NameauthName\ex\ex\ex{%
- \ex\the\ex\@nameauth@etoksc\ex}\ex[\the\@nameauth@etoksd]}%
+ \ex\ex\ex{\ex\ex\ex\NameauthName%
+ \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+ \ex[\the\@nameauth@etoksd]}%
\ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex L\ex\ex\ex\@arga%
\ex\ex\ex}\ex\ex\ex{\ex\ex\ex\@nameauth@FullNametrue%
- \ex\ex\ex\NameauthLName\ex\ex\ex{%
- \ex\the\ex\@nameauth@etoksc\ex}\ex[\the\@nameauth@etoksd]}%
+ \ex\ex\ex\NameauthLName%
+ \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+ \ex[\the\@nameauth@etoksd]}%
\ex\ex\ex\csgdef\ex\ex\ex{\ex\ex\ex S\ex\ex\ex\@arga%
\ex\ex\ex}\ex\ex\ex{\ex\ex\ex\@nameauth@FirstNametrue%
- \ex\ex\ex\NameauthFName\ex\ex\ex{%
- \ex\the\ex\@nameauth@etoksc\ex}\ex[\the\@nameauth@etoksd]}%
+ \ex\ex\ex\NameauthFName%
+ \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+ \ex[\the\@nameauth@etoksd]}%
\else
\ex\ex\ex\ex\ex\ex\ex\csgdef\ex\ex\ex\ex\ex\ex\ex{%
\ex\ex\ex\ex\ex\ex\ex\@arga\ex\ex\ex\ex\ex\ex\ex}%
\ex\ex\ex\ex\ex\ex\ex{\ex\ex\ex\ex\ex\ex\ex\NameauthName%
- \ex\ex\ex\ex\ex\ex\ex[\ex\ex\ex\the\ex\ex\ex\@nameauth@etoksb%
- \ex\ex\ex]\ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}\ex[%
- \the\@nameauth@etoksd]}%
+ \ex\ex\ex\ex\ex\ex\ex[\ex\ex\ex\the%
+ \ex\ex\ex\@nameauth@etoksb\ex\ex\ex]%
+ \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+ \ex[\the\@nameauth@etoksd]}%
\ex\ex\ex\ex\ex\ex\ex\csgdef\ex\ex\ex\ex\ex\ex\ex{%
\ex\ex\ex\ex\ex\ex\ex L\ex\ex\ex\ex\ex\ex\ex\@arga%
\ex\ex\ex\ex\ex\ex\ex}\ex\ex\ex\ex\ex\ex\ex{%
\ex\ex\ex\ex\ex\ex\ex\@nameauth@FullNametrue%
- \ex\ex\ex\ex\ex\ex\ex\NameauthLName\ex\ex\ex\ex\ex\ex\ex[%
- \ex\ex\ex\the\ex\ex\ex\@nameauth@etoksb%
- \ex\ex\ex]\ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}\ex[%
- \the\@nameauth@etoksd]}%
+ \ex\ex\ex\ex\ex\ex\ex\NameauthLName%
+ \ex\ex\ex\ex\ex\ex\ex[\ex\ex\ex\the\ex\ex\ex%
+ \@nameauth@etoksb\ex\ex\ex]%
+ \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+ \ex[\the\@nameauth@etoksd]}%
\ex\ex\ex\ex\ex\ex\ex\csgdef\ex\ex\ex\ex\ex\ex\ex{%
\ex\ex\ex\ex\ex\ex\ex S\ex\ex\ex\ex\ex\ex\ex\@arga%
\ex\ex\ex\ex\ex\ex\ex}\ex\ex\ex\ex\ex\ex\ex{%
\ex\ex\ex\ex\ex\ex\ex\@nameauth@FirstNametrue%
- \ex\ex\ex\ex\ex\ex\ex\NameauthFName\ex\ex\ex\ex\ex\ex\ex[%
- \ex\ex\ex\the\ex\ex\ex\@nameauth@etoksb\ex\ex\ex]%
- \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}\ex[%
- \the\@nameauth@etoksd]}%
+ \ex\ex\ex\ex\ex\ex\ex\NameauthFName%
+ \ex\ex\ex\ex\ex\ex\ex[\ex\ex\ex\the\ex\ex\ex%
+ \@nameauth@etoksb\ex\ex\ex]%
+ \ex\ex\ex{\ex\the\ex\@nameauth@etoksc\ex}%
+ \ex[\the\@nameauth@etoksd]}%
\fi
- \fi
- \ignorespaces%
+ \fi\ignorespaces%
}\ignorespaces%
}{\endgroup\ignorespaces}
%%
-%% Copyright (C) 2017 by Charles P. Schaum <charles dot schaum at comcast dot net>
+%% Copyright (C) 2020 by Charles P. Schaum
%%
-%% This work may be distributed and/or modified under the
+%% This work may be distributed and / or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
%% version 1.3c of this license or (at your option) any later
-%% version. The latest version of this license is in the file:
+%% version. The latest version of this license is in the file:
%%
%% http://www.latex-project.org/lppl.txt
%%
@@ -1561,9 +1758,8 @@
%% Charles P. Schaum.
%%
%% This work consists of the files nameauth.dtx, examples.tex, and a Makefile.
-%% Running "make" generates the derived files README, nameauth.pdf and
-%% nameauth.sty. Running "make inst" installs the files in the user's TeX tree.
-%% Running "make install" installs the files in the local TeX tree.
-%%
+%% These files generate README.txt / README, nameauth.ins, nameauth.sty, and
+%% nameauth.pdf, with other intermediate files, as a part of this work. See
+%% the README.txt or README for more information.
%%
%% End of file `nameauth.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nameauth.tlpobj new/tlpkg/tlpobj/nameauth.tlpobj
--- old/tlpkg/tlpobj/nameauth.tlpobj 2019-02-28 03:55:21.000000000 +0100
+++ new/tlpkg/tlpobj/nameauth.tlpobj 2020-02-28 01:55:09.000000000 +0100
@@ -1,6 +1,6 @@
name nameauth
category Package
-revision 43586
+revision 53940
shortdesc Name authority mechanism for consistency in body text and index
relocated 1
longdesc Publications, that reference many names, require editors and
@@ -9,10 +9,9 @@
longdesc compilers to normalize occurrences of names, variant name
longdesc forms, and pen names in the text and index. This may help
longdesc minimize writing and production time and cost.
-runfiles size=12
+runfiles size=13
RELOC/tex/latex/nameauth/nameauth.sty
catalogue-ctan /macros/latex/contrib/nameauth
-catalogue-date 2017-03-22 22:56:13 +0100
catalogue-license lppl1.3
catalogue-topics editorial editorial-consistency
-catalogue-version 3.2
+catalogue-version 3.4
++++++ ncctools.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ncctools/changes.txt new/doc/latex/ncctools/changes.txt
--- old/doc/latex/ncctools/changes.txt 2018-07-03 23:02:29.000000000 +0200
+++ new/doc/latex/ncctools/changes.txt 2019-08-03 23:57:36.000000000 +0200
@@ -4,10 +4,16 @@
=======================================================================
+August 3, 2019 (Release 3.5.3)
+
+ manyfoot: Fix multicol compatibility issues.
+
+
+=======================================================================
+
June 24, 2018 (Release 3.5.2)
extdash: Add more em-dash configuring options.
-
=======================================================================
Jan 20, 2006
Binary files old/doc/latex/ncctools/manyfoot.pdf and new/doc/latex/ncctools/manyfoot.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ncctools.doc.tlpobj new/tlpkg/tlpobj/ncctools.doc.tlpobj
--- old/tlpkg/tlpobj/ncctools.doc.tlpobj 2019-02-28 03:55:49.000000000 +0100
+++ new/tlpkg/tlpobj/ncctools.doc.tlpobj 2019-08-04 01:53:31.000000000 +0200
@@ -1,9 +1,9 @@
name ncctools.doc
category Package
-revision 48127
+revision 51810
shortdesc doc files of ncctools
relocated 1
-docfiles size=753
+docfiles size=778
RELOC/doc/latex/ncctools/README
RELOC/doc/latex/ncctools/README.source
RELOC/doc/latex/ncctools/afterpackage.pdf
++++++ ncctools.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ncctools/manyfoot.sty new/tex/latex/ncctools/manyfoot.sty
--- old/tex/latex/ncctools/manyfoot.sty 2006-01-13 01:00:29.000000000 +0100
+++ new/tex/latex/ncctools/manyfoot.sty 2019-08-03 23:57:36.000000000 +0200
@@ -24,7 +24,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1993/12/01]
\ProvidesPackage{manyfoot}
- [2005/09/11 v1.10 Many Footnote Levels Package (NCC)]
+ [2019/08/03 v1.11 Many Footnote Levels Package (NCC)]
\RequirePackage{nccfoots}
\newcommand{\extrafootnoterule}{}
\DeclareOption{ruled}{\def\extrafootnoterule{\defaultfootnoterule}}
@@ -312,9 +312,9 @@
\csname MFL@process#4\endcsname #5%
\ifvoid\footins
\let\footnoterule\MFL@currule
- \setbox\footins\vbox{#3\unvbox#5}%
+ \global\setbox\footins\vbox{#3\unvbox#5}%
\else
- \setbox\footins\vbox{%
+ \global\setbox\footins\vbox{%
\unvbox\footins\MFL@skip\MFL@currule#3\unvbox#5%
}%
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ncctools.tlpobj new/tlpkg/tlpobj/ncctools.tlpobj
--- old/tlpkg/tlpobj/ncctools.tlpobj 2019-02-28 03:55:50.000000000 +0100
+++ new/tlpkg/tlpobj/ncctools.tlpobj 2019-08-04 01:53:32.000000000 +0200
@@ -1,6 +1,6 @@
name ncctools
category Package
-revision 48127
+revision 51810
shortdesc A collection of general packages for LaTeX
relocated 1
longdesc The NCCtools bundle contains many packages for general use
@@ -47,7 +47,7 @@
RELOC/tex/latex/ncctools/topsection.sty
RELOC/tex/latex/ncctools/watermark.sty
catalogue-ctan /macros/latex/contrib/ncctools
-catalogue-date 2018-07-03 18:43:47 +0200
+catalogue-date 2019-08-03 11:40:31 +0200
catalogue-license lppl
catalogue-topics collection
-catalogue-version 3.5.2
+catalogue-version 3.5.3
++++++ newpx.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/newpx/ChangesInV1.4.txt new/doc/fonts/newpx/ChangesInV1.4.txt
--- old/doc/fonts/newpx/ChangesInV1.4.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/newpx/ChangesInV1.4.txt 2019-10-09 23:55:55.000000000 +0200
@@ -0,0 +1,49 @@
+Files changed in Newpx as of version 1.4 (2019/09/09)
+
+MATH
+
+NewPXMI.{pfb,afm,tfm} : math italics, LPPL licensed (new)
+NewPXBMI.{pfb,afm,tfm} : bold math italics, LPPL licensed (new)
+NewPXMI_gnu.{pfb,afm,tfm} : math italics, GNU licensed (new)
+NewPXBMI_gnu.{pfb,afm,tfm} : bold math italics, GNU licensed (new)
+stsscr.{pfb,afm,tfm} : old STIX script alphabets OFL (new)
+txmiaSTbb.{pfb,afm,tfm} : old STIX BBB alphabet OFL (new)
+txbmiaSTbb.{pfb,afm,tfm} : old STIX bold BBB alphabet OFL (new)
+px[b]miaX.{pfb,afm,tfm} : extended and modified px[b]mia
+px[b]sys.{pfb,afm,tfm} : modified px[b]sys
+zpl[b]mi.{tfm,vf} : letters
+zpl[b[sy.{tfm,vf} : symbols
+zpl[b]mia.{tfm,vf} : lettersA
+
+TEXT
+
+The npxsups*.tfm were completely revised so as to pass PDF/A-1b validation.
+npxsups-Regular.{pfb,afm} LPPL (New)
+npxsups-Italic.{pfb,afm} LPPL (New)
+npxsups-Bold.{pfb,afm} LPPL (New)
+npxsups-BoldItalic.{pfb,afm} LPPL (New)
+npxsups_OT1.enc (New)
+npxsups_T1.enc (New)
+npxsups_LY1.enc (New)
+
+The tfm files were generated using
+
+afm2tfm npxsups-Regular -a -T npxsups_OT1.enc -v npxsups-Regular-ot1 npxsups-Regular-ot1
+afm2tfm npxsups-Regular -a -T npxsups_T1.enc -v npxsups-Regular-t1 npxsups-Regular-t1
+afm2tfm npxsups-Regular -a -T npxsups_LY1.enc -v npxsups-Regular-ly1 npxsups-Regular-ly1
+afm2tfm npxsups-Italic -a -T npxsups_OT1.enc -v npxsups-Italic-ot1 npxsups-Italic-ot1
+afm2tfm npxsups-Italic -a -T npxsups_T1.enc -v npxsups-Italic-t1 npxsups-Italic-t1
+afm2tfm npxsups-Italic -a -T npxsups_LY1.enc -v npxsups-Italic-ly1 npxsups-Italic-ly1
+afm2tfm npxsups-Bold -a -T npxsups_OT1.enc -v npxsups-Bold-ot1 npxsups-Bold-ot1
+afm2tfm npxsups-Bold -a -T npxsups_T1.enc -v npxsups-Bold-t1 npxsups-Bold-t1
+afm2tfm npxsups-Bold -a -T npxsups_LY1.enc -v npxsups-Bold-ly1 npxsups-Bold-ly1
+afm2tfm npxsups-BoldItalic -a -T npxsups_OT1.enc -v npxsups-BoldItalic-ot1 npxsups-BoldItalic-ot1
+afm2tfm npxsups-BoldItalic -a -T npxsups_T1.enc -v npxsups-BoldItalic-t1 npxsups-BoldItalic-t1
+afm2tfm npxsups-BoldItalic -a -T npxsups_LY1.enc -v npxsups-BoldItalic-ly1 npxsups-BoldItalic-ly1
+#
+for f in npxsups*.vpl; do /bin/cp -fp $f ${f%.*}.pl; done
+for f in npxsups*.pl; do pltotf $f ${f%.*}.tfm; done
+
+MAP
+
+newpx.map was revised to relect the changes above.
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/newpx/README new/doc/fonts/newpx/README
--- old/doc/fonts/newpx/README 2018-12-17 22:30:58.000000000 +0100
+++ new/doc/fonts/newpx/README 2020-02-15 23:13:17.000000000 +0100
@@ -1,10 +1,55 @@
This package, based initially on pxfonts, provides many fixes and enhancements to that package, splitting it in two parts---newpxtext and newpxmath---which may be run independently of one another. It provides scaling, improved metrics, and other options. For proper operation, the packages require that the packages newtxmath, pxfonts and TeXGyrePagella be installed and their map files enabled. The text package now relies on an extension of the TeXGyrePagella Type1 fonts that is provided with this package. The accompanying MANIFEST-newpx.txt provides details of the extension as requested by GUST-FONT-LICENSE.txt
-Current version: 1.33 2018-12-16
+Current version: 1.410 2020-02-15
This material is subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3
for the details of that license.
+Changes in version 1.410
+1. Made some corrections to the subspace offsets in symbol fonts to provide better alignment of subscripts and superscripts.
+2. Reworked the dot positions for the five letters i, j, ij, iogonek and idotbelow, restoring the positions used in the original URW fonts and in earlier commercial versions, so that the top of the dot position aligns with the cap-height, allowing for curvature effects. (Thanks to Daniel Benjamin MIller for reporting this discrepancy.)
+
+Changes in version 1.409
+Changed some \Declare... macros to \re@Declare... in newpxmath.sty, matching recent changes in newtxmath.sty.
+
+Changes in version 1.408
+Other minor corrections.
+
+Changes in version 1.407
+Changed digits in NewPXBMI to bold tabular.
+
+Changes in version 1.406
+Fixed the footnote issues. Some files were missing from the distribution in previous versions.
+
+Changes in version 1.405
+Corrected the capitalization errors in newpx.map that were introduced in 1.404.
+
+Changes in version 1.404
+Corrected the entries in newpx.map, replacing the old sups lines with the versions that are corrext for the newest version of newpx.
+
+Changes in version 1.403
+Corrected codes for \forall and \exists, which are now in their default positions in symbols.
+
+Changes in version 1.402
+Corrected newpx.map and added the correct version of the npxsups encoding files.
+
+Changes in version 1.401
+1. Changed name of file newpx.subs to newpx-subs.tex.
+2. Placed the \pdfglyphtounicode lines in a conditional block in newpxmath.sty so it could continue to be used with other engines. (Thanks Hironobu Yamashita.)
+
+Changes in version 1.40
+1. Reworked the math italics to improve the rendering of some subscripts and superscripts, where formerly, overlaps could occur with superscripts like j, f, p and y with base shapes, such as D, that are round on the right. Increasing the left side-bearing of j, etc, helps with superscripts but makes those letters leave a large gap when used as subscripts.
+2. Corrected and enhanced the subscriptcorrection option to newpxmath so that it now fixes the above problem. I regret that this option is incompatible with xy-pic, both depending on making _ an active character but with very different behaviors. Newpxmath will detect if xy is loaded and disable subscriptcorrection if so.
+3. Added new script alphabets to math italics by extending the encoding from oml to full 256 slots, so they can be used without wasting math families.
+4. Rearranged npxmia and zplsy. The user should not notice this, unless I have erred somewhere.
+5. Provided an adaptive vector accent which matches the normal vector accent but extends as needed over its accentee. I've followed the usage of the esvect package, but changed its implementation.
+6. Many small corrections to spacing and accent positioning.
+7. Revised the superior letters fonts so they have appropriate unicode values.
+8. As a result of these changes, documents generated using newpxmath and appropriate settings will validate PDF/A-1b. (Thanks to Ross Moore for providing the necessary files and details on this.) See the updated documentation to newpx for details.
+9. Fixed error in lmxnpxexx.fd re fontdimens. (Thanks Ruixi Zhang.)
+10. Added option fracspacing that modifies fontdimens 8 and 11 of the symbol font to values more appropriate to the newpx fonts. (Thanks Ruixi Zhang.)
+11. Corrected AMS replacement font npxsym to fix \dalath, \mathbb{k}, \circledR and \circledS.
+
Changes in version 1.33
Modified newpxmath.sty to correct the macros involving selection of Blackboard Bold alphabets.
Binary files old/doc/fonts/newpx/newpxdoc.pdf and new/doc/fonts/newpx/newpxdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/newpx/newpxdoc.tex new/doc/fonts/newpx/newpxdoc.tex
--- old/doc/fonts/newpx/newpxdoc.tex 2017-06-05 01:49:32.000000000 +0200
+++ new/doc/fonts/newpx/newpxdoc.tex 2019-10-03 23:06:58.000000000 +0200
@@ -2,6 +2,15 @@
\documentclass[11pt]{article}
\usepackage[margin=1in]{geometry}
\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
+\pdfmapfile{=newtx.map}
+\pdfmapfile{=newpx.map}
+\pdfcompresslevel=0
+\pdfgentounicode=1
+\input glyphtounicode.tex
+\usepackage{pdfx} % v 1.6.4 or higher
+\InputIfFileExists{glyphtounicode-cmr.tex}{}{}
+\InputIfFileExists{glyphtounicode-ntx.tex}{}{}
+\usepackage{fonttable}
\usepackage{amsthm}
\newtheoremstyle{oldplain}
{\topsep} % ABOVESPACE
@@ -376,4 +385,126 @@
For further information on the changes made to \texttt{newpxmath} 1.3, see the appendix to the documentation for \texttt{newtxmath} 1.5.
+\def\jj{\mkern-3mu j}
+
+\section{Appendix 1: Changes made in version 1.40}
+Versions of {\tt newpx} dated from September, 2019 (1.40 for {\tt newpxmath} make some quite substantial changes, mostly to math mode.
+
+\section{Goals}
+Spurred by work of Ross Moore to provide means of generating archivable pdf using {\tt pdflatex}, the main goal was to change {\tt newpx} and {\tt newtx} to meet the requirements for satisfying the {\tt PDF/A-1b} standards by using an appropriate preamble involving the {\tt pdfx} package and other unicode mapping files. Making these changes gave me the opportunity to organize the source files to make them more manageable in future revisions.
+
+A further goal whose time seemed ripe was to rework the spacing of math letters, both Roman and Greek, so they behaved better in superscripts and subscripts. This did not turn out to be so easy. The problem is illustrated by math italic j. If you don't give it enough extra space on the left, it will likely collide with the D in rendering \verb|$D^j$|. On the other hand, if you do give it enough space on the left, it will look bad as a subscript, appearing too far right.
+
+A final goal was to make better use of the remaining space in some of the math fonts by placing some math alphabets in them, avoiding perhaps a waste of those precious sixteen math families.
+
+\section{The important changes}
+The following changes were made to both {\tt newtx} and {\tt newpx}.
+
+\subsection{Archivability}
+Some of the individual font files from which the math fonts are built turned out to have some fairly minor structural issues. These have all been corrected. The more major issue was the lack of unicode mapping for all characters in the fonts. For the symbol and math extension fonts, this issue was largely solved by Ross Moore's {\tt glyphtounicode} files that are now accessible as part of TeXLive and MiKTeX. The main problem was the math alphabets like math italic, bold math italic, upright Greek and slanted Greek, all of which have now been assigned their own unicode points. For all of these, I constructed new fonts using unicode names for the glyphs, then made \textsf{fontinst} scripts that renamed those unicode values to the original simple names as used in the encoding files so that I could use my old encoding and adjustment files. This exercise has now been carried out for {\tt newtxmath}, {\tt newpxmath}, {\tt newtxmath/libertine} and {\tt newtxmath/xcharter.} Each of these can now be considered to have an ``enhanced'' status that allows them to share all the new assets described below. The other packages which may be specified as an option to {\tt newtxmath} (e.g., {\tt cochineal, baskervillef}) must be considered for the moment to be ``unenhanced'' and able to share only some of the new assets. In particular, only the enhanced items can generate archivable pdf.
+
+Also modified were the {\tt sups} fonts in {newpxtext}, where the main issue was unicode mapping. Superior number and some superior letters do have assigned unicode values, but in may cases a more creative approach was needed, and provided once again by Ross Moore. I rebuilt the superior font files using those unicode names, solving that particular problem.
+
+Here is a sample preamble showing the elements you will need to specify to generate a pdf satisfying the PDF/A-1b standards, as verified by Adobe Acrobat Pro. (Other verification processes may yield different outcomes.)
+\begin{verbatim}
+\documentclass[noamsfonts]{amsart} % save 2 math families
+\pdfcompresslevel=0
+\pdfgentounicode=1
+\input glyphtounicode.tex
+\usepackage{pdfx} % v 1.6.4 or higher
+\InputIfFileExists{glyphtounicode-cmr.tex}{}{}
+\InputIfFileExists{glyphtounicode-ntx.tex}{}{}
+\usepackage{newpxtext} %T1 is default encoding
+\usepackage[scaled=0.95]{inconsolata} % typewriter
+%\usepackage[leqno]{amsmath}
+\usepackage{amsthm}
+\usepackage[vvarbb]{newpxmath} % vvarbb gives STIX Bbb
+\end{verbatim}
+
+Version 1.6.3 of {\tt pdfx} from February 2019 mishandles math accents. A fix is now available and will become part of the upcoming {\tt pdfx} v1.6.4.
+
+\subsection{Glyph spacing changes} I reworked the math italics to improve the rendering of some superscripts. This affects (a) parentheses, brackets and braces to inhibit clashes; (b) glyphs like j, f, p, y, \verb|\rho|, \verb|\beta| and \verb|\mu| where a long tail could pose problems intersecting with other glyphs; (c) glyphs like such as D, Q and \verb|\Phi| that are round on the right, where interference is most likely to occur with a superscript. Increasing the left side-bearing of j, etc., helps with superscripts but creates an ugly gap when used as subscripts.
+
+
+ The {\tt subscriptcorrection} option to {\tt newpxmath} has been corrected and enhanced so that it now offers a partial solution the subscript spacing problem. I regret that this option is incompatible with xy-pic, both depending on redefining \verb|_| as an active character. {\tt Newpxmath} will detect if the {\tt xy} package is loaded and disable {\tt subscriptcorrection} if so. You would have to correct such issues by manually inserting a negative \verb|\mkern|. For example, you might put in your preamble something like
+ \begin{verbatim}
+\def\jj{\mkern-3mu j}
+\end{verbatim}
+and then use \verb|$x_{\jj}$| instead of \verb|$x_j$|, turning $x_j$ into $x_{\jj}$.
+
+If you do enable {\tt subscriptcorrection}, there is a default correction table in the {\tt sty} file, but the sty file also looks for a file named, {\tt newpx-subs.tex}. There is already such a file located in the {\tt newpx} distribution in the \verb|tex/latex/newpx| folder. (The contents of this file are also listed at the end of this appendix, from which they may be more easily copied.) If you wish to make changes to this file, copy the file to your home TeX folder where it will be found by TeX before the one in the distribution. (The contents of this file are also listed at the end of this appendix, from which they may be more easily copied.) The entries in the file are lines like
+\begin{verbatim}
+{j}{-3}
+\end{verbatim}
+each of which will have the same effect as the above macro if the first item in the subscript is j. You can also specify Greek letters with lines like
+\begin{verbatim}
+{\beta}{-1.5}
+\end{verbatim}
+
+\subsection{New glyphs added} Math family 1 {\tt (letters)} has been extended from 128 slots to 256, retaining the {\tt OML} encoding of the first 128. Most of additional slots have been allocated to a script font from the old STIX collection and an upright modification of that font.
+By default, \verb|$\mathscr{F}$| will produce $\mathscr{F}$.\\
+$\bullet$ option {\tt uprightscript} changes the output to {\usefont{OML}{ntxmi}{m}{it}\char201}.\\
+In both cases, there are full upper-case and lower-case and {\tt dotlessi}, {\tt dotlessj}. To insert the latter, you can write either \verb|$\mathscr{\imath}$| or \verb|$\imathscr$|, rendered as $\mathscr{\imath}$ in the slanted script case.
+
+The secondary letters font {\tt (lettersA)} and math family 2 {\tt(symbols)} have been rearranged. The first of these continues to have a Fraktur alphabet, but it a modification of its original one, having wider vertical stems and a blacker appearance more in keeping with the weight Times. {\tt Dotlessi} and {\tt dotlessj} have been added and can be specified in math mode by \verb|$\imathfrak$| and \verb|$\jmathfrak$|---\verb|$\mathfrak{\imath}$| also works. There are in addition two subsidiary Bbb alphabets in {\tt lettersA}, specified by the respective options {\tt vmathbb}, {\tt vvmathbb}, and there are corresponding {\tt dotlessi}, {\tt dotlessj} activated by \verb|$\imathbb$|, \verb|$\jmathbb$|, which always render as $\imathbb$, $\jmathbb$ mo matter the choice of which Blackboard Bold Alphabet. If you select one of the options {\tt vmathbb}, {\tt vvmathbb}, you will have Bbb digits 0..9 using, e.g., \verb|$\mathbb{1}$| to get~$\mathbb{1}$.
+
+Among the new symbols added are:\\
+$\bullet$ \verb|\hslash|, \verb|\hbar|, \verb|\lambdaslash|, \verb|\lambdabar|, \verb|\Zbar|, \verb|\Angstrom| are now constructed from the native glyphs.\\
+$\bullet$ Euler's constant \verb|$\Euler$| ($\Euler$).\\
+$\bullet$ Hermitian transpose \verb|\hermtransp| or \verb|\htransp| is used like \verb|$\mathbf{A}^{\htransp}$| ($\mathbf{A}^{\htransp}$). This usage is similar to simple transpose \verb|$\mathbf{A}^{\transp}$| ($\mathbf{A}^{\transp}$).\\
+$\bullet$ Independence can use \verb|\Perp|, $\Perp$, and there is a new \verb|\nPerp|, $\nPerp$ for the negation.
+
+\subsection{Adaptive vector accent} The \LaTeX\ macro \verb|\overrightarrow| provides a right arrow with adaptive width, but not matching the vector head of {\tt newpxmath}. Likewise, the {\tt esvect} provides a similar service with a choice of vector heads, none of which match {\tt newpxmath}. I've added code to provide a matching adaptive vector accent and which uses the same macro name, \verb|\vv|, as {\tt esvect}.
+For a comparison of these vector accents, \verb|$\vec{XY} \vv{XY} \overrightarrow{XY}$| renders as\\
+$\vec{XY} \vv{XY} \overrightarrow{XY}$.\\
+$\bullet$ \verb|$\vv{AB}$| renders as $\vv{AB}$.\\
+$\bullet$ \verb|$\vv*{AB}{x}$| renders as $\vv*{AB}{x}$. This provides better horizontal spacing of subscripts than \verb|$\vv{AB}_{x}$|, $\vv{AB}_{x}$.\\
+$\bullet$ You can also do \verb|$\vv*{AB}{\vv{CD}}$|, which renders as $\vv*{AB}{\vv{CD}}$.\\
+$\bullet$ You can change the vertical space between the arrow and the accentee by means of the package option {\tt vecsep}, whose default value is {\tt .25ex}.
+
+\subsection{Miscellaneous Changes}
+\begin{itemize}
+\item
+The superior letters fonts in {\tt newpx}
+have been extended and all glyphs now have appropriate unicode mappings.
+\item
+The AMS fonts replacement, {\tt zplsym} corrects the former misplacement of \verb|\kbbb|, \verb|\daleth|, \verb|\circledR| and \verb|\circledS|.)
+\end{itemize}
+\newpage
+\section{Changed Font Tables}
+\subsection{letters}
+\fonttable{zplmi}
+\newpage
+\subsection{lettersA}
+\fonttable{zplmia}
+\newpage
+\subsection{symbols}
+\fonttable{zplsy}
+\newpage
+\subsection{A sample newpx-subs.tex}
+You may either copy the entire block below, starting with the line \verb|\begin{...| and ending after the line beginning \verb|\end{|
+and pasting it into the top of your document before the \verb|\documentclass...| line, which will allow for easy editing and will write the file to the same folder as your document, or make your own file, omitting those outer two lines.
+
+\begin{verbatim}
+\begin{filecontents*}{newpx-subs.tex}
+{f}{-2.5}
+{j}{-1.5}
+{p}{-1}
+{y}{-1}
+{A}{-1.5}
+{B}{-1}
+{D}{-1}
+{H}{-1}
+{I}{-1}
+{K}{-1}
+{L}{-1}
+{M}{-1}
+{N}{-0.5}
+{P}{-1}
+{X}{-1}
+{\rho}{-1.5}
+{\mu}{-1}
+\end{filecontents*}
+
+\end{verbatim}
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/newpx.doc.tlpobj new/tlpkg/tlpobj/newpx.doc.tlpobj
--- old/tlpkg/tlpobj/newpx.doc.tlpobj 2019-02-28 03:55:54.000000000 +0100
+++ new/tlpkg/tlpobj/newpx.doc.tlpobj 2020-02-16 01:54:28.000000000 +0100
@@ -1,9 +1,10 @@
name newpx.doc
category Package
-revision 49438
+revision 53792
shortdesc doc files of newpx
relocated 1
-docfiles size=89
+docfiles size=216
+ RELOC/doc/fonts/newpx/ChangesInV1.4.txt
RELOC/doc/fonts/newpx/MANIFEST-newpx.txt
RELOC/doc/fonts/newpx/README
RELOC/doc/fonts/newpx/newpxdoc.pdf
++++++ newpx.tar.xz ++++++
++++ 82555 lines of diff (skipped)
++++++ newtx.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/newtx/README new/doc/fonts/newtx/README
--- old/doc/fonts/newtx/README 2018-05-31 23:31:36.000000000 +0200
+++ new/doc/fonts/newtx/README 2020-03-03 23:02:56.000000000 +0100
@@ -1,10 +1,92 @@
This package, initially based on txfonts, provides many fixes and enhancements to the txfonts package, splitting it into two separate packages---newtxtext and newtxmath, which may be run independently of one another. It provides scaling, improved metrics, and other options. In particular, newtxmath offers a libertine option which substitutes Linux Libertine (provided with TeXLive and MikTeX) italic and Greek letters for the default Times letters, providing a good match for the Libertine text font, which is heavier than Computer Modern but lighter than Times, and in my experience, looks very sharp and clear on the screen.
-Current version: 1.554 2018-05-30
+Current version: 1.625 2020-03-02
This material is subject to the LaTeX Project Public License. See http://www.ctan.org/license/lppl1.3
for the details of that license.
+Changes in version 1.625
+1. Made some corrections to the subscript offsets in symbol fonts to provide better alignment of subscripts and superscripts.
+2. Reworked the dot positions for the five letters i, j, ij, iogonek and idotbelow, restoring the positions used in the original URW fonts and in commercial versions of Times, so that the top of the dot position aligns with the cap-height, allowing for curvature effects. (Thanks to Daniel Benjamin Miller for reporting this discrepancy.)
+3. Corrected a bug in newtxmath.sty handling of the choice between the three mathbb versions available and the resulting definition of \Bbbk. (Thanks again to Daniel Benjamin Miller who reported this error.)
+4. Added denominator figures in Regular weight only, and added a \textfrac macro that uses the superior and denominator figures to construct, e.g, seven eightieths using \textfrac{7}{80}. The denominator figures themselves are invoked by, e.g., \textin{345}.
+
+Changes in version 1.624
+Corrected problems with option varg in bold math italic and with the non-functional macros \varg, \varv, \varw, \vary. (Thanks Dave Green.)
+
+Changes in version 1.623
+Corrected code which prevented use of the frenchmath option to newtxmath.
+
+Changes in version 1.622
+Fixed a bad bug inadvertently introduced in 1.621.
+Changes in version 1.621
+Changes to newtxmath.sty to resolve conflicts with icdthesis.cls.
+
+Changes in version 1.62
+1. Changed the definition of \Bbbk to point to the lower-case K in the selected Blackboard Bold alphabet.
+2. Added New Century Schoolbook (option NC) to the list of fonts with enhanced math support in newtxmath.
+3. Reworked superior letters and figures unicode mappings in both ntxsups and in the otf TeXGyreTermesX otf files.
+4. Adjusted some math accent placements.
+5. Removed an unwanted ij ligature in the theorem font.
+
+Changes in version 1.612
+Corrected LibertineMath italic 7pt g. (Wrong shape of g.)
+
+Changes in version 1.611
+Added option alty to newtxmath/charter, offering a rounder math italic y shape.
+
+Changes in version 1.61
+Corrected a bug in newtxmath.sty affecting users of a non-enhanced font who also used the option nosymbolsC.
+
+Changes in version 1.609
+Small corrections related to newtxmath/erewhon.
+
+Changes in version 1.608
+1. Added support for utopia option to newtxmath with enhanced status.
+2. This version really does include the new names for slanted Greek letters.
+
+Changes in version 1.607
+1. Modified txmiaX.{pfb,tfm}, changing Delta, Sigma and epsilon1 (lunate epsilon symbol) so they would relate better to the bold, italic and bold italic versions.
+2. Reworked the sixteen tfm files ntx-*f-ot1.tfm, renaming them to replace "ot1" with "ot1r", and then regenerating the sixteen as virtual fonts based on the ot1r versions but with capital Greek taken from tx[b]miaX abd NewTX[B]MI. These now serve as the the ot1 font versions having capital Greeks in the first eleven slots.
+3. The slanted greek letters may now be specified as, e.g., \itGamma, as well as the existing \Gammit.
+(Thanks to Holger Gerhardt, who spotted the inconsistencies these modifications address.)
+
+Changes in version 1.606
+Changed handling of figures to honor change of math alphabet.
+
+Changes in version 1.605
+1. Added the missing pieces (fd files, map entries) of the math support files for ebgaramond.
+2. Modified zut[b]mi.{tfm,vf} so that math support for {utopia, heuristica, erewhon} is declared to be of enhanced, though not 100%. Exceptions are (i) you cannot reliably generate pdf/A-1b; (ii) the added symbols are from Times, not Utopia.
+
+Changes in version 1.604
+Removed the files ntxsts2* that are now located in the stickstoo package.
+
+Changes in version 1.603
+1. Corrected the sups lookup in the otf fonts to include 1,2,3.
+2. Added ae.superior to the otf fonts.
+3. Adjusted some figure shapes to blend better with {1,2,3}.superior (otf only, so far.)
+
+Changes in version 1.602
+1. Newtxmath.sty no longer requires the trimspaces package.
+2. Corrected newtx.map so that the ntxsups encoding names are now all in lowercase, matching the actual filenames.
+3. Added the changes needed for stix2 option to work as an enhanced option, able to generate conformant PDF/A-1b pdf output.
+
+Changes in version 1.601
+1. 1. Changed name of file newtx.subs to newtx-subs.tex, with similar changes for other such files.
+2. Placed the \pdfglyphtounicode lines in a conditional block in newpxmath.sty so it could continue to be used with other engines. (Thanks Hironobu Yamashita.)
+3. Added option ebgaramond to substitute ebgaramond Roman and Greek Letters for Times in math.
+
+Changes in version 1.60
+1. Reworked the math italics to improve the rendering of some subscripts and superscripts, where formerly, overlaps could occur with superscripts like j, f, p and y with base shapes, such as D, that are round on the right. Increasing the left side-bearing of j, etc, helps with superscripts but makes those letters leave a large gap when used as subscripts.
+2. Corrected and enhanced the subscriptcorrection option to newtxmath so that it now fixes the above problem. I regret that this option is incompatible with xy-pic, both depending on making _ an active character but with very different behaviors. Newtxmath will detect if xy is loaded and disable subscriptcorrection if so.
+3. Added new script alphabets to math italics by extending the encoding from oml to full 256 slots, so they can be used without wasting math families.
+4. Rearranged ntxmia and ntxsy. The user should not notice this, unless I have erred somewhere.
+5. Provided an adaptive vector accent which matches the normal vector accent but extends as needed over its accentee. I've followed the usage of the esvect package, but changed its implementation.
+6. Many small corrections to spacing and accent positioning.
+7. Revised the superior letters fonts so they have appropriate unicode values.
+8. As a result of these changes, documents generated using newpxmath and appropriate settings will validate PDF/A-1b. (Thanks to Ross Moore for providing the necessary files and details on this.) See the updated documentation to newtx for details.
+9. Corrected AMS replacement font ntxsym to fix \dalath, \mathbb{k}, \circledR and \circledS.
+
Changes in version 1.554
1. Removed some map lines from newtx.map that were duplicates of some in stickstootext.map.
2. Fixed a number of problems that had crept into the libertime math italic alphabets, which were in some cases not operating as documented with option libaltvw. Now they do.
Binary files old/doc/fonts/newtx/newtxdoc.pdf and new/doc/fonts/newtx/newtxdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/newtx/newtxdoc.tex new/doc/fonts/newtx/newtxdoc.tex
--- old/doc/fonts/newtx/newtxdoc.tex 2018-05-12 23:23:43.000000000 +0200
+++ new/doc/fonts/newtx/newtxdoc.tex 2020-03-03 23:02:56.000000000 +0100
@@ -2,12 +2,20 @@
\documentclass[11pt]{article}
\usepackage[margin=1in]{geometry}
\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
+\pdfmapfile{=newtx.map}
+\pdfcompresslevel=0
+\pdfgentounicode=1
+\input glyphtounicode.tex
+\usepackage{pdfx} % v 1.6.4 or higher
+\InputIfFileExists{glyphtounicode-cmr.tex}{}{}
+\InputIfFileExists{glyphtounicode-ntx.tex}{}{}
\usepackage{graphicx}
\usepackage{url}
\usepackage{trace}
+\usepackage{fonttable}
%SetFonts
% newtxtext text and newtxmath
-\usepackage{amsthm}
+\usepackage{amsmath,amsthm}
\newtheoremstyle{oldplain}
{\topsep} % ABOVESPACE
{\topsep} % BELOWSPACE
@@ -22,7 +30,7 @@
\theoremstyle{plain}
\newtheorem{thm}{Theorem}[section]
%\pdfmapfile{=newtx.map}
-\usepackage[osf,largesc,theoremfont]{newtxtext}
+\usepackage[osf,p,largesc,theoremfont]{newtxtext}
\usepackage[T1]{fontenc}
\usepackage[varqu,varl]{zi4}
%\traceon
@@ -45,11 +53,13 @@
\section{Introduction}
This package is meant to be a replacement for Young Ryu's {\tt txfonts}. It is a complete text ({\tt newtxtext}) and math ({\tt newtxmath}) package with roman text font provided by a Times clone, sans serif based on a \textsf{Helvetica} clone, typewriter faces, plus math symbol fonts whose math italic letters are from a Times Italic clone. As of version 1.4, {\tt newtxtext} no longer depends on {\tt txfonts} but is based on the richer source \textsf{TeXGyre Termes}, but {\tt newtxmath} continues to use the {\tt txfonts} math glyphs with many metric adjustments and some wholesale modifications.
-\textsc{Very Important:} The math package changed substantially as of version 1.5, changing a number of glyphs, adding an option to reduce the sizes of large operators, and changing the integral signs to a choice of upright and slanted forms, each available in twelve variants. The new options are {\tt upint} (upright integrals) and {\tt smallerops} (smaller large operators.) Some previously available options may no longer have any effect. The changes are described in detail in the section on math mode options. A summary of the changes in version 1.5 is given in the Appendix.
+\textsc{Very Important:} The math package changed substantially as of version 1.5, changing a number of glyphs, adding an option to reduce the sizes of large operators, and changing the integral signs to a choice of upright and slanted forms, each available in twelve variants. The new options are {\tt upint} (upright integrals) and {\tt smallerops} (smaller large operators.) Some previously available options may no longer have any effect. The changes are described in detail in the section on math mode options. A summary of the changes in version 1.5 is given in Appendix 1.
+
+Version 1.60 likewise has many additions and changes that are summarized in Appendix 2. Most important is that {\tt newtx} is now able to output a PDF/A-1b compliant pdf using {\tt pdflatex}.
-This math package works, after possibly replacing its math Roman and Greek letters, with fonts other than Times that are intermediate in weight between Computer Modern and Times. The free font Linux Libertine is one particular target---it is of nearly the same x-height as Computer Modern, but, not being a \emph{modern} font, does not have a high contrast ratio, and so appears denser than Computer Modern but not as much so as Times. It is meant as a replacement for Times, but differs from it in many characteristics, more similar to MinionPro than Times, and provides a better range of variants than Times---three weights (regular, semi-bold and bold) rather than just two, and has expert features in all weights: old-style figures, more extensive and more interesting ligatures, and small caps. In my opinion, material typeset in Linux Libertine looks better than the corresponding material typeset in Times. This seems especially true on the screen. As of version 1.0, the package also offers support for MinionPro as a math font, but with limitations described in detail below. More recently, an option to provide math support for the \textsf{garamondx} text font package was added. Version 1.55 adds support for the {SticksToo} text fonts, a reworking of the newly released {\tt STIX2} text fonts.
+This math package works, after possibly replacing its math Roman and Greek letters, with fonts other than Times that are intermediate in weight between Computer Modern and Times. The free font Linux Libertine is one particular target---it is of nearly the same x-height as Computer Modern, but, not being a \emph{modern} font, does not have a high contrast ratio, and so appears denser than Computer Modern but not as much so as Times. It is meant as a replacement for Times, but differs from it in many characteristics, more similar to MinionPro than Times, and provides a better range of variants than Times---three weights (regular, semi-bold and bold) rather than just two, and has expert features in all weights: old-style figures, more extensive and more interesting ligatures, and small caps. In my opinion, material typeset in Linux Libertine looks better than the corresponding material typeset in Times. This seems especially true on the screen. As of version 1.0, the package also offers support for MinionPro as a math font, but with limitations described in detail below. More recently, an option to provide math support for the \textsf{garamondx} text font package was added. Version 1.55 adds support for the {SticksToo} text fonts, a reworking of the {\tt STIX2} text fonts.
The {\tt newtx} package differs from {\tt txfonts} in the following ways:
\begin{itemize}
@@ -137,6 +147,8 @@
Option {\tt defaultsups} (same effect as {\tt defaultsups=true}) forces the package to use the \LaTeX\ default footnote markers (or, at least, those in force when the package is loaded) instead of those preferred by the package---Times Roman superior figures instead of spindly ordinary Times lining figures reduced to about 70\%. (Footnote markers in minipages use the default lowercase italic alphabetic characters, unless otherwise specified by redefining \verb|\thempfootnote|.) For better control over position and size of footnote markers, use the {\tt superiors} package after loading {\tt newtxtext}. The \verb|\sustyle| font switch and its related \verb|\textsu| macro know not only about figures, but also the lower case letters, including \texttt{egrave}, so that traditional French expressions like \textlf{1}\textsu{i\`ere} may be typeset correctly.
+As of version 1.625, there are now denominator figures (aligned to the text baseline) which may be called either with \verb|{\infigures 12345}| {\infigures 12345} or \verb|\textin{6789}| \textin{6789}. Currently, these are available only in regular weight, upright shape. There is a new macro \verb|\textfrac| that builds a fraction from superior figures and denominator figures: e.g., \verb|\textlf{5}\,\textfrac{7}{80}| renders as \textlf{5}\,\textfrac{7}{80}.
+
Option \texttt{largesc} changes the small cap glyphs from the default petite caps defined in TeXGyre Termes (same size as in txfonts) to a larger size that, in upright shapes, is metrically compatible with Adobe's small caps. These are about 10\% larger than petite caps. For a comparison, \textsc{Small Caps}, {\usefont{T1}{qtm}{m}{sc}Petite Caps}, and \textsc{\textit{Italic Small Caps}}, {\usefont{T1}{qtm}{m}{scit}Italic Petite Caps}.
Option \texttt{adobesc} is only for those who own licenses for \textsf{Adobe Times Small Caps} and install them into the \texttt{ptmsc} package downloaded from \textsc{ctan}. This option loads \texttt{largesc} and substitutes the Adobe glyphs, where available, including their larger Regular and Bold tabular oldstyle figures.
@@ -151,7 +163,7 @@
This is Theorem Italic: text numbers are upright---12345; punctuation is in many cases upright (also, parens, braces \{\} and brackets []). What about question marks and exclamations? Also upright! [These fit better with math mode punctuation and figures, like: for all $x\in[0,1]$, let $f(x)\coloneq \exp(\alpha x)$].
\end{oldthm}
-If you are using another theorem package (e.g., ntheorem, theorem) you will have to add your own descriptors as specified in the its documentation and set the body font to \verb|\slshape|.
+If you are using another theorem package (e.g., ntheorem, theorem) you will have to add your own descriptors as specified in its documentation and set the body font to \verb|\slshape|.
\section{Spacing issues}
This new version of {\tt newtxtext} has spacing that is a little different, in its default state, from that of the old {\tt newtxtext}. In small part this is due to the finer kerning of TeXGyre Termes, but mostly because the three parameters that govern inter-word spacing are not the same.
@@ -211,13 +223,22 @@
\item {\tt varvw} causes the math italic letters \verb|v,w| to be replaced by versions which are more distinctive---eg, useful for distinguishing math italic \verb|v| from \verb|\nu|;
\item {\tt libertine} loads different versions of math italic and bold math italic based on \textsf{Libertine} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default;
\item (new in version 1.55) {\tt stix2} loads different versions of math italic and bold math italic based on \textsf{StixTwoMath} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. See the documentation to the {\tt SticksToo} package, which contains more details and some math samples.
+\item (new in version 1.60) {\tt ebgaramond} loads different versions of math italic and bold math italic based on \textsf{EBGaramond} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. See the end of Appendix 2 for an example of a preamble.
+\item (new in version 1.62) {\tt nc, ncf} load different versions of math italic and bold math italic based on \textsf{ScholaX} (\textsf{New Century Schoolbook}) rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. The difference is that o[tion {\tt nc} loads math Greek letters from {\tt newtxmath}, while option {\tt ncf} loads math greek from an adaptation of {\tt fourier} Greek.
\item {\tt minion} loads different versions of math italic and bold math italic based on \textsf{MinionPro} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default---see the extended discussion below;
\item {\tt garamondx} loads different versions of math italic and bold math italic based on \textsf{garamondx} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default.
\item {\tt baskervaldx} (or {\tt Baskervaldx}) loads different versions of math italic and bold math italic based on \textsf{Baskervaldx} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default.
\item {\tt baskerville} (or {\tt Baskerville}, or {\tt baskervillef} or {\tt BaskervilleF}) loads different versions of math italic and bold math italic based on \textsf{BaskervilleF} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default.
\item {\tt charter} (or {\tt xcharter}) loads different versions of math italic and bold math italic based on \textsf{XCharter} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default. \textbf{As of version 1.53, Greek letters in all styles are taken from new alphabets constructed to match the Charter style.}
+\item {\tt alty} is new as of version 1.611, and applies only when math mode uses Charter alphabets. It causes math italic y to be rendered using a rounder shape that is less problematic than the default shape because it lacks the long tail of the XCharter Italic {\usefont{T1}{XCharter-TLF}{m}{it}y}.
\item {\tt noxchvw} (or {\tt noXchvw} is new as of version 1.54, and applies only when math mode uses Charter alphabets. It causes math italic v and w to be rendered using Charter italic glyphs. Use this only if you don't care if math italic v is hard to distinguish from Greek \verb|\nu|.
-\item {\tt cochineal} loads different versions of math italic and bold math italic based on \textsf{cochineal} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case.
+
+\item {\tt cochineal} loads different versions of math italic and bold math italic based on \textsf{cochineal} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case. There are two additional options specific to {\tt cochineal}.
+\begin{itemize}
+\item
+Option {\tt cochf} replaces the default short math italic f with the long italic f used in text.
+\item Option {\tt cochrho} replaces the default short form of \verb|\rho| with the the long form used in text.
+\end{itemize}
\item {\tt utopia} (or {\tt heuristica} or {\tt erewhon}) loads different versions of math italic and bold math italic based on \textsf{Utopia} rather than \textsf{Times}---the {\tt varg} and {\tt varvw} options are disabled in this case, as the equivalent variant forms are made available by default. The Heuristica or Erewhon font package must be installed to use this option. (Erewhon is based on Heuristica, but is 6\% smaller and has more complete figures styles and small cap styles, as well as a variety of smaller figures---superior, inferior, numerator, denominator.) For example:
\begin{verbatim}
\usepackage[osf]{erewhon} %extension of Utopia
@@ -225,7 +246,7 @@
\usepackage[scaled=.95]{cabin} % sans serif
\usepackage[utopia,vvarbb]{newtxmath}
\end{verbatim}
-\item the {\tt libertine} option also replaces both slanted and upright Greek symbols by the corresponding Libertine glyphs, and similarly for {\tt minion}, {\tt garamondx}, {\tt stix2} and {\tt cochineal};
+\item the {\tt libertine} option also replaces both slanted and upright Greek symbols by the corresponding Libertine glyphs, and similarly for {\tt minion}, {\tt garamondx}, {\tt ebgaramond}, {\tt stix2}, {\tt xcharter} and {\tt cochineal};
\item
{\tt cmintegrals} instructs \textsf{newtxmath} to load a thicker version of the Computer Modern integral in place of the \textsf{newtxmath} default---the txfonts integral (identical to the integral in the Wolfram fonts), which is not to everyone's taste---a consequence is that none of the special forms of \textsf{txfonts} integrals are available;
\textbf{as of version 1.5, this option does nothing, as the new default is slanted integrals.}
@@ -318,7 +339,7 @@
\usepackage[T1]{fontenc} % best for Western European languages
\usepackage{textcomp} % required to get special symbols
\usepackage[varqu,varl]{inconsolata}% a typewriter font must be defined
-\usepackage{amsthm}% must be loaded before newtxmath
+\usepackage{amsmath,amsthm}% must be loaded before newtxmath
\usepackage[libertine,vvarbb]{newtxmath}
\usepackage[scr=rsfso]{mathalfa}
\usepackage{bm}% load after all math to give access to bold math
@@ -350,7 +371,7 @@
\usepackage[T1]{fontenc}
\usepackage[scaled=.85]{beramono}% used only by \mathtt
\usepackage[type1]{cabin}% used only by \mathsf
-\usepackage{amsthm}% must be loaded before newtxmath
+\usepackage{amsmath,amsthm}% must be loaded before newtxmath
\usepackage[libertine]{newtxmath}
% loads minlibertine because no other Roman text package was specified
% so that \mathrm and \mathbf also use minlibertine
@@ -370,7 +391,7 @@
\renewcommand{\rmdefault}{fbb-LF}% Roman font for use in math mode
\usepackage[scaled=.85]{beramono}% used only by \mathtt
\usepackage[type1]{cabin}% used only by \mathsf
-\usepackage{amsthm}% load before newtxmath
+\usepackage{amsmath,amsthm}% load before newtxmath
\usepackage[libertine,vvarbb]{newtxmath}
% does not load minlibertine because another Roman text package was specified
\usepackage[scr=rsfso]{mathalfa}
@@ -507,7 +528,7 @@
\item the original variant form called with the macro \verb|\varmathbb| is better, but the macro conflicts with \verb|\bm|. (In fact, the bold version is identical to the regular version, but it is still not right that it conflicts with them.) The problem stems from the part of the definition of \verb|\varmathbb| which allows you to insert an argument with more than one character, like \verb|\varmathbb{ABC}|. Another problem with \verb|\varmathbb| is that it conflicts with {\tt hyperref}---if you use the macro in a moveable argument such as a section heading, you will provoke a \LaTeX\ error message. The solution is to use macros that take a single character as argument, like \verb|\vmathbb{A}| and \verb|\vvmathbb{A}|, which both cooperate with {\tt hyperref}.
\item the third, new, alphabet is borrowed from the STIX fonts---it is sharp and quite clear, geometric in design. The macro \verb|\vvmathbb| provided to access this alphabet. The new option {\tt vvarbb} effectively makes \verb|\mathbb| mean the same as \verb|\vvmathbb|.
(The reason for including these in the \textsf{newtx} package rather than calling them from the \textsf{mathalfa} package is that \textsf{newtx} leaves very little space for new math symbol fonts and math alphabets, and this way requires no additional such resources.
-\item \textbf{Important note:} Under the option {\tt stix2}, there are still three blackboard fonts but the macro \verb|\vmathbb| now points to glyphs from {\tt DSSerif}, a serifed double-struck family that replaces the original variant that is still available under other options.
+\item \textbf{Important note:} Under the option {\tt stix2}, there are still three blackboard fonts but the macro \verb|\vmathbb| now points to glyphs from {\tt DSSerif}, a serifed double-struck family that replaces the original variant that is still available under other options. With {\tt stix2}, the {\tt dotlessi} and {\tt dotlessj} glyphs from the {\tt DSSerif} font are available as \verb|$\imathbbs$| and \verb|$\jmathbbs$|, no matter which blackboard bold option you chose.
\end{itemize}
One interesting feature of the new alphabet is that it contains blackboard bold numbers, of which $0$ and $1$ will likely be the most useful, perhaps as operator names. I find $\vvmathbb{1}$=\verb|$\vvmathbb{1}$| useful in specifying an indicator, AKA characteristic function. Here are some examples:
@@ -638,7 +659,7 @@
The last two entries provide us with a way to access custom-encoded versions of {\tt fxlri.pfb} and {\tt fxlbi.map} in order to access some of the unencoded alternate characters---eg, Greek letters, {\tt J.alt} and {\tt v.alt}. The font file \textsf{LibertineTheta-Regular.pfb} was created from the Theta symbol in {\tt fxlri.pfb}, which requires some FontForge help to look correct.
This version contains optical versions of the math italic and symbol fonts at 7\texttt{pt} and 5\texttt{pt}, allowing better rendering in \verb|\scriptstyle| and \verb|\scriptscriptstyle|.
-\section{Appendix: Changes made in version 1.5}
+\section{Appendix 1: Changes made in version 1.5}
\begin{itemize}
\item
The large delimiters have been modified so match the heights in common usage by \texttt{cmex10} and other packages. (Those formerly used by \texttt{newtxmath} were somewhat shorter, resulting in unexpected behavior of \verb|\Big|, \verb|\bigg|, etc.)
@@ -716,4 +737,159 @@
\item New macros \verb|\setSYdimens| and \verb|\setEXdimens| allow experts to modify some math font dimensions.
\end{itemize}
+
+\def\jj{\mkern-3mu j}
+
+\section{Appendix 2: Changes made in version 1.60}
+Versions of {\tt newtx} dated from September, 2019 (1.60 for {\tt newtxmath} make some quite substantial changes, mostly to math mode.
+
+\section{Goals}
+Spurred by work of Ross Moore to provide means of generating archivable pdf using {\tt pdflatex}, the main goal was to change {\tt newtx} and {\tt newpx} to meet the requirements for satisfying the {\tt PDF/A-1b} standards by using an appropriate preamble involving the {\tt pdfx} package and other unicode mapping files. Making these changes gave me the opportunity to organize the source files to make them more manageable in future revisions.
+
+A further goal whose time seemed ripe was to rework the spacing of math letters, both Roman and Greek, so they behaved better in superscripts and subscripts. This did not turn out to be so easy. The problem is illustrated by math italic j. If you don't give it enough extra space on the left, it will likely collide with the D in rendering \verb|$D^j$|. On the other hand, if you do give it enough space on the left, it will look bad as a subscript, appearing too far right.
+
+A final goal was to make better use of the remaining space in some of the math fonts by placing some math alphabets in them, avoiding perhaps a waste of those precious sixteen math families.
+
+\section{The important changes}
+The following changes were made to both {\tt newtx} and {\tt newpx}.
+
+\subsection{Archivability}
+Some of the individual font files from which the math fonts are built turned out to have some fairly minor structural issues. These have all been corrected. The more major issue was the lack of unicode mapping for all characters in the fonts. For the symbol and math extension fonts, this issue was largely solved by Ross Moore's {\tt glyphtounicode} files that are now accessible as part of TeXLive and MiKTeX. The main problem was the math alphabets like math italic, bold math italic, upright Greek and slanted Greek, all of which have now been assigned their own unicode points. For all of these, I constructed new fonts using unicode names for the glyphs, then made \textsf{fontinst} scripts that renamed those unicode values to the original simple names as used in the encoding files so that I could use my old encoding and adjustment files. This exercise has now been carried out for {\tt newtxmath}, {\tt newpxmath}, {\tt newtxmath/libertine}, {\tt newtxmath/cochineal}, {\tt newtxmath/stix2}, {\tt newtxmath/xcharter} and {\tt newtxmath/erewhon.} Each of these can now be considered to have an ``enhanced'' status that allows them to share all the new assets described below.
+ The other packages which may be specified as an option to {\tt newtxmath} (e.g., {\tt baskervaldx, baskervillef}) must be considered for the moment to be ``unenhanced'' and able to share only some of the new assets. In particular, only the enhanced items can generate archivable pdf.
+
+Also modified were the {\tt sups} fonts in {newtxtext}, where the main issue was unicode mapping. Superior number and some superior letters do have assigned unicode values, but in may cases a more creative approach was needed, and provided once again by Ross Moore. I rebuilt the superior font files using those unicode names, solving that particular problem.
+
+Here is a sample preamble showing the elements you will need to specify to generate a pdf satisfying the PDF/A-1b standards, as verified by Adobe Acrobat Pro. (Other verification processes may yield different outcomes.)
+\begin{verbatim}
+\documentclass[noamsfonts]{amsart} % save 2 math families
+\pdfcompresslevel=0
+\pdfgentounicode=1
+\input glyphtounicode.tex
+\usepackage{pdfx} % v 1.6.4 or higher
+\InputIfFileExists{glyphtounicode-cmr.tex}{}{}
+\InputIfFileExists{glyphtounicode-ntx.tex}{}{}
+\usepackage{newtxtext} %T1 is default encoding
+\usepackage[scaled=0.95]{inconsolata} % typewriter
+%\usepackage[leqno]{amsmath}
+\usepackage{amsthm}
+\usepackage[vvarbb]{newtxmath} % vvarbb gives STIX Bbb
+\end{verbatim}
+
+Version 1.6.3 of {\tt pdfx} from February 2019 mishandles math accents. A fix is now available and will become part of the upcoming {\tt pdfx} v1.6.4.
+
+\subsection{Glyph spacing changes} \textbf{(For enhanced packages only)}I reworked the math italics to improve the rendering of some superscripts. This affects (a) parentheses, brackets and braces to inhibit clashes; (b) glyphs like j, f, p, y, \verb|\rho|, \verb|\beta| and \verb|\mu| where a long tail could pose problems intersecting with other glyphs; (c) glyphs like such as D, Q and \verb|\Phi| that are round on the right, where interference is most likely to occur with a superscript. Increasing the left side-bearing of j, etc., helps with superscripts but creates an ugly gap when used as subscripts.
+
+
+ The {\tt subscriptcorrection} option to {\tt newtxmath} has been corrected and enhanced so that it now offers a partial solution the subscript spacing problem. I regret that this option is incompatible with xy-pic, both depending on making \verb|_| an active character. {\tt Newtxmath} will detect if the {\tt xy} package is loaded and disable {\tt subscriptcorrection} if so. You would have to correct such issues by manually inserting a negative \verb|\mkern|. For example, you might put in your preamble something like
+ \begin{verbatim}
+\def\jj{\mkern-3mu j}
+\end{verbatim}
+and then use \verb|$x_{\jj}$| instead of \verb|$x_j$|, turning $x_j$ into $x_{\jj}$.
+
+If you do enable {\tt subscriptcorrection}, there is a default correction table in the {\tt sty} file, but the sty file also looks for a file named, e.g., {\tt newtx-subs.tex} if you are using the {\tt newtx} default math letters. There is already such a file located in the {\tt newtx} distribution in the \verb|/tex/latex/| folder. If you wish to make changes to this file, copy the file to your home TeX folder where it will be found by TeX before the one in the distribution. The entries in the file are lines like
+\begin{verbatim}
+{j}{-3}
+\end{verbatim}
+each of which will have the same effect as the above macro if the first item in the subscript is j. You can also specify Greek letters with lines like
+\begin{verbatim}
+{\beta}{-1.5}
+\end{verbatim}
+The complete list of file names recognized for specifying subscript corrections is:
+\begin{verbatim}
+newtx-subs.tex
+newtx-libertine-subs.tex
+newtx-xcharter-subs.tex
+newtx-cochineal-subs.tex
+newtx-baskervillef-subs.tex
+newtx-stickstoo-subs.tex
+newtx-garamond-subs.tex
+newtx-ebgaramond-subs.tex
+newtx-baskervald-subs.tex
+newtx-erewhon-subs.tex
+newtx-minion-subs.tex
+newtx-nc-subs.tex
+newtx-ncf-subs.tex
+\end{verbatim}
+
+\subsection{New glyphs added} \textbf{(For enhanced packages only)} Math family 1 {\tt (letters)} has been extended from 128 slots to 256, retaining the {\tt OML} encoding of the first 128. Most of additional slots have been allocated to a script font from the old STIX collection and an upright modification of that font.
+By default, \verb|$\mathscr{F}$| will produce $\mathscr{F}$.\\
+$\bullet$ option {\tt uprightscript} changes the output to {\usefont{OML}{ntxmi}{m}{it}\char201}.\\
+In both cases, there are full upper-case and lower-case and {\tt dotlessi}, {\tt dotlessj}. To insert the latter, you can write either \verb|$\mathscr{\imath}$| or \verb|$\imathscr$|, rendered as $\mathscr{\imath}$ in the slanted script case.
+
+The secondary letters font {\tt (lettersA)} and math family 2 {\tt(symbols)} have been rearranged. The first of these continues to have a Fraktur alphabet, but it a modification of its original one, having wider vertical stems and a blacker appearance more in keeping with the weight Times. {\tt Dotlessi} and {\tt dotlessj} have been added and can be specified in math mode by \verb|$\imathfrak$| and \verb|$\jmathfrak$|---\verb|$\mathfrak{\imath}$| also works. There are in addition two subsidiary Bbb alphabets in {\tt lettersA}, specified by the respective options {\tt vmathbb}, {\tt vvmathbb}, and there are corresponding {\tt dotlessi}, {\tt dotlessj} activated by \verb|$\imathbb$|, \verb|$\jmathbb$|, which always render as $\imathbb$, $\jmathbb$ mo matter the choice of which Blackboard Bold Alphabet. If you select one of the options {\tt varbb}, {\tt vvarbb}, you will have Bbb digits 0..9 using, e.g., \verb|$\mathbb{1}$| to get~$\vvmathbb{1}$.
+
+Among the new symbols added are:\\
+$\bullet$ \verb|\hslash|, \verb|\hbar|, \verb|\lambdaslash|, \verb|\lambdabar|, \verb|\Zbar|, \verb|\Angstrom| are now constructed from the native glyphs, but only in the enhanced families.\\
+$\bullet$ Euler's constant \verb|$\Euler$| ($\Euler$).\\
+$\bullet$ Hermitian transpose \verb|\hermtransp| or \verb|\htransp| is used like \verb|$\mathbf{A}^{\htransp}$| ($\mathbf{A}^{\htransp}$). This usage is similar to simple transpose \verb|$\mathbf{A}^{\transp}$| ($\mathbf{A}^{\transp}$).\\
+$\bullet$ Independence (in the probabilistic sense) can use \verb|\Perp|, $\Perp$, and there is a new \verb|\nPerp|, $\nPerp$ for the negation.
+
+\subsection{Adaptive vector accent} The \LaTeX\ macro \verb|\overrightarrow| provides a right arrow with adaptive width, but not matching the vector head of {\tt newtxmath}. Likewise, the {\tt esvect} provides a similar service with a choice of vector heads, none of which match {\tt newtxmath}. I've added code to provide a matching adaptive vector accent and which uses the same macro name, \verb|\vv|, as {\tt esvect}.
+For a comparison of these vector accents, \verb|$\vec{XY} \vv{XY} \overrightarrow{XY}$| renders as\\
+$\vec{XY} \vv{XY} \overrightarrow{XY}$.\\
+$\bullet$ \verb|$\vv{AB}$| renders as $\vv{AB}$.\\
+$\bullet$ \verb|$\vv*{AB}{x}$| renders as $\vv*{AB}{x}$. This provides better horizontal spacing of subscripts than \verb|$\vv{AB}_{x}$|, $\vv{AB}_{x}$.\\
+$\bullet$ You can also do \verb|$\vv*{AB}{\vv{CD}}$|, which renders as $\vv*{AB}{\vv{CD}}$.\\
+$\bullet$ You can change the vertical space between the arrow and the accentee by means of the package option {\tt vecsep}, whose default value is {\tt .25ex}.
+
+\subsection{Miscellaneous Changes}
+\begin{itemize}
+\item
+The superior letters fonts in {\tt newtx}
+have been extended and all glyphs now have appropriate unicode mappings.
+\item
+The AMS fonts replacement, {\tt ntxsym} corrects the former misplacement of \verb|\kbbb|, \verb|\daleth|, \verb|\circledR| and \verb|\circledS|.)
+\end{itemize}
+\newpage
+\section{Changed Font Tables}
+\subsection{letters}
+\fonttable{ntxmi}
+\newpage
+\subsection{lettersA}
+\fonttable{ntxmia}
+\newpage
+\subsection{symbols}
+\fonttable{ntxsy}
+\newpage
+
+\subsection{A sample newtx-subs.tex}
+You may either copy the entire block below, starting with the line \verb|\begin{...| and ending after the line beginning \verb|\end{|
+and pasting it into the top of your document before the \verb|\documentclass...| line, which will allow for easy editing and will write the file to the same folder as your document, or make your own file, omitting those outer two lines.
+
+\begin{verbatim}
+\begin{filecontents*}{newtx-subs.tex}
+{f}{-3}
+{j}{-3}
+{p}{-1}
+{y}{-1}
+{A}{-3}
+{B}{-1}
+{D}{-1}
+{H}{-1}
+{I}{-1}
+{K}{-1}
+{L}{-1}
+{M}{-1}
+{N}{-0.5}
+{P}{-1}
+{X}{-1}
+{\rho}{-1.5}
+{\mu}{-1}
+\end{filecontents*}
+\end{verbatim}
+\subsection*{The {\tt ebgaramond} option to newtxmath}
+As {\tt ebgaramond} has an x-height considerably smaller than {\tt newtx}, some amount of scaling is useful to bridge the gap. In making the replacement letters, I increased the size of the EBGaramond letters by 5\%, so make some scaling combination that compensates for this. The weights of {\tt ebgaramond} used in the substitutions were regular and semibold. This dictates one of the options used for {\tt ebgaramond}.
+
+\textsc{Example preamble:}\\
+\begin{verbatim}
+\usepackage[lining,semibold,scaled=1.05]{ebgaramond}
+% Latex BOLD renders with ebgaramond semibold
+\usepackage[T1]{fontenc} % best for Western European languages
+\usepackage{textcomp} % required to get special symbols
+\usepackage[varqu,varl]{inconsolata}% a typewriter font must be defined
+\usepackage{amsmath,amsthm}% must be loaded before newtxmath
+\usepackage[ebgaramond,vvarbb,subscriptcorrection]{newtxmath} % STIX Bbb
+\usepackage{bm}% load after all math to give access to bold math
+\end{verbatim}
+
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/newtx.doc.tlpobj new/tlpkg/tlpobj/newtx.doc.tlpobj
--- old/tlpkg/tlpobj/newtx.doc.tlpobj 2019-02-28 03:55:58.000000000 +0100
+++ new/tlpkg/tlpobj/newtx.doc.tlpobj 2020-03-04 23:52:58.000000000 +0100
@@ -1,9 +1,9 @@
name newtx.doc
category Package
-revision 47889
+revision 54080
shortdesc doc files of newtx
relocated 1
-docfiles size=236
+docfiles size=418
RELOC/doc/fonts/newtx/MANIFEST-newtx.txt
RELOC/doc/fonts/newtx/README
RELOC/doc/fonts/newtx/implementation.pdf
++++++ newtx.tar.xz ++++++
++++ 182336 lines of diff (skipped)
++++++ newtxtt.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/newtxtt/README new/doc/fonts/newtxtt/README
--- old/doc/fonts/newtxtt/README 2017-06-06 23:55:40.000000000 +0200
+++ new/doc/fonts/newtxtt/README 2020-02-16 23:06:12.000000000 +0100
@@ -1,7 +1,7 @@
This small package provides a means of accessing all features (plus scaling) of an extension of the txfont typewriter fonts as a typewriter font family to accompany any other chosen font packages. These are serifed typewriter faces that are taller and heavier than Latin Modern Typewriter and much heavier than Courier.
-Current version: 1.055
+Current version: 1.056, 2020-02-15
As the fonts on which these were based are licensed under GPL 3.0, so are the fonts in
@@ -19,6 +19,10 @@
http://www.ctan.org/license/lppl1.3
for the details of that license.
+Changes in version 1.056
+1. Corrected the fd files so as to be useable without loading the package. (Thanks Jean-Francois Burnol.)
+2. Added documentation about how to do this.
+
Changes in version 1.055
Corrected word-spacing parameters, broken in the prior version. (Thanks Yudai Nakata.)
Binary files old/doc/fonts/newtxtt/newtxtt-doc.pdf and new/doc/fonts/newtxtt/newtxtt-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/newtxtt/newtxtt-doc.tex new/doc/fonts/newtxtt/newtxtt-doc.tex
--- old/doc/fonts/newtxtt/newtxtt-doc.tex 2015-07-04 23:45:16.000000000 +0200
+++ new/doc/fonts/newtxtt/newtxtt-doc.tex 2020-02-16 23:06:12.000000000 +0100
@@ -103,4 +103,23 @@
\textttz{TX Typewriter: This is just a line to illustrate typewriter 0123456789. (ttz)}
\textsc{Notes:} The first two are standard monospaced with the same spacing---the : is considered to be the end of a sentence---while the words in the third are spaced more compactly, it would hyphenate if necessary, and lacks the extra space at the end of a ``sentence''.
+
+\textbf{Using the fonts without using the package:} If you wish to use these fonts without making one of the them the \verb|\ttdefault|, you may call them directly from the {\tt fd}:
+\begin{verbatim}
+{\fontfamily{newtxtt}\selectfont ...} % or newtxttz
+\end{verbatim}
+or, for finer control of the \textsc{nfss} parameters,
+\begin{verbatim}
+{\usefont{T1}{newtxtt}{b}{n} ...} % or {newtxttz}{m}{sc}, etc
+\end{verbatim}
+For further control, you may add in your preamble lines like the following to select the zero style (five choices, a to e) and the shape of quotes:
+\begin{verbatim}
+\makeatletter
+\edef\newtxtt@fig{c} % one of a--e to determine the zerostyle, defaults to a
+\newif\iftxtt@upq\txtt@upqtrue % same effect as option straightquotes
+% remove the \txtt@upqtrue for not straightquotes, the default
+\makeatother
+
+\end{verbatim}
+
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/newtxtt.doc.tlpobj new/tlpkg/tlpobj/newtxtt.doc.tlpobj
--- old/tlpkg/tlpobj/newtxtt.doc.tlpobj 2019-02-28 03:56:03.000000000 +0100
+++ new/tlpkg/tlpobj/newtxtt.doc.tlpobj 2020-03-24 02:00:55.000000000 +0100
@@ -1,9 +1,9 @@
name newtxtt.doc
category Package
-revision 44510
+revision 54512
shortdesc doc files of newtxtt
relocated 1
-docfiles size=22
+docfiles size=45
RELOC/doc/fonts/newtxtt/README
RELOC/doc/fonts/newtxtt/newtxtt-doc.pdf
RELOC/doc/fonts/newtxtt/newtxtt-doc.tex
++++++ newtxtt.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/newtxtt/t1newtxtt.fd new/tex/latex/newtxtt/t1newtxtt.fd
--- old/tex/latex/newtxtt/t1newtxtt.fd 2014-12-25 00:20:46.000000000 +0100
+++ new/tex/latex/newtxtt/t1newtxtt.fd 2020-02-16 23:06:12.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{t1newtxtt.fd}
- [2014/12/23 Font definitions for T1/newtxtt.]
+ [2020/02/15 Font definitions for T1/newtxtt.]
\expandafter\ifx\csname newtxtt@scale\endcsname\relax
\let\newtxtt@@scale\@empty
@@ -14,8 +14,11 @@
\fi
\let\newtxtt@@upq\@empty
-\expandafter\ifx\csname txtt@upqfalse\endcsname\relax
-\else
+\expandafter\ifx\csname txtt@upqfalse\endcsname\relax
+\csname iftrue\endcsname
+% fix proposed by Jean Francois Burnol to prevent "extra \fi"
+% error when using newtxtt directly from fd.
+\else
\iftxtt@upq\def\newtxtt@@upq{q}\fi
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/newtxtt/t1newtxttz.fd new/tex/latex/newtxtt/t1newtxttz.fd
--- old/tex/latex/newtxtt/t1newtxttz.fd 2014-12-25 00:20:46.000000000 +0100
+++ new/tex/latex/newtxtt/t1newtxttz.fd 2020-02-16 23:06:12.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{t1newtxttz.fd}
- [2014/05/30 Font definitions for T1/newtxttz.]
+ [2020/02/15 Font definitions for T1/newtxttz.]
\expandafter\ifx\csname newtxtt@scale\endcsname\relax
\let\newtxtt@@scale\@empty
@@ -14,8 +14,11 @@
\fi
\let\newtxtt@@upq\@empty
-\expandafter\ifx\csname txtt@upqfalse\endcsname\relax
-\else
+\expandafter\ifx\csname txtt@upqfalse\endcsname\relax
+\csname iftrue\endcsname
+% fix proposed by Jean Francois Burnol to prevent "extra \fi"
+% error when using newtxtt directly from fd.
+\else
\iftxtt@upq\def\newtxtt@@upq{q}\fi
\fi
@@ -68,3 +71,4 @@
%}{}
\endinput
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/newtxtt.tlpobj new/tlpkg/tlpobj/newtxtt.tlpobj
--- old/tlpkg/tlpobj/newtxtt.tlpobj 2019-02-28 03:56:03.000000000 +0100
+++ new/tlpkg/tlpobj/newtxtt.tlpobj 2020-03-24 02:00:55.000000000 +0100
@@ -1,6 +1,6 @@
name newtxtt
category Package
-revision 44510
+revision 54512
shortdesc Enhancement of typewriter fonts from newtx
relocated 1
longdesc The package provides enhanced fonts with LaTeX support files
@@ -154,7 +154,6 @@
RELOC/tex/latex/newtxtt/ts1newtxtt.fd
RELOC/tex/latex/newtxtt/ts1newtxttz.fd
catalogue-ctan /fonts/newtxtt
-catalogue-date 2017-05-22 18:08:04 +0200
-catalogue-license gpl3lppl
-catalogue-topics font font-type1 font-mono font-t1enc
-catalogue-version 1.055
+catalogue-license gpl3 lppl
+catalogue-topics font font-type1 font-mono font-supp font-t1enc
+catalogue-version 1.056
++++++ newverbs.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/newverbs/README new/doc/latex/newverbs/README
--- old/doc/latex/newverbs/README 2012-05-09 00:31:55.000000000 +0200
+++ new/doc/latex/newverbs/README 2019-09-10 23:45:21.000000000 +0200
@@ -1,6 +1,6 @@
The 'newverbs' LaTeX package
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Copyright (c) 2010-2012 by Martin Scharrer
+Copyright (c) 2010-2019 by Martin Scharrer
Code repository: https://bitbucket.org/martin_scharrer/newverbs
This package allows the definition of \verb variants which add TeX code before
Binary files old/doc/latex/newverbs/newverbs.pdf and new/doc/latex/newverbs/newverbs.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/newverbs.doc.tlpobj new/tlpkg/tlpobj/newverbs.doc.tlpobj
--- old/tlpkg/tlpobj/newverbs.doc.tlpobj 2019-02-28 03:56:04.000000000 +0100
+++ new/tlpkg/tlpobj/newverbs.doc.tlpobj 2019-09-11 01:55:18.000000000 +0200
@@ -1,8 +1,8 @@
name newverbs.doc
category Package
-revision 26258
+revision 52074
shortdesc doc files of newverbs
relocated 1
-docfiles size=46
+docfiles size=55
RELOC/doc/latex/newverbs/README
RELOC/doc/latex/newverbs/newverbs.pdf
++++++ newverbs.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/newverbs/newverbs.sty new/tex/latex/newverbs/newverbs.sty
--- old/tex/latex/newverbs/newverbs.sty 2012-05-09 00:31:55.000000000 +0200
+++ new/tex/latex/newverbs/newverbs.sty 2019-09-10 23:45:21.000000000 +0200
@@ -20,7 +20,7 @@
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
-%% Copyright (C) 2012 by Martin Scharrer
+%% Copyright (C) 2012-2019 by Martin Scharrer
%% --------------------------------------------------------------------
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -37,19 +37,33 @@
%% This work consists of the files newverbs.dtx and newverbs.ins
%% and the derived file newverbs.sty.
\ProvidesPackage{newverbs}[%
- 2012/05/08
- v1.3a
+ 2019/09/09
+ v1.4
Define new 'verb' commands and short verb. characters]
\newcommand*\newverbcommand{\new@verbcommand\newcommand}
\newcommand*\renewverbcommand{\new@verbcommand\renewcommand}
\newcommand*\provideverbcommand{\new@verbcommand\providecommand}
-\def\new@verbcommand#1#2#3#4{%
+\def\new@verbcommand#1#2{%
+ \@ifnextchar[%
+ {\new@@verbcommand{#1}{#2}}%
+ {\new@@verbcommand{#1}{#2}[\verb]}%
+}
+\let\newverbs@end\@empty
+\def\new@@verbcommand#1#2[#3]#4#5{%
#1*#2{%
- \begingroup
+ \bgroup
\newverbcommand@settings
- \def\verb@egroup{\verb@orig@egroup#4\endgroup}%
- \def\newverbs@txend{#4\endgroup}%
- #3\verb
+ \ifx\newverbs@end\@empty
+ \expandafter\def\expandafter\verb@egroup\expandafter{\verb@egroup\newverbs@end}%
+ \fi
+ \begingroup\def\@tempa{#5}%
+ \expandafter\expandafter\expandafter\endgroup
+ \expandafter\expandafter\expandafter\def
+ \expandafter\expandafter\expandafter\newverbs@end
+ \expandafter\expandafter\expandafter{\expandafter\@tempa\newverbs@end\egroup}%
+ \def\newverbs@txend{#5\egroup}%
+ \verbatim@font\let\verbatim@font\relax
+ #4#3%
}%
}
\def\newverbs@tabularxsupport{%
@@ -84,20 +98,43 @@
}
\provideverbcommand{\qverb}{\qverbbeginquote}{\qverbendquote}
\@ifundefined{openinnerquote}{%
- \def\qverbbeginquote{`}%
- \def\qverbendquote{'}%
+ \def\qverbbeginquote{``}%
+ \def\qverbendquote{''}%
}{%
- \def\qverbbeginquote{\openinnerquote}%
- \def\qverbendquote{\closeinnerquote}%
+ \def\qverbbeginquote{\openautoquote}%
+ \def\qverbendquote{\closeautoquote}%
}
\newverbcommand{\fverb}
{\setbox\verbbox\hbox\bgroup\color@setgroup}
{\color@endgroup\egroup\fbox{\box\verbbox}}
-\newcommand*\MakeSpecialShortVerb[1]{%
+\RequirePackage{shortvrb}
+\def\MakeShortVerb{%
+ \@ifstar
+ {\newverbs@MakeShortVerb*}%
+ {\newverbs@MakeShortVerb{}}%
+}
+\def\newverbs@MakeShortVerb#1{%
+ \@ifnextchar[%
+ {\newverbs@@MakeShortVerb{#1}}%
+ {\@MakeSpecialShortVerb{#1}{\verb}}%
+}
+\def\newverbs@@MakeShortVerb#1[#2]{%
+ \@MakeSpecialShortVerb{#1}{#2}%
+}
+\def\@MakeSpecialShortVerb#1#2#3{%
+ %\expandafter\ifx\csname cc\string#3\endcsname\relax
+ %\else
+ % \DeleteShortVerb{#3}%
+ %\fi
+ \def\@shortvrbdef{#2#1}%
+ \@MakeShortVerb{#3}%
+}
+\newcommand*\MakeSpecialShortVerb{%
\@ifstar
- {\def\@shortvrbdef{#1*}\@MakeShortVerb}%
- {\def\@shortvrbdef{#1}\@MakeShortVerb}%
+ {\@MakeSpecialShortVerb{*}}%
+ {\@MakeSpecialShortVerb{}}%
}
+%% \subsection{Collect verbatim argument}
\newcommand*\collectverb{%
\begingroup
\verbatim@font
@@ -246,19 +283,6 @@
)%
|gdef|misj(|def^^M(^^J))%
|endgroup%
-\newcommand\newverbenvironment{}
-\long\def\newverbenvironment#1#2#{%
- \@newverbenvironment{#1}{#2}%
-}
-\long\def\@newverbenvironment#1#2#3#4{%
- \newenvironment{#1}#2{%
- \begingroup
- \newverb@catcodes
- \obeyspaces
- #3%
- \expandafter\@@Collectverbenv\expandafter{\@currenvir}{\long\def\BODY}%
- }{#4}%
-}
\newcommand\newverbsfont{%
\verbatim@font
\frenchspacing
@@ -268,9 +292,20 @@
{\@Verbdef*}%
{\@Verbdef{}}%
}
-\newcommand*\@Verbdef[2]{%
+\def\@Verbdef#1#2{%
\Collectverb#1{\def#2}%
}
+\providecommand*\verbdef{%
+ \@ifstar
+ {\newverbs@verbdef*}%
+ {\newverbs@verbdef{}}%
+}
+\def\newverbs@verbdef#1#2{%
+ \Collectverb#1{\newverbs@@verbdef{#2}}%
+}
+\def\newverbs@@verbdef#1#2{%
+ \DeclareRobustCommand{#1}{{\newverbsfont#2}}%
+}
\endinput
%%
%% End of file `newverbs.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/newverbs.tlpobj new/tlpkg/tlpobj/newverbs.tlpobj
--- old/tlpkg/tlpobj/newverbs.tlpobj 2019-02-28 03:56:05.000000000 +0100
+++ new/tlpkg/tlpobj/newverbs.tlpobj 2019-09-11 01:55:18.000000000 +0200
@@ -1,6 +1,6 @@
name newverbs
category Package
-revision 26258
+revision 52074
shortdesc Define new versions of \verb, including short verb versions
relocated 1
longdesc The package allows the definition of \verb variants which add
@@ -17,7 +17,7 @@
catalogue-also shortvrb
catalogue-contact-repository https://bitbucket.org/martin_scharrer/newverbs
catalogue-ctan /macros/latex/contrib/newverbs
-catalogue-date 2017-04-18 05:31:40 +0200
+catalogue-date 2019-09-10 14:37:06 +0200
catalogue-license lppl1.3
catalogue-topics verbatim
-catalogue-version 1.3a
+catalogue-version 1.4
++++++ nicematrix.doc.tar.xz ++++++
++++ 2896 lines of diff (skipped)
++++++ nicematrix.tar.xz ++++++
++++ 4444 lines of diff (skipped)
++++++ nihbiosketch.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nihbiosketch.doc.tlpobj new/tlpkg/tlpobj/nihbiosketch.doc.tlpobj
--- old/tlpkg/tlpobj/nihbiosketch.doc.tlpobj 2019-02-28 03:56:08.000000000 +0100
+++ new/tlpkg/tlpobj/nihbiosketch.doc.tlpobj 2020-03-09 00:28:45.000000000 +0100
@@ -1,6 +1,6 @@
name nihbiosketch.doc
category Package
-revision 39460
+revision 54191
shortdesc doc files of nihbiosketch
relocated 1
docfiles size=22
++++++ nihbiosketch.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nihbiosketch.tlpobj new/tlpkg/tlpobj/nihbiosketch.tlpobj
--- old/tlpkg/tlpobj/nihbiosketch.tlpobj 2019-02-28 03:56:08.000000000 +0100
+++ new/tlpkg/tlpobj/nihbiosketch.tlpobj 2020-03-09 00:28:45.000000000 +0100
@@ -1,24 +1,23 @@
name nihbiosketch
category Package
-revision 39460
+revision 54191
shortdesc A class for NIH biosketches based on the 2015 updated format
relocated 1
longdesc This LaTeX document class tries to adhere to the Biographical
longdesc Sketch formatting requirements outlined in NIH Notice
longdesc [NOT-OD-15-032]
-longdesc (http://grants.nih.gov/grants/guide/notice-files/NOT-OD-15-032.
-longdesc html). This new format is required for applications submitted
-longdesc for due dates on or after May 25, 2015. The package tries to
-longdesc mimic the example documents provided on the [SF 424 (R&R) Forms
-longdesc and Applications page]
-longdesc (http://grants.nih.gov/grants/funding/424/index.htm#format) as
-longdesc closely as possible. The author has used this class for his own
-longdesc grant submissions; however he offers no guarantee of conformity
-longdesc to NIH requirements.
+longdesc (grants.nih.gov/grants/guide/notice-files/NOT-OD-15-032.html).
+longdesc This new format is required for applications submitted for due
+longdesc dates on or after May 25, 2015. The package tries to mimic the
+longdesc example documents provided on the [SF 424 (R&R) Forms and
+longdesc Applications page]
+longdesc (grants.nih.gov/grants/funding/424/index.htm#format) as closely
+longdesc as possible. The author has used this class for his own grant
+longdesc submissions; however he offers no guarantee of conformity to
+longdesc NIH requirements.
runfiles size=2
RELOC/tex/latex/nihbiosketch/nihbiosketch.cls
catalogue-also nih
catalogue-ctan /macros/latex/contrib/nihbiosketch
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics cv
++++++ nimbus15.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/nimbus15/README new/doc/fonts/nimbus15/README
--- old/doc/fonts/nimbus15/README 2018-09-22 22:59:39.000000000 +0200
+++ new/doc/fonts/nimbus15/README 2020-01-30 23:20:11.000000000 +0100
@@ -10,7 +10,14 @@
for the details of that license.
The support files for Latin characters are quite meager compared to those in other Times text packages (no small caps, no old-style figures, no proportional figures), and it is recommended to use these fonts only as a supplement providing Greek and Cyrillic. See the documentation for examples.
-Current version 1.011 2018-09-21
+Current version 1.013 2020-01-29
+
+Changes in version 1.013
+1. Added U+0300 .. U+0303 to zco-{Regular, Oblique, Bold, BoldOblique} and zcoB-{Regular,Oblique}. Fontspec seems to require three of these to be present.
+2. Added psili accent to the same fonts, as well as U_1E9E (Capital sharp S) and U+1F48 (Omicronpsili).
+
+Changes in version 1.012
+Modified some sty files to prevent warnings due to mweights in use by another package.
Changes in version 1.011
Documentation corrections and additions to allow comparisons of typewriter fonts.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nimbus15.doc.tlpobj new/tlpkg/tlpobj/nimbus15.doc.tlpobj
--- old/tlpkg/tlpobj/nimbus15.doc.tlpobj 2019-02-28 03:56:08.000000000 +0100
+++ new/tlpkg/tlpobj/nimbus15.doc.tlpobj 2020-03-24 02:00:56.000000000 +0100
@@ -1,6 +1,6 @@
name nimbus15.doc
category Package
-revision 48734
+revision 54512
shortdesc doc files of nimbus15
relocated 1
docfiles size=205
++++++ nimbus15.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/nimbus15/zco-Bold.afm new/fonts/afm/public/nimbus15/zco-Bold.afm
--- old/fonts/afm/public/nimbus15/zco-Bold.afm 2016-01-09 23:28:43.000000000 +0100
+++ new/fonts/afm/public/nimbus15/zco-Bold.afm 2020-01-30 23:20:11.000000000 +0100
@@ -1,13 +1,13 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20150526
-Comment Creation Date: Thu Jan 7 20:03:12 2016
+Comment Generated by FontForge 20190801
+Comment Creation Date: Wed Jan 29 12:52:10 2020
FontName zco-Bold
FullName zco Bold
FamilyName zco
Weight Bold
Notice (Copyright (URW)++,Copyright 2014 by (URW)++ Design & Development. Copyright 2015 by Michael Sharpe, AGPL)
ItalicAngle 0
-IsFixedPitch true
+IsFixedPitch false
UnderlinePosition -87
UnderlineThickness 77
Version 1.00
@@ -17,7 +17,7 @@
XHeight 437
Ascender 623
Descender -205
-StartCharMetrics 763
+StartCharMetrics 770
C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
C 33 ; WX 600 ; N exclam ; B 220 -15 381 638 ;
C 34 ; WX 600 ; N quotedbl ; B 136 312 464 602 ;
@@ -358,6 +358,10 @@
C -1 ; WX 600 ; N ogonek ; B 250 -208 463 0 ;
C -1 ; WX 600 ; N tilde ; B 115 523 485 656 ;
C -1 ; WX 600 ; N hungarumlaut ; B 125 496 475 694 ;
+C -1 ; WX 600 ; N gravecomb ; B 125 496 350 696 ;
+C -1 ; WX 600 ; N acutecomb ; B 250 496 475 696 ;
+C -1 ; WX 600 ; N uni0302 ; B 125 497 476 696 ;
+C -1 ; WX 600 ; N tildecomb ; B 115 523 485 656 ;
C -1 ; WX 600 ; N tonos ; B 204 491 393 656 ;
C -1 ; WX 600 ; N dieresistonos ; B 106 473 490 674 ;
C -1 ; WX 600 ; N Alphatonos ; B -18 0 617 583 ;
@@ -575,8 +579,11 @@
C -1 ; WX 600 ; N wacute ; B 0 0 600 696 ;
C -1 ; WX 600 ; N Wdieresis ; B -10 0 610 798 ;
C -1 ; WX 600 ; N wdieresis ; B 0 0 600 654 ;
+C -1 ; WX 600 ; N uni1E9E ; B 8 -16 588 626 ;
C -1 ; WX 600 ; N Ygrave ; B 21 0 579 839 ;
C -1 ; WX 600 ; N ygrave ; B 21 -205 579 696 ;
+C -1 ; WX 600 ; N uni1F48 ; B -29 -14 579 598 ;
+C -1 ; WX 600 ; N uni1FBF ; B 251 350 384 598 ;
C -1 ; WX 600 ; N uni2002 ; B 0 0 0 0 ;
C -1 ; WX 600 ; N endash ; B 42 229 558 329 ;
C -1 ; WX 600 ; N emdash ; B -29 229 629 329 ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/nimbus15/zco-BoldOblique.afm new/fonts/afm/public/nimbus15/zco-BoldOblique.afm
--- old/fonts/afm/public/nimbus15/zco-BoldOblique.afm 2016-01-09 23:28:43.000000000 +0100
+++ new/fonts/afm/public/nimbus15/zco-BoldOblique.afm 2020-01-30 23:20:11.000000000 +0100
@@ -1,13 +1,13 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20150526
-Comment Creation Date: Thu Jan 7 20:04:13 2016
+Comment Generated by FontForge 20190801
+Comment Creation Date: Wed Jan 29 12:52:18 2020
FontName zco-BoldOblique
FullName zco Bold Oblique
FamilyName zco
Weight Bold
Notice (Copyright (URW)++,Copyright 2014 by (URW)++ Design & Development. Copyright 2015 by Michael Sharpe, AGPL)
ItalicAngle -12
-IsFixedPitch true
+IsFixedPitch false
UnderlinePosition -87
UnderlineThickness 77
Version 1.00
@@ -17,7 +17,7 @@
XHeight 437
Ascender 623
Descender -205
-StartCharMetrics 763
+StartCharMetrics 770
C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
C 33 ; WX 600 ; N exclam ; B 234 -15 501 638 ;
C 34 ; WX 600 ; N quotedbl ; B 243 312 592 602 ;
@@ -358,6 +358,10 @@
C -1 ; WX 600 ; N ogonek ; B 222 -208 433 0 ;
C -1 ; WX 600 ; N tilde ; B 233 523 619 656 ;
C -1 ; WX 600 ; N hungarumlaut ; B 237 496 616 694 ;
+C -1 ; WX 600 ; N gravecomb ; B 264 496 464 696 ;
+C -1 ; WX 600 ; N acutecomb ; B 362 496 616 696 ;
+C -1 ; WX 600 ; N uni0302 ; B 237 497 590 696 ;
+C -1 ; WX 600 ; N tildecomb ; B 233 523 619 656 ;
C -1 ; WX 600 ; N tonos ; B 281 491 486 650 ;
C -1 ; WX 600 ; N dieresistonos ; B 150 491 575 650 ;
C -1 ; WX 600 ; N Alphatonos ; B -54 0 584 583 ;
@@ -575,8 +579,11 @@
C -1 ; WX 600 ; N wacute ; B 82 0 684 689 ;
C -1 ; WX 600 ; N Wdieresis ; B 98 0 725 793 ;
C -1 ; WX 600 ; N wdieresis ; B 82 0 684 654 ;
+C -1 ; WX 600 ; N uni1E9E ; B 18 -16 646 626 ;
C -1 ; WX 600 ; N Ygrave ; B 128 0 694 839 ;
C -1 ; WX 600 ; N ygrave ; B -13 -205 662 696 ;
+C -1 ; WX 600 ; N uni1F48 ; B 56 -14 660 598 ;
+C -1 ; WX 600 ; N uni1FBF ; B 336 351 492 598 ;
C -1 ; WX 600 ; N uni2002 ; B 0 0 0 0 ;
C -1 ; WX 600 ; N endash ; B 101 229 619 329 ;
C -1 ; WX 600 ; N emdash ; B 30 229 690 329 ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/nimbus15/zco-Oblique.afm new/fonts/afm/public/nimbus15/zco-Oblique.afm
--- old/fonts/afm/public/nimbus15/zco-Oblique.afm 2016-01-09 23:28:43.000000000 +0100
+++ new/fonts/afm/public/nimbus15/zco-Oblique.afm 2020-01-30 23:20:11.000000000 +0100
@@ -1,13 +1,13 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20150526
-Comment Creation Date: Thu Jan 7 19:59:58 2016
+Comment Generated by FontForge 20190801
+Comment Creation Date: Wed Jan 29 12:55:01 2020
FontName zco-Oblique
FullName zco Oblique
FamilyName zco
Weight Regular
Notice (Copyright (URW)++,Copyright 2014 by (URW)++ Design & Development. Copyright 2015 by Michael Sharpe, AGPL)
ItalicAngle -12
-IsFixedPitch true
+IsFixedPitch false
UnderlinePosition -100
UnderlineThickness 50
Version 1.00
@@ -17,7 +17,7 @@
XHeight 429
Ascender 616
Descender -198
-StartCharMetrics 763
+StartCharMetrics 770
C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
C 33 ; WX 600 ; N exclam ; B 234 -15 474 641 ;
C 34 ; WX 600 ; N quotedbl ; B 254 315 582 604 ;
@@ -358,6 +358,10 @@
C -1 ; WX 600 ; N ogonek ; B 246 -166 452 23 ;
C -1 ; WX 600 ; N tilde ; B 246 504 590 617 ;
C -1 ; WX 600 ; N hungarumlaut ; B 252 478 588 645 ;
+C -1 ; WX 600 ; N gravecomb ; B 274 478 441 651 ;
+C -1 ; WX 600 ; N acutecomb ; B 376 478 588 651 ;
+C -1 ; WX 600 ; N uni0302 ; B 252 478 566 654 ;
+C -1 ; WX 600 ; N tildecomb ; B 246 504 590 617 ;
C -1 ; WX 600 ; N tonos ; B 288 479 500 651 ;
C -1 ; WX 600 ; N dieresistonos ; B 180 479 542 651 ;
C -1 ; WX 600 ; N Alphatonos ; B -18 0 581 575 ;
@@ -575,8 +579,11 @@
C -1 ; WX 600 ; N wacute ; B 102 0 667 654 ;
C -1 ; WX 600 ; N Wdieresis ; B 109 0 708 774 ;
C -1 ; WX 600 ; N wdieresis ; B 102 0 667 623 ;
+C -1 ; WX 600 ; N uni1E9E ; B 20 -16 623 616 ;
C -1 ; WX 600 ; N Ygrave ; B 142 0 677 804 ;
C -1 ; WX 600 ; N ygrave ; B 10 -198 646 651 ;
+C -1 ; WX 600 ; N uni1F48 ; B 64 -16 664 589 ;
+C -1 ; WX 600 ; N uni1FBF ; B 325 342 462 589 ;
C -1 ; WX 600 ; N uni2002 ; B 0 0 0 0 ;
C -1 ; WX 600 ; N endash ; B 120 249 600 314 ;
C -1 ; WX 600 ; N emdash ; B 48 249 670 314 ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/nimbus15/zco-Regular.afm new/fonts/afm/public/nimbus15/zco-Regular.afm
--- old/fonts/afm/public/nimbus15/zco-Regular.afm 2016-01-09 23:28:43.000000000 +0100
+++ new/fonts/afm/public/nimbus15/zco-Regular.afm 2020-01-30 23:20:11.000000000 +0100
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20150526
-Comment Creation Date: Thu Jan 7 20:02:12 2016
+Comment Generated by FontForge 20190801
+Comment Creation Date: Wed Jan 29 12:52:50 2020
FontName zco-Regular
FullName zco Regular
FamilyName zco
@@ -17,7 +17,7 @@
XHeight 429
Ascender 616
Descender -198
-StartCharMetrics 763
+StartCharMetrics 770
C 32 ; WX 600 ; N space ; B 0 0 0 0 ;
C 33 ; WX 600 ; N exclam ; B 228 -15 372 641 ;
C 34 ; WX 600 ; N quotedbl ; B 146 315 454 604 ;
@@ -82,33 +82,33 @@
C 93 ; WX 600 ; N bracketright ; B 144 -136 332 616 ;
C 94 ; WX 600 ; N asciicircum ; B 102 342 498 633 ;
C 95 ; WX 600 ; N underscore ; B -24 -137 624 -63 ;
-C 96 ; WX 600 ; N grave ; B 144 478 332 651 ;
-C 97 ; WX 600 ; N a ; B 60 -16 552 443 ;
-C 98 ; WX 600 ; N b ; B 10 -16 552 616 ;
-C 99 ; WX 600 ; N c ; B 72 -16 546 443 ;
-C 100 ; WX 600 ; N d ; B 52 -16 594 616 ;
-C 101 ; WX 600 ; N e ; B 52 -16 532 443 ;
-C 102 ; WX 600 ; N f ; B 94 0 552 616 ;
-C 103 ; WX 600 ; N g ; B 52 -199 574 443 ;
-C 104 ; WX 600 ; N h ; B 32 0 562 616 ;
+C 96 ; WX 600 ; N grave ; B 206 478 394 651 ;
+C 97 ; WX 600 ; N a ; B 54 -16 546 443 ;
+C 98 ; WX 600 ; N b ; B 29 -16 571 616 ;
+C 99 ; WX 600 ; N c ; B 63 -16 537 443 ;
+C 100 ; WX 600 ; N d ; B 29 -16 571 616 ;
+C 101 ; WX 600 ; N e ; B 60 -16 540 443 ;
+C 102 ; WX 600 ; N f ; B 71 0 529 616 ;
+C 103 ; WX 600 ; N g ; B 39 -199 561 443 ;
+C 104 ; WX 600 ; N h ; B 35 0 565 616 ;
C 105 ; WX 600 ; N i ; B 80 0 520 636 ;
-C 106 ; WX 600 ; N j ; B 136 -199 471 636 ;
-C 107 ; WX 600 ; N k ; B 52 0 553 616 ;
+C 106 ; WX 600 ; N j ; B 133 -199 468 636 ;
+C 107 ; WX 600 ; N k ; B 50 0 551 616 ;
C 108 ; WX 600 ; N l ; B 80 0 520 616 ;
C 109 ; WX 600 ; N m ; B 0 0 604 443 ;
-C 110 ; WX 600 ; N n ; B 42 0 552 443 ;
+C 110 ; WX 600 ; N n ; B 45 0 555 443 ;
C 111 ; WX 600 ; N o ; B 60 -16 540 443 ;
-C 112 ; WX 600 ; N p ; B 10 -198 552 443 ;
-C 113 ; WX 600 ; N q ; B 52 -198 594 443 ;
-C 114 ; WX 600 ; N r ; B 72 0 552 439 ;
+C 112 ; WX 600 ; N p ; B 29 -198 571 443 ;
+C 113 ; WX 600 ; N q ; B 29 -198 571 443 ;
+C 114 ; WX 600 ; N r ; B 60 0 540 439 ;
C 115 ; WX 600 ; N s ; B 92 -16 508 443 ;
-C 116 ; WX 600 ; N t ; B 32 -16 510 578 ;
-C 117 ; WX 600 ; N u ; B 32 -16 552 429 ;
+C 116 ; WX 600 ; N t ; B 61 -16 539 578 ;
+C 117 ; WX 600 ; N u ; B 40 -16 560 429 ;
C 118 ; WX 600 ; N v ; B 18 0 581 429 ;
C 119 ; WX 600 ; N w ; B 18 0 581 429 ;
-C 120 ; WX 600 ; N x ; B 40 0 562 429 ;
+C 120 ; WX 600 ; N x ; B 39 0 561 429 ;
C 121 ; WX 600 ; N y ; B 40 -198 561 429 ;
-C 122 ; WX 600 ; N z ; B 104 0 501 429 ;
+C 122 ; WX 600 ; N z ; B 102 0 499 429 ;
C 123 ; WX 600 ; N braceleft ; B 186 -136 414 616 ;
C 124 ; WX 600 ; N bar ; B 268 -136 332 616 ;
C 125 ; WX 600 ; N braceright ; B 186 -136 414 616 ;
@@ -358,6 +358,10 @@
C -1 ; WX 600 ; N ogonek ; B 268 -167 448 12 ;
C -1 ; WX 600 ; N tilde ; B 134 504 466 616 ;
C -1 ; WX 600 ; N hungarumlaut ; B 144 478 456 645 ;
+C -1 ; WX 600 ; N gravecomb ; B 206 478 394 651 ;
+C -1 ; WX 600 ; N acutecomb ; B 268 478 456 651 ;
+C -1 ; WX 600 ; N uni0302 ; B 144 478 456 654 ;
+C -1 ; WX 600 ; N tildecomb ; B 134 504 466 616 ;
C -1 ; WX 600 ; N tonos ; B 206 479 394 651 ;
C -1 ; WX 600 ; N dieresistonos ; B 120 479 480 651 ;
C -1 ; WX 600 ; N Alphatonos ; B 24 0 625 575 ;
@@ -575,8 +579,11 @@
C -1 ; WX 600 ; N wacute ; B 18 0 581 654 ;
C -1 ; WX 600 ; N Wdieresis ; B 8 0 591 773 ;
C -1 ; WX 600 ; N wdieresis ; B 18 0 581 623 ;
+C -1 ; WX 600 ; N uni1E9E ; B 14 -16 588 616 ;
C -1 ; WX 600 ; N Ygrave ; B 40 0 560 804 ;
C -1 ; WX 600 ; N ygrave ; B 40 -198 561 651 ;
+C -1 ; WX 600 ; N uni1F48 ; B -19 -16 595 589 ;
+C -1 ; WX 600 ; N uni1FBF ; B 251 341 364 589 ;
C -1 ; WX 600 ; N uni2002 ; B 0 0 0 0 ;
C -1 ; WX 600 ; N endash ; B 60 249 540 314 ;
C -1 ; WX 600 ; N emdash ; B -10 249 610 314 ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/nimbus15/zcoN-Oblique.afm new/fonts/afm/public/nimbus15/zcoN-Oblique.afm
--- old/fonts/afm/public/nimbus15/zcoN-Oblique.afm 2016-01-09 23:28:43.000000000 +0100
+++ new/fonts/afm/public/nimbus15/zcoN-Oblique.afm 2020-01-30 23:20:11.000000000 +0100
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20150526
-Comment Creation Date: Fri Jan 8 12:44:39 2016
+Comment Generated by FontForge 20190801
+Comment Creation Date: Wed Jan 29 13:38:51 2020
FontName zcoN-Oblique
FullName zco Narrow Oblique
FamilyName zcoN
@@ -17,7 +17,7 @@
XHeight 429
Ascender 616
Descender -198
-StartCharMetrics 763
+StartCharMetrics 770
C 32 ; WX 500 ; N space ; B 0 0 0 0 ;
C 33 ; WX 500 ; N exclam ; B 186 -15 425 641 ;
C 34 ; WX 500 ; N quotedbl ; B 213 314 516 604 ;
@@ -358,6 +358,10 @@
C -1 ; WX 500 ; N ogonek ; B 147 -168 333 12 ;
C -1 ; WX 500 ; N tilde ; B 198 503 540 616 ;
C -1 ; WX 500 ; N hungarumlaut ; B 227 477 511 645 ;
+C -1 ; WX 500 ; N gravecomb ; B 284 477 453 651 ;
+C -1 ; WX 500 ; N acutecomb ; B 270 487 473 667 ;
+C -1 ; WX 500 ; N uni0302 ; B 202 477 518 654 ;
+C -1 ; WX 500 ; N tildecomb ; B 198 503 540 616 ;
C -1 ; WX 500 ; N tonos ; B 265 478 475 651 ;
C -1 ; WX 500 ; N dieresistonos ; B 193 478 532 651 ;
C -1 ; WX 500 ; N Alphatonos ; B 6 0 507 575 ;
@@ -575,8 +579,11 @@
C -1 ; WX 500 ; N wacute ; B 85 0 585 660 ;
C -1 ; WX 500 ; N Wdieresis ; B 78 0 610 773 ;
C -1 ; WX 500 ; N wdieresis ; B 85 0 585 623 ;
+C -1 ; WX 500 ; N uni1E9E ; B -3 -16 566 616 ;
C -1 ; WX 500 ; N Ygrave ; B 98 0 611 804 ;
C -1 ; WX 500 ; N ygrave ; B -6 -199 584 651 ;
+C -1 ; WX 500 ; N uni1F48 ; B 69 -16 552 589 ;
+C -1 ; WX 500 ; N uni1FBF ; B 289 342 427 589 ;
C -1 ; WX 500 ; N uni2002 ; B 0 0 0 0 ;
C -1 ; WX 500 ; N endash ; B 108 248 511 313 ;
C -1 ; WX 500 ; N emdash ; B 50 248 569 313 ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/nimbus15/zcoN-Regular.afm new/fonts/afm/public/nimbus15/zcoN-Regular.afm
--- old/fonts/afm/public/nimbus15/zcoN-Regular.afm 2016-01-09 23:28:43.000000000 +0100
+++ new/fonts/afm/public/nimbus15/zcoN-Regular.afm 2020-01-30 23:20:11.000000000 +0100
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20150526
-Comment Creation Date: Thu Jan 7 20:13:29 2016
+Comment Generated by FontForge 20190801
+Comment Creation Date: Wed Jan 29 13:39:04 2020
FontName zcoN-Regular
FullName zco Narrow Regular
FamilyName zcoN
@@ -17,7 +17,7 @@
XHeight 429
Ascender 616
Descender -198
-StartCharMetrics 763
+StartCharMetrics 770
C 32 ; WX 500 ; N space ; B 0 0 0 0 ;
C 33 ; WX 500 ; N exclam ; B 178 -15 322 641 ;
C 34 ; WX 500 ; N quotedbl ; B 112 314 388 604 ;
@@ -358,6 +358,10 @@
C -1 ; WX 500 ; N ogonek ; B 170 -168 330 12 ;
C -1 ; WX 500 ; N tilde ; B 85 503 415 616 ;
C -1 ; WX 500 ; N hungarumlaut ; B 120 477 380 645 ;
+C -1 ; WX 500 ; N gravecomb ; B 156 478 344 651 ;
+C -1 ; WX 500 ; N acutecomb ; B 218 478 406 651 ;
+C -1 ; WX 500 ; N uni0302 ; B 94 478 406 654 ;
+C -1 ; WX 500 ; N tildecomb ; B 85 503 415 616 ;
C -1 ; WX 500 ; N tonos ; B 157 478 343 651 ;
C -1 ; WX 500 ; N dieresistonos ; B 83 478 417 651 ;
C -1 ; WX 500 ; N Alphatonos ; B -10 0 499 575 ;
@@ -575,8 +579,11 @@
C -1 ; WX 500 ; N wacute ; B 2 0 498 660 ;
C -1 ; WX 500 ; N Wdieresis ; B 10 0 492 773 ;
C -1 ; WX 500 ; N wdieresis ; B 2 0 498 623 ;
+C -1 ; WX 500 ; N uni1E9E ; B -9 -16 491 616 ;
C -1 ; WX 500 ; N Ygrave ; B 6 0 494 804 ;
C -1 ; WX 500 ; N ygrave ; B 1 -199 499 651 ;
+C -1 ; WX 500 ; N uni1F48 ; B -14 -16 480 589 ;
+C -1 ; WX 500 ; N uni1FBF ; B 216 341 329 589 ;
C -1 ; WX 500 ; N uni2002 ; B 0 0 0 0 ;
C -1 ; WX 500 ; N endash ; B 50 248 450 313 ;
C -1 ; WX 500 ; N emdash ; B -8 248 508 313 ;
Binary files old/fonts/opentype/public/nimbus15/zco-Bold.otf and new/fonts/opentype/public/nimbus15/zco-Bold.otf differ
Binary files old/fonts/opentype/public/nimbus15/zco-BoldOblique.otf and new/fonts/opentype/public/nimbus15/zco-BoldOblique.otf differ
Binary files old/fonts/opentype/public/nimbus15/zco-Oblique.otf and new/fonts/opentype/public/nimbus15/zco-Oblique.otf differ
Binary files old/fonts/opentype/public/nimbus15/zco-Regular.otf and new/fonts/opentype/public/nimbus15/zco-Regular.otf differ
Binary files old/fonts/opentype/public/nimbus15/zcoN-Oblique.otf and new/fonts/opentype/public/nimbus15/zcoN-Oblique.otf differ
Binary files old/fonts/opentype/public/nimbus15/zcoN-Regular.otf and new/fonts/opentype/public/nimbus15/zcoN-Regular.otf differ
Binary files old/fonts/type1/public/nimbus15/zco-Bold.pfb and new/fonts/type1/public/nimbus15/zco-Bold.pfb differ
Binary files old/fonts/type1/public/nimbus15/zco-BoldOblique.pfb and new/fonts/type1/public/nimbus15/zco-BoldOblique.pfb differ
Binary files old/fonts/type1/public/nimbus15/zco-Oblique.pfb and new/fonts/type1/public/nimbus15/zco-Oblique.pfb differ
Binary files old/fonts/type1/public/nimbus15/zco-Regular.pfb and new/fonts/type1/public/nimbus15/zco-Regular.pfb differ
Binary files old/fonts/type1/public/nimbus15/zcoN-Oblique.pfb and new/fonts/type1/public/nimbus15/zcoN-Oblique.pfb differ
Binary files old/fonts/type1/public/nimbus15/zcoN-Regular.pfb and new/fonts/type1/public/nimbus15/zcoN-Regular.pfb differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nimbus15/nimbusmono.sty new/tex/latex/nimbus15/nimbusmono.sty
--- old/tex/latex/nimbus15/nimbusmono.sty 2016-01-09 23:28:43.000000000 +0100
+++ new/tex/latex/nimbus15/nimbusmono.sty 2019-10-19 23:17:18.000000000 +0200
@@ -1,6 +1,8 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nimbusmono}
- [2015/09/19 Style file for NimbusMono (msharpe).]
+\def\fileversion{1.012}
+\def\filedate{2019/10/18}
+\ProvidesPackage{nimbusmono}[\filedate\space v\fileversion]
+\message{`nimbusmono' v\fileversion, \filedate\space Style file for NimbusMono (msharpe)}
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nimbus15/nimbusmononarrow.sty new/tex/latex/nimbus15/nimbusmononarrow.sty
--- old/tex/latex/nimbus15/nimbusmononarrow.sty 2016-01-09 23:28:43.000000000 +0100
+++ new/tex/latex/nimbus15/nimbusmononarrow.sty 2019-10-19 23:17:18.000000000 +0200
@@ -1,6 +1,9 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nimbusmononarrow}
- [2016/01/04 Style file for NimbusMonoNarrow (msharpe).]
+\def\fileversion{1.012}
+\def\filedate{2019/10/18}
+\ProvidesPackage{nimbusmononarrow}[\filedate\space v\fileversion]
+\message{`nimbusmononarrow' v\fileversion, \filedate\space Style file for NimbusMonoNarrow (msharpe)}
+
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
@@ -18,6 +21,8 @@
\ProcessOptionsX\relax
+\edef\bfseries@tt{b}
+\edef\mdseries@tt{m}
\renewcommand*{\ttdefault}{NimbusMonoN}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nimbus15/nimbussans.sty new/tex/latex/nimbus15/nimbussans.sty
--- old/tex/latex/nimbus15/nimbussans.sty 2016-01-09 23:28:43.000000000 +0100
+++ new/tex/latex/nimbus15/nimbussans.sty 2019-10-19 23:17:18.000000000 +0200
@@ -1,6 +1,8 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nimbussans}
- [2015/09/19 Style file for NimbusSans (msharpe).]
+\def\fileversion{1.012}
+\def\filedate{2019/10/18}
+\ProvidesPackage{nimbussans}[\filedate\space v\fileversion]
+\message{`nimbussans' v\fileversion, \filedate\space Style file for NimbusSans (msharpe)}
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
@@ -18,6 +20,9 @@
\ProcessOptionsX\relax
+\edef\bfseries@sf{b}
+\edef\mdseries@sf{m}
+
\renewcommand*{\sfdefault}{NimbusSans}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nimbus15/nimbusserif.sty new/tex/latex/nimbus15/nimbusserif.sty
--- old/tex/latex/nimbus15/nimbusserif.sty 2016-01-09 23:28:43.000000000 +0100
+++ new/tex/latex/nimbus15/nimbusserif.sty 2019-10-19 23:17:18.000000000 +0200
@@ -1,6 +1,8 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{nimbusserif}
- [2015/09/19 Style file for NimbusSerif (msharpe).]
+\def\fileversion{1.012}
+\def\filedate{2019/10/18}
+\ProvidesPackage{nimbusserif}[\filedate\space v\fileversion]
+\message{`nimbusserif' v\fileversion, \filedate\space Style file for NimbusSerif (msharpe)}
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
@@ -18,6 +20,8 @@
\ProcessOptionsX\relax
+\edef\bfseries@rm{b}
+\edef\mdseries@rm{m}
\renewcommand*{\rmdefault}{NimbusSerif}
\renewcommand*{\familydefault}{\rmdefault}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nimbus15.tlpobj new/tlpkg/tlpobj/nimbus15.tlpobj
--- old/tlpkg/tlpobj/nimbus15.tlpobj 2019-02-28 03:56:09.000000000 +0100
+++ new/tlpkg/tlpobj/nimbus15.tlpobj 2020-03-24 02:00:56.000000000 +0100
@@ -1,16 +1,17 @@
name nimbus15
category Package
-revision 48734
+revision 54512
shortdesc Support files for Nimbus 2015 Core fonts
relocated 1
longdesc The Nimbus 2015 Core fonts added Greek and Cyrillic glyphs.
-longdesc This package may be best suited as an add-on the a
+longdesc This package may be best suited as an add-on to the
longdesc comprehensive Times package, providing support for Greek and
longdesc Cyrillic. A new intermediate weight of NimbusMono (AKA Courier)
longdesc is provided, along with a narrower version which may be useful
longdesc for rendering code.
+depend fontools
execute addMap nimbus15.map
-runfiles size=2045
+runfiles size=2049
RELOC/fonts/afm/public/nimbus15/zco-Bold.afm
RELOC/fonts/afm/public/nimbus15/zco-BoldOblique.afm
RELOC/fonts/afm/public/nimbus15/zco-Light.afm
@@ -306,7 +307,6 @@
RELOC/tex/latex/nimbus15/zhv.fontspec
RELOC/tex/latex/nimbus15/ztm.fontspec
catalogue-ctan /fonts/nimbus15
-catalogue-date 2018-09-21 21:32:03 +0200
-catalogue-license other-free
-catalogue-topics font font-ttf font-type1 font-otf
-catalogue-version 1.011
+catalogue-license other-free lppl1.3
+catalogue-topics font font-body font-proportional font-multilingual font-greek font-cyrillic font-type1 font-otf font-supp font-t1enc
+catalogue-version 1.013
++++++ nlctdoc.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nlctdoc.doc.tlpobj new/tlpkg/tlpobj/nlctdoc.doc.tlpobj
--- old/tlpkg/tlpobj/nlctdoc.doc.tlpobj 2019-02-28 03:56:13.000000000 +0100
+++ new/tlpkg/tlpobj/nlctdoc.doc.tlpobj 2020-02-14 01:55:02.000000000 +0100
@@ -1,6 +1,6 @@
name nlctdoc.doc
category Package
-revision 44353
+revision 53768
shortdesc doc files of nlctdoc
relocated 1
docfiles size=1
++++++ nlctdoc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nlctdoc/nlctdoc.cls new/tex/latex/nlctdoc/nlctdoc.cls
--- old/tex/latex/nlctdoc/nlctdoc.cls 2017-05-15 00:41:32.000000000 +0200
+++ new/tex/latex/nlctdoc/nlctdoc.cls 2020-02-13 23:11:15.000000000 +0100
@@ -4,7 +4,7 @@
% copy the code here to another file and modify it for your own purposes.
% There's no guarantee that it will work with other packages.
%
-% Copyright 2017 Nicola Talbot
+% Copyright 2013-2020 Nicola Talbot
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -15,7 +15,7 @@
% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{nlctdoc}[2017/05/13 v1.06 (NLCT)]
+\ProvidesClass{nlctdoc}[2020/02/12 v1.07 (NLCT)]
\RequirePackage{ifpdf}
\RequirePackage{ifxetex}
% tex4ht stopped working with koma during TL2013.
@@ -85,7 +85,11 @@
\DeclareOption{widecs}{\widecstrue}
\DeclareOption*{%
\PassOptionsToClass {\CurrentOption}{\@nlctdoc@class}}
+\newif\ifwbprompt
+\wbpromptfalse
+\DeclareOption{wbprompt}{\wbprompttrue}
\ProcessOptions
+
\@nlctdoc@if@usingtexht
{%
\LoadClass{\@nlctdoc@class}
@@ -97,6 +101,7 @@
\LoadClass[captions=tableheading,abstract=true]{\@nlctdoc@class}
\fi
}%
+
\RequirePackage{xcolor}
\ifxetex
\else
@@ -131,13 +136,38 @@
\@noligs
\let\do\@makeother \dospecials}
+% make it easier to configure index
+
+\begin{filecontents}{nlctdoc.ist}
+actual '='
+quote '!'
+level '>'
+preamble "\n \\begin{theindex} \n \\makeatletter\\scan@allowedfalse\n"
+postamble "\n\n \\end{theindex}\n"
+item_x1 "\\efill \n \\subitem "
+item_x2 "\\efill \n \\subsubitem "
+delim_0 "\\pfill "
+delim_1 "\\pfill "
+delim_2 "\\pfill "
+lethead_prefix "\\letterheading{"
+lethead_suffix "}\\nopagebreak\n"
+lethead_flag 1
+heading_prefix "\\letterheading{"
+heading_suffix "}\\nopagebreak\n"
+headings_flag 1
+\end{filecontents}
+
+\ifdef\chapter
+{\newcommand{\letterheading}[1]{\pdfbookmark[1]{#1}{index.#1}\textbf{\hfil#1\hfil}}}
+{\newcommand{\letterheading}[1]{\pdfbookmark[2]{#1}{index.#1}\textbf{\hfil#1\hfil}}}
+
\newcommand*{\nlctdocmarginfmt}{\raggedleft}
\nlct@setupmargin
\def\@@doxdescribe#1#2{%
\endgroup%
\ifdox@noprint\else%
- \marginpar{\nlctdocmarginfmt\@nameuse{PrintDescribe#1}{#2}}%
+ \nlctdocmargin{\@nameuse{PrintDescribe#1}{#2}}%
\fi%
\ifdox@noindex\else%
\@nameuse{Special#1Index}{#2}%
@@ -145,8 +175,14 @@
\endgroup%
\@esphack\ignorespaces}
+\newcommand{\nlctdocmargin}[1]{\marginpar{\nlctdocmarginfmt#1}}
+\newcommand{\nlctdocmarginwide}[1]{%
+ \marginpar{\parbox[b][2\baselineskip]{\marginparwidth}{\nlctdocmarginfmt#1\vfill\par}}%
+}
+
+\newrobustcmd\cs[1]{\texttt{\char`\\#1}}
-\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
+\newrobustcmd*{\mgroup}[1]{\texttt{\char`\{#1\char`\}}}
\providecommand\marg[1]{%
\allowbreak{\ttfamily\char`\{}\meta{#1}{\ttfamily\char`\}}}
@@ -163,10 +199,13 @@
\def\main#1{\underline{\hyperpage{#1}}}
\def\usage#1{\textit{\hyperpage{#1}}}
-\def\SortIndex#1#2{\index{#1\actualchar#2\encapchar hyperpage}}
+\newcommand{\nlctdocmainencap}{\encapchar main}
+\newcommand{\nlctdochyperencap}{\encapchar hyperpage}
+
+\def\SortIndex#1#2{\index{#1\actualchar#2\nlctdochyperencap}}
\newcommand*{\SpecialPageIndex}[1]{\@bsphack
- \index{#1\encapchar hyperpage}\@esphack}
+ \index{#1\nlctdochyperencap}\@esphack}
\renewcommand*\PageIndex{\makeindex
\codeline@indexfalse
@@ -256,8 +295,6 @@
\PageIndex
\CodelineNumbered
-\newcommand{\importantsymbol}{\bfseries\Huge\danger}
-
\newcommand\Describe@Wide@Macro[1]{%
\endgroup
\marginpar{\raggedright\hbox to\marginparwidth{\PrintDescribeMacro{#1}}\par}%
@@ -267,6 +304,16 @@
\newlength\macrowidth
+\newcommand{\promptsymbol}{\BeginAccSupp{ActualText={}}\$\EndAccSupp{}}
+
+\newcommand{\importantfmt}{\raggedright}
+\newcommand{\importantsymbolfont}[1]{\textbf{\Huge#1}}
+
+\newcommand{\importantpar}[1][-3]{%
+ \def\@nlct@importantparafter{#1}%
+ \@importantpar
+}
+
\@nlctdoc@if@usingtexht
{%
\newenvironment{definition}[1][]{%
@@ -275,19 +322,30 @@
\HCode{</div><hr>}\par\noindent
}
- \newcommand{\importantpar}[1][-3]{\importantsymbol\space}
-
+ \newcommand{\importantsymbol}{\HCode{<span class="warningsymbol">&\#9888;</span>}}
+ \newcommand{\@importantpar}[1][]{\importantsymbol\space}
\newenvironment{important}{%
\par\HCode{<div class="important" title="Important Note">}\noindent
}{%
\HCode{</div>}\par\noindent
}
- \newenvironment{prompt}{%
- \HCode{<spacer type=vertical size=10>}\begin{ttfamily}\obeylines\ignorespaces
- }{%
- \end{ttfamily}\HCode{<spacer type=vertical size=10>}\noindent
- }
+ \ifwbprompt
+ \AtBeginDocument{\Css{
+ pre.prompt {color: white; background: black; font-weight:
+bold; padding-bottom: 2ex; padding-left: 1em; padding-right: 1em;}
+ }}
+
+ \newenvironment{prompt}%
+ {\par\HCode{<spacer type=vertical size=10><pre class="prompt">}%
+ \obeylines\ignorespaces}%
+ {\HCode{</pre><spacer type=vertical size=10>}\par\noindent}
+
+ \else
+ \newenvironment{prompt}%
+ {\HCode{<spacer type=vertical size=10>}\begin{ttfamily}\obeylines\ignorespaces}%
+ {\end{ttfamily}\HCode{<spacer type=vertical size=10>}\noindent}
+ \fi
\newenvironment{display}{%
\HCode{<spacer type=vertical size=10>}\obeylines\ignorespaces
@@ -312,20 +370,18 @@
\setlength\defwidth\linewidth
\addtolength\defwidth{-2\fboxrule}%
\addtolength\defwidth{-2\fboxsep}%
- \begin{minipage}{\defwidth}\flushleft\ttfamily
+ \begin{minipage}[t]{\defwidth}\raggedright\ttfamily
}{%
\end{minipage}
\end{lrbox}%
\vskip10pt
\noindent
\ifwidecs
- \let\Describe@Macro\Describe@Wide@Macro
- \defarg
- \nopagebreak\mbox{}\nopagebreak
- \par\nopagebreak\vspace{0.5ex plus 0.25ex minus 0.1ex}\nopagebreak\noindent
+ \let\nlctdocmargin\nlctdocmarginwide
+ \par\bigskip\par\noindent
\else
- \defarg
\fi
+ \strut\nopagebreak\defarg\nopagebreak
\fcolorbox{black}{defbackground}{\usebox\defsbox}%
\vskip10pt
\noindent
@@ -335,16 +391,22 @@
\newlength\tmpwidth
\newlength\tmpheight
- \newcommand{\importantpar}[1][-3]{%
- \settoheight{\tmpheight}{\importantsymbol}%
- \settowidth{\tmpwidth}{\importantsymbol}%
+ \newcommand{\importantsymbol}{\warning}
+
+ \newsavebox\@nlctdoc@tmpsbox
+ \newcommand{\@importantpar}[1][0pt]{%
+ \sbox\@nlctdoc@tmpsbox{\importantsymbolfont{\importantsymbol}}%
+ \settoheight{\tmpheight}{\usebox\@nlctdoc@tmpsbox}%
+ \settowidth{\tmpwidth}{\usebox\@nlctdoc@tmpsbox}%
+ \advance\tmpheight by #1\relax
\advance\tmpwidth by .5em\relax
\par\noindent
\hangindent=\tmpwidth
- \hangafter=#1\relax
+ \hangafter=\@nlct@importantparafter\relax
\makebox[0pt][l]{\hspace*{-\tmpwidth}%
- \smash{\raisebox{-\tmpheight}{\importantsymbol}}%
+ \smash{\raisebox{-\tmpheight}{\usebox\@nlctdoc@tmpsbox}}%
}%
+ \ignorespaces
}
\newenvironment{important}{%
@@ -354,7 +416,7 @@
\addtolength\defwidth{-2\fboxrule}%
\begin{lrbox}{\defsbox}%
\begin{minipage}{\defwidth}%
- \raggedright
+ \importantfmt
\setlength\parindent{1em}%
\noindent\ignorespaces
}{%
@@ -365,14 +427,33 @@
\noindent\ignorespacesafterend
}
- \newenvironment{prompt}{%
- \par\vskip\baselineskip
- \begin{ttfamily}\obeylines\noindent\ignorespaces
- }{%
- \end{ttfamily}%
- \par\vskip\baselineskip
+ \ifwbprompt
+ \newenvironment{prompt}%
+ {%
+ \setlength\defwidth{\linewidth}%
+ \addtolength\defwidth{-2\fboxsep}%
+ \begin{lrbox}{\defsbox}%
+ \begin{minipage}[t]{\defwidth}%
+ \ttfamily\color{white}\bfseries
+ \everypar{\promptsymbol\ }%
+ \obeylines\raggedright\frenchspacing\ignorespaces%
+ }%
+ {%
+ \end{minipage}%
+ \end{lrbox}\par\noindent\colorbox{black}{\usebox\defsbox}%
+ \everypar{}\par\medskip
\noindent\ignorespacesafterend
- }
+ }
+ \else
+ \newenvironment{prompt}{%
+ \par\vskip\baselineskip
+ \begin{ttfamily}\frenchspacing\obeylines\noindent\ignorespaces
+ }{%
+ \end{ttfamily}%
+ \par\vskip\baselineskip
+ \noindent\ignorespacesafterend
+ }
+ \fi
\newenvironment{display}{%
\par\vskip\baselineskip\noindent
@@ -406,117 +487,308 @@
}
}%
+\newcommand*{\idxmarker}{\textsuperscript{\textdagger}}
+\newcommand*{\doidxmarker}{\strut\llap{\idxmarker}}
+
\newcommand*{\appfmt}[1]{\texttt{#1}}
-\DeclareRobustCommand*{\iapp}[1]{\index{#1=\appfmt{#1}\encapchar hyperpage}}
-\DeclareRobustCommand*{\app}[1]{\appfmt{#1}\iapp{#1}}
+\newrobustcmd*{\iapp}{\@ifstar\s@iapp\@iapp}
+
+\newcommand*{\s@iapp}[1]{\index{#1=\doidxmarker\appfmt{#1}\nlctdochyperencap}}
+\newcommand*{\@iapp}[1]{\index{#1=\appfmt{#1}\nlctdochyperencap}}
+
+\newrobustcmd*{\app}[1]{\appfmt{#1}\iapp{#1}}
\newcommand*{\qt}[1]{``#1''}
-\DeclareRobustCommand*{\termdef}[1]{\emph{#1}\iterm{#1}}
-\DeclareRobustCommand*{\term}[1]{#1\iterm{#1}}
-\DeclareRobustCommand*{\iterm}[1]{\index{#1|main}}
+\newrobustcmd*{\termdef}[1]{\emph{#1}\iterm{#1}}
+\newrobustcmd*{\term}[1]{#1\iterm{#1}}
+\newrobustcmd*{\iterm}[1]{\index{#1\nlctdocmainencap}}
\newcommand*{\tableref}[1]{\hyperref[#1]{table~\ref*{#1}}}
\newcommand*{\Tableref}[1]{\hyperref[#1]{Table~\ref*{#1}}}
-\newcommand*{\ics}[1]{\cs{#1}\SpecialMainIndex{#1}}
+\renewcommand{\SpecialMainIndex}[1]{\@bsphack \SpecialIndex@ {#1}{\nlctdocmainencap}\@esphack}
+
+\newcommand{\idxmarker@SpecialMainIndex}[1]{%
+ \@bsphack \idxmarker@SpecialIndex@ {#1}{\nlctdocmainencap}\@esphack
+}
+
+\newcommand\idxmarker@SpecialIndex@[2]{%
+ \@SpecialIndexHelper@#1\@nil
+ \def\@tempb{ }%
+ \ifcat \@tempb\@gtempa
+ \special@index{\quotechar\space\actualchar
+ \doidxmarker\string\verb\quotechar*\verbatimchar
+ \quotechar\bslash\quotechar\space\verbatimchar#2}%
+ \else
+ \def\@tempb##1##2\relax{\ifx\relax##2\relax
+ \def\@tempc{\special@index{\quotechar##1\actualchar
+ \doidxmarker\string\verb\quotechar*\verbatimchar
+ \quotechar\bslash\quotechar##1\verbatimchar#2}}%
+ \else
+ \def\@tempc{\special@index{##1##2\actualchar
+ \doidxmarker\string\verb\quotechar*\verbatimchar
+ \bslash##1##2\verbatimchar#2}}%
+ \fi}%
+ \expandafter\@tempb\@gtempa\relax
+ \@tempc
+ \fi}
+
+\newcommand{\dequals}{%
+ \texorpdfstring
+ {\discretionary{}{}{}\texttt{=}\discretionary{}{}{}}%
+ {=}%
+}
+
+\newcommand{\dcomma}{%
+ \texorpdfstring
+ {\discretionary{}{}{}\texttt{,}\discretionary{}{}{}}%
+ {,}%
+}
+
+\newcommand{\dhyphen}{%
+ \texorpdfstring
+ {\discretionary{}{}{}\texttt{-}\discretionary{}{}{}}%
+ {-}%
+}
+
+
+\newcommand{\idxmarkedfont}[1]{#1}
+
+\newcommand*{\nlctdoc@ifplus}[1]{\@ifnextchar+{\@firstoftwo {#1}}}
+
+\newrobustcmd{\ics}{\@ifstar\s@ics\@ics}
+
+\newcommand*{\s@ics}[1]{\idxmarkedfont{\cs{#1}}\idxmarker@SpecialMainIndex{#1}}
+\newcommand*{\@ics}[1]{\cs{#1}\SpecialMainIndex{#1}}
-\newcommand*{\icsopt}[2]{\index{#1 options\actualchar\cs{#1} options\levelchar#2\actualchar\textsf{#2}\encapchar hyperpage}}
+\newrobustcmd{\csmeta}{\@ifstar\s@csmeta\@csmeta}
-\newcommand*{\csopt}[2]{%
- \textsf{#2}%
+\newcommand*{\s@csmeta}[3]{\idxmarkedfont{\cs{#1\meta{#2}#3}}\index{#1#2#3=\protect\doidxmarker\protect\cs{#1\meta{#2}#3}\nlctdochyperencap}}
+\newcommand*{\@csmeta}[3]{\cs{#1\meta{#2}#3}\index{#1#2#3=\protect\cs{#1\meta{#2}#3}\nlctdochyperencap}}
+
+\newrobustcmd{\csmetameta}{\@ifstar\s@csmetameta\@csmetameta}
+
+\newcommand*{\s@csmetameta}[5]{\idxmarkedfont{\cs{#1\meta{#2}#3\meta{#4}#5}}\index{#1#2#3#4#5=\protect\doidxmarker\protect\cs{#1\meta{#2}#3\meta{#4}#5}\nlctdochyperencap}}
+\newcommand*{\@csmetameta}[5]{\cs{#1\meta{#2}#3\meta{#4}#5}\index{#1#2#3#4#5=\protect\cs{#1\meta{#2}#3\meta{#4}#5}\nlctdochyperencap}}
+
+\newcommand*{\csoptfmt}[1]{\textsf{#1}}
+
+\newrobustcmd*{\icsopt}{\@ifstar\s@icsopt\ns@icsopt}
+
+\newcommand*{\ns@icsopt}{\nlctdoc@ifplus\p@icsopt\@icsopt}
+
+\newcommand*{\s@icsopt}[2]{%
+ \index{#1 options\actualchar\cs{#1} options\levelchar#2\actualchar\doidxmarker\csoptfmt{#2}\nlctdochyperencap}}
+
+\newcommand*{\p@icsopt}[2]{%
+ \index{#1 options\actualchar\doidxmarker\cs{#1} options\levelchar#2\actualchar\csoptfmt{#2}\nlctdochyperencap}}
+
+\newcommand*{\@icsopt}[2]{%
+ \index{#1 options\actualchar\cs{#1} options\levelchar#2\actualchar\csoptfmt{#2}\nlctdochyperencap}}
+
+\newrobustcmd*{\csopt}{\@ifstar\s@csopt\@csopt}
+
+\newcommand*{\s@csopt}[2]{%
+ \idxmarkedfont{\csoptfmt{#2}}%
\@for\@thiscmd:=#1\do{%
- \icsopt{\@thiscmd}{#2}%
+ \s@icsopt{\@thiscmd}{#2}%
}%
}
+\newcommand*{\@csopt}[2]{%
+ \csoptfmt{#2}%
+ \@for\@thiscmd:=#1\do{%
+ \@icsopt{\@thiscmd}{#2}%
+ }%
+}
+
+% Package options
\newcommand*{\pkgoptfmt}[1]{\textsf{#1}}
+% \ipkgopt{option}
% \ipkgopt[value]{option}
-\newcommand*{\ipkgopt}[2][]{%
- \def\@argi{#1}%
- \ifx\@argi\@empty
- \index{package options:>#2=\pkgoptfmt{#2}|main}%
- \else
- \index{package options:>#2=\pkgoptfmt{#2}>#1=\pkgoptfmt{#1}|main}%
-\fi
+% \ipkgopt*{option} <- mark option
+% \ipkgopt*[value]{option} <- mark value
+% \ipkgopt+{value}{option} <- mark option
+
+\newrobustcmd*{\ipkgopt}{\@ifstar\s@ipkgopt\ns@ipkgopt}
+
+\newcommand*{\ns@ipkgopt}{\nlctdoc@ifplus\p@ipkgopt\@ipkgopt}
+
+\newcommand*{\s@ipkgopt}[2][]{%
+ \ifstrempty{#1}%
+ {\index{package options:>#2=\doidxmarker\pkgoptfmt{#2}\nlctdocmainencap}}%
+ {\index{package options:>#2=\pkgoptfmt{#2}>#1=\doidxmarker\pkgoptfmt{#1}\nlctdocmainencap}}%
}
-\newcommand*{\pkgopt}[2][]{%
- \def\@argi{#1}%
- \ifx\@argi\@empty
- \pkgoptfmt{#2}\index{package options:>#2=\pkgoptfmt{#2}|main}%
- \else
- \pkgoptfmt{#2=#1}%
- \index{package options:>#2=\pkgoptfmt{#2}>#1=\pkgoptfmt{#1}|main}%
-\fi
+\newcommand*{\p@ipkgopt}[2]{%
+ \index{package options:>#2=\doidxmarker\pkgoptfmt{#2}>#1=\pkgoptfmt{#1}\nlctdocmainencap}%
}
-% \pkgoptval{value}{option}
-\newcommand*{\pkgoptval}[2]{%
- \pkgoptfmt{#1}%
- \index{package options:>#2=\pkgoptfmt{#2}>#1=\pkgoptfmt{#1}|main}%
+\newcommand*{\@ipkgopt}[2][]{%
+ \ifstrempty{#1}%
+ {\index{package options:>#2=\pkgoptfmt{#2}\nlctdocmainencap}}%
+ {\index{package options:>#2=\pkgoptfmt{#2}>#1=\pkgoptfmt{#1}\nlctdocmainencap}}%
}
-\newcommand*{\clsoptfmt}[1]{\textsf{#1}}
+\newrobustcmd*{\ideprecatedpkgopt}[2][]{%
+ \ifstrempty{#1}%
+ {\index{package options:>#2=\pkgoptfmt{#2} (deprecated)\nlctdocmainencap}}%
+ {\index{package options:>#2=\pkgoptfmt{#2} (deprecated)>#1=\pkgoptfmt{#1}\nlctdocmainencap}}%
+}
+
+\newrobustcmd*{\pkgopt}{\@ifstar\s@pkgopt\ns@pkgopt}
+
+\newcommand*{\ns@pkgopt}{\nlctdoc@ifplus\p@pkgopt\@pkgopt}
+
+\newcommand*{\s@pkgopt}[2][]{%
+ \idxmarkedfont{\ifstrempty{#1}{\pkgoptfmt{#2}}{\pkgoptfmt{#2\dequals#1}}}%
+ \s@ipkgopt[#1]{#2}%
+}
+
+\newcommand*{\p@pkgopt}[2]{%
+ \idxmarkedfont{\pkgoptfmt{#2\dequals#1}}\p@ipkgopt{#1}{#2}%
+}
+
+\newcommand*{\@pkgopt}[2][]{%
+ \ifstrempty{#1}{\pkgoptfmt{#2}}{\pkgoptfmt{#2\dequals#1}}%
+ \@ipkgopt[#1]{#2}%
+}
+
+\newrobustcmd*{\deprecatedpkgopt}[2][]{%
+ \ifstrempty{#1}{\pkgoptfmt{#2}}{\pkgoptfmt{#2\dequals#1}}%
+ \ideprecatedpkgopt[#1]{#2}%
+}
+
+\newrobustcmd*{\pkgoptval}{\@ifstar\s@pkgoptval\ns@pkgoptval}
+
+\newcommand*{\ns@pkgoptval}{\nlctdoc@ifplus\p@pkgoptval\@pkgoptval}
+
+\newcommand*{\s@pkgoptval}[2]{\idxmarkedfont{\pkgoptfmt{#1}}\s@ipkgopt[#1]{#2}}
+
+\newcommand*{\p@pkgoptval}[2]{\idxmarkedfont{\pkgoptfmt{#1}}\p@ipkgopt[#1]{#2}}
+
+\newcommand*{\@pkgoptval}[2]{\pkgoptfmt{#1}\@ipkgopt[#1]{#2}}
+% Class options
+
+% \iclsopt{option}
% \iclsopt[value]{option}
-\newcommand*{\iclsopt}[2][]{%
- \def\@argi{#1}%
- \ifx\@argi\@empty
- \index{class options:>#2=\clsoptfmt{#2}|main}%
- \else
- \index{class options:>#2=\clsoptfmt{#2}>#1=\clsoptfmt{#1}|main}%
-\fi
+% \iclsopt*{option} <- mark option
+% \iclsopt*[value]{option} <- mark value
+% \iclsopt+{value}{option} <- mark option
+
+\newcommand*{\clsoptfmt}[1]{\textsf{#1}}
+
+\newrobustcmd*{\iclsopt}{\@ifstar\s@iclsopt\ns@iclsopt}
+
+\newcommand*{\ns@iclsopt}{\@ifnextchar+\p@iclsopt\@iclsopt}
+
+\newcommand*{\s@iclsopt}[2][]{%
+ \ifstrempty{#1}%
+ {\index{class options:>#2=\doidxmarker\clsoptfmt{#2}\nlctdocmainencap}}%
+ {\index{class options:>#2=\clsoptfmt{#2}>#1=\doidxmarker\clsoptfmt{#1}\nlctdocmainencap}}%
}
-\newcommand*{\clsopt}[2][]{%
- \def\@argi{#1}%
- \ifx\@argi\@empty
- \clsoptfmt{#2}\index{class options:>#2=\clsoptfmt{#2}|main}%
- \else
- \clsoptfmt{#2=#1}%
- \index{class options:>#2=\clsoptfmt{#2}>#1=\clsoptfmt{#1}|main}%
-\fi
+\newcommand*{\p@iclsopt}[2]{%
+ \index{class options:>#2=\doidxmarker\clsoptfmt{#2}>#1=\clsoptfmt{#1}\nlctdocmainencap}%
+}
+
+\newcommand*{\@iclsopt}[2][]{%
+ \ifstrempty{#1}%
+ {\index{class options:>#2=\clsoptfmt{#2}\nlctdocmainencap}}%
+ {\index{class options:>#2=\clsoptfmt{#2}>#1=\clsoptfmt{#1}\nlctdocmainencap}}%
+}
+
+\newrobustcmd*{\ideprecatedclsopt}[2][]{%
+ \ifstrempty{#1}%
+ {\index{class options:>#2=\clsoptfmt{#2} (deprecated)\nlctdocmainencap}}%
+ {\index{class options:>#2=\clsoptfmt{#2} (deprecated)>#1=\clsoptfmt{#1}\nlctdocmainencap}}%
+}
+
+\newrobustcmd*{\clsopt}{\@ifstar\s@clsopt\ns@clsopt}
+
+\newcommand*{\ns@clsopt}{\nlctdoc@ifplus\p@clsopt\@clsopt}
+
+\newcommand*{\s@clsopt}[2][]{%
+ \idxmarkedfont{\ifstrempty{#1}{\clsoptfmt{#2}}{\clsoptfmt{#2\dequals#1}}}%
+ \s@iclsopt[#1]{#2}%
+}
+
+\newcommand*{\p@clsopt}[2]{%
+ \idxmarkedfont{\ifstrempty{#1}{\clsoptfmt{#2}}{\clsoptfmt{#2\dequals#1}}}%
+ \p@iclsopt{#1}{#2}%
+}
+
+\newcommand*{\@clsopt}[2][]{%
+ \ifstrempty{#1}{\clsoptfmt{#2}}{\clsoptfmt{#2\dequals#1}}%
+ \@iclsopt[#1]{#2}%
}
-% \clsoptval{value}{option}
-\newcommand*{\clsoptval}[2]{%
- \clsoptfmt{#1}%
- \index{class options:>#2=\clsoptfmt{#2}>#1=\clsoptfmt{#1}|main}%
+\newrobustcmd*{\deprecatedclsopt}[2][]{%
+ \ifstrempty{#1}{\clsoptfmt{#2}}{\clsoptfmt{#2\dequals#1}}%
+ \ideprecatedclsopt[#1]{#2}%
}
+\newrobustcmd*{\clsoptval}{\@ifstar\s@clsoptval\ns@clsoptval}
+
+\newcommand*{\ns@clsoptval}{\nlctdoc@ifplus\p@clsoptval\@clsoptval}
+
+\newcommand*{\s@clsoptval}[2]{\idxmarkedfont{\clsoptfmt{#1}\s@iclsopt[#1]{#2}}}
+
+\newcommand*{\p@clsoptval}[2]{\idxmarkedfont{\clsoptfmt{#1}\p@iclsopt[#1]{#2}}}
+
+\newcommand*{\@clsoptval}[2]{\clsoptfmt{#1}\@iclsopt[#1]{#2}}
+
\newcommand*{\filetypefmt}[1]{\texttt{#1}}
\newcommand*{\ifiletype}[1]{\index{file
- types>#1=\filetypefmt{#1}|hyperpage}}
+ types>#1=\filetypefmt{#1}\nlctdochyperencap}}
\newcommand*{\filetype}[1]{\filetypefmt{#1}\ifiletype{#1}}
\newcommand*{\styfmt}[1]{\textsf{#1}}
-\newcommand*{\isty}[1]{\index{#1 package=\styfmt{#1}
- package|hyperpage}}
-\newcommand*{\sty}[1]{\styfmt{#1}\isty{#1}}
+\newrobustcmd{\isty}{\@ifstar\s@isty\@isty}
+
+\newcommand*{\@isty}[1]{\index{#1 package=\styfmt{#1}
+ package\nlctdocmainencap}}
+\newcommand*{\s@isty}[1]{\index{#1 package=\doidxmarker\styfmt{#1}
+ package\nlctdocmainencap}}
+
+\newrobustcmd{\sty}{\@ifstar\s@sty\@sty}
+
+\newcommand*{\@sty}[1]{\styfmt{#1}\@isty{#1}}
+\newcommand*{\s@sty}[1]{\idxmarkedfont{\styfmt{#1}}\s@isty{#1}}
\newcommand*{\clsfmt}[1]{\textsf{#1}}
-\newcommand*{\icls}[1]{\index{#1 class=\clsfmt{#1} class|hyperpage}}
-\newcommand*{\cls}[1]{\clsfmt{#1}\icls{#1}}
+\newrobustcmd{\icls}{\@ifstar\s@icls\@icls}
+
+\newcommand*{\@icls}[1]{\index{#1 class=\clsfmt{#1}
+ class\nlctdocmainencap}}
+\newcommand*{\s@icls}[1]{\index{#1 class=\doidxmarker\clsfmt{#1}
+ class\nlctdocmainencap}}
+
+\newrobustcmd{\cls}{\@ifstar\s@cls\@cls}
+
+\newcommand*{\@cls}[1]{\clsfmt{#1}\@icls{#1}}
+\newcommand*{\s@cls}[1]{\idxmarkedfont{\clsfmt{#1}}\s@icls{#1}}
\newcommand*{\envfmt}[1]{\textsf{#1}}
\newcommand*{\ienv}[1]{\SpecialMainEnvIndex{#1}}
\newcommand*{\env}[1]{\envfmt{#1}\ienv{#1}}
\newcommand*{\ctrfmt}[1]{\textsf{#1}}
-\newcommand*{\ictr}[1]{\index{#1={\protect\ttfamily#1} (counter)|hyperpage}}
+\newcommand*{\ictr}[1]{\index{#1={\protect\ttfamily#1} (counter)\nlctdochyperencap}}
\newcommand*{\ctr}[1]{\ctrfmt{#1}\ictr{#1}}
\newcommand*{\boolfmt}[1]{\textsf{#1}}
-\newcommand*{\ibool}[1]{\index{#1={\ttfamily#1} (boolean variable)|hyperpage}}
+\newcommand*{\ibool}[1]{\index{#1={\ttfamily#1} (boolean variable)\nlctdochyperencap}}
\newcommand*{\bool}[1]{\boolfmt{#1}\ibool{#1}}
\newcommand*{\bstfmt}[1]{\textsf{#1}}
\newcommand*{\ibst}[1]{\index{#1 bibliography style=\bstfmt{#1}
-bibliography style|hyperpage}}
+bibliography style\nlctdochyperencap}}
\newcommand*{\bst}[1]{\bstfmt{#1}\ibst{#1}}
\newcommand*{\menu}[1]{\textsf{#1}}
@@ -545,13 +817,17 @@
\newcommand*{\toTop}{\par\noindent\hyperlink{top}{Top}}
+ \AtBeginDocument{%
+ \Css{.warningsymbol { color: red; font-weight: bold;}}%
+ \Css{div.important { border : solid red; }}%
+ \Css{div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; clear:both; padding-top: 2ex; padding-bottom: 2ex;} }%
+ }
+
\@ifundefined{chapter}
{%
\AtBeginDocument{%
\Configure{section}{\toTop\HCode{<h2 class="sectionHead">}}{}{}{}%
\Configure{subsection}{\toTop\HCode{<h3 class="subsectionHead">}}{}{}{}%
- \Css{div.important { border : solid red; }}%
- \Css{div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; clear:both; padding-top: 2ex; padding-bottom: 2ex;} }%
}
}%
{%
@@ -563,8 +839,6 @@
{\HCode{<h2 class="chapterHead">}\thechapter. }{\HCode{</h2>}}%
\Configure{section}{\toTop\HCode{<h3 class="sectionHead">}}{}{}{}%
\Configure{subsection}{\toTop\HCode{<h4 class="subsectionHead">}}{}{}{}%
- \Css{div.important { border : solid red; }}%
- \Css{div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; clear:both; padding-top: 2ex; padding-bottom: 2ex;} }%
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nlctdoc.tlpobj new/tlpkg/tlpobj/nlctdoc.tlpobj
--- old/tlpkg/tlpobj/nlctdoc.tlpobj 2019-02-28 03:56:13.000000000 +0100
+++ new/tlpkg/tlpobj/nlctdoc.tlpobj 2020-02-14 01:55:02.000000000 +0100
@@ -1,16 +1,15 @@
name nlctdoc
category Package
-revision 44353
+revision 53768
shortdesc Package documentation class
relocated 1
longdesc The class provides support for the documentation of the
longdesc author's packages, using koma-script. This class is provided
longdesc "as is" solely for the benefit of anyone who wants to compile
longdesc the documentation of those packages.
-runfiles size=5
+runfiles size=7
RELOC/tex/latex/nlctdoc/nlctdoc.cls
catalogue-ctan /macros/latex/contrib/nlctdoc
-catalogue-date 2019-01-12 10:21:49 +0100
catalogue-license lppl
catalogue-topics doc-supp class
-catalogue-version 1.06
+catalogue-version 1.07
++++++ nomencl.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/nomencl/README new/doc/latex/nomencl/README
--- old/doc/latex/nomencl/README 2019-02-09 23:21:04.000000000 +0100
+++ new/doc/latex/nomencl/README 2020-03-03 23:58:00.000000000 +0100
@@ -10,7 +10,7 @@
COPYING AND MODIFICATION
-Copyright 1996-2018 Boris Veytsman, Bernd Shandl, Lee Netherton, CV
+Copyright 1996-2020 Boris Veytsman, Bernd Shandl, Lee Netherton, CV
Radhakrishnan, Brian Elmegaard
@@ -35,3 +35,11 @@
v5.1 2019/02/08 Compatibility changes for KOMA-Script
Bugs fixes
+ v5.2 2019/05/05 More compatibility changes: tocbasic call
+ is now optional
+
+ v5.3 2019/11/23 Documentation updates
+ Slovene option
+
+ v5.4 2020/03/01 Norwegian (norwegian-bokmaal, norwegian-nynorsk)
+ options
\ No newline at end of file
Binary files old/doc/latex/nomencl/nomencl.pdf and new/doc/latex/nomencl/nomencl.pdf differ
Binary files old/doc/latex/nomencl/sample01.pdf and new/doc/latex/nomencl/sample01.pdf differ
Binary files old/doc/latex/nomencl/sample02.pdf and new/doc/latex/nomencl/sample02.pdf differ
Binary files old/doc/latex/nomencl/sample03.pdf and new/doc/latex/nomencl/sample03.pdf differ
Binary files old/doc/latex/nomencl/sample04.pdf and new/doc/latex/nomencl/sample04.pdf differ
Binary files old/doc/latex/nomencl/sample05.pdf and new/doc/latex/nomencl/sample05.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nomencl.doc.tlpobj new/tlpkg/tlpobj/nomencl.doc.tlpobj
--- old/tlpkg/tlpobj/nomencl.doc.tlpobj 2019-02-28 03:56:20.000000000 +0100
+++ new/tlpkg/tlpobj/nomencl.doc.tlpobj 2020-03-04 23:53:05.000000000 +0100
@@ -1,9 +1,9 @@
name nomencl.doc
category Package
-revision 49987
+revision 54080
shortdesc doc files of nomencl
relocated 1
-docfiles size=160
+docfiles size=163
RELOC/doc/latex/nomencl/README
RELOC/doc/latex/nomencl/nomencl.pdf
RELOC/doc/latex/nomencl/sample01.pdf
++++++ nomencl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/nomencl/nomencl.sty new/tex/latex/nomencl/nomencl.sty
--- old/tex/latex/nomencl/nomencl.sty 2019-02-09 23:21:04.000000000 +0100
+++ new/tex/latex/nomencl/nomencl.sty 2020-03-03 23:58:00.000000000 +0100
@@ -16,17 +16,16 @@
%% version 1.2 of the license, or (at your option) any later version.
%%
\ProvidesPackage{nomencl}%
- [2019/02/08 v5.1 Nomenclature package]
+ [2020/03/01 v5.4 Nomenclature package]
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{xkeyval}
\RequirePackage{ifthen}
-\RequirePackage{tocbasic}
-\addtotoclist[nomencl]{nlo}
-\addtotoclist[nomencl]{nls}
\newif\if@printeqref
\newif\if@printpageref
\newif\if@intoc
\newif\if@compatibilitymode
+\newif\if@nomencl@tocbasic
+\@nomencl@tocbasictrue
\DeclareOptionX{refeq}{\@printeqreftrue}
\DeclareOptionX{norefeq}{\@printeqreffalse}
\DeclareOptionX{refpage}{\@printpagereftrue}
@@ -35,6 +34,8 @@
\DeclareOptionX{notintoc}{\@intocfalse}
\DeclareOptionX{compatible}{\@compatibilitymodetrue}
\DeclareOptionX{noncompatible}{\@compatibilitymodefalse}
+\DeclareOptionX{tocbasic}{\@nomencl@tocbasictrue}
+\DeclareOptionX{notocbasic}{\@nomencl@tocbasicfalse}
\DeclareOptionX{prefix}{\def\nomprefix{a}}
\DeclareOptionX{noprefix}{\def\nomprefix{}}
\newif\if@nomentbl
@@ -94,6 +95,22 @@
\def\nomGname{Lettere greche}%
\def\nomXname{Apici}%
\def\nomZname{Indici}}
+\DeclareOptionX{norwegian-bokmaal}{%
+ \def\eqdeclaration##1{, se ligning\nobreakspace(##1)}%
+ \def\pagedeclaration##1{, side\nobreakspace##1}%
+ \def\nomname{Nomenklatur}%
+ \def\nomAname{Romerske bokstaver}%
+ \def\nomGname{Greske bokstaver}%
+ \def\nomXname{Hevet skrift}%
+ \def\nomZname{Senket skrift}}
+\DeclareOptionX{norwegian-nynorsk}{%
+ \def\eqdeclaration##1{, se likning\nobreakspace(##1)}%
+ \def\pagedeclaration##1{, side\nobreakspace##1}%
+ \def\nomname{Nomenklatur}%
+ \def\nomAname{Romarske bokstavar}%
+ \def\nomGname{Greske bokstavar}%
+ \def\nomXname{Hevd skrift}%
+ \def\nomZname{Senka skrift}}
\DeclareOptionX{polish}{%
\def\eqdeclaration##1{, porownaj rownanie\nobreakspace(##1)}%
\def\pagedeclaration##1{, strona\nobreakspace##1}%
@@ -124,6 +141,14 @@
\cyri\cyrn\cyrd\cyre\cyrk\cyrs\cyrery}%
\def\nomZname{\CYRP\cyro\cyrd\cyrs\cyrt\cyrr\cyro\cyrch\cyrn\cyrery\cyre\
\cyri\cyrn\cyrd\cyre\cyrk\cyrs\cyrery}}
+\DeclareOptionX{slovene}{%
+ \def\eqdeclaration##1{, glej ena\v{c}bo\nobreakspace(##1)}%
+ \def\pagedeclaration##1{, stran\nobreakspace##1}%
+ \def\nomname{Seznam simbolov}%
+ \def\nomAname{Latinske \v{c}rke}%
+ \def\nomGname{Gr\v{s}ke \v{c}rke}%
+ \def\nomXname{Eksponenti}%
+ \def\nomZname{Indeksi}}
\DeclareOptionX{spanish}{%
\def\eqdeclaration##1{, v\'ease la ecuaci\'on\nobreakspace(##1)}%
\def\pagedeclaration##1{, p\'agina\nobreakspace##1}%
@@ -144,13 +169,20 @@
\def\nomXname{\CYRV\cyre\cyrr\cyrh\cyrn\cyrii\
\cyrii\cyrn\cyrd\cyre\cyrk\cyrs\cyri}%
\def\nomZname{\CYRII\cyrn\cyrd\cyre\cyrk\cyrs\cyri}}
-\ExecuteOptionsX{noncompatible,notintoc,norefeq,norefpage,prefix,cfg,english,nostdsubgroups}
+\ExecuteOptionsX{noncompatible,notintoc,norefeq,norefpage,prefix,cfg,english,nostdsubgroups,tocbasic}
\ProcessOptionsX\relax
\if@nomentbl
\RequirePackage{array,longtable, siunitx}
\fi
+\if@nomencl@tocbasic
+ \RequirePackage{tocbasic}
+ \addtotoclist[nomencl]{nlo}
+ \addtotoclist[nomencl]{nls}
+\fi
\if@intoc
-\setuptoc{nls}{totoc}
+ \if@nomencl@tocbasic
+ \setuptoc{nls}{totoc}
+ \fi
\fi
\if@compatibilitymode%
\def\@outputfileextension{.glo}%
@@ -251,9 +283,22 @@
\setnomtableformat{lp{0.45\textwidth}sp{0.3\textwidth}@{}l}
\def\thenomenclature{%
\providecommand*{\listofnlsname}{\nomname}%
- \let\list@fname\listofnlsname
- \def\@currext{nls}%
- \tocbasic@listhead{\list@fname}%
+ \if@nomencl@tocbasic
+ \let\list@fname\listofnlsname
+ \def\@currext{nls}%
+ \tocbasic@listhead{\list@fname}%
+ \else
+ \@ifundefined{chapter}%
+ {
+ \section*{\nomname}
+ \if@intoc\addcontentsline{toc}{section}{\nomname}\fi%
+ }%
+ {
+ \chapter*{\nomname}
+ \@mkboth{\nomname}{\nomname}%
+ \if@intoc\addcontentsline{toc}{chapter}{\nomname}\fi%
+ }%
+ \fi
\nompreamble
\if@nomentbl
\let\itemOrig=\item
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/nomencl.tlpobj new/tlpkg/tlpobj/nomencl.tlpobj
--- old/tlpkg/tlpobj/nomencl.tlpobj 2019-02-28 03:56:20.000000000 +0100
+++ new/tlpkg/tlpobj/nomencl.tlpobj 2020-03-04 23:53:05.000000000 +0100
@@ -1,6 +1,6 @@
name nomencl
category Package
-revision 49987
+revision 54080
shortdesc Produce lists of symbols as in nomenclature
relocated 1
longdesc Produces lists of symbols using the capabilities of the
@@ -13,7 +13,6 @@
catalogue-contact-home https://github.com/borisveytsman/nomencl
catalogue-contact-repository https://github.com/borisveytsman/nomencl
catalogue-ctan /macros/latex/contrib/nomencl
-catalogue-date 2019-02-09 07:47:28 +0100
catalogue-license lppl
catalogue-topics glossary
-catalogue-version 5.1
+catalogue-version 5.4
++++++ notes2bib.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/notes2bib/README new/doc/latex/notes2bib/README
--- old/doc/latex/notes2bib/README 2013-07-12 01:22:25.000000000 +0200
+++ new/doc/latex/notes2bib/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-notes2bib - Integrating notes into the bibliography
-===================================================
-
-The `notes2bib` package defines a new type of note, bibnote,
-which will always be added to the bibliography. The package
-allows footnotes and endnotes to be moved into the bibliography
-in the same way. The package can be used with natbib and
-biblatex as well as plain LaTeX citations. Both sorted and
-unsorted bibliography styles are supported.
-
-Installation
-------------
-
-The package is supplied in `.dtx` format and as a pre-extracted
-`.zip` file, `notes2bib.tds.zip`. The later is most convenient
-for most users: simply unzip this in your local `texmf`
-directory. If you want to unpack the `.dtx` yourself, running
-`tex notes2bib.dtx` will extract the package whereas `latex
-notes2bib.dtx` will extract it and also typeset the
-documentation.
-
-The package requires LaTeX3 support as provided in the
-`l3kernel` and `l3packages` bundles. Both of these are available
-on [CTAN](http://www.ctan.org/) as ready-to-install `.zip`
-files. Suitable versions are available in MiKTeX 2.9 and TeX
-Live 2012 (updating the relevant packages online may be
-necessary). LaTeX3, and so `notes2bib`, requires the e-TeX
-extensions: these are available on all modern TeX systems.
-
-Typesetting the documentation requires a number of packages in
-addition to those needed to use the package. This is mainly
-because of the number of demonstration items included in the
-text. To compile the documentation without error, you will
-need the packages:
- - `csquotes`
- - `helvet`
- - `mathpazo`
- - `listings`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/notes2bib/README.md new/doc/latex/notes2bib/README.md
--- old/doc/latex/notes2bib/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/notes2bib/README.md 2019-09-30 23:52:12.000000000 +0200
@@ -0,0 +1,38 @@
+notes2bib - Integrating notes into the bibliography
+===================================================
+
+The `notes2bib` package defines a new type of note, bibnote,
+which will always be added to the bibliography. The package
+allows footnotes and endnotes to be moved into the bibliography
+in the same way. The package can be used with natbib and
+biblatex as well as plain LaTeX citations. Both sorted and
+unsorted bibliography styles are supported.
+
+Installation
+------------
+
+The package is supplied in `.dtx` format and as a pre-extracted
+`.zip` file, `notes2bib.tds.zip`. The later is most convenient
+for most users: simply unzip this in your local `texmf`
+directory. If you want to unpack the `.dtx` yourself, running
+`tex notes2bib.dtx` will extract the package whereas `latex
+notes2bib.dtx` will extract it and also typeset the
+documentation.
+
+The package requires LaTeX3 support as provided in the
+`l3kernel` and `l3packages` bundles. Both of these are available
+on [CTAN](http://www.ctan.org/) as ready-to-install `.zip`
+files. Suitable versions are available in MiKTeX 2.9 and TeX
+Live 2012 (updating the relevant packages online may be
+necessary). LaTeX3, and so `notes2bib`, requires the e-TeX
+extensions: these are available on all modern TeX systems.
+
+Typesetting the documentation requires a number of packages in
+addition to those needed to use the package. This is mainly
+because of the number of demonstration items included in the
+text. To compile the documentation without error, you will
+need the packages:
+ - `csquotes`
+ - `helvet`
+ - `mathpazo`
+ - `listings`
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/notes2bib/README.txt new/doc/latex/notes2bib/README.txt
--- old/doc/latex/notes2bib/README.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/notes2bib/README.txt 2019-09-30 23:52:12.000000000 +0200
@@ -0,0 +1,39 @@
+notes2bib - Integrating notes into the bibliography
+===================================================
+
+The `notes2bib` package defines a new type of note, bibnote,
+which will always be added to the bibliography. The package
+allows footnotes and endnotes to be moved into the bibliography
+in the same way. The package can be used with natbib and
+biblatex as well as plain LaTeX citations. Both sorted and
+unsorted bibliography styles are supported.
+
+Installation
+------------
+
+The package is supplied in `.dtx` format and as a pre-extracted
+`.zip` file, `notes2bib.tds.zip`. The later is most convenient
+for most users: simply unzip this in your local `texmf`
+directory. If you want to unpack the `.dtx` yourself, running
+`tex notes2bib.dtx` will extract the package whereas `latex
+notes2bib.dtx` will extract it and also typeset the
+documentation.
+
+The package requires LaTeX3 support as provided in the
+`l3kernel` and `l3packages` bundles. Both of these are available
+on [CTAN](http://www.ctan.org/) as ready-to-install `.zip`
+files. Suitable versions are available in MiKTeX 2.9 and TeX
+Live 2012 (updating the relevant packages online may be
+necessary). LaTeX3, and so `notes2bib`, requires the e-TeX
+extensions: these are available on all modern TeX systems.
+
+Typesetting the documentation requires a number of packages in
+addition to those needed to use the package. This is mainly
+because of the number of demonstration items included in the
+text. To compile the documentation without error, you will
+need the packages:
+ - `csquotes`
+ - `helvet`
+ - `mathpazo`
+ - `listings`
+ %\section{Introduction}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/notes2bib/notes2bib-notes2bib.bib new/doc/latex/notes2bib/notes2bib-notes2bib.bib
--- old/doc/latex/notes2bib/notes2bib-notes2bib.bib 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/notes2bib/notes2bib-notes2bib.bib 2019-09-30 23:52:12.000000000 +0200
@@ -0,0 +1,40 @@
+% This is an auxiliary file used by the 'notes2bib' package.
+% This file may safely be deleted.
+% It will be recreated as required.
+
+@misc{Note1,
+ note = {Note for the first example},
+ key = {Note1},
+ keywords = {note},
+ presort = {mm},
+}
+
+@misc{labelled,
+ note = {Note for the second example},
+ key = {labelled},
+ keywords = {note},
+ presort = {mm},
+}
+
+@misc{Note2,
+ note = {Some \texttt {\textbackslash verb}-like output},
+ key = {Note2},
+ keywords = {note},
+ presort = {mm},
+}
+
+@misc{Note3,
+ note = {Text for the fourth example},
+ key = {Note3},
+ keywords = {note},
+ presort = {mm},
+}
+
+@misc{named,
+ note = {More text for the fourth example},
+ key = {named},
+ keywords = {note},
+ presort = {mm},
+}
+
+
Binary files old/doc/latex/notes2bib/notes2bib.pdf and new/doc/latex/notes2bib/notes2bib.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/notes2bib.doc.tlpobj new/tlpkg/tlpobj/notes2bib.doc.tlpobj
--- old/tlpkg/tlpobj/notes2bib.doc.tlpobj 2019-02-28 03:56:23.000000000 +0100
+++ new/tlpkg/tlpobj/notes2bib.doc.tlpobj 2019-10-01 02:22:27.000000000 +0200
@@ -1,8 +1,10 @@
name notes2bib.doc
category Package
-revision 31162
+revision 52231
shortdesc doc files of notes2bib
relocated 1
-docfiles size=50
- RELOC/doc/latex/notes2bib/README
+docfiles size=62
+ RELOC/doc/latex/notes2bib/README.md
+ RELOC/doc/latex/notes2bib/README.txt
+ RELOC/doc/latex/notes2bib/notes2bib-notes2bib.bib
RELOC/doc/latex/notes2bib/notes2bib.pdf
++++++ notes2bib.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/notes2bib/notes2bib.sty new/tex/latex/notes2bib/notes2bib.sty
--- old/tex/latex/notes2bib/notes2bib.sty 2013-07-12 01:22:25.000000000 +0200
+++ new/tex/latex/notes2bib/notes2bib.sty 2019-09-30 23:52:12.000000000 +0200
@@ -14,22 +14,22 @@
%% ---------------------------------------------------------------
%%
\RequirePackage{xparse}
-\ProvidesExplPackage
- {notes2bib} {2013/07/11} {2.0k}
+ %\section{Introduction}
+\ProvidesExplPackage {notes2bib} {2019-09-28} {2.0m}
{Integrating notes into the bibliography}
\RequirePackage{l3keys2e}
-\tl_new:N \c__notestobib_file_message_tl
-\tl_set:Nn \c__notestobib_file_message_tl {
- \iow_char:N \% ~
- This~is~an~auxiliary~file~used~by~the~'notes2bib'~package.
- \iow_newline:
- \iow_char:N \% ~
- This~file~may~safely~be~deleted.
- \iow_newline:
- \iow_char:N \% ~
- It~will~be~recreated~as~required.
- \iow_newline:
-}
+\tl_const:Nn \c__notestobib_file_message_tl
+ {
+ \iow_char:N \% ~
+ This~is~an~auxiliary~file~used~by~the~'notes2bib'~package.
+ \iow_newline:
+ \iow_char:N \% ~
+ This~file~may~safely~be~deleted.
+ \iow_newline:
+ \iow_char:N \% ~
+ It~will~be~recreated~as~required.
+ \iow_newline:
+ }
\clist_new:N \g__notestobib_after_clist
\clist_new:N \g__notestobib_before_clist
\clist_new:N \g__notestobib_all_after_clist
@@ -43,476 +43,492 @@
\tl_new:N \g__notestobib_notes_tl
\tl_new:N \l__notestobib_sortkey_field_tl
\int_new:N \g__notestobib_total_notes_int
-\cs_new_nopar:Npn \__notestobib_cite:w { }
-\keys_define:nn { notes2bib } {
- cite-function .code:n =
- { \AtBeginDocument { \cs_set_eq:NN \__notestobib_cite:w #1 } } ,
- file-name .tl_gset_x:N = \g__notestobib_filename_tl ,
- convert-endnotes .choice: ,
- convert-endnotes
- / false .code:n =
- { \AtBeginDocument { \__notestobib_from_bibnote:n { endnote } } } ,
- convert-endnotes
- / true .code:n =
- { \AtBeginDocument { \__notestobib_to_bibnote:n { endnote } } } ,
- convert-footnotes .choice: ,
- convert-footnotes
- / false .code:n =
- { \AtBeginDocument { \__notestobib_from_bibnote:n { footnote } } } ,
- convert-footnotes
- / true .code:n =
- { \AtBeginDocument { \__notestobib_to_bibnote:n { footnote } } } ,
- keyword-entry .tl_set:N = \l__notestobib_keyword_tl ,
- note-field .tl_set:N = \l__notestobib_note_field_tl ,
- note-name .tl_set:N = \l__notestobib_note_name_tl ,
- placement .choice: ,
- placement
- / after .code:n =
- {
- \cs_set_eq:NN \__notestobib_mark_note:n \__notestobib_mark_note_after:n
- \tl_set_eq:NN \l__notestobib_presort_tl \l__notestobib_presort_after_tl
- \tl_set_eq:NN \l__notestobib_sortkey_tl \l__notestobib_sortkey_after_tl
- },
- placement
- / before .code:n =
- {
- \cs_set_eq:NN \__notestobib_mark_note:n \__notestobib_mark_note_before:n
- \tl_set_eq:NN \l__notestobib_presort_tl \l__notestobib_presort_before_tl
- \tl_set_eq:NN \l__notestobib_sortkey_tl \l__notestobib_sortkey_before_tl
- },
- placement
- / mixed .code:n =
- {
- \cs_set_eq:NN \__notestobib_mark_note:n \__notestobib_mark_note_mixed:n
- \tl_set_eq:NN \l__notestobib_presort_tl \l__notestobib_presort_mixed_tl
- \tl_set_eq:NN \l__notestobib_sortkey_tl \l__notestobib_sortkey_mixed_tl
- },
- presort-after .tl_set:N = \l__notestobib_presort_after_tl ,
- presort-before .tl_set:N = \l__notestobib_presort_before_tl ,
- presort-mixed .tl_set:N = \l__notestobib_presort_mixed_tl ,
- record-type .tl_set:N = \l__notestobib_record_type_tl ,
- refsection-name .tl_set:N = \l__notestobib_refsection_name_tl ,
- refsection-separator .tl_set:N = \l__notestobib_refsection_sep_tl ,
- sort-key-after .tl_set:N = \l__notestobib_sortkey_before_tl ,
- sort-key-before .tl_set:N = \l__notestobib_sortkey_after_tl ,
- sort-key-mixed .tl_set:N = \l__notestobib_sortkey_mixed_tl ,
- use-sort-key .bool_set:N = \l__notestobib_write_sortkey_bool ,
-}
-\keys_set:nn { notes2bib } {
- cite-function = \cite ,
- file-name = notes2bib-\jobname ,
- keyword-entry = note ,
- note-field = note ,
- note-name = Note ,
- presort-after = mn ,
- presort-before = ml ,
- presort-mixed = mm ,
- record-type = misc ,
- refsection-name = Refsection ,
- refsection-separator = - ,
- sort-key-after = zzz ,
- sort-key-before = aaa ,
- use-sort-key = true
-}
-\AtBeginDocument {
- \@ifpackageloaded { biblatex }
- {
- \@ifpackagelater { biblatex } { 2011/01/08 }
- {
- \keys_set:nn { notes2bib }
- { record-type = bibnote }
- \DeclareBibliographyDriver { bibnote }
- {
- \usebibmacro { begentry }
- \printfield { note }
- \setunit { \bibpagerefpunct }
- \newblock
- \usebibmacro { pageref }
- \usebibmacro { finentry }
- }
- }
- { }
- }
- { }
- \keys_define:nn { notes2bib }
- {
- cite-function .code:n =
- { \cs_set_eq:NN \__notestobib_cite:w #1 } ,
- file-name .code:n =
- { \msg_info:nnn { notes2bib } { preamble-only } { file-name } },
- convert-endnotes / false .code:n =
- { \__notestobib_from_bibnote:n { endnote } } ,
- convert-endnotes / true .code:n =
- { \__notestobib_to_bibnote:n { endnote } } ,
- convert-footnotes / false .code:n =
- { \__notestobib_from_bibnote:n { footnote } } ,
- convert-footnotes / true .code:n =
- { \__notestobib_to_bibnote:n { footnote } } ,
- }
+\cs_new:Npn \__notestobib_cite:w { }
+\keys_define:nn { notes2bib }
+ {
+ cite-function .code:n =
+ { \AtBeginDocument { \cs_set_eq:NN \__notestobib_cite:w #1 } } ,
+ file-name .tl_gset_x:N = \g__notestobib_filename_tl ,
+ convert-endnotes .choice: ,
+ convert-endnotes
+ / false .code:n =
+ { \AtBeginDocument { \__notestobib_from_bibnote:n { endnote } } } ,
+ convert-endnotes
+ / true .code:n =
+ { \AtBeginDocument { \__notestobib_to_bibnote:n { endnote } } } ,
+ convert-footnotes .choice: ,
+ convert-footnotes
+ / false .code:n =
+ { \AtBeginDocument { \__notestobib_from_bibnote:n { footnote } } } ,
+ convert-footnotes
+ / true .code:n =
+ { \AtBeginDocument { \__notestobib_to_bibnote:n { footnote } } } ,
+ keyword-entry .tl_set:N = \l__notestobib_keyword_tl ,
+ note-field .tl_set:N = \l__notestobib_note_field_tl ,
+ note-name .tl_set:N = \l__notestobib_note_name_tl ,
+ placement .choice: ,
+ placement
+ / after .code:n =
+ {
+ \cs_set_eq:NN \__notestobib_mark_note:n \__notestobib_mark_note_after:n
+ \tl_set_eq:NN \l__notestobib_presort_tl \l__notestobib_presort_after_tl
+ \tl_set_eq:NN \l__notestobib_sortkey_tl \l__notestobib_sortkey_after_tl
+ },
+ placement
+ / before .code:n =
+ {
+ \cs_set_eq:NN \__notestobib_mark_note:n \__notestobib_mark_note_before:n
+ \tl_set_eq:NN \l__notestobib_presort_tl \l__notestobib_presort_before_tl
+ \tl_set_eq:NN \l__notestobib_sortkey_tl \l__notestobib_sortkey_before_tl
+ },
+ placement
+ / mixed .code:n =
+ {
+ \cs_set_eq:NN \__notestobib_mark_note:n \__notestobib_mark_note_mixed:n
+ \tl_set_eq:NN \l__notestobib_presort_tl \l__notestobib_presort_mixed_tl
+ \tl_set_eq:NN \l__notestobib_sortkey_tl \l__notestobib_sortkey_mixed_tl
+ },
+ presort-after .tl_set:N = \l__notestobib_presort_after_tl ,
+ presort-before .tl_set:N = \l__notestobib_presort_before_tl ,
+ presort-mixed .tl_set:N = \l__notestobib_presort_mixed_tl ,
+ record-type .tl_set:N = \l__notestobib_record_type_tl ,
+ refsection-name .tl_set:N = \l__notestobib_refsection_name_tl ,
+ refsection-separator .tl_set:N = \l__notestobib_refsection_sep_tl ,
+ sort-key-after .tl_set:N = \l__notestobib_sortkey_before_tl ,
+ sort-key-before .tl_set:N = \l__notestobib_sortkey_after_tl ,
+ sort-key-mixed .tl_set:N = \l__notestobib_sortkey_mixed_tl ,
+ use-sort-key .bool_set:N = \l__notestobib_write_sortkey_bool
+ }
+\keys_set:nn { notes2bib }
+ {
+ cite-function = \cite ,
+ file-name = notes2bib-\jobname ,
+ keyword-entry = note ,
+ note-field = note ,
+ note-name = Note ,
+ presort-after = mn ,
+ presort-before = ml ,
+ presort-mixed = mm ,
+ record-type = misc ,
+ refsection-name = Refsection ,
+ refsection-separator = - ,
+ sort-key-after = zzz ,
+ sort-key-before = aaa ,
+ use-sort-key = true
}
+\AtBeginDocument
+ {
+ \@ifpackageloaded { biblatex }
+ {
+ \@ifpackagelater { biblatex } { 2011/01/08 }
+ {
+ \keys_set:nn { notes2bib } { record-type = bibnote }
+ \DeclareBibliographyDriver { bibnote }
+ {
+ \usebibmacro { begentry }
+ \printfield { note }
+ \setunit { \bibpagerefpunct }
+ \newblock
+ \usebibmacro { pageref }
+ \usebibmacro { finentry }
+ }
+ }
+ { }
+ }
+ { }
+ \keys_define:nn { notes2bib }
+ {
+ cite-function .code:n =
+ { \cs_set_eq:NN \__notestobib_cite:w #1 } ,
+ file-name .code:n =
+ { \msg_info:nnn { notes2bib } { preamble-only } { file-name } } ,
+ convert-endnotes / false .code:n =
+ { \__notestobib_from_bibnote:n { endnote } } ,
+ convert-endnotes / true .code:n =
+ { \__notestobib_to_bibnote:n { endnote } } ,
+ convert-footnotes / false .code:n =
+ { \__notestobib_from_bibnote:n { footnote } } ,
+ convert-footnotes / true .code:n =
+ { \__notestobib_to_bibnote:n { footnote } }
+ }
+ }
\msg_new:nnn { notes2bib } { preamble-only }
{ The~option~'#1'~can~only~be~used~in~the~preamble. }
-\cs_new_nopar:Npn \__notestobib_insert_refsection: { }
-\AtBeginDocument {
- \@ifpackageloaded { biblatex }
- {
- \cs_set_nopar:Npn \__notestobib_insert_refsection:
- {
- \int_compare:nNnT { \value { refsection } } > { 0 }
- {
- \tl_use:N \l__notestobib_refsection_name_tl
- \arabic { refsection }
- \tl_use:N \l__notestobib_refsection_sep_tl
+\cs_new:Npn \__notestobib_insert_refsection: { }
+\AtBeginDocument
+ {
+ \@ifpackageloaded { biblatex }
+ {
+ \cs_set:Npn \__notestobib_insert_refsection:
+ {
+ \int_compare:nNnT { \value { refsection } } > { 0 }
+ {
+ \tl_use:N \l__notestobib_refsection_name_tl
+ \arabic { refsection }
+ \tl_use:N \l__notestobib_refsection_sep_tl
}
- }
- }
- { }
-}
-\keys_define:nn { notes2bib } {
- cite .code:n =
- {
- \use:x
- { \keys_set:nn { notes2bib } { cite-function = \exp_not:c {#1} } }
- } ,
- debug .code:n = { } ,
- endnotes .meta:n = { convert-footnotes = #1 } ,
- etex .code:n = { } ,
- field .meta:n = { note-field = #1 } ,
- footnotes .meta:n = { convert-footnotes = #1 } ,
- head .meta:n = { placement = before } ,
- keyhead .meta:n = { sort-key-before = #1 } ,
- keytail .meta:n = { sort-key-after = #1 } ,
- keynone .meta:n = { sort-key-mixed = #1 } ,
- keyword .meta:n = { keyword-entry = #1 } ,
- log .meta:n = { } ,
- name .meta:n = { note-name = #1 } ,
- prefix .meta:n = { file-name = #1 \jobname } ,
- presorthead .meta:n = { presort-before = #1 } ,
- presorttail .meta:n = { presort-after = #1 } ,
- presortnone .meta:n = { presort-mixed = #1 } ,
- record .meta:n = { record-type = #1 } ,
- sort .choice: ,
- sort / head .meta:n = { placement = before } ,
- sort / none .meta:n = { placement = after } ,
- sort / tail .meta:n = { placement = mixed } ,
- tail .meta:n = { placement = after } ,
- writekey .meta:n = { use-sort-key = #1 }
-}
-\cs_new_nopar:Npn \__notestobib_note_name: {
- \__notestobib_insert_refsection:
- \tl_use:N \l__notestobib_note_name_tl
- \int_compare:nNnT \g__notestobib_previous_notes_int > \c_nine
- { \int_compare:nNnT \g__notestobib_note_int < \c_ten { 0 } }
- \int_to_arabic:n { \g__notestobib_note_int }
-}
-\cs_new_nopar:Npn \__notestobib_filesw: { }
-\cs_new:Npn \__notestobib_mark_note:n #1 { }
+ }
+ }
+ { }
+ }
+\keys_define:nn { notes2bib }
+ {
+ cite .code:n =
+ {
+ \use:x
+ { \keys_set:nn { notes2bib } { cite-function = \exp_not:c {#1} } }
+ } ,
+ debug .code:n = { } ,
+ endnotes .meta:n = { convert-footnotes = #1 } ,
+ etex .code:n = { } ,
+ field .meta:n = { note-field = #1 } ,
+ footnotes .meta:n = { convert-footnotes = #1 } ,
+ head .meta:n = { placement = before } ,
+ keyhead .meta:n = { sort-key-before = #1 } ,
+ keytail .meta:n = { sort-key-after = #1 } ,
+ keynone .meta:n = { sort-key-mixed = #1 } ,
+ keyword .meta:n = { keyword-entry = #1 } ,
+ log .meta:n = { } ,
+ name .meta:n = { note-name = #1 } ,
+ prefix .meta:n = { file-name = #1 \jobname } ,
+ presorthead .meta:n = { presort-before = #1 } ,
+ presorttail .meta:n = { presort-after = #1 } ,
+ presortnone .meta:n = { presort-mixed = #1 } ,
+ record .meta:n = { record-type = #1 } ,
+ sort .choice: ,
+ sort / head .meta:n = { placement = before } ,
+ sort / none .meta:n = { placement = after } ,
+ sort / tail .meta:n = { placement = mixed } ,
+ tail .meta:n = { placement = after } ,
+ writekey .meta:n = { use-sort-key = #1 }
+ }
+\cs_new:Npn \__notestobib_note_name:
+ {
+ \__notestobib_insert_refsection:
+ \tl_use:N \l__notestobib_note_name_tl
+ \int_compare:nNnT \g__notestobib_previous_notes_int > 9
+ { \int_compare:nNnT \g__notestobib_note_int < { 10 } { 0 } }
+ \int_to_arabic:n { \g__notestobib_note_int }
+ }
+\cs_new_eq:NN \__notestobib_filesw: \tex_iftrue:D
+\cs_new_protected:Npn \__notestobib_mark_note:n #1 { }
\cs_generate_variant:Nn \__notestobib_mark_note:n { x }
-\cs_new_protected:Npn \__notestobib_mark_note_after:n #1 {
- \int_gincr:N \g__notestobib_total_notes_int
- \clist_gput_right:Nx \g__notestobib_after_clist {#1}
- \__notestobib_mark_note_after_aux:n {#1}
-}
-\cs_new:Npn \__notestobib_mark_note_after_aux:n #1 { }
-\cs_new_protected:Npn \__notestobib_mark_note_before:n #1 {
- \int_gincr:N \g__notestobib_total_notes_int
- \clist_gput_right:Nx \g__notestobib_before_clist {#1}
- \__notestobib_cite:w {#1}
-}
-\cs_new_protected:Npn \__notestobib_mark_note_mixed:n #1 {
- \int_gincr:N \g__notestobib_total_notes_int
- \__notestobib_cite:w {#1}
-}
-\cs_new:Npn \__notestobib_write_field:nn #1#2 {
- \c_space_tl \c_space_tl #1 \c_space_tl = \c_space_tl {#2} ,
- \iow_newline:
-}
+\cs_new_protected:Npn \__notestobib_mark_note_after:n #1
+ {
+ \int_gincr:N \g__notestobib_total_notes_int
+ \clist_gput_right:Nx \g__notestobib_after_clist {#1}
+ \__notestobib_mark_note_after_aux:n {#1}
+ }
+\cs_new_protected:Npn \__notestobib_mark_note_after_aux:n #1 { }
+\cs_new_protected:Npn \__notestobib_mark_note_before:n #1
+ {
+ \int_gincr:N \g__notestobib_total_notes_int
+ \clist_gput_right:Nx \g__notestobib_before_clist {#1}
+ \__notestobib_cite:w {#1}
+ }
+\cs_new_protected:Npn \__notestobib_mark_note_mixed:n #1
+ {
+ \int_gincr:N \g__notestobib_total_notes_int
+ \__notestobib_cite:w {#1}
+ }
+\cs_new:Npn \__notestobib_write_field:nn #1#2
+ {
+ \c_space_tl \c_space_tl #1 \c_space_tl = \c_space_tl {#2} ,
+ \iow_newline:
+ }
\cs_generate_variant:Nn \__notestobib_write_field:nn { V }
-\cs_new_protected_nopar:Npn \__notestobib_write_note:nn {
- \if@filesw
- \exp_after:wN \__notestobib_write_note_aux:nn
- \else:
- \exp_after:wN \use_none:nn
- \fi:
-}
-\cs_new_protected:Npn \__notestobib_write_note_aux:nn #1#2 {
- \tl_gput_right:Nx \g__notestobib_notes_tl
- {
- @ \l__notestobib_record_type_tl
- {
- #1 , \iow_newline:
- \__notestobib_write_field:Vn \l__notestobib_note_field_tl { \exp_not:n {#2} }
- \bool_if:NT \l__notestobib_write_sortkey_bool
- {
- \__notestobib_write_field:Vn \l__notestobib_sortkey_field_tl
- { \l__notestobib_sortkey_tl #1 }
- }
- \__notestobib_write_field:nn { keywords } { \l__notestobib_keyword_tl }
- \__notestobib_write_field:nn { presort } { \l__notestobib_presort_tl }
- }
- \iow_newline:
- \iow_newline:
- }
-}
-\cs_generate_variant:Nn \__notestobib_write_note:nn { x }
-\cs_new_protected_nopar:Npn \__notestobib_record_notes: {
- \if@filesw
- \exp_after:wN \__notestobib_flush_notes_aux:
- \fi
-}
-\cs_new_protected_nopar:Npn \__notestobib_flush_notes_aux: {
- \clist_if_empty:NF \g__notestobib_before_clist
- {
- \iow_now:Nx \@auxout
- { \NotesBeforeCitations { \exp_not:V \g__notestobib_before_clist } }
- \clist_gput_right:NV \g__notestobib_all_before_clist \g__notestobib_before_clist
- \clist_gclear:N \g__notestobib_before_clist
- }
- \clist_if_empty:NF \g__notestobib_after_clist
- {
- \iow_now:Nx \@auxout
- { \NotesAfterCitations { \exp_not:V \g__notestobib_after_clist } }
- \exp_args:NV \nocite \g__notestobib_after_clist
- \clist_gput_right:NV \g__notestobib_all_after_clist \g__notestobib_after_clist
- \clist_gclear:N \g__notestobib_after_clist
- }
-}
-\cs_new_protected_nopar:Npn \__notestobib_to_bibnote:n #1 {
- \cs_set_eq:cN {#1} \bibnote
- \cs_set_eq:cN { #1 mark } \bibnotemark
- \cs_set_eq:cN { #1 text } \bibnotetext
-}
-\cs_new_protected_nopar:Npn \__notestobib_from_bibnote:n #1 {
- \cs_set_eq:cc {#1} { __notestobib_ #1 :w }
- \cs_set_eq:cc { #1 mark } { __notestobib_ #1 mark:w }
- \cs_set_eq:cc { #1 text } { __notestobib_ #1 text:w }
-}
-\AtBeginDocument {
- \cs_set_eq:NN \__notestobib_endnote:w \endnote
- \cs_set_eq:NN \__notestobib_endnotemark:w \endnotemark
- \cs_set_eq:NN \__notestobib_endnotetext:w \endnotetext
- \cs_set_eq:NN \__notestobib_footnote:w \footnote
- \cs_set_eq:NN \__notestobib_footnotemark:w \footnotemark
- \cs_set_eq:NN \__notestobib_footnotetext:w \footnotetext
-}
-\AtBeginDocument {
- \@ifpackageloaded { biblatex }
- {
- \cs_new_protected_nopar:Npn \__notestobib_print_notes:
- {
- \cs_set_nopar:Npx \__notestobib_create_print_notes:
- {
- \printbibliography
- [ keyword = \exp_not:V \l__notestobib_keyword_tl ]
- }
- \__notestobib_create_print_notes:
- }
- }
- {
- \cs_new_protected_nopar:Npn \__notestobib_print_notes:
- { \exp_args:NV \__notestobib_bibliography:n \g__notestobib_filename_tl }
- }
-}
-\cs_new_nopar:Npn \__notestobib_create_print_notes: { }
-\cs_new_nopar:Npn \__notestobib_attach_bibliography: {
- \@ifpackageloaded { biblatex }
- {
- \@ifpackagelater { biblatex } { 2011/01/08 }
- {
- \@ifpackagelater { biblatex } { 2011/02/12 }
- {
+\cs_new_protected:Npn \notestobib_write_note:nn
+ {
+ \if@filesw
+ \exp_after:wN \__notestobib_write_note:nn
+ \else:
+ \exp_after:wN \use_none:nn
+ \fi:
+ }
+\cs_generate_variant:Nn \notestobib_write_note:nn { x }
+\cs_new_protected:Npn \__notestobib_write_note:nn #1#2
+ {
+ \tl_gput_right:Nx \g__notestobib_notes_tl
+ {
+ @ \l__notestobib_record_type_tl
+ {
+ #1 , \iow_newline:
+ \__notestobib_write_field:Vn \l__notestobib_note_field_tl { \exp_not:n {#2} }
+ \bool_if:NT \l__notestobib_write_sortkey_bool
+ {
+ \__notestobib_write_field:Vn \l__notestobib_sortkey_field_tl
+ { \l__notestobib_sortkey_tl #1 }
+ }
+ \__notestobib_write_field:nn { keywords } { \l__notestobib_keyword_tl }
+ \__notestobib_write_field:nn { presort } { \l__notestobib_presort_tl }
+ }
+ \iow_newline:
+ \iow_newline:
+ }
+ }
- \exp_args:No \addglobalbib
- { \g__notestobib_filename_tl .bib }
- }
- { \exp_args:NNV \bibliography * \g__notestobib_filename_tl }
- }
- { \exp_args:NV \bibliography \g__notestobib_filename_tl }
- }
- {
- \cs_new_eq:NN \__notestobib_bibliography:n \bibliography
- \RenewDocumentCommand \bibliography { m }
- {
- \int_compare:nNnTF \g__notestobib_total_notes_int = \c_zero
- { \__notestobib_bibliography:n {##1} }
- {
- \cs_set_nopar:Npx \__notestobib_attach_bibliography:
- {
- \exp_not:N \__notestobib_bibliography:n
- {
- \exp_not:n {##1} , \exp_not:V \g__notestobib_filename_tl
- }
- }
- \__notestobib_attach_bibliography:
- }
- }
- }
-}
+\cs_new_protected:Npn \__notestobib_record_notes:
+ {
+ \if@filesw
+ \exp_after:wN \__notestobib_flush_notes_aux:
+ \fi
+ }
+\cs_new_protected:Npn \__notestobib_flush_notes_aux:
+ {
+ \clist_if_empty:NF \g__notestobib_before_clist
+ {
+ \iow_now:Nx \@auxout
+ { \NotesBeforeCitations { \exp_not:V \g__notestobib_before_clist } }
+ \clist_gput_right:NV \g__notestobib_all_before_clist \g__notestobib_before_clist
+ \clist_gclear:N \g__notestobib_before_clist
+ }
+ \clist_if_empty:NF \g__notestobib_after_clist
+ {
+ \iow_now:Nx \@auxout
+ { \NotesAfterCitations { \exp_not:V \g__notestobib_after_clist } }
+ \exp_args:NV \nocite \g__notestobib_after_clist
+ \clist_gput_right:NV \g__notestobib_all_after_clist \g__notestobib_after_clist
+ \clist_gclear:N \g__notestobib_after_clist
+ }
+ }
+\cs_new_protected:Npn \__notestobib_to_bibnote:n #1
+ {
+ \cs_set_eq:cN {#1} \bibnote
+ \cs_set_eq:cN { #1 mark } \bibnotemark
+ \cs_set_eq:cN { #1 text } \bibnotetext
+ }
+\cs_new_protected:Npn \__notestobib_from_bibnote:n #1
+ {
+ \cs_set_eq:cc {#1} { __notestobib_ #1 :w }
+ \cs_set_eq:cc { #1 mark } { __notestobib_ #1 mark:w }
+ \cs_set_eq:cc { #1 text } { __notestobib_ #1 text:w }
+ }
+\AtBeginDocument
+ {
+ \cs_new_eq:NN \__notestobib_endnote:w \endnote
+ \cs_new_eq:NN \__notestobib_endnotemark:w \endnotemark
+ \cs_new_eq:NN \__notestobib_endnotetext:w \endnotetext
+ \cs_new_eq:NN \__notestobib_footnote:w \footnote
+ \cs_new_eq:NN \__notestobib_footnotemark:w \footnotemark
+ \cs_new_eq:NN \__notestobib_footnotetext:w \footnotetext
+ }
+\AtBeginDocument
+ {
+ \@ifpackageloaded { biblatex }
+ {
+ \cs_new_protected:Npn \__notestobib_print_notes:
+ {
+ \cs_set:Npx \__notestobib_create_print_notes:
+ {
+ \printbibliography
+ [ keyword = \exp_not:V \l__notestobib_keyword_tl ]
+ }
+ \__notestobib_create_print_notes:
+ }
+ }
+ {
+ \cs_new_protected:Npn \__notestobib_print_notes:
+ { \exp_args:NV \__notestobib_bibliography:n \g__notestobib_filename_tl }
+ }
+ }
+\cs_new_protected:Npn \__notestobib_create_print_notes: { }
+\cs_new_protected:Npn \__notestobib_attach_bibliography:
+ {
+ \@ifpackageloaded { biblatex }
+ {
+ \@ifpackagelater { biblatex } { 2011/01/08 }
+ {
+ \@ifpackagelater { biblatex } { 2011/02/12 }
+ { \exp_args:No \addglobalbib { \g__notestobib_filename_tl .bib } }
+ { \exp_args:NNV \bibliography * \g__notestobib_filename_tl }
+ }
+ { \exp_args:NV \bibliography \g__notestobib_filename_tl }
+ }
+ {
+ \cs_new_eq:NN \__notestobib_bibliography:n \bibliography
+ \RenewDocumentCommand \bibliography { m }
+ {
+ \int_compare:nNnTF \g__notestobib_total_notes_int = 0
+ { \__notestobib_bibliography:n {##1} }
+ {
+ \cs_set:Npx \__notestobib_attach_bibliography:
+ {
+ \exp_not:N \__notestobib_bibliography:n
+ { \exp_not:n {##1} , \exp_not:V \g__notestobib_filename_tl }
+ }
+ \__notestobib_attach_bibliography:
+ }
+ }
+ }
+ }
\@ifpackageloaded { biblatex }
{
\@ifpackagelater { biblatex } { 2011/01/08 }
{
\@ifpackagelater { biblatex } { 2011/02/12 }
- {
-
- \exp_args:No \addglobalbib
- { \g__notestobib_filename_tl .bib }
- }
+ { \exp_args:No \addglobalbib { \g__notestobib_filename_tl .bib } }
{ \exp_args:NNV \bibliography * \g__notestobib_filename_tl }
}
{ \exp_args:NV \bibliography \g__notestobib_filename_tl }
}
{ \AtBeginDocument { \__notestobib_attach_bibliography: } }
-\AtBeginDocument {
- \@ifpackageloaded { biblatex }
- { \tl_set:Nn \l__notestobib_sortkey_field_tl { sortkey } }
- { \tl_set:Nn \l__notestobib_sortkey_field_tl { key } }
-}
-\AtBeginDocument {
- \@ifpackageloaded { biblatex }
- {
- \cs_set:Npn \__notestobib_mark_note_after_aux:n #1
- {
- \AtNextCite { \@fileswfalse }
- \__notestobib_cite:w {#1}
- }
- }
- {
- \cs_set:Npn \__notestobib_mark_note_after_aux:n #1
- {
- \cs_set_eq:NN \__notestobib_filesw: \if@filesw
- \@fileswfalse
- \__notestobib_cite:w {#1}
- \cs_set_eq:NN \if@filesw \__notestobib_filesw:
- }
- }
-}
-\AtBeginDocument {
- \@ifpackageloaded { cite }
- {
- \cs_set:Npn \__notestobib_mark_note_after_aux:n #1
- {
- \cs_set_eq:NN \__notestobib_filesw: \if@filesw
- \@fileswfalse
- \cs_set_nopar:Npn \__notestobib_aux_hook:
- {
- \cs_set_eq:NN \if@filesw \__notestobib_filesw:
- \cs_set_nopar:Npn \__notestobib_aux_hook: { }
- }
- \__notestobib_cite:w {#1}
- }
- \cs_new_nopar:Npn \__notestobib_aux_hook: { }
- \tl_gput_right:Nn \g__notestobib_document_hook_tl
- {
- \cs_if_exist:NF \@restore@auxhandle
- { \tl_new:N \@restore@auxhandle }
- \tl_put_right:Nn \@restore@auxhandle { \__notestobib_aux_hook: }
- }
- }
- { }
-}
-\NewDocumentCommand \bibnote { o +m } {
- \IfNoValueTF {#1}
- {
- \int_gincr:N \g__notestobib_note_int
- \__notestobib_bibnote:xn { \__notestobib_note_name: } {#2}
- }
- { \__notestobib_bibnote:xn { \__notestobib_insert_refsection: #1 } {#2} }
-}
-\cs_new_protected:Npn \__notestobib_bibnote:nn #1#2 {
- \__notestobib_write_note:nn {#1} {#2}
- \__notestobib_mark_note:n {#1}
-}
+\AtBeginDocument
+ {
+ \@ifpackageloaded { biblatex }
+ { \tl_set:Nn \l__notestobib_sortkey_field_tl { sortkey } }
+ { \tl_set:Nn \l__notestobib_sortkey_field_tl { key } }
+ }
+\AtBeginDocument
+ {
+ \@ifpackageloaded { biblatex }
+ {
+ \cs_set_protected:Npn \__notestobib_mark_note_after_aux:n #1
+ {
+ \AtNextCite { \@fileswfalse }
+ \__notestobib_cite:w {#1}
+ }
+ }
+ {
+ \cs_set_protected:Npn \__notestobib_mark_note_after_aux:n #1
+ {
+ \cs_set_eq:NN \__notestobib_filesw: \if@filesw
+ \@fileswfalse
+ \__notestobib_cite:w {#1}
+ \cs_set_eq:NN \if@filesw \__notestobib_filesw:
+ }
+ }
+ }
+\AtBeginDocument
+ {
+ \@ifpackageloaded { cite }
+ {
+ \cs_set_protected:Npn \__notestobib_mark_note_after_aux:n #1
+ {
+ \cs_set_eq:NN \__notestobib_filesw: \if@filesw
+ \@fileswfalse
+ \cs_set:Npn \__notestobib_aux_hook:
+ {
+ \cs_set_eq:NN \if@filesw \__notestobib_filesw:
+ \cs_set:Npn \__notestobib_aux_hook: { }
+ }
+ \__notestobib_cite:w {#1}
+ }
+ \cs_new:Npn \__notestobib_aux_hook: { }
+ \tl_gput_right:Nn \g__notestobib_document_hook_tl
+ {
+ \cs_if_exist:NF \@restore@auxhandle
+ { \tl_new:N \@restore@auxhandle }
+ \tl_put_right:Nn \@restore@auxhandle { \__notestobib_aux_hook: }
+ }
+ }
+ { }
+ }
+\NewDocumentCommand \bibnote { o +m }
+ {
+ \IfNoValueTF {#1}
+ {
+ \int_gincr:N \g__notestobib_note_int
+ \__notestobib_bibnote:xn { \__notestobib_note_name: } {#2}
+ }
+ { \__notestobib_bibnote:xn { \__notestobib_insert_refsection: #1 } {#2} }
+ }
+\cs_new_protected:Npn \__notestobib_bibnote:nn #1#2
+ {
+ \notestobib_write_note:nn {#1} {#2}
+ \__notestobib_mark_note:n {#1}
+ }
\cs_generate_variant:Nn \__notestobib_bibnote:nn { x }
-\NewDocumentCommand \bibnotemark { o } {
- \IfNoValueTF {#1}
- {
- \int_gincr:N \g__notestobib_note_int
- \__notestobib_mark_note:x { \__notestobib_note_name: }
- }
- { \__notestobib_mark_note:x { \__notestobib_insert_refsection: #1 } }
-}
-\NewDocumentCommand \bibnotetext { o +m } {
- \IfNoValueTF {#1}
- { \__notestobib_write_note:xn { \__notestobib_note_name: } {#2} }
- { \__notestobib_write_note:xn { \__notestobib_insert_refsection: #1 } {#2} }
-}
-\NewDocumentCommand \recordnotes { } {
- \__notestobib_record_notes:
-}
-\NewDocumentCommand \bibnotesetup { m } {
- \keys_set:nn { notes2bib } {#1}
-}
-\NewDocumentCommand \printbibnotes { } {
- \__notestobib_print_notes:
-}
-\NewDocumentCommand \citenote { m } {
- \__notestobib_mark_note:n {#1}
-}
+\NewDocumentCommand \bibnotemark { o }
+ {
+ \IfNoValueTF {#1}
+ {
+ \int_gincr:N \g__notestobib_note_int
+ \__notestobib_mark_note:x { \__notestobib_note_name: }
+ }
+ { \__notestobib_mark_note:x { \__notestobib_insert_refsection: #1 } }
+ }
+\NewDocumentCommand \bibnotetext { o +m }
+ {
+ \IfNoValueTF {#1}
+ { \notestobib_write_note:xn { \__notestobib_note_name: } {#2} }
+ { \notestobib_write_note:xn { \__notestobib_insert_refsection: #1 } {#2} }
+ }
+\NewDocumentCommand \recordnotes { }
+ { \__notestobib_record_notes: }
+\NewDocumentCommand \bibnotesetup { m }
+ { \keys_set:nn { notes2bib } {#1} }
+\NewDocumentCommand \printbibnotes { }
+ { \__notestobib_print_notes: }
+\NewDocumentCommand \citenote { m }
+ { \__notestobib_mark_note:n {#1} }
\cs_new_eq:NN \flushnotestack \recordnotes
\cs_new_eq:NN \niibsetup \bibnotesetup
-\cs_new_protected_nopar:Npn \NotesAfterCitations #1 {
- \clist_gput_right:Nn \g__notestobib_previous_after_clist {#1}
-}
-\cs_new_protected_nopar:Npn \NotesBeforeCitations #1 {
- \clist_gput_right:Nn \g__notestobib_previous_after_clist {#1}
- \tl_gput_right:Nn \g__notestobib_document_hook_tl { \nocite {#1} }
-}
-\cs_new_protected_nopar:Npn \TotalNotes #1 {
- \int_gset:Nn \g__notestobib_previous_notes_int {#1}
-}
+\cs_new_protected:Npn \NotesAfterCitations #1
+ { \clist_gput_right:Nn \g__notestobib_previous_after_clist {#1} }
+\cs_new_protected:Npn \NotesBeforeCitations #1
+ {
+ \clist_gput_right:Nn \g__notestobib_previous_after_clist {#1}
+ \tl_gput_right:Nn \g__notestobib_document_hook_tl { \nocite {#1} }
+ }
+\cs_new_protected:Npn \TotalNotes #1
+ { \int_gset:Nn \g__notestobib_previous_notes_int {#1} }
\tl_gput_right:Nn \document { \g__notestobib_document_hook_tl }
\tl_new:N \g__notestobib_document_hook_tl
\AtEndDocument { \__notestobib_record_notes: }
-\AtEndDocument {
- \tl_if_eq:NNTF \g__notestobib_all_before_clist \g__notestobib_previous_before_clist
- {
- \tl_if_eq:NNF \g__notestobib_all_after_clist \g__notestobib_previous_after_clist
- { \msg_info:nn { notes2bib } { rerun } }
- }
- { \msg_info:nn { notes2bib } { rerun } }
-}
-\msg_new:nnn { notes2bib } { rerun } {
- To~get~notes~in~the~correct~order,~please~run: \\%
- \c_space_tl 1)~LaTeX \\
- \c_space_tl 2)~BibTeX \\
- \c_space_tl 3)~LaTeX
-}
-\AtEndDocument {
- \if@filesw
- \exp_after:wN \__notestobib_write_note_file:
- \fi:
-}
-\cs_new_protected_nopar:Npn \__notestobib_write_note_file: {
- \tl_if_empty:NF \g__notestobib_notes_tl {
- \iow_open:Nn \g__notestobib_file_iow { \g__notestobib_filename_tl .bib }
- \iow_now:Nx \g__notestobib_file_iow { \c__notestobib_file_message_tl }
- \iow_now:Nx \g__notestobib_file_iow
- { \exp_not:V \g__notestobib_notes_tl }
- \iow_close:N \g__notestobib_file_iow
+\AtEndDocument
+ {
+ \tl_if_eq:NNTF \g__notestobib_all_before_clist \g__notestobib_previous_before_clist
+ {
+ \tl_if_eq:NNF \g__notestobib_all_after_clist \g__notestobib_previous_after_clist
+ { \msg_info:nn { notes2bib } { rerun } }
+ }
+ { \msg_info:nn { notes2bib } { rerun } }
+ }
+\msg_new:nnn { notes2bib } { rerun }
+ {
+ To~get~notes~in~the~correct~order,~please~run: \\%
+ \c_space_tl 1)~LaTeX \\
+ \c_space_tl 2)~BibTeX \\
+ \c_space_tl 3)~LaTeX
+ }
+\AtEndDocument
+ {
+ \if@filesw
+ \exp_after:wN \__notestobib_write_note_file:
+ \fi:
+ }
+\cs_new_protected:Npn \__notestobib_write_note_file:
+ {
+ \tl_if_empty:NF \g__notestobib_notes_tl
+ {
+ \iow_open:Nn \g__notestobib_file_iow { \g__notestobib_filename_tl .bib }
+ \iow_now:Nx \g__notestobib_file_iow { \c__notestobib_file_message_tl }
+ \iow_now:Nx \g__notestobib_file_iow { \exp_not:V \g__notestobib_notes_tl }
+ \iow_close:N \g__notestobib_file_iow
+ }
}
-}
\iow_new:N \g__notestobib_file_iow
-\AtEndDocument {
- \int_compare:nNnT \g__notestobib_note_int > \c_zero
- {
- \iow_now:Nx \@auxout
- { \TotalNotes { \int_to_arabic:n { \g__notestobib_note_int } } }
- }
-}
-\cs_set:Npn \thanks #1 {
- \__notestobib_footnotemark:w
- \protected@xdef \@thanks
- {
- \@thanks
- \protect \__notestobib_footnotetext:w [ \the \c@footnote ] {#1}
- }
-}
+\AtEndDocument
+ {
+ \int_compare:nNnT \g__notestobib_note_int > 0
+ {
+ \iow_now:Nx \@auxout
+ { \TotalNotes { \int_to_arabic:n { \g__notestobib_note_int } } }
+ }
+ }
+\cs_set:Npn \thanks #1
+ {
+ \__notestobib_footnotemark:w
+ \protected@xdef \@thanks
+ {
+ \@thanks
+ \protect \__notestobib_footnotetext:w [ \the \c@footnote ] {#1}
+ }
+ }
\keys_set:nn { notes2bib } { placement = mixed }
\ProcessKeysOptions { notes2bib }
%%
-%% Copyright (C) 2007-2011,2013 by
-%% Copyright (C) 2007-2013 by
+%% Copyright (C) 2007-2013,2016,2019 by
%% Joseph Wright
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/notes2bib.tlpobj new/tlpkg/tlpobj/notes2bib.tlpobj
--- old/tlpkg/tlpobj/notes2bib.tlpobj 2019-02-28 03:56:23.000000000 +0100
+++ new/tlpkg/tlpobj/notes2bib.tlpobj 2019-10-01 02:22:27.000000000 +0200
@@ -1,6 +1,6 @@
name notes2bib
category Package
-revision 31162
+revision 52231
shortdesc Integrating notes into the bibliography
relocated 1
longdesc The package defines a new type of note, bibnote, which will
@@ -17,7 +17,7 @@
runfiles size=5
RELOC/tex/latex/notes2bib/notes2bib.sty
catalogue-ctan /macros/latex/contrib/notes2bib
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl
+catalogue-date 2019-09-30 17:56:14 +0200
+catalogue-license lppl1.3c
catalogue-topics notes bib-use expl3
-catalogue-version 2.0k
+catalogue-version 2.0m
++++++ noto.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/noto/README new/doc/fonts/noto/README
--- old/doc/fonts/noto/README 2019-03-15 22:16:00.000000000 +0100
+++ new/doc/fonts/noto/README 2019-12-12 23:57:04.000000000 +0100
@@ -1,16 +1,16 @@
-This is the README for the noto package, version 2019-03-15.
+This is the README for the noto package, version 2019-12-09.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
-support for the NotoSerif, NotoSans and NotoMono families of
-fonts, designed by Steve Matteson for Google.
+support for the NotoSerif, NotoSans and NotoSansMono
+families of fonts, designed by Steve Matteson for Google.
-To install this package on a TDS-compliant TeX system download the
-file "tex-archive"/install/fonts/noto.tds.zip, where the
-preferred URL for "tex-archive" is http://mirror.ctan.org. Unzip
-the archive at the root of an appropriate texmf tree, likely a
-personal or local tree. If necessary, update the file-name database
-(e.g., texhash). Update the font-map files by enabling the Map file
-noto.map.
+To install this package on a TDS-compliant TeX system
+download the file "tex-archive"/install/fonts/noto.tds.zip,
+where the preferred URL for "tex-archive" is
+http://mirror.ctan.org. Unzip the archive at the root of an
+appropriate texmf tree, likely a personal or local tree. If
+necessary, update the file-name database (e.g., texhash).
+Update the font-map files by enabling the Map file noto.map.
To use, add
@@ -18,7 +18,7 @@
to the preamble of your document. This will activate
NotoSerif as the main (serifed) text font, NotoSans as the
-sans font and NotoMono as the fixed-width font.
+sans font and NotoSansMono as the fixed-width font.
To activate NotoSerif without NotoSans, use
@@ -46,25 +46,30 @@
xeLaTeX users who might prefer type1 fonts or who wish to
avoid fontspec may use the type1 option. Use option nott to
avoid activating NotoMono as the fixed-width font.
-To active just NotoMono, use
+
+To active just NotoSansMono, use
\usepackage{noto-mono}
Options scaled=<number> or scale=<number> may be used to
-scale the NotoSans and NotoMono fonts; the serifed variants
-are not affected unless noto-serif is being used.
+scale the NotoSans and NotoSansMono fonts; the serifed
+variants are not affected unless noto-serif is being used.
-Font encodings supported are OT1, T1, LY1, LGR and TS1.
+Font encodings supported are OT1, T1, TS1, LY1, LGR and
+T2A/B/C.
-The following options
-may be used:
+The following options may be used:
pf proportional
osf oldstyle
lf lining
tf tabular
-The default figures are lining-tabular.
+The default figures are lining-tabular. NotoSansMono has
+only tabular figures.
+
+Superior numbers (for footnote markers) are available
+using \sufigures or \textsu{...}.
thin
extralight
@@ -81,15 +86,29 @@
The default bold weight is Bold.
+ condensed
+ semicondensed
+ extracondensed
+
+These are only effective for NotoSans and NotoSansMono.
+
+The mono family does not currently have italics.
+
Macros \notoserif, \notosans and \notomono select the
-NotoSerif, NotoSans and NotoMono families, respectively.
+NotoSerif, NotoSans and NotoMono families, respectively,
+and \notoseriflgr, \notosanslgr and \notomonolgr
+activate the LGR encoding.
+
+Macros \notosanscondensed, \notosanssemicondensed,
+\notosansextracondensed, \notomonocondensed,
+\notomonosemicondensed and \notomonoextracondensed
+select condensed weights for NotoSans or NotoSansMono.
The original fonts are available at
https://www.google.com/get/noto and are licensed under the
SIL Open Font License, (version 1.1); the text may be found
in the doc directory. The type1 versions were created using
-ccftot1; fontforge was used to generate bold and italic
-(i.e., oblique) variants of NotoMono. The support files were
-created using autoinst and are licensed under the terms of
-the LaTeX Project Public License. The maintainer of this
-package is Bob Tennent (rdt at cs.queensu.ca)
+ccftot1. The support files were created using autoinst and
+are licensed under the terms of the LaTeX Project Public
+License. The maintainer of this package is Bob Tennent (rdt
+at cs.queensu.ca)
Binary files old/doc/fonts/noto/noto-samples.pdf and new/doc/fonts/noto/noto-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/noto/noto-samples.tex new/doc/fonts/noto/noto-samples.tex
--- old/doc/fonts/noto/noto-samples.tex 2018-02-20 00:28:36.000000000 +0100
+++ new/doc/fonts/noto/noto-samples.tex 2019-05-23 22:51:17.000000000 +0200
@@ -1,9 +1,9 @@
\documentclass{article}
-\usepackage[T1]{fontenc}
-%\usepackage[osf,pf]{noto-mono}
-%\usepackage[osf,pf]{noto-sans}
-%\usepackage[osf,pf]{noto-serif}
-\usepackage[osf,pf]{noto}
+\usepackage[LGR,LY1]{fontenc}
+%\usepackage[osf]{noto-sans}
+%\usepackage[osf]{noto-serif}
+%\usepackage[osf]{noto-mono}
+\usepackage[osf]{noto}
\usepackage{lipsum}
\begin{document}
@@ -44,10 +44,23 @@
1234567890
+\subsection*{Superior Numbers}
+
+X\textsu{1234567890}
+
+
+\subsection*{LGR}
+
+{\notoseriflgr\noindent
+abgdezhjiklmnxoprstufqyw\\
+ABGDEZHJIKLMNXOPRSTUFQYW\\
+0123456789
+}
+
\section*{NotoSans}
-\sf
+\sffamily
\subsection*{Regular}
\lipsum[1]
@@ -84,28 +97,59 @@
1234567890
-\section*{NotoMono}
+\subsection*{Superior Numbers}
+
+X\textsu{1234567890}
+
+
+\subsection*{LGR}
-\tt
+{\notosanslgr\noindent
+abgdezhjiklmnxoprstufqyw\\
+ABGDEZHJIKLMNXOPRSTUFQYW\\
+0123456789
+}
+
+
+\section*{NotoSansMono}
+
+\ttfamily
\subsection*{Regular}
\lipsum[1]
-\subsection*{Italic}
-\textit{\lipsum[2]}
-
\subsection*{Bold}
-\textbf{\lipsum[3]}
+\textbf{\lipsum[2]}
+\subsection*{Regular Small Caps}
+\textsc{\lipsum[1]}
+\subsection*{Bold Small Caps}
-\subsection*{Bold Italic}
+\textsc{\textbf{\lipsum[3]}}
-\textbf{\textit{\lipsum[4]}}
\subsection*{Numbers}
1234567890
+\subsection*{Superior Numbers}
+
+X\textsu{1234567890}
+
+\subsection*{Mono Non-Ligatures}
+
+
+Officially broken off. Often offline, find me flowerless.
+
+
+\subsection*{LGR}
+
+{\notomonolgr\noindent
+ a b g d e z h j i k l m n x o p r s t u f q y w\\
+ A B G D E Z H J I K L M N X O P R S T U F Q Y W\\
+ 0 1 2 3 4 5 6 7 8 9
+}
+
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/noto.doc.tlpobj new/tlpkg/tlpobj/noto.doc.tlpobj
--- old/tlpkg/tlpobj/noto.doc.tlpobj 2019-03-16 02:23:57.000000000 +0100
+++ new/tlpkg/tlpobj/noto.doc.tlpobj 2020-03-24 02:00:59.000000000 +0100
@@ -1,9 +1,9 @@
name noto.doc
category Package
-revision 50401
+revision 54512
shortdesc doc files of noto
relocated 1
-docfiles size=36
+docfiles size=80
RELOC/doc/fonts/noto/LICENSE_OFL.txt
RELOC/doc/fonts/noto/README
RELOC/doc/fonts/noto/noto-samples.pdf
++++++ noto.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-q/noto.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-q.new.3606/noto.tar.xz differ: char 25, line 1
++++++ novel.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/novel.doc.tlpobj new/tlpkg/tlpobj/novel.doc.tlpobj
--- old/tlpkg/tlpobj/novel.doc.tlpobj 2019-02-28 03:57:27.000000000 +0100
+++ new/tlpkg/tlpobj/novel.doc.tlpobj 2020-03-24 02:02:57.000000000 +0100
@@ -1,6 +1,6 @@
name novel.doc
category Package
-revision 47492
+revision 54512
shortdesc doc files of novel
relocated 1
docfiles size=1339
++++++ novel.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/novel.tlpobj new/tlpkg/tlpobj/novel.tlpobj
--- old/tlpkg/tlpobj/novel.tlpobj 2019-02-28 03:57:29.000000000 +0100
+++ new/tlpkg/tlpobj/novel.tlpobj 2020-03-24 02:02:59.000000000 +0100
@@ -1,6 +1,6 @@
name novel
category Package
-revision 47492
+revision 54512
shortdesc Class for printing fiction, such as novels
relocated 1
longdesc This LuaLaTeX document class is specifically written to meet
@@ -33,7 +33,6 @@
RELOC/tex/lualatex/novel/novel-xmppacket.sty
RELOC/tex/lualatex/novel/novel.cls
catalogue-ctan /macros/luatex/latex/novel
-catalogue-date 2018-04-28 21:25:48 +0200
-catalogue-license lppl1.3cofl
+catalogue-license lppl1.3c ofl
catalogue-topics luatex production book-pub class
catalogue-version 1.52
++++++ npp-for-context.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/context/third/npp-for-context/LICENSE new/doc/context/third/npp-for-context/LICENSE
--- old/doc/context/third/npp-for-context/LICENSE 2018-03-28 01:08:46.000000000 +0200
+++ new/doc/context/third/npp-for-context/LICENSE 1970-01-01 01:00:00.000000000 +0100
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- {one line to give the program's name and a brief idea of what it does.}
- Copyright (C) {year} {name of author}
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see http://www.gnu.org/licenses/.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- {project} Copyright (C) {year} {fullname}
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-http://www.gnu.org/licenses/.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-http://www.gnu.org/philosophy/why-not-lgpl.html.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/context/third/npp-for-context/Npp-for-ConTeXt.sha256sum new/doc/context/third/npp-for-context/Npp-for-ConTeXt.sha256sum
--- old/doc/context/third/npp-for-context/Npp-for-ConTeXt.sha256sum 2018-04-04 09:10:40.000000000 +0200
+++ new/doc/context/third/npp-for-context/Npp-for-ConTeXt.sha256sum 2019-06-17 00:05:18.000000000 +0200
@@ -1 +1 @@
-9831f13c32798c44e83f007a996fb4550c219784bc493cfa0a3903d5fd6777bd Npp-for-ConTeXt.zip
+1ef7a3133cbde8a859af3ec594370567df76cbfc755a812f6a1278fa7059b67c *Npp-for-ConTeXt.zip
Binary files old/doc/context/third/npp-for-context/Npp-for-ConTeXt.zip and new/doc/context/third/npp-for-context/Npp-for-ConTeXt.zip differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/context/third/npp-for-context/README.md new/doc/context/third/npp-for-context/README.md
--- old/doc/context/third/npp-for-context/README.md 2018-04-04 09:10:40.000000000 +0200
+++ new/doc/context/third/npp-for-context/README.md 2019-06-17 00:05:18.000000000 +0200
@@ -177,6 +177,3 @@
have several ways to insert the same text. However, it's likely that in
a future release this will be simplified or streamlined.
-
-This package is released under the GPL: see the file LICENSE for the full
-text.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/npp-for-context.doc.tlpobj new/tlpkg/tlpobj/npp-for-context.doc.tlpobj
--- old/tlpkg/tlpobj/npp-for-context.doc.tlpobj 2019-02-28 03:57:30.000000000 +0100
+++ new/tlpkg/tlpobj/npp-for-context.doc.tlpobj 2019-06-17 01:39:04.000000000 +0200
@@ -1,10 +1,9 @@
name npp-for-context.doc
category Package
-revision 47282
+revision 51389
shortdesc doc files of npp-for-context
relocated 1
-docfiles size=690
- RELOC/doc/context/third/npp-for-context/LICENSE
+docfiles size=682
RELOC/doc/context/third/npp-for-context/Npp-for-ConTeXt.sha256sum
RELOC/doc/context/third/npp-for-context/Npp-for-ConTeXt.zip
RELOC/doc/context/third/npp-for-context/README.md
++++++ ntgclass.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/00readme.txt new/doc/latex/ntgclass/00readme.txt
--- old/doc/latex/ntgclass/00readme.txt 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/00readme.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
- NTG document classes distribution
-
- 20 February 2004
-
-This file contains the distribution guide for the new version
-of the NTG document classes and the A4 package.
-The classes are maintained by NTG Working Group 13
-
-This distribution is described in the files ending with .txt.
-
- * 00readme.txt is this file.
-
- * manifest.txt lists all the files in the distribution.
-
-For more information about the document classes see the file
-ntgclass.tex.
-
-These files 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
-and version 1.3 or later is part of all distributions of LaTeX
-version 2003/12/01 or later.
-
-Please do not request updates from us. Distribution is done only
-through mail servers and TeX organisations.
-
-
---- Copyright 1994-2004 NTG. All rights reserved ---
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/CATALOG new/doc/latex/ntgclass/CATALOG
--- old/doc/latex/ntgclass/CATALOG 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/ntgclass/CATALOG 2020-02-23 01:28:45.000000000 +0100
@@ -0,0 +1,25 @@
+Name: ntgclass
+Problems-To: texniek@braams.texniek.nl
+Author: J.L. Braams and V. Eijkhout
+Version: 2.2-patch level 4
+
+Description:
+
+The ntgclass bundle provides a number of document classes that
+implement alternative layouts for the standard LaTeX document classes.
+These classes were originally developped by Victor Eijkhout and the
+NTG WG13.
+The classes provided are:
+artikel1, artikel2, artikel3; rapport1, rapport3; boek, boek3; brief.
+This bundle also includes the a4 package, originally written for
+LaTeX209 to support printing on A4 paper.
+
+Keywords: latex, document classes
+
+See-Also:
+
+Address:
+TeXniek
+Kersengaarde 33
+2723 BP Zoetermeer
+The Netherlands
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/ChangeLog new/doc/latex/ntgclass/ChangeLog
--- old/doc/latex/ntgclass/ChangeLog 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/ntgclass/ChangeLog 2020-02-23 01:28:45.000000000 +0100
@@ -0,0 +1,348 @@
+2020-02-22 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * ntgclass.dtx: The mechanism to work around the hyperref code
+ being injected int the tabel of contents lines needed to be
+ changed. There's a fourth token to jump over and the use of
+ \MakeUppercase instead of \uppercase in the toc-lines for parts
+ (rapport and boek classes) needed a different approach, made the
+ hyperref copmmand robust and protected it with \lowercase.
+
+2020-02-18 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * brief.dtx: Update to change copyright notice and address
+ information; synchronised with the standard document classes.
+
+ * a4.dtx: Update to change copyright notice and address
+ information.
+
+2020-02-18 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * ntgclass.dtx: Update to synchronize with classes.dtx
+
+2004-08-17 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * ntgclass.dtx: Various changes involving no longer passing
+ \toc@font and \toc@case settings through the .aux file because
+ they break when the hyperref package is used.
+ Fixed a bug in the toc-entry for \part: the spacing was wrong and
+ the pagenumber was put on a line by itself.
+
+2004-06-07 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * ntgclass.dtx : updated version to 2.1a as 2.0z should be the
+ last, but no major changes, added a missing fix related to pr3285
+
+2004-02-20 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * ntgclass.dtx: various changes to sychronise with classes.dtx,
+ mostly fixes for Problem reports in the bugs database
+
+Tue Sep 9 00:43:15 1997 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx: Repaired a few documentation buglets.
+
+ * brief.dtx : Added a few extra command synonimes, suggested by
+ Wybo Dekker (wybo at servaly.hobby.nl)
+ (subsubsection{The address window}): Put the \textbullet in a
+ group to keep the font change local
+ (subsubsection{The little rules}): Make the rules slightly thinner
+ and modify their position a little
+ (subsubsection{Page breaking control}): Added a \leavevmode in
+ \@afsluiting to make \afsluiting work as documented.
+ (subsection{Footnotes}): The footnotemarker should appear
+ different in the text from in the footnotes themselves, changed
+ definition of \@makefntext and use default \@makefnmark
+
+Tue Apr 1 00:15:34 1997 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsection{Footnotes}): Mixed the syntac for \def
+ and \newcommand (had #1 instead of [1]).
+ Found by Thorsten Schwander (schwander at ooo.lanl.gov)
+
+Sun Mar 2 00:17:17 1997 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsection{The title}): Use \textendash instead of
+ -- in label in footnotes on the titlepage.
+ (subsubsection{Itemize}): Now also \textasteriskcentered instead
+ of using math
+ (subsubsection{Equation and eqnarray}): Added test for chapter 0
+ in the definition of \theequation inb rapport and boek classes
+ (following classes.dtx)
+ (subsubsection{Figure}): Added test for chapter 0
+ (subsubsection{tabel}): Added test for chapter 0
+
+Mon Sep 23 23:12:21 1996 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (subsubsection{Itemize}): Replaced --, $\bullet$
+ and $\cdot$ with \text... commands, following a change in the
+ LaTeX classes.
+
+ * ntgclass.dtx (subsubsection{Itemize}): Replaced --, $\bullet$
+ and $\cdot$ with \text... commands, following a change in the
+ LaTeX classes.
+ (chapter*{...}): Changed \@xsect and \@ssect to follow a change in
+ the june 1996 release fo LaTeX which allows commands with an
+ argument in the last argument of \@sartsection.
+
+Mon Apr 1 19:26:32 1996 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx : use \renewcommand rather than \newcommand to
+ define \newblock
+ (subsection{Font changing}): Removed suerfluous
+ closing braces
+ (subsection{Footnotes}): Repaired definition of \@xmakefntext (it
+ had #1 in a \newcommand
+
+ * brief.dtx (subsubsection{The address window}): Repaired a typo
+ (\parksip instead of \parskip
+
+Sun Mar 31 23:25:10 1996 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx : Added \CodelineIndex to the driver in order
+ to really produce a .idx file for the index.
+
+Wed Mar 27 22:57:57 1996 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dst: Update to make use of the new docstrip
+ possibillity to produce multiple files in one go.
+
+Wed Nov 29 00:19:36 1995 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (subsubsection{The reference line}): Also set
+ \parindent to zero in \@refveld
+ (subsubsection{The address window}): Set both \parksip and
+ \parindent to zero inside the \adresveld
+
+Thu Oct 5 22:29:06 1995 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsection{The title}): Disable some more of the
+ commands that are only needed for \maketitle; empty internal
+ storage macros.
+ (subsection{Open bibliography}): openbib option reimplemented
+ Brought in sinc again with classes.dtx
+
+Tue Aug 22 23:57:27 1995 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx : Added missing braces around negative arguments to
+ \addpenalty; make l@part only do something when \c@tocdepthd>-2.
+
+Thu Aug 10 01:04:30 1995 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx : Brought up-to-date with LaTeX's letter.dtx in order
+ to make the classes run with LaTeX <1995/06/01>
+
+ * ntgclass.dtx : Brought up-to-date with LaTeX's classes.dtx in
+ order to make the classes run with LaTeX <1995/06/01>
+
+Sun May 7 23:45:33 1995 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsection{Chapters and Sections}): Added \erlax
+ to the definition of \@svsec as a result of LaTeX pr/1596
+
+Fri Jan 6 14:09:51 1995 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsection{Chapters and Sections}): Changed
+ {\baselineskip\@plus... to
+ {1\baselineskip\@plus... in the defintion of \subsection and
+ \subsubsection in artikel2.
+ Found by Dick Snippe (D.M.Snippe at el.utwente.nl)
+ (subsubsection{Building blocks}): Use \protected@edef instead of
+ the juggling with redefining \protect.
+
+Sat Dec 31 16:31:12 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (subsubsection{Page breaking control}): The printing
+ of the closing text generated an overfull hbox message. Removed
+ the extra \hbox (width \textwidth) inside the \parbox of width
+ .5\textwidth.
+
+Fri Dec 30 14:25:00 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (subsection{Words}): Repaired a small typo (a bracket
+ was used instead of a brace)
+
+ * ntgclass.dtx: Repaired a number of typos that prevented
+ artikel2.cls from functioning properly.
+
+ * brief.dtx (section{Executing Options}): Added a \relax after
+ \ProcessOptions to prevent the \ifcase to be `eaten' in the search
+ for a *.
+
+Fri Dec 23 21:48:47 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx: Use \newcommand* instead of \newcommand in most
+ places.
+ (subsection{Customizing the labels}): Redefined \mlabel to use the
+ new \parbox syntax instead of using the \setbox primitive.
+ (subsection{Font changing}): Define \cal and \mit using
+ \DeclareRobustCommand
+ (subsection{The generic letter commands}): Use
+ \let\protect\@unexpandable@protect instead of redefining it.
+
+ * ntgclass.dtx: More updates to go with the december 1994 release
+ of LaTeX.
+ - Made the oneside option work for the boek class (LaTeX PR
+ #1195)
+ (section{Initial Code}): Moved the allocation of
+ \if@mainmatter to this section in order to let it be known when
+ the pagestyles are defined. The switch is used there and needs to
+ be known then; otherwise TeX finds the wrong \fi in an
+ \if@twoside...\else...\fi construct.
+
+Tue Dec 20 01:52:12 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx: Updates to go with the december 1994 release of
+ LaTeX.
+ - Use \newcommand* cs.
+ - Set the \@minipage flag in the caption
+ (subsubsection{Margins}): Moved the rounding of \topmargin into
+ native mode only (LaTeX PR #93)
+ (section{Cross Referencing}): Fixed a typo in the documentation of
+ \@tocrmarg. (LaTeX PR #904)
+ (subsection{Single or double sided printing}): removed typo (LaTeX
+ PR #881)
+ (subsubsection{Chapters}): Made chapter titles more robust against
+ pagebreaks in the middle of them. Added an extra \nobreak but not
+ the extra \interlinepenalty\@M lines as that is taken care of by
+ \head@style (LaTeX PR #1016, #1135)
+ (subsection{Font changing}): Define \cal and \mit using
+ \DeclareRobustCommand
+ (the driver): use \newcommand* for shorthands with argument
+ (whole file): Use \newcommand* for commands with arguments
+
+Tue Oct 4 00:12:26 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (section{The documentation driver file}): Added a
+ missing comma in the \DoNotIndex list
+
+Tue Jul 12 22:45:13 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (subsubsection{Defining the page styles}): Removed the
+ typo in \@othertheadheight
+
+Mon Jul 11 23:25:48 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (subsubsection{Itemize}): \labelitemiii was
+ mistakenly called \labelitemiiii (LaTeX bug report # 711)
+
+ * ntgclass.dtx (subsection{Paragraphing}): The definition of the
+ dimension \othermargin was erroneously left out of type2 document
+ classes.
+ (subsection{Footnotes}): Moved the `.' that appeared in the
+ definition of \@xmakefntext to the definition of \@makefntext.
+ This should prevent it from appearing in a footnote produced by
+ \thanks.
+
+Wed Jun 15 22:19:45 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (section{The documentation driver file}): Reorder the
+ DoNotIndex list. Removed remnant from letter.dtx, now get the
+ file info from bief.dtx and also typeset brief.dtx instead of
+ trying to typeset letter.dtx.
+
+
+Wed Jun 8 13:16:41 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (section{The documentation driver file}): The
+ documentation didn't run; had to shuffle some entries in
+ \DoNotIndex lines.
+
+ * artdoc.tex (subsection{Fonts in sectiekoppen}): Added a missing
+ brace
+
+ * ntgclass.dtx (subsubsection{Chapters}): Removed yet another
+ carriage return that caused \if@mainmatter to end up in the
+ rapport classes.
+
+Mon Jun 6 00:03:19 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * brief.dtx (subsection{Global Declarations}): Using \newcommand
+ for internal storage macros causes the test against \@empty to
+ fail; a nempty long macro is not the same as an empytt macro. This
+ happened to \fromsig and \@subject.
+
+Fri Jun 3 14:25:27 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsubsection{Chapters}): Removed a carriage
+ return behind %<+boek> which caused \f@mainmatter to end up in the
+ rapport classes.
+
+ * brief.dtx: Finished upgrading for LaTeX2e
+
+ * briefdoc.tex: Updated for latex2e and the use of the babel
+ package. Contents may not be correct with the new version of the
+ code.
+
+ * rapdoc.tex: Updated for latex2e and the use of the babel
+ package. Contents may not be correct with the new version of the
+ code.
+
+ * artdoc.tex: Updated for latex2e and the use of the babel
+ package. Contents may not be correct with the new version of the
+ code.
+
+Fri Jun 3 00:27:27 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (section{Identification}): The size files claimed
+ to have a name that starts with `size'; changed to `ntg'.
+
+ * ntgclass.dst: Added the stripping of brief.
+
+Thu Jun 2 00:30:21 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsection{The title}): Added check on number of
+ columns in use locally
+ (section{Identification}): Fixed bug that prevented LaTeX from
+ seeing the \ProvideFile command in the driver
+
+Wed Jun 1 14:15:21 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx: Added \Charactertable
+ Moved the identification and driver sections to the start of the
+ file; they no longer print.
+ Added 'v' to changes entries; wrapped some long lines.
+ (subsubsection{Captions}): Use \sbox\@tempboxa instead of
+ \setbox\@tempboxa\hbox to make @makecaption color safe.
+ (subsection{The title}): The boek classes always havve a
+ titlepage, forgot to remove the code for the \else part of
+ \if@titlepage.
+ (section*{\contentsname): Added a missing backslash
+
+Mon Apr 18 12:45:43 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsection{Fonts}): The size changing commands are
+ no longer defined in the kernel. Use \newcommand instead of
+ \renewcommand.
+ (subsection{Font changing}): \@renewfontswitch has gone;
+ \@newfontswitch has become \DeclareOldFontCommand
+ Synchronized with the changes to classes.dtx
+
+Sun Mar 20 00:53:17 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dst: Removed production of the documentation driver.
+
+ * ntgclass.dtx (section{Identification}): Removed the use of
+ \typeout statements as \Provides... does that now.
+ (section{The {\sc docstrip} modules}): This section added.
+ (section{The documentation driver file}): Moved this section to
+ the front in order not to need a searate driver.
+
+Sat Mar 19 17:40:24 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * ntgclass.dtx (subsubsection{Captions}): The \CaptionLabelFont
+ shouldn't influence the font in which the caption text comes out.
+ PUt a group around the label.
+
+ * ntgclass.dst: Removed \TopLevel, a remnant from classes.dst
+
+ * ntgclass.dtx (subsubsection{Abstract}): Treat the abstract like
+ a section and use \SectFont for the title.
+
+Tue Mar 15 11:54:32 1994 Johannes Braams (texniek at braams.xs4all.nl)
+
+ * a4.dtx (subsection{The code}): The name of a package and the
+ name of the file should be the same.
+
+ (subsection{The code}): Added \ProcessOptions and moved it to the
+ end of the package.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/MANIFEST new/doc/latex/ntgclass/MANIFEST
--- old/doc/latex/ntgclass/MANIFEST 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/ntgclass/MANIFEST 2020-02-23 01:28:45.000000000 +0100
@@ -0,0 +1,50 @@
+%
+% CONTENTS OF THE NTG DOCUMENT CLASSES DISTRIBUTION
+% =================================================
+%
+% Documentation:
+% --------------
+%
+% 00readme.txt -- The distribution guide.
+% manifest.txt -- This file.
+% changes.txt -- List of changes in reverse chronological order.
+% catalog.txt -- A short description for the macro catalog.
+%
+% artdoc.tex -- A description of the artikel classes, in dutch
+% artdoc.pdf
+% briefdoc.tex -- A description of the brief class, in dutch
+% briefdoc.pdf
+% rapdoc.tex -- A description of the rapport classes, in dutch
+% rapdoc.pdf
+% classdoc.tex -- A description of the document classes, in english
+% classdoc.pdf
+%
+%
+% Classes:
+% --------
+%
+% ntgclass.dtx -- NTG document classes artikel1,2,3/boek,boek3/rapport1,3.
+% ntgclass.pdf
+% brief.dtx -- NTG document class brief
+% brief.pdf
+%
+% Classes:
+% --------
+%
+% a4.dtx -- The package a4 from NTG/WG13 (Braams, Poppelier)
+% a4.pdf
+%
+% Installation script for the various parts:
+% -------------------------------------------
+%
+% a4.ins -- installation script for the a4 package
+% ntgclass.ins -- NTG document classes installation script
+%
+%
+% Support files:
+% --------------
+%
+% brief-sample.tex -- A document showing the layout of the NEN-brief
+% implemented by brief.dtx
+% brief-sample.pdf
+%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/README new/doc/latex/ntgclass/README
--- old/doc/latex/ntgclass/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/ntgclass/README 2020-02-23 01:28:45.000000000 +0100
@@ -0,0 +1,28 @@
+ NTG document classes distribution
+
+ 22 February 2020
+
+This file contains the distribution guide for the new version
+of the NTG document classes and the A4 package.
+The classes are maintained by NTG Working Group 13
+
+ * README is this file.
+
+ * MANIFEST lists all the files in the distribution.
+
+For more information about the document classes see the file
+ntgclass.tex.
+
+These files may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3c
+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
+and version 1.3c or later is part of all distributions of LaTeX
+version 2008 or later.
+
+Please do not request updates from us. Distribution is done only
+through mail servers and TeX organisations.
+
+
+--- Copyright 1994-2020 NTG. All rights reserved ---
Binary files old/doc/latex/ntgclass/a4.pdf and new/doc/latex/ntgclass/a4.pdf differ
Binary files old/doc/latex/ntgclass/artdoc.pdf and new/doc/latex/ntgclass/artdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/artdoc.tex new/doc/latex/ntgclass/artdoc.tex
--- old/doc/latex/ntgclass/artdoc.tex 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/artdoc.tex 2020-02-23 01:28:45.000000000 +0100
@@ -1,33 +1,3 @@
-% \iffalse meta-comment
-%
-% % \iffalse meta-comment
-% %
-% % Copyright (C) 1990-2004 Nederlandstalige TeX Gebruikersgroep.
-% % All rights reserved.
-% %
-% % This file is part of the NTG document classes distribution
-% % ----------------------------------------------------------
-% %
-% % It 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
-% % and version 1.3 or later is part of all distributions of LaTeX
-% % version 2003/12/01 or later.
-% %
-% % This work has the LPPL maintenance status "maintained".
-% %
-% % The Current Maintainer of this work is Johannes Braams.
-% %
-% % The list of all files belonging to the NTG document classes
-% % distribution is given in the file `manifest.txt.
-% %
-% % The list of derived (unpacked) files belonging to the distribution
-% % and covered by LPPL is defined by the unpacking scripts (with
-% % extension .ins) which are part of the distribution.
-% % \fi
-% \fi
\documentclass[a4paper]{artikel1} %ja,ja, onze eigen documentstijl!
\usepackage[dutch]{babel}
Binary files old/doc/latex/ntgclass/brief-sample.pdf and new/doc/latex/ntgclass/brief-sample.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/brief-sample.tex new/doc/latex/ntgclass/brief-sample.tex
--- old/doc/latex/ntgclass/brief-sample.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/ntgclass/brief-sample.tex 2020-02-23 01:28:45.000000000 +0100
@@ -0,0 +1,199 @@
+\documentclass{brief} %% er is een optie 'adresrechts'
+
+%\maaketiketten %% werkt nog niet naar behoren
+
+\begin{document}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%% briefhoofd %%%%%%%%%%%%%%%%%%%%%%%%%%
+% De gebruiker wordt geacht zijn eigen \briefhoofd te definieren,
+% of voorgedrukt briefpapier te gebruiken,
+% maar hij kan een redelijk standaard hoofd aangemeten krijgen
+% door \maakbriefhoofd.
+\maakbriefhoofd{WG 13}{Werkgroep 13\\ de De Facto Standaard
+ \\ in Nederlandse \TeX pertise}
+
+% De PTT staat toe dat boven in het venster klein (5 a 6 punt)
+% een antwoordadres gedrukt wordt. Het hoeft natuurlijk niet.
+% En svp alleen voor binnenlands gebruik.
+\antwoordadres{Toernooiveld 5, \\ 6525 ED Nijmegen}
+
+%%%%%%%%%%%%%%%%%%% de referentieregel %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\uwbriefvan{13 januari 1988} % vier gegevens in de referentieregels
+\datum{8 october 1989} % hier mist alleen de 'uwkenmerk'
+\onskenmerk{VE-NTG 002} % volgorde en plaatsing ligt vast
+% datum wordt automatisch ingevuld wanneer niet gespecificeerd
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%% voetregel %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% maximaal vier gegevens, de gebruiker specificeert zowel het
+% kopje, als wat er onder komt. Gegevens worden geplaatst in de
+% opgegeven volgorde.
+\voetitem{fax:}{12345 abc}
+\voetitem{telefoon:}{080-613169}
+\voetitem{telefoon \\ priv\'e:}{080-448664}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% de brief zelf %%%%%%%%%%%%%%%%%%%%%%%%%%
+% bijna zoals in 'letter.sty', alleen zijn de commando's
+% nu in de nederlandse taal.
+\begin{brief}{Werkgroep 13\\Nederlandse \TeX\ groep\\Nederland}
+
+\betreft{nieuwe briefstijl}
+\opening{Hallo volkjes,}
+
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+
+
+
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+Dit is een test om te zien hoe ver ik gevorderd ben met het
+autentieke Nederlandse briefontwerp.
+Het zal waarschijnlijk nog wel een tijdje duren voor er
+echt iets moois uitkomt. Sprak hij bescheiden.
+
+\ondertekening{Victor Eijkhout \\ co\"ordinator \en Johannes Braams \\ lid
+ \en Nico Poppelier \\ lid}
+\afsluiting{Hoogachtend,\\ Werkgroep 13}
+
+\bijlagen{De broncode van deze brief}
+\cc{Stichting `de Kettingbrief'}
+\ps{PS: panta rei}
+
+
+\end{brief}
+
+%\end{document} %% hier stoppen, behalve als je 'maaketiketten'
+ %% wil testen.
+
+\onskenmerk{VE-JD1}
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\onskenmerk{VE-JD2}
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\end{document}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
+\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
+\end{brief}
+
+\end{document}
Binary files old/doc/latex/ntgclass/brief.pdf and new/doc/latex/ntgclass/brief.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/brief.tex new/doc/latex/ntgclass/brief.tex
--- old/doc/latex/ntgclass/brief.tex 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/brief.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,229 +0,0 @@
-% \iffalse meta-comment
-%
-% % \iffalse meta-comment
-% %
-% % Copyright (C) 1990-2004 Nederlandstalige TeX Gebruikersgroep.
-% % All rights reserved.
-% %
-% % This file is part of the NTG document classes distribution
-% % ----------------------------------------------------------
-% %
-% % It 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
-% % and version 1.3 or later is part of all distributions of LaTeX
-% % version 2003/12/01 or later.
-% %
-% % This work has the LPPL maintenance status "maintained".
-% %
-% % The Current Maintainer of this work is Johannes Braams.
-% %
-% % The list of all files belonging to the NTG document classes
-% % distribution is given in the file `manifest.txt.
-% %
-% % The list of derived (unpacked) files belonging to the distribution
-% % and covered by LPPL is defined by the unpacking scripts (with
-% % extension .ins) which are part of the distribution.
-% % \fi
-% \fi
-\documentclass{brief} %% er is een optie 'adresrechts'
-
-%\maaketiketten %% werkt nog niet naar behoren
-
-\begin{document}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%% briefhoofd %%%%%%%%%%%%%%%%%%%%%%%%%%
-% De gebruiker wordt geacht zijn eigen \briefhoofd te definieren,
-% of voorgedrukt briefpapier te gebruiken,
-% maar hij kan een redelijk standaard hoofd aangemeten krijgen
-% door \maakbriefhoofd.
-\maakbriefhoofd{WG 13}{Werkgroep 13\\ de De Facto Standaard
- \\ in Nederlandse \TeX pertise}
-
-% De PTT staat toe dat boven in het venster klein (5 a 6 punt)
-% een antwoordadres gedrukt wordt. Het hoeft natuurlijk niet.
-% En svp alleen voor binnenlands gebruik.
-\antwoordadres{Toernooiveld 5, \\ 6525 ED Nijmegen}
-
-%%%%%%%%%%%%%%%%%%% de referentieregel %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\uwbriefvan{13 januari 1988} % vier gegevens in de referentieregels
-\datum{8 october 1989} % hier mist alleen de 'uwkenmerk'
-\onskenmerk{VE-NTG 002} % volgorde en plaatsing ligt vast
-% datum wordt automatisch ingevuld wanneer niet gespecificeerd
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%% voetregel %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% maximaal vier gegevens, de gebruiker specificeert zowel het
-% kopje, als wat er onder komt. Gegevens worden geplaatst in de
-% opgegeven volgorde.
-\voetitem{fax:}{12345 abc}
-\voetitem{telefoon:}{080-613169}
-\voetitem{telefoon \\ priv\'e:}{080-448664}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% de brief zelf %%%%%%%%%%%%%%%%%%%%%%%%%%
-% bijna zoals in 'letter.sty', alleen zijn de commando's
-% nu in de nederlandse taal.
-\begin{brief}{Werkgroep 13\\Nederlandse \TeX\ groep\\Nederland}
-
-\betreft{nieuwe briefstijl}
-\opening{Hallo volkjes,}
-
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-
-
-
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-Dit is een test om te zien hoe ver ik gevorderd ben met het
-autentieke Nederlandse briefontwerp.
-Het zal waarschijnlijk nog wel een tijdje duren voor er
-echt iets moois uitkomt. Sprak hij bescheiden.
-
-\ondertekening{Victor Eijkhout \\ co\"ordinator \en Johannes Braams \\ lid
- \en Nico Poppelier \\ lid}
-\afsluiting{Hoogachtend,\\ Werkgroep 13}
-
-\bijlagen{De broncode van deze brief}
-\cc{Stichting `de Kettingbrief'}
-\ps{PS: panta rei}
-
-
-\end{brief}
-
-%\end{document} %% hier stoppen, behalve als je 'maaketiketten'
- %% wil testen.
-
-\onskenmerk{VE-JD1}
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\onskenmerk{VE-JD2}
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\end{document}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\begin{brief}{Jan Doedel\\ klinkhamerdreef 37\\ Duckstad}
-\opening{Hallo,} daar ben ik dan \ondertekening{Victor}\afsluiting{doei}
-\end{brief}
-
-\end{document}
Binary files old/doc/latex/ntgclass/briefdoc.pdf and new/doc/latex/ntgclass/briefdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/briefdoc.tex new/doc/latex/ntgclass/briefdoc.tex
--- old/doc/latex/ntgclass/briefdoc.tex 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/briefdoc.tex 2020-02-23 01:28:45.000000000 +0100
@@ -1,33 +1,3 @@
-% \iffalse meta-comment
-%
-% % \iffalse meta-comment
-% %
-% % Copyright (C) 1990-2004 Nederlandstalige TeX Gebruikersgroep.
-% % All rights reserved.
-% %
-% % This file is part of the NTG document classes distribution
-% % ----------------------------------------------------------
-% %
-% % It 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
-% % and version 1.3 or later is part of all distributions of LaTeX
-% % version 2003/12/01 or later.
-% %
-% % This work has the LPPL maintenance status "maintained".
-% %
-% % The Current Maintainer of this work is Johannes Braams.
-% %
-% % The list of all files belonging to the NTG document classes
-% % distribution is given in the file `manifest.txt.
-% %
-% % The list of derived (unpacked) files belonging to the distribution
-% % and covered by LPPL is defined by the unpacking scripts (with
-% % extension .ins) which are part of the distribution.
-% % \fi
-% \fi
\documentclass[a4paper,10pt]{artikel1}
\usepackage[dutch]{babel}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/catalog.txt new/doc/latex/ntgclass/catalog.txt
--- old/doc/latex/ntgclass/catalog.txt 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/catalog.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-Name: ntgclass
-Problems-To: JLBraams@cistron.nl
-Author: J.L. Braams and V. Eijkhout
-Version: 2.2-patch level 3
-
-Description:
-
-The ntgclass bundle provides a number of document classes that
-implement alternative layouts for the standard LaTeX document classes.
-These classes were originally developped by Victor Eijkhout and the
-NTG WG13.
-The classes provided are:
-artikel1, artikel2, artikel3; rapport1, rapport3; boek, boek3; brief.
-This bundle also includes the a4 package, originally written for
-LaTeX209 to support printing on A4 paper.
-
-Keywords: latex, document classes
-
-See-Also:
-
-Address:
-J.L. Braams
-Kooienswater 62
-2715 AJ Zoetermeer
-The Netherlands
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/changes.txt new/doc/latex/ntgclass/changes.txt
--- old/doc/latex/ntgclass/changes.txt 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/changes.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-
-This file lists changes to the NTG files in reverse chronological order.
-========================================================================
-
-
Binary files old/doc/latex/ntgclass/classdoc.pdf and new/doc/latex/ntgclass/classdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/classdoc.tex new/doc/latex/ntgclass/classdoc.tex
--- old/doc/latex/ntgclass/classdoc.tex 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/classdoc.tex 2020-02-23 01:28:45.000000000 +0100
@@ -1,33 +1,3 @@
-% \iffalse meta-comment
-%
-% % \iffalse meta-comment
-% %
-% % Copyright (C) 1990-2004 Nederlandstalige TeX Gebruikersgroep.
-% % All rights reserved.
-% %
-% % This file is part of the NTG document classes distribution
-% % ----------------------------------------------------------
-% %
-% % It 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
-% % and version 1.3 or later is part of all distributions of LaTeX
-% % version 2003/12/01 or later.
-% %
-% % This work has the LPPL maintenance status "maintained".
-% %
-% % The Current Maintainer of this work is Johannes Braams.
-% %
-% % The list of all files belonging to the NTG document classes
-% % distribution is given in the file `manifest.txt.
-% %
-% % The list of derived (unpacked) files belonging to the distribution
-% % and covered by LPPL is defined by the unpacking scripts (with
-% % extension .ins) which are part of the distribution.
-% % \fi
-% \fi
\documentclass[a4paper,10pt]{artikel1} % or just 'article'
\usepackage{shortvrb}
\newcommand\Lopt[1]{\textsf{#1}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/manifest.txt new/doc/latex/ntgclass/manifest.txt
--- old/doc/latex/ntgclass/manifest.txt 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/manifest.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-%
-% CONTENTS OF THE NTG DOCUMENT CLASSES DISTRIBUTION
-% =================================================
-%
-% Documentation:
-% --------------
-%
-% 00readme.txt -- The distribution guide.
-% manifest.txt -- This file.
-% changes.txt -- List of changes in reverse chronological order.
-% catalog.txt -- A short description for the macro catalog.
-%
-% artdoc.tex -- A description of the artikel classes, in dutch
-% artdoc.pdf
-% briefdoc.tex -- A description of the brief class, in dutch
-% briefdoc.pdf
-% rapdoc.tex -- A description of the rapport classes, in dutch
-% rapdoc.pdf
-% classdoc.tex -- A description of the document classes, in english
-% classdoc.pdf
-%
-% Classes:
-% --------
-%
-% ntgclass.dtx -- NTG document classes artikel1,2,3/boek,boek3/rapport1,3.
-% ntgclass.pdf
-% brief.dtx -- NTG document class brief
-% brief.pdf
-%
-% Classes:
-% --------
-%
-% a4.dtx -- The package a4 from NTG/WG13 (Braams, Poppelier)
-% a4.pdf
-%
-% Installation script for the various parts:
-% -------------------------------------------
-%
-% a4.ins -- installation script for the a4 package
-% ntgclass.ins -- NTG document classes installation script
-%
-%
-% Support files:
-% --------------
-%
-% brief.tex -- A sample file with three letters
-%
Binary files old/doc/latex/ntgclass/ntgclass.pdf and new/doc/latex/ntgclass/ntgclass.pdf differ
Binary files old/doc/latex/ntgclass/rapdoc.pdf and new/doc/latex/ntgclass/rapdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ntgclass/rapdoc.tex new/doc/latex/ntgclass/rapdoc.tex
--- old/doc/latex/ntgclass/rapdoc.tex 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ntgclass/rapdoc.tex 2020-02-23 01:28:45.000000000 +0100
@@ -1,33 +1,3 @@
-% \iffalse meta-comment
-%
-% % \iffalse meta-comment
-% %
-% % Copyright (C) 1990-2004 Nederlandstalige TeX Gebruikersgroep.
-% % All rights reserved.
-% %
-% % This file is part of the NTG document classes distribution
-% % ----------------------------------------------------------
-% %
-% % It 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
-% % and version 1.3 or later is part of all distributions of LaTeX
-% % version 2003/12/01 or later.
-% %
-% % This work has the LPPL maintenance status "maintained".
-% %
-% % The Current Maintainer of this work is Johannes Braams.
-% %
-% % The list of all files belonging to the NTG document classes
-% % distribution is given in the file `manifest.txt.
-% %
-% % The list of derived (unpacked) files belonging to the distribution
-% % and covered by LPPL is defined by the unpacking scripts (with
-% % extension .ins) which are part of the distribution.
-% % \fi
-% \fi
\documentclass[oldtoc,a4paper,10pt]{rapport3}
\usepackage[dutch]{babel}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ntgclass.doc.tlpobj new/tlpkg/tlpobj/ntgclass.doc.tlpobj
--- old/tlpkg/tlpobj/ntgclass.doc.tlpobj 2019-02-28 03:57:31.000000000 +0100
+++ new/tlpkg/tlpobj/ntgclass.doc.tlpobj 2020-02-25 01:54:53.000000000 +0100
@@ -1,22 +1,23 @@
name ntgclass.doc
category Package
-revision 15878
+revision 53882
shortdesc doc files of ntgclass
relocated 1
-docfiles size=313
- RELOC/doc/latex/ntgclass/00readme.txt
+docfiles size=482
+ RELOC/doc/latex/ntgclass/CATALOG
+ RELOC/doc/latex/ntgclass/ChangeLog
+ RELOC/doc/latex/ntgclass/MANIFEST
+ RELOC/doc/latex/ntgclass/README
RELOC/doc/latex/ntgclass/a4.pdf
RELOC/doc/latex/ntgclass/artdoc.pdf
RELOC/doc/latex/ntgclass/artdoc.tex
+ RELOC/doc/latex/ntgclass/brief-sample.pdf
+ RELOC/doc/latex/ntgclass/brief-sample.tex
RELOC/doc/latex/ntgclass/brief.pdf
- RELOC/doc/latex/ntgclass/brief.tex
RELOC/doc/latex/ntgclass/briefdoc.pdf
RELOC/doc/latex/ntgclass/briefdoc.tex
- RELOC/doc/latex/ntgclass/catalog.txt
- RELOC/doc/latex/ntgclass/changes.txt
RELOC/doc/latex/ntgclass/classdoc.pdf
RELOC/doc/latex/ntgclass/classdoc.tex
- RELOC/doc/latex/ntgclass/manifest.txt
RELOC/doc/latex/ntgclass/ntgclass.pdf
RELOC/doc/latex/ntgclass/rapdoc.pdf
RELOC/doc/latex/ntgclass/rapdoc.tex
++++++ ntgclass.tar.xz ++++++
++++ 2444 lines of diff (skipped)
++++++ nwejm.doc.tar.xz ++++++
++++ 2265 lines of diff (skipped)
++++++ nwejm.tar.xz ++++++
++++ 2856 lines of diff (skipped)
++++++ oberdiek.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-q/oberdiek.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-q.new.3606/oberdiek.doc.tar.xz differ: char 25, line 1
++++++ oberdiek.tar.xz ++++++
++++ 73990 lines of diff (skipped)
++++++ ocgx.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ocgx.doc.tlpobj new/tlpkg/tlpobj/ocgx.doc.tlpobj
--- old/tlpkg/tlpobj/ocgx.doc.tlpobj 2019-02-28 03:57:50.000000000 +0100
+++ new/tlpkg/tlpobj/ocgx.doc.tlpobj 2020-03-24 02:02:59.000000000 +0100
@@ -1,6 +1,6 @@
name ocgx.doc
category Package
-revision 28492
+revision 54512
shortdesc doc files of ocgx
relocated 1
docfiles size=253
++++++ ocgx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ocgx.tlpobj new/tlpkg/tlpobj/ocgx.tlpobj
--- old/tlpkg/tlpobj/ocgx.tlpobj 2019-02-28 03:57:51.000000000 +0100
+++ new/tlpkg/tlpobj/ocgx.tlpobj 2020-03-24 02:03:00.000000000 +0100
@@ -1,6 +1,6 @@
name ocgx
category Package
-revision 28492
+revision 54512
shortdesc Use OCGs within a PDF document without JavaScript
relocated 1
longdesc The package extends the ocg package, which allows you to create
@@ -16,7 +16,6 @@
RELOC/tex/latex/ocgx/tikzlibraryocgx.code.tex
catalogue-also asymptote
catalogue-ctan /macros/latex/contrib/ocgx
-catalogue-date 2016-12-28 10:23:26 +0100
-catalogue-license lppllppl
+catalogue-license lppl lppl
catalogue-topics pdf-feat
catalogue-version 0.5
++++++ ocgx2.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ocgx2/ChangeLog new/doc/latex/ocgx2/ChangeLog
--- old/doc/latex/ocgx2/ChangeLog 2019-01-02 23:38:58.000000000 +0100
+++ new/doc/latex/ocgx2/ChangeLog 2019-11-10 23:11:28.000000000 +0100
@@ -1,3 +1,44 @@
+2019-11-07
+ * v0.48: ocgx2.sty
+ * fix: link-making commands failed with empty option arg
+
+2019-11-04
+ * v0.47: ocgx2.sty
+ * v0.17: ocgbase.sty
+ * fix: output driver set-up
+
+2019-10-01
+ * v0.46: ocgx2.sty
+ * fix: 2020 deprecations (fixocgx.sty)
+
+2019-09-19
+ * v0.45: ocgx2.sty
+ * new: using comma for separating OCG ids in \showocg, \hideocg etc.; <space>
+ still accepted for compatibility with ocgx/ocg-p
+
+2019-09-17
+ * v0.44: ocgx2.sty
+ * fix: wrong visibility of reopened ocg (introduced in v0.41)
+
+2019-07-04
+ * v0.43: ocgx2.sty
+ * v0.16: ocgbase.sty
+ * fix: ocmd-related refactoring; now, \ocgbase@insert@oc takes into account
+ open OCMD layers;
+ * new: OCMD visibility expressions also accept references to other ocmd
+
+2019-05-28
+ * v0.42: ocgx2.sty
+ * new: `ocmd' TikZ style added; option `radiobtngrp' renamed to
+ `radiobtngrps' and accepting multiple RB group names passed as a
+ comma-separated list (`radiobtngrp' still available as an alias)
+
+2019-05-24
+ * v0.41: ocgx2.sty
+ * v0.15: ocgbase.sty
+ * new: `ocmd' environment (PDF Optional content membership dictionary)
+ * fix: passing driver options to expl3
+
2019-01-02
* v0.40: ocgx2.sty
* fix: merge request incorporated (latex3 end-of-2018 deprecations)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ocgx2/README.txt new/doc/latex/ocgx2/README.txt
--- old/doc/latex/ocgx2/README.txt 2019-01-02 23:38:58.000000000 +0100
+++ new/doc/latex/ocgx2/README.txt 2019-09-19 22:44:28.000000000 +0200
@@ -24,15 +24,17 @@
To enable dvipdfmx support, pass `dvipdfmx' globally as a class option.
Also, it adds some minor improvements and bug fixes, such as package
-options, remembering option settings of re-opened ocgs, correct behaviour
+options, remembering option settings of re-opened OCGs, correct behaviour
of layer switching links that were themselves placed on layers, correct
-listing of (nested) ocgs in the layers tab of PDF viewers, compatibility
+listing of (nested) OCGs in the layers tab of PDF viewers, compatibility
with the `animate' and `media9' packages.
* New features:
+ PDF layers extending over page breaks
- + grouping PDF layers into Radio Button Groups
+ + OCMDs (Optional Content Membership Dictionaries) for creating layers
+ with complex visibility dependency
+ + grouping OCGs into Radio Button Groups
+ additional keys for the TikZ interface of package `ocgx'
+ re-implementing `hyperref's `ocgcolorlinks' option for creating
OCG coloured links, which are printed on paper in the default
@@ -43,49 +45,116 @@
2. Usage
========
-\usepackage[<options>]{ocgx2}
+ \usepackage[<options>]{ocgx2}
-\begin{ocg}[<options>]{<layer name>}{<layer id>}{<initial visibility>}
- ... material to be put on a PDF layer ...
-\end{ocg}
+ \begin{ocg}[<options>]{<layer name>}{<OCG id>}{<initial visibility>}
+ ... material to be put on a PDF layer ...
+ \end{ocg}
-With <initial visibility> = ( on | true | 1 ) | ( off | false | 0 )
+<layer name> is the name shown in the PDF viewer's "Layers" panel,
+<OCG id> is an identifier used for referencing the layer elsewhere in the
+document (e. g. layer switching buttons, visibility configuration of an `ocmd'
+environment, re-opening the OCG at another place using the `ocg' environment).
-and <options> : viewocg = always | never | ifvisible
- printocg = always | never | ifvisible
- exportocg = always | never | ifvisible
+<initial visibility> is `on', `true', `1' or `off', `false', `0'.
- not in ocgx, ocg-p:
+ \begin{ocmd}[<OCMD id>]{[<visibility policy>][,<visibility expression>]}
+ ... material to be put on a PDF layer ...
+ visibility calculated by <visibility expression> (Boolean expression) from
+ other OCGs visibility, or according to <visibility policy>
+ \end{ocmd}
- showingui (to be preferred over `listintoolbar' of ocgx/ocg-p)
- radiobtngrp = <group name> (string; environment-only option)
- tikz (package-only option)
- ocgcolorlinks (package-only option)
+Package and `ocg' environment options:
+
+ viewocg = always | never | ifvisible
+ printocg = always | never | ifvisible
+ exportocg = always | never | ifvisible
+
+ not in ocgx, ocg-p:
+
+ showingui (to be preferred over `listintoolbar' of ocgx/ocg-p)
+ radiobtngrps = {[,[, ...]]}
+
+ tikz (package-only option)
+ ocgcolorlinks (package-only option)
Package options have global scope. Environment options override package
options locally.
-Layers can be added to one or several Radio Button Groups using the new
-option `radiobtngrp'. From all layers within a Radio Button Group only
-one can be enabled at a time. Enabling a layer, e. g. in the Layers tab
-of the PDF viewer, automatically hides the previously visible layer.
-Option `radiobtngrp' can be used repeatedly for the same OCG in order
-to add the layer to more than one Radio Button Group.
+OCGs can be added to one or multiple Radio Button Groups using the new
+option `radiobtngrps'. From all OCGs within a Radio Button Group only _one_
+can be enabled at a time. Enabling an OCG, e. g. in the Layers tab of the PDF
+viewer, automatically hides the previously visible OCG in the group. An OCG
+can be added to multiple Radio Button Groups, passing a comma-separated list of
+group names. Such a list must be enclosed in braces, `{...}'.
-`ocg' environments can be nested and span multiple pages.
+`ocg' as well as `ocmd' environments can be nested and span multiple pages.
See the `ocg-p' manual about the environment usage and the meaning of
the remaining options:
texdoc ocg-p
-Clickable links for switching PDF layer visibility are created with:
- \switchocg[<trigger>]{}{<link text>}
- \showocg[<trigger>]{}{<link text>}
- \hideocg[<trigger>]{}{<link text>}
- \actionsocg[<trigger>]{<IDs to toggle>}{<IDs to switch ON>}{<IDs to switch OFF>}{<link text>}
+3. The `ocmd' environment (Optional Content Membership Dictionary)
+==================================================================
+
+ \begin{ocmd}[<OCMD id>]{[<visibility policy>][,<visibility expression>]}
+ ... material to be put on a PDF layer ...
+ \end{ocmd}
+
+This environment creates a PDF layer whose visibility is determined by the
+current visibilities of other OCGs in the document according to at most one
+visibility policy plus at most one visibility expression. If both are given
+(with a comma in between) `<visibility expression>' takes precedence over
+`<visibility policy>', but the latter may serve as a fallback in older PDF
+viewers.
+
+`<OCMD id>' is an optional identifier which can be used to re-open the same
+layer with the same visibility setting at another place further down in the
+document.
+
+A `<visibility policy>' can be _one_ of
+
+ \AllOn{, , ...}
+ \AnyOn{, , ...}
+ \AnyOff{, , ...}
+ \AllOff{, , ...}
+
+All four directives take a list of OCG ids from wich the OCMD visibility is
+calculated. If the condition represented by the policy is met, the content
+associated with the OCMD is shown. The listed OCGs can be defined anywhere in
+the document. These directives can neither be combined nor nested in order to
+define the policy. Thus, a visibility policy has limited capabilities.
+
+A `<visibility expression>' is much more flexible than a policy. Arbitrarily
+complex visibility relationships can be formulated, based on the Boolean
+functions
+
+ \And{<item a>, <item b>, ...}
+ \Or{<item i>, <item j>, ...}
+ \Not{<item n>}
+
+In the argument list, items represent OCG/OCMD ids as well as nested Boolean
+functions. As nesting of the three functions is possible, any thinkable
+visibility relationship can be defined. Note that `\Not{...}' accepts only one
+item, either an OCG/OCMD id or a nested function. Also note that Boolean functions
+and policy directives cannot be intermixed.
+
+As a trivial example, the visibility expression equivalent of the policy
+directive `\AllOff{...}' is written as `\Not{ \Or{ ... } }'.
+
+
+4. Clickable links for switching PDF layer visibility
+=====================================================
+
+The available commands are
+
+ \switchocg[<trigger>]{}{<link text>}
+ \showocg[<trigger>]{}{<link text>}
+ \hideocg[<trigger>]{}{<link text>}
+ \actionsocg[<trigger>]{<ids to toggle>}{<ids to switch ON>}{<ids to switch OFF>}{<link text>}
For details about their usage, read the `ocgx' package manual:
@@ -98,16 +167,21 @@
onmousenter, onmouseexit, onmousedown, onmouseup, onmouseall
for <trigger>. In order to listen to more than one mouse event, use
-`onmouseall'. Layer IDs in the mandatory argument(s) must then be grouped with
-commas as follows:
+`onmouseall'. Layer ids in the mandatory argument(s) must then be grouped with
+braces and commas as follows:
- <mouse-enter group>, <mouse-exit group>, <mouse-down group>, <mouse-up group>
+ {<mouse-enter group>}, {<mouse-exit group>}, {<mouse-down group>}, {<mouse-up group>}
Any of these groups may be left empty in order to configure only some
-mouse triggers. Inside the groups, layer IDs are separated by space.
+mouse triggers. Inside the groups, OCG ids are also separated by commas.
+Therefore, braces must be put around the groups. For example:
+
+ \switchocg[onmouseall]{
+ , , {ocg1, ocg2, ocg3, ocg4}, {ocg1, ocg2, ocg3, ocg4}
+ }{Toggle layers on mouse-down and -up}
-3. Package option `ocgcolorlinks'
+5. Package option `ocgcolorlinks'
=================================
Is a re-implementation of the same `hyperref' option for creating OCG-
@@ -133,7 +207,7 @@
\ocglinkprotect{\includegraphics{ctan-lion}}!}
-4. Usage with TikZ
+5. Usage with TikZ
==================
`ocgx2' uses code from file `tikzlibraryocgx.code.tex' by P. Gaborit to
@@ -154,13 +228,35 @@
texdoc ocgx
-The key `/tikz/ocg/opts' was added to the list in section
-`How to add TikZ scopes into OCGs' in the `ocgx' manual:
+Package `ocgx2' adds the key `/tikz/ocg/opts' to the list in section ``How to
+add TikZ scopes into OCGs'" in the `ocgx' manual:
+
+ /tikz/ocg/opts={<OCG options>}
+
+It can be used inside the `ocg' style
- /tikz/ocg/opts={<ocg options>}
+ \begin{scope}[
+ ocg={ref=..., name=..., opts={..., ...}},
+ ...
+ ]
+ ...
+ \end{scope}
+
+and allows passing `ocg'-environment options (`viewocg', `printocg', `exportocg',
+`showingui', `radiobtngrps') to the TikZ scope.
+
+The style `ocmd={...}' is another way for turning a TikZ scope into a PDF
+layer (in addition to `ocg={...}'). It has two sub-keys, `ref={...}' and
+`visibility={...}', which have the same meaning as the optional and the
+mandatory arguments of the `ocmd' environment:
+
+ \begin{scope}[
+ ocmd={ref=..., visibility=...},
+ ...
+ ]
+ ...
+ \end{scope}
-It allows passing `ocg'-environment options (`viewocg', `printocg', `exportocg',
-`showingui', `radiobtngrp') to the TikZ scope.
Moreover, TikZ objects to be turned into OCG switching hyperlinks (section "How
to transform nodes or paths into clickable links" in the `ocgx' manual) accept
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ocgx2.doc.tlpobj new/tlpkg/tlpobj/ocgx2.doc.tlpobj
--- old/tlpkg/tlpobj/ocgx2.doc.tlpobj 2019-02-28 03:57:51.000000000 +0100
+++ new/tlpkg/tlpobj/ocgx2.doc.tlpobj 2019-11-12 01:55:00.000000000 +0100
@@ -1,8 +1,8 @@
name ocgx2.doc
category Package
-revision 49580
+revision 52730
shortdesc doc files of ocgx2
relocated 1
-docfiles size=4
+docfiles size=5
RELOC/doc/latex/ocgx2/ChangeLog
RELOC/doc/latex/ocgx2/README.txt
++++++ ocgx2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ocgx2/fixocgx.sty new/tex/latex/ocgx2/fixocgx.sty
--- old/tex/latex/ocgx2/fixocgx.sty 2015-06-19 01:16:56.000000000 +0200
+++ new/tex/latex/ocgx2/fixocgx.sty 2019-10-02 23:17:55.000000000 +0200
@@ -7,7 +7,7 @@
\ExplSyntaxOn
-\msg_interrupt:nnn{Package~`fixocgx':}{
+\msg_new:nnnn{fixocgx}{obsolete}{
This~package~is~obsolete~and~replaced~by~package~`ocgx2'.\\\\
Remove\\\\
\space\space\string\usepackage{ocgx}\\
@@ -19,4 +19,6 @@
Read~the~manual~(`texdoc~ocgx2')~for~further~information.
}
+\msg_error:nn{fixocgx}{obsolete}
+
\ExplSyntaxOff
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ocgx2/ocgbase.sty new/tex/latex/ocgx2/ocgbase.sty
--- old/tex/latex/ocgx2/ocgbase.sty 2018-06-09 00:04:17.000000000 +0200
+++ new/tex/latex/ocgx2/ocgbase.sty 2019-11-04 23:16:29.000000000 +0100
@@ -93,14 +93,38 @@
% The Current Maintainer of this work is A. Grahn.
\RequirePackage{expl3}
-\RequirePackage{pdfbase}
+\RequirePackage{l3keys2e}
-\def\g@ocgbase@date@tl{2018/06/07}
-\def\g@ocgbase@version@tl{0.14}
+\def\g@ocgbase@date@tl{2019/11/04}
+\def\g@ocgbase@version@tl{0.17}
\ProvidesExplPackage{ocgbase}{\g@ocgbase@date@tl}{\g@ocgbase@version@tl}
{support package for ocgx2.sty}
+%package options
+
+%unknown package option error message
+\msg_set:nnnn{ocgbase}{unknown~package~option}{Unknown~package~option~`#1'.}{
+ Package option~'#1'~is~unknown;\\
+ perhaps~it~is~spelled~incorrectly.
+}
+
+\keys_define:nn{ocgbase}{
+ xetex .code:n = {}, %dummy
+
+ dvipdfmx .choice:,
+ dvipdfmx / true .code:n = {\PassOptionsToPackage{dvipdfmx}{pdfbase}},
+ dvipdfmx / false .code:n = {},
+ dvipdfmx .default:n = {true},
+
+ unknown .code:n = {
+ \msg_error:nnx{ocgbase}{unknown~package~option}{\l_keys_key_tl}
+ }
+}
+\ProcessKeysOptions{ocgbase}
+
+\RequirePackage{pdfbase}
+
\msg_set:nnnn{ocgbase}{support~outdated}{
Support~package~`#1'~too~old.
}{
@@ -141,7 +165,7 @@
%generate RBGroups entry (radio button groups)
\tl_new:N\l_ocgbase_rbtn_groups_tl
\seq_map_inline:Nn\g_ocgbase_rbtn_groups_seq{
- \int_compare:nT{\seq_count:c{g_ocgbase_rbtn_group_#1_seq}>\c_one}{
+ \int_compare:nT{\seq_count:c{g_ocgbase_rbtn_group_#1_seq}>\c_one_int}{
\tl_put_right:Nx\l_ocgbase_rbtn_groups_tl{
~[\seq_use:cn{g_ocgbase_rbtn_group_#1_seq}{~}]
}
@@ -174,14 +198,14 @@
%macro for inserting new OCG object
\cs_new_protected_nopar:Nn\ocgbase_new_ocg:nnn{
\pbs_pdfobj:nnn{}{dict}{
- /Type/OCG/Name~(#1)~\str_if_eq_x:nnF{#2}{}{/Usage<<#2>>}
+ /Type/OCG/Name~(#1)~\str_if_eq:eeF{#2}{}{/Usage<<#2>>}
}
\tl_gput_right:Nx\g_ocgbase_ocgs_tl{~\pbs_pdflastobj:}
\bool_if:nT{
- \str_if_eq_x_p:nn{#3}{0} ||
- \str_if_eq_x_p:nn{#3}{off} ||
- \str_if_eq_x_p:nn{#3}{false} ||
- \str_if_eq_x_p:nn{#3}{invisible}
+ \str_if_eq_p:ee{#3}{0} ||
+ \str_if_eq_p:ee{#3}{off} ||
+ \str_if_eq_p:ee{#3}{false} ||
+ \str_if_eq_p:ee{#3}{invisible}
}{
\ocgbase_add_to_off_list:n{\pbs_pdflastobj:}
}
@@ -236,7 +260,7 @@
\cs_new_protected:Nn\ocgbase_tree_node_end:{
\seq_get:NN\g_ocgbase_tree_nd_stack_seq\l_tempa_tl
\seq_get:NN\g_ocgbase_tree_ocg_stack_seq\l_tempb_tl
- \str_if_eq_x:nnT{
+ \str_if_eq:eeT{
\cs_if_exist_use:c{g_ocgbase_nd_\l_tempa_tl _ocg_tl}
}{
\l_tempb_tl
@@ -252,7 +276,7 @@
% the node id of the sibling found is returned in arg #1
\cs_new:Nn\ocgbase_traverse_siblings:NN{
% #1: current node (in/out), #2: OCG obj (in/out)
- \str_if_eq_x:nnF{#2}{\tl_use:c{g_ocgbase_nd_#1_ocg_tl}}{
+ \str_if_eq:eeF{#2}{\tl_use:c{g_ocgbase_nd_#1_ocg_tl}}{
\tl_if_exist:cTF{g_ocgbase_nd_#1_sbl_tl}{
\tl_set:Nv#1{g_ocgbase_nd_#1_sbl_tl}
\ocgbase_traverse_siblings:NN#1#2
@@ -329,14 +353,6 @@
\cs_new_protected_nopar:Nn\ocgbase_open_stack_pop:N{
\seq_gpop:NN\g_ocgbase_open_stack_seq#1}
-%command that inserts /OC <<OCMD with currently open OCGs>> entry;
-%for use within annotation/xobject dicts
-\cs_new_nopar:Nn\ocgbase_insert_oc:{
- \seq_if_empty:NF\g_ocgbase_open_stack_seq{
- /OC~<>
- }
-}
-
%l2e versions
\cs_gset_eq:NN\ocgbase@new@ocg\ocgbase_new_ocg:nnn
\cs_gset_eq:NN\ocgbase@last@ocg\ocgbase_last_ocg:
@@ -347,6 +363,5 @@
\cs_gset_eq:NN\ocgbase@add@ocg@to@radiobtn@grp\ocgbase_add_ocg_to_radiobtn_grp:nn
\cs_gset_eq:NN\ocgbase@oc@bdc\ocgbase_oc_bdc:n
\cs_gset_eq:NN\ocgbase@oc@emc\ocgbase_oc_emc:
-\cs_gset_eq:NN\ocgbase@insert@oc\ocgbase_insert_oc:
\cs_gset_eq:NN\ocgbase@open@stack@pop\ocgbase_open_stack_pop:N
\cs_gset_eq:NN\ocgbase@open@stack@push\ocgbase_open_stack_push:n
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ocgx2/ocgx2.sty new/tex/latex/ocgx2/ocgx2.sty
--- old/tex/latex/ocgx2/ocgx2.sty 2019-01-02 23:38:58.000000000 +0100
+++ new/tex/latex/ocgx2/ocgx2.sty 2019-11-10 23:11:28.000000000 +0100
@@ -15,7 +15,9 @@
%
% With ocgx2, PDF layers may extend across page breaks.
%
-% Adds some minor improvements, such as package options, remembering option
+% ocgx2 implements OCMDs (optional content membership dictionaries)
+%
+% Adds some minor improvements, such as package options, remembering option.
% settings of reopened ocgs, correct behaviour of ocg switching links that were
% themselves placed on layers, compatibility with the animate and media9
% packages.
@@ -38,20 +40,24 @@
\RequirePackage{xparse}
\RequirePackage{l3keys2e}
-\def\g@ocgxii@date@tl{2019/01/02}
-\def\g@ocgxii@version@tl{0.40}
+\def\g@ocgxii@date@tl{2019/11/07}
+\def\g@ocgxii@version@tl{0.48}
\ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl}
{ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx}
%creating global definitions
\cs_new_protected:Npn\ocgxii@newkey#1#2{\tl_gset:cx{#1}{#2}}
+\cs_new_protected:Npn\ocgxii@newkeynoexp#1#2{\tl_gset:cn{#1}{#2}}
\AtBeginDocument{
\iow_now:Nx\@mainaux{
\token_to_str:N\providecommand\token_to_str:N\ocgxii@newkey[2]{}
}
\iow_now:Nx\@mainaux{
+ \token_to_str:N\providecommand\token_to_str:N\ocgxii@newkeynoexp[2]{}
+ }
+ \iow_now:Nx\@mainaux{
\token_to_str:N\providecommand\token_to_str:N\ocgxii@ocg@stack@on@page[2]{}
}
\iow_now:Nx\@mainaux{
@@ -60,6 +66,8 @@
}
}
+\msg_set:nnn{ocgx2}{generic~msg}{#1\\#2}
+
\msg_set:nnn{ocgx2}{missing~package}{
Package~`#1'~must~be~loaded~before~ocgx2.\\\\
Put\\\\
@@ -87,11 +95,10 @@
\bool_new:N\l_ocgxii_showingui_bool
\keys_define:nn{ocgx2}{
- xetex .code:n = {
- \PassOptionsToPackage{xetex}{pdfbase}
- },
+ xetex .code:n = {}, %dummy
dvipdfmx .code:n = {
+ \PassOptionsToPackage{dvipdfmx}{ocgbase}
\PassOptionsToPackage{dvipdfmx}{pdfbase}
\bool_gset_true:N\g_ocgxii_dvipdfmx_bool
},
@@ -122,8 +129,8 @@
showingui .choices:nn = {true,false,always,never,iffirstuse}{
\bool_if:nTF{
- \str_if_eq_x_p:nn{#1}{false} ||
- \str_if_eq_x_p:nn{#1}{never}
+ \str_if_eq_p:ee{#1}{false} ||
+ \str_if_eq_p:ee{#1}{never}
}{
\bool_gset_false:N\g_ocgxii_showingui_bool
}{
@@ -151,50 +158,51 @@
%process package options
\ProcessKeysOptions{ocgx2}
-\sys_if_engine_xetex:T{
- \bool_gset_true:N\g_ocgxii_dvipdfmx_bool
-}
+\sys_if_engine_xetex:T{\bool_gset_true:N\g_ocgxii_dvipdfmx_bool}
\RequirePackage{ocgbase} %also loads pdfbase.sty
%re-implement ocg-p's `ocg' environment
\DeclareDocumentEnvironment{ocg}{O{}mmm}{
- \ocgxii_beginocg:nnnn{#1}{#2}{#3}{#4}
+ \ocgxii_begin_ocg:nnnn{#1}{#2}{#3}{#4}
}{
- \ocgxii_endocg:
+ \ocgxii_end_ocg:
}
-\cs_new_protected_nopar:Nn\ocgxii_beginocg:nnnn{
+\cs_new_protected_nopar:Nn\ocgxii_begin_ocg:nnnn{
\group_begin:
\ocgxii_reset_cmd_opts: % ... to the user-set package options
- \tl_if_exist:cTF{ocgxii@#3}{ %re-open existing layer
- \tl_set:Nx\l_tempa_tl{\tl_use:c{ocgxii@#3.opts},#1}
- \tl_gset:cx{ocgxii@#3.opts}{\l_tempa_tl} %new options appended
- \keys_set:nV{ocgx2/user}\l_tempa_tl
+ \tl_set:Nx\l_ocgxii_argiv_tl{\tl_trim_spaces:n{#4}}
+ \tl_if_exist:cTF{ocgxii_ocg_#3}{ %re-open existing layer
+ \tl_set:Nx\l_tempa_tl{\tl_use:c{ocgxii_ocg_#3.opts},#1}
+ \tl_gset:cx{ocgxii_ocg_#3.opts}{\l_tempa_tl} %new options appended
+ \keys_set:nV{ocgx2/ocgenv}\l_tempa_tl
\bool_if:nTF{ %initial visibility
- \str_if_eq_x_p:nn{#4}{1} ||
- \str_if_eq_x_p:nn{#4}{on} ||
- \str_if_eq_x_p:nn{#4}{true}
+ \str_if_eq_p:ee{\l_ocgxii_argiv_tl}{1} ||
+ \str_if_eq_p:ee{\l_ocgxii_argiv_tl}{on} ||
+ \str_if_eq_p:ee{\l_ocgxii_argiv_tl}{true}
}{
- \ocgbase_del_from_off_list:n{\tl_use:c{ocgxii@#3}}
+ \ocgbase_del_from_off_list:n{\tl_use:c{ocgxii_ocg_#3}}
}{
- \ocgbase_add_to_off_list:n{\tl_use:c{ocgxii@#3}}
+ \ocgbase_add_to_off_list:n{\tl_use:c{ocgxii_ocg_#3}}
}
}{
\tl_set:Nx\l_tempa_tl{#1}
- \tl_gset:cx{ocgxii@#3.opts}{\l_tempa_tl}
- \keys_set:nV{ocgx2/user}\l_tempa_tl
+ \tl_gset:cx{ocgxii_ocg_#3.opts}{\l_tempa_tl}
+ \keys_set:nV{ocgx2/ocgenv}\l_tempa_tl
\ocgbase_new_ocg:nnn{#2}{
\l_ocgxii_view_tl\l_ocgxii_print_tl\l_ocgxii_export_tl
- }{#4}
- \tl_gset:cx{ocgxii@#3}{\ocgbase_last_ocg:}
+ }{\l_ocgxii_argiv_tl}
+ \tl_gset:cx{ocgxii_ocg_#3}{\ocgbase_last_ocg:}
+ \tl_gset:cx{ocgx2.ocg.\ocgbase_last_ocg:}{\ocgbase_last_ocg:}
+ \tl_gset:cx{ocgx2.ocg.#3}{\ocgbase_last_ocg:}
\iow_now:Nx\@mainaux{
\token_to_str:N\ocgxii@newkey{ocgx2.ocg.#3}{\ocgbase_last_ocg:}
}
}
\bool_if:nT{
!\cs_if_exist:cTF{ocgx2.ocg.#3}{
- \str_if_eq_x_p:nn{\tl_use:c{ocgx2.ocg.#3}}{\tl_use:c{ocgxii@#3}}
+ \str_if_eq_p:ee{\tl_use:c{ocgx2.ocg.#3}}{\tl_use:c{ocgxii_ocg_#3}}
}{
\c_false_bool
}
@@ -204,29 +212,346 @@
\AtEndDocument{\msg_warning:nn{ocgx2}{rerun}}
}
}
- \tl_gset:cx{ocgx2.ocg.#3}{\tl_use:c{ocgxii@#3}}
\seq_map_inline:Nn\l_ocgxii_rbgrps_seq{% process list of radio btn groups
- \ocgbase_add_ocg_to_radiobtn_grp:nn{##1}{\tl_use:c{ocgxii@#3}}
+ \ocgbase_add_ocg_to_radiobtn_grp:nn{##1}{\tl_use:c{ocgxii_ocg_#3}}
}
- \ocgbase_open_stack_push:n{\tl_use:c{ocgxii@#3}}
+ \ocgbase_open_stack_push:n{\tl_use:c{ocgxii_ocg_#3}}
+ \ocgxii_make_oc_entry:
\ocgxii_stack_shipout:NN\ocgxii@ocg@stack@on@page\g_ocgbase_open_stack_seq
% insert OCG into Order tree
\bool_if:NT\l_ocgxii_showingui_bool{
- \ocgbase_tree_node_begin:n{\tl_use:c{ocgxii@#3}}
+ \ocgbase_tree_node_begin:n{\tl_use:c{ocgxii_ocg_#3}}
}
\group_end:
- \ocgbase_oc_bdc:n{\tl_use:c{ocgxii@#3}}
+ \ocgbase_oc_bdc:n{\tl_use:c{ocgxii_ocg_#3}}
\ignorespaces
}
-\cs_new_protected_nopar:Nn\ocgxii_endocg:{
+\cs_new_protected_nopar:Nn\ocgxii_end_ocg:{
\unskip
\ocgbase_oc_emc:
\ocgbase_tree_node_end:
\ocgbase_open_stack_pop:N\l_trash_tl
+ \ocgxii_make_oc_entry:
+ \ocgxii_stack_shipout:NN\ocgxii@ocg@stack@on@page\g_ocgbase_open_stack_seq
+}
+
+% OCMD implementation
+\DeclareDocumentEnvironment{ocmd}{O{}m}{
+ \ocgxii_begin_ocmd:on{#1}{#2}
+ \ignorespaces
+}{
+ \unskip
+ \ocgxii_end_ocmd:
+}
+
+\cs_new_protected_nopar:Nn\ocgxii_begin_ocmd:nn{ % #1: id,
+ \bool_if:nTF{ % #2: visib. expr. or policy
+ \tl_if_blank:oTF{#1}{
+ \c_false_bool
+ }{
+ \tl_if_exist_p:c{ocgxii_ocmd_#1}
+ }
+ }{
+ % re-open existing ocmd
+ \tl_set_eq:Nc\l_ocgxii_cur_ocmd_tl{ocgxii_ocmd_#1}
+ }{
+ % new ocmd
+ \group_begin:
+ \ocgxii_ocmd_read_visbility:nN{#2}\l_ocgxii_ocmd_visibility_tl
+ \pbs_pdfobj:nnn{}{dict}{/Type/OCMD\l_ocgxii_ocmd_visibility_tl}
+ %if only visb. policy is given, generate equivalent visib. expression,
+ %needed for stack of open layers and \ocgxii_make_oc_entry: command
+ \ocgxii_ocmd_make_equiv_ve:nN{#2}\l_ocgxii_ocmd_equiv_ve_tl
+ \tl_gset:co{ocgx2.ocmd.\pbs_pdflastobj:}{\l_ocgxii_ocmd_equiv_ve_tl}
+ \group_end:
+ \tl_set:Nx\l_ocgxii_cur_ocmd_tl{\pbs_pdflastobj:}
+ \tl_if_blank:oF{#1}{
+ \tl_gset:cx{ocgxii_ocmd_#1}{\pbs_pdflastobj:}
+ \iow_now:Nn\@mainaux{\ocgxii@newkeynoexp{ocgx2.ocmd.#1}{#2}}
+ }
+ }
+ \ocgbase_open_stack_push:n{\l_ocgxii_cur_ocmd_tl}
+ \ocgxii_make_oc_entry:
+ \ocgxii_stack_shipout:NN\ocgxii@ocg@stack@on@page\g_ocgbase_open_stack_seq
+ \ocgbase_oc_bdc:n{\l_ocgxii_cur_ocmd_tl}
+}
+\cs_generate_variant:Nn\ocgxii_begin_ocmd:nn{on}
+\cs_new_protected_nopar:Nn\ocgxii_end_ocmd:{
+ \ocgbase_oc_emc:
+ \ocgbase_open_stack_pop:N\l_trash_tl
+ \ocgxii_make_oc_entry: %update
\ocgxii_stack_shipout:NN\ocgxii@ocg@stack@on@page\g_ocgbase_open_stack_seq
}
+%visibility expressions
+\cs_new_protected_nopar:Nn\ocgxii_ocmd_read_visbility:nN{
+ \int_zero:N\l_ocgxii_ve_cnt_int
+ \int_zero:N\l_ocgxii_vp_cnt_int
+ \tl_clear_new:N#2
+ \clist_map_inline:nn{#1}{\ocgxii_omcd_parse_argument:nN{##1}#2}
+}
+\cs_new_protected_nopar:Nn\ocgxii_omcd_parse_argument:nN{
+ \cs_set_eq:NN\AllOn \ocgxii_vp_check:n
+ \cs_set_eq:NN\AnyOn \ocgxii_vp_check:n
+ \cs_set_eq:NN\AnyOff\ocgxii_vp_check:n
+ \cs_set_eq:NN\AllOff\ocgxii_vp_check:n
+ \cs_set_eq:NN\Not\ocgxii_ve_check:n
+ \cs_set_eq:NN\And\ocgxii_ve_check:n
+ \cs_set_eq:NN\Or \ocgxii_ve_check:n
+ \tl_if_exist:cTF{ocgx2.ocg.#1}{
+ \msg_error:nnxx{ocgx2}{generic~msg}{
+ OCG~ids~cannot~be~directly~used~in~the~visibility~argument~of~an~
+ `ocmd'~environment.
+ }{\g_ocgxii_help_msg_tl}
+ }{
+ \tl_if_exist:cTF{ocgx2.ocmd.#1}{
+ \msg_error:nnxx{ocgx2}{generic~msg}{
+ OCMD~ids~cannot~be~directly~used~in~the~visibility~argument~of~an~
+ `ocmd'~environment.
+ }{\g_ocgxii_help_msg_tl}
+ }{
+ \tl_if_exist:cTF{ocgxii_#1}{
+ \str_case_e:nn{\tl_use:c{ocgxii_#1}}{
+ {VisExpr}{
+ \int_incr:N\l_ocgxii_ve_cnt_int
+ \int_compare:nNnTF{\l_ocgxii_ve_cnt_int}>{1}{
+ \msg_error:nnnn{ocgx2}{generic~msg}{
+ More~than~one~visibility~expression~passed~to~the~`ocmd'~
+ environment.
+ }{
+ At~most~one~visibility~expression~is~allowed.~A~visibility~
+ expression~is~a~boolean~expression~built~by~nesting~any~number~of~
+ \And{...},~\Or{...},~\Not{...}~commands.
+ }
+ }{
+ \tl_put_right:Nx#2{/VE~}
+ \ocgxii_ocmd_expression_parser:nN{#1}#2
+ }
+ }
+ {VisPol}{
+ \int_incr:N\l_ocgxii_vp_cnt_int
+ \int_compare:nNnTF{\l_ocgxii_vp_cnt_int}>{1}{
+ \msg_error:nnnn{ocgx2}{generic~msg}{
+ More~than~one~visibility~policy~passed~to~the~`ocmd'~environment.
+ }{
+ At~most~one~visibility~policy~out~of~\AllOn{...},~\AnyOn{...},~
+ \AnyOff{...},~\AllOff{...}~is~allowed.~Any~number~of~OCG~IDs,~
+ separated~by~commas,~may~be~passed~as~arguments~to~these~
+ commands,~but~commands~may~not~be~nested.~For~complex~visibilty~
+ relations,~consider~using~a~visibility~expression.
+ }
+ }{
+ \ocgxii_ocmd_expression_parser:nN{#1}#2
+ }
+ }
+ }
+ }{
+ \msg_error:nnxx{ocgx2}{generic~msg}{
+ The~visibility~argument~of~the~`ocmd'~environment~cannot~be~parsed.
+ }{\g_ocgxii_help_msg_tl}
+ }
+ }
+ }
+}
+\cs_generate_variant:Nn\ocgxii_omcd_parse_argument:nN{xN}
+\cs_generate_variant:Nn\ocgxii_omcd_parse_argument:nN{oN}
+\cs_new_protected_nopar:Nn\ocgxii_ocmd_expression_parser:nN{
+ \cs_set_eq:NN\AllOn \ocgxii_vp_check:n
+ \cs_set_eq:NN\AnyOn \ocgxii_vp_check:n
+ \cs_set_eq:NN\AnyOff\ocgxii_vp_check:n
+ \cs_set_eq:NN\AllOff\ocgxii_vp_check:n
+ \cs_set_eq:NN\Not\ocgxii_ve_check:n
+ \cs_set_eq:NN\And\ocgxii_ve_check:n
+ \cs_set_eq:NN\Or \ocgxii_ve_check:n
+ \tl_if_exist:cTF{ocgx2.ocg.#1}{% ocg reference
+ \tl_put_right:Nx#2{~\tl_use:c{ocgx2.ocg.#1}}
+ }{
+ \tl_if_exist:cTF{ocgx2.ocmd.#1}{% ocmd reference
+ \ocgxii_ocmd_expression_parser:vN{ocgx2.ocmd.#1}#2
+ }{
+ \tl_if_exist:cTF{ocgxii_#1}{% visib. bool expression or policy directive
+ \bool_if:nTF{
+ \str_if_eq_p:ee{\tl_use:c{ocgxii_#1}}{VisExpr} &&
+ \bool_if_p:N\l_ocgxii_vp_open_bool ||
+ \str_if_eq_p:ee{\tl_use:c{ocgxii_#1}}{VisPol} &&
+ \bool_if_p:N\l_ocgxii_ve_open_bool
+ }{
+ \msg_error:nnxx{ocgx2}{generic~msg}{
+ Visibility~policy~and~expression~commands~cannot~be~mixed.
+ }{\g_ocgxii_help_msg_tl}
+ }{
+ \bool_if:nT{
+ \str_if_eq_p:ee{\tl_use:c{ocgxii_#1}}{VisPol} &&
+ \bool_if_p:N\l_ocgxii_vp_open_bool
+ }{
+ \msg_error:nnxx{ocgx2}{generic~msg}{
+ Visibility~policy~commands~cannot~be~nested.~For~more~complex~
+ visibilty~relations,~consider~using~a~visibility~expression.
+ }{\g_ocgxii_help_msg_tl}
+ }
+ }
+ \cs_set_eq:NN\AllOn \ocgxii_vp_allon:nN
+ \cs_set_eq:NN\AnyOn \ocgxii_vp_anyon:nN
+ \cs_set_eq:NN\AnyOff\ocgxii_vp_anyoff:nN
+ \cs_set_eq:NN\AllOff\ocgxii_vp_alloff:nN
+ \cs_set_eq:NN\Not\ocgxii_ve_not:nN
+ \cs_set_eq:NN\And\ocgxii_ve_and:nN
+ \cs_set_eq:NN\Or \ocgxii_ve_or:nN
+ #1#2
+ }{
+ \msg_warning:nnx{ocgx2}{undefined~OCG}{#1}
+ \tl_if_exist:NF\g_ocgxii_refundefwarned_tl{
+ \tl_new:N\g_ocgxii_refundefwarned_tl
+ \AtEndDocument{\msg_warning:nn{ocgx2}{undefined~OCGs}}
+ }
+ }
+ }
+ }
+}
+\cs_generate_variant:Nn\ocgxii_ocmd_expression_parser:nN{vN}
+% visib. policy directives
+\cs_new_protected_nopar:Nn\ocgxii_vp_allon:nN{
+ \bool_set_true:N\l_ocgxii_vp_open_bool
+ \tl_put_right:Nx#2{/P/AllOn/OCGs~\g_ocgxii_left_bracket_tl}
+ \clist_map_inline:nn{#1}{\ocgxii_ocmd_expression_parser:nN{##1}#2}
+ \tl_put_right:Nx#2{\g_ocgxii_right_bracket_tl}
+ \bool_set_false:N\l_ocgxii_vp_open_bool
+}
+\cs_new_protected_nopar:Nn\ocgxii_vp_anyon:nN{
+ \bool_set_true:N\l_ocgxii_vp_open_bool
+ \tl_gput_right:Nx#2{/P/AnyOn/OCGs~\g_ocgxii_left_bracket_tl}
+ \clist_map_inline:nn{#1}{\ocgxii_ocmd_expression_parser:nN{##1}#2}
+ \tl_gput_right:Nx#2{\g_ocgxii_right_bracket_tl}
+ \bool_set_false:N\l_ocgxii_vp_open_bool
+}
+\cs_new_protected_nopar:Nn\ocgxii_vp_anyoff:nN{
+ \bool_set_true:N\l_ocgxii_vp_open_bool
+ \tl_gput_right:Nx#2{/P/AnyOff/OCGs~\g_ocgxii_left_bracket_tl}
+ \clist_map_inline:nn{#1}{\ocgxii_ocmd_expression_parser:nN{##1}#2}
+ \tl_gput_right:Nx#2{\g_ocgxii_right_bracket_tl}
+ \bool_set_false:N\l_ocgxii_vp_open_bool
+}
+\cs_new_protected_nopar:Nn\ocgxii_vp_alloff:nN{
+ \bool_set_true:N\l_ocgxii_vp_open_bool
+ \tl_gput_right:Nx#2{/P/AllOff/OCGs~\g_ocgxii_left_bracket_tl}
+ \clist_map_inline:nn{#1}{\ocgxii_ocmd_expression_parser:nN{##1}#2}
+ \tl_gput_right:Nx#2{\g_ocgxii_right_bracket_tl}
+ \bool_set_false:N\l_ocgxii_vp_open_bool
+}
+% policy to expression conversion
+\cs_new_protected_nopar:Nn\ocgxii_ocmd_make_equiv_ve:nN{
+ \int_zero:N\l_ocgxii_ve_cnt_int
+ \tl_clear_new:N#2
+ \clist_map_inline:nn{#1}{\ocgxii_omcd_convert_vp:nN{##1}#2}
+}
+\cs_new_protected_nopar:Nn\ocgxii_omcd_convert_vp:nN{
+ \cs_set_eq:NN\AllOn \ocgxii_vp_check:n
+ \cs_set_eq:NN\AnyOn \ocgxii_vp_check:n
+ \cs_set_eq:NN\AnyOff\ocgxii_vp_check:n
+ \cs_set_eq:NN\AllOff\ocgxii_vp_check:n
+ \cs_set_eq:NN\Not\ocgxii_ve_check:n
+ \cs_set_eq:NN\And\ocgxii_ve_check:n
+ \cs_set_eq:NN\Or \ocgxii_ve_check:n
+ \tl_if_exist:cT{ocgxii_#1}{
+ \str_case_e:nn{\tl_use:c{ocgxii_#1}}{
+ {VisExpr}{
+ \int_incr:N\l_ocgxii_ve_cnt_int
+ \tl_set:Nn#2{#1}
+ }
+ {VisPol}{
+ \int_compare:nNnT{\l_ocgxii_ve_cnt_int}={0}{
+ \cs_set_eq:NN\AllOn \ocgxii_allon_to_ve:n
+ \cs_set_eq:NN\AnyOn \ocgxii_anyon_to_ve:n
+ \cs_set_eq:NN\AnyOff\ocgxii_anyoff_to_ve:n
+ \cs_set_eq:NN\AllOff\ocgxii_alloff_to_ve:n
+ \tl_set:No#2{#1}
+ }
+ }
+ }
+ }
+}
+\cs_new_protected_nopar:Nn\ocgxii_allon_to_ve:n{\And{#1}}
+\cs_new_protected_nopar:Nn\ocgxii_anyon_to_ve:n{\Or{#1}}
+\cs_new_protected_nopar:Nn\ocgxii_anyoff_to_ve:n{\Not{\And{#1}}}
+\cs_new_protected_nopar:Nn\ocgxii_alloff_to_ve:n{\Not{\Or{#1}}}
+% visib. boolean expressions
+\cs_new_protected_nopar:Nn\ocgxii_ve_and:nN{
+ \bool_set_true:N\l_ocgxii_ve_open_bool
+ \tl_put_right:Nx#2{\g_ocgxii_left_bracket_tl/And}
+ \clist_map_inline:nn{#1}{\ocgxii_ocmd_expression_parser:nN{##1}#2}
+ \tl_put_right:Nx#2{\g_ocgxii_right_bracket_tl}
+ \bool_set_false:N\l_ocgxii_ve_open_bool
+}
+\cs_new_protected_nopar:Nn\ocgxii_ve_or:nN{
+ \bool_set_true:N\l_ocgxii_ve_open_bool
+ \tl_put_right:Nx#2{\g_ocgxii_left_bracket_tl/Or}
+ \clist_map_inline:nn{#1}{\ocgxii_ocmd_expression_parser:nN{##1}#2}
+ \tl_put_right:Nx#2{\g_ocgxii_right_bracket_tl}
+ \bool_set_false:N\l_ocgxii_ve_open_bool
+}
+\cs_new_protected_nopar:Nn\ocgxii_ve_not:nN{
+ \bool_set_true:N\l_ocgxii_ve_open_bool
+ % only one item allowed in \Not{...} argument
+ \int_compare:nNnT{\clist_count:n{#1}}>{\c_one_int}{
+ \msg_error:nnnn{ocgx2}{generic~msg}{
+ More~than~one~item~passed~to~\Not{...}.
+ }{
+ Only~one~item~is~allowed.
+ }
+ }
+ \int_compare:nNnT{\clist_count:n{#1}}={\c_one_int}{
+ \tl_put_right:Nx#2{\g_ocgxii_left_bracket_tl/Not}
+ \clist_map_inline:nn{#1}{\ocgxii_ocmd_expression_parser:nN{##1}#2}
+ \tl_put_right:Nx#2{\g_ocgxii_right_bracket_tl}
+ }
+ \bool_set_false:N\l_ocgxii_ve_open_bool
+}
+\cs_new_protected_nopar:Nn\ocgxii_ve_check:n{VisExpr}
+\tl_set:cn{ocgxii_VisExpr}{VisExpr}
+\cs_new_protected_nopar:Nn\ocgxii_vp_check:n{VisPol}
+\tl_set:cn{ocgxii_VisPol}{VisPol}
+\tl_set:Nx\g_ocgxii_left_bracket_tl{\tl_to_str:N[}
+\tl_set:Nx\g_ocgxii_right_bracket_tl{\tl_to_str:N]}
+\int_new:N\l_ocgxii_vp_cnt_int %number of visib. policies
+\int_new:N\l_ocgxii_ve_cnt_int %number of visib. expressions
+\bool_new:N\l_ocgxii_vp_open_bool %for nesting test
+\bool_new:N\l_ocgxii_ve_open_bool %for nesting test
+\tl_set:Nn\g_ocgxii_help_msg_tl{
+ At~most~one~visibility~policy~and,~separated~by~a~comma,~at~most~one~
+ visibility~expression~may~be~passed~as~the~2nd~argument~to~the~`ocmd'~
+ environment.~A~visibility~
+ policy~is~defined~by~one~of~\AllOn{...},~\AnyOn{...},~\AnyOff{...},~
+ \AllOff{...}.~A~visibility~expression~is~a~boolean~expression~built~by~
+ nesting~any~number~of~\And{...},~\Or{...},~\Not{...}~commands.~If~both~are~
+ provided,~the~visibility~expression~takes~precedence~over~the~policy,~but~the~
+ latter~may~be~used~as~fallback~by~non-conforming~PDF~viewers.
+}
+%command that builds /OC entry from open layer stack
+\cs_new_nopar:Nn\ocgxii_make_oc_entry:{
+ \group_begin:
+ \tl_gclear:N\g_ocgxii_oc_entry_tl
+ \tl_clear:N\l_tempa_tl
+ \seq_if_empty:NF\g_ocgbase_open_stack_seq{
+ \seq_clear:N\l_tempa_seq
+ %additional level of braces around indirect PDF objects (needed for dvips)
+ \seq_map_inline:Nn\g_ocgbase_open_stack_seq{
+ \seq_put_right:Nn\l_tempa_seq{{##1}}
+ }
+ \ocgxii_omcd_parse_argument:xN{
+ \exp_not:N\And{\seq_use:Nn\l_tempa_seq{,}}
+ }\l_tempa_tl
+ \tl_gset:Nx\g_ocgxii_oc_entry_tl{/OC~<>}
+ }
+ \group_end:
+}
+%programmer/author command that inserts /OC << >> entry; for use in
+%annotation/xobject dicts, in order to make them layer-aware
+\cs_new_nopar:Nn\ocgxii_insert_oc:{\g_ocgxii_oc_entry_tl}
+\cs_gset_eq:NN\ocgbase_insert_oc:\ocgxii_insert_oc:
+\cs_gset_eq:NN\ocgbase@insert@oc\ocgxii_insert_oc:
+\tl_new:N\g_ocgxii_oc_entry_tl
+
\cs_new_protected_nopar:Nn\ocgxii_stack_shipout:NN{
\iow_shipout_x:Nx\@mainaux{
\token_to_str:N#1{
@@ -268,7 +593,7 @@
}
\bool_if:nT{
!\cs_if_exist:cTF{ocgx2.oldlnkcol.\int_use:N\g_ocgxii_page_int}{
- \str_if_eq_x_p:nn{
+ \str_if_eq_p:ee{
\tl_use:c{ocgx2.oldlnkcol.\int_use:N\g_ocgxii_page_int}
}{
\seq_use:cn{g_pending_lnkcols_on_\int_use:c{g_ocgxii_page_int}_seq}{,}
@@ -296,7 +621,7 @@
}
\bool_if:nT{
!\cs_if_exist:cTF{ocgx2.oldstack.\int_use:N\g_ocgxii_page_int}{
- \str_if_eq_x_p:nn{
+ \str_if_eq_p:ee{
\tl_use:c{ocgx2.oldstack.\int_use:N\g_ocgxii_page_int}
}{
\seq_use:cn{g_pending_ocgs_on_\int_use:c{g_ocgxii_page_int}_seq}{,}
@@ -338,7 +663,7 @@
\seq_gset_eq:cc{
g_pending_ocgs_on_\int_use:c{g_ocgxii_page_int}_seq
}{
- g_pending_ocgs_on_\int_eval:n{\g_ocgxii_page_int-\c_one}_seq
+ g_pending_ocgs_on_\int_eval:n{\g_ocgxii_page_int-\c_one_int}_seq
}
}
%the same for link colour stack
@@ -346,7 +671,7 @@
\seq_gset_eq:cc{
g_pending_lnkcols_on_\int_use:c{g_ocgxii_page_int}_seq
}{
- g_pending_lnkcols_on_\int_eval:n{\g_ocgxii_page_int-\c_one}_seq
+ g_pending_lnkcols_on_\int_eval:n{\g_ocgxii_page_int-\c_one_int}_seq
}
}
}
@@ -361,7 +686,22 @@
\cs_new_protected_nopar:Nn\ocgxii_ocglist_build:Nn{
\tl_set:Nx\l_ocglistarg_tl{#2}\tl_trim_spaces:N\l_ocglistarg_tl
- \seq_set_split:NnV\l_ocgxii_ocglistarg_seq{~}\l_ocglistarg_tl
+ % first try splitting at commas (ocgx2 syntax)
+ \tl_set_eq:NN\l_tmpa_tl\l_ocglistarg_tl
+ \tl_remove_all:Nn\l_tmpa_tl{~}
+ \seq_set_split:NnV\l_ocgxii_ocglistarg_seq{,}\l_tmpa_tl
+ \seq_remove_all:Nn\l_ocgxii_ocglistarg_seq{}
+ \tl_set:Nx\l_tmpa_tl{\seq_count:N\l_ocgxii_ocglistarg_seq}
+ % now at spaces (legacy ocgx/ocg-p)
+ \tl_set_eq:NN\l_tmpb_tl\l_ocglistarg_tl
+ \tl_remove_all:Nn\l_tmpb_tl{,}
+ \seq_set_split:NnV\l_tmpb_seq{~}\l_tmpb_tl
+ \seq_remove_all:Nn\l_tmpb_seq{}
+ \tl_set:Nx\l_tmpb_tl{\seq_count:N\l_tmpb_seq}
+ %take the seq having more elements (guessing the separator most likely used)
+ \int_compare:nT{\l_tmpb_tl>\l_tmpa_tl}{
+ \seq_set_eq:NN\l_ocgxii_ocglistarg_seq\l_tmpb_seq
+ }
\seq_map_variable:NNn\l_ocgxii_ocglistarg_seq\l_tempa_tl{
\ocgxii_process_ocgref:NN#1\l_tempa_tl
}
@@ -378,7 +718,7 @@
\cs_new_protected_nopar:Nn\ocgxii_ocglist_process_idlist:nn{
\ocgxii_ocglist_reset:
\tl_set:Nx\l_ocgxii_opt_tl{#1}\tl_remove_all:Nn\l_ocgxii_opt_tl{~}
- \str_case_x:nnF{\l_ocgxii_opt_tl}{
+ \str_case_e:nnF{\l_ocgxii_opt_tl}{
{onmouseup}{
\ocgxii_ocglist_build:Nn\l_ocgxii_u_list_tl{#2}
}
@@ -408,19 +748,19 @@
% adding optional 2nd argument -> Button Widget (non-breakable) with one of
% various mouse triggers (`troggerocgs` option from ocg-p)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\DeclareDocumentCommand\switchocg{s o m +m}{
+\DeclareDocumentCommand\switchocg{s O{} m +m}{
\ocgxii_actionsocg:nnnnnn{#1}{#2}{#3}{}{}{#4}
}
-\DeclareDocumentCommand\showocg{s o m +m}{
+\DeclareDocumentCommand\showocg{s O{} m +m}{
\ocgxii_actionsocg:nnnnnn{#1}{#2}{}{#3}{}{#4}
}
-\DeclareDocumentCommand\hideocg{s o m +m}{
+\DeclareDocumentCommand\hideocg{s O{} m +m}{
\ocgxii_actionsocg:nnnnnn{#1}{#2}{}{}{#3}{#4}
}
-\DeclareDocumentCommand\actionsocg{s o m m m +m}{
+\DeclareDocumentCommand\actionsocg{s O{} m m m +m}{
\ocgxii_actionsocg:nnnnnn{#1}{#2}{#3}{#4}{#5}{#6}
}
@@ -446,28 +786,28 @@
%
%process *all* mouse triggers (e,d,u,x)
\ocgxii_ocglist_process_idlist:nn{
- \IfValueTF{#2}{#2}{onmouseup}
+ \tl_if_blank:oTF{#2}{onmouseup}{#2}
}{#3}
\tl_set_eq:NN\l_ocgxii_toswitch_e_tl\l_ocgxii_e_list_tl
\tl_set_eq:NN\l_ocgxii_toswitch_x_tl\l_ocgxii_x_list_tl
\tl_set_eq:NN\l_ocgxii_toswitch_d_tl\l_ocgxii_d_list_tl
\tl_set_eq:NN\l_ocgxii_toswitch_u_tl\l_ocgxii_u_list_tl
\ocgxii_ocglist_process_idlist:nn{
- \IfValueTF{#2}{#2}{onmouseup}
+ \tl_if_blank:oTF{#2}{onmouseup}{#2}
}{#4}
\tl_set_eq:NN\l_ocgxii_toshow_e_tl\l_ocgxii_e_list_tl
\tl_set_eq:NN\l_ocgxii_toshow_x_tl\l_ocgxii_x_list_tl
\tl_set_eq:NN\l_ocgxii_toshow_d_tl\l_ocgxii_d_list_tl
\tl_set_eq:NN\l_ocgxii_toshow_u_tl\l_ocgxii_u_list_tl
\ocgxii_ocglist_process_idlist:nn{
- \IfValueTF{#2}{#2}{onmouseup}
+ \tl_if_blank:oTF{#2}{onmouseup}{#2}
}{#5}
\tl_set_eq:NN\l_ocgxii_tohide_e_tl\l_ocgxii_e_list_tl
\tl_set_eq:NN\l_ocgxii_tohide_x_tl\l_ocgxii_x_list_tl
\tl_set_eq:NN\l_ocgxii_tohide_d_tl\l_ocgxii_d_list_tl
\tl_set_eq:NN\l_ocgxii_tohide_u_tl\l_ocgxii_u_list_tl
%any triggers apart from mouse-up?
- \str_if_eq_x:nnF{
+ \str_if_eq:eeF{
\l_ocgxii_toswitch_e_tl\l_ocgxii_toswitch_x_tl\l_ocgxii_toswitch_d_tl
\l_ocgxii_toshow_e_tl\l_ocgxii_toshow_x_tl\l_ocgxii_toshow_d_tl
\l_ocgxii_tohide_e_tl\l_ocgxii_tohide_x_tl\l_ocgxii_tohide_d_tl
@@ -488,7 +828,7 @@
/Subtype/Widget/Ff~65536/FT/Btn/BS<>
/T~(ocgx2@\int_use:N\g_ocgxii_widcount_int)
%treat mouse-up as mouse-click --> handle through /A dictionary
- \str_if_eq_x:nnF{}{
+ \str_if_eq:eeF{}{
\l_ocgxii_toswitch_u_tl\l_ocgxii_toshow_u_tl\l_ocgxii_tohide_u_tl
}{
/A <>
}
/AA <<
- %\str_if_eq_x:nnF{}{
+ %\str_if_eq:eeF{}{ % mouse-up
% \l_ocgxii_toswitch_u_tl\l_ocgxii_toshow_u_tl\l_ocgxii_tohide_u_tl
%}{
% /U <>
%}
- \str_if_eq_x:nnF{}{ % mouse-down
+ \str_if_eq:eeF{}{ % mouse-down
\l_ocgxii_toswitch_d_tl\l_ocgxii_toshow_d_tl\l_ocgxii_tohide_d_tl
}{
/D <>
}
- \str_if_eq_x:nnF{}{ % mouse-enter
+ \str_if_eq:eeF{}{ % mouse-enter
\l_ocgxii_toswitch_e_tl\l_ocgxii_toshow_e_tl\l_ocgxii_tohide_e_tl
}{
/E <>
}
- \str_if_eq_x:nnF{}{ % mouse-exit
+ \str_if_eq:eeF{}{ % mouse-exit
\l_ocgxii_toswitch_x_tl\l_ocgxii_toshow_x_tl\l_ocgxii_tohide_x_tl
}{
/X <>}},
@@ -693,8 +1031,8 @@
showingui .choices:nn = {true,false,always,never,iffirstuse}{
\bool_if:nTF{
- \str_if_eq_x_p:nn{#1}{false} ||
- \str_if_eq_x_p:nn{#1}{never}
+ \str_if_eq_p:ee{#1}{false} ||
+ \str_if_eq_p:ee{#1}{never}
}{
\bool_set_false:N\l_ocgxii_showingui_bool
}{
@@ -706,11 +1044,15 @@
listintoolbar .meta:n = {showingui=#1},
listintoolbar .default:n={true},
- radiobtngrp .code:n = {
- \seq_if_in:NxF\l_ocgxii_rbgrps_seq{#1}{
- \seq_put_right:Nx\l_ocgxii_rbgrps_seq{#1}
+ radiobtngrps .code:n = {
+ \clist_map_inline:nn{#1}{
+ \seq_if_in:NxF\l_ocgxii_rbgrps_seq{##1}{
+ \seq_put_right:Nx\l_ocgxii_rbgrps_seq{##1}
+ }
}
},
+ radiobtngrps .value_required:n = {true},
+ radiobtngrp .meta:n={radiobtngrps={#1}},
radiobtngrp .value_required:n = {true}
}
@@ -759,10 +1101,10 @@
\cs_new_protected_nopar:Nn\ocgxii_colourlink_nobreak_end:{
\color@endgroup\hbox_set_end:
\mbox{
- \ocgbase_oc_bdc:n{\ocgxii@OCPrint}
+ \ocgbase_oc_bdc:n{\tl_use:c{ocgxii_ocg_OCPrint}}
\hbox_to_zero:n{\box_use:N\l_tmpa_box\hss}
\ocgbase_oc_emc:
- \ocgbase_oc_bdc:n{\ocgxii@OCView}
+ \ocgbase_oc_bdc:n{\tl_use:c{ocgxii_ocg_OCView}}
\group_begin:
\exp_after:wN\HyColor@UseColor\l_ocgxii_lnkcol_tl
\box_use_drop:N\l_tmpa_box
@@ -845,10 +1187,10 @@
%a tiny space char should keep empty link annots from flooding the page
% with link colour
\hbox_overlap_left:n{\ocgxii_tiny_space_char:}
- \ocgbase_oc_bdc:n{\ocgxii@OCPrint}
+ \ocgbase_oc_bdc:n{\tl_use:c{ocgxii_ocg_OCPrint}}
\pbs_literal:nn{page}{-88888~-88888~99999~99999~re~f}
\ocgbase_oc_emc:
- \ocgbase_oc_bdc:n{\ocgxii@OCView}
+ \ocgbase_oc_bdc:n{\tl_use:c{ocgxii_ocg_OCView}}
\group_begin:
\exp_after:wN\HyColor@UseColor\g_ocgxii_lnkcol_tl
\pbs_literal:nn{page}{-88888~-88888~99999~99999~re~f}
@@ -911,22 +1253,25 @@
/Print<>
/Export<>
}{on}
- \tl_gset:Nx\ocgxii@OCView{\ocgbase_last_ocg:}
- \tl_gset:cx{ocgxii@OCView.opts}{
+ \tl_gset:cx{ocgxii_ocg_OCView}{\ocgbase_last_ocg:}
+ %in case somebody wants to reopen with \begin{ocg}...
+ \tl_gset:cx{ocgxii_ocg_OCView.opts}{
showingui=never,printocg=never,exportocg=never}
\ocgbase_new_ocg:nnn{OCPrint}{
/Print<>
/Export<>
}{off}
- \tl_gset:Nx\ocgxii@OCPrint{\ocgbase_last_ocg:}
- \tl_gset:cx{ocgxii@OCPrint.opts}{
+ \tl_gset:cx{ocgxii_ocg_OCPrint}{\ocgbase_last_ocg:}
+ \tl_gset:cx{ocgxii_ocg_OCPrint.opts}{
showingui=never,printocg=always,exportocg=always}
\ocgxii_enable_ocglinks:
\iow_now:Nx\@mainaux{
- \token_to_str:N\ocgxii@newkey{ocgx2.ocg.OCView}{\ocgxii@OCView}
+ \token_to_str:N\ocgxii@newkey{ocgx2.ocg.OCView}{
+ \tl_use:c{ocgxii_ocg_OCView}}
}
\iow_now:Nx\@mainaux{
- \token_to_str:N\ocgxii@newkey{ocgx2.ocg.OCPrint}{\ocgxii@OCPrint}
+ \token_to_str:N\ocgxii@newkey{ocgx2.ocg.OCPrint}{
+ \tl_use:c{ocgxii_ocg_OCPrint}}
}
}
}{
@@ -953,9 +1298,15 @@
% taken in large parts from Paul Gaborit's `tikzlibraryocgx.code.tex' with
% some additions/fixes:
%
-% - opts={...} allows ocg-environment options to be passed to a TikZ scope
+% - opts={...} inside ocg={...} allows ocg-environment options to be passed
+% to a TikZ scope
+%
+% - The style ocmd={...} is another way for turning a TikZ scope into a PDF
+% layer (in addition to ocg={...}). It has two sub-keys, ref={...} and
+% visibility={...}, which have the same meaning as the optional and the
+% mandatory arguments of the `ocmd' environment
%
-% - TikZ objects to be turned into ocg switching links accept the additional
+% - TikZ objects to be turned into OCG switching links accept the additional
% key
%
% trigger ocg = onmousenter | onmouseexit | onmousedown | onmouseup |
@@ -995,6 +1346,23 @@
/tikz/execute at end scope={\end{ocg}},
}
},
+ ocmd/.style={
+ ocmd/.cd,
+ #1,
+ /tikz/execute at begin scope={%
+ \begin{ocmd}[\ocgxii@ocmdref]{\ocgxii@ocmdvisibility}%
+ },
+ /tikz/execute at end scope={\end{ocmd}},
+ /tikz/.cd
+ },
+ ocmd={
+ % parameters
+ ref/.store in=\ocgxii@ocmdref,
+ visibility/.store in=\ocgxii@ocmdvisibility,
+ % default values
+ ref=,
+ visibility=,
+ },
trigger ocg/.store in=\ocgxii@trigger,
trigger ocg/.value required,
switch ocg/.style={
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ocgx2.tlpobj new/tlpkg/tlpobj/ocgx2.tlpobj
--- old/tlpkg/tlpobj/ocgx2.tlpobj 2019-02-28 03:57:51.000000000 +0100
+++ new/tlpkg/tlpobj/ocgx2.tlpobj 2019-11-12 01:55:00.000000000 +0100
@@ -1,6 +1,6 @@
name ocgx2
category Package
-revision 49580
+revision 52730
shortdesc Drop-in replacement for 'ocgx' and 'ocg-p'
relocated 1
longdesc This package serves as a drop-in replacement for the packages
@@ -11,14 +11,14 @@
longdesc ps2pdf/Distiller (Xe)LaTeX(x) - dvipdfmx pdfLaTeX and LuaLaTeX
longdesc . It also ensures compatibility with the media9 and animate
longdesc packages.
-runfiles size=15
+runfiles size=18
RELOC/tex/latex/ocgx2/fixocgx.sty
RELOC/tex/latex/ocgx2/ocgbase.sty
RELOC/tex/latex/ocgx2/ocgx2.sty
catalogue-also ocgx ocg-p
catalogue-contact-repository https://gitlab.com/agrahn/ocgx2
catalogue-ctan /macros/latex/contrib/ocgx2
-catalogue-date 2019-01-02 18:29:33 +0100
+catalogue-date 2019-11-08 15:21:24 +0100
catalogue-license lppl
catalogue-topics pdf-feat adobe-distiller expl3
-catalogue-version 0.40
+catalogue-version 0.48
++++++ oldstandard.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/oldstandard/NewComputerModern.fontspec new/doc/fonts/oldstandard/NewComputerModern.fontspec
--- old/doc/fonts/oldstandard/NewComputerModern.fontspec 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/oldstandard/NewComputerModern.fontspec 2020-02-25 02:16:34.000000000 +0100
@@ -0,0 +1,8 @@
+\defaultfontfeatures[NewComputerModern]
+ {
+ Extension = .otf ,
+ UprightFont = NewCM10-Regular,
+ BoldFont = NewCM10-Bold,
+ ItalicFont = NewCM10-Italic,
+ BoldItalicFont = NewCM10-BoldItalic,
+ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/oldstandard/NewComputerModernMono.fontspec new/doc/fonts/oldstandard/NewComputerModernMono.fontspec
--- old/doc/fonts/oldstandard/NewComputerModernMono.fontspec 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/oldstandard/NewComputerModernMono.fontspec 2020-02-25 02:16:34.000000000 +0100
@@ -0,0 +1,8 @@
+\defaultfontfeatures[NewComputerModern Mono]
+ {
+ Extension = .otf ,
+ UprightFont = NewCMMono10-Regular,
+ BoldFont = NewCMMono10-Bold,
+ ItalicFont = NewCMMono10-Italic,
+ BoldItalicFont = NewCMMono10-BoldOblique,
+ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/oldstandard/NewComputerModernSans.fontspec new/doc/fonts/oldstandard/NewComputerModernSans.fontspec
--- old/doc/fonts/oldstandard/NewComputerModernSans.fontspec 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/oldstandard/NewComputerModernSans.fontspec 2020-02-25 02:16:34.000000000 +0100
@@ -0,0 +1,8 @@
+\defaultfontfeatures[NewComputerModern Sans]
+ {
+ Extension = .otf ,
+ UprightFont = NewCMSans10-Regular,
+ BoldFont = NewCMSans10-Bold,
+ ItalicFont = NewCMSans10-Oblique,
+ BoldItalicFont = NewCMSans10-BoldOblique,
+ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/oldstandard/README new/doc/fonts/oldstandard/README
--- old/doc/fonts/oldstandard/README 2016-07-20 00:28:40.000000000 +0200
+++ new/doc/fonts/oldstandard/README 2020-02-26 23:09:08.000000000 +0100
@@ -1,9 +1,10 @@
-This is the README for the OldStandard package, version 2.2.
+This is the README for the OldStandard package, version 2.5,
+reease 2020-02-26.
This package provides the Old Standard family of fonts
-designed by Alexey Kryukov, in both OpenType and Type1
-formats, with support for both traditional and modern LaTeX
-processors.
+designed by Alexey Kryukov and revised by Robert Alessi,
+in both OpenType and Type1 formats, with support for both
+traditional and modern LaTeX processors.
Old Standard reproduces a specific type of Modern
(classicist) style of serif typefaces, very commonly used in
@@ -20,9 +21,30 @@
+ the most beautiful examples of Greek and Cyrillic
lettertypes were all based on the classicist style,
so for those scripts, "Modern" fonts are much more
- appropriate than any contemporary (e. g. Times-based)
+ appropriate than any contemporary (e.g. Times-based)
designs.
+In comparison to previous releases of *Old Standard*, this release
+includes a bold italic, new letters and some corrections:
+
+1. Small capitals for Roman, Greek and Cyrillic letters, in all three
+ styles, Regular, Italic and Bold have been added. Small capitals,
+ which were missing from *Old Standard*, were already in use a
+ century ago in fine books which used font faces very similar to
+ *Old Standard*. Typical use cases of small capitals were headers,
+ current headings and in some books proper names.
+2. The letter G with caron above, that is: Ǧ (`U+01E6`, uppercase) and
+ ǧ (`U+01E7`, lowercase) has been added. It is the only character
+ missing from *Old Standard* that is needed in some of the accepted
+ standards of romanization of classical Arabic.[^2]
+3. Additionally, this release corrects the `+ss06` feature provided by
+ *Old Standard*. This feature is supposed to distinguish between
+ regular and ‘curled’ beta (β/ϐ) and to print ‘curled’ beta
+ (`U+03D0`) in medial position. This feature worked in most cases
+ with the previous release of *Old Standard*. However, it failed if
+ the beta is preceded by a vowel with an acute accent taken from the
+ *Greek extended* Unicode block.
+
To install this package on a TDS-compliant
TeX system download the file
"tex-archive"/install/fonts/oldstandard.tds.zip where the
@@ -38,9 +60,9 @@
to the preamble of your document. This will activate
OldStandard as the main (serifed) text font. Regular,
-Italic and Bold styles are available. Font encodings
-supported are OT1, T1, LY1 and TS1. The only figure style is
-tabular-lining.
+Italic, Bold and BoldItalic styles are available. Font
+encodings supported are OT1, T1, TS1, LY1, LGR and T2A/B/C.
+The only figure style is tabular-lining.
LuaLaTeX and xeLaTeX users may also use OldStandard.sty but
should read the oldstand-manual document for information
@@ -53,8 +75,16 @@
The fonts are licensed under the SIL Open Font License,
version 1.1; the text may be found in the doc directory.
-The type1 versions were created using fontforge. The LaTeX
+The type1 versions were created using cfftot1. The LaTeX
support files were created using autoinst and are licensed
under the terms of the LaTeX Project Public License.
The maintainers of this package are Bob Tennent (rdt at
-cs.queensu.ca) and Nikola Lecic.
+cs.queensu.ca), Nikola Lecic and Robert Alessi.
+
+Please send error reports and suggestions for improvements
+to Robert Alessi:
+
+ * email:
+ * website: http://www.robertalessi.net/
+ * development: http://git.robertalessi.net/oldstandard
+ * comments, feature requests, bug reports: https://gitlab.com/ralessi/oldstandard/issues
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/oldstandard/fonttable.lua new/doc/fonts/oldstandard/fonttable.lua
--- old/doc/fonts/oldstandard/fonttable.lua 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/oldstandard/fonttable.lua 2020-02-25 02:16:34.000000000 +0100
@@ -0,0 +1,36 @@
+-- the following is adapted from https://tex.stackexchange.com/a/380780
+ft = {}
+function ft.print_glyphs(maxCols,maxChars)
+ local id = font.current()
+ local fnt = font.getfont(id)
+ local col = 1
+ local maxU4 = 15*(16^3+16^2+16+1)
+ a = {}
+ for k, v in pairs(fnt.characters) do
+ a [#a + 1] = k
+ end
+ table.sort(a)
+ for i, k in ipairs(a) do
+ if i >= maxChars then break end
+ if col == 1 then
+ if k > maxU4 then
+ tex.sprint(string.format("U+%06x", k))
+ else
+ tex.sprint(string.format("U+%04x", k))
+ end
+ tex.sprint("&")
+ end
+ if (i) then
+ tex.sprint(string.format([[\char%i]], k))
+ else
+ tex.sprint("~")
+ end
+ if col == maxCols then
+ tex.sprint([[\\\cline{2-]] .. maxCols+1 .. "} ")
+ col = 1
+ else
+ tex.sprint("&")
+ col = col + 1
+ end
+ end
+end
Binary files old/doc/fonts/oldstandard/fonttable.pdf and new/doc/fonts/oldstandard/fonttable.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/oldstandard/fonttable.tex new/doc/fonts/oldstandard/fonttable.tex
--- old/doc/fonts/oldstandard/fonttable.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/oldstandard/fonttable.tex 2020-02-25 02:16:34.000000000 +0100
@@ -0,0 +1,30 @@
+\documentclass[12pt]{article}
+\usepackage{fontspec}
+
+\usepackage{array}
+\usepackage{longtable}
+\usepackage{latexcolors}
+
+\usepackage{luacode}
+\luadirect{require("fonttable.lua")}
+
+\setmainfont{Old Standard}
+
+\title{\textsc{Old Standard}}
+\author{Font Table}
+\date{}
+
+\begin{document}
+\maketitle
+
+\color{cinnamon}
+
+\begin{longtable}{>{\color{gray}\ttfamily\footnotesize}r|
+ *{10}{>{\color{black}}p{1.5em}|}}
+\cline{2-11}
+\endhead
+
+\luadirect{ft.print_glyphs(10,65463)} \\ \cline{2-11}
+\end{longtable}
+
+\end{document}
\ No newline at end of file
Binary files old/doc/fonts/oldstandard/oldstandard-samples.pdf and new/doc/fonts/oldstandard/oldstandard-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/oldstandard/oldstandard-samples.tex new/doc/fonts/oldstandard/oldstandard-samples.tex
--- old/doc/fonts/oldstandard/oldstandard-samples.tex 2016-07-20 00:28:40.000000000 +0200
+++ new/doc/fonts/oldstandard/oldstandard-samples.tex 2019-07-26 22:47:54.000000000 +0200
@@ -1,6 +1,6 @@
\documentclass{article}
-\usepackage[T1]{fontenc}
-\usepackage{OldStandard}
+\usepackage[LGR,T2A,LY1]{fontenc}
+\usepackage[scale=1.0]{OldStandard}
\usepackage{lipsum}
\begin{document}
\thispagestyle{empty}
@@ -12,6 +12,9 @@
\section*{Regular}
\lipsum[1]
+\section*{Small Caps}
+\textsc{\lipsum[1]}
+
\section*{Italic}
\textit{\lipsum[2]}
@@ -19,6 +22,11 @@
\textbf{\lipsum[3]}
+\section*{Bold Italic}
+
+
+\textbf{\textit{\lipsum[4]}}
+
\section*{Numbers}
0123456789
@@ -26,4 +34,18 @@
\noindent
X\textsu{0123456789}
+\section*{LGR}
+
+
+{\oldstandardlgr\noindent
+ a b g d e z h j i k l m n x o p r s t u f q y w\\
+ A B G D E Z H J I K L M N X O P R S T U F Q Y W\\
+}
+
+\section*{Cyrillic}
+
+{\ifxetex\else\ifluatex\else\fontencoding{T2A}\selectfont\fi\fi
+Съешь ещё этих мягких французских булок да
+выпей чаю!}
+
\end{document}
Binary files old/doc/fonts/oldstandard/oldstandard.pdf and new/doc/fonts/oldstandard/oldstandard.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/oldstandard/oldstandard.tex new/doc/fonts/oldstandard/oldstandard.tex
--- old/doc/fonts/oldstandard/oldstandard.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/oldstandard/oldstandard.tex 2020-02-25 02:16:34.000000000 +0100
@@ -0,0 +1,367 @@
+\RequirePackage{filecontents}
+\begin{filecontents*}{\jobname.bib}
+@software{arabluatex,
+ title = {The arabluatex package},
+ titleaddon = {Arab\TeX\ for Lua\LaTeX},
+ author = {Alessi, Robert},
+ url = {https://ctan.org/pkg/arabluatex},
+ version = {1.17}
+}
+@software{babel,
+ title = {The Babel package},
+ titleaddon = {Multilingual support for Plain TeX or LaTeX},
+ author = {Bezos López, Javier and Braams, Johannes L.},
+ url = {http://www.ctan.org/pkg/babel},
+ version = {3.33}
+}
+@software{oldstandard,
+ title = {The OldStandard package},
+ titleaddon = {Old Standard: A Unicode Font for Classical and
+ Medieval Studies},
+ author = {Kryukov, Alexey},
+ editor = {Lečić, Nikola and Tennent, Bob},
+ editortype = {compiler},
+ url = {http://www.ctan.org/pkg/oldstandard},
+ version = {2.3}
+}
+\end{filecontents*}
+\documentclass[letterpaper]{article}
+\usepackage{fontspec}
+\usepackage[english]{babel}
+\babeltags{grc = greek}
+
+\babelfont{rm}{Old Standard}
+\babelfont[greek]{rm}[RawFeature={+ss05;+ss06}]{Old Standard}
+\babelfont{sf}{NewComputerModern Sans}
+\babelfont{tt}{NewComputerModern Mono}
+
+\newlength\defaultparindent
+\setlength\defaultparindent{\parindent}
+\usepackage{dtxdescribe}
+\setlength\parindent{\defaultparindent}
+
+\usepackage[xindy]{imakeidx}
+\indexsetup{noclearpage}
+\makeindex
+
+\usepackage{latexcolors}
+\usepackage{csquotes}
+\usepackage{varioref}
+\usepackage{hyperref}
+\hypersetup{unicode=true, linktocpage=true, colorlinks,
+ allcolors=cinnamon, pdfauthor={Robert Alessi}, pdftitle={Old
+ Standard}}
+\usepackage{uri}
+
+\usepackage{enumitem}
+\setlist{nosep}
+\setlist[itemize]{label=\textendash}
+\setlist[enumerate,1]{label=(\alph*)}
+\setlist[enumerate,2]{label=\roman*.}
+\usepackage{metalogox}
+\usepackage{lettrine}
+\usepackage{setspace}
+
+\usepackage{relsize}
+\usepackage{tikz}
+\usepackage[breakable, skins, xparse, minted]{tcolorbox}
+\tcbset{colback=white, boxrule=.15mm, colframe=cinnamon, breakable}
+\newtcblisting{example}{minted options={linenos, numbersep=0mm,
+ fontsize=\smaller}}
+\newtcblisting{code}{minted options={linenos, numbersep=0mm,
+ fontsize=\smaller}, listing only}
+
+\usepackage[fullvoc]{arabluatex}
+\usepackage[style=oxnotes-inote]{biblatex}
+\DeclareFieldFormat{postnote}{\mkpageprefix[pagination][\mknormrange]{#1}}
+\addbibresource{oldstandard.bib}
+\usepackage[citecmd=autocite,defaultindex=none]{icite}
+\bibinput{oldstandard}
+
+\usepackage{cleveref}
+
+\usepackage[toc]{multitoc}
+
+\edef\pkgver{2.5}
+\edef\pkgdate{2020/02/24}
+\title{\mdseries\tcbox[colframe=black, enhanced, tikznode, drop
+ lifted shadow, colback=white, boxrule=.25mm]%
+ {\textsc{Old Standard}\\
+ \Large
+ A Unicode Font for Classical and Medieval Studies\\
+ \large Based on Alexey Kryukov's original \emph{Old Standard}\\
+ \large v\pkgver -- \pkgdate}}
+
+\author{Robert Alessi \\
+\href{mailto:alessi@robertalessi.net?Subject=arabluatex package}%
+{\texttt{alessi@robertalessi.net}}}
+\date{}
+
+\begin{document}
+\maketitle
+\footnotesize
+\tableofcontents
+\normalsize
+
+\begin{abstract}
+ This font is just the same as Alexey Kryukov's beautiful \emph{Old
+ Standard}. In comparison to the previous releases of \emph{Old
+ Standard}, it includes new letters and some corrections.
+\end{abstract}
+
+\section{License}
+\label{sec:license}
+Copyright \textcopyright\ 2006--2011, Alexey Kryukov
+(\href{mailto:amkryukov@gmail.com}{amkryukov@gmail.com}), without
+Reserved Font Names.
+\\
+Copyright \textcopyright\ 2019--2020, Robert Alessi
+(\href{mailto:alessi@robertalessi.net}{alessi@robertalessi.net}), without
+Reserved Font Names.
+
+Please send error reports and suggestions for improvements to Robert
+Alessi:
+\begin{itemize}
+\item email: \mailto[oldstandard package]{alessi@roberalessi.net}
+\item website: \url{http://git.robertalessi.net/oldstandard/about}
+\item development: \url{http://git.robertalessi.net/oldstandard}
+\item comments, feature requests, bug reports:
+\url{https://gitlab.com/ralessi/oldstandard/issues}
+\end{itemize}
+
+This Font Software is licensed under the SIL Open Font License,
+Version 1.1. This license is available with a FAQ at:
+\url{http://scripts.sil.org/OFL}
+
+\section{Documentation}
+\label{sec:documentation}
+No documentation is associated with this release of \emph{Old
+ Standard} as every item of the original extensive documentation
+applies. The reader should refer to the documentation edited for CTAN
+by Bob Tennent:\icite{oldstandard}
+\begin{itemize}
+\item
+ \href{http://mirrors.ctan.org/fonts/oldstandard/doc/oldstand-manual.pdf}%
+ {Original manual (online version)}
+\item \href{oldstand-manual.pdf}{Original manual (local version
+ included in {\TeX}Live)}
+\end{itemize}
+
+\emph{Old Standard} also has its reference web page:
+\uref{https://web.archive.org/web/20190926123235/http://thessalonica.org.ru/en/oldstandard.html}{http://thessalonica.org.ru/en/oldstandard.html}%
+\footnote{Archived on Sept. 26, 2019.}
+
+\section{History}
+\label{sec:history}
+\emph{Old Standard} is a remarkable creation of Alexey Kryukov,
+inspired by a typeface most commonly used in books printed in the late
+\textsc{xix}\textsuperscript{th} and early
+\textsc{xx}\textsuperscript{th} century. The source files, which can
+be found online,\footnote{See
+ \url{https://github.com/akryukov/oldstand}} have been published
+under the terms of the OFL license (see above,
+\vref{sec:license}). However, at the time of writing, the latest
+update dates back to Aug.\ 12, 2013. To be more precise, all of the
+five \enquote*{commits} the writer was able to see were pushed on the
+very same day. Since then, two \enquote*{pull requests} dating back to
+2017 have remained unanswered. It is therefore to be feared that the
+project has been abandoned. To date, this release of \emph{Old
+ Standard} has been published by Nikola Lečić and Bob Tennent and is
+available on CTAN and {\TeX}Live with a style file.\footnote{See
+ \url{https://ctan.org/pkg/oldstandard}}
+
+Being unable himself to contact the author, the writer, while in need
+to have new letters included in \emph{Old Standard} and some issues
+addressed, took the decision to make a new release \emph{Old
+ Standard}, while maintaining the hope that the author will one day
+resume the development of this typeface.
+
+\paragraph{Important disclaimer}
+The writer is very far from being able to design glyphs \emph{ex
+ nihilo}. That aside, he has some limited knowledge in the use of
+FontForge, and, as a classicist, he is able to scrutinize how features
+operate and if they operate as expected.
+
+\section{Additions and corrections provided}
+\label{sec:addit-corr-prov}
+This release of \emph{Old Standard} includes new letters and some
+corrections:
+\begin{enumerate}
+\item Small capitals for Roman, Greek and Cyrillic letters, in all
+ three styles, Regular, Italic and Bold have been added. Small
+ capitals, which are missing from \emph{Old Standard}, were already
+ in use a century ago in fine books which used font faces very
+ similar to \emph{Old Standard}. Typical use cases of small capitals
+ were headers, current headings and in some books proper names.
+\item \emph{For the time being}, a bold italic shape has been
+ auto-generated. Of course, auto-generating shapes is not a
+ satisfactory solution. However, it is better than using the
+ font loader to emulate bold shapes. A real bold italic shape is
+ planned in the versions of \emph{Old Standard} to come.
+\item The letter G with caron above, that is: Ǧ (\verb|U+01E6|,
+ uppercase) and ǧ (\verb|U+01E7|, lowercase) has been added. It is
+ the only character missing from \emph{Old Standard} that is needed
+ in some of the accepted standards of romanization of classical
+ Arabic. See for references the current documentation of the
+ \textsf{arabluatex} package.\footnote{\icite{arabluatex}[cite], sect{.}
+ \enquote{Transliteration}.}
+\item Additionally, this release corrects the \verb|+ss06| feature
+ which is supposed to distinguish between regular and
+ \enquote*{curled} beta (β/ϐ) and to print \enquote*{curled} beta
+ (\verb|U+03D0|) in medial position. This feature worked in most
+ cases with the previous releases. However, it failed if the beta was
+ preceded by a vowel with an acute accent taken from the Greek
+ extended Unicode block.
+\end{enumerate}
+
+\section{Usage}
+\label{sec:usage}
+\emph{Old Standard} works with \TeX\ engines that directly support
+OpenType features such as \XeTeX\ and \LuaTeX.
+
+It is loaded with \pkg{fontspec} like so:---
+\begin{code}
+ \usepackage{fontspec}
+ \setmainfont{Old Standard}
+\end{code}
+
+\paragraph{Small capitals}
+Small capitals have been added for the following languages or
+transcription schemes: French, German, Italian, Spanish, unaccented
+Greek, basic Russian and Arabic \enquote*{DMG}.
+
+The following two examples demonstrate the use of small capitals:---
+\begin{tcblisting}{minted language=latex, title=Initials, minted
+ options={fontsize=\smaller, linenos, numbersep=0mm,
+ highlightlines={7}}}
+ \begin{center}
+ CHAPTER I
+
+ MR.\ SHERLOCK HOLMES
+ \end{center}
+
+ \lettrine[loversize=0.2]{M}{r.\ Sherlock Holmes}, who was usually
+ very late in the mornings, save upon those not infrequent occasions
+ when he stayed up all night, was seated at the breakfast table. I
+ stood upon the hearth-rug and picked up the stick which our visitor
+ had left behind him the night before. It was a fine, thick piece of
+ wood, bulbous-headed, of the sort which is known as a
+ \enquote{Penang lawyer.} Just under the head was a broad silver
+ band, nearly an inch across. \enquote{To James Mortimer, M.R.C.S.,
+ from his friends of the C.C.H.,} was engraved upon it, with the
+ date \enquote{1884.} It was just such a stick as the old-fashioned
+ family practitioner used to carry—dignified, solid, and reassuring.
+\end{tcblisting}
+
+\begin{tcblisting}{minted language=latex, title=Headings, minted
+ options={linenos, numbersep=0mm, fontsize=\smaller,
+ highlightlines={11}}}
+ \doublespacing
+ \begin{center}
+ \textlarger{PART SECOND}.
+
+ ETYMOLOGY OR THE PART OF THE SPEECH.
+
+ \rule{1in}{0.4pt}
+
+ I. THE VERB, \arb{al-fi`lu}.
+
+ A. \textsc{General View}.
+
+ 1. \emph{The Forms of the Triliteral Verb}.
+ \end{center}
+\end{tcblisting}
+
+\paragraph{The letter \enquote*{ǧ}} It is used notably to print
+romanized Arabic. \emph{Old Standard} now features this letter in all
+of the three styles (Regular, Italic and Bold):---
+\begin{tcblisting}{minted language=latex, minted
+ options={fontsize=\smaller, linenos, numbersep=0mm,
+ highlightlines={3,6,9}}}
+ \begin{arab}[trans]
+ \begin{center}
+ \textbf{da^gA^gaTu \uc{'a}bI 'l-\uc{h}u_dayli 'l-\uc{`a}llAfi}
+ \end{center}
+ kAna \uc{'a}bU 'l-\uc{h}u_dayli 'ahd_A 'il_A \uc{m}uwaysiN
+ da^gA^gaTaN. wa-kAnat da^gA^gatu-hu 'llatI 'ahdA-hA dUna mA kAna
+ yuttaxa_du li-\uc{m}uwaysiN.
+
+ (\uc{al-^gA.hi.zu}, \aemph{\uc{k}itAbu 'l-\uc{b}u_halA'i})
+ \end{arab}
+\end{tcblisting}
+
+\paragraph{\texttt{+ss06} OpenType feature} It is commonly believed
+that all Greek vowels with acute accent taken from the Greek Extended
+Unicode block \verb|1F00–1FFF| along with standalone acute accents
+were duplicated from the Greek and Coptic Unicode block. Affected
+characters from the Greek Extended Unicode block (\verb|0370–03FF|)
+follow: \textgrc{ά, έ, ή, ί, ό, ύ, ώ, Ά, Έ, Ή, Ί, Ό, Ύ, Ώ, ΐ, ΰ, ´,
+ ΅}. The counterparts of these letters in the Greek and Coptic
+Unicode block are vowels with \emph{tonoi}.
+
+However, strictly speaking, \emph{tonos} is not to be mistaken for
+\enquote*{acute}: that is for sure, as \emph{tonos} was introduced as
+a result of a reform to denote a tone, namely a stress on some vowels,
+and not a pitch, namely a rising and falling voice on accented vowels.
+Confusion began when the Greek government decreed that \emph{tonos}
+shall be the acute. From what the writer could see, many Greek fonts
+originally reflected the distinction between \emph{tonos} and acute.
+But nowadays, they simply mix them up. As a result of this confusion,
+in \emph{Old Standard}, vowels with acute were simply missing from the
+Greek Extended Block. All of them, including the standalone accents,
+have been restored. Furthermore, the rule that instructed to absorb
+vowels with acute into vowels with \emph{tonos} has been removed.
+
+Since assigning vowels with \emph{tonos} and vowels with acute to the
+same code points is clearly unacceptable even if the glyphs are
+identical, it is now possible in \emph{Old Standard} to input all
+accented vowels from the Greek Extended Unicode block exclusively and
+have the substitution rules applied at the same time, as shown by the
+example that follows:---
+\begin{tcblisting}{minted language=latex, minted
+ options={fontsize=\smaller, linenos, numbersep=0mm,
+ highlightlines={9-10}}}
+ \begin{grc}
+ \begin{center}
+ \textlarger{ΙΠΠΟΚΡΑΤΟΥΣ ΕΠΙΔΗΜΙΩΝ ΤΟ ΔΕΥΤΕΡΟΝ}.
+
+ ΤΜΗΜΑ ΠΡΩΤΟΝ.
+ \end{center}
+
+ \textbf{1.} Ἄνθρακες θερινοὶ ἐν Κραννῶνι· ὗεν ἐν καύμασιν ὕδατι
+ λάβρῳ δι’ ὅλου καὶ ἐγίνετο μᾶλλον νότῳ, [καὶ] ὑπογίνονται μὲν ἐν
+ τῷ δέρματι ἰχῶρες· ἐγκαταλαμβανόμενοι δέ, θερμαίνονται, καὶ
+ κνησμὸν ἐμποιέουσιν· εἶτα φλυκταινίδες ὥσπερ πυρίκαυστοι
+ ἐπανίσταντο καὶ ὑπὸ τὸ δέρμα καίεσθαι ἐδόκεον.
+ \end{grc}
+\end{tcblisting}
+
+\subsection{Using \emph{Old Standard} in multilingual
+ documents}
+\label{sec:using-old-standard}
+\pkg{babel} provides a high level interface on top of \pkg{fontspec}
+to select fonts depending on the languages to be used.\icite[For more
+information, the reader should refer to][10,24]{babel} As an example,
+here is how \emph{Old Standard} has been loaded in the preamble of
+this document to be compiled with \LuaLaTeX:---
+\begin{code}
+ \usepackage[no-math]{fontspec}
+ \usepackage{fontspec}
+ \usepackage[greek.ancient,english]{babel}
+ \babeltags{grc = greek}
+
+ \babelfont{rm}{Old Standard}
+
+ \babelfont[greek]{rm}[RawFeature={+ss05;+ss06}]{Old Standard}
+\end{code}
+
+Then, once \emph{Old Standard} has been loaded with \cs{babelfont}
+properly,
+\begin{enumerate}
+\item \cs{textgrc}\marg{Greek text} can be used for short insertions
+ of Greek text.
+\item \verb|\begin{grc}| ... \verb|\end{grc}| can be used for
+ inserting running paragraphs of Greek text.
+\end{enumerate}
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/oldstandard.doc.tlpobj new/tlpkg/tlpobj/oldstandard.doc.tlpobj
--- old/tlpkg/tlpobj/oldstandard.doc.tlpobj 2019-02-28 03:57:55.000000000 +0100
+++ new/tlpkg/tlpobj/oldstandard.doc.tlpobj 2020-03-24 02:03:00.000000000 +0100
@@ -1,21 +1,29 @@
name oldstandard.doc
category Package
-revision 41735
+revision 54512
shortdesc doc files of oldstandard
relocated 1
-docfiles size=339
+docfiles size=415
RELOC/doc/fonts/oldstandard/FONTLOG.txt
+ RELOC/doc/fonts/oldstandard/NewComputerModern.fontspec
+ RELOC/doc/fonts/oldstandard/NewComputerModernMono.fontspec
+ RELOC/doc/fonts/oldstandard/NewComputerModernSans.fontspec
RELOC/doc/fonts/oldstandard/OFL-FAQ.txt
RELOC/doc/fonts/oldstandard/OFL.txt
RELOC/doc/fonts/oldstandard/README
RELOC/doc/fonts/oldstandard/didot-de.png
RELOC/doc/fonts/oldstandard/didot-fr.png
+ RELOC/doc/fonts/oldstandard/fonttable.lua
+ RELOC/doc/fonts/oldstandard/fonttable.pdf
+ RELOC/doc/fonts/oldstandard/fonttable.tex
RELOC/doc/fonts/oldstandard/gendocs.sh
RELOC/doc/fonts/oldstandard/greek-contextual.png
RELOC/doc/fonts/oldstandard/oldstand-manual.pdf
RELOC/doc/fonts/oldstandard/oldstand-manual.tex
RELOC/doc/fonts/oldstandard/oldstandard-samples.pdf
RELOC/doc/fonts/oldstandard/oldstandard-samples.tex
+ RELOC/doc/fonts/oldstandard/oldstandard.pdf
+ RELOC/doc/fonts/oldstandard/oldstandard.tex
RELOC/doc/fonts/oldstandard/opentype.png
RELOC/doc/fonts/oldstandard/serbian.png
RELOC/doc/fonts/oldstandard/spadmin-add.png
++++++ oldstandard.tar.xz ++++++
++++ 5756 lines of diff (skipped)
++++++ olsak-misc.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/olsak-misc/README new/doc/generic/olsak-misc/README
--- old/doc/generic/olsak-misc/README 2016-06-23 00:28:57.000000000 +0200
+++ new/doc/generic/olsak-misc/README 2019-05-09 23:26:05.000000000 +0200
@@ -22,6 +22,7 @@
1996--2016 ... files are created and released at
http://petr.olsak.net/ftp/olsak/makra/
ver.1 ... files contributed to CTAN as one "bundle" olsak-misc
+ ... qrcode: bug fixed
License:
-------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/olsak-misc.doc.tlpobj new/tlpkg/tlpobj/olsak-misc.doc.tlpobj
--- old/tlpkg/tlpobj/olsak-misc.doc.tlpobj 2019-02-28 03:57:56.000000000 +0100
+++ new/tlpkg/tlpobj/olsak-misc.doc.tlpobj 2020-03-04 23:53:05.000000000 +0100
@@ -1,6 +1,6 @@
name olsak-misc.doc
category Package
-revision 41526
+revision 54080
shortdesc doc files of olsak-misc
relocated 1
docfiles size=49
++++++ olsak-misc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/olsak-misc/qrcode.tex new/tex/generic/olsak-misc/qrcode.tex
--- old/tex/generic/olsak-misc/qrcode.tex 2016-06-23 00:28:57.000000000 +0200
+++ new/tex/generic/olsak-misc/qrcode.tex 2019-05-09 23:26:05.000000000 +0200
@@ -138,11 +138,10 @@
\fi
}
-
-\long\def\isnextchar#1#2#3{\def\tmpa{#2}\def\tmpb{#3}%
+\long\def\isnextchar#1#2#3{\begingroup\toks0={\endgroup#2}\toks1={\endgroup#3}%
\let\tmp=#1\futurelet\next\isnextcharA
}
-\def\isnextcharA{\ifx\tmp\next\expandafter\tmpa\else\expandafter\tmpb\fi}
+\def\isnextcharA{\the\toks\ifx\tmp\next0\else1\fi\space}
\long\def\xaddto#1#2{\expandafter\xdef\expandafter#1\expandafter{#1#2}}
\let\g@addto@macro=\xaddto
@@ -2759,7 +2758,7 @@
}
\def\qrrestoreB#1{\advance \qr@j by1
\ifx1#1\vrule height\qrmodulesize width\qrmodulesize\else \kern\qrmodulesize\fi
- \ifnum\qr@size=\qr@j \padd\egroup \advance\qr@i by1
+ \ifnum\qr@size=\qr@j \vrule height\qrmodulesize width 0pt \padd\egroup \advance\qr@i by1
\ifnum\qr@size=\qr@i \padd\egroup \let\next=\relax \else \hbox\bgroup\padd \fi
\fi \next
}
@@ -2866,5 +2865,7 @@
History
-------
-Jun 2015 released
+Jun. 2015 released
Jul. 2015 \xprncodes=0space (bug fixed)
+Sep. 2018 \isnextchar processed in group
+May 2019 strut included for case of empty line (bug fixed)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/olsak-misc.tlpobj new/tlpkg/tlpobj/olsak-misc.tlpobj
--- old/tlpkg/tlpobj/olsak-misc.tlpobj 2019-02-28 03:57:56.000000000 +0100
+++ new/tlpkg/tlpobj/olsak-misc.tlpobj 2020-03-04 23:53:05.000000000 +0100
@@ -1,9 +1,9 @@
name olsak-misc
category Package
-revision 41526
-shortdesc Collection with plain TeX macros written by Petr Olsak
+revision 54080
+shortdesc Collection of plain TeX macros written by Petr Olsak
relocated 1
-longdesc This is a collection with various single-file plain TeX macros
+longdesc This is a collection of various single-file plain TeX macros
longdesc written by Petr Olsak. The documentation is included in each
longdesc file separately. booklet.tex: re-orders PDF pages and collects
longdesc them for booklet printing cnv.tex: conversion of texts
@@ -23,6 +23,6 @@
RELOC/tex/generic/olsak-misc/xmlparser.tex
catalogue-contact-home http://petr.olsak.net/ftp/olsak/makra/
catalogue-ctan /macros/generic/olsak-misc
-catalogue-date 2018-01-07 12:06:50 +0100
catalogue-license pd
catalogue-topics misc-support
+catalogue-version May 2019
++++++ omegaware.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/odvicopy.man1.pdf and new/texmf-dist/doc/man/man1/odvicopy.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/odvitype.man1.pdf and new/texmf-dist/doc/man/man1/odvitype.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ofm2opl.1 new/texmf-dist/doc/man/man1/ofm2opl.1
--- old/texmf-dist/doc/man/man1/ofm2opl.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ofm2opl.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH OFM2OPL 1 "14 April 2016" "Web2C 2019"
+.TH OFM2OPL 1 "14 April 2016" "Web2C 2020"
.PP
.SH "NAME"
ofm2opl \- convert Omega and TeX font-metric files to property-list files
Binary files old/texmf-dist/doc/man/man1/ofm2opl.man1.pdf and new/texmf-dist/doc/man/man1/ofm2opl.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/opl2ofm.1 new/texmf-dist/doc/man/man1/opl2ofm.1
--- old/texmf-dist/doc/man/man1/opl2ofm.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/opl2ofm.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH OPL2OFM 1 "16 June 2015" "Web2C 2019"
+.TH OPL2OFM 1 "16 June 2015" "Web2C 2020"
.PP
.SH "NAME"
opl2ofm \- convert Omega and TeX property-list files to font-metric files
Binary files old/texmf-dist/doc/man/man1/opl2ofm.man1.pdf and new/texmf-dist/doc/man/man1/opl2ofm.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/otangle.man1.pdf and new/texmf-dist/doc/man/man1/otangle.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/otp2ocp.man1.pdf and new/texmf-dist/doc/man/man1/otp2ocp.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/outocp.man1.pdf and new/texmf-dist/doc/man/man1/outocp.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ovf2ovp.1 new/texmf-dist/doc/man/man1/ovf2ovp.1
--- old/texmf-dist/doc/man/man1/ovf2ovp.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ovf2ovp.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH OVF2OVP 1 "14 April 2016" "Web2C 2019"
+.TH OVF2OVP 1 "14 April 2016" "Web2C 2020"
.PP
.SH "NAME"
ovf2ovp \- convert virtual font file and associated font metrics to property-list format
Binary files old/texmf-dist/doc/man/man1/ovf2ovp.man1.pdf and new/texmf-dist/doc/man/man1/ovf2ovp.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ovp2ovf.1 new/texmf-dist/doc/man/man1/ovp2ovf.1
--- old/texmf-dist/doc/man/man1/ovp2ovf.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ovp2ovf.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH OVP2OVF 1 "16 June 2015" "Web2C 2019"
+.TH OVP2OVF 1 "16 June 2015" "Web2C 2020"
.PP
.SH "NAME"
ovp2ovf \- convert a virtual property-list file into a virtual font file and its associated font metric file
Binary files old/texmf-dist/doc/man/man1/ovp2ovf.man1.pdf and new/texmf-dist/doc/man/man1/ovp2ovf.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/omegaware.doc.tlpobj new/tlpkg/tlpobj/omegaware.doc.tlpobj
--- old/tlpkg/tlpobj/omegaware.doc.tlpobj 2019-03-27 02:25:51.000000000 +0100
+++ new/tlpkg/tlpobj/omegaware.doc.tlpobj 2020-03-14 01:43:17.000000000 +0100
@@ -1,6 +1,6 @@
name omegaware.doc
category TLCore
-revision 50602
+revision 54276
shortdesc doc files of omegaware
docfiles size=61
texmf-dist/doc/man/man1/odvicopy.1
++++++ onedown.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/onedown/README new/doc/latex/onedown/README
--- old/doc/latex/onedown/README 2019-02-23 23:18:17.000000000 +0100
+++ new/doc/latex/onedown/README 2019-10-21 22:51:57.000000000 +0200
@@ -1,11 +1,11 @@
--------------------------------------------------------------------------
-The OneDown package v1.3 - 2019/02/21
+The OneDown package v1.4 - 2019/10/15
A package to typeset diagrams for the game of bridge
--------------------------------------------------------------------------
Jacob Wiersma
Web:
-E-Mail: jack46@online.de
+E-Mail: jack@schuli-wirsi.de
--------------------------------------------------------------------------
Copyright 2018 Jacob Wiersma
@@ -33,6 +33,7 @@
- ODw-danish.trsl ODw-english.trsl ODw-french.trsl
ODw-norwegian.trsl ODw-turkish.trsl ODw-dutch.trsl
ODw-fallback.trsl ODw-german.trsl ODw-swedish.trsl
+ ODw-spanish.trsl
the directory examples with the files
- onedown-examples.pdf onedown-ref.pdf
@@ -67,11 +68,17 @@
MORE DOCUMENTATION
- examples/onedown-examples.pdf
- examples/onedown-ref.pdf
+These are in english. To get PDFs which shows the (output of) onedown commands
+in your language run
+ pdflatex '\AtBeginDocument{\def\RefLang{french}}\input{onedown-ref.tex}'
+or
+ pdflatex '\AtBeginDocument{\def\ExLang{norsk}}\input{onedown-examples.tex}'
+This works for all supported languages
--------------------------------------------------------------------------
DESCRIPTION
This packages provides macros to typeset bridge diagrams, including hands
-(stand alone or arround a compass), bidding tables (stand alone or in
+(stand alone or around a compass), bidding tables (stand alone or in
connection with hands/compass), trick tables and expert quizes.
--------------------------------------------------------------------------
REQUIREMENTS
Binary files old/doc/latex/onedown/examples/onedown-examples.pdf and new/doc/latex/onedown/examples/onedown-examples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/onedown/examples/onedown-examples.tex new/doc/latex/onedown/examples/onedown-examples.tex
--- old/doc/latex/onedown/examples/onedown-examples.tex 2018-11-02 21:53:02.000000000 +0100
+++ new/doc/latex/onedown/examples/onedown-examples.tex 2019-10-21 22:51:57.000000000 +0200
@@ -1,6 +1,6 @@
%%
%% onedown-examples.tex
-%% April 16, 2018
+%% Oct 04, 2019
%% Requires the onedown bundle
%% Part of the OneDown bundle (mirror.ctan.org/onedown)
%% author: J. Wiersma
@@ -17,9 +17,17 @@
\usepackage[T1]{fontenc}
%
\usepackage{subfiles}% can compile stand-alone/combined
-\usepackage[dutch,norsk,%
- turkish,shorthands=,% avoid problems with ':', '=' and '!'
- german,english]{babel}% introduce possible languages
+\usepackage[%
+ danish,%
+ dutch,%
+ french,%
+ german,%
+ norsk,%
+ spanish,es-noshorthands,% unset active chars to avoid problems with '.' '’' '"' '~' '<' and '>'
+ swedish,%
+ turkish,shorthands=,% unset active chars to avoid problems with ':', '=' and '!'
+ english,%
+]{babel}% introduce all known languages, default is english
%\usepackage[mono=false]{libertine}% verbatim needs option mono=false
% linertine screws verbatim, at least I don't know how to handle that
@@ -104,8 +112,15 @@
\def\SubFile#1{\def\FileName{#1}\newpage\section{#1}\subfile{#1}}
\addtolength{\textheight}{1.5cm}
-
+\def\ExLang{english}
\begin{document}
+% when compiled with:
+% pdflatex '\AtBeginDocument{\def\RefLang{YourLanguage}}\input{onedown-ref.tex}'
+% you'll get the onedown commands expansions in YourLanguage
+% YourLanguage can be any language out of:
+% english, danish, dutch, french, german, norsk, spanish, swedish, turkish
+%
+\expandafter\selectlanguage\expandafter{\ExLang}
\pdfbookmark[1]{Title}{Title}
\title{Examples for the\\\OneDown package%
\footnote{This file is part of the \OneDown bundle. To generate this file,
@@ -137,6 +152,12 @@
examples are produced using the \textsf{tcolorbox} package. This enables us
to show the code and the output of it side by side.
+The explanatory text is always in the English language. But you can show the output of all commands
+in any of the supported languages.\\
+These are: english, danish, dutch, french, german, norsk, spanish, swedish, turkish. \\
+You obtain this output in \emph{YourLanguage} by compiling onedown-ref.tex with: \\[0.2em]
+
+\verb|pdflatex '\AtBeginDocument{\def\RefLang{YourLanguage}}\input{onedown-examples.tex}'|
\par\vspace{1\baselineskip}
\setlength\columnseprule{.8pt}% rule between cols
\begin{multicols}{3}[{\centering \textbf{\Large List of Examples}}]
Binary files old/doc/latex/onedown/examples/onedown-ref.pdf and new/doc/latex/onedown/examples/onedown-ref.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/onedown/examples/onedown-ref.tex new/doc/latex/onedown/examples/onedown-ref.tex
--- old/doc/latex/onedown/examples/onedown-ref.tex 2019-02-23 23:18:17.000000000 +0100
+++ new/doc/latex/onedown/examples/onedown-ref.tex 2019-10-21 22:51:57.000000000 +0200
@@ -1,4 +1,41 @@
-\documentclass[onedown-examples]{subfiles}
+%%
+%% onedown-ref.tex
+%% Oct 04, 2019
+%% Requires the onedown bundle
+%% Part of the OneDown bundle (mirror.ctan.org/onedown)
+%% author: J. Wiersma
+%%--------NOTE-------------------------------------------
+%% USAGE: (pdf)latex onedown-ref.tex
+%%-------------------------------------------------------
+
+\documentclass[a4paper,fontsize=11pt]{scrartcl}
+\usepackage{scrlayer-scrpage}
+%
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+%
+\usepackage[%
+ danish,%
+ dutch,%
+ french,%
+ german,%
+ norsk,%
+ spanish,es-noshorthands,% unset active chars to avoid problems with '.' '’' '"' '~' '<' and '>'
+ swedish,%
+ turkish,shorthands=,% unset active chars to avoid problems with ':', '=' and '!'
+ english,%
+]{babel}% introduce all known languages, default is english
+
+\usepackage{onedown}% our own style to set bridge stuff
+\usepackage[a4paper, total={185mm, 257mm},left=12mm,top=20mm]{geometry}
+\newcommand\OneDown{\textcolor{red}{\smaller\bfseries\textsc{OneDown}}\xspace}
+\usepackage{shortvrb}
+\MakeShortVerb{\|}
+\usepackage{enumitem}%
+%\fi
+%
+%%%
+%
\usepackage[Q=yes]{examplep}
\makeatletter
\def\verbatim@font{\ttfamily\bfseries
@@ -19,9 +56,16 @@
%
\definecolor{optbackgr}{named}{lightgray}
\newcommand\Oarg[1]{\colorbox{optbackgr}{\texttt{#1}}}
-
+% default language to show the onedown command
+\def\RefLang{english}
\begin{document}
-
+% when compiled with:
+% pdflatex '\AtBeginDocument{\def\RefLang{YourLanguage}}\input{onedown-ref.tex}'
+% you'll get the onedown commands expansions in YourLanguage
+% YourLanguage can be any language out of:
+% english, danish, dutch, french, german, norsk, spanish, swedish, turkish
+%
+\expandafter\selectlanguage\expandafter{\RefLang}
\larger
\newgeometry{total={150mm, 265mm},left=25mm,top=15mm}
\pagestyle{empty}
@@ -37,8 +81,14 @@
background color, like \Oarg{*!}. Output of a tokenized |\macro*!| is shown
as:
\quad|\macro|\Oarg{*!}|: \macro, \macro*, \macro!, \macro*!|\\
-All output is shown for the English language.
-
+The explanatory text is always in the English language. But you can show the output of all commands
+in any of the supported languages.\\
+These are: english, danish, dutch, french, german, norsk, spanish, swedish, turkish. \\
+You obtain this output in \emph{YourLanguage} by compiling onedown-ref.tex with: \\[0.5em]
+%
+\verb|pdflatex '\AtBeginDocument{\def\RefLang{YourLanguage}}\input{onedown-ref.tex}'|
+\\[0.7em]
+\centerline{\textbf{This document shows the commands for the \emph{\RefLang}\ language}}
\begin{description}[itemsep=-0.3em]
\item[ace]: \ace
\item[Ace\Oarg{*!}]: \Ace, \Ace*, \Ace!, \Ace*!
@@ -118,7 +168,7 @@
\item[eastwest]: \eastwest
\item[Eastwest\Oarg{*!}]: \EastWest, \EastWest*, \EastWest!, \EastWest*!
-\item[expertquiz\Oarg{*!}\Q{[comment]}{award}]\\
+\item[expertquiz\Oarg{*!}\Q{[comment]{award}}]\\
Typesets a quiz, showing a
predefined hand and a predefined bidding diagram. The star version centers
the output. The token |!| forces a newline between hand and bidding
@@ -460,6 +510,7 @@
8 & {\Pass*!} & {\Double*!} & {\Redouble*!} & {\Allpass*!} \\
9 & {\pass} & {\double} & {\redouble} & {\allpass} \\
\end{tabular}\\
+
\end{document}
\endinput
Binary files old/doc/latex/onedown/onedown.pdf and new/doc/latex/onedown/onedown.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/onedown.doc.tlpobj new/tlpkg/tlpobj/onedown.doc.tlpobj
--- old/tlpkg/tlpobj/onedown.doc.tlpobj 2019-02-28 03:58:05.000000000 +0100
+++ new/tlpkg/tlpobj/onedown.doc.tlpobj 2019-10-25 01:54:26.000000000 +0200
@@ -1,9 +1,9 @@
name onedown.doc
category Package
-revision 50104
+revision 52525
shortdesc doc files of onedown
relocated 1
-docfiles size=535
+docfiles size=546
RELOC/doc/latex/onedown/README
RELOC/doc/latex/onedown/examples/Bidding.tex
RELOC/doc/latex/onedown/examples/Compass.tex
++++++ onedown.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-danish.trsl new/tex/latex/onedown/ODw-danish.trsl
--- old/tex/latex/onedown/ODw-danish.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-danish.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
%
%% retrieve with e.g \GetTranslation{dealer-(ODw)} to get givare
%
-\ProvideDictionaryFor{danish}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{danish}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1.}
\NewDictTranslation{2nd-(ODw)}{2.}
@@ -123,7 +123,7 @@
\NewDictTranslation{redoubled-(ODw)}{redubbelt}
\NewDictTranslation{Redoubled-(ODw)}{Redubbelt}
\NewDictTranslation{redouble-(ODw)}{redubbelt}
-\NewDictTranslation{Redouble-(ODw)}{Redubbelt}
+\NewDictTranslation{ReDouble-(ODw)}{Redubbelt}
\NewDictTranslation{semi forcing-(ODw)}{semi forcing}
\NewDictTranslation{Semi Forcing-(ODw)}{Semi Forcing}
\NewDictTranslation{sf-(ODw)}{sf}
@@ -140,8 +140,8 @@
\NewDictTranslation{Third Suit Forcing-(ODw)}{Tredje Farve Forcing}
\NewDictTranslation{total points-(ODw)}{total points}
\NewDictTranslation{Total Points-(ODw)}{Total Points}
-\NewDictTranslation{tp-(ODw)}{sp}
-\NewDictTranslation{TP-(ODw)}{SP}
+\NewDictTranslation{tp-(ODw)}{tp}
+\NewDictTranslation{TP-(ODw)}{TP}
\NewDictTranslation{trial bid-(ODw)}{trial bid}
\NewDictTranslation{Trial bid-(ODw)}{Trial bid}
\NewDictTranslation{trick-(ODw)}{træk}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-dutch.trsl new/tex/latex/onedown/ODw-dutch.trsl
--- old/tex/latex/onedown/ODw-dutch.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-dutch.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
%
% retrieve with e.g. \GetTranslation{dealer-(ODw)} to get dealer
%
-\ProvideDictionaryFor{dutch}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{dutch}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1ste}
\NewDictTranslation{2nd-(ODw)}{2de}
@@ -119,15 +119,15 @@
\NewDictTranslation{Q-(ODw)}{V}
\NewDictTranslation{queen-(ODw)}{vrouw}
\NewDictTranslation{Queen-(ODw)}{Vrouw}
-\NewDictTranslation{ReDbl-(ODw)}{ReDbl}
+\NewDictTranslation{ReDbl-(ODw)}{ReDblt}
\NewDictTranslation{redoubled-(ODw)}{geredoubleerd}
\NewDictTranslation{Redoubled-(ODw)}{Geredoubleerd}
\NewDictTranslation{redouble-(ODw)}{redoublet}
-\NewDictTranslation{Redouble-(ODw)}{Redoublet}
+\NewDictTranslation{ReDouble-(ODw)}{Redoublet}
\NewDictTranslation{semi forcing-(ODw)}{semi-mancheforcing}
\NewDictTranslation{Semi Forcing-(ODw)}{Semi-MancheForcing}
-\NewDictTranslation{sf-(ODw)}{sf}
-\NewDictTranslation{SF-(ODw)}{SF}
+\NewDictTranslation{sf-(ODw)}{smf}
+\NewDictTranslation{SF-(ODw)}{SMF}
\NewDictTranslation{s-(ODw)}{z}
\NewDictTranslation{S-(ODw)}{Z}
\NewDictTranslation{south-(ODw)}{zuid}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-english.trsl new/tex/latex/onedown/ODw-english.trsl
--- old/tex/latex/onedown/ODw-english.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-english.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
%
% retrieve with e.g. \GetTranslation{dealer-(ODw)} to get dealer
%
-\ProvideDictionaryFor{english}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{english}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1st}
\NewDictTranslation{2nd-(ODw)}{2nd}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-fallback.trsl new/tex/latex/onedown/ODw-fallback.trsl
--- old/tex/latex/onedown/ODw-fallback.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-fallback.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
%
% retrieve with e.g. \GetTranslation{dealer-(ODw)} to get dealer
%
-\ProvideDictionaryFor{fallback}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{fallback}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1st}
\NewDictTranslation{2nd-(ODw)}{2nd}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-french.trsl new/tex/latex/onedown/ODw-french.trsl
--- old/tex/latex/onedown/ODw-french.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-french.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
%
% retrieve with e.g. \GetTranslation{dealer-(ODw)} to get donneur
%
-\ProvideDictionaryFor{french}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{french}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1er}
\NewDictTranslation{2nd-(ODw)}{2e}
@@ -28,8 +28,8 @@
\NewDictTranslation{Bid-(ODw)}{Enchère}
\NewDictTranslation{board-(ODw)}{etui}
\NewDictTranslation{Board-(ODw)}{Etui}
-\NewDictTranslation{brd-(ODw)}{bte}
-\NewDictTranslation{Brd-(ODw)}{Bte}
+\NewDictTranslation{brd-(ODw)}{etui}
+\NewDictTranslation{Brd-(ODw)}{Etui}
\NewDictTranslation{by-(ODw)}{pour}
\NewDictTranslation{call-(ODw)}{annonce}
\NewDictTranslation{Call-(ODw)}{Annonce}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-german.trsl new/tex/latex/onedown/ODw-german.trsl
--- old/tex/latex/onedown/ODw-german.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-german.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
%
% retrieve with e.g. \GetTranslation{dealer-(ODw)} to get teiler
%
-\ProvideDictionaryFor{german}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{german}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1.}
\NewDictTranslation{2nd-(ODw)}{2.}
@@ -38,7 +38,7 @@
\NewDictTranslation{Contract-(ODw)}{Kontrakt}
\NewDictTranslation{contr-(ODw)}{kontr}
\NewDictTranslation{Contr-(ODw)}{Kontr}
-\NewDictTranslation{Dbl-(ODw)}{Kontra}
+\NewDictTranslation{Dbl-(ODw)}{Kntr}
\NewDictTranslation{dealer-(ODw)}{teiler}
\NewDictTranslation{Dealer-(ODw)}{Teiler}
\NewDictTranslation{deal!-(ODw)}{aust}
@@ -119,11 +119,11 @@
\NewDictTranslation{Q-(ODw)}{D}
\NewDictTranslation{queen-(ODw)}{dame}
\NewDictTranslation{Queen-(ODw)}{Dame}
-\NewDictTranslation{ReDbl-(ODw)}{ReKontra}
+\NewDictTranslation{ReDbl-(ODw)}{ReKntr}
\NewDictTranslation{redoubled-(ODw)}{rekontriert}
\NewDictTranslation{Redoubled-(ODw)}{Rekontriert}
\NewDictTranslation{redouble-(ODw)}{rekontra}
-\NewDictTranslation{Redouble-(ODw)}{Rekontra}
+\NewDictTranslation{ReDouble-(ODw)}{ReKontra}
\NewDictTranslation{semi forcing-(ODw)}{semi forcing}
\NewDictTranslation{Semi Forcing-(ODw)}{Semi Forcing}
\NewDictTranslation{sf-(ODw)}{sf}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-norwegian.trsl new/tex/latex/onedown/ODw-norwegian.trsl
--- old/tex/latex/onedown/ODw-norwegian.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-norwegian.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
%
% retrieve with e.g \GetTranslation{dealer-(ODw)} to get givare
%
-\ProvideDictionaryFor{norwegian}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{norwegian}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1.}
\NewDictTranslation{2nd-(ODw)}{2.}
@@ -123,7 +123,7 @@
\NewDictTranslation{redoubled-(ODw)}{redoblet}
\NewDictTranslation{Redoubled-(ODw)}{Redoblet}
\NewDictTranslation{redouble-(ODw)}{redoblet}
-\NewDictTranslation{Redouble-(ODw)}{Redoblet}
+\NewDictTranslation{ReDouble-(ODw)}{Redoblet}
\NewDictTranslation{semi forcing-(ODw)}{RundKrav}
\NewDictTranslation{Semi Forcing-(ODw)}{RundKrav}
\NewDictTranslation{sf-(ODw)}{rk}
@@ -140,8 +140,8 @@
\NewDictTranslation{Third Suit Forcing-(ODw)}{Tredje Farge Forcing}
\NewDictTranslation{total points-(ODw)}{totalt poeng}
\NewDictTranslation{Total Points-(ODw)}{Totalt Poeng}
-\NewDictTranslation{tp-(ODw)}{sp}
-\NewDictTranslation{TP-(ODw)}{SP}
+\NewDictTranslation{tp-(ODw)}{tp}
+\NewDictTranslation{TP-(ODw)}{TP}
\NewDictTranslation{trial bid-(ODw)}{prøving bud}
\NewDictTranslation{Trial bid-(ODw)}{Prøving bud}
\NewDictTranslation{trick-(ODw)}{trekk}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-spanish.trsl new/tex/latex/onedown/ODw-spanish.trsl
--- old/tex/latex/onedown/ODw-spanish.trsl 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/onedown/ODw-spanish.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -0,0 +1,160 @@
+% this is file ODw-spanish.trsl from the OneDown bundle
+%
+% Entries with a "!" denote an abreviated form
+%
+% retrieve with e.g. \GetTranslation{dealer-(ODw)} to get donneur
+%
+\ProvideDictionaryFor{spanish}{ODw}[V0.51-2019/10/15]
+
+\NewDictTranslation{1st-(ODw)}{1er}
+\NewDictTranslation{2nd-(ODw)}{2do}
+\NewDictTranslation{3rd-(ODw)}{3er}
+\NewDictTranslation{4th-(ODw)}{4th}
+\NewDictTranslation{ace-(ODw)}{as}
+\NewDictTranslation{Ace-(ODw)}{As}
+\NewDictTranslation{all-(ODw)}{todos}
+\NewDictTranslation{All-(ODw)}{Todos}
+\NewDictTranslation{all!-(ODw)}{todos}
+\NewDictTranslation{All!-(ODw)}{Todos}
+\NewDictTranslation{all pass-(ODw)}{todos pasan}
+\NewDictTranslation{All pass-(ODw)}{Todos pasan}
+\NewDictTranslation{a-(ODw)}{a}
+\NewDictTranslation{A-(ODw)}{A}
+\NewDictTranslation{ap-(ODw)}{tp}
+\NewDictTranslation{AP-(ODw)}{TP}
+\NewDictTranslation{award-(ODw)}{premio}
+\NewDictTranslation{Award-(ODw)}{Premio}
+\NewDictTranslation{bid-(ODw)}{contrato}
+\NewDictTranslation{Bid-(ODw)}{Contrato}
+\NewDictTranslation{board-(ODw)}{estuche}
+\NewDictTranslation{Board-(ODw)}{Estuche}
+\NewDictTranslation{brd-(ODw)}{est}
+\NewDictTranslation{Brd-(ODw)}{Est}
+\NewDictTranslation{by-(ODw)}{por}
+\NewDictTranslation{call-(ODw)}{annonce}
+\NewDictTranslation{Call-(ODw)}{Annonce}
+\NewDictTranslation{-card-(ODw)}{-carta}
+\NewDictTranslation{contract-(ODw)}{contrato final}
+\NewDictTranslation{Contract-(ODw)}{Contrato final}
+\NewDictTranslation{contr-(ODw)}{ctrf}
+\NewDictTranslation{Contr-(ODw)}{Ctrf}
+\NewDictTranslation{Dbl-(ODw)}{Dbl}
+\NewDictTranslation{dealer-(ODw)}{dador}
+\NewDictTranslation{Dealer-(ODw)}{Dador}
+\NewDictTranslation{deal!-(ODw)}{donne}
+\NewDictTranslation{Deal!-(ODw)}{Donne}
+\NewDictTranslation{deal-(ODw)}{donne}
+\NewDictTranslation{Deal-(ODw)}{Donne}
+\NewDictTranslation{declarer-(ODw)}{declarante}
+\NewDictTranslation{Declarer-(ODw)}{Declarante}
+\NewDictTranslation{decl-(ODw)}{decl}
+\NewDictTranslation{Decl-(ODw)}{Decl}
+\NewDictTranslation{distribution points-(ODw)}{puntos de distribución}
+\NewDictTranslation{Distribution Points-(ODw)}{Puntos de Distribución}
+\NewDictTranslation{doubled-(ODw)}{doblado}
+\NewDictTranslation{Doubled-(ODw)}{Doblado}
+\NewDictTranslation{double-(ODw)}{doblo}
+\NewDictTranslation{Double-(ODw)}{Doblo}
+\NewDictTranslation{dp-(ODw)}{pd}
+\NewDictTranslation{DP-(ODw)}{PD}
+\NewDictTranslation{east-(ODw)}{este}
+\NewDictTranslation{East-(ODw)}{Este}
+\NewDictTranslation{e-(ODw)}{e}
+\NewDictTranslation{E-(ODw)}{E}
+\NewDictTranslation{fourth suit forcing-(ODw)}{cuarto palo forcing}
+\NewDictTranslation{Fourth Suit Forcing-(ODw)}{Cuarto Palo Forcing}
+\NewDictTranslation{fsf-(ODw)}{4th\,pf}
+\NewDictTranslation{FSF-(ODw)}{4th\,PF}
+\NewDictTranslation{game forcing-(ODw)}{forcing a manga}
+\NewDictTranslation{Game Forcing-(ODw)}{Forcing a Manga}
+\NewDictTranslation{GF-(ODw)}{FG}
+\NewDictTranslation{gf-(ODw)}{fg}
+\NewDictTranslation{hand-(ODw)}{mano}
+\NewDictTranslation{Hand-(ODw)}{Mano}
+\NewDictTranslation{hcp-(ODw)}{ph}
+\NewDictTranslation{HCP-(ODw)}{PH}
+\NewDictTranslation{high card points-(ODw)}{puntos de honores}
+\NewDictTranslation{High Card Points-(ODw)}{Puntos de Honores}
+\NewDictTranslation{hlp-(ODw)}{hl}
+\NewDictTranslation{HLP-(ODw)}{HL}
+\NewDictTranslation{jack-(ODw)}{jaco}
+\NewDictTranslation{Jack-(ODw)}{Jaco}
+\NewDictTranslation{j-(ODw)}{j}
+\NewDictTranslation{J-(ODw)}{J}
+\NewDictTranslation{king-(ODw)}{rey}
+\NewDictTranslation{King-(ODw)}{Rey}
+\NewDictTranslation{k-(ODw)}{r}
+\NewDictTranslation{K-(ODw)}{R}
+\NewDictTranslation{lead!-(ODw)}{ent.}
+\NewDictTranslation{Lead!-(ODw)}{Ent.}
+\NewDictTranslation{lead-(ODw)}{entame}
+\NewDictTranslation{Lead-(ODw)}{Entame}
+\NewDictTranslation{length points-(ODw)}{points de longueur}
+\NewDictTranslation{Length Points-(ODw)}{Points de Longueur}
+\NewDictTranslation{lp-(ODw)}{pl}
+\NewDictTranslation{LP-(ODw)}{PL}
+\NewDictTranslation{new minor forcing-(ODw)}{neuvo menor forcing}
+\NewDictTranslation{New Minor Forcing-(ODw)}{Neuvo Menor Forcing}
+\NewDictTranslation{nmf-(ODw)}{nmf}
+\NewDictTranslation{NMF-(ODw)}{NMF}
+\NewDictTranslation{n-(ODw)}{n}
+\NewDictTranslation{N-(ODw)}{N}
+\NewDictTranslation{none-(ODw)}{nadie}
+\NewDictTranslation{None-(ODw)}{Nadie}
+\NewDictTranslation{none!-(ODw)}{nadie}
+\NewDictTranslation{None!-(ODw)}{Nadie}
+\NewDictTranslation{north-(ODw)}{norte}
+\NewDictTranslation{North-(ODw)}{Norte}
+\NewDictTranslation{no trump-(ODw)}{sin triunfo}
+\NewDictTranslation{No Trump-(ODw)}{Sin Triunfo}
+\NewDictTranslation{Nr-(ODw)}{\textnumero}
+\NewDictTranslation{Nr.-(ODw)}{\textnumero.}
+\NewDictTranslation{nt-(ODw)}{st}
+\NewDictTranslation{NT-(ODw)}{S\kern-0.01emT}
+\NewDictTranslation{pass-(ODw)}{paso}
+\NewDictTranslation{Pass-(ODw)}{Paso}
+\NewDictTranslation{pass!-(ODw)}{p}
+\NewDictTranslation{Pass!-(ODw)}{P}
+\NewDictTranslation{q-(ODw)}{d}
+\NewDictTranslation{Q-(ODw)}{D}
+\NewDictTranslation{queen-(ODw)}{dama}
+\NewDictTranslation{Queen-(ODw)}{Dama}
+\NewDictTranslation{ReDbl-(ODw)}{ReDbl}
+\NewDictTranslation{redoubled-(ODw)}{redoblado}
+\NewDictTranslation{Redoubled-(ODw)}{Redoblado}
+\NewDictTranslation{redouble-(ODw)}{redoblo}
+\NewDictTranslation{Redouble-(ODw)}{Redoblo}
+\NewDictTranslation{semi forcing-(ODw)}{semi forcing}
+\NewDictTranslation{Semi Forcing-(ODw)}{Semi Forcing}
+\NewDictTranslation{SF-(ODw)}{SF}
+\NewDictTranslation{sf-(ODw)}{sf}
+\NewDictTranslation{s-(ODw)}{s}
+\NewDictTranslation{S-(ODw)}{S}
+\NewDictTranslation{south-(ODw)}{sur}
+\NewDictTranslation{South-(ODw)}{Sur}
+\NewDictTranslation{suiter-(ODw)}{color}
+\NewDictTranslation{Suiter-(ODw)}{Color}
+\NewDictTranslation{suit-(ODw)}{palo}
+\NewDictTranslation{Suit-(ODw)}{Palo}
+\NewDictTranslation{third suit forcing-(ODw)}{tercer palo forcing}
+\NewDictTranslation{Third Suit Forcing-(ODw)}{Tercer Palo Forcing}
+\NewDictTranslation{total points-(ODw)}{puntos de honor-distribución}
+\NewDictTranslation{Total Points-(ODw)}{Puntos de Honor-Distribución}
+\NewDictTranslation{TP-(ODw)}{PHD}
+\NewDictTranslation{tp-(ODw)}{phd}
+\NewDictTranslation{trial bid-(ODw)}{trial bid}
+\NewDictTranslation{Trial bid-(ODw)}{Trial bid}
+\NewDictTranslation{trick-(ODw)}{baza}
+\NewDictTranslation{Trick-(ODw)}{Baza}
+\NewDictTranslation{tsf-(ODw)}{3er\,pf}
+\NewDictTranslation{TSF-(ODw)}{3er\,PF}
+\NewDictTranslation{vulnerable-(ODw)}{vulnerable}
+\NewDictTranslation{Vulnerable-(ODw)}{Vulnerable}
+\NewDictTranslation{vul-(ODw)}{vul}
+\NewDictTranslation{Vul-(ODw)}{Vul}
+\NewDictTranslation{west-(ODw)}{oeste}
+\NewDictTranslation{West-(ODw)}{Oeste}
+\NewDictTranslation{w-(ODw)}{o}
+\NewDictTranslation{W-(ODw)}{O}
+%
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-swedish.trsl new/tex/latex/onedown/ODw-swedish.trsl
--- old/tex/latex/onedown/ODw-swedish.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-swedish.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
% Thanks to Per Karlberg
% retrieve with e.g \GetTranslation{dealer-(ODw)} to get givare
%
-\ProvideDictionaryFor{swedish}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{swedish}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1:a}
\NewDictTranslation{2nd-(ODw)}{2:a}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/ODw-turkish.trsl new/tex/latex/onedown/ODw-turkish.trsl
--- old/tex/latex/onedown/ODw-turkish.trsl 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/ODw-turkish.trsl 2019-10-21 22:51:57.000000000 +0200
@@ -4,7 +4,7 @@
%
% retrieve with e.g. \GetTranslation{dealer-(ODw)} to get kâğıdı
%
-\ProvideDictionaryFor{turkish}{ODw}[V0.50-2019/02/21]
+\ProvideDictionaryFor{turkish}{ODw}[V0.51-2019/10/15]
\NewDictTranslation{1st-(ODw)}{1.}
\NewDictTranslation{2nd-(ODw)}{2.}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/onedown/onedown.sty new/tex/latex/onedown/onedown.sty
--- old/tex/latex/onedown/onedown.sty 2019-02-23 23:18:17.000000000 +0100
+++ new/tex/latex/onedown/onedown.sty 2019-10-21 22:51:57.000000000 +0200
@@ -21,10 +21,10 @@
%% 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}[2014/05/01]
-\def\ODwstyleversion{1.3}\def\ODwstyledate{2019/02/21}
+\def\ODwstyleversion{1.4}\def\ODwstyledate{2019/10/15}
\ProvidesPackage{onedown}
[\ODwstyledate\space v\ODwstyleversion\space
- Typeset Bridge Diagrams - Jacob Wiersma (C) 2016-2018]
+ Typeset Bridge Diagrams - Jacob Wiersma (C) 2016-2019]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -132,16 +132,16 @@
}% gamefont
\fontencoding{T1}\fontfamily{stix}
\fontseries{m}\fontshape{n}\selectfont
-\DeclareSymbolFont{symbols}{OMS}{txsy}{m}{n}
-\SetSymbolFont{symbols}{bold}{OMS}{txsy}{bx}{n}
+\DeclareSymbolFont{ODw@symbols}{OMS}{txsy}{m}{n}
+\SetSymbolFont{ODw@symbols}{bold}{OMS}{txsy}{bx}{n}
\DeclareFontSubstitution{OMS}{txsy}{m}{n}
-\DeclareSymbolFont{symbolsC}{U}{txsyc}{m}{n}
-\SetSymbolFont{symbolsC}{bold}{U}{txsyc}{bx}{n}
+\DeclareSymbolFont{ODw@symbolsC}{U}{txsyc}{m}{n}
+\SetSymbolFont{ODw@symbolsC}{bold}{U}{txsyc}{bx}{n}
\DeclareFontSubstitution{U}{txsyc}{m}{n}
-\DeclareMathSymbol{\ODw@spadesuit}{\mathord}{symbols}{127}
-\DeclareMathSymbol{\ODw@varheart}{\mathord}{symbolsC}{114}
-\DeclareMathSymbol{\ODw@vardiamond}{\mathord}{symbolsC}{113}
-\DeclareMathSymbol{\ODw@clubsuit}{\mathord}{symbols}{124}
+\DeclareMathSymbol{\ODw@spadesuit}{\mathord}{ODw@symbols}{127}
+\DeclareMathSymbol{\ODw@varheart}{\mathord}{ODw@symbolsC}{114}
+\DeclareMathSymbol{\ODw@vardiamond}{\mathord}{ODw@symbolsC}{113}
+\DeclareMathSymbol{\ODw@clubsuit}{\mathord}{ODw@symbols}{124}
\def\Cl{}\def\Di{}\def\He{}\def\Sp{}%
\ODw@set{%
colors/0/.code={%
@@ -185,6 +185,21 @@
}
\ODw@set{colors/b+r/.code={\pgfkeys{/ODw/colors=2}}}
\ODw@set{%
+ colors/3/.code={%
+ \ODw@monochromefalse%
+ \renewrobustcmd\Cl{\textcolor{gray}%
+ {\,[0.3]\ensuremath{\ODw@clubsuit}}\xspace}%
+ \renewrobustcmd\Di{\textcolor{gray}%
+ {\,[0.3]\ensuremath{\ODw@vardiamond}}\xspace}%
+ \renewrobustcmd\He{\textcolor{gray}%
+ {\,[0.3]\ensuremath{\ODw@varheart}}\xspace}%
+ \renewrobustcmd\Sp{\textcolor{gray}%
+ {\,[0.3]\ensuremath{\ODw@spadesuit}}\xspace}%
+ }%
+}
+\ODw@set{colors/grey/.code={\pgfkeys{/ODw/colors=3}}}
+\ODw@set{colors/gray/.code={\pgfkeys{/ODw/colors=3}}}
+\ODw@set{%
colors/4A/.code={%
\ODw@monochromefalse%
\renewrobustcmd\Cl{\textcolor{green}%
@@ -1860,6 +1875,13 @@
\xspace%
}% Jack
\def\jack{\Jack*!}
+\newcommand{\Ten}{%
+ \bgroup%
+ 10%
+ \egroup%
+ \xspace%
+}% Ten
+
\NewDocumentCommand{\All}{s t!}{%
\bgroup%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/onedown.tlpobj new/tlpkg/tlpobj/onedown.tlpobj
--- old/tlpkg/tlpobj/onedown.tlpobj 2019-02-28 03:58:06.000000000 +0100
+++ new/tlpkg/tlpobj/onedown.tlpobj 2019-10-25 01:54:27.000000000 +0200
@@ -1,6 +1,6 @@
name onedown
category Package
-revision 50104
+revision 52525
shortdesc Typeset Bridge Diagrams
relocated 1
longdesc This is a comprehensive package to draw all sorts of bridge
@@ -13,7 +13,7 @@
longdesc consistency of suit and hands. Multilingual output of bridge
longdesc terms. Extensive documentation: User manual, Reference manual,
longdesc and Examples.
-runfiles size=35
+runfiles size=37
RELOC/tex/latex/onedown/ODw-danish.trsl
RELOC/tex/latex/onedown/ODw-dutch.trsl
RELOC/tex/latex/onedown/ODw-english.trsl
@@ -21,11 +21,12 @@
RELOC/tex/latex/onedown/ODw-french.trsl
RELOC/tex/latex/onedown/ODw-german.trsl
RELOC/tex/latex/onedown/ODw-norwegian.trsl
+ RELOC/tex/latex/onedown/ODw-spanish.trsl
RELOC/tex/latex/onedown/ODw-swedish.trsl
RELOC/tex/latex/onedown/ODw-turkish.trsl
RELOC/tex/latex/onedown/onedown.sty
catalogue-ctan /macros/latex/contrib/onedown
-catalogue-date 2019-02-23 19:45:42 +0100
+catalogue-date 2019-10-24 16:04:43 +0200
catalogue-license lppl1.3
catalogue-topics games
-catalogue-version 1.3
+catalogue-version 1.4
++++++ opensans.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/opensans/CHANGES new/doc/fonts/opensans/CHANGES
--- old/doc/fonts/opensans/CHANGES 2011-12-01 00:00:30.000000000 +0100
+++ new/doc/fonts/opensans/CHANGES 2019-06-25 23:29:46.000000000 +0200
@@ -1,5 +1,25 @@
-Changelog for version 1.1:
- - fix bad weight substitution when using light weight and slanted shape
+VERSION 2.2:
+ - Fix ligatures for hyphens
+ - Fix font family definition with proportional numbers
+ - Fix font name in XeLaTeX/LuaLaTeX mode
-Changelog for version 1.2:
- - remove unneeded call to textcomp package in opensans.sty
+VERSION 2.1:
+ - Fix OT1 encoding with italic shape
+ - Fix packaging according to CTAN guidelines
+
+VERSION 2.0:
+ - Complete rewrite of the TeX metric file generation (otftotfm is now
+ used instead of fontinst)
+ - Support for XeLaTeX and LuaLaTeX
+ - Add bold condensed font
+ - Improve support for figure variant selection
+ - Drop faked smallcaps support
+ - Fix kerning with uppercase Greek diacritics
+ - Add "scaled" alias option
+ - Fix NFSS shape for condensed fonts
+
+VERSION 1.2:
+ - remove unneeded call to textcomp package in opensans.sty
+
+VERSION 1.1:
+ - fix bad weight substitution when using light weight and slanted shape
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/opensans/README new/doc/fonts/opensans/README
--- old/doc/fonts/opensans/README 2011-12-01 00:00:30.000000000 +0100
+++ new/doc/fonts/opensans/README 2019-06-25 23:29:46.000000000 +0200
@@ -1,24 +1,22 @@
------------------------
- Open Sans, version 1.2
+ Open Sans, version 2.1
------------------------
Open Sans is a humanist sans serif typeface designed by Steve Matteson. Open
Sans was designed with an upright stress, open forms and a neutral, yet friendly
appearance. It was optimized for print, web, and mobile interfaces, and has
-excellent legibility characteristics in its letterforms. This font is available
-from the Google Font Directory at
-http://code.google.com/webfonts/family?family=Open+Sans as TrueType files
-licensed under the Apache License version 2.0.
+excellent legibility characteristics in its letterforms.
-This package provides support for this font family in LaTeX. It includes the
-original TrueType fonts, as well as Type 1 versions, converted for this package
-using FontForge for full support with Dvips.
+The font family is available from the Google Font Directory as TTF-flavored
+OpenType files licensed under the Apache License version 2.0.
-Installation and usage instructions are described in
-doc/fonts/opensans/opensans.pdf.
+This package provides support for Open Sans in LaTeX, including XeLaTeX and
+LuaLaTeX. It includes the original OpenType fonts, as well as Type 1 versions,
+converted for this package using FontForge for full support with LaTeX and
+Dvips.
This package is released under the LaTeX Project Public License, either version
-1.3c or above, with the exception of the .pfb and .sfd files, released under the
+1.3c or above, with the exception of the .ttf and .pfb files, released under the
Apache License version 2.0.
If you have comments about the package, please contact Mohamed El Morabity
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/opensans/manifest.txt new/doc/fonts/opensans/manifest.txt
--- old/doc/fonts/opensans/manifest.txt 2011-12-01 00:00:30.000000000 +0100
+++ new/doc/fonts/opensans/manifest.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,823 +0,0 @@
-./source/fonts/opensans/opensans-02.etx
-./source/fonts/opensans/opensans-fixcyrillic.mtx
-./source/fonts/opensans/opensans-fixtextcomp.mtx
-./source/fonts/opensans/opensans-osfigures.etx
-./source/fonts/opensans/opensans-04.etx
-./source/fonts/opensans/opensans-fixlatin.mtx
-./source/fonts/opensans/opensans-03.etx
-./source/fonts/opensans/opensans-fixgreek.mtx
-./source/fonts/opensans/Makefile
-./source/fonts/opensans/opensans-01.etx
-./source/fonts/opensans/opensans-map.tex
-./source/fonts/opensans/opensans-drv.tex
-./source/fonts/opensans/ttf2type1.pe
-./fonts/truetype/public/opensans/OpenSans-Light.ttf
-./fonts/truetype/public/opensans/OpenSans-LightItalic.ttf
-./fonts/truetype/public/opensans/OpenSans-Regular.ttf
-./fonts/truetype/public/opensans/OpenSans-SemiboldItalic.ttf
-./fonts/truetype/public/opensans/OpenSans-Semibold.ttf
-./fonts/truetype/public/opensans/OpenSans-Bold.ttf
-./fonts/truetype/public/opensans/OpenSans-BoldItalic.ttf
-./fonts/truetype/public/opensans/OpenSans-CondLight.ttf
-./fonts/truetype/public/opensans/OpenSans-Italic.ttf
-./fonts/truetype/public/opensans/OpenSans-ExtraBold.ttf
-./fonts/truetype/public/opensans/OpenSans-ExtraBoldItalic.ttf
-./fonts/truetype/public/opensans/OpenSans-CondLightItalic.ttf
-./fonts/tfm/public/opensans/OpenSans-Semibold-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-04.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-02.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-04.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-03.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-01.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-02.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-02.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-01.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-02.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-01.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-02.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-03.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-02.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-04.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-01.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-03.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-01.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-04.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-04.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-03.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-04.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-04.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-03.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-03.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-04.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-01.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-03.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-03.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-03.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-03.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-01.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-04.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-02.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-01.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-01.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-02.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-03.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-02.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-01.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-01.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-01.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-SmallCaps-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-03.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-02.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-t2b.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-02.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLight-04.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-OSFigures-lgr.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-OSFigures-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-Semibold-SmallCaps-t2a.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-Regular-04.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-OSFigures-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Light-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-BoldItalic-04.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-SmallCaps-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-t1.tfm
-./fonts/tfm/public/opensans/OpenSans-Bold-OSFigures-ot1.tfm
-./fonts/tfm/public/opensans/OpenSans-SemiboldItalic-02.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-ExtraBoldItalic-ts1.tfm
-./fonts/tfm/public/opensans/OpenSans-Italic-SmallCaps-t2c.tfm
-./fonts/tfm/public/opensans/OpenSans-LightItalic-x2.tfm
-./fonts/tfm/public/opensans/OpenSans-CondLightItalic-OSFigures-t1.tfm
-./fonts/map/dvips/opensans/opensans.map
-./fonts/afm/public/opensans/OpenSans-LightItalic.afm
-./fonts/afm/public/opensans/OpenSans-ExtraBoldItalic.afm
-./fonts/afm/public/opensans/OpenSans-Bold.afm
-./fonts/afm/public/opensans/OpenSans-Italic.afm
-./fonts/afm/public/opensans/OpenSans-SemiboldItalic.afm
-./fonts/afm/public/opensans/OpenSans-CondLightItalic.afm
-./fonts/afm/public/opensans/OpenSans-ExtraBold.afm
-./fonts/afm/public/opensans/OpenSans-CondLight.afm
-./fonts/afm/public/opensans/OpenSans-Light.afm
-./fonts/afm/public/opensans/OpenSans-BoldItalic.afm
-./fonts/afm/public/opensans/OpenSans-Regular.afm
-./fonts/afm/public/opensans/OpenSans-Semibold.afm
-./fonts/vf/public/opensans/OpenSans-Bold-ot1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Bold-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Bold-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Light-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-t2a.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-ot1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Bold-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-lgr.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-Italic-t2b.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-t2a.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Regular-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Bold-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-Light-t2b.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-Regular-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Regular-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Light-ot1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-t2c.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Light-t2c.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Italic-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Bold-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Italic-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-t2c.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-Light-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-x2.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Italic-x2.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Light-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-ts1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-t1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-t2c.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-ts1.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Bold-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-x2.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-ts1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Regular-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Italic-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Italic-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-t2a.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-t1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-ts1.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Bold-x2.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-Light-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-t2b.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-t1.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-x2.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-t1.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Light-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Italic-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Italic-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Light-ts1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-t2c.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-ts1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Regular-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-ot1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-x2.vf
-./fonts/vf/public/opensans/OpenSans-Bold-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Regular-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Light-x2.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Italic-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Italic-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-lgr.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Italic-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Light-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-ts1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Light-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-ts1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-t2b.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-t2c.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Italic-ts1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-t1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-ot1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-lgr.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-ts1.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Light-t1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Regular-t2b.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Light-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Bold-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-lgr.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-t1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Regular-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Regular-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-ot1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-x2.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-t2c.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-x2.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Italic-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-x2.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-lgr.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Italic-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-OSFigures-ot1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-OSFigures-t1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-lgr.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-t2b.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-ts1.vf
-./fonts/vf/public/opensans/OpenSans-Light-SmallCaps-OSFigures-lgr.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Light-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-CondLight-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-SmallCaps-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-Italic-t1.vf
-./fonts/vf/public/opensans/OpenSans-Bold-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-Italic-OSFigures-x2.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Semibold-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-t2b.vf
-./fonts/vf/public/opensans/OpenSans-Bold-OSFigures-t2b.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-t2c.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-x2.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-SmallCaps-t2a.vf
-./fonts/vf/public/opensans/OpenSans-BoldItalic-ot1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBold-SmallCaps-OSFigures-t2a.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-t1.vf
-./fonts/vf/public/opensans/OpenSans-LightItalic-ot1.vf
-./fonts/vf/public/opensans/OpenSans-Regular-SmallCaps-x2.vf
-./fonts/vf/public/opensans/OpenSans-SemiboldItalic-t2a.vf
-./fonts/vf/public/opensans/OpenSans-Bold-ts1.vf
-./fonts/vf/public/opensans/OpenSans-ExtraBoldItalic-t1.vf
-./fonts/vf/public/opensans/OpenSans-CondLightItalic-SmallCaps-OSFigures-t2a.vf
-./fonts/enc/dvips/opensans/opensans-03.enc
-./fonts/enc/dvips/opensans/opensans-04.enc
-./fonts/enc/dvips/opensans/opensans-01.enc
-./fonts/enc/dvips/opensans/opensans-02.enc
-./fonts/type1/public/opensans/OpenSans-Bold.pfb
-./fonts/type1/public/opensans/OpenSans-SemiboldItalic.pfb
-./fonts/type1/public/opensans/OpenSans-ExtraBold.pfb
-./fonts/type1/public/opensans/OpenSans-Semibold.pfb
-./fonts/type1/public/opensans/OpenSans-Italic.pfb
-./fonts/type1/public/opensans/OpenSans-ExtraBoldItalic.pfb
-./fonts/type1/public/opensans/OpenSans-Regular.pfb
-./fonts/type1/public/opensans/OpenSans-CondLightItalic.pfb
-./fonts/type1/public/opensans/OpenSans-CondLight.pfb
-./fonts/type1/public/opensans/OpenSans-Light.pfb
-./fonts/type1/public/opensans/OpenSans-BoldItalic.pfb
-./fonts/type1/public/opensans/OpenSans-LightItalic.pfb
-./tex/latex/opensans/ot1fos.fd
-./tex/latex/opensans/t2bfosj.fd
-./tex/latex/opensans/t2afos.fd
-./tex/latex/opensans/lgrfosj.fd
-./tex/latex/opensans/lgrfos.fd
-./tex/latex/opensans/t2cfos.fd
-./tex/latex/opensans/t1fos.fd
-./tex/latex/opensans/t1fosj.fd
-./tex/latex/opensans/ot1fosj.fd
-./tex/latex/opensans/t2cfosj.fd
-./tex/latex/opensans/ts1fos.fd
-./tex/latex/opensans/t2afosj.fd
-./tex/latex/opensans/t2bfos.fd
-./tex/latex/opensans/x2fosj.fd
-./tex/latex/opensans/opensans.sty
-./tex/latex/opensans/x2fos.fd
-./tex/latex/opensans/ts1fosj.fd
-./manifest.txt
-./doc/fonts/opensans/CHANGES
-./doc/fonts/opensans/opensans-samples.tex
-./doc/fonts/opensans/opensans.tex
-./doc/fonts/opensans/opensans.pdf
-./doc/fonts/opensans/opensans-samples.pdf
-./doc/fonts/opensans/README
-./README
Binary files old/doc/fonts/opensans/opensans-samples.pdf and new/doc/fonts/opensans/opensans-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/opensans/opensans-samples.tex new/doc/fonts/opensans/opensans-samples.tex
--- old/doc/fonts/opensans/opensans-samples.tex 2011-08-27 00:25:05.000000000 +0200
+++ new/doc/fonts/opensans/opensans-samples.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,127 +0,0 @@
-%% opensans-samples.tex
-%% Copyright 2011 Mohamed El Morabity
-%
-% 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 and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[greek,russian,francais,american]{babel}
-\usepackage[LGR,T2A,T1,OT1]{fontenc}
-\usepackage[utf8x]{inputenc}
-\usepackage{microtype}
-\usepackage{opensans}
-\usepackage{textcomp}
-
-\newcommand{\latinSample}{%
- \foreignlanguage{francais}{%
- Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils
- sont doués de raison et de conscience et doivent agir les uns envers les
- autres dans un esprit de fraternité.%
- }%
-}
-
-\newcommand{\cyrillicSample}{%
- \foreignlanguage{russian}{%
- Все люди рождаются свободными и равными в своем достоинстве и правах. Они
- наделены разумом и совестью и должны поступать в отношении друг друга в духе
- братства.%
- }%
-}
-
-\newcommand{\greekSample}{%
- \foreignlanguage{greek}{%
- 'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα
- δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να
- συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
- }%
-}
-
-\newcommand{\miscSample}{%
- 0123456789 \oldstylenums{0123456789} ff fi fl ffi ffl \textperthousand{}
- \textcopyright{} \textregistered{} \texttrademark{} \texteuro{}
- \textsterling{} \textyen\\%
-}
-
-\newcommand{\fontSample}[2]{%
- {\usefont{T1}{fos}{#1}{#2}\latinSample}
-
- {\usefont{T2A}{fos}{#1}{#2}\cyrillicSample}
-
- {\usefont{LGR}{fos}{#1}{#2}\greekSample}
-
- {\fontfamily{fos}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
-}
-
-\begin{document}
-
-\section*{Opensans Light}
-
-\fontSample{l}{n}
-
-\fontSample{l}{it}
-
-\fontSample{l}{sc}
-
-\fontSample{l}{scit}
-
-\section*{Opensans Condensed Light}
-
-\fontSample{cl}{n}
-
-\fontSample{cl}{it}
-
-\fontSample{cl}{sc}
-
-\fontSample{cl}{scit}
-
-\section*{Opensans Regular}
-
-\fontSample{m}{n}
-
-\fontSample{m}{it}
-
-\fontSample{m}{sc}
-
-\fontSample{m}{scit}
-
-\section*{Opensans Semibold}
-
-\fontSample{sb}{n}
-
-\fontSample{sb}{it}
-
-\fontSample{sb}{sc}
-
-\fontSample{sb}{scit}
-
-\section*{Opensans Bold}
-
-\fontSample{b}{n}
-
-\fontSample{b}{it}
-
-\fontSample{b}{sc}
-
-\fontSample{b}{scit}
-
-\section*{Opensans Extrabold}
-
-\fontSample{eb}{n}
-
-\fontSample{eb}{it}
-
-\fontSample{eb}{sc}
-
-\fontSample{eb}{scit}
-
-\end{document}
Binary files old/doc/fonts/opensans/opensans.pdf and new/doc/fonts/opensans/opensans.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/opensans/opensans.tex new/doc/fonts/opensans/opensans.tex
--- old/doc/fonts/opensans/opensans.tex 2011-12-01 00:00:30.000000000 +0100
+++ new/doc/fonts/opensans/opensans.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,257 +0,0 @@
-%% opensans.tex
-%% Copyright 2011 Mohamed El Morabity
-%
-% 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 and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[american]{babel}
-\usepackage{booktabs}
-\usepackage[default,osfigures]{opensans}
-\usepackage{microtype}
-\usepackage{multirow}
-\usepackage{path}
-\usepackage{textcomp}
-\usepackage{varioref}
-\usepackage[colorlinks]{hyperref}
-
-\hypersetup{%
- pdftitle={LaTeX support for Open Sans},%
- pdfauthor={Mohamed El Morabity}%
-}%
-
-\newcommand{\acronym}[1]{\textsc{\lowercase{#1}}}
-\newcommand{\code}{\texttt}
-\newcommand{\command}{\texttt}
-\newcommand{\email}[1]{\href{mailto:#1}{\nolinkurl{#1}}}
-\newcommand{\name}{}
-\newcommand{\package}{\texttt}
-\newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
-\newcommand{\program}{}
-
-\title{\LaTeX{} support for Open Sans\\Version~1.2}
-
-\author{Mohamed \name{El~Morabity}\\\email{melmorabity@fedoraproject.org}}
-
-\begin{document}
-
-\maketitle
-
-\tableofcontents
-
-\section{Introduction}
-
-Open Sans is a humanist sans serif typeface designed by Steve
-\name{Matteson}. Open Sans was designed with an upright stress, open forms and a
-neutral, yet friendly appearance. It was optimized for print, web, and mobile
-interfaces, and has excellent legibility characteristics in its letterforms (see
-figure~\vref{styles}). This font is available from the Google Font Directory
-~\cite{opensans} as TrueType files licensed under the Apache License
-version~2.0.
-
-\begin{figure}
- \centering
- \fosfamily%
- {%
- {\fontseries{l}\selectfont Open Sans Light}\\
- {\fontseries{l}\selectfont\itshape Open Sans Light Italic}\\
- {\fontseries{cl}\selectfont Open Sans Condensed Light}\\
- {\fontseries{cl}\selectfont\itshape Open Sans Condensed Light Italic}\\
- Open Sans Regular\\
- {\itshape Open Sans Italic}\\
- {\fontseries{sb}\selectfont Open Sans Semibold}\\
- {\fontseries{sb}\selectfont\itshape Open Sans Semibold Italic}\\
- {\bfseries Open Sans Bold}\\
- {\bfseries\itshape Open Sans Bold Italic}\\
- {\fontseries{eb}\selectfont Open Sans Extrabold}\\
- {\fontseries{eb}\selectfont\itshape Open Sans Extrabold Italic}%
- }
- \caption{Available styles for Open Sans}
- \label{styles}
-\end{figure}
-
-This package provides support for this font in \LaTeX. It includes Type~1
-versions of the fonts, converted for this package using \program{FontForge} from
-its sources, for full support with \program{Dvips}.
-
-\section{Installation}
-
-These directions assume that your \TeX{} distribution is
-\acronym{TDS}-compliant.
-
-Once the \path|opensans.zip| archive extracted:
-\begin{enumerate}
-\item Copy \path|doc/|, \path|fonts/|, \path|source/|, and \path|tex/|
- directories to your \path|texmf/| directory (either your local or global
- \path|texmf/| directory).
-\item Run \command{mktexlsr} to refresh the file name database and make \TeX{}
- aware of the new files.
-\item Run \command{updmap --enable Map=opensans.map} to make \program{Dvips},
- \program{dvipdf} and \program{pdf\TeX} aware of the new fonts.
-\end{enumerate}
-
-Note that this package requires the \package{keyval}~\cite{keyval} and
-\package{slantsc}~\cite{slantsc} (to handle italic/slanted small caps) ones to
-work.
-
-\section{Usage}
-
-\subsection{Calling Open Sans}
-
-You can use the Open Sans font in a \LaTeX{} document by adding the command
-\begin{verbatim}
-\usepackage{opensans}
-\end{verbatim}
-to the preamble. The package supplies the \code{\char`\\fosfamily} command to
-switch the current font to Open Sans.
-
-\subsection{Options}
-
-\subsubsection{Open Sans as default (sans-serif) font}
-
-You can set \LaTeX{} to use Open Sans as standard font throughout the whole
-document by passing the \code{default} option to the package:
-\begin{verbatim}
-\usepackage[default]{opensans}
-\end{verbatim}
-To set Open Sans as default sans-serif only:
-\begin{verbatim}
-\usepackage[defaultsans]{opensans}
-\end{verbatim}
-
-\subsubsection{Font scaling}
-
-The font can be up- and downscale by any factor. This can be used to make Open
-Sans more friendly when used in company with other type faces, e.g., to adapt
-the x-height. The package option \code{scale=\parameter{ratio}} will scale the
-font according to \parameter{ratio} (1.0 by default), for example:
-\begin{verbatim}
-\usepackage[scale=0.95]{opensans}
-\end{verbatim}
-
-\subsubsection{Figure selection}
-
-Open Sans provides two different figures versions (see table~\vref{figures}):
-\begin{itemize}
-\item\emph{Lining figures} are designed to match the uppercase letters in size
- and clor; they are used by default.
-\item\emph{Text figures} (also known as \emph{old-style figures}) are designed
- to match the lowercase letters.
-\end{itemize}
-
-\begin{table}
- \centering
- \begin{tabular}{ll}
- \toprule
- lining figures&{\fontfamily{fos}\selectfont 0123456789}\\
- \midrule
- text figures&{\fontfamily{fosj}\selectfont 0123456789}\\
- \bottomrule
- \end{tabular}
- \caption{Comparison between lining figures and text figures}
- \label{figures}
-\end{table}
-
-To use text figures by default when calling \code{\char`\\fosfamily}, enable the
-\code{osfigures} package option:
-\begin{verbatim}
-\usepackage[osfigures]{opensans}
-\end{verbatim}
-To use Open Sans as default font with text figures:
-\begin{verbatim}
-\usepackage[default,osfigures]{opensans}
-\end{verbatim}
-
-\subsubsection{Encodings}
-
-The following encodings are supported:
-\begin{description}
-\item[Latin] OT1, T1, TS1 (partial)
-\item[Cyrillic] T2A, T2B, T2C, X2
-\item[Greek] LGR (monotonic only)
-\end{description}
-To use one or another encoding, give the \LaTeX{} name to the \package{fontenc}
-package as usual, as in
-\begin{verbatim}
-\usepackage[T1]{fontenc}
-\usepackage{opensans}
-\end{verbatim}
-
-Note that, as usual with OT1 encoded fonts, kerning with accented characters is
-treated poorly, if at all. Note difference in kerning between these two encoding
-in table~\vref{kerning}.
-\begin{table}
-\centering
- \begin{tabular}{ll}
- \toprule
- OT1-encoded&{\fosfamily Te T\'e}\\
- \midrule
- T1-encoded&{\fosfamily\fontencoding{T1}\selectfont Te T\'e}\\
- \bottomrule
- \end{tabular}
- \caption{Kerning with OT1 and T1 encodings}
- \label{kerning}
-\end{table}
-It is therefore advised to always use the Open Sans fonts in any encoding than
-OT1 when typing diacritics.
-
-\subsection{Available weights and variants}
-
-Table~\vref{nfss} lists the available font series and shapes with their
-\acronym{NFSS} classification. Parenthesized combinations are provided via
-substitutions.
-\begin{table}
- \centering
- \begin{tabular}{llll}
- \toprule
- family&encoding&series&shape\\
- \midrule
- \multirow{4}{*}{fos, fosj}&OT1,T1,&\multirow{4}{*}{l, lc, m, sb, b (bx), eb}&\multirow{3}{*}{n, it (sl), sc, scit (scsl)}\\
- &T2A, T2B, T2C, X2,&&\\
- &LGR&&\\
- \cmidrule{2-2}
- \cmidrule{4-4}
- &TS1&&n, it (sl)\\
- \bottomrule
- \end{tabular}
- \caption{Available font series and shapes for Open Sans; fosj corresponds to the text-figures version of the family}
- \label{nfss}
-\end{table}
-Notice that the slanted shapes are faked ones, as well as the small capitals
-(reduced to 80\%).
-
-Samples of the font are available in the
-\href{run:opensans-samples.pdf}{\path|opensans-samples.pdf|} file.
-
-\section{Known bugs and improvements}
-
-Please send bug reports and suggestions about the Open Sans \LaTeX{} support to
-\href{mailto:melmorabity@fedoraproject.org}{Mohamed \name{El~Morabity}}.
-
-\section{License}
-
-This package is released under the \LaTeX{} project public license, either
-version~1.3c or above~\cite{lppl}. Anyway both the TrueType and Type~1 files are
-delivered under the Apache License version~2.0~\cite{asl}.
-
-\begin{thebibliography}{9}
-\bibitem{opensans} \url{http://code.google.com/webfonts/family?family=Open+Sans}
-\bibitem{keyval}
- \url{http://www.ctan.org/tex-archive/macros/latex/required/graphics/}
-\bibitem{slantsc}
- \url{http://www.ctan.org/tex-archive/macros/latex/contrib/slantsc/}
-\bibitem{lppl} \url{http://www.latex-project.org/lppl/lppl-1-3c.html}
-\bibitem{asl} \url{http://www.apache.org/licenses/LICENSE-2.0.html}
-\end{thebibliography}
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/opensans.doc.tlpobj new/tlpkg/tlpobj/opensans.doc.tlpobj
--- old/tlpkg/tlpobj/opensans.doc.tlpobj 2019-02-28 03:58:07.000000000 +0100
+++ new/tlpkg/tlpobj/opensans.doc.tlpobj 2020-03-24 02:03:01.000000000 +0100
@@ -1,13 +1,10 @@
name opensans.doc
category Package
-revision 24706
+revision 54512
shortdesc doc files of opensans
relocated 1
-docfiles size=170
+docfiles size=149
RELOC/doc/fonts/opensans/CHANGES
RELOC/doc/fonts/opensans/README
- RELOC/doc/fonts/opensans/manifest.txt
RELOC/doc/fonts/opensans/opensans-samples.pdf
- RELOC/doc/fonts/opensans/opensans-samples.tex
RELOC/doc/fonts/opensans/opensans.pdf
- RELOC/doc/fonts/opensans/opensans.tex
++++++ opensans.tar.xz ++++++
++++ 247765 lines of diff (skipped)
++++++ optidef.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/optidef/README.md new/doc/latex/optidef/README.md
--- old/doc/latex/optidef/README.md 2018-07-19 23:11:40.000000000 +0200
+++ new/doc/latex/optidef/README.md 2019-05-03 00:39:15.000000000 +0200
@@ -68,7 +68,7 @@
Github: https://github.com/jeslago/optidef
-## Latest stable version: Optidef 3.0
+## Latest stable version: Optidef 3.1
CTAN: https://www.ctan.org/pkg/optidef
Binary files old/doc/latex/optidef/optidef.pdf and new/doc/latex/optidef/optidef.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/optidef/optidef.tex new/doc/latex/optidef/optidef.tex
--- old/doc/latex/optidef/optidef.tex 2018-07-19 23:11:40.000000000 +0200
+++ new/doc/latex/optidef/optidef.tex 2019-05-03 00:39:15.000000000 +0200
@@ -1,13 +1,13 @@
\documentclass[a4paper]{article}
\usepackage{remreset}
-\usepackage[short]{optidef}
+\usepackage{optidef}
\usepackage{listings}
\usepackage{enumitem}
\usepackage[hidelinks]{hyperref}
\lstset{basicstyle=\ttfamily,breaklines=true}
% Title Page
-\title{\textit{\textbf{Optidef}} \\ A Latex library for optimization problems\\ \textnormal{Version - 3.0}}
+\title{\textit{\textbf{Optidef}} \\ A Latex library for optimization problems\\ \textnormal{Version - 3.1}}
\author{Jesus Lago}
@@ -306,18 +306,17 @@
\begin{lstlisting}
\begin{mini*}<b>
{w,u}{f(w)+ R(w+6x)+ H(100w-x*w/500)}{}{}
-\breakObjective{-g(w^3-x^2*200+10000*w^5)}
\addConstraint{g(w_k)+h(w_k)}{=0,}{k=0,\ldots,N-1}
\addConstraint{l(w_k)}{=5u,\quad}{k=0,\ldots,N-1}
\end{mini*}
\end{lstlisting}
-For the \verb|mini|, \verb|maxi|, \verb|argmini|, and \verb|argmaxi| environments, when the option \verb|<b>| is provided, the environment does not automatically set the numbering nor the label of the environment. To create the number/label, the command \verb|\labelOP{label}| should be used. In particular, in the equation/constraint of the optimization problem where the label/number should be located, simply add \verb|\labelOP{label}|. For example, the following code:
+
+However, when using this option \verb|<b>|, it is important to note that labeling of equations is no longer automatic. To create the number/label, the command \verb|\labelOP{label}| should be used. In particular, in the equation/constraint of the optimization problem where the label/number should be located, simply add \verb|\labelOP{label}|. For example, the following code:
\begin{lstlisting}
\begin{mini}<b>
{w,u}{f(w)+ R(w+6x)+ H(100w-x*w/500)}{}{}
-\breakObjective{-g(w^3-x^2*200+10000*w^5)}
\addConstraint{g(w_k)+h(w_k)}{=0,}{k=0,\ldots,N-1 \labelOP{eq:label}}
\addConstraint{l(w_k)}{=5u,\quad}{k=0,\ldots,N-1}
\end{mini}
@@ -327,12 +326,11 @@
\begin{mini}<b>
{w,u}{f(w)+ R(w+6x)+ H(100w-x*w/500)}{}{}
- \breakObjective{-g(w^3-x^2*200+10000*w^5)}
\addConstraint{g(w_k)+h(w_k)}{=0,}{k=0,\ldots,N-1 \labelOP{eq:label}}
\addConstraint{l(w_k)}{=5u,\quad}{k=0,\ldots,N-1}
\end{mini}
-In addition to automatic breaking equations, manual breaks at selected locations can also be done using the \verb|\displaybreak| command. Just add \verb|\displaybreak| between the two constraints that need to be broken, e.g.:
+The option \verb|<b>| automatically breaks the optimization problem when the problem is too large to fit in one page (e.g.\ see an example in \ref{ex:break}). However, manual breaks at selected locations are also possible using the \verb|\displaybreak| command. Just add \verb|\displaybreak| between the two constraints that need to be broken, e.g.:
\begin{lstlisting}
\begin{mini}<b>
@@ -789,11 +787,15 @@
\end{maxi}
\subsection{Example 13 - Breaking optimization problem}
+\label{ex:break}
\begin{lstlisting}
\begin{mini}<b>
{w}{f(w)+ R(w+6x)}
{\label{eq:Example1}}{}
\addConstraint{g(w)}{=0}
+\addConstraint{p(w)}{=0}
+\addConstraint{q(w)}{=0}
+\addConstraint{r(w)}{=0\labelOP{testLabel}}
\addConstraint{n(w)}{= 6}
\addConstraint{L(w)+r(x)}{=Kw+p}
\addConstraint{h(x)}{=0.}
@@ -805,9 +807,9 @@
{w}{f(w)+ R(w+6x)}
{\label{eq:Example1}}{}
\addConstraint{g(w)}{=0}
-%\addConstraint{p(w)}{=0}
-%\addConstraint{q(w)}{=0}
-%\addConstraint{r(w)}{=0}
+\addConstraint{p(w)}{=0}
+\addConstraint{q(w)}{=0}
+\addConstraint{r(w)}{=0\labelOP{testLabel}}
%\addConstraint{s(w)}{=0}
%\addConstraint{t(w)}{=0}
%\addConstraint{v(w)}{=0}
@@ -821,13 +823,14 @@
\subsection{Example 14 - All Possible Parameters}
\begin{verbatim}
-\begin{mini!}|s|[1]<b>
-{w}{f(w)+ R(w+6x)}
-{}{w^*=}
-\addConstraint{g(w)}{=0,}{ \quad \text{(Dynamic constraint)}}
-\addConstraint{n(w)}{= 6,}{ \quad \text{(Boundary constraint)}}
-\addConstraint{L(w)+r(x)}{=Kw+p,}{ \quad \text{(Random constraint)}}
-\addConstraint{h(x)}{=0,}{ \quad \text{(Path constraint).}}
+\begin{mini!}|s|[2]<b>
+{w}{f(w)+ R(w+6x)\label{eq:ObjectiveExample3}}
+{\label{eq:Example3}}
+{w^*=}
+\addConstraint{g(w)}{=0 \label{eq:C1Example3}}
+\addConstraint{n(w)}{= 6 \label{eq:C2Example3}}
+\addConstraint{L(w)+r(x)}{=Kw+p \label{eq:C3Example3}}
+\addConstraint{h(x)}{=0.\label{eq:C4Example3}}
\end{mini!}
\end{verbatim}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/optidef.doc.tlpobj new/tlpkg/tlpobj/optidef.doc.tlpobj
--- old/tlpkg/tlpobj/optidef.doc.tlpobj 2019-02-28 03:58:10.000000000 +0100
+++ new/tlpkg/tlpobj/optidef.doc.tlpobj 2019-05-03 01:40:06.000000000 +0200
@@ -1,9 +1,9 @@
name optidef.doc
category Package
-revision 48228
+revision 50941
shortdesc doc files of optidef
relocated 1
-docfiles size=70
+docfiles size=71
RELOC/doc/latex/optidef/README.md
RELOC/doc/latex/optidef/optidef.pdf
RELOC/doc/latex/optidef/optidef.tex
++++++ optidef.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/optidef/optidef.sty new/tex/latex/optidef/optidef.sty
--- old/tex/latex/optidef/optidef.sty 2018-07-19 23:11:40.000000000 +0200
+++ new/tex/latex/optidef/optidef.sty 2019-05-03 00:39:15.000000000 +0200
@@ -1,4 +1,4 @@
-% optidef - Version 3.0
+% optidef - Version 3.1
%
%Copyright 2018 Jesus Lago
%
@@ -7,12 +7,12 @@
%
%This work has the LPPL maintenance status 'maintained'. The Current Maintainer of this work is J. Lago .
%
-%E-mail: J.LagoGarcia@tudelft.nl
+%E-mail: j.lagogarcia@tudelft.nl
%
%This work consists of the file optidef.sty.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{optidef}[2018/07/19 - version=3.0, Package for defining optimization problems]
+\ProvidesPackage{optidef}[2019/04/23 - version=3.1, Package for defining optimization problems]
\RequirePackage{environ}
\RequirePackage{mathtools}
@@ -32,26 +32,26 @@
\newcommand{\defaultConstraintFormat}{0}
\newcommand{\labelOP}[1]{\stepcounter{equation}\tag{\theequation}\label{#1}}
-\DeclareOption{short}{
- \renewcommand{\defaultProblemFormat}{s}
+\DeclareOption{short}{%
+ \renewcommand{\defaultProblemFormat}{s}%
}
-\DeclareOption{long}{
-\renewcommand{\defaultProblemFormat}{l}
+\DeclareOption{long}{%
+\renewcommand{\defaultProblemFormat}{l}%
}
-\DeclareOption{nocomma}{
- \renewcommand{\defaultOCPConstraint}{}
+\DeclareOption{nocomma}{%
+ \renewcommand{\defaultOCPConstraint}{}%
}
-\DeclareOption{c1}{
- \renewcommand{\defaultConstraintFormat}{1}
+\DeclareOption{c1}{%
+ \renewcommand{\defaultConstraintFormat}{1}%
}
-\DeclareOption{c2}{
- \renewcommand{\defaultConstraintFormat}{2}
+\DeclareOption{c2}{%
+ \renewcommand{\defaultConstraintFormat}{2}%
}
-\DeclareOption{c3}{
- \renewcommand{\defaultConstraintFormat}{3}
+\DeclareOption{c3}{%
+ \renewcommand{\defaultConstraintFormat}{3}%
}
\ProcessOptions\relax
@@ -91,42 +91,35 @@
%%%%%%%%%%%%%%%%%%%%%%%
% OBJECTIVE COMMAND DEFINITION
%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\bodyobj}[4]
-{
- \ifthenelse{\isempty{#4}}
- {
+\newcommand{\bodyobj}[4]{%
+ \ifthenelse{\isempty{#4}}{%
&\underset{\displaystyle #1}{\mathrlap{\mathrm{#3}}\phantom{\mathrm{subject~to}}} \quad #2\span\span\span\span
- }
- {
+ }{%
#4~ &\underset{\displaystyle #1}{\mathrlap{\mathrm{#3}}\phantom{\mathrm{subject~to}}} \quad #2\span\span\span\span
- }
+ }%
}
%% LONG VERSION "minimize" instead of "min"
-\newcommand{\bodyobjLong}[4]
-{
- \ifthenelse{\isempty{#4}}
- {
- &\mathmakebox[\widthof{$\underset{\displaystyle #1}{\mathrm{subject~to}}$}]{\underset{\displaystyle #1}{\mathrm{#3}}} \quad #2\span\span\span\span
- }
- {
- #4~ &\mathmakebox[\widthof{$\underset{\displaystyle #1}{\mathrm{subject~to}}$}]{\underset{\displaystyle #1}{\mathrm{#3}}} \quad #2\span\span\span\span
- }
+\newcommand{\bodyobjLong}[4]{%
+ \ifthenelse{\isempty{#4}}{%
+ &\mathmakebox[\widthof{$\underset{\displaystyle #1}{\mathrm{subject~to}}$}][l]{\underset{\displaystyle #1}{\mathrm{#3}}} \quad #2\span\span\span\span
+ }{%
+ #4~&\mathmakebox[\widthof{$\underset{\displaystyle #1}{\mathrm{subject~to}}$}][l]{\underset{\displaystyle #1}{\mathrm{#3}}} \quad #2\span\span\span\span
+ }%
}
%% SHORT VERSION "min" instead of "minimize"
-\newcommand{\bodyobjShort}[4]
-{
- \ifthenelse{\isempty{#4}}
- {
+\newcommand{\bodyobjShort}[4]{%
+ \ifthenelse{\isempty{#4}}{%
&\underset{\displaystyle #1}{\mathrm{#3}} \quad #2\span\span\span\span
- }
- {
+ }{%
#4 ~ &\underset{\displaystyle #1}{\mathrm{#3}} \quad #2\span\span\span\span
- }
+ }%
}
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% DEFINITION DIFFERENT TYPE OF BODY CONSTRAINTS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -135,141 +128,137 @@
% Main command. Dynamically redefined at every new problem definition.
-\DeclareDocumentCommand{\bodyconst}{m G{}}
-{ \equalsNothing{#2}{
+\DeclareDocumentCommand{\bodyconst}{m G{}}{%
+ \equalsNothing{#2}{%
\\ &\underset{\displaystyle \phantom{\localOptimalVariable}}{\mathrm{subject~to}} \quad & #2
- }{
+ }{%
\\ &\underset{\displaystyle \phantom{\localOptimalVariable}}{\mathrm{subject~to}} \quad & #2
- }
+ }%
}
-\newcommand{\bodySubjectToDefinition}{
+\newcommand{\bodySubjectToDefinition}{%
%## If the short version of "subject to", i.e. "s.t.", should be used the command \bodySubjectTo should be modified
-\ifthenelse{\equal{\localProblemFormat}{s}}
-{%%
-\global\def\bodySubjectTo{\mathmakebox[\widthof{$\underset{\displaystyle \phantom{\localOptimalVariable}}{\mathrm{\localProblemType}}$}][c]{\mathmakebox[\widthof{$\mathrm{\localProblemType}$}][l]{\mathrm{\kern 0.1em s.t.}}}}
-}{%%
-\global\def\bodySubjectTo{\mathmakebox[\widthof{$\underset{\displaystyle \phantom{\localOptimalVariable}}{\mathrm{\,subject~to}}$}][c]{\mathmakebox[\widthof{$\mathrm{\localProblemType}$}][l]{\mathrm{subject~to}}}}
-}%%
-%
+\ifthenelse{\equal{\localProblemFormat}{s}}{%
+\global\def\bodySubjectTo{\mathmakebox[\widthof{$\underset{\displaystyle\phantom{\localOptimalVariable}}{\mathrm{\localProblemType}}$}][c]{\mathmakebox[\widthof{$\mathrm{\localProblemType}$}][l]{\mathrm{\kern 0.1em s.t.}}}}
+}{%
+\global\def\bodySubjectTo{\mathmakebox[\widthof{$\underset{\displaystyle\phantom{\localOptimalVariable}}{\mathrm{subject~to}}$}][c]{%
+% \mathmakebox[\widthof{$\mathrm{\localProblemType}$}][l]
+ {\mathrm{subject~to}}
+ }%
+ }%
+}%
}
% Standard version.
-\DeclareDocumentCommand{\bodyconstRight}{m G{} G{}}
-{%%%
+\DeclareDocumentCommand{\bodyconstRight}{m G{} G{}}{%
\bodySubjectToDefinition
%## Set the first constraint according to the format used for "subject to"
-\equalsNothing{#3}{%%
- \equalsNothing{#2}{%
- \\ & \bodySubjectTo \quad & #2
+\equalsNothing{#3}{%
+ \equalsNothing{#2}{%
+ \\ & \bodySubjectTo \quad & #2
}{%
\\ &\bodySubjectTo \quad & #2
}%
\togglefalse{previousThird}
-}{%%
+}{%
\equalsNothing{#2}{%
\\ &\bodySubjectTo \quad & #2 &
}{%
\\ &\bodySubjectTo \quad & #2 &
}%
\toggletrue{previousThird}
-}%%
-}%%%
+}%
+}
% Single alignment point but next to subject to
-\DeclareDocumentCommand{\bodyconstOneAlign}{m G{} G{}}
-{
+\DeclareDocumentCommand{\bodyconstOneAlign}{m G{} G{}}{%
\bodySubjectToDefinition
%## Set the first constraint according to the format used for "subject to"
- \equalsNothing{#3}{
- \\ &\bodySubjectTo\quad & #2 \togglefalse{previousThird}
- }{
+ \equalsNothing{#3}{%
+ \\ &\bodySubjectTo\quad & #2 \togglefalse{previousThird}
+ }{%
\\ &\bodySubjectTo\quad & #2 &
\toggletrue{previousThird}
- }
+ }%
}
% Contraints below subject to and with a single alignment point
-\DeclareDocumentCommand{\bodyconstOneAlignBelow}{m G{} G{}}
-{
+\DeclareDocumentCommand{\bodyconstOneAlignBelow}{m G{} G{}}{%
\bodySubjectToDefinition
%## Set the first constraint according to the format used for "subject to"
- \equalsNothing{#3}{
+ \equalsNothing{#3}{%
\\ &\bodySubjectTo \span\span\span\span \\
&& #2 \togglefalse{previousThird}
- }{
+ }{%
\\ &\bodySubjectTo \span\span\span\span \\
&& #2 &
\toggletrue{previousThird}
- }
+ }%
}
% Contraints below subject to but with double alignment point
-\DeclareDocumentCommand{\bodyconstBelow}{m G{} G{}}
-{
+\DeclareDocumentCommand{\bodyconstBelow}{m G{} G{}}{%
\bodySubjectToDefinition
%## Set the first constraint according to the format used for "subject to"
- \equalsNothing{#3}{
- \equalsNothing{#2}{
+ \equalsNothing{#3}{%
+ \equalsNothing{#2}{%
\\ &\bodySubjectTo\span\span\span\span \\
&& #2
- }{
+ }{%
\\ &\bodySubjectTo \span\span\span\span \\
& & #2
- }
+ }%
\togglefalse{previousThird}
- }{
- \equalsNothing{#2}{
+ }{%
+ \equalsNothing{#2}{%
\\ &\bodySubjectTo \span\span\span\span \\
&& #2 &
- }{
+ }{%
\\ &\bodySubjectTo\span\span\span\span \\
& & #2 &
- }
+ }%
\toggletrue{previousThird}
- }
+ }%
}
% Contraints below subject to for the case of having a reference/label for each individual equation
-\DeclareDocumentCommand{\bodyconstBelowMult}{m G{} G{}}
-{
+\DeclareDocumentCommand{\bodyconstBelowMult}{m G{} G{}}{%
\bodySubjectToDefinition
%## Set the first constraint according to the format used for "subject to"
- \equalsNothing{#3}{
- \equalsNothing{#2}{
+ \equalsNothing{#3}{%
+ \equalsNothing{#2}{%
\\ &\bodySubjectTo\span\span\span\span \nonumber \\
&& #2
- }{
+ }{%
\\ &\bodySubjectTo \span\span\span\span \nonumber \\
& & #2
- }
+ }%
\togglefalse{previousThird}
- }{
- \equalsNothing{#2}{
+ }{%
+ \equalsNothing{#2}{%
\\ &\bodySubjectTo\span\span\span\span \nonumber \\
&& #2 &
- }{
+ }{%
\\ &\bodySubjectTo \span\span\span\span \nonumber \\
& & #2 &
- }
+ }%
\toggletrue{previousThird}
- }
+ }%
}
% Contraints below subject to and with a single alignment point for the case of having a reference/label for each individual equation
-\DeclareDocumentCommand{\bodyconstOneAlignBelowMult}{m G{} G{}}
-{
+\DeclareDocumentCommand{\bodyconstOneAlignBelowMult}{m G{} G{}}{%
\bodySubjectToDefinition
%## Set the first constraint according to the format used for "subject to"
- \equalsNothing{#3}{
+ \equalsNothing{#3}{%
\\ &\bodySubjectTo\span\span\span\span \nonumber \\
&& #2 \togglefalse{previousThird}
- }{
+ }{%
\\ &\bodySubjectTo\span\span\span\span \nonumber \\
&& #2 && #3
\toggletrue{previousThird}
- }
+ }%
}
@@ -279,238 +268,253 @@
% Main command. Dynamically redefined at every problem definiton.
-\DeclareDocumentCommand{\addConstraint}{m G{} G{}}{
+\DeclareDocumentCommand{\addConstraint}{m G{} G{}}{%
% "If clause" selecting whether a third parameter (#3) defining extra constraint information is used
-\equalsNothing{#3}{
+\equalsNothing{#3}{%
% Second "If clause" selecting whether two or 1 elements for the constraints are used
- \equalsNothing{#2}{
- \iftoggle{bodyCon}{
+ \equalsNothing{#2}{%
+ \iftoggle{bodyCon}{%
\bodyconst{#1}
\togglefalse{bodyCon}
- }{
+ }{%
\defaultOCPConstraint\\&\quad & #2\span\span
\togglefalse{bodyCon}
- }
- }{
- \iftoggle{bodyCon}{
+ }%
+ }{%
+ \iftoggle{bodyCon}{%
\bodyconst{#1}{#2}
\togglefalse{bodyCon}
- }{
+ }{%
\defaultOCPConstraint\\&\quad & #2\span\span
\togglefalse{bodyCon}
- }
- }
+ }%
+ }%
\togglefalse{previousThird}
- }{
- \iftoggle{bodyCon}{
+ }{%
+ \iftoggle{bodyCon}{%
\bodyconst{#1}{#2}{#3}
\togglefalse{bodyCon}
- }{
- \equalsNothing{#2}{
+ }{%
+ \equalsNothing{#2}{%
\defaultOCPConstraint\\&\quad & #2 && #3
- }{
+ }{%
\defaultOCPConstraint\\&\quad & #2 && #3
- }
+ }%
\togglefalse{bodyCon}
- }
+ }%
\toggletrue{previousThird}
- }
+ }%
}
% Standard version of adding constraints
% The toggle previousThird indicates if the previous constraint had three arguments or two. According to that it adjust the required spans at the end of the previous contraint. It is needed because the line jump after a constraint it is done at the beginning of the next constraint, not after the constraint itself. That avoid the last jump of the last constraint.
% The toggle bodyCon indicate that it is the first contraint. The first contraint is different that the rest because it contains "subject to"
% The commands \equalsNothing checks if the optional arguments exists
-\DeclareDocumentCommand{\standardAddConstraint}{m G{} G{}}{
- \iftoggle{previousThird}
- {
+\DeclareDocumentCommand{\standardAddConstraint}{m G{} G{}}{%
+ \iftoggle{previousThird}{%
\renewcommand{\spanit}{}
- }{
+ }{%
\renewcommand{\spanit}{\span\span}
- }
-\iftoggle{bodyCon}{
+ }%
+\iftoggle{bodyCon}{%
\bodyconstRight{#1}{#2}{#3}
\togglefalse{bodyCon}
-}{
- \equalsNothing{#2}{
- \equalsNothing{#3}{
+}{%
+ \equalsNothing{#2}{%
+ \equalsNothing{#3}{%
\defaultOCPConstraint\spanit\\&\quad & #2
\togglefalse{previousThird}
- }{
+ }{%
\defaultOCPConstraint\spanit\\&\quad & #2 && #3
\toggletrue{previousThird}
- }
- }{
- \equalsNothing{#3}{
+ }%
+ }{%
+ \equalsNothing{#3}{%
\defaultOCPConstraint\spanit\\&\quad & #2
\togglefalse{previousThird}
- }{
+ }{%
\defaultOCPConstraint\spanit\\&\quad & #2 && #3
\toggletrue{previousThird}
- }
-}
-\togglefalse{bodyCon}
-}
+ }%
+}%
+\togglefalse{bodyCon}%
+}%
}
% Adding constraints below subject to
-\DeclareDocumentCommand{\BelowAddConstraint}{m G{} G{}}{
- \iftoggle{bodyCon}{
+\DeclareDocumentCommand{\BelowAddConstraint}{m G{} G{}}{%
+ \iftoggle{bodyCon}{%
\bodyconstBelow{#1}{#2}{#3}
\togglefalse{bodyCon}
- }{
- \equalsNothing{#2}{
- \equalsNothing{#3}{
+ }{%
+ \equalsNothing{#2}{%
+ \equalsNothing{#3}{%
\defaultOCPConstraint\spanit\\&& #2 \togglefalse{previousThird}
- }{
+ }{%
\defaultOCPConstraint\spanit\\&& #2 && #3
\toggletrue{previousThird}
- }
- }{
- \equalsNothing{#3}{
+ }%
+ }{%
+ \equalsNothing{#3}{%
\defaultOCPConstraint\spanit\\ & \togglefalse{previousThird}
- }{
+ }{%
\defaultOCPConstraint\spanit\\ & && #3
\toggletrue{previousThird}
- }
- }
- \togglefalse{bodyCon}
- }
+ }%
+ }%
+ \togglefalse{bodyCon}%
+ }%
}
% Adding constraints with a single alignment point but next to subject to
-\DeclareDocumentCommand{\oneAlignAddConstraint}{m G{} G{}}{
- \iftoggle{bodyCon}{
+\DeclareDocumentCommand{\oneAlignAddConstraint}{m G{} G{}}{%
+ \iftoggle{bodyCon}{%
\bodyconstOneAlign{#1}{#2}{#3}
\togglefalse{bodyCon}
- }{
- \equalsNothing{#3}{
+ }{%
+ \equalsNothing{#3}{%
\defaultOCPConstraint\spanit\\&\quad & #2 \togglefalse{previousThird}
- }{
+ }{%
\defaultOCPConstraint\spanit\\&\quad & #2 && #3
\toggletrue{previousThird}
- }
- \togglefalse{bodyCon}
- }
+ }%
+ \togglefalse{bodyCon}%
+ }%
}
% Adding constraints for a single alignment point and with the constraints below
-\DeclareDocumentCommand{\oneAlignBelowAddConstraint}{m G{} G{}}{
- \iftoggle{bodyCon}{
+\DeclareDocumentCommand{\oneAlignBelowAddConstraint}{m G{} G{}}{%
+ \iftoggle{bodyCon}{%
\bodyconstOneAlignBelow{#1}{#2}{#3}
\togglefalse{bodyCon}
- }{
- \equalsNothing{#3}{
+ }{%
+ \equalsNothing{#3}{%
\defaultOCPConstraint\spanit\\& & #2\togglefalse{previousThird}
- }{
+ }{%
\defaultOCPConstraint\spanit\\& & #2 && #3
\toggletrue{previousThird}
- }
- \togglefalse{bodyCon}
- }
+ }%
+ \togglefalse{bodyCon}%
+ }%
}
% Adding constraints below "subject to" for multiple references
-\DeclareDocumentCommand{\BelowAddConstraintMult}{m G{} G{}}{
- \iftoggle{bodyCon}{
+\DeclareDocumentCommand{\BelowAddConstraintMult}{m G{} G{}}{%
+ \iftoggle{bodyCon}{%
\bodyconstBelowMult{#1}{#2}{#3}
\togglefalse{bodyCon}
- }{
- \equalsNothing{#3}{
- \equalsNothing{#2}{
+ }{%
+ \equalsNothing{#3}{%
+ \equalsNothing{#2}{%
\defaultOCPConstraint\spanit\\&& #2
- }{
+ }{%
\defaultOCPConstraint\spanit\\ &
- }
+ }%
\togglefalse{previousThird}
- }{
+ }{%
\equalsNothing{#2}{
\defaultOCPConstraint\spanit\\&& #2 && #3
- }{
+ }{%
\defaultOCPConstraint\spanit\\ & && #3}
\toggletrue{previousThird}
- }
- \togglefalse{bodyCon}
- }
+ }%
+ \togglefalse{bodyCon}%
+ }%
}
% Adding constraints for a single alignment point and with the constraints below for multiple references
\DeclareDocumentCommand{\oneAlignBelowAddConstraintMult}{m G{} G{}}{
- \iftoggle{bodyCon}{
+ \iftoggle{bodyCon}{%
\bodyconstOneAlignBelowMult{#1}{#2}{#3}
\togglefalse{bodyCon}
- }{
- \equalsNothing{#3}{
+ }{%
+ \equalsNothing{#3}{%
\defaultOCPConstraint\spanit\\& & #2 \togglefalse{previousThird}
- }{
+ }{%
\defaultOCPConstraint\spanit\\& & #2 && #3
\toggletrue{previousThird}
- }
+ }%
\togglefalse{bodyCon}
-}
+}%
}
%%%%%%%%%%%%%%%%%%%%
% ADDING EXTRA LINE
%%%%%%%%%%%%%%%%%%%%
-\newcommand{\breakObjective}[1]
-{
-\\&\mathmakebox[\widthInit]{\phantom{\underset{}{}}}#1\span\span\span\span
-}
+\newcommand{\breakObjective}[1]{%
+ \bodyBreakObjectiveDefinition
+\\
+\bodyBreakObjective\quad #1\span\span\span\span
+}%
+\newcommand{\bodyBreakObjectiveDefinition}{%
+ \ifthenelse{\equal{\localProblemFormat}{s}}{%
+ \global\def\bodyBreakObjective{\mathmakebox[\widthof{$\underset{\displaystyle\phantom{\localOptimalVariable}}{\mathrm{\localProblemType}}$}][c]{%
+ \mathmakebox[\widthof{$\mathrm{\localProblemType}$}][l]{}%
+ }%
+ }%
+ }%
+{%
+ \global\def\bodyBreakObjective{\mathmakebox[\widthof{$\underset{\displaystyle\phantom{\localOptimalVariable}}{\mathrm{subject~to}}$}][c]{%
+ {}%
+ }%
+ }%
+ }%
+}%
+
%%%%%%%%%%%%%%%%%%%%
% SELECTING TYPE OF FORMAT
%%%%%%%%%%%%%%%%%%%%
-\newcommand{\selectConstraint}[1]{
- \ifthenelse{\equal{#1}{1}}{
+\newcommand{\selectConstraint}[1]{%
+ \ifthenelse{\equal{#1}{1}}{%
\let\addConstraint\BelowAddConstraint
- }{
- \ifthenelse{\equal{#1}{2}}{
+ }{%
+ \ifthenelse{\equal{#1}{2}}{%
\let\addConstraint\oneAlignAddConstraint
- }{
- \ifthenelse{\equal{#1}{3}}{
+ }{%
+ \ifthenelse{\equal{#1}{3}}{%
\let\addConstraint\oneAlignBelowAddConstraint
- }{
- \let\addConstraint\standardAddConstraint}
-}
-}
-}
+ }{%
+ \let\addConstraint\standardAddConstraint
+ }%
+}%
+}%
+}%
% Selecting for multiple references
-\newcommand{\selectConstraintMult}[1]{
- \ifthenelse{\equal{#1}{1}}{
+\newcommand{\selectConstraintMult}[1]{%
+ \ifthenelse{\equal{#1}{1}}{%
\let\addConstraint\BelowAddConstraintMult
- }{
- \ifthenelse{\equal{#1}{2}}{
+ }{%
+ \ifthenelse{\equal{#1}{2}}{%
\let\addConstraint\oneAlignAddConstraint
- }{
- \ifthenelse{\equal{#1}{3}}{
+ }{%
+ \ifthenelse{\equal{#1}{3}}{%
\let\addConstraint\oneAlignBelowAddConstraintMult
- }{
- \let\addConstraint\standardAddConstraint}
-}
-}
-}
+ }{%
+ \let\addConstraint\standardAddConstraint
+}%
+}%
+}%
+}%
%%%%%%%%%%%%%%%%%%%
% SETTING DEFAULT FORMAT
%%%%%%%%%%%%%%%%%%%
% Originally, \toggletrue{bodyCon} was inside this function, however, spacing issues after environment made me remove it.
-\newcommand{\setStandardMini}{
- \let\addConstraint\standardAddConstraint
-}
+\newcommand{\setStandardMini}{\let\addConstraint\standardAddConstraint}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% COMMANDS TO DEFINE ALL REQUIRED PROPERTIES TO CHOOSE SHORT/LONG FORMAT
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\setFormatShort}[2]{\global\def\localProblemFormat{s} \let\bodyobj\bodyobjShort \renewcommand{\localProblemType}{#1}
- \setlength{\widthInit}{\widthof{$\underset{\displaystyle #2}{\mathrm{#1}}$\quad}}
+\newcommand{\setFormatShort}[2]{\global\def\localProblemFormat{s}\let\bodyobj\bodyobjShort \renewcommand{\localProblemType}{#1}%
+ \setlength{\widthInit}{\widthof{$\underset{\displaystyle #2}{\mathrm{#1}}$\quad}}%
}
-\newcommand{\setFormatLong}[2]{\global\def\localProblemFormat{l} \let\bodyobj\bodyobjLong \renewcommand{\localProblemType}{#1}
-\setlength{\widthInit}{\widthof{$\underset{\displaystyle #2}{\mathrm{subject~to}}$ \quad}}
-}
+\newcommand{\setFormatLong}[2]{\global\def\localProblemFormat{l}\let\bodyobj\bodyobjLong \renewcommand{\localProblemType}{#1}%
+\setlength{\widthInit}{\widthof{$\underset{\displaystyle #2}{\mathrm{subject~to}}$ \quad}}%
+}%
%%%%%%%%%%%%%%%%%%%%%
%MINIMIZATION ENVIRONMENTS
@@ -521,58 +525,46 @@
% Base environment for the three possible types of referencing: 1 label, no label or multilabel
% Base environment defined using NewEnviron package because of \BODY command
\NewEnviron{BaseMini}[6]{%
-
-\selectConstraint{#1}
-\renewcommand{\localOptimalVariable}{#2}
+\selectConstraint{#1}%
+\renewcommand{\localOptimalVariable}{#2}%
\begin{equation}
#4
\begin{alignedat}{5}
\bodyobj{#2}{#3}{#6}{#5}
\BODY
\end{alignedat}
-\end{equation}
+\end{equation}%
\setStandardMini
}
\NewEnviron{BaseMiniStar}[6]{%
-\selectConstraint{#1}
-\renewcommand{\localOptimalVariable}{#2}
-\ifthenelse{\equal{#6}{b}}{
- \begingroup
- \allowdisplaybreaks
-}{}
+\selectConstraint{#1}%
+\renewcommand{\localOptimalVariable}{#2}%
+\ifthenelse{\equal{#6}{b}}{\begingroup\allowdisplaybreaks}{}%
\begin{alignat*}{5}
\bodyobj{#2}{#3}{#5}{#4}
\BODY
-\end{alignat*}
-\ifthenelse{\equal{#6}{b}}{
- \endgroup
-}{}
+\end{alignat*}%
+\ifthenelse{\equal{#6}{b}}{\endgroup}{}%
\setStandardMini
}
\NewEnviron{BaseMiniExclam}[7]{%
- \selectConstraintMult{#1}
- \renewcommand{\localOptimalVariable}{#2}
-\ifthenelse{\equal{#7}{b}}{
- \begingroup
- \allowdisplaybreaks
-}{}
+ \selectConstraintMult{#1}%
+ \renewcommand{\localOptimalVariable}{#2}%
+ \ifthenelse{\equal{#7}{b}}{\begingroup\allowdisplaybreaks}{}%
\begin{subequations}
#4
\begin{alignat}{5}
\bodyobj{#2}{#3}{#6}{#5}
\BODY
\end{alignat}
- \end{subequations}
-\ifthenelse{\equal{#7}{b}}{
- \endgroup
-}{}
- \setStandardMini
+ \end{subequations}%
+\ifthenelse{\equal{#7}{b}}{\endgroup}{}%
+\setStandardMini
}
-
% INDIVIDUAL AND SPECIFIC ENVIRONMENTS (mini, maxi, argmini*...)
% Specific environments defined with xparse package due to arguments options
@@ -580,191 +572,183 @@
% In the below definitions, \toggletrue{bodyCon} has to be added once the definition of the environment is finished. I tried to do inside the environment itself using \setStandardMini, but it produced some ugly text displacemente.
% Single reference probems
-\DeclareDocumentEnvironment{mini}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{
-\ifthenelse{\equal{#3}{b}}
-{
- \ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{mini}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+\ifthenelse{\equal{#3}{b}}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{min}{#3}}
+ {\setFormatShort{min}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{min}{#3}}%
% Long version problem
- {\setFormatLong{minimize}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{minimize}{#3}}
-}
-{
- \ifthenelse{\equal{#1}{s}}
+ {\setFormatLong{minimize}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{minimize}{#3}}%
+}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{min}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{min}}
+ {\setFormatShort{min}{#2}\BaseMini{#2}{#4}{#5}{#6}{#7}{min}}%
% Long version problem
- {\setFormatLong{minimize}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{minimize}}
-}
+ {\setFormatLong{minimize}{#2}\BaseMini{#2}{#4}{#5}{#6}{#7}{minimize}}%
+}%
}%
{\endBaseMini\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmini}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{
- \ifthenelse{\equal{#3}{b}}
- {
- \ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{argmini}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#3}{b}}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{arg~min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}
+ {\setFormatShort{arg~min}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}%
% Long version problem
- {\setFormatLong{arg~min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}
- }
- {
- \ifthenelse{\equal{#1}{s}}
+ {\setFormatLong{arg~min}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}%
+ }{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{arg~min}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{arg~min}}
+ {\setFormatShort{arg~min}{#2}\BaseMini{#2}{#4}{#5}{#6}{#7}{arg~min}}%
% Long version problem
- {\setFormatLong{arg~min}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{arg~min}}
- }
+ {\setFormatLong{arg~min}{#2}\BaseMini{#2}{#4}{#5}{#6}{#7}{arg~min}}%
+ }%
}%
{\endBaseMini\toggletrue{bodyCon}}
% No reference
-\DeclareDocumentEnvironment{mini*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{mini*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{min}{#3}}
+ {\setFormatShort{min}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{min}{#3}}%
% Long version problem
- {\setFormatLong{minimize}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{minimize}{#3}}
+ {\setFormatLong{minimize}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{minimize}{#3}}%
}{\endBaseMiniStar\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmini*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{argmini*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
-{\setFormatShort{arg~min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}
+{\setFormatShort{arg~min}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}%
% Long version problem
-{\setFormatLong{arg~min}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}
+{\setFormatLong{arg~min}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{arg~min}{#3}}%
}{\endBaseMiniStar\toggletrue{bodyCon}}
% Multiple reference
-\DeclareDocumentEnvironment{mini!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{mini!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{min}{#3}}
+ {\setFormatShort{min}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{min}{#3}}%
% Long version problem
- {\setFormatLong{minimize}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{minimize}{#3}}
+ {\setFormatLong{minimize}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{minimize}{#3}}%
}{\endBaseMiniExclam\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmini!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{argmini!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
-{\setFormatShort{arg~min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}
+{\setFormatShort{arg~min}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}%
% Long version problem
-{\setFormatLong{arg~min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}
+{\setFormatLong{arg~min}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}%
}{\endBaseMiniExclam\toggletrue{bodyCon}}
% Multiple reference
-\DeclareDocumentEnvironment{minie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{minie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{min}{#3}}
+ {\setFormatShort{min}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{min}{#3}}%
% Long version problem
- {\setFormatLong{minimize}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{minimize}{#3}}
+ {\setFormatLong{minimize}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{minimize}{#3}}%
}{\endBaseMiniExclam\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argminie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{argminie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{arg~min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}
+ {\setFormatShort{arg~min}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}%
% Long version problem
- {\setFormatLong{arg~min}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}
+ {\setFormatLong{arg~min}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~min}{#3}}%
}{\endBaseMiniExclam\toggletrue{bodyCon}}
%MAXIMIZATION ENVIRONMENTS
% Single reference probems
-\DeclareDocumentEnvironment{maxi}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{
- \ifthenelse{\equal{#3}{b}}
- {
- \ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{maxi}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#3}{b}}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{max}{#3}}
+ {\setFormatShort{max}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{max}{#3}}%
% Long version problem
- {\setFormatLong{maximize}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{maximize}{#3}}
- }
- {
- \ifthenelse{\equal{#1}{s}}
+ {\setFormatLong{maximize}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{maximize}{#3}}%
+ }{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{max}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{max}}
+ {\setFormatShort{max}{#2}\BaseMini{#2}{#4}{#5}{#6}{#7}{max}}%
% Long version problem
- {\setFormatLong{maximize}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{maximize}}
- }
+ {\setFormatLong{maximize}{#2}\BaseMini{#2}{#4}{#5}{#6}{#7}{maximize}}%
+ }%
}%
{\endBaseMini\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmaxi}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{
- \ifthenelse{\equal{#3}{b}}
- {
- \ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{argmaxi}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#3}{b}}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{arg~max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}
+ {\setFormatShort{arg~max}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}%
% Long version problem
- {\setFormatLong{arg~max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}
- }
- {
- \ifthenelse{\equal{#1}{s}}
+ {\setFormatLong{arg~max}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}%
+ }{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{arg~max}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{arg~max}}
+ {\setFormatShort{arg~max}{#2}\BaseMini{#2}{#4}{#5}{#6}{#7}{arg~max}}%
% Long version problem
- {\setFormatLong{arg~max}{#2} \BaseMini{#2}{#4}{#5}{#6}{#7}{arg~max}}
- }
+ {\setFormatLong{arg~max}{#2}\BaseMini{#2}{#4}{#5}{#6}{#7}{arg~max}}%
+ }%
}%
{\endBaseMini\toggletrue{bodyCon}}
% No reference
-\DeclareDocumentEnvironment{maxi*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{maxi*}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
-{\setFormatShort{max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{max}{#3}}
+{\setFormatShort{max}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{max}{#3}}%
% Long version problem
-{\setFormatLong{maximize}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{maximize}{#3}}
+{\setFormatLong{maximize}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{maximize}{#3}}%
}{\endBaseMiniStar\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmaxi*}{D||{l} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{argmaxi*}{D||{l} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
-{\setFormatShort{arg~max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}
+{\setFormatShort{arg~max}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}%
% Long version problem
-{\setFormatLong{arg~max}{#2} \BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}
+{\setFormatLong{arg~max}{#2}\BaseMiniStar{#2}{#4}{#5}{#7}{arg~max}{#3}}%
}{\endBaseMiniStar\toggletrue{bodyCon}}
% Multiple reference
-\DeclareDocumentEnvironment{maxi!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{maxi!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
-{\setFormatShort{max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{max}{#3}}
+{\setFormatShort{max}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{max}{#3}}%
% Long version problem
-{\setFormatLong{maximize}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{maximize}{#3}}
+{\setFormatLong{maximize}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{maximize}{#3}}%
}{\endBaseMiniExclam\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmaxi!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{argmaxi!}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
-{\setFormatShort{arg~max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}
+{\setFormatShort{arg~max}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}%
% Long version problem
-{\setFormatLong{arg~max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}
+{\setFormatLong{arg~max}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}%
}{\endBaseMiniExclam\toggletrue{bodyCon}}
% Multiple reference
-\DeclareDocumentEnvironment{maxie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{maxie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{max}{#3}}
+ {\setFormatShort{max}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{max}{#3}}%
% Long version problem
- {\setFormatLong{maximize}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{maximize}{#3}}
+ {\setFormatLong{maximize}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{maximize}{#3}}%
}{\endBaseMiniExclam\toggletrue{bodyCon}}
-\DeclareDocumentEnvironment{argmaxie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}
-{\ifthenelse{\equal{#1}{s}}
+\DeclareDocumentEnvironment{argmaxie}{D||{\defaultProblemFormat} O{\defaultConstraintFormat} D<>{} m m m m}{%
+ \ifthenelse{\equal{#1}{s}}%
% Short version problem
- {\setFormatShort{arg~max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}
+ {\setFormatShort{arg~max}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}%
% Long version problem
- {\setFormatLong{arg~max}{#2} \BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}
+ {\setFormatLong{arg~max}{#2}\BaseMiniExclam{#2}{#4}{#5}{#6}{#7}{arg~max}{#3}}%
}{\endBaseMiniExclam\toggletrue{bodyCon}}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/optidef.tlpobj new/tlpkg/tlpobj/optidef.tlpobj
--- old/tlpkg/tlpobj/optidef.tlpobj 2019-02-28 03:58:11.000000000 +0100
+++ new/tlpkg/tlpobj/optidef.tlpobj 2019-05-03 01:40:06.000000000 +0200
@@ -1,6 +1,6 @@
name optidef
category Package
-revision 48228
+revision 50941
shortdesc Environments for writing optimization problems
relocated 1
longdesc This small library provides a standard set of environments for
@@ -19,12 +19,12 @@
longdesc has an individual reference. Finally, it also allows a
longdesc definition of any optimization problem without a limitless
longdesc number of constraints.
-runfiles size=6
+runfiles size=7
RELOC/tex/latex/optidef/optidef.sty
catalogue-contact-bugs https://github.com/jeslago/optidef/issues
catalogue-contact-repository https://github.com/jeslago/optidef
catalogue-ctan /macros/latex/contrib/optidef
-catalogue-date 2018-07-19 13:37:27 +0200
+catalogue-date 2019-04-23 21:57:10 +0200
catalogue-license lppl1.3
catalogue-topics maths
-catalogue-version 3.0
+catalogue-version 3.1
++++++ oscola.doc.tar.xz ++++++
++++ 1698 lines of diff (skipped)
++++++ oscola.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeindex/oscola/oscola.ist new/makeindex/oscola/oscola.ist
--- old/makeindex/oscola/oscola.ist 2019-01-21 00:18:31.000000000 +0100
+++ new/makeindex/oscola/oscola.ist 2020-03-15 22:31:46.000000000 +0100
@@ -1,6 +1,6 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-% v 1.6 22/03/2018
+% 2020/03/15 v1.7
delim_0 "\\space\\dotfill\\space "
delim_1 "\\space\\dotfill\\space "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oscola/american-oscola.lbx new/tex/latex/oscola/american-oscola.lbx
--- old/tex/latex/oscola/american-oscola.lbx 2019-01-21 00:18:31.000000000 +0100
+++ new/tex/latex/oscola/american-oscola.lbx 2020-03-15 22:31:46.000000000 +0100
@@ -2,8 +2,8 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-\ProvidesFile{english-oscola.lbx}
-[2019/01/20 v 1.6 Biblatex localisation file for OSCOLA citations]
+\ProvidesFile{american-oscola.lbx}
+[2020/03/15 v1.7 Biblatex localisation file for OSCOLA citations]
\DeclareRedundantLanguages{english,american,british}{english,american,british}
@@ -76,7 +76,7 @@
{\mkdatezeros{\thefield{#2}}%
\iffieldundef{#3}
{\iffieldundef{#1}{}{/}}
- {/}}%
+ {/}}%
\iffieldundef{#3}
{}
{\mkdatezeros{\thefield{#3}}%
@@ -94,55 +94,70 @@
\lbx@us@mkbibrangetruncextra@long{long}}%
\protected\def\mkbibrangeterseextra{%
\lbx@us@mkbibrangetruncextra@short{short}}%
- \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
- \printfield{extrayear}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}
+ \protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+ \printfield{extrayear}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \printfield{extrayear}}}}}}%
}
\UndeclareBibliographyExtras{%
@@ -530,7 +545,7 @@
abstract = {{abstract}{abstract}},
annotation = {{annotations}{annotations}},
eucase = {{Case}{Case}},
- eujoinedcases = {{Joined Cases}{Joined Cases}},
+ eujoinedcases = {{Joined Cases}{Joined Cases}},
commissiondecision = {{Commission Decision}{Commission Decision}},
article = {{article}{art}},
articles = {{articles}{arts}},
@@ -552,22 +567,4 @@
firstpublished = {{first published}{first published}},
}
-\protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}
-
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oscola/british-oscola.lbx new/tex/latex/oscola/british-oscola.lbx
--- old/tex/latex/oscola/british-oscola.lbx 2019-01-21 00:18:31.000000000 +0100
+++ new/tex/latex/oscola/british-oscola.lbx 2020-03-15 22:31:46.000000000 +0100
@@ -2,12 +2,13 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-\ProvidesFile{british-oscola.lbx}[2019/01/20 v 1.6 Biblatex localisation file for OSCOLA citations]
-
-\InheritBibliographyExtras{british}
+\ProvidesFile{british-oscola.lbx}
+[2020/03/15 v1.7 Biblatex localisation file for OSCOLA citations]
\DeclareRedundantLanguages{english,american,british}{english,american,british}
+\InheritBibliographyExtras{british}
+
\NewBibliographyString{regulation,
regulations,
eucase,
@@ -75,7 +76,7 @@
{\mkdatezeros{\thefield{#2}}%
\iffieldundef{#3}
{\iffieldundef{#1}{}{/}}
- {/}}%
+ {/}}%
\iffieldundef{#3}
{}
{\mkdatezeros{\thefield{#3}}%
@@ -93,55 +94,70 @@
\lbx@us@mkbibrangetruncextra@long{long}}%
\protected\def\mkbibrangeterseextra{%
\lbx@us@mkbibrangetruncextra@short{short}}%
- \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
- \printfield{extrayear}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}
+ \protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+ \printfield{extrayear}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \printfield{extrayear}}}}}}%
}
\UndeclareBibliographyExtras{%
@@ -529,7 +545,7 @@
abstract = {{abstract}{abstract}},
annotation = {{annotations}{annotations}},
eucase = {{Case}{Case}},
- eujoinedcases = {{Joined Cases}{Joined Cases}},
+ eujoinedcases = {{Joined Cases}{Joined Cases}},
commissiondecision = {{Commission Decision}{Commission Decision}},
article = {{article}{art}},
articles = {{articles}{arts}},
@@ -551,22 +567,4 @@
firstpublished = {{first published}{first published}},
}
-\protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}
-
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oscola/english-oscola.lbx new/tex/latex/oscola/english-oscola.lbx
--- old/tex/latex/oscola/english-oscola.lbx 2019-01-21 00:18:31.000000000 +0100
+++ new/tex/latex/oscola/english-oscola.lbx 2020-03-15 22:31:46.000000000 +0100
@@ -3,7 +3,7 @@
% oscola.lbx for copyright and licence information
\ProvidesFile{english-oscola.lbx}
-[2019/01/20 v 1.6 Biblatex localisation file for OSCOLA citations]
+[2020/03/15 v1.7 Biblatex localisation file for OSCOLA citations]
\DeclareRedundantLanguages{english,american,british}{english,american,british}
@@ -76,7 +76,7 @@
{\mkdatezeros{\thefield{#2}}%
\iffieldundef{#3}
{\iffieldundef{#1}{}{/}}
- {/}}%
+ {/}}%
\iffieldundef{#3}
{}
{\mkdatezeros{\thefield{#3}}%
@@ -94,55 +94,70 @@
\lbx@us@mkbibrangetruncextra@long{long}}%
\protected\def\mkbibrangeterseextra{%
\lbx@us@mkbibrangetruncextra@short{short}}%
- \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
- \printfield{extrayear}}}}}}
-
-\protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {\printfield{extrayear}}
- {\iffieldequalstr{#2endyear}{}
- {\printfield{extrayear}%
- \mbox{\bibdatedash}}
- {\bibdatedash
- \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
- \printfield{extrayear}}}}}}
+ \protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetrunc@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@long#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \iffieldsequal{#2year}{#2endyear}
+ {\iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+ \printfield{extrayear}}}}}}%
+ \protected\gdef\lbx@us@mkbibrangetruncextra@short#1#2{%
+ \iffieldundef{#2year}
+ {}
+ {\printtext{%
+ \iffieldsequal{#2year}{#2endyear}
+ {\csuse{mkbibdate#1}{}{#2month}{#2day}}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
+ \iffieldundef{#2endyear}
+ {\printfield{extrayear}}
+ {\iffieldequalstr{#2endyear}{}
+ {\printfield{extrayear}%
+ \mbox{\bibdatedash}}
+ {\bibdatedash
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \printfield{extrayear}}}}}}%
}
\UndeclareBibliographyExtras{%
@@ -530,7 +545,7 @@
abstract = {{abstract}{abstract}},
annotation = {{annotations}{annotations}},
eucase = {{Case}{Case}},
- eujoinedcases = {{Joined Cases}{Joined Cases}},
+ eujoinedcases = {{Joined Cases}{Joined Cases}},
commissiondecision = {{Commission Decision}{Commission Decision}},
article = {{article}{art}},
articles = {{articles}{arts}},
@@ -552,22 +567,4 @@
firstpublished = {{first published}{first published}},
}
-\protected\gdef\lbx@us@mkbibrangetrunc@long#1#2{%
- \iffieldundef{#2year}
- {}
- {\printtext{%
- \iffieldsequal{#2year}{#2endyear}
- {\csuse{mkbibdate#1}{}{#2month}{#2day}}
- {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}}%
- \iffieldundef{#2endyear}
- {}
- {\iffieldequalstr{#2endyear}{}
- {\mbox{\bibdatedash}}
- {\bibdatedash
- \iffieldsequal{#2year}{#2endyear}
- {\iffieldsequal{#2month}{#2endmonth}
- {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}
- {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}}}}}}
-
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oscola/oscola.bbx new/tex/latex/oscola/oscola.bbx
--- old/tex/latex/oscola/oscola.bbx 2019-01-21 00:18:31.000000000 +0100
+++ new/tex/latex/oscola/oscola.bbx 2020-03-15 22:31:46.000000000 +0100
@@ -13,7 +13,7 @@
% This work has the LPPL maintenance status 'maintained'.
% The current maintainer of this work is Paul Stanley (pstanley@essexcourt.net)
-\ProvidesFile{oscola.bbx}[2019/01/20 v1.6 Biblatex bibliography style for OSCOLA standard]
+\ProvidesFile{oscola.bbx}[2020/03/15 v1.7 Biblatex bibliography style for OSCOLA standard]
\RequireBibliographyStyle{authortitle}
@@ -131,12 +131,6 @@
\newboolean{bbx@year-essential}\setboolean{bbx@year-essential}{false}
% Entry options
-\DeclareEntryOption{url}[true]{%
- \settoggle{bbx:url}{#1}}
-\DeclareEntryOption{doi}[true]{%
- \settoggle{bbx:doi}{#1}}
-\DeclareEntryOption{eprint}[true]{%
- \settoggle{bbx:eprint}{#1}}
\DeclareEntryOption{scottish-style}[true]{%
\settoggle{bbx:scotstyle}{#1}}
\DeclareEntryOption{no-ibid}[true]{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/oscola/oscola.cbx new/tex/latex/oscola/oscola.cbx
--- old/tex/latex/oscola/oscola.cbx 2019-01-21 00:18:31.000000000 +0100
+++ new/tex/latex/oscola/oscola.cbx 2020-03-15 22:31:46.000000000 +0100
@@ -2,7 +2,7 @@
% Part of the OSCOLA package for biblatex: see the file
% oscola.lbx for copyright and licence information
-\ProvidesFile{oscola.cbx}[2018/03/22 v1.6 Biblatex citation style for OSCOLA standard]
+\ProvidesFile{oscola.cbx}[2020/03/15 v1.7 Biblatex citation style for OSCOLA standard]
\RequireCitationStyle{verbose-inote}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/oscola.tlpobj new/tlpkg/tlpobj/oscola.tlpobj
--- old/tlpkg/tlpobj/oscola.tlpobj 2019-02-28 03:58:12.000000000 +0100
+++ new/tlpkg/tlpobj/oscola.tlpobj 2020-03-16 02:21:38.000000000 +0100
@@ -1,6 +1,6 @@
name oscola
category Package
-revision 49772
+revision 54328
shortdesc BibLaTeX style for the Oxford Standard for the Citation of Legal Authorities
relocated 1
longdesc The package provides a set of style files for use with BibLaTeX
@@ -9,15 +9,15 @@
longdesc Citation of Legal Authorities. It also includes facilities for
longdesc constructing tables of cases and legislation from citations (in
longdesc conjunction with appropriate indexing packages).
-runfiles size=55
+runfiles size=54
RELOC/makeindex/oscola/oscola.ist
RELOC/tex/latex/oscola/american-oscola.lbx
RELOC/tex/latex/oscola/british-oscola.lbx
RELOC/tex/latex/oscola/english-oscola.lbx
RELOC/tex/latex/oscola/oscola.bbx
RELOC/tex/latex/oscola/oscola.cbx
+catalogue-contact-repository https://github.com/PaulStanley/oscola-biblatex
catalogue-ctan /macros/latex/contrib/biblatex-contrib/oscola
-catalogue-date 2019-01-20 10:41:30 +0100
catalogue-license lppl1.3
catalogue-topics legal biblatex
-catalogue-version 1.6
+catalogue-version 1.7