Hello community,
here is the log from the commit of package texlive-specs-j for openSUSE:Factory checked in at 2020-05-29 21:17:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-j (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-j.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-j"
Fri May 29 21:17:43 2020 rev:39 rq:806896 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-j/texlive-specs-j.changes 2019-11-07 23:10:45.692152840 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-j.new.3606/texlive-specs-j.changes 2020-05-29 21:26:59.588795297 +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
+
+-------------------------------------------------------------------
Old:
----
genmisc.tar.xz
geometry-de.doc.tar.xz
New:
----
fontsetup.doc.tar.xz
fontsetup.tar.xz
fontsize.doc.tar.xz
fontsize.tar.xz
forum.doc.tar.xz
forum.tar.xz
garamond-libre.doc.tar.xz
garamond-libre.tar.xz
gettitlestring.doc.tar.xz
gettitlestring.tar.xz
gfsdidotclassic.doc.tar.xz
gfsdidotclassic.tar.xz
gindex.doc.tar.xz
gindex.tar.xz
git-latexdiff.doc.tar.xz
git-latexdiff.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-j.spec ++++++
++++ 12089 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-j/texlive-specs-j.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-j.new.3606/texlive-specs-j.spec
++++++ fmtcount.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/CHANGES new/doc/latex/fmtcount/CHANGES
--- old/doc/latex/fmtcount/CHANGES 2017-12-29 00:44:51.000000000 +0100
+++ new/doc/latex/fmtcount/CHANGES 2020-02-25 23:03:17.000000000 +0100
@@ -1,5 +1,23 @@
fmtcount package versions:
+Version 3.07:
+
+* Make french definition robust against cleveref 0.21.4 dirty handling
+ of conditionals. See https://github.com/nlct/fmtcount/pull/36.
+
+Version 3.06:
+
+* Fix French documentation « mille » → « mil » where applicable.
+
+* Rename \Hexadecimal to \HEXADecimal, and document why. Same for
+ \Hexadecimalnum renamed to \HEXADecimalnum. Keep support for old
+ macro name with deprecation warning.
+
+* Fix issue #34 (documentation concerning no more trailing space
+ gobbling when the optional gender argument is omitted).
+
+* Fix issue #33 (fix ordinalstringnum in German)
+
Version 3.05:
* Fix issue #28 (works now with lualatex: actually from 3.05 fmtcount
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/README new/doc/latex/fmtcount/README
--- old/doc/latex/fmtcount/README 2017-12-29 00:44:51.000000000 +0100
+++ new/doc/latex/fmtcount/README 2020-02-25 23:03:17.000000000 +0100
@@ -1,6 +1,11 @@
-LaTeX Package : fmtcount v3.05
+LaTeX Package : fmtcount v3.07
-Last Modified : 2017-12-26
+
+(c) Copyright 2000-2013 Nicola LC Talbot
+(c) Copyright 2013-2020 Nicola LC Talbot and Vincent Bela\"iche
+
+
+Last Modified : 2020-02-24
Author : Nicola Talbot and Vincent Belaïche
@@ -46,8 +51,7 @@
Read the file CHANGES for version changes.
-This material is subject to the LaTeX Project Public License.
-See http://mirror.ctan.org/help/Cataloague/licenses.lppl.html for
-the details of that license.
+This material is subject to the LaTeX Project Public License. See
+https://www.ctan.org/license/lppl for the details of that license.
http://www.dickimaw-books.com/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fmtcount/fc-typeout-languages.tex new/doc/latex/fmtcount/fc-typeout-languages.tex
--- old/doc/latex/fmtcount/fc-typeout-languages.tex 2015-05-10 00:19:10.000000000 +0200
+++ new/doc/latex/fmtcount/fc-typeout-languages.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-\documentclass{article}
-\usepackage{fmtcount}
-\usepackage{lipsum}
-\newwrite\styfiles
-\openout\styfiles=fc-styfiles.txt
-\begin{document}
-\immediate\write\styfiles{STYFILES=\string\^^J}
-\makeatletter
-{%
- \def\@tempb#1{%
- \immediate\write\styfiles{fc-#1.def\string\^^J}%
- }%
- \fc@iterate@on@languages\@tempb
-}
-\makeatother
-\immediate\write\styfiles{fmtcount.sty fcnumparser.sty fcprefix.sty}
-\closeout\styfiles
-\lipsum
-\clearpage
-\end{document}
Binary files old/doc/latex/fmtcount/fmtcount.pdf and new/doc/latex/fmtcount/fmtcount.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fmtcount.doc.tlpobj new/tlpkg/tlpobj/fmtcount.doc.tlpobj
--- old/tlpkg/tlpobj/fmtcount.doc.tlpobj 2019-02-28 03:37:41.000000000 +0100
+++ new/tlpkg/tlpobj/fmtcount.doc.tlpobj 2020-02-26 01:54:40.000000000 +0100
@@ -1,11 +1,10 @@
name fmtcount.doc
category Package
-revision 46159
+revision 53912
shortdesc doc files of fmtcount
relocated 1
-docfiles size=142
+docfiles size=143
RELOC/doc/latex/fmtcount/CHANGES
RELOC/doc/latex/fmtcount/README
RELOC/doc/latex/fmtcount/fc-lang.tex
- RELOC/doc/latex/fmtcount/fc-typeout-languages.tex
RELOC/doc/latex/fmtcount/fmtcount.pdf
++++++ fmtcount.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-UKenglish.def new/tex/latex/fmtcount/fc-UKenglish.def
--- old/tex/latex/fmtcount/fc-UKenglish.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-UKenglish.def 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-UKenglish.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\ProvidesFCLanguage{UKenglish}[2013/08/17]%
\FCloadlang{english}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-USenglish.def new/tex/latex/fmtcount/fc-USenglish.def
--- old/tex/latex/fmtcount/fc-USenglish.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-USenglish.def 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-USenglish.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\ProvidesFCLanguage{USenglish}[2013/08/17]%
\FCloadlang{english}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-american.def new/tex/latex/fmtcount/fc-american.def
--- old/tex/latex/fmtcount/fc-american.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-american.def 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-american.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\ProvidesFCLanguage{american}[2016/01/12]%
\FCloadlang{USenglish}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-brazilian.def new/tex/latex/fmtcount/fc-brazilian.def
--- old/tex/latex/fmtcount/fc-brazilian.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-brazilian.def 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-brazilian.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\ProvidesFCLanguage{brazilian}[2017/12/26]%
\FCloadlang{portuges}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-british.def new/tex/latex/fmtcount/fc-british.def
--- old/tex/latex/fmtcount/fc-british.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-british.def 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-british.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\ProvidesFCLanguage{british}[2013/08/17]%
\FCloadlang{english}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-english.def new/tex/latex/fmtcount/fc-english.def
--- old/tex/latex/fmtcount/fc-english.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-english.def 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-english.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\ProvidesFCLanguage{english}[2016/01/12]%
\newcommand*\@ordinalMenglish[2]{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-francais.def new/tex/latex/fmtcount/fc-francais.def
--- old/tex/latex/fmtcount/fc-francais.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-francais.def 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-francais.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\ProvidesFCLanguage{francais}[2013/08/17]%
\FCloadlang{french}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-french.def new/tex/latex/fmtcount/fc-french.def
--- old/tex/latex/fmtcount/fc-french.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-french.def 2020-02-25 23:03:17.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-french.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,8 +50,9 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
-\ProvidesFCLanguage{french}[2017/06/15]%
+\ProvidesFCLanguage{french}[2020/02/24]%
\ifcsundef{fc@gl@let}{\global\let\fc@gl@let\let}{\PackageError{fmtcount}{Command already defined}{Command
\protect\fc@gl@let\space already defined.}}
\ifcsundef{fc@gl@def}{\global\let\fc@gl@def\def}{\PackageError{fmtcount}{Command already defined}{Command
@@ -1159,8 +1160,14 @@
\count0=0 %
\fi
\ifnum\count0=1 %
- \protected@edef\@tempa{\expandafter\fc@wcase\fc@first\@nil}%
+ \expandafter\@firstoftwo
\else
+ \expandafter\@secondoftwo
+ \fi
+ {%
+ \protected@edef\@tempa{\expandafter\fc@wcase\fc@first\@nil}%
+ }%
+ {%
\def\@tempa##1{%
\expandafter\edef\csname fc@frenchoptions@##1@plural\endcsname{%
\ifcase\csname fc@frenchoptions@##1@plural\endcsname\space
@@ -1209,7 +1216,7 @@
\fi
\fi
\fi
- \fi
+ }%
\fc@apply@gcase
\def\@tempb##1{\def\@tempa{\def#2{##1}}}%
\expandafter\@tempb\expandafter{\@tempa}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-frenchb.def new/tex/latex/fmtcount/fc-frenchb.def
--- old/tex/latex/fmtcount/fc-frenchb.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-frenchb.def 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-frenchb.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\ProvidesFCLanguage{frenchb}[2013/08/17]%
\FCloadlang{french}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-german.def new/tex/latex/fmtcount/fc-german.def
--- old/tex/latex/fmtcount/fc-german.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-german.def 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-german.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,8 +50,9 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
-\ProvidesFCLanguage{german}[2016/01/12]%
+\ProvidesFCLanguage{german}[2018/06/17]%
\newcommand{\@ordinalMgerman}[2]{%
\edef#2{\number#1\relax.}%
}%
@@ -404,11 +405,12 @@
}%
\global\let\@@numberunderhundredthgerman\@@numberunderhundredthgerman
\newcommand*\@@ordinalstringgerman[2]{%
-\ifnum#1>99999\relax
+\@orgargctr=#1\relax
+\ifnum\@orgargctr>99999\relax
\PackageError{fmtcount}{Out of range}%
{This macro only works for values less than 100000}%
\else
- \ifnum#1<0\relax
+ \ifnum\@orgargctr<0\relax
\PackageError{fmtcount}{Negative numbers not permitted}%
{This macro does not work for negative numbers, however
you can try typing "minus" first, and then pass the modulus of
@@ -416,10 +418,10 @@
\fi
\fi
\def#2{}%
-\@strctr=#1\relax \divide\@strctr by 1000\relax
+\@strctr=\@orgargctr\divide\@strctr by 1000\relax
\ifnum\@strctr>1\relax
\@@numberunderhundredgerman{\@strctr}{#2}%
- \@tmpstrctr=#1\relax \@FCmodulo{\@tmpstrctr}{1000}%
+ \@tmpstrctr=\@orgargctr\@FCmodulo{\@tmpstrctr}{1000}%
\ifnum\@tmpstrctr=0\relax
\eappto#2{\@thousandth}%
\else
@@ -427,18 +429,18 @@
\fi
\else
\ifnum\@strctr=1\relax
- \ifnum#1=1000\relax
+ \ifnum\@orgargctr=1000\relax
\eappto#2{\@thousandth}%
\else
\eappto#2{\eintausend}%
\fi
\fi
\fi
-\@strctr=#1\relax
+\@strctr=\@orgargctr
\@FCmodulo{\@strctr}{1000}%
\divide\@strctr by 100\relax
\ifnum\@strctr>1\relax
- \@tmpstrctr=#1\relax \@FCmodulo{\@tmpstrctr}{100}%
+ \@tmpstrctr=\@orgargctr \@FCmodulo{\@tmpstrctr}{100}%
\ifnum\@tmpstrctr=0\relax
\ifnum\@strctr=1\relax
\eappto#2{\@hundredth}%
@@ -450,11 +452,11 @@
\fi
\else
\ifnum\@strctr=1\relax
- \@tmpstrctr=#1\relax \@FCmodulo{\@tmpstrctr}{100}%
+ \@tmpstrctr=\@orgargctr \@FCmodulo{\@tmpstrctr}{100}%
\ifnum\@tmpstrctr=0\relax
\eappto#2{\@hundredth}%
\else
- \ifnum#1>1000\relax
+ \ifnum\@orgargctr>1000\relax
\appto#2{einhundert}%
\else
\eappto#2{\einhundert}%
@@ -462,9 +464,9 @@
\fi
\fi
\fi
-\@strctr=#1\relax
+\@strctr=\@orgargctr
\@FCmodulo{\@strctr}{100}%
-\ifthenelse{\@strctr=0 \and #1>0}{}{%
+\ifthenelse{\@strctr=0 \and \@orgargctr>0 }{}{%
\@@numberunderhundredthgerman{\@strctr}{#2}%
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-germanb.def new/tex/latex/fmtcount/fc-germanb.def
--- old/tex/latex/fmtcount/fc-germanb.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-germanb.def 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-germanb.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\ProvidesFCLanguage{germanb}[2013/08/17]%
\FCloadlang{german}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-italian.def new/tex/latex/fmtcount/fc-italian.def
--- old/tex/latex/fmtcount/fc-italian.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-italian.def 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-italian.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\ProvidesFCLanguage{italian}[2013/08/17]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-ngerman.def new/tex/latex/fmtcount/fc-ngerman.def
--- old/tex/latex/fmtcount/fc-ngerman.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-ngerman.def 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-ngerman.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\ProvidesFCLanguage{ngerman}[2012/06/18]%
\FCloadlang{german}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-ngermanb.def new/tex/latex/fmtcount/fc-ngermanb.def
--- old/tex/latex/fmtcount/fc-ngermanb.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-ngermanb.def 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-ngermanb.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\ProvidesFCLanguage{ngermanb}[2013/08/17]%
\FCloadlang{german}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-portuges.def new/tex/latex/fmtcount/fc-portuges.def
--- old/tex/latex/fmtcount/fc-portuges.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-portuges.def 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-portuges.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\ProvidesFCLanguage{portuges}[2017/12/26]%
\newcommand*\@ordinalMportuges[2]{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-portuguese.def new/tex/latex/fmtcount/fc-portuguese.def
--- old/tex/latex/fmtcount/fc-portuguese.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-portuguese.def 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-portuguese.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\ProvidesFCLanguage{portuguese}[2014/06/09]%
\FCloadlang{portuges}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fc-spanish.def new/tex/latex/fmtcount/fc-spanish.def
--- old/tex/latex/fmtcount/fc-spanish.def 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fc-spanish.def 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fc-spanish.def,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\ProvidesFCLanguage{spanish}[2016/01/12]%
\newcommand*\@ordinalMspanish[2]{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fcnumparser.sty new/tex/latex/fmtcount/fcnumparser.sty
--- old/tex/latex/fmtcount/fcnumparser.sty 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fcnumparser.sty 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fcnumparser.sty,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fcnumparser}[2017/06/15]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fcprefix.sty new/tex/latex/fmtcount/fcprefix.sty
--- old/tex/latex/fmtcount/fcprefix.sty 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fcprefix.sty 2020-01-29 23:37:04.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fcprefix.sty,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,6 +50,7 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fcprefix}[2012/09/28]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fmtcount/fmtcount.sty new/tex/latex/fmtcount/fmtcount.sty
--- old/tex/latex/fmtcount/fmtcount.sty 2017-12-29 00:44:51.000000000 +0100
+++ new/tex/latex/fmtcount/fmtcount.sty 2020-02-25 23:03:17.000000000 +0100
@@ -7,7 +7,7 @@
%% fmtcount.dtx (with options: `fmtcount.sty,package')
%%
%% fmtcount.dtx
-%% Copyright 2017 Nicola Talbot and Vincent Bela�che
+%% Copyright 2020 Nicola Talbot and Vincent Bela�che
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -50,10 +50,11 @@
%%\end{definition}
%% Local Variables:
%% coding: utf-8
+%% compile-command: "make -C ../dist fmtcount.pdf"
%% End:
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fmtcount}[2017/12/24 v3.05]
+\ProvidesPackage{fmtcount}[2020/01/30 v3.07]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
@@ -341,48 +342,26 @@
\ifcase#10\or1\or2\or3\or4\or5\or
6\or7\or8\or9\or a\or b\or c\or d\or e\or f\fi
}
-\newrobustcmd*{\@hexadecimal}[1]{%
- \@DT@padzeroestrue
- \@DT@loopN=\@vpt
- \@strctr=\@DT@loopN
- \whiledo{\@strctr<\c@padzeroesN}{0\advance\@strctr by \@ne}%
- \@strctr=65536\relax
- \@DT@X=#1\relax
- \loop
- \@DT@modctr=\@DT@X
- \divide\@DT@modctr by \@strctr
- \ifthenelse{\boolean{@DT@padzeroes}
- \and \(\@DT@modctr=0\)
- \and \(\@DT@loopN>\c@padzeroesN\)}
- {}{\@@hexadecimal\@DT@modctr}%
- \ifnum\@DT@modctr=0\else\@DT@padzeroesfalse\fi
- \multiply\@DT@modctr by \@strctr
- \advance\@DT@X by -\@DT@modctr
- \divide\@strctr by 16\relax
- \advance\@DT@loopN by \m@ne
- \ifnum\@strctr>\@ne
- \repeat
- \@@hexadecimal\@DT@X
-}
-\let\hexadecimalnum=\@hexadecimal
+\newrobustcmd*{\hexadecimalnum}{\@hexadecimalengine\@@hexadecimal}
\newcommand*{\@@Hexadecimal}[1]{%
\ifcase#10\or1\or2\or3\or4\or5\or6\or
7\or8\or9\or A\or B\or C\or D\or E\or F\fi
}
-\newrobustcmd*{\@Hexadecimal}[1]{%
+\newrobustcmd*{\HEXADecimalnum}{\@hexadecimalengine\@@Hexadecimal}
+\newcommand*{\@hexadecimalengine}[2]{%
\@DT@padzeroestrue
- \@DT@loopN=5\relax
+ \@DT@loopN=\@vpt
\@strctr=\@DT@loopN
\whiledo{\@strctr<\c@padzeroesN}{0\advance\@strctr by \@ne}%
\@strctr=65536\relax
- \@DT@X=#1\relax
+ \@DT@X=#2\relax
\loop
\@DT@modctr=\@DT@X
\divide\@DT@modctr by \@strctr
\ifthenelse{\boolean{@DT@padzeroes}
\and \(\@DT@modctr=0\)
- \and \(\@DT@loopN>\c@padzeroesN\)}%
- {}{\@@Hexadecimal\@DT@modctr}%
+ \and \(\@DT@loopN>\c@padzeroesN\)}
+ {}{#1\@DT@modctr}%
\ifnum\@DT@modctr=0\else\@DT@padzeroesfalse\fi
\multiply\@DT@modctr by \@strctr
\advance\@DT@X by -\@DT@modctr
@@ -390,10 +369,13 @@
\advance\@DT@loopN by \m@ne
\ifnum\@strctr>\@ne
\repeat
- \@@Hexadecimal\@DT@X
+ #1\@DT@X
}
-
-\let\Hexadecimalnum=\@Hexadecimal
+\def\Hexadecimalnum{%
+ \PackageWarning{fmtcount}{\string\Hexadecimalnum\space is deprecated, use \string\HEXADecimalnum\space
+ instead. The \string\Hexadecimalnum\space control sequence name is confusing as it can mislead in thinking
+ that only the 1st letter is upper-cased.}%
+ \HEXADecimalnum}
\newrobustcmd*{\@aaalph}{\fc@aaalph\@alph}
\newcommand*\fc@aaalph[2]{%
\@DT@loopN=#2\relax
@@ -979,13 +961,21 @@
\the\value{#1}}%
}
\providecommand*{\hexadecimal}[1]{%
- \@hexadecimal{\expandafter\expandafter\expandafter
+ \hexadecimalnum{\expandafter\expandafter\expandafter
\the\value{#1}}%
}
-\providecommand*{\Hexadecimal}[1]{%
- \@Hexadecimal{\expandafter\expandafter\expandafter
+\providecommand*{\HEXADecimal}[1]{%
+ \HEXADecimalnum{\expandafter\expandafter\expandafter
\the\value{#1}}%
}
+\newrobustcmd*\FC@Hexadecimal@warning{%
+ \PackageWarning{fmtcount}{\string\Hexadecimal\space is deprecated, use \string\HEXADecimal\space
+ instead. The \string\Hexadecimal\space control sequence name is confusing as it can mislead in thinking
+ that only the 1st letter is upper-cased.}%
+}
+\def\Hexadecimal{%
+ \FC@Hexadecimal@warning
+ \HEXADecimal}
\providecommand*{\octal}[1]{%
\@octal{\expandafter\expandafter\expandafter
\the\value{#1}}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fmtcount.tlpobj new/tlpkg/tlpobj/fmtcount.tlpobj
--- old/tlpkg/tlpobj/fmtcount.tlpobj 2019-02-28 03:37:42.000000000 +0100
+++ new/tlpkg/tlpobj/fmtcount.tlpobj 2020-02-26 01:54:40.000000000 +0100
@@ -1,6 +1,6 @@
name fmtcount
category Package
-revision 46159
+revision 53912
shortdesc Display the value of a LaTeX counter in a variety of formats
relocated 1
longdesc The package provides commands that display the value of a LaTeX
@@ -37,7 +37,6 @@
catalogue-contact-bugs https://github.com/nlct/fmtcount/issues
catalogue-contact-repository https://github.com/nlct/fmtcount
catalogue-ctan /macros/latex/contrib/fmtcount
-catalogue-date 2017-12-27 23:42:13 +0100
catalogue-license lppl1.3
catalogue-topics numbers
-catalogue-version 3.05
+catalogue-version 3.07
++++++ fncylab.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fncylab/README.md new/doc/latex/fncylab/README.md
--- old/doc/latex/fncylab/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/fncylab/README.md 2019-09-14 23:35:37.000000000 +0200
@@ -0,0 +1,6 @@
+# fncylab
+Alter the format of \label references
+
+Since the 2019 LaTeX release the functionality of this package is
+included in the LaTeX kernel so this package is only necessary on old
+installations.
Binary files old/doc/latex/fncylab/fncylab.pdf and new/doc/latex/fncylab/fncylab.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fncylab/fncylab.tex new/doc/latex/fncylab/fncylab.tex
--- old/doc/latex/fncylab/fncylab.tex 2010-03-08 18:14:01.000000000 +0100
+++ new/doc/latex/fncylab/fncylab.tex 2019-09-14 23:35:37.000000000 +0200
@@ -1,16 +1,36 @@
\documentclass[a4paper]{article}
\usepackage[a4paper]{geometry}
-\usepackage{miscdoc}
-\usepackage[scaled=0.85]{luximono}
+
+%\usepackage{miscdoc} % no idea where that package is (maybe just on Robin's home machine)
+%
+% so go manual ...
+
+\newcommand\Package[1]{\texttt{#1}}
+\newcommand\cs[1]{\texttt{\textbackslash#1}}
+\newcommand\meta[1]{$\langle$\textnormal{\itshape#1}$\rangle$}
+\newcommand\marg[1]{\texttt{\{\meta{#1}\}}}
+
+\usepackage[T1]{fontenc} % needed for \textbackslash
+
+%\usepackage[scaled=0.85]{luximono}
+
+\def\labelformat{} \usepackage{fncylab} % testing
+
\begin{document}
\title{The \Package{fncylab} package}
\author{Robin Fairbairns\thanks{Email:
- \emph{robin.fairbairns@cl.cam.ac.uk}}}
-\date{2003-08-13, version 1.0}
+ \emph{robin.fairbairns@cl.cam.ac.uk} --- no longer active}}
+\date{2019-08-23, version 1.1}
\maketitle
+As of 2019 the \LaTeX{} kernel already contains these extra commands
+and the modification to \cs{refstepcounter}. So on nevery kernels
+this package is no longer necessary and will silently exit.
+
+\section{Introduction}
+
The package provides support for arbitrary structuring of the way
-label references look. The command \cmdinvoke*{labelformat}{ctr}{defn}
+label references look. The command \cs{labelformat}\marg{ctr}\marg{defn}
specifies the structure of a label:
\begin{description}
\item[\emph{\texttt{ctr}}] the counter that will define the label
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fncylab.doc.tlpobj new/tlpkg/tlpobj/fncylab.doc.tlpobj
--- old/tlpkg/tlpobj/fncylab.doc.tlpobj 2019-02-28 03:37:42.000000000 +0100
+++ new/tlpkg/tlpobj/fncylab.doc.tlpobj 2019-09-15 01:54:31.000000000 +0200
@@ -1,9 +1,10 @@
name fncylab.doc
category Package
-revision 17382
+revision 52090
shortdesc doc files of fncylab
relocated 1
-docfiles size=54
+docfiles size=53
+ RELOC/doc/latex/fncylab/README.md
RELOC/doc/latex/fncylab/fncylab-example.tex
RELOC/doc/latex/fncylab/fncylab.pdf
RELOC/doc/latex/fncylab/fncylab.tex
++++++ fncylab.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fncylab/fncylab.sty new/tex/latex/fncylab/fncylab.sty
--- old/tex/latex/fncylab/fncylab.sty 2010-03-08 18:14:01.000000000 +0100
+++ new/tex/latex/fncylab/fncylab.sty 2019-09-14 23:35:37.000000000 +0200
@@ -1,5 +1,6 @@
-% FNCYLAB.STY v1.0
+% FNCYLAB.STY v1.1
% Copyright 2000,2003 Robin Fairbairns (robin.fairbairns@cl.cam.ac.uk)
+% Copyright 2019 LaTeX Team
%
% This program can redistributed and/or modified under the terms
% of the LaTeX Project Public License; either version 1.2 of the
@@ -41,6 +42,12 @@
% which will typeset as
% ... Section 3 shows us that ...
+% as 2019 the modification (and \labelformat and \Ref) has been added
+% to the LaTeX kernel, so there is nothing to do for this package any more
+% unless it is run using an older kernel.
+
+\ifx\labelformat\@undefined % if defined we assume a newer kernel
+
% this check and redefinition is suggested in the latex source
% (ltxref.dtx)
\CheckCommand*\refstepcounter[1]{\stepcounter{#1}%
@@ -57,5 +64,11 @@
\DeclareRobustCommand\Ref[1]{\protected@edef\@tempa{\ref{#1}}%
\expandafter\MakeUppercase\@tempa
}
+\else
+\PackageWarningNoLine{fncylab}{%
+fncylab is not required with releases after 2019.\MessageBreak
+All its functionality is now in the LaTeX kernel}
+
+\fi
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fncylab.tlpobj new/tlpkg/tlpobj/fncylab.tlpobj
--- old/tlpkg/tlpobj/fncylab.tlpobj 2019-02-28 03:37:42.000000000 +0100
+++ new/tlpkg/tlpobj/fncylab.tlpobj 2019-09-15 01:54:31.000000000 +0200
@@ -1,6 +1,6 @@
name fncylab
category Package
-revision 17382
+revision 52090
shortdesc Alter the format of \label references
relocated 1
longdesc LaTeX provides a mechanism for altering the appearance of
@@ -15,7 +15,7 @@
catalogue-contact-repository https://github.com/rf-latex/fncylab
catalogue-contact-support https://github.com/rf-latex/fncylab/issues
catalogue-ctan /macros/latex/contrib/fncylab
-catalogue-date 2018-09-15 15:39:16 +0200
+catalogue-date 2019-09-13 22:09:34 +0200
catalogue-license lppl
catalogue-topics label-ref
-catalogue-version 1.0
+catalogue-version 1.1
++++++ fnpct.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fnpct/README new/doc/latex/fnpct/README
--- old/doc/latex/fnpct/README 2019-02-18 00:02:03.000000000 +0100
+++ new/doc/latex/fnpct/README 2019-10-05 22:49:45.000000000 +0200
@@ -1,15 +1,15 @@
--------------------------------------------------------------------------
-the FNPCT package v0.4f
+the FNPCT package v0.5
footnote kerning
-2019/02/17
+2019/10/05
--------------------------------------------------------------------------
Clemens Niederberger
Web: https://bitbucket.org/cgnieder/fnpct/
E-Mail: contact@mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2012-2019 Clemens Niederberger
+Copyright 2012--2019 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
Binary files old/doc/latex/fnpct/fnpct_en.pdf and new/doc/latex/fnpct/fnpct_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fnpct/fnpct_en.tex new/doc/latex/fnpct/fnpct_en.tex
--- old/doc/latex/fnpct/fnpct_en.tex 2019-02-18 00:02:03.000000000 +0100
+++ new/doc/latex/fnpct/fnpct_en.tex 2019-10-05 22:49:45.000000000 +0200
@@ -12,7 +12,7 @@
% Web: https://bitbucket.org/cgnieder/fnpct/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2019 Clemens Niederberger
+% Copyright 2012--2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -266,6 +266,13 @@
\cs*{@footnotemark}. \fnpct\ resets this redefinition but sets the
\option{before-footnote-space} equal to a thin space (\code{.16667em}).
+\subsection{Changes in v0.5}\label{ssec:news}
+
+\begin{itemize}
+ \item the option \option{bigfoot-default-top} has been removed
+ \item the \pkg{manyfoot} package is now supported
+\end{itemize}
+
\section{Options}\label{sec:options}
Most package options are listed below. They all can be set as a package
option or with the \cs{setfnpct} command. Most of them are for adjusting the
@@ -650,21 +657,19 @@
of the following subsections is dedicated to one of these packages and if and
how they work together with \fnpct. Fortunately most of them do quite well.
-\subsection{bigfoot}\label{ssec:bigfoot}
+\subsection{bigfoot and manyfoot}\label{ssec:bigfoot}
The \pkg{bigfoot}~\cite{pkg:bigfoot} package extends the possibilities of the
\pkg{manyfoot} package~\cite{pkg:manyfoot} (see section~\ref{ssec:manyfoot}).
The main visible feature is to use different classes of footnotes which are
typeset in different apparatus on the bottom of the page.
-\fnpct\ is compatible with \pkg{bigfoot}. You need to be a bit cautious,
-though. You need to \emph{declare footnotes with \cs*{DeclareNewFootnote}
- \emph{after} loading \fnpct\ but in the document \emph{preamble}.}
-
-\emph{Also verbatim material won't work inside footnotes anymore}. But you
-can of course use \lefloch's \pkg{cprotect}~\cite{pkg:cprotect} if you really
-need verbatim material in footnotes \emph{and} want to use \fnpct. Since
-\fnpct\ does not redefine any \cs{footnotetext} like command it will still
-work inside one of them.
+\fnpct\ is compatible with \pkg{bigfoot}.
+
+You need to be a bit cautious, though: \emph{verbatim material won't work
+ inside footnotes anymore}. You can of course use \lefloch's
+\pkg{cprotect}~\cite{pkg:cprotect} if you really need verbatim material in
+footnotes \emph{and} want to use \fnpct. Since \fnpct\ does not redefine any
+\cs{footnotetext} like command it will still work inside one of them.
For every footnote class defined with \cs*{DeclareNewFootnote} the commands
\cs*{footnote\meta{class}} and \cs*{footnotemark\meta{class}} are redefined
@@ -672,13 +677,6 @@
\option{multiple} option will turn all \cs*{footnote\meta{class}} commands
into the corresponding \cs*{multfootnote\meta{class}}.
-\fnpct\ has an additional package option which \emph{cannot} be set with
-\cs{setfnpct} and only has any effects if \pkg{bigfoot} has been loaded:
-\begin{options}
- \keybool{bigfoot-default-top}\Default{false}
- Sets the \code{default} footnote class as top layer.
-\end{options}
-
Since this document cannot easily combine \emph{every} footnote package at the
same time for demonstration purposes the following code is shown in
figure~\ref{fig:bigfoot}:
@@ -691,8 +689,9 @@
bottom=1.5cm]{geometry}
\usepackage{bigfoot}
- \usepackage[bigfoot-default-top]{fnpct}
+ \usepackage{fnpct}
\setfnpct{multiple}
+ \DeclareNewFootnote{default}
\DeclareNewFootnote[para]{B}[alph]
\begin{document}
@@ -795,7 +794,7 @@
\end{document}
\end{example}
-\subsection{footmisc}\label{ssec:manyfoot}
+\subsection{footmisc}\label{ssec:footmisc}
The \pkg{footmisc} package~\cite{pkg:footmisc} provides a range of options to
customize footnotes, for example output them as margin notes or count
footnotes per page.
@@ -803,34 +802,24 @@
Testing showed no incompatibilities with \pkg{footmisc}. The only thing is
that you won't have to (and shouldn't) use its \option{multiple} option.
-\subsection{footnote}
+\subsection{footnote}\label{ssec:footnote}
Unfortunately \fnpct\ is not compatible with the \pkg{footnote}
package~\cite{pkg:footnote}. Or more precisely it is not compatible if the
command pair \cs*{savenotes}/\cs*{spewnotes} is invoked. This disables
\pkg{footnote}'s environments as well as its environment escaping mechanism
through \cs{makesavenoteenv}.
-\subsection{manyfoot}
-The \pkg{manyfoot} package~\cite{pkg:manyfoot} is not and will not directly be
-supported. It is loaded by \pkg{bigfoot} (see section~\ref{ssec:bigfoot}), anyway.
-And since the latter states in its documentation
-\begin{cnltxquote}[David Kastrup~\textup{\cite{pkg:bigfoot}}]
- Purpose of this package is to provide a one-stop solution to almost all
- problems related to footnotes. You can use it as a drop-in replacement of
- the `\pkg{manyfoot}' package, but without many of its shortcomings, and
- quite a few features of its own.
-\end{cnltxquote}
-you should probably prefer it anyway.
+\subsection{manyfoot}\label{ssec:manyfoot}
+The package \pkg{manyfoot}~\cite{pkg:manyfoot} is supported. See
+section~\ref{ssec:bigfoot} for more details.
-If it is \emph{really} wanted by users I might change my opinion, though \ldots
-
-\subsection{pagenote}
+\subsection{pagenote}\label{ssec:pagenote}
The package \pkg{pagenote}~\cite{pkg:pagenote} is supported and its
\cs*{pagenote} command is treated the same way as all other note commands: it
got an optional \sarg\ argument and an additional \cs*{multpagenote} is
defined.
-\subsection{parnotes}
+\subsection{parnotes}\label{ssec:parnotes}
The function of the package \pkg{parnotes}~\cite{pkg:parnotes} is similar to the
\pkg{endnotes} package. basically it allows to output the footnote text after
a paragraph, either by using a special environment or by invoking
@@ -861,7 +850,7 @@
\end{minipage}
\end{example}
-\subsection{sepfootnotes}
+\subsection{sepfootnotes}\label{ssec:sepfootnotes}
\fnpct\ supports the \pkg{sepfootnotes} package~\cite{pkg:sepfootnotes}. Each
note type you have created with with one of the commands
\begin{description}
@@ -889,28 +878,57 @@
\end{minipage}
\end{example}
-\subsection{sidenotes}
-The package \pkg{sidenotes}~\cite{pkg:sidenotes} is supported and its commands
-\cs*{sidenote} and \cs*{sidenotemark} are treated the same way as footnotes:
-they got an optional \sarg\ argument and the additional \cs*{multsidenote} is
-created. The option \option{multiple} turns all note commands into their
-mult-variant.
+\subsection{sidenotes}\label{ssec:sidenotes}
+The package \pkg{sidenotes}~\cite{pkg:sidenotes} is \emph{not} supported.
+For the time being users can use the following code\footnote{Since the code
+ depends on the implementation of \pkg{sidenotes} this may break with each
+ update of \pkg{sidenotes}.;Thanks to Marijn van Vliet for
+ providing it!}:
+\begin{sourcecode}
+ \ExplSyntaxOn
+ \makeatletter
+ \NewDocumentCommand \origsidenotemark {o}
+ {
+ \@sidenotes@multichecker
+ \IfNoValueOrEmptyTF {#1}
+ { \@sidenotes@thesidenotemark { \thesidenote } }
+ { \@sidenotes@thesidenotemark {#1} }
+ \@sidenotes@multimarker
+ }
+
+ \NewDocumentCommand \origsidenote {oo+m}
+ {
+ \origsidenotemark [#1]
+ \sidenotetext [#1] [#2] {#3}
+ \@sidenotes@multimarker
+ }
+
+ \fnpct_create_mult_variant:NN \multsidenote \origsidenote
+
+ \RenewDocumentCommand \sidenote {soo+m}
+ { \fnpct_handle_note:Nnnnn \origsidenote {#2} {#3} {#4} {#1} }
+
+ \RenewDocumentCommand \sidenotemark {so}
+ { \fnpct_handle_note:Nnnnn \origsidenotemark {#2} { \q_no_value } { } {#1} }
+ \makeatother
+ \ExplSyntaxOff
+\end{sourcecode}
-\subsection{snotez}
+\subsection{snotez}\label{ssec:snotez}
The package \pkg{snotez}~\cite{pkg:snotez} is supported and its commands
\cs*{sidenote} and \cs*{sidenotemark} are treated the same way as footnotes:
they got an optional \sarg\ argument and the additional \cs*{multsidenote} is
created. The option \option{multiple} turns all note commands into their
mult-variant.
-\subsection{tablefootnote}
+\subsection{tablefootnote}\label{ssec:tablefootnote}
The package \pkg{tablefootnote}~\cite{pkg:tablefootnote} is supported and its
\cs*{tablefootnote} command is treated the same way as all other note
commands: it got an optional \sarg\ argument and an additional
\cs*{multtablefootnote} is defined. The option \option{multiple} turns all
note commands into their mult-variant.
-\subsection{yafoot}
+\subsection{yafoot}\label{ssec:yafoot}
Currently no issues are known when using \fnpct\ with one or all of the
packages of the \bnd{yafoot}~\cite{bnd:yafoot} bundle. Just for reference:
these packages are \pkg*{pfnote}, \pkg*{fnpos} and \pkg*{dblfnote}.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fnpct.doc.tlpobj new/tlpkg/tlpobj/fnpct.doc.tlpobj
--- old/tlpkg/tlpobj/fnpct.doc.tlpobj 2019-02-28 03:37:43.000000000 +0100
+++ new/tlpkg/tlpobj/fnpct.doc.tlpobj 2020-03-24 01:58:04.000000000 +0100
@@ -1,9 +1,9 @@
name fnpct.doc
category Package
-revision 50046
+revision 54512
shortdesc doc files of fnpct
relocated 1
-docfiles size=153
+docfiles size=152
RELOC/doc/latex/fnpct/README
RELOC/doc/latex/fnpct/fnpct_en.pdf
RELOC/doc/latex/fnpct/fnpct_en.tex
++++++ fnpct.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fnpct/fnpct.sty new/tex/latex/fnpct/fnpct.sty
--- old/tex/latex/fnpct/fnpct.sty 2019-02-18 00:02:03.000000000 +0100
+++ new/tex/latex/fnpct/fnpct.sty 2019-10-05 22:49:45.000000000 +0200
@@ -8,7 +8,7 @@
% Web: https://bitbucket.org/cgnieder/fnpct/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2019 Clemens Niederberger
+% Copyright 2012--2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -28,220 +28,291 @@
% the package is inspired by the following question on TeX.SE:
% http://tex.stackexchange.com/q/56094/5049
% --------------------------------------------------------------------------
-\RequirePackage { xparse , l3keys2e , scrlfile }
-\ProvidesExplPackage
- {fnpct}
- {2019/02/17}
- {0.4f}
- {footnote kerning}
-
-% --------------------------------------------------------------------------
-% SETTING THINGS UP:
-% this is plain's \nobreak:
-\cs_new:Npn \fnpct_no_break: { \tex_penalty:D \c_ten_thousand }
+\RequirePackage {xparse,l3keys2e,scrlfile}
+\ExplSyntaxOn
-% messages:
-\cs_new_protected:Npn \fnpct_dont_mess_around:
+\tl_const:Nn \c_fnpct_date_tl {2019/10/05}
+\tl_const:Nn \c_fnpct_version_major_number_tl {0}
+\tl_const:Nn \c_fnpct_version_minor_number_tl {5}
+\tl_const:Nn \c_fnpct_version_subrelease_tl {}
+\tl_const:Nx \c_fnpct_version_number_tl
{
- \iow_log:n { ................................................. }
- \iow_log:n { . ~ fnpct~info: }
- \iow_log:n { . }
- \iow_log:n { . ~ All~right,~not~messing~around.~:( }
- \iow_log:n { . ~ But~I'd~really~love~to~(http://www.youtube.com/watch?v=Bqz876VkwwY). }
- \iow_log:n { ................................................. }
+ \c_fnpct_version_major_number_tl .
+ \c_fnpct_version_minor_number_tl
}
-
-\msg_set:nnn { fnpct } { already-adapted }
+\tl_const:Nx \c_fnpct_version_tl
{
- The~command~\token_to_str:N #1 \tl_use:N \c_space_tl has~already~been~
- adapted. \\
- I~will~do~nothing~instead.
+ \c_fnpct_version_number_tl
+ \c_fnpct_version_subrelease_tl
}
+\tl_const:Nn \c_fnpct_info_tl {footnote~ kerning}
-\bool_new:N \l__fnpct_strict_bool
+\ProvidesExplPackage
+ {fnpct}
+ {\c_fnpct_date_tl}
+ {\c_fnpct_version_tl}
+ {\c_fnpct_info_tl}
-\cs_new_protected:Npn \fnpct_message:nx #1#2
- {
- \bool_if:NTF \l__fnpct_strict_bool
- { \msg_error:nnx { fnpct } { #1 } }
- { \msg_warning:nnx { fnpct } { #1 } }
- { #2 }
- }
+% --------------------------------------------------------------------------
+% this is plain's \nobreak:
+\cs_new:Npn \fnpct_no_break: { \tex_penalty:D 10000 \scan_stop: }
-% scratch variables:
+% --------------------------------------------------------------------------
+% variables:
\tl_new:N \l__fnpct_tmpa_tl
\tl_new:N \l__fnpct_tmpb_tl
+
\dim_new:N \l__fnpct_tmpa_dim
\dim_new:N \l__fnpct_tmpb_dim
+
\int_new:N \l__fnpct_tmpa_int
-% rigid lengths:
+\seq_new:N \l__fnpct_tmpa_seq
+\seq_new:N \l__fnpct_tmpb_seq
+
\dim_new:N \l__fnpct_after_comma_dim
-\dim_set:Nn \l__fnpct_after_comma_dim { -.06em }
+\dim_set:Nn \l__fnpct_after_comma_dim {-.06em}
\dim_new:N \l__fnpct_after_dot_dim
-\dim_set:Nn \l__fnpct_after_dot_dim { -.06em }
+\dim_set:Nn \l__fnpct_after_dot_dim {-.06em}
\dim_new:N \l__fnpct_before_comma_dim
-\dim_set:Nn \l__fnpct_before_comma_dim { -.16em }
+\dim_set:Nn \l__fnpct_before_comma_dim {-.16em}
\dim_new:N \l__fnpct_before_dot_dim
-\dim_set:Nn \l__fnpct_before_dot_dim { -.16em }
+\dim_set:Nn \l__fnpct_before_dot_dim {-.16em}
\dim_new:N \l__fnpct_before_footnote_dim
-\dim_set:Nn \l__fnpct_before_footnote_dim { .06em }
+\dim_set:Nn \l__fnpct_before_footnote_dim {.06em}
\dim_new:N \l__fnpct_normal_mark_width_dim
-\dim_set:Nn \l__fnpct_normal_mark_width_dim { 1em }
+\dim_set:Nn \l__fnpct_normal_mark_width_dim {1em}
\dim_new:N \l__fnpct_normal_indent_dim
-\dim_set:Nn \l__fnpct_normal_indent_dim { 1.5em }
+\dim_set:Nn \l__fnpct_normal_indent_dim {1.5em}
\dim_new:N \l__fnpct_normal_parindent_dim
-\dim_set:Nn \l__fnpct_normal_parindent_dim { 1em }
+\dim_set:Nn \l__fnpct_normal_parindent_dim {1em}
\dim_new:N \l__fnpct_french_before_footnote_space_dim
-\dim_set:Nn \l__fnpct_french_before_footnote_space_dim { .16667em }
+\dim_set:Nn \l__fnpct_french_before_footnote_space_dim {.16667em}
-% multiple footnote input and output variables:
-\tl_new:N \l__fnpct_multiple_footnotes_delimiter_tl
-\tl_set:Nn \l__fnpct_multiple_footnotes_delimiter_tl { ; }
-\tl_new:N \l__fnpct_multiple_footnote_separator_tl
-% check for KOMA-Script's \multfootsep:
-\cs_if_exist:NTF \KOMAClassName
- { \tl_set:Nn \l__fnpct_multiple_footnote_separator_tl { \multfootsep } }
- { \tl_set:Nn \l__fnpct_multiple_footnote_separator_tl { , } }
+\int_new:N \l__fnpct_multiple_notes_int
-% basic booleans for punctuation order switch and multiple footnotes
+\tl_new:N \l__fnpct_multiple_footnotes_delimiter_tl
+\tl_set:Nn \l__fnpct_multiple_footnotes_delimiter_tl {;}
+\tl_new:N \l__fnpct_multiple_footnote_separator_tl
+\tl_new:N \l__fnpct_last_punct_mark_tl
+\tl_new:N \l__fnpct_punctuation_marks_tl
+\tl_set:Nn \l__fnpct_punctuation_marks_tl {.,}
+\tl_new:N \l__fnpct_multiple_true_tl
+\tl_new:N \l__fnpct_multiple_false_tl
+
+\bool_new:N \l__fnpct_strict_bool
\bool_new:N \l__fnpct_punct_after_bool
\bool_new:N \l__fnpct_dont_mess_around_bool
\bool_new:N \l__fnpct_multiple_default_bool
\bool_new:N \l__fnpct_multiple_footnotes_bool
\bool_new:N \l__fnpct_reverse_switch_bool
-\bool_new:N \l__fnpct_bigfoot_default_top_bool
\bool_new:N \l__fnpct_normal_marks_bool
\bool_new:N \l__fnpct_hyperref_bool
-
\bool_new:N \g__fnpct_after_punctuation_bool
+\bool_new:N \g__fnpct_only_text_bool
+\bool_new:N \l__fnpct_makepagenote_bool
-% default punctuation marks for switching:
-\tl_new:N \l__fnpct_punctuation_marks_tl
-\tl_set:Nn \l__fnpct_punctuation_marks_tl { ., }
-\prop_new:N \l__fnpct_punctuation_marks_after_prop
-\prop_new:N \l__fnpct_punctuation_marks_before_prop
+\seq_new:N \l__fnpct_multiple_footnotes_seq
+\seq_new:N \l__fnpct_footnote_class_seq
+\prop_new:N \l__fnpct_punctuation_marks_after_prop
+\prop_new:N \l__fnpct_punctuation_marks_before_prop
+\prop_new:N \l__fnpct_sepfootnote_foot_classes_prop
+\prop_new:N \l__fnpct_sepfootnote_end_classes_prop
+\prop_new:N \l__fnpct_sepfootnote_symbol_classes_prop
+\prop_new:N \g__fnpct_adapted_notes_prop
+\prop_new:N \g__fnpct_inner_footnote_prop
+\prop_new:N \g__fnpct_inner_footnote_hyperref_prop
+\prop_new:N \l__fnpct_footnote_fixfoot_prop
+
+% --------------------------------------------------------------------------
+% variants:
+\cs_generate_variant:Nn \str_remove_once:Nn {NV}
+\cs_generate_variant:Nn \tl_remove_all:Nn {NV}
+\cs_generate_variant:Nn \tl_put_right:Nn {NV}
+\cs_generate_variant:Nn \seq_set_split:Nnn {NnV,NV}
+\cs_generate_variant:Nn \prop_gput:Nnn {Nxn,Nxo}
+\cs_generate_variant:Nn \prop_put:Nnn {Nnx}
+\cs_generate_variant:Nn \prop_if_in:NnTF {Nx}
+
+% --------------------------------------------------------------------------
+% messages:
+\cs_new_protected:Npn \fnpct_dont_mess_around:
+ {
+ \iow_log:n { ................................................. }
+ \iow_log:n { . ~ fnpct~info: }
+ \iow_log:n { . }
+ \iow_log:n { . ~ All~right,~not~messing~around.~:( }
+ \iow_log:n { . ~ But~I'd~really~love~to. }
+ \iow_log:n { . ~ (https://www.youtube.com/results?search_query=mess+around+ray+charles) }
+ \iow_log:n { ................................................. }
+ }
+
+\msg_new:nnn {fnpct} {already-adapted}
+ {
+ The~ command~ \token_to_str:N #1 \c_space_tl has~ already~ been~
+ adapted. \\
+ I~ will~ do~ nothing~ instead.
+ }
+
+\msg_new:nnn {fnpct} {pagenote}
+ {
+ If~ you~ use~ the~ `pagenote'~ package~ with~ `fnpct'~ please~ make~ sure~
+ to~ use~ \token_to_str:N \makepagenote \c_space_tl after~ loading~
+ `fnpct'!
+ }
+
+\msg_new:nnn {fnpct} {deprecated}
+ {
+ You've~ tried~ setting~ #1~ `#2'~ \msg_line_context: .~ However,~
+ #1~ `#2'~ is~ deprecated.~
+ \tl_if_blank:nF {#3} {Please~ use~ #1~ `#3'~ instead.~}
+ Refer~ to~ the~ manual~ for~ details.
+ }
+
+\cs_new_protected:Npn \fnpct_message:nx #1#2
+ {
+ \bool_if:NTF \l__fnpct_strict_bool
+ { \msg_error:nnx {fnpct} {#1} }
+ { \msg_warning:nnx {fnpct} {#1} }
+ {#2}
+ }
+
+% --------------------------------------------------------------------------
+\prg_new_conditional:Npnn \fnpct_if_package_loaded:n #1 {p,T,F,TF}
+ {
+ \@ifpackageloaded {#1}
+ { \prg_return_true: }
+ { \prg_return_false: }
+ }
+
+% --------------------------------------------------------------------------
+% multiple footnote input and output variables:
+% check for KOMA-Script's \multfootsep:
+\cs_if_exist:NTF \KOMAClassName
+ { \tl_set:Nn \l__fnpct_multiple_footnote_separator_tl { \multfootsep } }
+ { \tl_set:Nn \l__fnpct_multiple_footnote_separator_tl {,} }
+
+% --------------------------------------------------------------------------
% #1: before/after
% #2: punctuation mark
% #3: dimension
\cs_new_protected:Npn \fnpct_set_punctuation_dim:nnn #1#2#3
{
\prop_put:cnx { l__fnpct_punctuation_marks_#1_prop }
- { #2 }
- { \dim_eval:n { #3 } }
+ {#2}
+ { \dim_eval:n {#3} }
}
-\cs_generate_variant:Nn \fnpct_set_punctuation_dim:nnn { nV }
+\cs_generate_variant:Nn \fnpct_set_punctuation_dim:nnn {nV}
-\fnpct_set_punctuation_dim:nnn { after } { . } { \l__fnpct_after_dot_dim }
-\fnpct_set_punctuation_dim:nnn { after } { , } { \l__fnpct_after_comma_dim }
-\fnpct_set_punctuation_dim:nnn { before } { . } { \l__fnpct_before_dot_dim }
-\fnpct_set_punctuation_dim:nnn { before } { , } { \l__fnpct_before_comma_dim }
+\fnpct_set_punctuation_dim:nnn {after} {.} { \l__fnpct_after_dot_dim }
+\fnpct_set_punctuation_dim:nnn {after} {,} { \l__fnpct_after_comma_dim }
+\fnpct_set_punctuation_dim:nnn {before} {.} { \l__fnpct_before_dot_dim }
+\fnpct_set_punctuation_dim:nnn {before} {,} { \l__fnpct_before_comma_dim }
\cs_new_protected:Npn \fnpct_rm_punctuation:n #1
{
- \tl_remove_all:Nn \l__fnpct_punctuation_marks_tl { #1 }
- \prop_del:Nn \l__fnpct_punctuation_marks_after_prop { #1 }
- \prop_del:Nn \l__fnpct_punctuation_marks_before_prop { #1 }
+ \tl_remove_all:Nn \l__fnpct_punctuation_marks_tl {#1}
+ \prop_del:Nn \l__fnpct_punctuation_marks_after_prop {#1}
+ \prop_del:Nn \l__fnpct_punctuation_marks_before_prop {#1}
}
-\tl_new:N \l__fnpct_last_punct_mark_tl
-
\cs_new_protected:Npn \fnpct_add_punctuation:n #1
{ \__fnpct_add_punctuation:w #1 [ \q_no_value ] \q_no_value \q_stop }
-\cs_generate_variant:Nn \fnpct_add_punctuation:n { V }
+\cs_generate_variant:Nn \fnpct_add_punctuation:n {V}
\cs_new_protected:Npn \__fnpct_add_punctuation:w #1[#2]#3 \q_stop
{
- \quark_if_no_value:nTF { #2 }
+ \quark_if_no_value:nTF {#2}
{
% there is no option at all
- \tl_map_inline:nn { #1 }
+ \tl_map_inline:nn {#1}
{
- \tl_put_right:Nn \l__fnpct_punctuation_marks_tl { ##1 }
- \fnpct_set_punctuation_dim:nnn { after } { ##1 } { 0pt }
- \fnpct_set_punctuation_dim:nnn { before } { ##1 } { 0pt }
- \tl_set:No \l__fnpct_last_punct_mark_tl { ##1 }
+ \tl_put_right:Nn \l__fnpct_punctuation_marks_tl {##1}
+ \fnpct_set_punctuation_dim:nnn {after} {##1} {0pt}
+ \fnpct_set_punctuation_dim:nnn {before} {##1} {0pt}
+ \tl_set:No \l__fnpct_last_punct_mark_tl {##1}
}
}
{
- \tl_if_blank:nTF { #1 }
+ \tl_if_blank:nTF {#1}
{
% #2 is a second option (= before space)
- \fnpct_set_punctuation_dim:nVn { before }
+ \fnpct_set_punctuation_dim:nVn {before}
\l__fnpct_last_punct_mark_tl
- { #2 }
+ {#2}
}
{
% #2 is a first option (= after space), #1 might be more than one token:
- \tl_if_single_token:nTF { #1 }
+ \tl_if_single_token:nTF {#1}
{
- \tl_put_right:Nn \l__fnpct_punctuation_marks_tl { #1 }
- \fnpct_set_punctuation_dim:nnn { after } { #1 } { #2 }
- \fnpct_set_punctuation_dim:nnn { before } { #1 } { 0pt }
- \tl_set:No \l__fnpct_last_punct_mark_tl { #1 }
+ \tl_put_right:Nn \l__fnpct_punctuation_marks_tl {#1}
+ \fnpct_set_punctuation_dim:nnn {after} {#1} {#2}
+ \fnpct_set_punctuation_dim:nnn {before} {#1} {0pt}
+ \tl_set:No \l__fnpct_last_punct_mark_tl {#1}
}
{
\int_zero:N \l__fnpct_tmpa_int
- \tl_map_inline:nn { #1 }
+ \tl_map_inline:nn {#1}
{
- \tl_put_right:Nn \l__fnpct_punctuation_marks_tl { ##1 }
- \int_compare:nTF { \l__fnpct_tmpa_int < ( \tl_count:n { #1 } - 1 ) }
+ \tl_put_right:Nn \l__fnpct_punctuation_marks_tl {##1}
+ \int_compare:nTF { \l__fnpct_tmpa_int < ( \tl_count:n {#1} - 1 ) }
{
- \fnpct_set_punctuation_dim:nnn { after } { ##1 } { 0pt}
- \fnpct_set_punctuation_dim:nnn { before } { ##1 } { 0pt }
+ \fnpct_set_punctuation_dim:nnn {after} {##1} {0pt}
+ \fnpct_set_punctuation_dim:nnn {before} {##1} {0pt}
}
{
- \fnpct_set_punctuation_dim:nnn { after } { ##1 } { #2 }
- \fnpct_set_punctuation_dim:nnn { before } { ##1 } { 0pt }
+ \fnpct_set_punctuation_dim:nnn {after} {##1} {#2}
+ \fnpct_set_punctuation_dim:nnn {before} {##1} {0pt}
}
- \tl_set:No \l__fnpct_last_punct_mark_tl { ##1 }
+ \tl_set:No \l__fnpct_last_punct_mark_tl {##1}
\int_incr:N \l__fnpct_tmpa_int
}
}
}
}
% is there more?
- \tl_if_eq:nnF { #3 } { [\q_no_value]\q_no_value }
+ \tl_if_eq:nnF {#3} { [\q_no_value]\q_no_value }
{
- \quark_if_no_value:nF { #3 }
+ \quark_if_no_value:nF {#3}
{
- \tl_set:Nn \l__fnpct_tmpa_tl { #3 }
+ \tl_set:Nn \l__fnpct_tmpa_tl {#3}
\tl_remove_all:Nn \l__fnpct_tmpa_tl { [\q_no_value]\q_no_value }
\fnpct_add_punctuation:V \l__fnpct_tmpa_tl
}
}
}
+% --------------------------------------------------------------------------
% options:
-\keys_define:nn { fnpct }
+\keys_define:nn {fnpct}
{
+ bigfoot-default-top .code:n =
+ \msg_warning:nnnn {fnpct} {deprecated} {option} {bigfoot-default-top} ,
strict .bool_set:N = \l__fnpct_strict_bool ,
- strict .default:n = true ,
after-comma-space .code:n =
- \fnpct_set_punctuation_dim:nnn { after } { , } { #1 } ,
+ \fnpct_set_punctuation_dim:nnn {after} {,} {#1} ,
after-dot-space .code:n =
- \fnpct_set_punctuation_dim:nnn { after } { . } { #1 } ,
+ \fnpct_set_punctuation_dim:nnn {after} {.} {#1} ,
before-comma-space .code:n =
- \fnpct_set_punctuation_dim:nnn { before } { , } { #1 } ,
+ \fnpct_set_punctuation_dim:nnn {before} {,} {#1} ,
before-dot-space .code:n =
- \fnpct_set_punctuation_dim:nnn { before } { , } { #1 } ,
+ \fnpct_set_punctuation_dim:nnn {before} {.} {#1} ,
after-punct-space .code:n =
\prop_map_inline:Nn \l__fnpct_punctuation_marks_after_prop
- { \fnpct_set_punctuation_dim:nnn { after } { ##1 } { #1 } } ,
+ { \fnpct_set_punctuation_dim:nnn {after} {##1} {#1} } ,
before-punct-space .code:n =
\prop_map_inline:Nn \l__fnpct_punctuation_marks_before_prop
- { \fnpct_set_punctuation_dim:nnn { before } { ##1 } { #1 } } ,
+ { \fnpct_set_punctuation_dim:nnn {before} {##1} {#1} } ,
before-footnote-space .dim_set:N = \l__fnpct_before_footnote_dim ,
french-before-footnote-space .dim_set:N =
\l__fnpct_french_before_footnote_space_dim ,
punct-after .bool_set:N = \l__fnpct_punct_after_bool ,
- punct-after .default:n = true ,
dont-mess-around .code:n =
\prop_map_inline:Nn \l__fnpct_punctuation_marks_after_prop
- { \fnpct_set_punctuation_dim:nnn { after } { ##1 } { 0pt } }
+ { \fnpct_set_punctuation_dim:nnn {after} {##1} {0pt} }
\prop_map_inline:Nn \l__fnpct_punctuation_marks_before_prop
- { \fnpct_set_punctuation_dim:nnn { before } { ##1 } { 0pt } }
+ { \fnpct_set_punctuation_dim:nnn {before} {##1} {0pt} }
\dim_zero:N \l__fnpct_before_footnote_dim
\bool_set_true:N \l__fnpct_punct_after_bool
\bool_set_true:N \l__fnpct_dont_mess_around_bool
@@ -249,45 +320,41 @@
mult-fn-delim .tl_set:N = \l__fnpct_multiple_footnotes_delimiter_tl ,
mult-fn-sep .tl_set:N = \l__fnpct_multiple_footnote_separator_tl ,
multiple .bool_set:N = \l__fnpct_multiple_default_bool ,
- multiple .default:n = true ,
- bigfoot-default-top .bool_set:N = \l__fnpct_bigfoot_default_top_bool ,
- bigfoot-default-top .default:n = true ,
normal-marks .bool_set:N = \l__fnpct_normal_marks_bool ,
- normal-marks .default:n = true ,
normal-mark-width .dim_set:N = \l__fnpct_normal_mark_width_dim ,
normal-indent .dim_set:N = \l__fnpct_normal_indent_dim ,
normal-parindent .dim_set:N = \l__fnpct_normal_parindent_dim ,
verb-format .tl_set:N = \l__fnpct_verbatim_format_tl ,
- add-punct-marks .code:n = \fnpct_add_punctuation:n { #1 } ,
+ add-punct-marks .code:n = \fnpct_add_punctuation:n {#1} ,
remove-punct-marks .code:n =
- \tl_map_function:nN { #1 } \fnpct_rm_punctuation:n
+ \tl_map_function:nN {#1} \fnpct_rm_punctuation:n
}
-\ProcessKeysOptions { fnpct }
+\ProcessKeysOptions {fnpct}
% --------------------------------------------------------------------------
% MAIN INTERNAL FOOTNOTE FUNCTION:
% write the notes:
\cs_new:Npn \__fnpct_no_value_or_quark_no_value:nTF #1#2#3
{
- \IfNoValueTF { #1 } { #2 }
- { \quark_if_no_value:nTF { #1 } { #2 } { #3 } }
+ \IfNoValueTF {#1} {#2}
+ { \quark_if_no_value:nTF {#1} {#2} {#3} }
}
\cs_new:Npn \fnpct_write_note:Nnnn #1#2#3#4
{
- \__fnpct_no_value_or_quark_no_value:nTF { #2 }
- { #1 { #4 } }
+ \__fnpct_no_value_or_quark_no_value:nTF {#2}
+ { #1 {#4} }
{
- \__fnpct_no_value_or_quark_no_value:nTF { #3 }
- { #1 [ #2 ] { #4 } }
- { #1 [ #2 ] [ #3 ] { #4 } }
+ \__fnpct_no_value_or_quark_no_value:nTF {#3}
+ { #1 [#2] {#4} }
+ { #1 [#2] [#3] {#4} }
}
}
% check for punctuation:
\cs_new_protected:Npn \fnpct_check_punctuation:TF #1#2
- { \__fnpct_check_punctuation:nTF { 0 } { #1 } { #2 } }
+ { \__fnpct_check_punctuation:nTF {0} {#1} {#2} }
\cs_new_protected:Npn \__fnpct_check_punctuation:nTF #1#2#3
{
@@ -295,17 +362,17 @@
\l__fnpct_current_punct_mark_tl
\l__fnpct_punctuation_marks_tl
\exp_args:NV \peek_meaning_remove:NTF \l__fnpct_current_punct_mark_tl
- { #2 }
+ {#2}
{
- \__fnpct_check_punctuation_aux:nnn { #1 }
- { \__fnpct_check_punctuation:VTF \l__fnpct_tmpa_int { #2 } { #3 } }
- { #3 }
+ \__fnpct_check_punctuation_aux:nnn {#1}
+ { \__fnpct_check_punctuation:VTF \l__fnpct_tmpa_int {#2} {#3} }
+ {#3}
}
}
\cs_new_protected:Npn \__fnpct_check_punctuation_aux:nnn #1#2#3
{
- \int_set:Nn \l__fnpct_tmpa_int { #1 }
+ \int_set:Nn \l__fnpct_tmpa_int {#1}
\int_incr:N \l__fnpct_tmpa_int
\tl_set:Nx \l__fnpct_tmpb_tl { \int_to_arabic:n { \l__fnpct_tmpa_int } }
\tl_remove_all:NV \l__fnpct_punctuation_marks_tl
@@ -313,25 +380,19 @@
\tl_put_right:NV \l__fnpct_punctuation_marks_tl
\l__fnpct_current_punct_mark_tl
\int_compare:nTF { \l__fnpct_tmpa_int < \tl_count:V \l__fnpct_punctuation_marks_tl }
- { #2 }
- { #3 }
+ {#2}
+ {#3}
}
-\cs_generate_variant:Nn \__fnpct_check_punctuation:nTF { V }
-% \cs_generate_variant:Nn \peek_meaning_remove:NTF { V }
-\cs_generate_variant:Nn \tl_remove_all:Nn { NV }
-\cs_generate_variant:Nn \tl_put_right:Nn { NV }
+\cs_generate_variant:Nn \__fnpct_check_punctuation:nTF {V}
\cs_new_protected:Npn \__fnpct_get_head:NN #1#2
{ \tl_set:Nx #1 { \tl_head:V #2 } }
% check for multiple notes:
-\tl_new:N \l__fnpct_multiple_true_tl
-\tl_new:N \l__fnpct_multiple_false_tl
-
\cs_new_protected:Npn \fnpct_check_multiple:TF #1#2
{
- \tl_set:Nn \l__fnpct_multiple_true_tl { #1 }
- \tl_set:Nn \l__fnpct_multiple_false_tl { #2 }
+ \tl_set:Nn \l__fnpct_multiple_true_tl {#1}
+ \tl_set:Nn \l__fnpct_multiple_false_tl {#2}
\bool_gset_false:N \g__fnpct_after_punctuation_bool
\peek_after:Nw \__fnpct_check_multiple:
}
@@ -340,8 +401,9 @@
{
\prop_map_inline:Nn \g__fnpct_adapted_notes_prop
{
- \prop_get:NnN \g__fnpct_adapted_notes_prop { ##1 } \l__fnpct_tmpb_tl
- \exp_args:NV \token_if_eq_meaning:NNTF \l__fnpct_tmpb_tl \l_peek_token
+ \tl_set_rescan:Nnn \l__fnpct_tmpb_tl {} {##1}
+ \exp_args:NV
+ \token_if_eq_meaning:NNTF \l__fnpct_tmpb_tl \l_peek_token
{
\bool_set_true:N \l__fnpct_multiple_footnotes_bool
\prop_map_break:
@@ -353,10 +415,8 @@
{ \tl_use:N \l__fnpct_multiple_false_tl }
}
-% \cs_generate_variant:Nn \token_if_eq_meaning:NNTF {V}
-
% check which mode is active:
-\prg_new_conditional:Npnn \fnpct_punct_if_after: { T, TF }
+\prg_new_conditional:Npnn \fnpct_punct_if_after: {T,TF}
{
\bool_if:nTF
{
@@ -426,7 +486,6 @@
\fnpct_check_multiple:TF
{
\bool_set_true:N \l__fnpct_multiple_footnotes_bool
- % else insert space and then note
\fnpct_no_break:
\bool_if:NF \g__fnpct_after_punctuation_bool
{ \skip_horizontal:N \l__fnpct_before_footnote_dim }
@@ -446,7 +505,6 @@
#1
\bool_set_false:N \l__fnpct_reverse_switch_bool
}
- % \bool_gset_false:N \g__fnpct_after_punctuation_bool
}
}
@@ -462,12 +520,12 @@
% and then insert footnote
\bool_if:NF \l__fnpct_dont_mess_around_bool
{
- \IfBooleanT { #5 }
+ \IfBooleanT {#5}
{ \bool_set_true:N \l__fnpct_reverse_switch_bool }
}
\fnpct_handle_punctuation:n
{
- \fnpct_write_note:Nnnn #1 { #2 } { #3 } { #4 }
+ \fnpct_write_note:Nnnn #1 {#2} {#3} {#4}
\fnpct_write_inner:N #1
}
}
@@ -475,9 +533,6 @@
% --------------------------------------------------------------------------
% MULTIPLE FOOTNOTES
-\seq_new:N \l__fnpct_multiple_footnotes_seq
-\cs_generate_variant:Nn \seq_set_split:Nnn { NVn }
-
% #1: original note command
% #2: star
% #3: multiple notes separated by \l__fnpct_multiple_footnotes_delimiter_tl
@@ -485,20 +540,19 @@
{
\bool_if:NF \l__fnpct_dont_mess_around_bool
{
- \IfBooleanT { #2 }
+ \IfBooleanT {#2}
{ \bool_set_true:N \l__fnpct_reverse_switch_bool }
}
% split input:
\seq_set_split:NVn \l__fnpct_multiple_footnotes_seq
\l__fnpct_multiple_footnotes_delimiter_tl
- { #3 }
+ {#3}
\fnpct_handle_punctuation:n
{ \fnpct_write_notes:NN #1 \l__fnpct_multiple_footnotes_seq }
}
-\cs_generate_variant:Nn \fnpct_mult_note:Nnn { cnn }
+\cs_generate_variant:Nn \fnpct_mult_note:Nnn {cnn}
-\int_new:N \l__fnpct_multiple_notes_int
% #1: original note command
% #2: sequence variable holding the note arguments
\cs_new_protected:Npn \fnpct_write_notes:NN #1#2
@@ -506,7 +560,7 @@
\int_zero:N \l__fnpct_multiple_notes_int
\seq_map_inline:Nn #2
{
- \__fnpct_read_note_with_option:w ##1 \q_stop { #1 }
+ \__fnpct_read_note_with_option:w ##1 \q_stop {#1}
\int_incr:N \l__fnpct_multiple_notes_int
}
}
@@ -518,7 +572,6 @@
% #3: second optional argument to original note command
% #4: mandatory argument to original note command
% #5: original note command
-\bool_new:N \g__fnpct_only_text_bool
\NewDocumentCommand \__fnpct_read_note_with_option:w { soo+u{\q_stop}m }
{
\bool_if:nT
@@ -533,40 +586,36 @@
}
}
{
- \IfBooleanTF { #1 }
+ \IfBooleanTF {#1}
{ \tex_unskip:D }
{ \textsuperscript { \l__fnpct_multiple_footnote_separator_tl } }
}
- \IfBooleanTF { #1 }
+ \IfBooleanTF {#1}
{
% TODO: maybe provide option to change \footnotetext? Or do it
% automatically?
\bool_gset_true:N \g__fnpct_only_text_bool
- \IfNoValueTF { #2 }
- { \footnotetext { #4 } }
- { \footnotetext [ #2 ] { #4 } }
+ \IfNoValueTF {#2}
+ { \footnotetext {#4} }
+ { \footnotetext [#2] {#4} }
}
- { \fnpct_write_note:Nnnn #5 { #2 } { #3 } { #4 } }
+ { \fnpct_write_note:Nnnn #5 {#2} {#3} {#4} }
\fnpct_write_inner:N #5
}
% --------------------------------------------------------------------------
% NESTED FOOTNOTES:
% 1 layer of nesting...
-\prop_new:N \g__fnpct_inner_footnote_prop
-\prop_new:N \g__fnpct_inner_footnote_hyperref_prop
-\cs_generate_variant:Nn \prop_gput:Nnn { Nxn , Nxo }
-
% this shouldn't be a document command! But for the time being I'll stick to
% this easy solution...
-\NewDocumentCommand \fnpct_inner_footnote:w { o+m }
+\NewDocumentCommand \fnpct_inner_footnote:w {o+m}
{
- \IfNoValueTF { #1 }
+ \IfNoValueTF {#1}
{
% TODO: maybe detect what type of note we're in and use the appropriate mark?
% Or provide a user interface to choose the appropriate mark?
\fnpct_orig_footnotemark:w
- \prop_gput:Nxn \g__fnpct_inner_footnote_prop { \thefootnote } { #2 }
+ \prop_gput:Nxn \g__fnpct_inner_footnote_prop { \thefootnote } {#2}
\bool_if:NT \l__fnpct_hyperref_bool
{
\prop_gput:Nxo \g__fnpct_inner_footnote_hyperref_prop
@@ -574,28 +623,28 @@
}
}
{
- \fnpct_orig_footnotemark:w [ #1 ]
- \prop_gput:Nnn \g__fnpct_inner_footnote_prop { #1 } { #2 }
+ \fnpct_orig_footnotemark:w [#1]
+ \prop_gput:Nnn \g__fnpct_inner_footnote_prop {#1} {#2}
\bool_if:NT \l__fnpct_hyperref_bool
{
\prop_gput:Nno \g__fnpct_inner_footnote_hyperref_prop
- { #1 } { \Hy@footnote@currentHref }
+ {#1} { \Hy@footnote@currentHref }
}
}
}
-\cs_new:Npn \fnpct_write_inner:N #1
+\cs_new_protected:Npn \fnpct_write_inner:N #1
{
\token_if_eq_meaning:NNF #1 \fnpct_inner_footnote:w
{
\prop_map_inline:Nn \g__fnpct_inner_footnote_prop
{
- \footnotetext [ ##1 ]
+ \footnotetext [##1]
{
\bool_if:NT \l__fnpct_hyperref_bool
{
\prop_get:NnN \g__fnpct_inner_footnote_hyperref_prop
- { ##1 } \l__fnpct_tmpa_tl
+ {##1} \l__fnpct_tmpa_tl
\Hy@raisedlink
{ \exp_args:NV \hyper@@anchor \l__fnpct_tmpa_tl }
}
@@ -659,11 +708,22 @@
}
% --------------------------------------------------------------------------
-% LET'S MAKE IT EASIER TO ADAPT EXISTIUNG FUNCTIONS:
-\prop_new:N \g__fnpct_adapted_notes_prop
-\cs_generate_variant:Nn \prop_put:Nnn { Nxn }
-
+% LET'S MAKE IT EASIER TO ADAPT EXISTING FUNCTIONS:
% COPY, RENEW AND CREATE MULT
+
+\prg_new_conditional:Npnn \fnpct_if_adapted:N #1 {p,T,F,TF}
+ {
+ \prop_if_in:NnTF \g__fnpct_adapted_notes_prop {#1}
+ { \prg_return_true: }
+ { \prg_return_false: }
+ }
+
+\cs_new_protected:Npn \fnpct_add_to_adapted:NN #1#2
+ {
+ % \tl_show:n {1:~#1} \tl_show:n {2:~#2}
+ \prop_gput:Nnn \g__fnpct_adapted_notes_prop {#1} {#2}
+ }
+
% standard \footnote[<mark>]{<text>} like commands
% #1: old new name
% #2: internal name of old definition
@@ -672,184 +732,232 @@
% \footnote[<mark>]{<text>} like:
\cs_new_protected:Npn \fnpct_renew_and_mult:NNN #1#2#3
{
- \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 }
- \cs_new_eq:NN #2 #1
- \fnpct_create_mult_variant:NN #3 #2
- \bool_if:NTF \l__fnpct_multiple_default_bool
- { \cs_set_eq:NN #1 #3 }
+ \fnpct_if_adapted:NF #1
{
- \RenewDocumentCommand #1 { so+m }
- { \fnpct_handle_note:Nnnnn #2 { ##2 } { \q_no_value } { ##3 } { ##1 } }
+ \fnpct_add_to_adapted:NN #1#2
+ \cs_new_eq:NN #2#1
+ \fnpct_create_mult_variant:NN #3#2
+ \bool_if:NTF \l__fnpct_multiple_default_bool
+ { \cs_set_eq:NN #1#3 }
+ {
+ \RenewDocumentCommand #1 {so+m}
+ { \fnpct_handle_note:Nnnnn #2 {##2} { \q_no_value } {##3} {##1} }
+ }
}
}
-\cs_generate_variant:Nn \fnpct_renew_and_mult:NNN { ccc , NcN }
+\cs_generate_variant:Nn \fnpct_renew_and_mult:NNN {ccc,NcN}
% \footnote{<text>} like:
\cs_new_protected:Npn \fnpct_renew_and_mult_no_opt:NNN #1#2#3
{
- \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 }
- \cs_new_eq:NN #2 #1
- \fnpct_create_mult_variant:NN #3 #2
- \bool_if:NTF \l__fnpct_multiple_default_bool
- { \cs_set_eq:NN #1 #3 }
+ \fnpct_if_adapted:NF #1
{
- \RenewDocumentCommand #1 { s+m }
+ \fnpct_add_to_adapted:NN #1#2
+ \cs_new_eq:NN #2#1
+ \fnpct_create_mult_variant:NN #3#2
+ \bool_if:NTF \l__fnpct_multiple_default_bool
+ { \cs_set_eq:NN #1#3 }
{
- \fnpct_handle_note:Nnnnn #2 { \q_no_value } { \q_no_value }
- { ##2 } { ##1 }
+ \RenewDocumentCommand #1 {s+m}
+ {
+ \fnpct_handle_note:Nnnnn #2 { \q_no_value } { \q_no_value }
+ {##2} {##1}
+ }
}
}
}
-\cs_generate_variant:Nn \fnpct_renew_and_mult_no_opt:NNN { Nc, ccc }
+\cs_generate_variant:Nn \fnpct_renew_and_mult_no_opt:NNN {Nc,ccc}
% renew but don't create mult-variant:
% \footnote[<mark>]{<text>} like:
\cs_new_protected:Npn \fnpct_renew:NN #1#2
{
- \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 }
- \cs_new_eq:NN #2 #1
- \RenewDocumentCommand #1 { so+m }
- { \fnpct_handle_note:Nnnnn #2 { ##2 } { \q_no_value } { ##3 } { ##1 } }
+ \fnpct_if_adapted:NF #1
+ {
+ \fnpct_add_to_adapted:NN #1#2
+ \cs_new_eq:NN #2#1
+ \RenewDocumentCommand #1 {so+m}
+ { \fnpct_handle_note:Nnnnn #2 {##2} { \q_no_value } {##3} {##1} }
+ }
}
-\cs_generate_variant:Nn \fnpct_renew:NN { cc ,Nc }
+\cs_generate_variant:Nn \fnpct_renew:NN {cc,Nc}
% new
\cs_new_protected:Npn \fnpct_new:NN #1#2
{
- \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 }
- \NewDocumentCommand #1 { so+m }
- { \fnpct_handle_note:Nnnnn #2 { ##2 } { \q_no_value } { ##3 } { ##1 } }
+ \fnpct_if_adapted:NF #1
+ {
+ \fnpct_add_to_adapted:NN #1#2
+ \NewDocumentCommand #1 {so+m}
+ { \fnpct_handle_note:Nnnnn #2 {##2} { \q_no_value } {##3} {##1} }
+ }
}
-\cs_generate_variant:Nn \fnpct_new:NN { cc , Nc }
+\cs_generate_variant:Nn \fnpct_new:NN {cc,Nc}
% \note[<mark>][<oarg>]{<text>} like:
\cs_new_protected:Npn \fnpct_renew_and_mult_opt:NNN #1#2#3
{
- \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 }
- \cs_new_eq:NN #2 #1
- \fnpct_create_mult_variant:NN #3 #2
- \bool_if:NTF \l__fnpct_multiple_default_bool
- { \cs_set_eq:NN #1 #3 }
+ \fnpct_if_adapted:NF #1
{
- \RenewDocumentCommand #1 { soo+m }
- { \fnpct_handle_note:Nnnnn #2 { ##2 } { ##3 } { ##4 } { ##1 } }
+ \fnpct_add_to_adapted:NN #1#2
+ \cs_new_eq:NN #2#1
+ \fnpct_create_mult_variant:NN #3#2
+ \bool_if:NTF \l__fnpct_multiple_default_bool
+ { \cs_set_eq:NN #1#3 }
+ {
+ \RenewDocumentCommand #1 {soo+m}
+ { \fnpct_handle_note:Nnnnn #2 {##2} {##3} {##4} {##1} }
+ }
}
}
-\cs_generate_variant:Nn \fnpct_renew_and_mult_opt:NNN { ccc , NcN }
+\cs_generate_variant:Nn \fnpct_renew_and_mult_opt:NNN {ccc,NcN}
\cs_new_protected:Npn \fnpct_renew_opt:NN #1#2
{
- \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 }
- \cs_new_eq:NN #2 #1
- \RenewDocumentCommand #1 { soo+m }
- { \fnpct_handle_note:Nnnnn #2 { ##2 } { ##3 } { ##4 } { ##1 } }
+ \fnpct_if_adapted:NF #1
+ {
+ \fnpct_add_to_adapted:NN #1#2
+ \cs_new_eq:NN #2#1
+ \RenewDocumentCommand #1 {soo+m}
+ { \fnpct_handle_note:Nnnnn #2 {##2} {##3} {##4} {##1} }
+ }
}
-\cs_generate_variant:Nn \fnpct_renew_opt:NN { cc , Nc }
+\cs_generate_variant:Nn \fnpct_renew_opt:NN {cc,Nc}
% \note{<arg>} like
\cs_new_protected:Npn \fnpct_renew_no_opt:NN #1#2
{
- \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 }
- \cs_new_eq:NN #2 #1
- \RenewDocumentCommand #1 { s+m }
- { \fnpct_handle_note:Nnnnn #2 { \q_no_value } { \q_no_value } { ##2 } { ##1 } }
+ \fnpct_if_adapted:NF #1
+ {
+ \fnpct_add_to_adapted:NN #1#2
+ \cs_new_eq:NN #2#1
+ \RenewDocumentCommand #1 {s+m}
+ { \fnpct_handle_note:Nnnnn #2 { \q_no_value } { \q_no_value } {##2} {##1} }
+ }
}
-\cs_generate_variant:Nn \fnpct_renew_no_opt:NN { cc ,Nc }
+\cs_generate_variant:Nn \fnpct_renew_no_opt:NN {cc,Nc}
% \note like
\cs_new_protected:Npn \fnpct_renew_no_arg:NN #1#2
{
- \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 }
- \cs_new_eq:NN #2 #1
- \RenewDocumentCommand #1 { s }
- { \fnpct_handle_note:Nnnnn #2 { \q_no_value } { \q_no_value } { } { ##1 } }
+ \fnpct_if_adapted:NF #1
+ {
+ \fnpct_add_to_adapted:NN #1#2
+ \cs_new_eq:NN #2#1
+ \RenewDocumentCommand #1 {s}
+ { \fnpct_handle_note:Nnnnn #2 { \q_no_value } { \q_no_value } { } {##1} }
+ }
}
-\cs_generate_variant:Nn \fnpct_renew_no_arg:NN { cc }
+\cs_generate_variant:Nn \fnpct_renew_no_arg:NN {cc}
% create mult-variant
\cs_new_protected:Npn \fnpct_create_mult_variant:NN #1#2
{
- \NewDocumentCommand #1 { s+m }
- { \fnpct_mult_note:Nnn #2 { ##1 } { ##2 } }
+ \NewDocumentCommand #1 {s+m}
+ { \fnpct_mult_note:Nnn #2 {##1} {##2} }
}
% \footnotemark[<mark>] like commands:
\cs_new_protected:Npn \fnpct_renew_mark:NN #1#2
{
- \prop_gput:Nxn \g__fnpct_adapted_notes_prop { \cs_to_str:N #2 } { #1 }
- \cs_new_eq:NN #2 #1
- \RenewDocumentCommand #1 { so }
- { \fnpct_handle_note:Nnnnn #2 { ##2 } { \q_no_value } { } { ##1 } }
+ \fnpct_if_adapted:NF #1
+ {
+ \fnpct_add_to_adapted:NN #1#2
+ \cs_new_eq:NN #2#1
+ \RenewDocumentCommand #1 {so}
+ { \fnpct_handle_note:Nnnnn #2 {##2} { \q_no_value } { } {##1} }
+ }
}
-\cs_generate_variant:Nn \fnpct_renew_mark:NN { cc , Nc }
+\cs_generate_variant:Nn \fnpct_renew_mark:NN {cc,Nc}
% user commands:
-\NewDocumentCommand \AdaptNote { mm }
+\NewDocumentCommand \AdaptNote {mm}
{
\cs_if_exist:cTF { fnpct_orig_ \cs_to_str:N #1 :w }
- { \fnpct_message:nx { already-adapted } { #1 } }
+ { \fnpct_message:nx {already-adapted} {#1} }
{ \fnpct_renew_and_mult:NcN #1 { fnpct_orig_ \cs_to_str:N #1 :w } #2 }
}
-\NewDocumentCommand \AdaptNoteNoMult { m }
+\NewDocumentCommand \AdaptNoteNoMult {m}
{
\cs_if_exist:cTF { fnpct_orig_ \cs_to_str:N #1 :w }
- { \fnpct_message:nx { already-adapted } { #1 } }
+ { \fnpct_message:nx {already-adapted} {#1} }
{ \fnpct_renew:Nc #1 { fnpct_orig_ \cs_to_str:N #1 :w } }
}
-\NewDocumentCommand \AdaptNoteOpt { mm }
+\NewDocumentCommand \AdaptNoteOpt {mm}
{
\cs_if_exist:cTF { fnpct_orig_ \cs_to_str:N #1 :w }
- { \fnpct_message:nx { already-adapted } { #1 } }
+ { \fnpct_message:nx {already-adapted} {#1} }
{ \fnpct_renew_and_mult_opt:NcN #1 { fnpct_orig_ \cs_to_str:N #1 :w } #2 }
}
-\NewDocumentCommand \AdaptNoteOptNoMult { m }
+\NewDocumentCommand \AdaptNoteOptNoMult {m}
{
\cs_if_exist:cTF { fnpct_orig_ \cs_to_str:N #1 :w }
- { \fnpct_message:nx { already-adapted } { #1 } }
+ { \fnpct_message:nx {already-adapted} {#1} }
{ \fnpct_renew_opt:Nc #1 { fnpct_orig_ \cs_to_str:N #1 :w } }
}
-\NewDocumentCommand \AdaptNoteNoOpt { mm }
+\NewDocumentCommand \AdaptNoteNoOpt {mm}
{
\cs_if_exist:cTF { fnpct_orig_ \cs_to_str:N #1 :w }
- { \fnpct_message:nx { already-adapted } { #1 } }
+ { \fnpct_message:nx {already-adapted} {#1} }
{ \fnpct_renew_and_mult_no_opt:NcN #1 { fnpct_orig_ \cs_to_str:N #1 :w } #2 }
}
-\NewDocumentCommand \AdaptNoteNoOptNoMult { m }
+\NewDocumentCommand \AdaptNoteNoOptNoMult {m}
{
\cs_if_exist:cTF { fnpct_orig_ \cs_to_str:N #1:w }
- { \fnpct_message:nx { already-adapted } { #1 } }
+ { \fnpct_message:nx {already-adapted} {#1} }
{ \fnpct_renew_no_opt:Nc #1 { fnpct_orig_ \cs_to_str:N #1:w } }
}
-\NewDocumentCommand \AdaptNoteMark { m }
+\NewDocumentCommand \AdaptNoteMark {m}
{
\cs_if_exist:cTF { fnpct_orig_ \cs_to_str:N #1 :w }
- { \fnpct_message:nx { already-adapted } { #1 } }
+ { \fnpct_message:nx {already-adapted} {#1} }
{ \fnpct_renew_mark:Nc #1 { fnpct_orig_ \cs_to_str:N #1 :w } }
}
% --------------------------------------------------------------------------
% DO THE REDEFINING:
%
+% `bigfoot' loads `manyfoot' which saves its footnote classes in a 2e list:
+\str_const:Nn \c__fnpct_footins_str {\footins}
+\str_remove_once:Nn \c__fnpct_footins_str {~}
+\cs_new_protected:Npn \__fnpct_grab_second:Nnw #1#2#3 \q_stop
+ {
+ \str_set:Nn \l__fnpct_tmpa_str {#3}
+ \str_remove_once:Nn \l__fnpct_tmpa_str {~}
+ \str_remove_once:NV \l__fnpct_tmpa_str \c__fnpct_footins_str
+ \seq_put_right:Nx #1 { \l__fnpct_tmpa_str }
+ }
+
+\cs_new_protected:Npn \__fnpct_get_fnclasses:NN #1#2
+ {
+ \seq_set_split:NnV \l__fnpct_tmpa_seq {\@elt } #1
+ \seq_pop_left:NN \l__fnpct_tmpa_seq \l__fnpct_tmpa_tl
+ \seq_map_inline:Nn \l__fnpct_tmpa_seq
+ { \__fnpct_grab_second:Nnw #2 ##1 \q_stop }
+ \seq_remove_duplicates:N #2
+ }
+
% before we start make the testing more comfortable:
-\cs_new:Npn \fnpct_treatment:nn #1#2
- { \@ifpackageloaded { #1 } { #2 } { } }
-\cs_new:Npn \fnpct_special_treatment:nn #1#2
- { \@ifpackageloaded { #1 } { #2 } { \AfterPackage * { #1 } { #2 } } }
+\cs_new_protected:Npn \fnpct_treatment:nn #1#2
+ { \fnpct_if_package_loaded:nT {#1} {#2} }
+
+\cs_new_protected:Npn \fnpct_special_treatment:nn #1#2
+ { \fnpct_if_package_loaded:nTF {#1} {#2} { \AfterPackage* {#1} {#2} } }
% and now get going:
\AtBeginDocument
{
- \@ifpackageloaded { hyperref }
+ \fnpct_if_package_loaded:nTF {hyperref}
{ \bool_set_true:N \l__fnpct_hyperref_bool }
{
\cs_if_exist:NF \AfterBeginDocument
- { \cs_new:Npn \AfterBeginDocument #1 { #1 } }
+ { \cs_new:Npn \AfterBeginDocument #1 {#1} }
}
\AfterBeginDocument
{
@@ -859,48 +967,63 @@
{ \AdaptNoteNoOptNoMult \footref }
\fnpct_new:NN \innernote \fnpct_inner_footnote:w
%% the `endnotes' package:
- \fnpct_treatment:nn { endnotes }
+ \fnpct_treatment:nn {endnotes}
{
\AdaptNote \endnote \multendnote
\AdaptNoteMark \endnotemark
}
%% the `enotez' package:
- \fnpct_treatment:nn { enotez }
+ \fnpct_treatment:nn {enotez}
{ \AdaptNote \endnote \multendnote }
%% the `snotez' package:
- \fnpct_treatment:nn { snotez }
- {
- \AdaptNoteOpt \sidenote \multsidenote
- \AdaptNoteMark \sidenotemark
- }
- %% the `sidenotes' package:
- \fnpct_treatment:nn { sidenotes }
+ \fnpct_treatment:nn {snotez}
{
\AdaptNoteOpt \sidenote \multsidenote
\AdaptNoteMark \sidenotemark
}
%% the `parnotes' package:
- \fnpct_treatment:nn { parnotes }
+ \fnpct_treatment:nn {parnotes}
{ \AdaptNote \parnote \multparnote }
%% the `pagenote' package:
- \fnpct_treatment:nn { pagenote }
+ \fnpct_treatment:nn {pagenote}
{
- \bool_if:NT \l__fnpct_makepagenote_bool
+ \bool_if:NTF \l__fnpct_makepagenote_bool
{ \AdaptNote \pagenote \multpagenote }
+ { \msg_warning:nn {fnpct} {pagenote} }
}
%% the `tablefootnote' package:
- \fnpct_treatment:nn { tablefootnote }
+ \fnpct_treatment:nn {tablefootnote}
{ \AdaptNote \tablefootnote \multtablefootnote }
- %% the `bigfoot' package:
- \fnpct_treatment:nn { bigfoot }
+ %% the `manyfoot' package (also loaded by `bigfoot'):
+ \fnpct_treatment:nn {manyfoot}
{
- \prop_map_inline:Nn \l__fnpct_footnote_class_prop
+ \__fnpct_get_fnclasses:NN \MFL@list \l__fnpct_footnote_class_seq
+ \seq_map_inline:Nn \l__fnpct_footnote_class_seq
{
- \fnpct_renew_and_mult:ccc { footnote#2 }
- { fnpct_orig_footnote#2:w } { multfootnote#2 }
- \fnpct_renew_mark:cc { footnotemark#2 } { fnpct_orig_footnotemark#2:w }
+ \str_if_eq:nnTF {#1} {default}
+ {
+ \cs_if_exist:NT \footnotedefault
+ {
+ \fnpct_renew_and_mult:ccc {footnote#1}
+ {fnpct_orig_footnote#1:w}
+ {multfootnote#1}
+ \fnpct_renew_mark:cc {footnotemark#1}
+ {fnpct_orig_footnotemark#1:w}
+ }
+ }
+ {
+ \fnpct_renew_and_mult:ccc {footnote#1}
+ {fnpct_orig_footnote#1:w}
+ {multfootnote#1}
+ \fnpct_renew_mark:cc {footnotemark#1}
+ {fnpct_orig_footnotemark#1:w}
+ }
}
- \prop_if_in:NnT \l__fnpct_footnote_class_prop { default }
+ }
+ %% the `bigfoot' package:
+ \fnpct_special_treatment:nn {bigfoot}
+ {
+ \cs_if_exist:NT \footnotedefault
{
% re-set basics:
\cs_set_eq:NN \footnote \footnotedefault
@@ -909,119 +1032,91 @@
}
}
%% the `fixfoot' package:
- \fnpct_treatment:nn { fixfoot }
+ \fnpct_treatment:nn {fixfoot}
{
\prop_map_inline:Nn \l__fnpct_footnote_fixfoot_prop
- { \fnpct_renew_no_arg:cc { #2 } { fnpct_orig_fix_#2:w } }
+ { \fnpct_renew_no_arg:cc {#2} {fnpct_orig_fix_#2:w} }
}
%% the `sepfootnotes' package:
- \fnpct_treatment:nn { sepfootnotes }
+ \fnpct_treatment:nn {sepfootnotes}
{
\prop_map_inline:Nn \l__fnpct_sepfootnote_foot_classes_prop
{
- \fnpct_renew_and_mult_no_opt:ccc { #2note }
- { fnpct_orig_sep_#2:w } { #2multnote }
- \fnpct_renew_and_mult_no_opt:ccc { #2quicknote }
- { fnpct_orig_sep_#2_quick:w } { #2multquicknote }
- \fnpct_renew_no_opt:cc { #2notemark } { fnpct_orig_sep_#2_mark:w }
+ \fnpct_renew_and_mult_no_opt:ccc {#2note}
+ {fnpct_orig_sep_#2:w} {#2multnote}
+ \fnpct_renew_and_mult_no_opt:ccc {#2quicknote}
+ {fnpct_orig_sep_#2_quick:w} {#2multquicknote}
+ \fnpct_renew_no_opt:cc {#2notemark} {fnpct_orig_sep_#2_mark:w}
}
\prop_map_inline:Nn \l__fnpct_sepfootnote_end_classes_prop
{
- \fnpct_renew_and_mult_no_opt:ccc { #2note }
- { fnpct_orig_sep_#2:w } { #2multnote }
- \fnpct_renew_no_opt:cc { #2notemark } { fnpct_orig_sep_#2_mark:w }
+ \fnpct_renew_and_mult_no_opt:ccc {#2note}
+ {fnpct_orig_sep_#2:w} {#2multnote}
+ \fnpct_renew_no_opt:cc {#2notemark} {fnpct_orig_sep_#2_mark:w}
}
}
}
}
-% the `bigfoot' package neads special treatment:
-\prop_new:N \l__fnpct_footnote_class_prop
+% `bigfoot' package
+% \fnpct_special_treatment:nn {fixfoot}
+% {
+% \bool_if:NT \l__fnpct_bigfoot_default_top_bool
+% { \DeclareNewFootnote {default} }
+% }
-\fnpct_special_treatment:nn { bigfoot }
- {
- % hook into \DeclareNewFootnote so we can redefine all footnote
- % classes defined be users
- \cs_new_eq:NN \fnpct_new_footnote:w \DeclareNewFootnote
- \RenewDocumentCommand \DeclareNewFootnote { omo }
- {
- \prop_put:Nnn \l__fnpct_footnote_class_prop { #2 } { #2 }
- \IfNoValueTF { #1 }
- {
- \IfNoValueTF { #3 }
- { \fnpct_new_footnote:w { #2 } }
- { \fnpct_new_footnote:w { #2 } [ #3 ] }
- }
- {
- \IfNoValueTF { #3 }
- { \fnpct_new_footnote:w [ #1 ] { #2 } }
- { \fnpct_new_footnote:w [ #1 ] { #2 } [ #3 ] }
- }
- }
- \bool_if:NT \l__fnpct_bigfoot_default_top_bool
- { \DeclareNewFootnote { default } }
- }
-
-% as does the `fixfoot' package
-\prop_new:N \l__fnpct_footnote_fixfoot_prop
-
-\fnpct_special_treatment:nn { fixfoot }
+% `fixfoot' package
+\fnpct_special_treatment:nn {fixfoot}
{
% hook into \DeclareFixedFootnote so we can redefine all footnote
% classes defined be users
\cs_new_eq:NN \fnpct_new_fixnote:w \DeclareFixedFootnote
- \RenewDocumentCommand \DeclareFixedFootnote { smm }
+ \RenewDocumentCommand \DeclareFixedFootnote {smm}
{
- \prop_put:Nnx \l__fnpct_footnote_fixfoot_prop { #2 }
+ \prop_put:Nnx \l__fnpct_footnote_fixfoot_prop {#2}
{ \cs_to_str:N #2 }
- \IfBooleanTF { #1 }
- { \fnpct_new_fixnote:w * { #2 } { #3 } }
- { \fnpct_new_fixnote:w { #2 } { #3 } }
+ \IfBooleanTF {#1}
+ { \fnpct_new_fixnote:w * {#2} {#3} }
+ { \fnpct_new_fixnote:w {#2} {#3} }
}
}
-% and the `pagenote' package:
-\bool_new:N \l__fnpct_makepagenote_bool
-
-\fnpct_special_treatment:nn { pagenote }
+% `pagenote' package:
+\fnpct_special_treatment:nn {pagenote}
{
\tl_put_left:Nn \makepagenote
{ \bool_set_true:N \l__fnpct_makepagenote_bool }
}
-% aaand... the `sepfootnotes' package:
-\prop_new:N \l__fnpct_sepfootnote_foot_classes_prop
-\prop_new:N \l__fnpct_sepfootnote_end_classes_prop
-\prop_new:N \l__fnpct_sepfootnote_symbol_classes_prop
-
-\fnpct_special_treatment:nn { sepfootnotes }
+% `sepfootnotes' package:
+\fnpct_special_treatment:nn {sepfootnotes}
{
\cs_new_eq:NN \fnpct_orig_new_footnotes:w \newfootnotes
\cs_new_eq:NN \fnpct_orig_new_endnotes:n \newendnotes
\cs_new_eq:NN \fnpct_orig_new_symbolnotes:w \newsymbolfootnotes
- \RenewDocumentCommand \newfootnotes { sm }
+ \RenewDocumentCommand \newfootnotes {sm}
{
- \prop_put:Nnn \l__fnpct_sepfootnote_foot_classes_prop { #2 } { #2 }
- \IfBooleanTF { #1 }
- { \fnpct_orig_new_footnotes:w * { #2 } }
- { \fnpct_orig_new_footnotes:w { #2 } }
+ \prop_put:Nnn \l__fnpct_sepfootnote_foot_classes_prop {#2} {#2}
+ \IfBooleanTF {#1}
+ { \fnpct_orig_new_footnotes:w * {#2} }
+ { \fnpct_orig_new_footnotes:w {#2} }
}
- \RenewDocumentCommand \newendnotes { m }
+ \RenewDocumentCommand \newendnotes {m}
{
- \prop_put:Nnn \l__fnpct_sepfootnote_end_classes_prop { #1 } { #1 }
- \fnpct_orig_new_endnotes:n { #1 }
+ \prop_put:Nnn \l__fnpct_sepfootnote_end_classes_prop {#1} {#1}
+ \fnpct_orig_new_endnotes:n {#1}
}
- \RenewDocumentCommand \newsymbolfootnotes { om }
+ \RenewDocumentCommand \newsymbolfootnotes {om}
{
- \prop_put:Nnn \l__fnpct_sepfootnote_symbol_classes_prop { #2 } { #2 }
- \IfNoValueTF { #1 }
- { \fnpct_orig_new_symbolnotes:w { #2 } }
- { \fnpct_orig_new_symbolnotes:w [ #1 ] { #2 } }
+ \prop_put:Nnn \l__fnpct_sepfootnote_symbol_classes_prop {#2} {#2}
+ \IfNoValueTF {#1}
+ { \fnpct_orig_new_symbolnotes:w {#2} }
+ { \fnpct_orig_new_symbolnotes:w [#1] {#2} }
}
}
% --------------------------------------------------------------------------
-\RequirePackage{translations}[2014/01/10]
+\RequirePackage{translations}
\AtBeginDocument{
\ifcurrentbaselanguage{French}
{
@@ -1040,10 +1135,10 @@
% --------------------------------------------------------------------------
% SETUP COMMAND:
-\NewDocumentCommand \setfnpct { m }
- { \keys_set:nn { fnpct } { #1 } }
+\NewDocumentCommand \setfnpct {m}
+ { \keys_set:nn {fnpct} {#1} }
-\tex_endinput:D
+\file_input_stop:
% --------------------------------------------------------------------------
% HISTORY:
@@ -1084,7 +1179,7 @@
2012/08/27 v0.2f - switched to internal scratch variables
2012/11/14 v0.2g - adapt changes in `sidenotes' package
2013/01/18 v0.2h - bug fixed: \l__fnpct_multiple_footnote_separator_tl
- should be { , } when `memoir' is loaded
+ should be {,} when `memoir' is loaded
2013/01/21 v0.2i - adapted to changes of sepfootnotes, bug fix in reading
of multiple notes
2013/02/22 v0.2j - adaption of `enotez' \endnote command
@@ -1113,18 +1208,13 @@
2015/04/23 v0.4d - fix for issue #7: polyglossia and french
2016/03/25 v0.4e - fix for issue #9
2019/02/17 v0.4f - fix for issues #13 and #19
+2019/09/30 v0.4g - update for expl3 deprecations
+2019/10/05 v0.5 - fix issue 18
+ - remove option `bigfoot-default-top'
+ - support `manyfoot' package
% --------------------------------------------------------------------------
% NOTES:
-- `footnote' package => not compatible => see todo
+- `footnote' package => not compatible
- `ednotes' package => not tested; who knows?
-
-% --------------------------------------------------------------------------
-% TODO:
-- localization: should there be different defaults for different languages?
- And who might provide enough information about conventions in other
- languages?
-- solve incompatibility with the `footnote' package
-- get this working (??) => http://tex.stackexchange.com/questions/54288/nested-endnotes
-- the `bigfoot' package provides \footnote+ and \footnote- -- let's see if we
- can add those functionalities again
+- `sidenotes' package => mot easily patchable, see pull request #1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fnpct.tlpobj new/tlpkg/tlpobj/fnpct.tlpobj
--- old/tlpkg/tlpobj/fnpct.tlpobj 2019-02-28 03:37:43.000000000 +0100
+++ new/tlpkg/tlpobj/fnpct.tlpobj 2020-03-24 01:58:04.000000000 +0100
@@ -1,6 +1,6 @@
name fnpct
category Package
-revision 50046
+revision 54512
shortdesc Manage footnote marks' interaction with punctuation
relocated 1
longdesc The package moves footnote marks after following punctuation
@@ -9,9 +9,8 @@
longdesc provided.
runfiles size=11
RELOC/tex/latex/fnpct/fnpct.sty
-catalogue-contact-repository https://bitbucket.org/cgnieder/fnpct/
+catalogue-contact-repository https://github.com/cgnieder/fnpct/
catalogue-ctan /macros/latex/contrib/fnpct
-catalogue-date 2019-02-17 16:59:26 +0100
catalogue-license lppl1.3
catalogue-topics footnote
-catalogue-version 0.4f
+catalogue-version 0.5
++++++ fontawesome5.doc.tar.xz ++++++
Binary files old/doc/fonts/fontawesome5/fontawesome5.pdf and new/doc/fonts/fontawesome5/fontawesome5.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fontawesome5/fontawesome5.tex new/doc/fonts/fontawesome5/fontawesome5.tex
--- old/doc/fonts/fontawesome5/fontawesome5.tex 2019-03-20 23:31:51.000000000 +0100
+++ new/doc/fonts/fontawesome5/fontawesome5.tex 2020-03-24 21:50:55.000000000 +0100
@@ -2,11 +2,16 @@
\usepackage{hyperref}
\usepackage{shortvrb}
\usepackage{metalogo}
+\usepackage{longtable}
\usepackage{fontawesome5}
+% \usepackage{xcolor}
+% \usepackage[pro]{fontawesome5}
+% \faStyle{duotone}
\usepackage[utf8]{inputenc}
+\usepackage{geometry}
\MakeShortVerb{\|}
\begin{document}
-\title{The fontawesome5 package\thanks{This document corresponds to fontawesome5 version 5.8.0, dated 2019/03/20}}
+\title{The fontawesome5 package\thanks{This document corresponds to fontawesome5 version 5.13.0, dated 2020/03/24}}
\author{Font Awesome\thanks{More information at \url{https://fontawesome.com}} (The font)\and Marcel Krüger\thanks{E-Mail: \href{mailto:tex@2krueger.de}{\nolinkurl{tex@2krueger.de}}} (The \LaTeX{} package)}
\maketitle
This package provides \LaTeX{} support for the Font Awesome 5 icons.
@@ -19,13 +24,15 @@
\begin{verbatim}
\usepackage[fixed]{fontawesome5}
\end{verbatim}
-For every icon a macro is provided: Just use the official icon names\footnote{For a full list see \url{https://fontawesome.com/cheatsheet}.} converted to CamelCase with the prefix |\fa|.
+For every icon a macro is provided: Just use the official icon names converted to CamelCase with the prefix |\fa|.
For example to use the |hand-point-up| icon, use |\faHandPointUp|.
For icons ending with |-alt|, append a |*| instead.
An optional argument can be added to select the style (|solid| or |regular|).
The default style is |solid|, it can be changed with |\faStyle{...}|
-Every icon can also be accessed with |\faIcon{the-icon-name}| or |\faIcon[style]{...}|.
+Every icon can also be accessed using the official icon name. To do this, you can use |\faIcon{the-icon-name}| or |\faIcon[style]{the-icon-name}|.
+
+A list of all included icons with their respective commands can be found at the end of this document.
\subsection*{Example}
\begin{verbatim}
@@ -54,18 +61,23 @@
Alternative syntax: \faIcon{file}~\faIcon*{file}~\faIcon[regular]{file}~\faIcon*[regular]{file}.
\subsection*{Font Awesome Pro}
-Font Awesome 5 is available in a Free and a Pro version.
+Font Awesome 5 is available in a Free and a Pro version.
This package uses the free version by default.
If you own a Pro license and have the Font Awesome 5 Pro desktop fonts installed in your system font path, you can use Pro instead.
For this, load the package with the |[pro]| option:
\begin{verbatim}
\usepackage[pro]{fontawesome5}
\end{verbatim}
-Now additional icons and the |light| style can be used.
+Now additional icons, the |duotone| and the |light| style can be used.
+The second color for |duotone| icons can be set though |\faDuotoneSetSecondary|:
+\begin{verbatim}
+ \faDuotoneSetSecondary{green}% From here on, the secondary layer
+ % will be green.
+\end{verbatim}
Pro is only supported with \XeLaTeX{} and \LuaLaTeX.
\subsection*{Updates}
-This package corresponds to Font Awesome 5.8.0.
+This package corresponds to Font Awesome 5.13.0.
In case there is a newer version available on the Font Awesome homepage, check for updates on \url{https://ctan.org/pkg/fontawesome5}. Should there be no corresponding update on CTAN, you can write a mail to \href{mailto:tex@2krueger.de}{\nolinkurl{tex@2krueger.de}}.
If you use \XeLaTeX{} or \LuaLaTeX{}, you can also directly download the new Desktop Fonts from \url{https://fontawesome.com} into your \TeX{} tree. If you save them with the filenames\\
{\ttfamily\begin{tabular}{l}
@@ -77,4 +89,6 @@
\subsection*{Bugs}
For bug reports and feature requests, write to \href{mailto:tex@2krueger.de}{\nolinkurl{tex@2krueger.de}}.
+
+\input{fulllist}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fontawesome5/fulllist.tex new/doc/fonts/fontawesome5/fulllist.tex
--- old/doc/fonts/fontawesome5/fulllist.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/fontawesome5/fulllist.tex 2020-03-24 21:50:55.000000000 +0100
@@ -0,0 +1,102 @@
+\ExplSyntaxOn
+\msg_new:nnnn {fontawesome5} {list/no-shorthand} {No~shorthand~defined~for~icon~#1.} {
+ It~looks~like~#1~need~special~handling~in~fulllist.tex~but~there~are~
+ no~appropriate~definitions.~Ask~a~wizard~to~add~#1~to~fulllist.tex~to~
+ fix~this.
+}
+\tl_new:N \g__fontawesome_last_name_tl
+\tl_new:N \g__fontawesome_last_cs_tl
+\prg_new_protected_conditional:Nnn \__fontawesome_if_regular_style:nn {T} {
+ \str_if_eq:nnTF {#1} {free3} {
+ \prg_return_false:
+ }
+ {
+ \group_begin:
+ \usefont{U}{fontawesome#1}{regular}{n}
+ \iffontchar\font#2
+ \group_insert_after:N \prg_return_true:
+ \else:
+ \group_insert_after:N \prg_return_false:
+ \fi:
+ \group_end:
+ }
+}
+\tracingonline1
+\showboxdepth\maxdimen
+\showboxbreadth\maxdimen
+\cs_new:Nn\__fontawesome_list_show_icon:nnnn{
+ \str_if_in:nnT{#3}{brands}{
+ \hfilneg\vbox to0.875em{\vfil\hbox to0pt{\hss\tiny\faTrademark\quad}\vfil}\hfil
+ }
+ \faIcon{#2}&\texttt{\textbackslash#1}&\texttt{\textbackslash faIcon\{#2\}}
+ \str_if_in:nnT{#3}{free}{
+ \__fontawesome_if_regular_style:nnT {#3} {#4} {
+ \\\faIcon[regular]{#2}&\texttt{\textbackslash#1[regular]}&\texttt{\textbackslash faIcon[regular]\{#2\}}
+ }
+ }
+ \tl_gset:Nn \g__fontawesome_last_cs_tl {#1}
+ \tl_gset:Nn \g__fontawesome_last_name_tl {#2}
+ \\
+}
+\cs_generate_variant:Nn \__fontawesome_list_show_icon:nnnn { fnnn }
+\cs_set:Nn\__fontawesome_def_icon:nnnnn{
+ \__fontawesome_list_show_icon:fnnn{
+ \tl_if_empty:nTF{#1}{
+ \str_if_eq:noTF{#2}{\g__fontawesome_last_name_tl-alt}{
+ \g__fontawesome_last_cs_tl*
+ }{
+ \cs_if_exist_use:cF {__fontawesome_list_real_cs_#2_tl} {
+ \msg_expandable_error:nnn {fontawesome5} {list/no-shorthand} {#2}
+ }
+ }
+ }{
+ \cs_to_str:N #1 % You might have noticed that #1 is a n-type argument, not N-type.
+ % This is not a mistake, the argument might contain additional characters after the initial cs
+ % which is passed to \cs_to_str:N
+ }
+ }{#2}{#3}{#4}
+}
+% Some icons are special for some reason. See fontawesome5.sty if you want to know why
+% they are singled out.
+\tl_const:cn{__fontawesome_list_real_cs_wifi_tl}{faWifi}
+\tl_const:cn{__fontawesome_list_real_cs_dice-d20_tl}{faDiceD20}
+\tl_const:cn{__fontawesome_list_real_cs_dice-d6_tl}{faDiceD6}
+\tl_const:cn{__fontawesome_list_real_cs_signal_tl}{faSignal}
+\tl_const:cn{__fontawesome_list_real_cs_stopwatch_tl}{faStopwatch}
+\tl_const:cn{__fontawesome_list_real_cs_stopwatch-20_tl}{faStopwatch20}
+%
+\tl_const:cn{__fontawesome_list_real_cs_500px_tl}{faIcon\{500px\}}
+\tl_const:cn{__fontawesome_list_real_cs_arrows-alt_tl}{faArrows*}
+\tl_const:cn{__fontawesome_list_real_cs_cloud-download-alt_tl}{faCloudDownload*}
+\tl_const:cn{__fontawesome_list_real_cs_cloud-upload-alt_tl}{faCloudUpload*}
+\tl_const:cn{__fontawesome_list_real_cs_exchange-alt_tl}{faExchange*}
+\tl_const:cn{__fontawesome_list_real_cs_expand-arrows-alt_tl}{faExpandArrows*}
+\tl_const:cn{__fontawesome_list_real_cs_external-link-alt_tl}{faExternalLink*}
+\tl_const:cn{__fontawesome_list_real_cs_external-link-square-alt_tl}{faExternalLinkSquare*}
+\tl_const:cn{__fontawesome_list_real_cs_level-down-alt_tl}{faLevelDown*}
+\tl_const:cn{__fontawesome_list_real_cs_level-up-alt_tl}{faLevelUp*}
+\tl_const:cn{__fontawesome_list_real_cs_pencil-alt_tl}{faPencil*}
+\tl_const:cn{__fontawesome_list_real_cs_shield-alt_tl}{faShield*}
+\tl_const:cn{__fontawesome_list_real_cs_sign-in-alt_tl}{faSignIn*}
+\tl_const:cn{__fontawesome_list_real_cs_sign-out-alt_tl}{faSignOut*}
+\tl_const:cn{__fontawesome_list_real_cs_square-root-alt_tl}{faSquareRoot*}
+\tl_const:cn{__fontawesome_list_real_cs_tachometer-alt_tl}{faTachometer*}
+\tl_const:cn{__fontawesome_list_real_cs_ticket-alt_tl}{faTicket*}
+%
+\tl_const:cn{__fontawesome_list_real_cs_compress-arrows-alt_tl}{faCompressArrows*}
+\ExplSyntaxOff
+\newgeometry{textwidth=18cm}
+\subsection*{Full~icon~list~for~FontAwesome~5~Free}
+All icons marked with \vbox to0.875em{\vfil\hbox{\hss\tiny\faTrademark}\vfil} are brand icons.
+\begin{quote}
+ All brand icons are trademarks of their respective owners. The use of these
+ trademarks does not indicate endorsement of the trademark holder by Font
+ Awesome, nor vice versa. \emph{Please do not use brand logos for any purpose except
+ to represent the company, product, or service to which they refer.}
+\end{quote}
+\ExplSyntaxOn
+\begin{longtable}{cll}
+ \cs:w @@input\cs_end: fontawesome5-mapping.def~
+\end{longtable}
+\ExplSyntaxOff
+\restoregeometry
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontawesome5.doc.tlpobj new/tlpkg/tlpobj/fontawesome5.doc.tlpobj
--- old/tlpkg/tlpobj/fontawesome5.doc.tlpobj 2019-03-21 02:24:15.000000000 +0100
+++ new/tlpkg/tlpobj/fontawesome5.doc.tlpobj 2020-03-25 16:13:09.000000000 +0100
@@ -1,9 +1,10 @@
name fontawesome5.doc
category Package
-revision 50490
+revision 54517
shortdesc doc files of fontawesome5
relocated 1
-docfiles size=42
+docfiles size=180
RELOC/doc/fonts/fontawesome5/README.md
RELOC/doc/fonts/fontawesome5/fontawesome5.pdf
RELOC/doc/fonts/fontawesome5/fontawesome5.tex
+ RELOC/doc/fonts/fontawesome5/fulllist.tex
++++++ fontawesome5.tar.xz ++++++
++++ 6018 lines of diff (skipped)
++++++ fontinst.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/fontinst.man1.pdf and new/texmf-dist/doc/man/man1/fontinst.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontinst.doc.tlpobj new/tlpkg/tlpobj/fontinst.doc.tlpobj
--- old/tlpkg/tlpobj/fontinst.doc.tlpobj 2019-03-27 02:24:08.000000000 +0100
+++ new/tlpkg/tlpobj/fontinst.doc.tlpobj 2020-01-27 01:40:47.000000000 +0100
@@ -1,6 +1,6 @@
name fontinst.doc
category Package
-revision 50602
+revision 53562
shortdesc doc files of fontinst
docfiles size=463
texmf-dist/doc/fonts/fontinst/README
++++++ fontinst.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texlive/fontinst.sh new/texmf-dist/scripts/texlive/fontinst.sh
--- old/texmf-dist/scripts/texlive/fontinst.sh 2013-04-08 17:51:20.000000000 +0200
+++ new/texmf-dist/scripts/texlive/fontinst.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-test -f /bin/sh5 && test -z "$RUNNING_SH5" \
- && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
- && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; }
-unset RUNNING_SH5
-
-test -f /bin/bsh && test -z "$RUNNING_BSH" \
- && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
- && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
-unset RUNNING_BSH
-
-# hack around a bug in zsh:
-test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-
-tex -progname=fontinst \&tex ${1+"$@"}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texlive-extra/fontinst.sh new/texmf-dist/scripts/texlive-extra/fontinst.sh
--- old/texmf-dist/scripts/texlive-extra/fontinst.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/scripts/texlive-extra/fontinst.sh 2020-01-27 00:58:37.000000000 +0100
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+test -f /bin/sh5 && test -z "$RUNNING_SH5" \
+ && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
+ && { RUNNING_SH5=true; export RUNNING_SH5; exec /bin/sh5 $0 ${1+"$@"}; }
+unset RUNNING_SH5
+
+test -f /bin/bsh && test -z "$RUNNING_BSH" \
+ && { UNAMES=`uname -s`; test "x$UNAMES" = xAIX; } 2>/dev/null \
+ && { RUNNING_BSH=true; export RUNNING_BSH; exec /bin/bsh $0 ${1+"$@"}; }
+unset RUNNING_BSH
+
+# hack around a bug in zsh:
+test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+
+tex -progname=fontinst \&tex ${1+"$@"}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontinst.tlpobj new/tlpkg/tlpobj/fontinst.tlpobj
--- old/tlpkg/tlpobj/fontinst.tlpobj 2019-03-27 02:24:08.000000000 +0100
+++ new/tlpkg/tlpobj/fontinst.tlpobj 2020-01-27 01:40:47.000000000 +0100
@@ -1,6 +1,6 @@
name fontinst
category Package
-revision 50602
+revision 53562
shortdesc Help with installing fonts for TeX and LaTeX
longdesc TeX macros for converting Adobe Font Metric files to TeX metric
longdesc and virtual font format. Fontinst helps mainly with the number
@@ -17,7 +17,7 @@
longdesc such as the pltotf and vptovf programs.
depend fontinst.ARCH
runfiles size=255
- texmf-dist/scripts/texlive/fontinst.sh
+ texmf-dist/scripts/texlive-extra/fontinst.sh
texmf-dist/tex/fontinst/base/bbox.sty
texmf-dist/tex/fontinst/base/cfntinst.sty
texmf-dist/tex/fontinst/base/finstmsc.sty
@@ -88,7 +88,6 @@
texmf-dist/tex/fontinst/smblmtx/unsetnum.mtx
texmf-dist/tex/latex/fontinst/fontdoc.sty
catalogue-ctan /fonts/utilities/fontinst
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font-cvt
catalogue-version 1.933
++++++ fontname.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontname.doc.tlpobj new/tlpkg/tlpobj/fontname.doc.tlpobj
--- old/tlpkg/tlpobj/fontname.doc.tlpobj 2019-02-28 03:37:50.000000000 +0100
+++ new/tlpkg/tlpobj/fontname.doc.tlpobj 2019-12-26 01:55:11.000000000 +0100
@@ -1,6 +1,6 @@
name fontname.doc
category Package
-revision 45930
+revision 53228
shortdesc doc files of fontname
relocated 1
docfiles size=781
++++++ fontname.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/fontname/texfonts.map new/fonts/map/fontname/texfonts.map
--- old/fonts/map/fontname/texfonts.map 2017-11-28 00:19:31.000000000 +0100
+++ new/fonts/map/fontname/texfonts.map 2019-12-25 01:54:09.000000000 +0100
@@ -5,16 +5,20 @@
% @mapfile{
% license = "public domain",
% email = "tex-fonts@tug.org",
-% date = "27nov17",
+% date = "25dec19",
% url = "https://tug.org/fontname/texfonts.map",
% docstring = "Define aliases for font names in TeX."
+% docurl = "http://tug.org/texinfohtml/kpathsea.html#Fontmap",
% supported = "yes",
% }
%
% First column is real filename; second is alias; others are ignored.
% Spaces and/or tabs separate columns.
% Blank lines are ignored.
-% Comments start with the last % on a line and continue to the end of the line.
+% Comments start with the last % or first @c on a line,
+% and continue to the end of the line.
+% If the first word is "include", the second word is used as
+% a filename, and it is searched for and read.
%
% Null bytes will confuse the programs, and a CR at the end of a line is
% removed for DOS's sake, but any other characters will be considered
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontname.tlpobj new/tlpkg/tlpobj/fontname.tlpobj
--- old/tlpkg/tlpobj/fontname.tlpobj 2019-02-28 03:37:52.000000000 +0100
+++ new/tlpkg/tlpobj/fontname.tlpobj 2019-12-26 01:55:12.000000000 +0100
@@ -1,6 +1,6 @@
name fontname
category Package
-revision 45930
+revision 53228
shortdesc Scheme for naming fonts in TeX
relocated 1
longdesc The scheme for assigning names is described (in the
@@ -31,6 +31,5 @@
RELOC/fonts/map/fontname/width.map
RELOC/fonts/map/fontname/yandy.map
catalogue-ctan /info/fontname
-catalogue-date 2016-11-04 04:57:17 +0100
catalogue-license gpl
catalogue-topics font-doc
++++++ fontools.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/afm2afm.1 new/texmf-dist/doc/man/man1/afm2afm.1
--- old/texmf-dist/doc/man/man1/afm2afm.1 2019-04-01 23:07:53.000000000 +0200
+++ new/texmf-dist/doc/man/man1/afm2afm.1 2020-01-29 23:38:26.000000000 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "AFM2AFM 1"
-.TH AFM2AFM 1 "2019-03-14" "fontools" "Marc Penninga"
+.TH AFM2AFM 1 "2020-01-29" "fontools" "Marc Penninga"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -145,10 +145,11 @@
.IP "\fBafm2afm\fR" 8
.IX Item "afm2afm"
[\fB\-help\fR]
-[\fB\-encoding\fR \fIencodingfile\fR]
-[\fB\-kpx\fR \fIkpxfile\fR]
-[\fB\-output\fR \fIoutputfile\fR]
-\&\fBafmfile\fR
+[\fB\-version\fR]
+[\fB\-encoding\fR=\fI<encodingfile>\fR]
+[\fB\-kpx\fR=\fI<kpxfile>\fR]
+[\fB\-output\fR=\fI<outputfile>\fR]
+\&\fB<afmfile>\fR
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
\&\fBafm2afm\fR re-encodes an \fIafm\fR file.
@@ -158,8 +159,8 @@
(potentially much) smaller files.
.PP
Additional kerning pairs can be added to the output file.
-If you don't specify an encoding file,
-the \fIafm\fR file isn't re-encoded;
+If you don't specify an encoding file,
+the \fIafm\fR file isn't re-encoded;
however, all unused (unencoded) data is still pruned.
.PP
The program also generates an entry for a \fIdvips\fR\-style map file,
@@ -171,28 +172,31 @@
.IP "\fB\-help\fR" 4
.IX Item "-help"
Print a short description of the syntax
-.IP "\fB\-encoding\fR \fIencodingfile\fR" 4
-.IX Item "-encoding encodingfile"
-Re-encode to the enconding in \fIencodingfile\fR
-.IP "\fB\-kpx\fR \fIkpxfile\fR" 4
-.IX Item "-kpx kpxfile"
-Read additional kerning pairs from \fIkpxfile\fR and add these to the output.
-This option cannot be used to override values from the input \fIafm\fR file,
+.IP "\fB\-version\fR" 4
+.IX Item "-version"
+Print version number and exit
+.IP "\fB\-encoding\fR=\fI<encodingfile>\fR" 4
+.IX Item "-encoding=<encodingfile>"
+Re-encode to the enconding in \fI<encodingfile>\fR
+.IP "\fB\-kpx\fR=\fI<kpxfile>\fR" 4
+.IX Item "-kpx=<kpxfile>"
+Read additional kerning pairs from \fI<kpxfile>\fR and add these to the output.
+This option cannot be used to override values from the input \fIafm\fR file,
since \fBafm2afm\fR will write both old and new values to the output!
.Sp
-The \fIkpxfile\fR should contain kerning data in standard \fIafm\fR format,
+The \fI<kpxfile>\fR should contain kerning data in standard \fIafm\fR format,
i.e. for each kerning pair there should be a line
.Sp
.Vb 1
\& KPX <amount>
.Ve
.Sp
-All other lines in the \fIkpxfile\fR are ignored.
-.IP "\fB\-output\fR \fIoutputfile\fR" 4
-.IX Item "-output outputfile"
-Write the result to \fIoutputfile\fR instead of \f(CW\*(C`stdout\*(C'\fR.
-.IP "\fBafmfile\fR" 4
-.IX Item "afmfile"
+All other lines in the \fI<kpxfile>\fR are ignored.
+.IP "\fB\-output\fR=\fI<outputfile>\fR" 4
+.IX Item "-output=<outputfile>"
+Write the result to \fI<outputfile>\fR instead of \f(CW\*(C`stdout\*(C'\fR.
+.IP "\fB<afmfile>\fR" 4
+.IX Item "<afmfile>"
The \fIafm\fR file to be re-encoded.
.PP
You may use either one or two dashes before options,
@@ -202,7 +206,7 @@
Marc Penninga
.SH "COPYRIGHT"
.IX Header "COPYRIGHT"
-Copyright (C) 2005\-2013 Marc Penninga.
+Copyright (C) 2005\-2020 Marc Penninga.
.SH "LICENSE"
.IX Header "LICENSE"
This program is free software; you can redistribute it and/or modify
@@ -217,15 +221,12 @@
but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0
See the \s-1GNU\s0 General Public License for more details.
+.SH "VERSION"
+.IX Header "VERSION"
+This document describes \fBafm2afm\fR version 20200129.
.SH "RECENT CHANGES"
.IX Header "RECENT CHANGES"
(See the source code for the rest of the story.)
-.IP "\fI2013\-08\-07\fR" 12
-.IX Item "2013-08-07"
-Added the \fI\-kpx\fR command-line option.
-Replaced all \f(CW\*(C`given/when\*(C'\fR constructions in the source code by \f(CW\*(C`if\*(C'\fR's,
-to avoid warnings about experimental features in Perl 5.18 and later.
-.IP "\fI2012\-02\-01\fR" 12
-.IX Item "2012-02-01"
-Refactored the code; added the \*(L"no re-encoding, only pruning\*(R"
-functionality.
+.IP "\fI2019\-05\-20\fR" 12
+.IX Item "2019-05-20"
+Added the \fI\-version\fR option.
Binary files old/texmf-dist/doc/man/man1/afm2afm.man1.pdf and new/texmf-dist/doc/man/man1/afm2afm.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/autoinst.1 new/texmf-dist/doc/man/man1/autoinst.1
--- old/texmf-dist/doc/man/man1/autoinst.1 2019-04-01 23:07:53.000000000 +0200
+++ new/texmf-dist/doc/man/man1/autoinst.1 2020-01-29 23:38:26.000000000 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,14 +133,14 @@
.\" ========================================================================
.\"
.IX Title "AUTOINST 1"
-.TH AUTOINST 1 "2019-04-01" "fontools" "Marc Penninga"
+.TH AUTOINST 1 "2020-01-29" "fontools" "Marc Penninga"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
.nh
.SH "NAME"
autoinst \- wrapper around the LCDF TypeTools,
-for installing and using OpenType fonts in (La)TeX.
+for installing and using OpenType fonts in LaTeX.
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
\&\fBautoinst\fR [\fIoptions\fR] \fBfontfile(s)\fR
@@ -158,8 +158,9 @@
\&\fBautoinst\fR will create several LaTeX font families:
.RS 2
.IP "\-" 3
-Four text families (with lining and oldstyle digits, each in both tabular
-and proportional variants), all with the following shapes:
+Four text families (with lining and oldstyle digits,
+each in both tabular and proportional variants),
+all with the following shapes:
.RS 3
.RS 2
.IP "\fIn\fR" 8
@@ -171,25 +172,15 @@
.IP "\fIsc\fR" 8
.IX Item "sc"
Small caps
-.IP "\fIsw\fR" 8
-.IX Item "sw"
-Swash
-.IP "\fItl\fR" 8
-.IX Item "tl"
-Titling shape. Meant for all-caps text; letterspacing and the positioning of
-punctuation characters have been adjusted to suit all-caps text.
-(This shape is only generated for the families with lining digits,
-since old-style digits make no sense with all-caps text.)
.IP "\fIscit\fR, \fIscsl\fR" 8
.IX Item "scit, scsl"
Italic and slanted small caps
+.IP "\fIsw\fR" 8
+.IX Item "sw"
+Swash
.IP "\fInw\fR" 8
.IX Item "nw"
-\&\*(L"Upright swash\*(R"; usually roman text with a few \*(L"oldstyle\*(R" ligatures
-like ct, sp and st.
-.IP "\fItlit\fR, \fItlsl\fR" 8
-.IX Item "tlit, tlsl"
-Italic and slanted titling text
+\&\*(L"Upright swash\*(R"
.RE
.RS 2
.RE
@@ -197,12 +188,19 @@
.RS 3
.RE
.IP "\-" 3
-For each T1\-encoded text family: a family of TS1\-encoded symbol fonts,
-in roman, italic and slanted shapes.
+For each T1\-encoded text family:
+a family of TS1\-encoded symbol fonts, in roman, italic and slanted shapes.
.IP "\-" 3
Families with superiors, inferiors, numerators and denominators,
in roman, italic and slanted shapes.
.IP "\-" 3
+Families with \*(L"Titling\*(R" characters;
+these \*(L"... replace the default glyphs
+with corresponding forms designed specifically for titling.
+These may be all-capital and/or larger on the body,
+and adjusted for viewing at larger sizes\*(R"
+(according to the OpenType Specification).
+.IP "\-" 3
An ornament family, also in roman, italic and slanted shapes.
.RE
.RS 2
@@ -236,6 +234,9 @@
.IX Item "Inf"
inferior characters; usually only digits and some punctuation,
normal forms for other characters
+.IP "\fITitl\fR" 8
+.IX Item "Titl"
+Titling characters; see above.
.IP "\fIOrn\fR" 8
.IX Item "Orn"
ornaments
@@ -248,16 +249,25 @@
.PP
The individual fonts are named \fI<FontName>\-<suffix>\-<shape>\-<enc>\fR,
where \fI<suffix>\fR is the same as above (but in lowercase),
-\&\fI<shape>\fR is either empty, \*(L"sc\*(R", \*(L"swash\*(R" or \*(L"titling\*(R",
+\&\fI<shape>\fR is either empty, \*(L"sc\*(R" or \*(L"swash\*(R",
and \fI<enc>\fR is the encoding (also in lowercase).
A typical name in this scheme would be \*(L"FiraSans\-Light\-osf\-sc\-ly1\*(R".
+.SS "About the log file"
+.IX Subsection "About the log file"
+\&\fBautoinst\fR writes some info about what it thinks it's doing to a log file.
+By default this is called \fI<fontfamily>.log\fR,
+but this choice can be overridden by the user;
+see the \fI\-logfile\fR command-line option in \*(L"COMMAND-LINE \s-1OPTIONS\*(R"\s0 below.
+If this log file already exists, \fBautoinst\fR will append its data to the end
+rather than overwrite it.
+Use the \fI\-verbose\fR command-line option to ask for more detailed info.
.SS "A note for MiKTeX users"
.IX Subsection "A note for MiKTeX users"
Automatically installing the fonts into a suitable \s-1TEXMF\s0 tree
-(as \fBautoinst\fR tries to do by default) only works for TeX-installations that use
-the \fIkpathsea\fR library; with TeX distributions that implement their
-own directory searching (such as MiKTeX), \fBautoinst\fR will complain that
-it cannot find the \fIkpsewhich\fR program and move all generated files
+(as \fBautoinst\fR tries to do by default) only works for TeX-installations
+that use the \fIkpathsea\fR library; with TeX distributions that implement
+their own directory searching (such as MiKTeX), \fBautoinst\fR will complain
+that it cannot find the \fIkpsewhich\fR program and move all generated files
into a subdirectory \f(CW\*(C`./autoinst_output/\*(C'\fR of the current directory.
If you use such a TeX distribution, you should either move these files
to their correct destinations by hand, or use the \fI\-target\fR option
@@ -269,11 +279,11 @@
and TeXLive (\fIhttp://tug.org/texlive\fR) don't seem to have this problem.
.SS "A note for MacTeX users"
.IX Subsection "A note for MacTeX users"
-By default, \fBautoinst\fR will try to install all files into the \f(CW$TEXMFLOCAL\fR tree;
-when this directory isn't user-writable, it will use the \f(CW$TEXMFHOME\fR tree instead.
-Unfortunately, MacTeX's version of \f(CW\*(C`updmap\-sys\*(C'\fR
-(which is called behind the scenes) doesn't search in \f(CW$TEXMFHOME\fR,
-and hence MacTeX will not find the new fonts.
+By default, \fBautoinst\fR will try to install all generated files into
+the \f(CW$TEXMFLOCAL\fR tree; when this directory isn't user-writable,
+it will use the \f(CW$TEXMFHOME\fR tree instead. Unfortunately, MacTeX's version
+of \f(CW\*(C`updmap\-sys\*(C'\fR (which is called behind the scenes) doesn't search
+in \f(CW$TEXMFHOME\fR, and hence MacTeX will not find the new fonts.
.PP
To remedy this, either run \fBautoinst\fR as root (so that it can install
everything into \f(CW$TEXMFLOCAL\fR) or manually run \f(CW\*(C`updmap \-user\*(C'\fR to tell
@@ -283,12 +293,21 @@
.SS "Using the fonts in your LaTeX documents"
.IX Subsection "Using the fonts in your LaTeX documents"
\&\fBautoinst\fR generates a style file for using the fonts in LaTeX documents,
-named \fI<FontFamily>.sty\fR. This style file also takes care of loading the
-\&\fIfontenc\fR and \fItextcomp\fR packages.
+named \fI<FontFamily>.sty\fR. This style file also takes care of loading
+the \fIfontenc\fR and \fItextcomp\fR packages.
To use the fonts, add the command \f(CW\*(C`\eusepackage{\f(CI<FontFamily>\f(CW}\*(C'\fR
to the preamble of your document.
.PP
This style file defines a number of options:
+.ie n .IP """mainfont""" 4
+.el .IP "\f(CWmainfont\fR" 4
+.IX Item "mainfont"
+Redefine \f(CW\*(C`\efamilydefault\*(C'\fR to make this font the main font
+for the document.
+This is a no-op if the font is installed as a serif font;
+but if the font is installed as a sanserif or typewriter font,
+this option saves you from having to redefine \f(CW\*(C`\efamilydefault\*(C'\fR
+yourself.
.ie n .IP """lining"", ""oldstyle"", ""tabular"", ""proportional""" 4
.el .IP "\f(CWlining\fR, \f(CWoldstyle\fR, \f(CWtabular\fR, \f(CWproportional\fR" 4
.IX Item "lining, oldstyle, tabular, proportional"
@@ -318,7 +337,7 @@
you have the \fImweights\fR package installed.
.PP
The style file will also try to load the \fIfontaxes\fR package
-(available on \s-1CTAN\s0), which gives easy access to various font shapes and styles.
+(on \s-1CTAN\s0), which gives easy access to various font shapes and styles.
Using the machinery set up by \fIfontaxes\fR, the generated style file
defines a number of commands (which take the text to be typeset as argument)
and declarations (which don't take arguments, but affect all text up to
@@ -334,8 +353,8 @@
.Ve
.PP
In addition, the \f(CW\*(C`\eswshape\*(C'\fR and \f(CW\*(C`\etextsw\*(C'\fR commands are redefined to place
-swash on \fIfontaxes\fR' secondary shape axis (\fIfontaxes\fR places it on the primary
-shape axis) to make them behave properly when nested, so that
+swash on \fIfontaxes\fR' secondary shape axis (\fIfontaxes\fR places it on the
+primary shape axis) to make them behave properly when nested, so that
\&\f(CW\*(C`\eswshape\eupshape\*(C'\fR will give upright swash.
.PP
There are no commands for accessing the numerator and denominator
@@ -352,8 +371,8 @@
To access ornament glyphs, \fBautoinst\fR creates a font-specific encoding file
\&\fI<FontFamily>_orn.enc\fR,
but only if that file doesn't yet exist in the current directory.
-This is a deliberate feature that allows you to provide your own
-encoding vector, e.g. if your fonts use non-standard glyph names for ornaments.
+This is a deliberate feature that allows you to provide your own encoding
+vector, e.g. if your fonts use non-standard glyph names for ornaments.
.PP
These commands are only generated for existing shapes and number styles;
no commands are generated for shapes and styles that don't exist,
@@ -361,40 +380,29 @@
Also these commands are built on top of \fIfontaxes\fR, so if that package
cannot be found, you're limited to using the lower-level commands from
standard \s-1NFSS\s0 (\f(CW\*(C`\efontfamily\*(C'\fR, \f(CW\*(C`\efontseries\*(C'\fR, \f(CW\*(C`\efontshape\*(C'\fR etc.).
-.SS "On the choice of text encoding"
-.IX Subsection "On the choice of text encoding"
-By default, \fBautoinst\fR generates text fonts with \s-1OT1, T1\s0 and \s-1LY1\s0
-encodings, and the generated style files use \s-1LY1\s0 as the default text encoding.
-\&\s-1LY1\s0 has been chosen over T1 because it has some empty slots to accommodate
-the additional ligatures found in many OpenType fonts.
+.PP
+By default, \fBautoinst\fR generates text fonts with \s-1OT1, LY1\s0 and T1
+encodings, and the generated style files use T1 as the default text encoding.
Other encodings can be chosen using the \fI\-encoding\fR option
(see \*(L"COMMAND-LINE \s-1OPTIONS\*(R"\s0 below).
.SS "\s-1NFSS\s0 codes"
.IX Subsection "NFSS codes"
-\&\fI\f(BI\s-1CAVEAT\s0\fI: this functionality was almost completely rewritten in release 2019\-03\-14.
-Older versions tried to map all fonts directly to short \s-1NFSS\s0 codes,
-but often had to invent non-standard codes in order to deal with the
-many different weights and widths that occur in the wild.
-These non-standard \s-1NFSS\s0 codes used by older versions of \f(BIautoinst\fI will no longer
-work for fonts installed with newer versions; for those you'll have to either
-use the long names or stick to the standard \s-1NFSS\s0 codes.
-This change mainly concerns very light or very heavy weights and very condensed widths;
-for more moderate weights and widths, existing code will very probably continue to work.\fR
-.PP
LaTeX's New Font Selection System (\s-1NFSS\s0)
identifies fonts by a combination of family,
series (the concatenation of weight and width), shape and size.
-\&\fBautoinst\fR parses the font's metadata (more precisely: the output of \f(CW\*(C`otfinfo \-\-info\*(C'\fR)
+\&\fBautoinst\fR parses the font's metadata
+(more precisely: the output of \f(CW\*(C`otfinfo \-\-info\*(C'\fR)
to determine these parameters.
-When this fails (usually because the font family contains uncommon weights, widths
-or shapes),
+When this fails (usually because the font family contains uncommon weights,
+widths or shapes),
\&\fBautoinst\fR ends up with different fonts having the \fIsame\fR values
for these font parameters; such fonts cannot be used in \s-1NFSS,\s0
since there's no way distinguish them.
-When \fBautoinst\fR detects such a situation, it will print an error message and abort.
+When \fBautoinst\fR detects such a situation, it will print an error message
+and abort.
If that happens, either rerun \fBautoinst\fR on a smaller set of fonts,
-or add the missing widths, weights and shapes to the tables \f(CW%NFSS_WIDTH\fR,
-\&\f(CW%NFSS_WEIGHT\fR and \f(CW%NFSS_SHAPE\fR, near the top of the source code.
+or add the missing widths, weights and shapes to the tables \f(CW\*(C`NFSS_WIDTH\*(C'\fR,
+\&\f(CW\*(C`NFSS_WEIGHT\*(C'\fR and \f(CW\*(C`NFSS_SHAPE\*(C'\fR, near the top of the source code.
Please also send a bug report (see \s-1AUTHOR\s0 below).
.PP
The mapping of shapes to \s-1NFSS\s0 codes is done using the following table:
@@ -403,55 +411,46 @@
\& SHAPE CODE
\& \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\- \-\-\-\-
\& Roman, Upright n
-\& Italic, Cursive, Kursive it
+\& Italic it
\& Oblique, Slant(ed), Incline(d) sl
.Ve
.PP
-(\fIException:\fR Adobe Silentium Pro contains two Roman shapes; we map the first of these
-to \*(L"n\*(R", for the second one we [ab]use the \*(L"it\*(R" code as this family doesn't contain
-an Italic shape.)
+(\fIException:\fR Adobe Silentium Pro contains two Roman shapes;
+we map the first of these to \*(L"n\*(R", for the second one we (ab)use the \*(L"it\*(R" code
+as this family doesn't contain an Italic shape.)
.PP
-The mapping of weights and widths to \s-1NFSS\s0 code is a more complex, two-step proces.
+The mapping of weights and widths to \s-1NFSS\s0 codes is a more complex,
+two-step proces.
In the first step, all fonts are assigned a \*(L"series\*(R" name that is simply
-the concatenation of its full weight and width (after expanding any abbreviations
-and converting to lowercase).
-So a font with \*(L"Cond\*(R" width and \*(L"Ultra\*(R" weight will be known as \*(L"ultrablackcondensed\*(R".
+the concatenation of its weight and width
+(after expanding any abbreviations and converting to lowercase).
+A font with \*(L"Cond\*(R" width and \*(L"Ultra\*(R" weight will then be known
+as \*(L"ultrablackcondensed\*(R".
.PP
In the second step, \fBautoinst\fR tries to map all combinations of \s-1NFSS\s0 codes
(ul, el, l, sl, m, sb, b, eb and ub for weights;
uc, ec, c, sc, m, sx, x, ex and ux for widths) to actual fonts.
-Of course, not all 81 combinations of these \s-1NFSS\s0 weights and widths will map to
-existing fonts; and conversely it may not be possible to assign every existing font
-a unique code in a sane way (especially on the weight axis, some font families
+Of course, not all 81 combinations of these \s-1NFSS\s0 weights and widths will map
+to existing fonts;
+and conversely it may not be possible to assign every existing font
+a unique code in a sane way (especially for the weights, some font families
offer more choices or finer granularity than \s-1NFSS\s0's codes can handle;
e.g., Fira Sans contains fifteen(!) different weights,
including an additional \*(L"Medium\*(R" weight between Regular and Semibold).
.PP
-This mapping between \s-1NFSS\s0 codes and actual fonts is based on a few principles:
-.IP "\fBUsefulness\fR. As many of the most commonly used \s-1NFSS\s0 codes as possible should point to actual fonts." 4
-.IX Item "Usefulness. As many of the most commonly used NFSS codes as possible should point to actual fonts."
-.PD 0
-.ie n .IP "\fBExactness\fR. Exact matches always win: if the font family contains a Semibold Condensed font, that's what the ""sbc"" code will map to." 4
-.el .IP "\fBExactness\fR. Exact matches always win: if the font family contains a Semibold Condensed font, that's what the ``sbc'' code will map to." 4
-.IX Item "Exactness. Exact matches always win: if the font family contains a Semibold Condensed font, that's what the sbc code will map to."
-.ie n .IP "\fBSanity\fR. A code like ""sb"" will always map to something semi-boldish. If there's no Semibold font it might map to Demibold or Medium, but never to Black. If there is no close match, the \s-1NFSS\s0 code will simply not be used." 4
-.el .IP "\fBSanity\fR. A code like ``sb'' will always map to something semi-boldish. If there's no Semibold font it might map to Demibold or Medium, but never to Black. If there is no close match, the \s-1NFSS\s0 code will simply not be used." 4
-.IX Item "Sanity. A code like sb will always map to something semi-boldish. If there's no Semibold font it might map to Demibold or Medium, but never to Black. If there is no close match, the NFSS code will simply not be used."
-.ie n .IP "\fBWell-ordering\fR. The mapping respects the ordering that is inherent in the \s-1NFSS\s0 codes, so ""sb"" will be heavier than ""m"" and lighter than ""b""." 4
-.el .IP "\fBWell-ordering\fR. The mapping respects the ordering that is inherent in the \s-1NFSS\s0 codes, so ``sb'' will be heavier than ``m'' and lighter than ``b''." 4
-.IX Item "Well-ordering. The mapping respects the ordering that is inherent in the NFSS codes, so sb will be heavier than m and lighter than b."
-.ie n .IP "\fBUniqueness\fR. No two \s-1NFSS\s0 codes will map to the same font (with the exception of ""bx""; since this is so ubiquitous in Latex, \fBautoinst\fR will treat it as a synonym for ""b"" if there is no BoldExtended font)." 4
-.el .IP "\fBUniqueness\fR. No two \s-1NFSS\s0 codes will map to the same font (with the exception of ``bx''; since this is so ubiquitous in Latex, \fBautoinst\fR will treat it as a synonym for ``b'' if there is no BoldExtended font)." 4
-.IX Item "Uniqueness. No two NFSS codes will map to the same font (with the exception of bx; since this is so ubiquitous in Latex, autoinst will treat it as a synonym for b if there is no BoldExtended font)."
-.PD
-.PP
-These rules should ensure that the standard \s-1NFSS\s0 codes (and high-level commands
-such as \f(CW\*(C`\ebfseries\*(C'\fR, which are built on top of these codes) will \*(L"just work\*(R".
-To access specific weights or widths, use the \f(CW\*(C`\efontseries\*(C'\fR command with
-the full series name (i.e., \f(CW\*(C`\efontseries{demibold}\eselectfont\*(C'\fR).
-.PP
-To see exactly which \s-1NFSS\s0 codes map to which fonts, please refer to
-the generated \fIfd\fR files.
+\&\fBautoinst\fR tries hard to ensure that the most common \s-1NFSS\s0 codes
+(and high-level commands such as \f(CW\*(C`\ebfseries\*(C'\fR,
+which are built on top of those codes) will \*(L"just work\*(R".
+.PP
+To see exactly which \s-1NFSS\s0 codes map to which fonts, see the log file
+(pro tip: run \fBautoinst\fR with the \fI\-dryrun\fR option
+to check the chosen mapping beforehand).
+The \fI\-nfssweight\fR and \fI\-nfsswidth\fR command-line options can be used
+to finetune the mapping between \s-1NFSS\s0 codes and fonts.
+.PP
+To access specific weights or widths,
+one can always use the \f(CW\*(C`\efontseries\*(C'\fR command with the full series name
+(i.e., \f(CW\*(C`\efontseries{demibold}\eselectfont\*(C'\fR).
.SH "COMMAND-LINE OPTIONS"
.IX Header "COMMAND-LINE OPTIONS"
\&\fBautoinst\fR tries hard to do The Right Thing (\s-1TM\s0) by default,
@@ -462,96 +461,132 @@
and option names may be shortened to a unique prefix
(e.g., \fB\-encoding\fR may be abbreviated to \fB\-enc\fR or even \fB\-en\fR,
but \fB\-e\fR is ambiguous (it may mean either \fB\-encoding\fR or \fB\-extra\fR)).
+.IP "\fB\-version\fR" 4
+.IX Item "-version"
+Print \fBautoinst\fR's version number and exit.
+.IP "\fB\-help\fR" 4
+.IX Item "-help"
+Print a (relatively) short help text and exit.
.IP "\fB\-dryrun\fR" 4
.IX Item "-dryrun"
-Don't generate any output files; only parse the input fonts and create
-\&\fIautoinst.log\fR showing which fonts would have been generated.
+Don't generate output; just parse input fonts and write
+a log file saying what \fBautoinst\fR would have done.
+.IP "\fB\-logfile\fR=\fIfilename\fR" 4
+.IX Item "-logfile=filename"
+Write log data to \fIfilename\fR instead of the default \fI<fontfamily>.log\fR.
+If the file already exists, \fBautoinst\fR appends to it;
+it doesn't overwrite an existing file.
+.IP "\fB\-verbose\fR" 4
+.IX Item "-verbose"
+Add more details to the log file. Repeat this option for even more info.
.IP "\fB\-encoding\fR=\fIencoding[,encoding]\fR" 4
.IX Item "-encoding=encoding[,encoding]"
-Generate the specified encoding(s) for the text fonts. Multiple text encodings may be
-specified as a comma-separated list: \f(CW\*(C`\-encoding=OT1,T1,LY1\*(C'\fR (without spaces!).
-The generated style file passes these encodings to \fIfontenc\fR in the specified order,
-so the last one will become the default text encoding for your document.
+Generate the specified encoding(s) for the text fonts.
+Multiple encodings may be specified as a comma-separated list:
+\&\f(CW\*(C`\-encoding=OT1,LY1,T1\*(C'\fR (without spaces!).
+The style file passes these to \fIotftotfm\fR in the specified order,
+so the \fIlast\fR one will become the default text encoding of your document.
.Sp
-The default choice of encodings is \*(L"\s-1OT1,T1,LY1\*(R".\s0
+The default choice of encodings is \*(L"\s-1OT1,LY1,T1\*(R".\s0
For each encoding, a file \fI<encoding>.enc\fR (in all \fIlowercase\fR!)
should be somewhere where \fIotftotfm\fR can find it. Suitable encoding files
-for \s-1OT1, T1/TS1, LY1, LGR\s0 and T2A/B/C come with \fBautoinst\fR. (These files are
-called \fIfontools_ot1.enc\fR etc. to avoid name clashes with other packages;
-the \*(L"fontools_\*(R" prefix may be omitted.)
-.IP "\fB\-ts1\fR / \fB\-nots1\fR" 4
-.IX Item "-ts1 / -nots1"
+for \s-1OT1, T1/TS1, LY1, LGR, T2A/B/C\s0 and T3/TS3 come with \fBautoinst\fR.
+(These files are called \fIfontools_ot1.enc\fR etc. to avoid name clashes
+with other packages; the \*(L"fontools_\*(R" prefix may be omitted.)
+.IP "\fB\-ts1\fR/\fB\-nots1\fR" 4
+.IX Item "-ts1/-nots1"
Control the creation of TS1\-encoded fonts. The default is \fB\-ts1\fR
if the text encodings (see \fI\-encoding\fR above) include T1,
\&\fB\-nots1\fR otherwise.
-.IP "\fB\-sanserif\fR" 4
-.IX Item "-sanserif"
-Install the font as a sanserif font, accessed via \f(CW\*(C`\esffamily\*(C'\fR and \f(CW\*(C`\etextsf\*(C'\fR.
-The generated style file redefines \f(CW\*(C`\efamilydefault\*(C'\fR,
-so including it will still make this font the default text font.
-.IP "\fB\-typewriter\fR" 4
-.IX Item "-typewriter"
-Install the font as a typewriter font, accessed via \f(CW\*(C`\ettfamily\*(C'\fR and
-\&\f(CW\*(C`\etexttt\*(C'\fR.
-The generated style file redefines \f(CW\*(C`\efamilydefault\*(C'\fR,
-so including it will still make this font the default text font.
-.IP "\fB\-lining\fR / \fB\-nolining\fR" 4
-.IX Item "-lining / -nolining"
+.IP "\fB\-serif\fR/\fB\-sanserif\fR/\fB\-typewriter\fR" 4
+.IX Item "-serif/-sanserif/-typewriter"
+Install the font as a serif, sanserif or typewriter font, respectively.
+This changes how you access the font in LaTeX:
+with \f(CW\*(C`\ermfamily\*(C'\fR/\f(CW\*(C`\etextrm\*(C'\fR, \f(CW\*(C`\esffamily\*(C'\fR/\f(CW\*(C`\etextsf\*(C'\fR
+or \f(CW\*(C`\ettfamily\*(C'\fR/\f(CW\*(C`\etexttt\*(C'\fR.
+.Sp
+Installing the font as a typewriter font will cause two further changes:
+it will \- by default \- turn off the use of f\-ligatures
+(though this can be overridden with the \fI\-ligatures\fR option),
+and it will disable hyphenation for this font.
+This latter effect cannot be disabled in \fBautoinst\fR;
+if you want typewriter text to be hyphenated, use the \fIhyphenat\fR package.
+.Sp
+If none of these options is specified, \fBautoinst\fR tries to guess:
+if the font's filename contains the string \*(L"mono\*(R"
+or if the field \f(CW\*(C`isFixedPitch\*(C'\fR in the font's \fIpost\fR table is True,
+it will select \fB\-typewriter\fR;
+else if the filename contains \*(L"sans\*(R" it selects \fB\-sanserif\fR;
+and otherwise it will opt for \fB\-serif\fR.
+.IP "\fB\-lining\fR/\fB\-nolining\fR" 4
+.IX Item "-lining/-nolining"
Control the creation of fonts with lining figures. The default is
\&\fB\-lining\fR.
-.IP "\fB\-oldstyle\fR / \fB\-nooldstyle\fR" 4
-.IX Item "-oldstyle / -nooldstyle"
+.IP "\fB\-oldstyle\fR/\fB\-nooldstyle\fR" 4
+.IX Item "-oldstyle/-nooldstyle"
Control the creation of fonts with oldstyle figures. The default is
\&\fB\-oldstyle\fR.
-.IP "\fB\-proportional\fR / \fB\-noproportional\fR" 4
-.IX Item "-proportional / -noproportional"
+.IP "\fB\-proportional\fR/\fB\-noproportional\fR" 4
+.IX Item "-proportional/-noproportional"
Control the creation of fonts with proportional figures. The default is
\&\fB\-proportional\fR.
-.IP "\fB\-tabular\fR / \fB\-notabular\fR" 4
-.IX Item "-tabular / -notabular"
+.IP "\fB\-tabular\fR/\fB\-notabular\fR" 4
+.IX Item "-tabular/-notabular"
Control the creation of fonts with tabular figures. The default is
\&\fB\-tabular\fR.
-.IP "\fB\-smallcaps\fR / \fB\-nosmallcaps\fR" 4
-.IX Item "-smallcaps / -nosmallcaps"
+.IP "\fB\-smallcaps\fR/\fB\-nosmallcaps\fR" 4
+.IX Item "-smallcaps/-nosmallcaps"
Control the creation of small caps fonts. The default is
\&\fB\-smallcaps\fR.
-.IP "\fB\-swash\fR / \fB\-noswash\fR" 4
-.IX Item "-swash / -noswash"
+.IP "\fB\-swash\fR/\fB\-noswash\fR" 4
+.IX Item "-swash/-noswash"
Control the creation of swash fonts. The default is \fB\-swash\fR.
-.IP "\fB\-titling\fR / \fB\-notitling\fR" 4
-.IX Item "-titling / -notitling"
-Control the creation of titling fonts. The default is \fB\-titling\fR.
-.IP "\fB\-superiors\fR / \fB\-nosuperiors\fR" 4
-.IX Item "-superiors / -nosuperiors"
+.IP "\fB\-titling\fR/\fB\-notitling\fR" 4
+.IX Item "-titling/-notitling"
+Control the creation of titling families. The default is \fB\-titling\fR.
+.IP "\fB\-superiors\fR/\fB\-nosuperiors\fR" 4
+.IX Item "-superiors/-nosuperiors"
Control the creation of fonts with superior characters.
The default is \fB\-superiors\fR.
-.IP "\fB\-inferiors\fR=[ \fBnone\fR | \fBauto\fR | \fBsubs\fR | \fBsinf\fR | \fBdnom\fR ]" 4
-.IX Item "-inferiors=[ none | auto | subs | sinf | dnom ]"
+.IP "\fB\-noinferiors\fR" 4
+.IX Item "-noinferiors"
+.PD 0
+.IP "\fB\-inferiors\fR [= \fBnone\fR | \fBauto\fR | \fBsubs\fR | \fBsinf\fR | \fBdnom\fR ]" 4
+.IX Item "-inferiors [= none | auto | subs | sinf | dnom ]"
+.PD
The OpenType standard defines several kinds of digits that might be used
as inferiors or subscripts: \*(L"Subscripts\*(R" (OpenType feature \*(L"subs\*(R"),
\&\*(L"Scientific Inferiors\*(R" (\*(L"sinf\*(R"), and \*(L"Denominators\*(R" (\*(L"dnom\*(R").
This option allows the user to determine which of these styles \fBautoinst\fR
should use for the inferior characters.
Alternatively, the value \*(L"auto\*(R" tells \fBautoinst\fR to use the first value
-in the list \*(L"subs\*(R", \*(L"sinf\*(R" or \*(L"dnom\*(R" that is supported by the fonts.
-The default value is \*(L"none\*(R".
+in \*(L"subs\*(R", \*(L"sinf\*(R" or \*(L"dnom\*(R" that is supported by the font.
+Saying just \fB\-inferiors\fR is equivalent to \fB\-inferiors=auto\fR;
+otherwise the default is \fB\-noinferiors\fR.
.Sp
-\&\fINote that if you specify a style of inferiors that isn't
-present in the font, \f(BIautoinst\fI silently falls back to its default behaviour
-of not creating fonts with inferiors; it doesn't try to substitute one of
-the other features.\fR
-.IP "\fB\-fractions\fR / \fB\-nofractions\fR" 4
-.IX Item "-fractions / -nofractions"
+\&\fIIf you specify a style of inferiors that isn't present in the font,
+\&\f(BIautoinst\fI will fall back to its default behaviour of not creating fonts
+with inferiors at all; it won't try to substitute one of the other styles.\fR
+.IP "\fB\-fractions\fR/\fB\-nofractions\fR" 4
+.IX Item "-fractions/-nofractions"
Control the creation of fonts with numerators and denominators.
The default is \fB\-nofractions\fR.
-.IP "\fB\-ornaments\fR / \fB\-noornaments\fR" 4
-.IX Item "-ornaments / -noornaments"
-Control the creation of ornament fonts. The default is \fB\-ornaments\fR.
-.IP "\fB\-defaultlining\fR / \fB\-defaultoldstyle\fR" 4
-.IX Item "-defaultlining / -defaultoldstyle"
+.IP "\fB\-ligatures\fR/\fB\-noligatures\fR" 4
+.IX Item "-ligatures/-noligatures"
+Some fonts create glyphs for the standard f\-ligatures (ff, fi, fl, ffi, ffl),
+but don't provide a \*(L"liga\*(R" feature to access these.
+This option tells \fBautoinst\fR to add extra \f(CW\*(C`LIGKERN\*(C'\fR rules to
+the generated fonts to enable the use of these ligatures.
+The default is \fB\-ligatures\fR,
+unless the user specified the \fI\-typewriter\fR option.
+.Sp
+Specify \fB\-noligatures\fR to disable the generation of ligatures even for fonts
+that do contain a \*(L"liga\*(R" feature.
+.IP "\fB\-defaultlining\fR/\fB\-defaultoldstyle\fR" 4
+.IX Item "-defaultlining/-defaultoldstyle"
.PD 0
-.IP "\fB\-defaulttabular\fR / \fB\-defaultproportional\fR" 4
-.IX Item "-defaulttabular / -defaultproportional"
+.IP "\fB\-defaulttabular\fR/\fB\-defaultproportional\fR" 4
+.IX Item "-defaulttabular/-defaultproportional"
.PD
Tell \fBautoinst\fR which figure style is the current font family's default
(i.e., which figures you get when you don't specify any OpenType features).
@@ -570,20 +605,36 @@
to the commands for \fIotftotfm\fR to suppress such kerns.
Note that this option leads to very long commands (it adds
one hundred \fI \-\-ligkern\fR options), which may cause problems on some systems.
-.IP "\fB\-mergewidths\fR / \fB\-nomergewidths\fR" 4
-.IX Item "-mergewidths / -nomergewidths"
-Some font families put Condensed, Narrow, Extended etc. fonts in separate families;
-this option tells \fBautoinst\fR to merge those separate families into the main family.
-The default is \fB\-nomergewidths\fR.
+.IP "\fB\-mergewidths\fR/\fB\-nomergewidths\fR, \fB\-mergeweights\fR/\fB\-nomergeweights\fR, \fB\-mergeshapes\fR/\fB\-nomergeshapes\fR" 4
+.IX Item "-mergewidths/-nomergewidths, -mergeweights/-nomergeweights, -mergeshapes/-nomergeshapes"
+Some font put different widths, weights or shapes (e.g., small caps)
+in separate families.
+These options tell \fBautoinst\fR to merge those separate families into
+the main family.
+Since this is usually desirable, they are all enabled by default.
+.Sp
+In earlier versions, \fB\-mergeshapes\fR was called \fB\-mergesmallcaps\fR;
+for reasons of backward compatibility, that option is still supported.
+.IP "\fB\-nfssweight\fR=\fIcode\fR=\fIweight\fR, \fB\-nfsswidth\fR=\fIcode\fR=\fIwidth\fR" 4
+.IX Item "-nfssweight=code=weight, -nfsswidth=code=width"
+Map the \s-1NFSS\s0 code \fIcode\fR to the given weight or width,
+overriding the built-in tables.
+Each of these options may be given multiple times,
+to override more than one \s-1NFSS\s0 code.
+Example: to map the \*(L"ul\*(R" code to the \*(L"Thin\*(R" weight,
+use \f(CW\*(C`\-nfssweight=ul=thin\*(C'\fR.
+To inhibit the use of the \*(L"ul\*(R" code completely,
+use \f(CW\*(C`\-nfssweight=ul=\*(C'\fR.
.IP "\fB\-extra\fR=\fItext\fR" 4
.IX Item "-extra=text"
Append \fItext\fR as extra options to the command lines for \fIotftotfm\fR.
-To prevent \fItext\fR from accidentily being interpreted as options to \fBautoinst\fR,
-it should be properly quoted.
+To prevent \fItext\fR from accidentily being interpreted as options
+to \fBautoinst\fR, it should be properly quoted.
.IP "\fB\-manual\fR" 4
.IX Item "-manual"
-Manual mode; for users who want to post-process the generated files and commands.
-By default, \fBautoinst\fR immediately executes all \fIotftotfm\fR commands it generates;
+Manual mode; for users who want to post-process the generated files
+and commands. By default, \fBautoinst\fR immediately executes all
+\&\fIotftotfm\fR commands it generates;
in manual mode, these are instead written to a file \fIautoinst.bat\fR.
Furthermore it tells \fIotftotfm\fR to generate human readable (and editable)
\&\fIpl/vpl\fR files instead of the default \fItfm/vf\fR ones,
@@ -593,20 +644,20 @@
When using this option, you need to execute the following manual steps after
\&\fBautoinst\fR has finished:
.RS 4
-.IP "\fB\-\fR run \fIpltotf\fR and \fIvptovf\fR on the generated \fIpl\fR and \fIvf\fR files, to convert them to \fItfm/vf\fR format;" 2
+.IP "\- run \fIpltotf\fR and \fIvptovf\fR on the generated \fIpl\fR and \fIvf\fR files, to convert them to \fItfm/vf\fR format;" 2
.IX Item "- run pltotf and vptovf on the generated pl and vf files, to convert them to tfm/vf format;"
.PD 0
-.IP "\fB\-\fR move all generated files to a proper \s-1TEXMF\s0 tree, and, if necessary, update the filename database;" 2
+.IP "\- move all generated files to a proper \s-1TEXMF\s0 tree, and, if necessary, update the filename database;" 2
.IX Item "- move all generated files to a proper TEXMF tree, and, if necessary, update the filename database;"
-.ie n .IP "\fB\-\fR tell TeX about the new \fImap\fR file (usually by running ""updmap"" or similar)." 2
-.el .IP "\fB\-\fR tell TeX about the new \fImap\fR file (usually by running \f(CWupdmap\fR or similar)." 2
+.ie n .IP "\- tell TeX about the new \fImap\fR file (usually by running ""updmap"" or similar)." 2
+.el .IP "\- tell TeX about the new \fImap\fR file (usually by running \f(CWupdmap\fR or similar)." 2
.IX Item "- tell TeX about the new map file (usually by running updmap or similar)."
.RE
.RS 4
.PD
.Sp
-Note that some options (\fI\-target\fR, \fI\-vendor\fR and \fI\-typeface\fR, \fI\-[no]updmap\fR)
-are meaningless, and hence ignored, in manual mode.
+Note that some options (\fI\-target\fR, \fI\-vendor\fR and \fI\-typeface\fR,
+\&\fI\-[no]updmap\fR) are meaningless, and hence ignored, in manual mode.
.RE
.IP "\fB\-target\fR=\fI\s-1DIRECTORY\s0\fR" 4
.IX Item "-target=DIRECTORY"
@@ -619,7 +670,15 @@
it will print a warning message and put all files into the subdirectory
\&\f(CW\*(C`./autoinst_output/\*(C'\fR of the current directory.
It's then up to the user to move the generated files to a better location
-and update all relevant databases (usually by calling \fItexhash\fR and \fIupdmap\fR).
+and update all relevant databases
+(usually by calling \fItexhash\fR and \fIupdmap\fR).
+.Sp
+\&\fI\s-1WARNING:\s0\fR using this option may interfere with \fIkpathsea\fR and \fIupdmap\fR
+(especially when the chosen directory is outside the standard \s-1TEXMF\s0 trees),
+so using \fI\-target\fR will disable the automatic call to \fIupdmap\fR
+(as if \fI\-noupdmap\fR had been given).
+It is up to the user to manually update all databases (i.e., by calling
+\&\fItexhash\fR and \fIupdmap\fR or similar).
.IP "\fB\-vendor\fR=\fI\s-1VENDOR\s0\fR" 4
.IX Item "-vendor=VENDOR"
.PD 0
@@ -633,8 +692,8 @@
.Sp
Note that these options change \fIonly\fR directory names,
not the names of any generated files.
-.IP "\fB\-updmap\fR / \fB\-noupdmap\fR" 4
-.IX Item "-updmap / -noupdmap"
+.IP "\fB\-updmap\fR/\fB\-noupdmap\fR" 4
+.IX Item "-updmap/-noupdmap"
Control whether or not \fIupdmap\fR is called after the last call to \fIotftotfm\fR.
The default is \fB\-updmap\fR.
.SH "SEE ALSO"
@@ -646,25 +705,26 @@
For Windows, try ActivePerl (\fIhttp://www.activestate.com\fR)
or Strawberry Perl (\fIhttp://strawberryperl.com\fR).
.PP
-\&\fBXeTeX\fR (\fIhttp://www.tug.org/xetex\fR) and \fBLuaTeX\fR (\fIhttp://www.luatex.org\fR)
+\&\fBXeTeX\fR (\fIhttp://www.tug.org/xetex\fR) and
+\&\fBLuaTeX\fR (\fIhttp://www.luatex.org\fR)
are Unicode-aware TeX engines that can use OpenType fonts directly,
without any (La)TeX\-specific support files.
.PP
The \fBFontPro\fR project (\fIhttps://github.com/sebschub/FontPro\fR)
-offers very complete LaTeX support (even for typesetting maths) for Adobe's
-Minion Pro, Myriad Pro and Cronos Pro font families.
+offers very complete LaTeX support (even for typesetting maths) for
+Adobe's Minion Pro, Myriad Pro and Cronos Pro font families.
.SH "AUTHOR"
.IX Header "AUTHOR"
Marc Penninga (\fImarcpenninga@gmail.com\fR)
.PP
When sending a bug report, please give as much relevant information as
-possible.
-If you see any error messages
-(whether from \fBautoinst\fR itself, from the \fI\s-1LCDF\s0 TypeTools\fR, from Perl
-or from the \s-1OS\s0), include these \fIverbatim\fR; don't paraphrase.
+possible; this usually includes (but may not be limited to) the log file
+(please add the \fI\-verbose\fR command-line option, for extra info).
+If you see any error messages, please include these \fIverbatim\fR;
+don't paraphase.
.SH "COPYRIGHT"
.IX Header "COPYRIGHT"
-Copyright (C) 2005\-2019 Marc Penninga.
+Copyright (C) 2005\-2020 Marc Penninga.
.SH "LICENSE"
.IX Header "LICENSE"
This program is free software; you can redistribute it and/or modify
@@ -679,9 +739,105 @@
but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0 See the
\&\s-1GNU\s0 General Public License for more details.
+.SH "VERSION"
+.IX Header "VERSION"
+This document describes \fBautoinst\fR version 20200129.
.SH "RECENT CHANGES"
.IX Header "RECENT CHANGES"
(See the source for the full story, all the way back to 2005.)
+.IP "\fI2020\-01\-29\fR" 12
+.IX Item "2020-01-29"
+Don't create empty subdirectories in the target \s-1TEXMF\s0 tree.
+.IP "\fI2019\-11\-18\fR" 12
+.IX Item "2019-11-18"
+Fine-tuned calling of \fIkpsewhich\fR on Windows (patch by Akira Kakuto).
+The font info parsing now also recognises numerical weights, e.g. in Museo.
+.IP "\fI2019\-10\-29\fR" 12
+.IX Item "2019-10-29"
+The generated style files now use T1 as the default text encoding.
+.IP "\fI2019\-10\-27\fR" 12
+.IX Item "2019-10-27"
+The mapping in \fIfd\fR files between font series and standard \s-1NFSS\s0 attributes
+now uses the new \fIalias\fR function instead of \fIssub\fR (based on code by
+Frank Mittelbach).
+The way \fIotftotfm\fR is called was changed to work around a Perl/Windows bug;
+the old way might cause the process to hang.
+Using the \fI\-target\fR option now implies \fI\-noupdmap\fR, since choosing
+a non-standard target directory interferes with kpathsea/texhash and updmap.
+.IP "\fI2019\-10\-01\fR" 12
+.IX Item "2019-10-01"
+Handle \fI\-target\fR directories with spaces in their path names.
+Tweaked messages and logs to make them more useful to the user.
+.IP "\fI2019\-07\-12\fR" 12
+.IX Item "2019-07-12"
+Replaced single quotes in calls to \fIotfinfo\fR with double quotes,
+as they caused problems on Windows 10.
+.IP "\fI2019\-06\-25\fR" 12
+.IX Item "2019-06-25"
+.RS 12
+.PD 0
+.IP "\-" 3
+.PD
+Added the \fI\-mergeweights\fR and \fI\-mergeshapes\fR options,
+and improved \fI\-mergewidths\fR.
+.IP "\-" 3
+Improved the parsing of fonts' widths and weights.
+.IP "\-" 3
+Improved the mapping of widths and weights to \s-1NFSS\s0 codes.
+.IP "\-" 3
+Changed logging code so that that results of font info parsing
+are always logged, even (especially!) when parsing fails.
+.IP "\-" 3
+Added a warning when installing fonts from multiple families.
+.IP "\-" 3
+Added simple recognition for sanserif and typewriter fonts.
+.IP "\-" 3
+Fixed error checking after calls to \fIotfinfo\fR
+(\fBautoinst\fR previously only checked whether \f(CW\*(C`fork()\*(C'\fR was successful,
+not whether the actual call to \fIotfinfo\fR worked).
+.IP "\-" 3
+Fixed a bug in the \fI\-inferiors\fR option;
+when used without a (supposedly optional) value,
+it would silently gobble the next option instead.
+.RE
+.RS 12
+.RE
+.IP "\fI2019\-05\-22\fR" 12
+.IX Item "2019-05-22"
+Added the \fImainfont\fR option to the generated \fIsty\fR files.
+Prevented hyphenation for typewriter fonts
+(added \f(CW\*(C`\ehyphenchar\efont=\-1\*(C'\fR to the \f(CW\*(C`\eDeclareFontFamily\*(C'\fR declarations).
+Added the \fI\-version\fR option.
+.IP "\fI2019\-05\-17\fR" 12
+.IX Item "2019-05-17"
+Changed the way the \fI\-ligatures\fR option works:
+\&\fI\-ligatures\fR enables f\-ligatures (even without a \*(L"liga\*(R" feature),
+\&\fI\-noligatures\fR now disables f\-ligatures (overriding a \*(L"liga\*(R" feature).
+.IP "\fI2019\-05\-11\fR" 12
+.IX Item "2019-05-11"
+Separate small caps families are now also recognised when the family name
+ends with \*(L"\s-1SC\*(R"\s0 (previously \fBautoinst\fR only looked for \*(L"SmallCaps\*(R").
+.IP "\fI2019\-04\-22\fR" 12
+.IX Item "2019-04-22"
+Fixed a bug in the generation of swash shapes.
+.IP "\fI2019\-04\-19\fR" 12
+.IX Item "2019-04-19"
+Fixed a bug that affected \-mergesmallcaps with multiple encodings.
+.IP "\fI2019\-04\-16\fR" 12
+.IX Item "2019-04-16"
+Added the <\-mergesmallcaps> option, to handle cases where
+the small caps fonts are in separate font families.
+Titling shape is now treated as a separate family instead of a distinct shape;
+it is generated only for fonts with the 'titl' feature.
+Only add f\-ligatures to fonts when explicitly asked to (\fI\-ligatures\fR).
+.IP "\fI2019\-04\-11\fR" 12
+.IX Item "2019-04-11"
+Tried to make the log file more relevant.
+Added the \fI\-nfssweight\fR and \fI\-nfsswidth\fR options,
+and finetuned the automatic mapping between fonts and \s-1NFSS\s0 codes.
+Changed the name of the generated log file to \fI<fontfamily>.log\fR,
+and revived the \fI\-logfile\fR option to allow overriding this choice.
+Made \fI\-mergewidths\fR the default (instead of \fI\-nomergewidths\fR).
.IP "\fI2019\-04\-01\fR" 12
.IX Item "2019-04-01"
Fine-tuned the decision where to put generated files;
@@ -692,19 +848,15 @@
put all generated files into a subdirectory \f(CW\*(C`./autoinst_output/\*(C'\fR
instead of all over the current working directory.
.Sp
-Added to \*(L"auto\*(R" value to the \fIinferiors\fR option,
+Added \*(L"auto\*(R" value to the \fIinferiors\fR option,
to tell \fBautoinst\fR to use whatever inferior characters are available.
-.IP "\fI2019\-03\-14\fR (never released to \s-1CTAN\s0)" 12
-.IX Item "2019-03-14 (never released to CTAN)"
+.IP "\fI2019\-03\-14\fR" 12
+.IX Item "2019-03-14"
Overhauled the mapping of fonts (more specifically of weights and widths;
-the mapping of shapes didn't change) to \s-1NFSS\s0 codes. Instead of inventing our own codes
-to deal with every possible weight and width out there, we now create \*(L"long\*(R" codes
-based on the names in the font metadata. Then we add \*(L"ssub\*(R" rules to the \fIfd\fR
-files to map the standard \s-1NFSS\s0 codes to our fancy names (see the section \fB\s-1NFSS\s0 codes\fR;
+the mapping of shapes didn't change) to \s-1NFSS\s0 codes.
+Instead of inventing our own codes to deal with every possible weight
+and width out there, we now create \*(L"long\*(R" codes based on the names
+in the font metadata.
+Then we add \*(L"ssub\*(R" rules to the \fIfd\fR files to map the standard \s-1NFSS\s0 codes
+to our fancy names (see the section \fB\s-1NFSS\s0 codes\fR;
based on discussions with Frank Mittelbach and Bob Tennent).
-.IP "\fI2018\-08\-10\fR" 12
-.IX Item "2018-08-10"
-Added encoding files for \s-1LGR\s0 and T2A/B/C to \fIfontools\fR.
-.IP "\fI2018\-03\-26\fR" 12
-.IX Item "2018-03-26"
-Added the \fI\-(no)mergewidths\fR option; tried to improve the documentation.
Binary files old/texmf-dist/doc/man/man1/autoinst.man1.pdf and new/texmf-dist/doc/man/man1/autoinst.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ot2kpx.1 new/texmf-dist/doc/man/man1/ot2kpx.1
--- old/texmf-dist/doc/man/man1/ot2kpx.1 2019-04-01 23:07:53.000000000 +0200
+++ new/texmf-dist/doc/man/man1/ot2kpx.1 2020-01-29 23:38:26.000000000 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "OT2KPX 1"
-.TH OT2KPX 1 "2019-03-14" "fontools" "Marc Penninga"
+.TH OT2KPX 1 "2020-01-29" "fontools" "Marc Penninga"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -142,18 +142,31 @@
ot2kpx \- extract kerning information from OpenType fonts
.SH "SYNOPSIS"
.IX Header "SYNOPSIS"
-.IP "\fBot2kpx\fR" 8
-.IX Item "ot2kpx"
-\&\fBfontfile\fR
+\&\fBot2kpx\fR [ \fI\-afm\fR | \fI\-kpx\fR | \fI\-lua\fR ] \fB<fontfile>\fR
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
-\&\fBot2kpx\fR extract the kerning data from OpenType fonts (both \fIotf\fR
-and \fIttf\fR formats) and prints it (in \fIafm\fR format) to \f(CW\*(C`stdout\*(C'\fR.
+\&\fBot2kpx\fR extract the kerning data from OpenType fonts and prints it
+to \f(CW\*(C`stdout\*(C'\fR, either in Adobe's \s-1KPX\s0 format (for adding to an \fIafm\fR file)
+or as a Luatex custom feature, for use with the \f(CW\*(C`\edirectlua\*(C'\fR command.
.SH "OPTIONS AND ARGUMENTS"
.IX Header "OPTIONS AND ARGUMENTS"
-.IP "\fBfontfile\fR" 4
-.IX Item "fontfile"
-The OpenType font (in either \fIotf\fR or \fIttf\fR format).
+.IP "\fB\-help\fR" 4
+.IX Item "-help"
+Print a short help text and exit.
+.IP "\fB\-version\fR" 4
+.IX Item "-version"
+Print \fBot2kpx\fR's version and exit.
+.IP "\fB\-afm\fR, \fB\-kpx\fR" 4
+.IX Item "-afm, -kpx"
+Output the kerning data in Adobe's \s-1KPX\s0 format, as used in \fIafm\fR files.
+This is the default output format.
+.IP "\fB\-lua\fR" 4
+.IX Item "-lua"
+Output the kerning data as a Luatex custom font feature,
+to be included in a \f(CW\*(C`\edirectlua\*(C'\fR command.
+.IP "\fB<fontfile>\fR" 4
+.IX Item "<fontfile>"
+The OpenType font (both \fIotf\fR and \fIttf\fR format are supported).
.SH "RESTRICTIONS"
.IX Header "RESTRICTIONS"
.IP "\fB\-\fR" 4
@@ -198,7 +211,7 @@
Marc Penninga
.SH "COPYRIGHT"
.IX Header "COPYRIGHT"
-Copyright (C) 2005\-2013 Marc Penninga.
+Copyright (C) 2005\-2020 Marc Penninga.
.SH "LICENSE"
.IX Header "LICENSE"
This program is free software; you can redistribute it and/or modify
@@ -213,14 +226,16 @@
but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of
\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS FOR A PARTICULAR PURPOSE.\s0
See the \s-1GNU\s0 General Public License for more details.
+.SH "VERSION"
+.IX Header "VERSION"
+This document describes \fBot2kpx\fR version 20200129.
.SH "RECENT CHANGES"
.IX Header "RECENT CHANGES"
(See the source code for the rest of the story.)
-.IP "\fI2013\-08\-07\fR" 12
-.IX Item "2013-08-07"
-Replaced all \f(CW\*(C`given/when\*(C'\fR constructions in the source code by \f(CW\*(C`if\*(C'\fR's,
-to avoid warnings about experimental features in Perl 5.18 and later.
-.IP "\fI2012\-02\-01\fR" 12
-.IX Item "2012-02-01"
-Refactored the code, and fixed a number of bugs in the process.
-Updated the documentation.
+.IP "\fI2019\-05\-20\fR" 12
+.IX Item "2019-05-20"
+Added the \fI\-version\fR option.
+.IP "\fI2019\-04\-15\fR" 12
+.IX Item "2019-04-15"
+Added the \fI\-lua\fR command-line option to get output in Luatex's
+custom feature format.
Binary files old/texmf-dist/doc/man/man1/ot2kpx.man1.pdf and new/texmf-dist/doc/man/man1/ot2kpx.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/fontools/README new/texmf-dist/doc/support/fontools/README
--- old/texmf-dist/doc/support/fontools/README 2019-04-01 23:07:53.000000000 +0200
+++ new/texmf-dist/doc/support/fontools/README 2020-01-29 23:38:26.000000000 +0100
@@ -1,68 +1,83 @@
-=- FONTOOLS -=-
-
+
This package provides tools to simplify using OpenType fonts with LaTeX.
-Currently, this bundle contains the following programs:
+By far the most important program in this bundle is autoinst:
+
+ AUTOINST - a wrapper script around Eddie Kohler's LCDF TypeTools.
+ Autoinst aims to automate the installation of OpenType fonts in LaTeX
+ by calling the LCDF TypeTools (with the correct options) for all fonts
+ you wish to install, and generating the necessary .fd and .sty files.
-AUTOINST - a wrapper script around Eddie Kohler's LCDF TypeTools.
- Autoinst aims to automate the installation of OpenType fonts in LaTeX
- by calling the LCDF TypeTools (with the correct options) for all fonts
- you wish to install, and by generating the necessary .fd and .sty files.
+In addition, this bundle contains a few other, less important utilities:
-AFM2AFM - re-encode .afm files
+ AFM2AFM - re-encode .afm files
-OT2KPX - extract kerning pairs from OpenType fonts.
+ OT2KPX - extract kerning pairs from OpenType fonts
+
+ SPLITTTC - split an OpenType Collection file (ttc or otc) into
+ individual fonts
PREREQUISITES
--------------
+=============
Perl
- The Fontools are written in Perl; any version since v5.10.1 should work.
- Perl is usually installed on Linux and Unix systems;
- for Windows, try ActivePerl (http://www.activestate.com)
+ The Fontools are written in Perl; any remotely recent version should work.
+ Perl is usually installed on Linux and Unix systems;
+ for Windows, try ActivePerl (http://www.activestate.com)
or Strawberry Perl (http://strawberryperl.com).
LCDF TypeTools
- Of course, Autoinst needs the LCDF TypeTools;
+ Of course, Autoinst needs the LCDF TypeTools;
they should be installed in a directory on your PATH.
Kpathsea
Automatically installing the fonts into a suitable TEXMF tree
- (as Autoinst does by default) requires a TeX-installation that uses
- the kpathsea library; with TeX distributions that implement their
- own directory searching (such as MiKTeX), Autoinst will complain that
+ (as Autoinst does by default) requires a TeX-installation that uses
+ the kpathsea library; with TeX distributions that implement their
+ own directory searching (such as MiKTeX), Autoinst will complain that
it cannot find the kpsewhich program and install all generated files
- into subdirectories of the current directory.
-
- If you use such a TeX distribution, either move these files to their
+ into subdirectories of the current directory.
+
+ If you use such a TeX distribution, either move these files to their
destinations by hand, or use the -target command line option
(please see the manual for more information).
-Other
- The encoding files in the "share" directory should be installed
- in a standard location where otftotfm can find them.
+
+Installation
+------------
+When installing manually, the encoding files in the "share/" directory
+should be moved to a "standard" location where otftotfm can find them.
+What this location is depends on your TeX installation;
+in TeXLive, it should be $TEXMFLOCAL/fonts/enc/dvips/fontools/ or,
+if you don't have write permissions in $TEXMFLOCAL,
+$TEXMFHOME/fonts/enc/dvips/fontools/.
+
+The scripts in the "bin/" directory should be placed in a directory
+on your PATH (or else you have to call them with their full path name).
+
+Of course, when using a package manager (such as tlmgr) to do
+the installation, all files will automatically be put in the right
+location.
DISCLAIMER
-----------
+==========
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.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
LICENSE & COPYRIGHT
--------------------
-
-This software is copyright (C) 2005-2019 Marc Penninga. It is released under
-the terms of the GNU General Public Licence; see the file GPLv2.txt for
-the license conditions.
-
+===================
- Marc Penninga, 2019/04/01
+This software is copyright (C) 2005-2020 Marc Penninga.
+It is released under the terms of the GNU General Public Licence;
+see the file GPLv2.txt for the license conditions.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/fontools/splitttc new/texmf-dist/doc/support/fontools/splitttc
--- old/texmf-dist/doc/support/fontools/splitttc 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/fontools/splitttc 2020-01-29 23:38:26.000000000 +0100
@@ -0,0 +1,271 @@
+#! /usr/bin/env perl
+
+=begin COPYRIGHT
+
+----------------------------------------------------------------------------
+
+ Copyright (C) 2020 Marc Penninga.
+
+ 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 2
+ 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, write to
+ Free Software Foundation, Inc.,
+ 59 Temple Place,
+ Suite 330,
+ Boston, MA 02111-1307,
+ USA
+
+----------------------------------------------------------------------------
+
+=end COPYRIGHT
+
+=cut
+
+use strict;
+use warnings;
+
+use File::Basename;
+use Getopt::Long;
+use Pod::Usage;
+
+my $VERSION = "20200129";
+
+parse_commandline();
+
+use constant {
+ SIZEOF_OFFSET_TABLE => 12,
+ SIZEOF_TABLE_RECORD => 16,
+};
+
+my $filename_in = $ARGV[0];
+my ($basename_out, undef, undef) = fileparse($filename_in, qw(.ttc .otc));
+my $output_prefix = $ARGV{output_prefix} // $basename_out;
+
+open my $fh, '<:raw', $filename_in
+ or die "[ERROR] cannot open $filename_in: $!";
+my $ttc = do { local $/; <$fh> };
+close $fh
+ or die "[ERROR] something went wrong when closing $filename_in: $!";
+
+# unpack TTC header; we ignore the DSIG fields in version 2.0 headers
+my ($ttc_tag, $major_version, $minor_version, $num_fonts)
+ = unpack 'A4 nnN', $ttc;
+my $ttc_header_version = sprintf "%d.%d", $major_version, $minor_version;
+die "$ARGV[0] is not an OpenType Collection file" if $ttc_tag ne 'ttcf';
+die "$ARGV[0]: unknown TTC Header Version $ttc_header_version"
+ if $ttc_header_version !~ m/\A [12] [.] 0 \z/xms;
+
+my $offsets_template = sprintf "\@%d N%d", SIZEOF_OFFSET_TABLE, $num_fonts;
+my @offsets_of_offset_table = unpack $offsets_template, $ttc;
+
+# collect the data for each font and write to separate file
+for my $i_font (1..$num_fonts) {
+ my $offset_of_offset_table = $offsets_of_offset_table[$i_font - 1];
+ my $offset_table
+ = substr $ttc, $offset_of_offset_table, SIZEOF_OFFSET_TABLE;
+
+ # unpack relevant fields from Offset Table
+ my ($sfnt_version, $num_tables) = unpack 'a4 n', $offset_table;
+ my $file_ext = $sfnt_version eq 'OTTO' ? 'otf'
+ : $sfnt_version eq "\x00\x01\x00\x00" ? 'ttf'
+ : die
+ ;
+ my $filename_out = sprintf "%s%d.%s", $output_prefix, $i_font, $file_ext;
+
+ # unpack Table Records and create list of tables
+ my $table_records
+ = substr $ttc,
+ $offset_of_offset_table + SIZEOF_OFFSET_TABLE,
+ $num_tables * SIZEOF_TABLE_RECORD,
+ ;
+ my $table_records_template
+ = sprintf "(a%d)%d", SIZEOF_TABLE_RECORD, $num_tables;
+ my @table_records = unpack $table_records_template, $table_records;
+ for my $table_record (@table_records) {
+ my ($table_tag, $checksum, $offset, $length)
+ = unpack 'a4 N3', $table_record;
+ my $padding = "\x00" x ((4 - ($length % 4)) % 4);
+ my $table = substr($ttc, $offset, $length) . $padding;
+ $table_record = {
+ table_tag => $table_tag,
+ checksum => $checksum,
+ offset => $offset,
+ length => $length,
+ table => $table,
+ };
+ }
+
+ my $file_pos = SIZEOF_OFFSET_TABLE + length $table_records;
+ for my $table_record (@table_records) {
+ $table_record->{offset} = $file_pos;
+ $file_pos += length $table_record->{table};
+ }
+
+ open my $filehandle_out, '>:raw', $filename_out
+ or die "[ERROR] Cannot create $filename_out: $!";
+ print {$filehandle_out} $offset_table;
+ for my $table_record (@table_records) {
+ print {$filehandle_out}
+ pack 'a4 N3',
+ @{$table_record}{ qw(table_tag checksum offset length) }
+ ;
+ }
+ for my $table_record (@table_records) {
+ print {$filehandle_out} $table_record->{table};
+ }
+ close $filehandle_out
+ or die "[ERROR] something went wrong when closing $filename_out: $!";
+}
+
+#-----------------------------------------------------------------------
+# Read the command-line options
+#-----------------------------------------------------------------------
+sub parse_commandline {
+ Getopt::Long::GetOptions(
+ 'help|?' => sub { pod2usage(-verbose => 1) },
+ 'version' => sub { print "$VERSION\n"; exit },
+ 'output-prefix=s' => \$ARGV{output_prefix},
+ )
+ or pod2usage(-verbose => 0);
+
+ pod2usage(-verbose => 0) if @ARGV != 1;
+
+ return;
+}
+
+
+__END__
+
+
+############################################################################
+
+ To create the documentation:
+
+ pod2man --center="Marc Penninga" --release="fontools" --section=1 \
+ splitttc - | groff -Tps -man - | ps2pdf - splitttc.pdf
+
+=pod
+
+=head1 NAME
+
+splitttc - split an OpenType Collection F<ttc> or F<otc> file
+
+=head1 SYNOPSIS
+
+=over 8
+
+=item B<splitttc>
+[B<-help>]
+[B<-version>]
+[B<-output-prefix>=I<< <prefix> >>]
+B<< <ttc-or-otc-file> >>
+
+=back
+
+
+=head1 DESCRIPTION
+
+B<splitttc> splits an OpenType Collection file.
+
+The OpenType specification allows for multiple fonts to be contained
+in the same file. This might be advantageous if fonts share a lot of data,
+as this then needs to be stored only once. Probably the best known
+example of an OpenType Collection file is Microsoft's Cambria,
+where the Regular weight shares a file with the Math font.
+
+Unfortunately some tools (including Eddie Kohler's LCDF TypeTools)
+cannot handle such OpenType Collections; they only work for individual fonts.
+B<splitttc> takes an OpenType Collection file
+and splits it into its constituent parts.
+
+=head1 OPTIONS AND ARGUMENTS
+
+=over 4
+
+=item B<-help>
+
+Print a short description of the syntax and exit.
+
+=item B<-version>
+
+Print version number and exit.
+
+=item B<-output-prefix>=I<< <prefix> >>
+
+Write the individual fonts to files named I<< <prefix> >>1.ttf,
+I<< <prefix> >>2.ttf etc.
+The default is to take the prefix from the filename of the input file.
+
+=item B<< <ttc-or-otc-file> >>
+
+The F<ttc> or F<otc> file to be split.
+
+=back
+
+You may use either one or two dashes before options,
+and option names may be shortened to a unique prefix.
+
+
+=head1 AUTHOR
+
+Marc Penninga
+
+
+=head1 COPYRIGHT
+
+Copyright (C) 2020 Marc Penninga.
+
+
+=head1 LICENSE
+
+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 2 of the License,
+or (at your option) any later version.
+A copy of the GNU General Public License is included with B<splitttc>;
+see the file F.
+
+
+=head1 DISCLAIMER
+
+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.
+
+
+=head1 VERSION
+
+This document describes B<splitttc> version 20200129.
+
+
+=head1 RECENT CHANGES
+
+(See the source code for the rest of the story.)
+
+=over 12
+
+=item I<2019-06-25>
+
+First release.
+
+=back
+
+
+=begin Really_old_history
+
+=over 12
+
+=back
+
+=cut
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontools.doc.tlpobj new/tlpkg/tlpobj/fontools.doc.tlpobj
--- old/tlpkg/tlpobj/fontools.doc.tlpobj 2019-04-02 01:24:44.000000000 +0200
+++ new/tlpkg/tlpobj/fontools.doc.tlpobj 2020-01-30 01:55:21.000000000 +0100
@@ -1,8 +1,8 @@
name fontools.doc
category Package
-revision 50695
+revision 53593
shortdesc doc files of fontools
-docfiles size=50
+docfiles size=55
texmf-dist/doc/man/man1/afm2afm.1
texmf-dist/doc/man/man1/afm2afm.man1.pdf
texmf-dist/doc/man/man1/autoinst.1
@@ -11,3 +11,4 @@
texmf-dist/doc/man/man1/ot2kpx.man1.pdf
texmf-dist/doc/support/fontools/GPLv2.txt
texmf-dist/doc/support/fontools/README
+ texmf-dist/doc/support/fontools/splitttc
++++++ fontools.tar.xz ++++++
++++ 3886 lines of diff (skipped)
++++++ fonts-tlwg.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fonts-tlwg.doc.tlpobj new/tlpkg/tlpobj/fonts-tlwg.doc.tlpobj
--- old/tlpkg/tlpobj/fonts-tlwg.doc.tlpobj 2019-02-28 03:38:29.000000000 +0100
+++ new/tlpkg/tlpobj/fonts-tlwg.doc.tlpobj 2020-03-24 01:58:37.000000000 +0100
@@ -1,6 +1,6 @@
name fonts-tlwg.doc
category Package
-revision 49085
+revision 54512
shortdesc doc files of fonts-tlwg
relocated 1
docfiles size=17
++++++ fonts-tlwg.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fonts-tlwg.tlpobj new/tlpkg/tlpobj/fonts-tlwg.tlpobj
--- old/tlpkg/tlpobj/fonts-tlwg.tlpobj 2019-02-28 03:38:30.000000000 +0100
+++ new/tlpkg/tlpobj/fonts-tlwg.tlpobj 2020-03-24 01:58:38.000000000 +0100
@@ -1,6 +1,6 @@
name fonts-tlwg
category Package
-revision 49085
+revision 54512
shortdesc Thai fonts for LaTeX from TLWG
relocated 1
longdesc A collection of free Thai fonts, supplied as FontForge sources,
@@ -341,7 +341,6 @@
catalogue-contact-repository https://github.com/tlwg/fonts-tlwg
catalogue-contact-support https://groups.google.com/forum/#!forum/thai-linux-foss-devel
catalogue-ctan /fonts/thai/fonts-tlwg
-catalogue-date 2018-11-05 07:54:33 +0100
-catalogue-license gpl2+lppl1.3other-free
+catalogue-license gpl2+ lppl1.3 other-free
catalogue-topics font font-thai thai
catalogue-version 0.7.1
++++++ fontspec.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fontspec/CHANGES.md new/doc/latex/fontspec/CHANGES.md
--- old/doc/latex/fontspec/CHANGES.md 2019-03-14 21:56:10.000000000 +0100
+++ new/doc/latex/fontspec/CHANGES.md 2020-02-21 23:54:05.000000000 +0100
@@ -1,16 +1,79 @@
Change history
==============
+## v2.7i (2020/02/21)
+
+ * Define both `b` and `bx` font series by default to avoid spurious warnings in some
+ cases, and broken behaviour in pathological cases.
+
+
+## v2.7h (2020/02/03)
+
+ * Eroneous uses of `language=DFLT` changed to `language=dflt`.
+ * Fix spurious error in some cases of `SlantedFont` and `BoldSlantedFont`
+ being specified in a `.fontspec` file.
+ * Fix regression with `unicode-math` related log files showing the wrong
+ NFSS-based font ‘identifier’.
+
+## v2.7g (2020/01/26)
+
+ * Fix regression that broke changing the default encoding after `fontspec` was loaded
+ (e.g., to use legacy fonts by default but use a `fontspec` font occassionally).
+ * Fix bug exhibited in `polyglossia` and perhaps elsewhere when `Script` is set without
+ a corresponding `Language`.
+ * Use `\familydefault` instead of `\rmdefault` when calculating scaling parameters in
+ `Scale=MatchLowercase` and `Scale=MatchUppercase`.
+
+## v2.7f (2020/01/24)
+
+ * Rename font feature `Letters=Uppercase` to `Style=Uppercase`, as this feature does
+ not generally affect the letters themselves, only symbols and accents.
+ The old name will be retained for the time being.
+ * Rename `Style=TitlingCaps` to `Style=Titling`.
+ * Track changes in both LaTeX2e and `expl3`.
+ * Fix long-standing (but never noticed?) bug that successive `\addfontfeatures`
+ would overwrite previous ones when using `UprightFeatures={...}` or similar.
+ Now the ‘`UprightFeatures`’ are accumulated.
+ * Remove AAT font examples from the documentation — support for many AAT fonts now
+ appears broken with latest versions of macOS.
+
+
+## v2.7e (2020/01/09)
+
+ * Rename for `Renderer=HarfBuzz` (the old `Harfbuzz` name is kept for compatibility)
+ * Track upcoming changes in LaTeX2e release for 2020.
+ * Remove/reword some out-of-date documentation.
+ * Remove entirely the patches for 3rd party verbatim packages as `\verbvisiblespace`
+ has now been offered by the kernel for a year.
+
+
+## v2.7d (2019/10/19)
+
+ * Allow the user to manually change `\rmdefault`, `\sfdefault`, `\ttdefault`
+ if desired. Note this could cause problems if the `fontspec` encoding does not
+ match the encoding of the specified families.
+ * Additional optional argument for `\EncodingCommand`.
+ * Suppress spurious warnings for `HyphenChar` feature in XeLaTeX.
+ * Add `Ligatures=TeXOff` even though it's not a real OpenType feature.
+ (Functionally equivalent to `Ligatures=TeXReset`.)
+ * New scripts definitions to match OpenType 1.8.3 (thanks Werner!).
+ * Documentation changes for `Numbers=Arabic`, `HypenChar=None` for `\ttfamily`.
+ * Documentation fixes (thanks `muzimuzhi`!).
+ * Prepare for `FakeBold` being available in `luaotfload` (thanks Khaled!).
+ * Bug fix for doubled + symbol when setting `tlig` feature in LuaTeX.
+ * Bug fix for Harfbuzz use. (Support still very minimal I'm afraid.)
+
+
## v2.7c (2019/03/15)
- * Two optimisations reduce time for font definitions with a large number of
+ * Two optimisations reduce time for font definitions with a large number of
`FontFace` options. Thanks to Bob Tennent for the test file and bringing
the problem to my attention.
## v2.7b (2019/02/12)
- * Fix regression in loading `Language=Turkish`. This now allows users to define more
+ * Fix regression in loading `Language=Turkish`. This now allows users to define more
than one OpenType tag when defining a language name, where the first tag found is
the one selected for the font. E.g.,
@@ -19,75 +82,75 @@
when selected, this first checks for the existance of the TRK language tag, and if
not found then checks for the TUR language tag to use if available.
- * Add new `Renderer` options for LuaTeX that enable the Harfbuzz engine. These only
+ * Add new `Renderer` options for LuaTeX that enable the HarfBuzz engine. These only
work running under `luahbtex` and are currently experimental. The new options are
`Harfbuzz`, `OpenType`, `AAT`, and `Graphite`.
- * Always try to remove ‘clashing’ font features inside `\addfontfeatures` even in
+ * Always try to remove ‘clashing’ font features inside `\addfontfeatures` even in
cases when the requested font feature doesn't exist. E.g., now if a font is loaded
with `Numbers=OldStyle` and *doesn't have* `Numbers=Lining`, requesting the latter
will still reset the former.
- * Add `pxfonts`, `txfonts`, `newpxmath`, `newtxmath`, `mtpro2` to the list
+ * Add `pxfonts`, `txfonts`, `newpxmath`, `newtxmath`, `mtpro2` to the list
of packages that automatically invoke `no-math`.
- * Add `\providefontfamily`, `\setfontface`, `\renewfontface`, and `\providefontface`.
+ * Add `\providefontfamily`, `\setfontface`, `\renewfontface`, and `\providefontface`.
- * Add local/global distinction with `\fontspec_(g)set_family:Nnn` and `\fontspec_(g)set_fontface:NNnn`.
+ * Add local/global distinction with `\fontspec_(g)set_family:Nnn` and `\fontspec_(g)set_fontface:NNnn`.
## v2.7a (2019/01/25)
- * One last (?!) fix for recent regression (!!). I am not getting enough sleep at the moment and it is too hot.
- * Add `LocalForms=On/Off/Reset` to control the `locl` OpenType tag.
- * Reorganise some documentation.
- * Remove redundant redefinition of `\-` which is nowadays defined correctly by the LaTeX2e kernel.
- * Add code to remove the patching of verbatim commands and environments when the new
+ * One last (?!) fix for recent regression (!!). I am not getting enough sleep at the moment and it is too hot.
+ * Add `LocalForms=On/Off/Reset` to control the `locl` OpenType tag.
+ * Reorganise some documentation.
+ * Remove redundant redefinition of `\-` which is nowadays defined correctly by the LaTeX2e kernel.
+ * Add code to remove the patching of verbatim commands and environments when the new
`\verbvisiblespace` command is defined in a future version of LaTeX2e.
## v2.7 (2019/01/24)
- * Add new `ScaleAgain` feature for compounding scale factors.
+ * Add new `ScaleAgain` feature for compounding scale factors.
(This is largely to support `unicode-math` but may be useful by others.)
- * `\oldstylenums` no longer overwritten if `textcomp` loaded after `fontspec`.
- * More fixes for recent regressions (sorry!).
+ * `\oldstylenums` no longer overwritten if `textcomp` loaded after `fontspec`.
+ * More fixes for recent regressions (sorry!).
## v2.6l (2019/01/18)
- * REALLY fix crash when loading fonts that are missing a requested script.
- * Lots of internal logic changes for what should have been an easy fix :(
+ * REALLY fix crash when loading fonts that are missing a requested script.
+ * Lots of internal logic changes for what should have been an easy fix :(
## v2.6k (2019/01/16)
- * Fix crash when loading fonts that are missing a requested script.
+ * Fix crash when loading fonts that are missing a requested script.
## v2.6j (2019/01/10)
- * Re-sync with `expl3` for deprecated commands.
- * Added support for `\hbar` if anyone is relying on `fontspec` to emulate legacy maths.
+ * Re-sync with `expl3` for deprecated commands.
+ * Added support for `\hbar` if anyone is relying on `fontspec` to emulate legacy maths.
## v2.6i (2018/08/02)
- * Emergency bug-fix -- a one-char typo broke loading of bold fonts!
- * Some minor updates to the docs regarding “family names” of fonts.
- * Using `\defaultfontfeatures` to specify a font face by a custom name can now use
+ * Emergency bug-fix -- a one-char typo broke loading of bold fonts!
+ * Some minor updates to the docs regarding “family names” of fonts.
+ * Using `\defaultfontfeatures` to specify a font face by a custom name can now use
`Font=` to specify the filename.
## v2.6h (2018/07/30)
- * `expl3` internals updated so loading `expl3` with the `check-declarations` option will run without error.
- * Fix bug with `FontFace` in which spaces weren't being ignored.
+ * `expl3` internals updated so loading `expl3` with the `check-declarations` option will run without error.
+ * Fix bug with `FontFace` in which spaces weren't being ignored.
## v2.6g (2017-11-09)
- * Bugfix for clash introduced with last version. When loading `babel`
+ * Bugfix for clash introduced with last version. When loading `babel`
before `fontspec` the following error arose:
! Control sequence \latinencoding already defined.
@@ -95,150 +158,150 @@
## v2.6f (2017-11-05)
- * Fix loading of Graphite fonts and add a little documentation (a better interface is needed, though)
- * Correct and simplify some internal code that fixes a bug in the way some fonts are displayed in `\tracingoutput` mode.
- * This also fixes an obscure bug using the API in which a query for a selected font feature
+ * Fix loading of Graphite fonts and add a little documentation (a better interface is needed, though)
+ * Correct and simplify some internal code that fixes a bug in the way some fonts are displayed in `\tracingoutput` mode.
+ * This also fixes an obscure bug using the API in which a query for a selected font feature
would test against the upright font in the current family regardless of the face/shape actually in use.
- * This package now complies with the `expl3` option `check-declarations`.
+ * This package now complies with the `expl3` option `check-declarations`.
## v2.6e (2017/09/22)
- * Re-enable use of `HyphenChar=None` in LuaLaTeX. (Hyphenation and font choice are
+ * Re-enable use of `HyphenChar=None` in LuaLaTeX. (Hyphenation and font choice are
decoupled in LuaTeX, except for this one setting.)
- * Some internal changes needed by `unicode-math` to fix some cross-over code.
+ * Some internal changes needed by `unicode-math` to fix some cross-over code.
## v2.6d (2017/08/14)
- * Update Scripts to Unicode 1.8.2 (thanks Werner)
- * Remove `HyphenChar` feature when running LuaTeX — use `\prehyphenchar` LuaTeX primitive instead.
- * Rewrite test suite so that automated testing actually functions correctly and automatically. Thanks to Joseph for introducing me to Travis CI.
+ * Update Scripts to Unicode 1.8.2 (thanks Werner)
+ * Remove `HyphenChar` feature when running LuaTeX — use `\prehyphenchar` LuaTeX primitive instead.
+ * Rewrite test suite so that automated testing actually functions correctly and automatically. Thanks to Joseph for introducing me to Travis CI.
## v2.6c (2017/07/23)
- * Emergency bug-fix.
+ * Emergency bug-fix.
## v2.6b (2017/07/16)
- * Fix conflict with Polyglossia and `Scale=MatchLowercase`.
- * New feature `IgnoreFontspecFile` to avoid loading the `.fontspec` file for a font.
- * Fix regression with `\fontspec_if_feature:nTF`
+ * Fix conflict with Polyglossia and `Scale=MatchLowercase`.
+ * New feature `IgnoreFontspecFile` to avoid loading the `.fontspec` file for a font.
+ * Fix regression with `\fontspec_if_feature:nTF`
(which broke `realscripts`, oops — must improve my test suite)
## v2.6a (2017/03/31)
- * Fix crashing bug with `..Reset` and `ResetAll` keys.
- * Fix crashing bug with `\newfontface`.
+ * Fix crashing bug with `..Reset` and `ResetAll` keys.
+ * Fix crashing bug with `\newfontface`.
## v2.6 (2017/02/12)
- * Change the new behaviour of `\emph` (and `\emfontdeclare`) to act only on the NFSS font shape; using the series as well was too fragile.
- * Add `\strong` as the "weight" analogy to `\emph`. This will need some extra syntactic sugar from `fontspec` before it becomes truly useful.
- * Add `Numbers=Tabular` alias for `Numbers=Monospaced`.
- * Fix occasional bug with "chained" keyval choices such as `Numbers={Lining,Proportional}` in which only the first choice would be recognised.
- * Fix interaction with `RawFeature` and "proper" `fontspec` features.
- * Fix regression in which `C:\...` file paths in Windows couldn't be used.
- * Fix regression in XeTeX in which `Ligatures=TeX` overrode `Mapping=..` regardless of where the former was declared in the feature list.
- * Fix bug (sorry!) in `\newopentypefeature`.
- * Improve monospace font in documentation.
+ * Change the new behaviour of `\emph` (and `\emfontdeclare`) to act only on the NFSS font shape; using the series as well was too fragile.
+ * Add `\strong` as the "weight" analogy to `\emph`. This will need some extra syntactic sugar from `fontspec` before it becomes truly useful.
+ * Add `Numbers=Tabular` alias for `Numbers=Monospaced`.
+ * Fix occasional bug with "chained" keyval choices such as `Numbers={Lining,Proportional}` in which only the first choice would be recognised.
+ * Fix interaction with `RawFeature` and "proper" `fontspec` features.
+ * Fix regression in which `C:\...` file paths in Windows couldn't be used.
+ * Fix regression in XeTeX in which `Ligatures=TeX` overrode `Mapping=..` regardless of where the former was declared in the feature list.
+ * Fix bug (sorry!) in `\newopentypefeature`.
+ * Improve monospace font in documentation.
- * N.B. There is currently a known issue with TTC fonts and LuaTeX; currently they cannot be loaded through the `fontspec` interface, but this issue should soon be addressed by the `luaotfload` package.
+ * N.B. There is currently a known issue with TTC fonts and LuaTeX; currently they cannot be loaded through the `fontspec` interface, but this issue should soon be addressed by the `luaotfload` package.
## v2.5d (2017/01/24) "oops"
- * Add `\fontspec_if_small_caps:TF`
- * Fix bug in `\emph` (!!)
+ * Add `\fontspec_if_small_caps:TF`
+ * Fix bug in `\emph` (!!)
## v2.5c (2017/01/20) "Christmas 2016 release"
- * `TU` font encoding now default, with encoding files provided by the kernel.
- * Experimental interface added for customising encodings.
- * Add feature `Ornament=`*n* corresponding to OpenType feature `+ornm=`*n*.
- * Add feature `FontIndex=`*n* to support TrueType Collection (TTC) files.
- * Nested `\emph` is now much smarter and will cleverly nest even if manual font changes are made.
- * Tries to resolve situations when font features clash.
+ * `TU` font encoding now default, with encoding files provided by the kernel.
+ * Experimental interface added for customising encodings.
+ * Add feature `Ornament=`*n* corresponding to OpenType feature `+ornm=`*n*.
+ * Add feature `FontIndex=`*n* to support TrueType Collection (TTC) files.
+ * Nested `\emph` is now much smarter and will cleverly nest even if manual font changes are made.
+ * Tries to resolve situations when font features clash.
E.g., `Numbers={Uppercase,Lowercase}` will define only `+onum` rather than the previous behaviour of `+lnum;+onum` to let the engine sort things out. Coverage may still be preliminary.
- * Add API function `\fontspec_if_current_feature:nTF` for querying selected features based on their OpenType tag.
- * Add user function `\IfFontFeatureActiveTF` for querying selected features based on their `fontspec` specification.
- * All "tag-based" OpenType features are now provided in `Feat`/`FeatOff`/`FeatReset` forms to disable and reset them.
- * `ResetAll` provided for all "tag-based" OpenType feature keys. (E.g., `Ligatures=ResetAll`.)
- * Big table of OpenType feature tags to help cross-reference which fontspec feature (if any) corresponds to which OpenType feature.
- * Bug fixed for `Script` selection.
+ * Add API function `\fontspec_if_current_feature:nTF` for querying selected features based on their OpenType tag.
+ * Add user function `\IfFontFeatureActiveTF` for querying selected features based on their `fontspec` specification.
+ * All "tag-based" OpenType features are now provided in `Feat`/`FeatOff`/`FeatReset` forms to disable and reset them.
+ * `ResetAll` provided for all "tag-based" OpenType feature keys. (E.g., `Ligatures=ResetAll`.)
+ * Big table of OpenType feature tags to help cross-reference which fontspec feature (if any) corresponds to which OpenType feature.
+ * Bug fixed for `Script` selection.
## v2.5b (2016/05/14) "More bugs" (somehow never released)
- * Fixed bug with garbage text printed in certain "verbatim" situations under LuaTeX.
- * Improve interaction between optical sizes and small caps.
- * Remove documentation for `FeatureFile`, since this is no longer supported under LuaLaTeX
+ * Fixed bug with garbage text printed in certain "verbatim" situations under LuaTeX.
+ * Improve interaction between optical sizes and small caps.
+ * Remove documentation for `FeatureFile`, since this is no longer supported under LuaLaTeX
(there are other methods to perform the same thing, but no "easy" user interface that `fontspec` can provide at this stage).
- * Fix regression causing an error message if `fontspec` loaded before `\documentclass'.
+ * Fix regression causing an error message if `fontspec` loaded before `\documentclass'.
## v2.5a (2016/02/01) "Bugs fixed"
- * Rather embarrassing bug fix! (`unicode-math` was broken.)
- * Remember to add the `fontspec.cfg` file to the distribution.
- * Remove `+trep` from `Ligatures=TeX` (no longer necessary).
- * Add some basic tests using `l3build`; more to come.
- * Simplify some internal Lua code and package loading code.
+ * Rather embarrassing bug fix! (`unicode-math` was broken.)
+ * Remember to add the `fontspec.cfg` file to the distribution.
+ * Remove `+trep` from `Ligatures=TeX` (no longer necessary).
+ * Add some basic tests using `l3build`; more to come.
+ * Simplify some internal Lua code and package loading code.
## v2.5 (2016/01/30) "TL2016 release"
- * Provide a new Unicode font encoding ("TU") to replace EU1/EU2 and xunicode.
- * Activate with package option `[tuenc]'; once it becomes the default (later this year), `[euenc]` option will revert to the old behaviour.
- * New command `\emfontdeclare` for defining font shapes when arbitrarily nesting the `\emph` command.
- * Allow slanted small caps and better internal methods for "combining" font shapes; this fixes a few bugs.
- * Incorporate "new" font script tags for Indic fonts. E.g., when selecting `Script=Bengali`, fontspec will first query the font for the `bng2` OpenType script, and if not found select `beng`.
- * Restrict some font features from being able to be used within `\addfontfeatures` that were causing some font-loading confusion.
- * Fixed behaviour in which `\baselineskip` and `\f@size` would (possibly) change values after loading the packge.
- * Remove copy of `fixltx2e`'s code for footnote symbols; handled by LaTeX2e now.
- * Deprecate `ExternalLocation` for the simpler (and identical) `Path` option.
- * Improvement to some warnings/info messages.
- * Improve structure of code.
+ * Provide a new Unicode font encoding ("TU") to replace EU1/EU2 and xunicode.
+ * Activate with package option `[tuenc]'; once it becomes the default (later this year), `[euenc]` option will revert to the old behaviour.
+ * New command `\emfontdeclare` for defining font shapes when arbitrarily nesting the `\emph` command.
+ * Allow slanted small caps and better internal methods for "combining" font shapes; this fixes a few bugs.
+ * Incorporate "new" font script tags for Indic fonts. E.g., when selecting `Script=Bengali`, fontspec will first query the font for the `bng2` OpenType script, and if not found select `beng`.
+ * Restrict some font features from being able to be used within `\addfontfeatures` that were causing some font-loading confusion.
+ * Fixed behaviour in which `\baselineskip` and `\f@size` would (possibly) change values after loading the packge.
+ * Remove copy of `fixltx2e`'s code for footnote symbols; handled by LaTeX2e now.
+ * Deprecate `ExternalLocation` for the simpler (and identical) `Path` option.
+ * Improvement to some warnings/info messages.
+ * Improve structure of code.
## v2.4e (2015/09/24)
- * Allow `[Path=...]` to be specified for individual font faces.
- * Continue to normalise naming with expl3. (Ongoing.)
+ * Allow `[Path=...]` to be specified for individual font faces.
+ * Continue to normalise naming with expl3. (Ongoing.)
## v2.4d (2015/07/22)
- * Rename an internal expl3 function or two.
+ * Rename an internal expl3 function or two.
## v2.4c (2015/03/14)
- * v2.4b was never released, sorry!
- * This time *really* fix `\@fnsymbol` and avoid overwriting it if already fixed.
- * Fix "`Renderer=Graphite`" (off-by-one error).
- * Fix some edge cases for `\aliasfontfeature`.
+ * v2.4b was never released, sorry!
+ * This time *really* fix `\@fnsymbol` and avoid overwriting it if already fixed.
+ * Fix "`Renderer=Graphite`" (off-by-one error).
+ * Fix some edge cases for `\aliasfontfeature`.
## v2.4b (2014/08/23)
- * Improve backwards compatibility w.r.t. recent argument order change;
+ * Improve backwards compatibility w.r.t. recent argument order change;
specifically, if an optional argument is presented before the font name
then avoid looking for one afterwards.
- * Fix \@fnsymbol; it was defined as a \protected macro, where in fact its internal text-or-math switch needed to be instead.
- * No longer lowercase fontnames internally; this fixes a bug with loading
+ * Fix \@fnsymbol; it was defined as a \protected macro, where in fact its internal text-or-math switch needed to be instead.
+ * No longer lowercase fontnames internally; this fixes a bug with loading
mixed-case ".fontspec" files.
- * Fixed some documentation typos/inconsistencies related to recent changes.
+ * Fixed some documentation typos/inconsistencies related to recent changes.
## v2.4a (2014/06/21)
- * No longer load fixltx2e.sty -- this package should really be loaded before \documentclass.
- * Avoid deprecated l3fp code.
- * A couple of bugs introduced with v2.4 fixed.
+ * No longer load fixltx2e.sty -- this package should really be loaded before \documentclass.
+ * Avoid deprecated l3fp code.
+ * A couple of bugs introduced with v2.4 fixed.
## v2.4 (2014/06/01)
- * Significant change to the user interface: instead of `\setmainfont[features]{font}`, you now write `\setmainfont{font}[features]`.
+ * Significant change to the user interface: instead of `\setmainfont[features]{font}`, you now write `\setmainfont{font}[features]`.
Backwards compatibility is of course preserved.
The reason for this change is to improve the visual comprehension of the font loading syntax with large numbers of font features.
- * Defaults for symbolic font families like this can now be specified with
+ * Defaults for symbolic font families like this can now be specified with
\defaultfontfeatures[\rmfamily]{...}
@@ -247,20 +310,20 @@
\defaultfontfeatures[\headingsfont]{...}
\newfontfamily\headingsfont{...}
- * New `PunctuationSpace=WordSpace` and `PunctuationSpace=TwiceWordSpace` settings, intended for monospaced fonts; these force the space after a period to be exactly one or two spaces wide, respectively, which preserves character alignment across lines.
+ * New `PunctuationSpace=WordSpace` and `PunctuationSpace=TwiceWordSpace` settings, intended for monospaced fonts; these force the space after a period to be exactly one or two spaces wide, respectively, which preserves character alignment across lines.
- * The features above now allow changes to the default settings:
+ * The features above now allow changes to the default settings:
- * `Ligatures=TeX` is enabled by default with `\setmainfont` and `\setsansfont`.
- * `WordSpace={1,0,0}` and `PunctuationSpace=WordSpace` are now enabled by default for `\setmonofont` to produce better monospaced results.
- * (These can be adjusted by created your own `fontspec.cfg` file.)
+ * `Ligatures=TeX` is enabled by default with `\setmainfont` and `\setsansfont`.
+ * `WordSpace={1,0,0}` and `PunctuationSpace=WordSpace` are now enabled by default for `\setmonofont` to produce better monospaced results.
+ * (These can be adjusted by created your own `fontspec.cfg` file.)
- * `SizeFeatures` can now be nested inside `ItalicFeatures` (etc.) and behaves correctly. This has been a very long overdue bug!
+ * `SizeFeatures` can now be nested inside `ItalicFeatures` (etc.) and behaves correctly. This has been a very long overdue bug!
- * New feature `NFSSFamily=ABC` to set the NFSS family of a font to “`ABC`”. Useful
+ * New feature `NFSSFamily=ABC` to set the NFSS family of a font to “`ABC`”. Useful
when other packages use the `\fontfamily{ABC}\selectfont` interface.
- * New feature `FontFace = {series}{shape}{font}` allows a font face to be loaded with a specific NFSS font series and font shape.
+ * New feature `FontFace = {series}{shape}{font}` allows a font face to be loaded with a specific NFSS font series and font shape.
A more verbose syntax allows arbitrary font features as well (and this also plays nicely with `SizeFeatures`):
\fontspec{myfont.otf}[
@@ -269,60 +332,60 @@
The code above, for example, will allow a bold upright italic font to be selected using the standard NFSS interface: `\fontseries{b}\fontshape{ui}\selectfont`.
- * `\defaultfontfeatures+` (note the `+`) can now be used to append to the default font feature set.
+ * `\defaultfontfeatures+` (note the `+`) can now be used to append to the default font feature set.
- * Setting the `SmallCapsFont` using the `*`-replacement notation has been improved/fixed.
+ * Setting the `SmallCapsFont` using the `*`-replacement notation has been improved/fixed.
## v2.3c (2013/05/20)
- * Compatbility with luaotfload 2013/05/20 2.2c, support for older version
+ * Compatbility with luaotfload 2013/05/20 2.2c, support for older version
removed.
## v2.3b (2013/05/12)
- * Compatibility with new (and future) version of luaotfload
+ * Compatibility with new (and future) version of luaotfload
## v2.3a (2013/03/16)
- * Bug fix update to retain compatibility with new expl3
+ * Bug fix update to retain compatibility with new expl3
## v2.3 (2013/02/25)
- * Add support for per-font options in `\defaultfontfeatures`
- * Add support for `<fontname>.fontspec` per-font configuration files
- * Keep up-to-date with expl3 changes
+ * Add support for per-font options in `\defaultfontfeatures`
+ * Add support for `<fontname>.fontspec` per-font configuration files
+ * Keep up-to-date with expl3 changes
## v2.2b (2012/05/06) "TL2012 version"
- * Fix error with AutoFakeSlant/Bold (#113) and when used with external fonts (#128)
- * Add warning when using FakeBold in LuaLaTeX, where it's not supported
- * Fix slshape misassignment introduced in v2.2
- * Allow fontspec to be loaded before \documentclass
+ * Fix error with AutoFakeSlant/Bold (#113) and when used with external fonts (#128)
+ * Add warning when using FakeBold in LuaLaTeX, where it's not supported
+ * Fix slshape misassignment introduced in v2.2
+ * Allow fontspec to be loaded before \documentclass
(or rather fix the regression that broke this)
- * Avoid using the calc package now that it's no longer loaded by expl3
- * Allow multiple values to StylisticSet and Alternate font options
+ * Avoid using the calc package now that it's no longer loaded by expl3
+ * Allow multiple values to StylisticSet and Alternate font options
## v2.2a (2011/09/14)
- * Bug fix: improve backwards compatibility for packages that use old
+ * Bug fix: improve backwards compatibility for packages that use old
fontspec internals such as mathspec.
## v2.2 (2011/09/13)
- * Support alternate selections in CharacterVariant (cvxx in OpenType)
+ * Support alternate selections in CharacterVariant (cvxx in OpenType)
using new syntax `[CharacterVariant=5:2]`.
- * Add `fontspec`-compatible `\oldstylenums` and `\liningnums` commands.
- * New programmer's function `\fontspec_set_fontface:NNnn` (for use when
+ * Add `fontspec`-compatible `\oldstylenums` and `\liningnums` commands.
+ * New programmer's function `\fontspec_set_fontface:NNnn` (for use when
`\zf@basefont` might previously have been queried).
- * Log file output is slightly tidier.
- * Some old lingering bugs squashed:
+ * Log file output is slightly tidier.
+ * Some old lingering bugs squashed:
- Small caps font selection was broken in some cases.
(Thanks Enrico Gregorio.)
- Fonts loaded by filename with under-specified shapes threw an error
(e.g., asking explicitly for bold but not italic).
(Thanks Vafa Khalighi.)
- * Documentation improvements largely due to Markus Böhning.
- * Many internal changes, among which:
+ * Documentation improvements largely due to Markus Böhning.
+ * Many internal changes, among which:
- `xkeyval` package no longer used for option processing;
`expl3`'s `l3keys` used instead.
This allows `fontspec` to be loaded before `\documentclass`
@@ -336,94 +399,94 @@
## v2.1g (2011/08/02)
- * No longer uses the binhex package, avoiding some name clashes with TIPA
+ * No longer uses the binhex package, avoiding some name clashes with TIPA
## v2.1f (2011/02/26)
- * Finally add a real error message when a font cannot be found!
- * Add "Letters=Random" feature.
- * Fix bug in which "Unknown feature `'..." warnings
+ * Finally add a real error message when a font cannot be found!
+ * Add "Letters=Random" feature.
+ * Fix bug in which "Unknown feature `'..." warnings
were shown in the log file.
- * Some small documentation improvements.
+ * Some small documentation improvements.
## v2.1e (2010/11/17)
- * Internal changes for luatexbase v0.3.
+ * Internal changes for luatexbase v0.3.
## v2.1d (2010/11/07)
- * Bug fix when \itdefault is "sl" rather than "it".
+ * Bug fix when \itdefault is "sl" rather than "it".
E.g., when using the "slides" class.
- * Minor internal changes, including merging some code from unicode-math.
+ * Minor internal changes, including merging some code from unicode-math.
## v2.1c (2010/10/13)
- * New documentation for defining custom kerning and ligatures
+ * New documentation for defining custom kerning and ligatures
when using LuaLaTeX.
- * Fix bug when defining bold italic fonts by filename.
- * Avoid infinite loop when the Latin script is requested for a font
+ * Fix bug when defining bold italic fonts by filename.
+ * Avoid infinite loop when the Latin script is requested for a font
that does not contain it. TODO: a suitable fallback script should be
chosen; right now we just ignore the script selection.
## v2.1b (2010/09/29)
- * Fix for bug introduced in the last release:
+ * Fix for bug introduced in the last release:
small caps weren't being automatically selected correctly
## v2.1a (2010/09/27)
- * Fix for colours bug introduced in the last update
- * Fix for for bad interaction with LuaLaTeX and fallback fonts
+ * Fix for colours bug introduced in the last update
+ * Fix for for bad interaction with LuaLaTeX and fallback fonts
(such as using \slshape when no slanted font specified)
- * Behaviour/messaging improvement when scripts/languages are requested
+ * Behaviour/messaging improvement when scripts/languages are requested
that do not exist in the font
- * Fix bug with detecting font features/scripts in some cases with:
+ * Fix bug with detecting font features/scripts in some cases with:
- `\fontspec_if_feature:n(TF)`
- `\fontspec_if_language:n(TF)`
- `\fontspec_if_current_script:n(TF)`
- `\fontspec_if_current_language:n(TF)`
- * Some messages in the log file are improved
- * Code for "visible space" fixed for LuaLaTeX use
- * Lots of internal changes to bring the implementation closer
+ * Some messages in the log file are improved
+ * Code for "visible space" fixed for LuaLaTeX use
+ * Lots of internal changes to bring the implementation closer
to being "native expl3".
## v2.1 (2010/09/19)
- * Now load xunicode internally for consistent behaviour in
+ * Now load xunicode internally for consistent behaviour in
XeLaTeX and LuaLaTeX.
- * Font commands now include \fontencoding internally, easing their
+ * Font commands now include \fontencoding internally, easing their
use together with legacy TeX fonts.
- * Colour & Opacity now behave a little better.
- * Nested emphasis with \emph now also occurs inside a "slanted" shape.
- * Some compatibility commands/options added that were removed.
+ * Colour & Opacity now behave a little better.
+ * Nested emphasis with \emph now also occurs inside a "slanted" shape.
+ * Some compatibility commands/options added that were removed.
in the transition to v2.
- * Bug fix for a problem triggered after counters got too high.
+ * Bug fix for a problem triggered after counters got too high.
## v2.0c (2010/08/01)
Bug fix and documentation tune-up.
- * Significant bug fix reported simultaneously by Enrico Gregorio and
+ * Significant bug fix reported simultaneously by Enrico Gregorio and
Don Hosek.
- * Many documentation improvements and additions due to David Perry.
- * Documentation typo thanks to John McChesney-Young
+ * Many documentation improvements and additions due to David Perry.
+ * Documentation typo thanks to John McChesney-Young
## v2.0b (2010/07/14)
*Actually* the final release before TeX Live 2010.
- * Improved examples in the documentation, with fewer proprietary fonts
- * All font examples are included as separate images on CTAN, so the
+ * Improved examples in the documentation, with fewer proprietary fonts
+ * All font examples are included as separate images on CTAN, so the
manual can be compiled (with pdfLaTeX) by anyone, anywhere
- * LuaLaTeX fixes for the StylisticSet and Annotation features
- * New OpenType feature `CharacterVariant` now supported
- * Minor change: `Ligatures=Historical` is now `Ligatures=Historic` for consistency
+ * LuaLaTeX fixes for the StylisticSet and Annotation features
+ * New OpenType feature `CharacterVariant` now supported
+ * Minor change: `Ligatures=Historical` is now `Ligatures=Historic` for consistency
## v2.0a (2010/07/11)
Final release before TeX Live 2010.
- * Bug fix for the Language setting being ignored
- * Add programmer's command `\fontspec_glyph_if_exist:NnTF`
- * Many documentation improvements, especially for LuaTeX features
+ * Bug fix for the Language setting being ignored
+ * Add programmer's command `\fontspec_glyph_if_exist:NnTF`
+ * Many documentation improvements, especially for LuaTeX features
`FeatureFile=...` and `Numbers=Arabic`.
- * Add `Parsi` and `Persian` synonyms for `Language=Farsi`
+ * Add `Parsi` and `Persian` synonyms for `Language=Farsi`
Binary files old/doc/latex/fontspec/fontspec-code.pdf and new/doc/latex/fontspec/fontspec-code.pdf differ
Binary files old/doc/latex/fontspec/fontspec.pdf and new/doc/latex/fontspec/fontspec.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontspec.doc.tlpobj new/tlpkg/tlpobj/fontspec.doc.tlpobj
--- old/tlpkg/tlpobj/fontspec.doc.tlpobj 2019-03-15 02:24:23.000000000 +0100
+++ new/tlpkg/tlpobj/fontspec.doc.tlpobj 2020-02-22 01:54:55.000000000 +0100
@@ -1,9 +1,9 @@
name fontspec.doc
category Package
-revision 50387
+revision 53860
shortdesc doc files of fontspec
relocated 1
-docfiles size=337
+docfiles size=314
RELOC/doc/latex/fontspec/CHANGES.md
RELOC/doc/latex/fontspec/LICENSE
RELOC/doc/latex/fontspec/README.md
++++++ fontspec.tar.xz ++++++
++++ 1765 lines of diff (skipped)
++++++ fontware.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pltotf.1 new/texmf-dist/doc/man/man1/pltotf.1
--- old/texmf-dist/doc/man/man1/pltotf.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/pltotf.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH PLTOTF 1 "16 June 2015" "Web2C 2019"
+.TH PLTOTF 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
Binary files old/texmf-dist/doc/man/man1/pltotf.man1.pdf and new/texmf-dist/doc/man/man1/pltotf.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/tftopl.1 new/texmf-dist/doc/man/man1/tftopl.1
--- old/texmf-dist/doc/man/man1/tftopl.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/tftopl.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH TFTOPL 1 "16 June 2015" "Web2C 2019"
+.TH TFTOPL 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
Binary files old/texmf-dist/doc/man/man1/tftopl.man1.pdf and new/texmf-dist/doc/man/man1/tftopl.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/vftovp.1 new/texmf-dist/doc/man/man1/vftovp.1
--- old/texmf-dist/doc/man/man1/vftovp.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/vftovp.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH VFTOVP 1 "16 June 2015" "Web2C 2019"
+.TH VFTOVP 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
.if n .ds TX TeX
Binary files old/texmf-dist/doc/man/man1/vftovp.man1.pdf and new/texmf-dist/doc/man/man1/vftovp.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/vptovf.1 new/texmf-dist/doc/man/man1/vptovf.1
--- old/texmf-dist/doc/man/man1/vptovf.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/vptovf.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH VPTOVF 1 "16 June 2015" "Web2C 2019"
+.TH VPTOVF 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
.if n .ds TX TeX
Binary files old/texmf-dist/doc/man/man1/vptovf.man1.pdf and new/texmf-dist/doc/man/man1/vptovf.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fontware.doc.tlpobj new/tlpkg/tlpobj/fontware.doc.tlpobj
--- old/tlpkg/tlpobj/fontware.doc.tlpobj 2019-03-27 02:24:09.000000000 +0100
+++ new/tlpkg/tlpobj/fontware.doc.tlpobj 2020-03-04 23:50:54.000000000 +0100
@@ -1,6 +1,6 @@
name fontware.doc
category TLCore
-revision 50602
+revision 54070
shortdesc doc files of fontware
docfiles size=27
texmf-dist/doc/man/man1/pltotf.1
++++++ footnotehyper.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/footnotehyper/README.md new/doc/latex/footnotehyper/README.md
--- old/doc/latex/footnotehyper/README.md 2018-01-24 22:50:28.000000000 +0100
+++ new/doc/latex/footnotehyper/README.md 2019-11-07 23:17:17.000000000 +0100
@@ -1,10 +1,10 @@
<!-- -->
- Source: footnotehyper.dtx (v1.1 2018/01/23)
+ Source: footnotehyper.dtx (v1.1a 2019/11/07)
Author: Jean-Francois Burnol
Info: hyperref aware footnote.sty
License: LPPL 1.3c
- Copyright (C) 2016-2018 Jean-Francois Burnol <jfbu at free dot fr>.
+ Copyright (C) 2016-2019 Jean-Francois Burnol <jfbu at free dot fr>.
ABSTRACT
========
@@ -34,22 +34,31 @@
INSTALLATION
============
-To extract the package (.sty) and driver (.tex) files from
-footnotehyper.dtx:
+The recommended way is to first extract the package (.sty)
+and driver (.tex) files from footnotehyper.dtx via
-- if footnotehyper.ins is present: etex footnotehyper.ins
-- without footnotehyper.ins: etex footnotehyper.dtx
-- or run latex or pdflatex directly on footnotehyper.dtx
-
-At least three ways to produce footnotehyper.pdf (method (1) is
-preferred):
-
-1. latex footnotehyper.tex (twice), then dvipdfmx
-2. pdflatex footnotehyper.dtx (twice)
-3. latex footnotehyper.dtx (twice), then dvips, then ps2pdf
+ tex footnotehyper.dtx
-Method (1) produces the smallest pdf files.
-Options can be set in footnotehyper.tex:
+and then produce the documentation via
+
+ latex footnotehyper.tex (twice)
+ dvipdfmx footnotehyper.dvi
+
+It is also possible to produce simultaneously the package
+and the documentation via one of these two routes:
+
+ pdflatex footnotehyper.dtx (twice)
+
+or
+
+ latex footnotehyper.dtx (twice)
+ dvips
+ ps2pdf
+
+The method using the extracted file footnotehyper.tex produces
+the smallest pdf file and is the officially preferred one as
+it allows to set options in footnotehyper.tex to customize the
+footnotehyper.pdf file:
- scrdoc class options (paper size, font size, ...)
- with or without source code,
@@ -84,6 +93,6 @@
- Jean-Francois Burnol `<jfbu at free dot fr>`
-This Work consists of the main source file footnotehyper.dtx and the
-derived files footnotehyper.sty, footnotehyper.ins, footnotehyper.tex,
+This Work consists of the main source file footnotehyper.dtx
+and the derived files footnotehyper.sty, footnotehyper.tex,
footnotehyper.pdf, footnotehyper.dvi.
Binary files old/doc/latex/footnotehyper/footnotehyper.pdf and new/doc/latex/footnotehyper/footnotehyper.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/footnotehyper/footnotehyper.tex new/doc/latex/footnotehyper/footnotehyper.tex
--- old/doc/latex/footnotehyper/footnotehyper.tex 2018-01-24 22:50:28.000000000 +0100
+++ new/doc/latex/footnotehyper/footnotehyper.tex 2019-11-07 23:17:17.000000000 +0100
@@ -1,13 +1,13 @@
%%
%% Package: footnotehyper
-%% Version: 1.1 (2018/01/23)
+%% Version: 1.1a (2019/11/07)
%% License: LPPL 1.3c
-%% Copyright (C) 2016-2018 Jean-Francois Burnol <jfbu at free dot fr>.
+%% Copyright (C) 2016-2019 Jean-Francois Burnol <jfbu at free dot fr>.
%%
\def\pkgname {footnotehyper}
-\def\pkgdate {2018/01/23}
-\def\docdate {2018/01/23}
-\def\pkgversion {v1.1}
+\def\pkgdate {2019/11/07}
+\def\docdate {2019/11/07}
+\def\pkgversion {v1.1a}
\def\pkgdescription {hyperref aware footnote.sty (JFB)}
%%
%% run latex twice on this file footnotehyper.tex then dvipdfmx on
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/footnotehyper.doc.tlpobj new/tlpkg/tlpobj/footnotehyper.doc.tlpobj
--- old/tlpkg/tlpobj/footnotehyper.doc.tlpobj 2019-02-28 03:38:42.000000000 +0100
+++ new/tlpkg/tlpobj/footnotehyper.doc.tlpobj 2019-11-08 01:55:59.000000000 +0100
@@ -1,6 +1,6 @@
name footnotehyper.doc
category Package
-revision 46431
+revision 52676
shortdesc doc files of footnotehyper
relocated 1
docfiles size=17
++++++ footnotehyper.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/footnotehyper/footnotehyper.sty new/tex/latex/footnotehyper/footnotehyper.sty
--- old/tex/latex/footnotehyper/footnotehyper.sty 2018-01-24 22:50:28.000000000 +0100
+++ new/tex/latex/footnotehyper/footnotehyper.sty 2019-11-07 23:17:17.000000000 +0100
@@ -23,16 +23,21 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{footnotehyper}%
- [2018/01/23 v1.1 hyperref aware footnote.sty (JFB)]
+ [2019/11/07 v1.1a hyperref aware footnote.sty (JFB)]
%%
%% Package: footnotehyper
-%% Version: 1.1 (2018/01/23)
+%% Version: 1.1a (2019/11/07)
%% License: LPPL 1.3c
-%% Copyright (C) 2016-2018 Jean-Francois Burnol <jfbu at free dot fr>.
+%% Copyright (C) 2016-2019 Jean-Francois Burnol <jfbu at free dot fr>.
%%
\DeclareOption*%
{\PackageWarning{footnotehyper}{Option `\CurrentOption' is unknown}}%
\ProcessOptions\relax
+\@ifclassloaded{beamer}
+ {\PackageWarningNoLine{footnotehyper}{This package is
+ incompatible with the beamer class. Aborting input..}%
+ \endinput}
+ {}%
\newbox\FNH@notes
\newdimen\FNH@width
\let\FNH@colwidth\columnwidth
@@ -233,8 +238,9 @@
\def\FNH@bad@makefntext@alert{%
\PackageWarningNoLine{footnotehyper}%
{^^J The footnote environment will not be fully functional, sorry.^^J
- You may try to email the author with the following information:}%
- \typeout{\meaning\@makefntext}%
+ You may try to email the author this meaning of \string\@makefntext:^^J
+ \meaning\@makefntext^^J
+ together with the used preamble}%
\let\FNH@prefntext\@empty\let\FNH@postfntext\@empty
}%
\def\makesavenoteenv{\@ifnextchar[\FNH@msne@ii\FNH@msne@i}%]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/footnotehyper.tlpobj new/tlpkg/tlpobj/footnotehyper.tlpobj
--- old/tlpkg/tlpobj/footnotehyper.tlpobj 2019-02-28 03:38:42.000000000 +0100
+++ new/tlpkg/tlpobj/footnotehyper.tlpobj 2019-11-08 01:55:59.000000000 +0100
@@ -1,16 +1,16 @@
name footnotehyper
category Package
-revision 46431
+revision 52676
shortdesc hyperref aware footnote.sty
relocated 1
longdesc The footnote package by Mark Wooding dates back to 1997 and has
longdesc not been made hyperref compatible. The aim of the present
longdesc package is to do that.
-runfiles size=2
+runfiles size=3
RELOC/tex/latex/footnotehyper/footnotehyper.sty
catalogue-also footnote
catalogue-ctan /macros/latex/contrib/footnotehyper
-catalogue-date 2018-01-24 09:17:07 +0100
+catalogue-date 2019-11-07 19:27:08 +0100
catalogue-license lppl1.3
catalogue-topics footnote macro-supp
-catalogue-version 1.1
+catalogue-version 1.1a
++++++ footnoterange.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/footnoterange/README new/doc/latex/footnoterange/README
--- old/doc/latex/footnoterange/README 2018-10-15 23:22:13.000000000 +0200
+++ new/doc/latex/footnoterange/README 2019-11-24 22:37:49.000000000 +0100
@@ -1,4 +1,4 @@
-README for footnoterange package, 2018/10/15, v1.0b
+README for footnoterange package, 2019/11/24, v1.0c
TABLE OF CONTENTS
Binary files old/doc/latex/footnoterange/footnoterange-example.pdf and new/doc/latex/footnoterange/footnoterange-example.pdf differ
Binary files old/doc/latex/footnoterange/footnoterange.pdf and new/doc/latex/footnoterange/footnoterange.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/footnoterange.doc.tlpobj new/tlpkg/tlpobj/footnoterange.doc.tlpobj
--- old/tlpkg/tlpobj/footnoterange.doc.tlpobj 2019-02-28 03:38:43.000000000 +0100
+++ new/tlpkg/tlpobj/footnoterange.doc.tlpobj 2019-11-25 01:55:55.000000000 +0100
@@ -1,6 +1,6 @@
name footnoterange.doc
category Package
-revision 48912
+revision 52910
shortdesc doc files of footnoterange
relocated 1
docfiles size=102
++++++ footnoterange.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/footnoterange/footnoterange.sty new/tex/latex/footnoterange/footnoterange.sty
--- old/tex/latex/footnoterange/footnoterange.sty 2018-10-15 23:22:13.000000000 +0200
+++ new/tex/latex/footnoterange/footnoterange.sty 2019-11-24 22:37:49.000000000 +0100
@@ -9,9 +9,9 @@
%% This is a generated file.
%%
%% Project: footnoterange
-%% Version: 2018/10/15 v1.0b
+%% Version: 2019/11/24 v1.0c
%%
-%% Copyright (C) 2012 - 2018 by
+%% Copyright (C) 2012 - 2019 by
%% H.-Martin M"unch <Martin dot Muench at Uni-Bonn dot de>
%% Portions of code copyrighted by other people as marked;
%% lines marked "FMi": code by Frank Mittelbach, thanks!
@@ -47,7 +47,7 @@
%% Hans-Klaus Muench + 2014/08/24
%%
\NeedsTeXFormat{LaTeX2e}[2011/06/27]
-\ProvidesPackage{footnoterange}[2018/10/15 v1.0b
+\ProvidesPackage{footnoterange}[2019/11/24 v1.0c
References to ranges of footnotes (HMM)]
%% Provides the footnoterange and footnoterange* environments to
%% refer to ranges of footnotes.
@@ -73,7 +73,7 @@
\ltx@ifpackageloaded{hyperref}{\fnr@ifhyperrfn}{\relax}%
\xdef\fnr@opt{#1}% contains the optional argument
\xdef\fnr@arabic{\arabic\@mpfn}%
- \edef\fnr@formated{\thefootnote}%
+ \protected@edef\fnr@formated{\thefootnote}%
\ifx\fnr@opt\empty%
\footnotetext{\label{fnr:\fnr@arabic}#2}%
\else%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/footnoterange.tlpobj new/tlpkg/tlpobj/footnoterange.tlpobj
--- old/tlpkg/tlpobj/footnoterange.tlpobj 2019-02-28 03:38:43.000000000 +0100
+++ new/tlpkg/tlpobj/footnoterange.tlpobj 2019-11-25 01:55:55.000000000 +0100
@@ -1,6 +1,6 @@
name footnoterange
category Package
-revision 48912
+revision 52910
shortdesc References to ranges of footnotes
relocated 1
longdesc The package provides the environments footnoterange and
@@ -15,7 +15,7 @@
RELOC/tex/latex/footnoterange/footnoterange.sty
catalogue-also footmisc
catalogue-ctan /macros/latex/contrib/footnoterange
-catalogue-date 2018-11-12 13:11:56 +0100
+catalogue-date 2019-11-24 20:28:15 +0100
catalogue-license lppl1.3c
catalogue-topics footnote label-ref
-catalogue-version 1.0b
+catalogue-version 1.0c
++++++ forms16be.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/forms16be/README.md new/doc/latex/forms16be/README.md
--- old/doc/latex/forms16be/README.md 2017-08-31 01:01:11.000000000 +0200
+++ new/doc/latex/forms16be/README.md 2019-06-03 23:34:17.000000000 +0200
@@ -1,6 +1,6 @@
The forms16b3 Package
Author: D. P. Story
-Dated: 2017/08/28
+Dated: 2019-03-20
The forms16be package provides support for UTF-16BE Unicode character
encoding (called a big-endian character string) for the text string
@@ -12,6 +12,9 @@
support for Basic Latin plus the ability to enter any unicode character using
the notation \uXXXX, where 'XXXX' are four hex digits. Package
works for dvips/Distiller, pdflatex, lualatex, and xelatex.
+
+What's New (2019-03-20) Changed when macros are expanded; changes are in
+response to new features of insdljs (2019/03/16) and eforms (2019/03/16).
Enjoy!
Binary files old/doc/latex/forms16be/doc/forms16be-man.pdf and new/doc/latex/forms16be/doc/forms16be-man.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/forms16be/doc/forms16be-man.tex new/doc/latex/forms16be/doc/forms16be-man.tex
--- old/doc/latex/forms16be/doc/forms16be-man.tex 2017-08-31 01:01:11.000000000 +0200
+++ new/doc/latex/forms16be/doc/forms16be-man.tex 2019-06-03 23:34:17.000000000 +0200
@@ -40,7 +40,7 @@
email={dpstory@acrotex.net},
subject=Documentation for the forms16be package,
talksite={\url{www.acrotex.net}},
- version={1.2, 2017/08/28},
+ version={1.3, 2019/03/20},
Keywords={LaTeX, form fields, UTF-16BE, AcroTeX},
copyrightStatus=True,
copyrightNotice={Copyright (C) \the\year, D. P. Story},
@@ -308,13 +308,13 @@
There are three sample files:
\begin{itemize}
-\item \texttt{forms16b3-ef.tex} uses the \pkg{eforms} package to create
+\item \texttt{forms16be-ef.tex} uses the \pkg{eforms} package to create
form fields and demonstrate how to initialize form fields using
unicode.
-\item \texttt{forms16b3-hy.tex} uses form fields created by \pkg{hyperref}.
+\item \texttt{forms16be-hy.tex} uses form fields created by \pkg{hyperref}.
\pkg{hyperref} does not support initializing the value of a field, for
example, with big-endian, so a redefinition is needed.
-\item \texttt{forms16b3-ap.tex} demonstrates the \pkg{forms16be} with
+\item \texttt{forms16be-ap.tex} demonstrates the \pkg{forms16be} with
\pkg{aeb\_pro} (\app{dvips}/\app{Distiller} workflow required). For consistency with previously
documented behavior of \pkg{aeb\_pro}, the \opt{linktoattachments} option is used to import \pkg{forms16be}.
It is not necessary, however, to use \opt{linktoattachments}.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/forms16be/examples/forms16b3-ap.tex new/doc/latex/forms16be/examples/forms16b3-ap.tex
--- old/doc/latex/forms16be/examples/forms16b3-ap.tex 2017-08-28 01:54:58.000000000 +0200
+++ new/doc/latex/forms16be/examples/forms16b3-ap.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,59 +0,0 @@
-\documentclass{article}
-\usepackage{amsmath}
-
-\usepackage[
- useacrobat,
- web={designv,forcolorpaper,tight*},
- eforms,
-% The next two option require dvips/Distiller workflow
-% linktoattachments,
-% attachsource=tex
-]{aeb_pro}
-\usepackage{forms16be}
-
-\def\cs#1{\texttt{\char`\\#1}}
-\let\pkg\textsf
-\let\opt\texttt
-\let\app\textsf
-
-\parindent0pt \parskip6pt
-
-\begin{document}
-
-This file uses \pkg{aeb\_pro}, which assumes the document author uses \app{Acrobat}. When the \opt{linktooption}
-is used, \pkg{forms16be} is automatically included, but \app{dvips/Distiller} must be used as the PDF creator. However,
-if you don't want to attach or link to files, then simply say \verb~\usepackage{forms16be}~, as is done in this
-file, but specify the \opt{useacrobat} for \pkg{aeb\_pro}. The latter is how this source file is configured. As a
-user of \app{pdflatex}, \app{lualatex}, or \app{xelatex}, you can build this source file if you have \app{Acrobat} as your default
-PDF viewer.
-
-Initialize a text field using unicode character strings,
-
-\defUniStr{VDV}{\u03B1 cos(\u03B8)}
-\defUniStr{TU}{Don \u\EURO Story "\u03B1 cos(\u03B8)"}
-
-\textField[\TU{\unicodeStr(TU)}\DV{\unicodeStr(VDV)}\V{\unicodeStr(VDV)}]{tst}{1.5in}{11bp}\olBdry
-\pushButton[\CA{\unicodeStr(VDV)}\AAmouseup{app.alert("Initialized to \\"\\u03B1 cos(\\u03B8)\\"");}]{btn}{1in}{11bp}\cgBdry[1em]
-\pushButton[\CA{Reset}\AAmouseup{this.resetForm();}]{reset}{}{11bp}
-
-Note the JavaScript alert message, we use the same markup as for \cs{defUniStr}, but use \cs{\cs{uXXXX}} rather than \cs{uXXXX}. See the source file.
-
-Initialize a combo box using unicode character strings.
-
-\defUniStr{myEuro}{\u20AC (Euro)}
-\defUniStr{myYen}{\u00A5 (Yen)}
-\defUniStr{mySheqel}{\u20AA (Sheqel)}
-\defUniStr{myPound}{\u00A3 (Pound)}
-\defUniStr{myFranc}{\u20A3 (Franc)}
-
-\comboBox[\Ff\FfEdit\DV{Euro}\V{Euro}\textFont{Arial}
-\BG{0.98 0.92 0.73}\BC{0 .6 0}]{myCombo}{1in}{11bp}
-{*{[(Euro)<\unicodeStr(myEuro)>]%
- [(Yen)<\unicodeStr(myYen)>]%
- [(Sheqel)<\unicodeStr(mySheqel)>]%
- [(Pound)<\unicodeStr(myPound)>]%
- [(Franc)<\unicodeStr(myFranc)>]}
-}
-
-\end{document}
-
Binary files old/doc/latex/forms16be/examples/forms16b3-ef.pdf and new/doc/latex/forms16be/examples/forms16b3-ef.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/forms16be/examples/forms16b3-ef.tex new/doc/latex/forms16be/examples/forms16b3-ef.tex
--- old/doc/latex/forms16be/examples/forms16b3-ef.tex 2017-08-31 01:01:11.000000000 +0200
+++ new/doc/latex/forms16be/examples/forms16b3-ef.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-\documentclass{article}
-\usepackage[designi,tight*]{web}
-\usepackage{eforms}
-\usepackage{forms16be}
-
-\previewOff
-
-
-\def\cs#1{\texttt{\char`\\#1}}
-\let\pkg\textsf
-
-\parindent0pt \parskip6pt
-
-\begin{document}
-
-Initialize a text field using unicode character strings,
-
-\defUniStr{VDV}{\u03B1 cos(\u03B8)}
-\defUniStr{TU}{Don \u\EURO Story "\u03B1 cos(\u03B8)"}
-
-\textField[\TU{\unicodeStr(TU)}\DV{\unicodeStr(VDV)}\V{\unicodeStr(VDV)}]{tst}{1.5in}{11bp}\olBdry
-
-\pushButton[\CA{\unicodeStr(VDV)}\AAmouseup{app.alert("Initialized to \\"\\u03B1 cos(\\u03B8)\\"");}]{btn}{1in}{11bp}\cgBdry[1em]
-\pushButton[\CA{Reset}\AAmouseup{this.resetForm();}]{reset}{}{11bp}
-
-Note the JavaScript alert message, we use the same markup as for
-\cs{defUniStr}, but use \cs{\cs{uXXXX}} rather than \cs{uXXXX}. See the
-source file.
-
-Initialize a combo box using unicode character strings.
-
-\defUniStr{myEuro}{\u20AC (Euro)}
-\defUniStr{myYen}{\u00A5 (Yen)}
-\defUniStr{mySheqel}{\u20AA (Sheqel)}
-\defUniStr{myPound}{\u00A3 (Pound)}
-\defUniStr{myFranc}{\u20A3 (Franc)}
-
-\comboBox[\Ff\FfEdit\DV{Euro}\V{Euro}\textFont{Arial}
-\BG{0.98 0.92 0.73}\BC{0 .6 0}]{myCombo}{1in}{11bp}
-{*{[(Euro)<\unicodeStr(myEuro)>]
- [(Yen)<\unicodeStr(myYen)>]
- [(Sheqel)<\unicodeStr(mySheqel)>]
- [(Pound)<\unicodeStr(myPound)>]
- [(Franc)<\unicodeStr(myFranc)>]}
-}
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/forms16be/examples/forms16b3-hy.tex new/doc/latex/forms16be/examples/forms16b3-hy.tex
--- old/doc/latex/forms16be/examples/forms16b3-hy.tex 2017-08-28 01:54:58.000000000 +0200
+++ new/doc/latex/forms16be/examples/forms16b3-hy.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,78 +0,0 @@
-\documentclass{article}
-%\usepackage[designv,forcolorpaper,tight*]{web}
-\usepackage{hyperref}
-\usepackage{forms16be}
-
-\defUniStr{VDV}{\u03B1 cos(\u03B8)}
-\defUniStr{TU}{Don \u\EURO Story "\u03B1 cos(\u03B8)"}
-
-\makeatletter
-% Define two new keys udefault and uvalue to take big-endian values
-\define@key{Field}{udefault}{%
- \def\Fld@udefault{#1}%
-}
-\define@key{Field}{uvalue}{%
- \Hy@pdfstringdef\Fld@uvalue{#1}%
-}
-\let\Fld@udefault\ltx@empty
-\let\Fld@uvalue\@empty
-\def\PDFForm@Text{%
- /Subtype/Widget%
- \Fld@annotflags
- \Fld@pageobjref
- \Fld@annotnames
- /FT/Tx%
- \Fld@flags
- /Q \Fld@align
- /BS<>%
- \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
- \ifx\Fld@bordercolor\relax\else 1\fi
- \ifx\Fld@bcolor\relax \else 1\fi
- \space
- \else
- /MK<<%
- \ifnum\Fld@rotation=\z@
- \else
- /R \Fld@rotation
- \fi
- \ifx\Fld@bordercolor\relax
- \else
- /BC[\Fld@bordercolor]%
- \fi
- \ifx\Fld@bcolor\relax
- \else
- /BG[\Fld@bcolor]%
- \fi
- >>%
- \fi
- /DA(/Helv \strip@pt\Fld@charsize\space Tf%
- \ifx\Fld@color\@empty\else\space\Fld@color\fi)%
-% Determine which key to used based on uvalue and udefault
-\ifx\Fld@udefault\ltx@empty
- /DV(\Hy@escapestring{\Fld@default})\else
- /DV<\Hy@escapestring{\Fld@udefault}>\fi
-\ifx\Fld@uvalue\@empty
- /V(\Hy@escapestring{\Fld@value})\else
- /V<\Hy@escapestring{\Fld@uvalue}>\fi
- \Fld@additionalactions
- \ifnum\Fld@maxlen>\z@/MaxLen \Fld@maxlen \fi
-}
-\makeatother
-
-\def\cs#1{\texttt{\char`\\#1}}
-\let\pkg\textsf
-
-\parindent0pt \parskip6pt
-
-\begin{document}
-\begin{Form}
-
-The \pkg{hyperref} package does not support initializing form fields with big-endian, but it is possible
-to modify some \pkg{hyperref} core code to get the desired result. The maintainer can take this example
-and generalize it to all appropriate form fields and properties, it there is a demand.
-
-\def\LayoutTextField#1#2{#2}
-\TextField[uvalue={\unicodeStr(VDV)},udefault={\unicodeStr(VDV)}]{textfield}
-
-\end{Form}
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/forms16be/examples/forms16be-ap.tex new/doc/latex/forms16be/examples/forms16be-ap.tex
--- old/doc/latex/forms16be/examples/forms16be-ap.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/forms16be/examples/forms16be-ap.tex 2019-06-03 23:34:17.000000000 +0200
@@ -0,0 +1,62 @@
+\documentclass{article}
+\usepackage{amsmath}
+
+\usepackage[
+ useacrobat,
+ web={designv,forcolorpaper,tight*},
+ eforms,
+% The next two option require dvips/Distiller workflow
+% linktoattachments,
+% attachsource=tex
+]{aeb_pro}
+\usepackage{forms16be}
+
+\def\cs#1{\texttt{\char`\\#1}}
+\let\pkg\textsf
+\let\opt\texttt
+\let\app\textsf
+
+\parindent0pt \parskip6pt
+
+\begin{document}
+
+This file uses \pkg{aeb\_pro}, which assumes the document author
+uses \app{Acrobat}. When the option \opt{linktoattachments} is
+used, \pkg{forms16be} is automatically included, but
+\app{dvips/Distiller} must be used as the PDF creator. However,
+if you don't want to attach or link to files, then simply say
+\verb~\usepackage{forms16be}~, as is done in this file, but
+specify the \opt{useacrobat} for \pkg{aeb\_pro}. The latter is
+how this source file is configured. As a user of \app{pdflatex},
+\app{lualatex}, or \app{xelatex}, you can build this source file
+if you have \app{Acrobat} as your default PDF viewer.
+
+Initialize a text field using unicode character strings,
+
+\defUniStr{VDV}{\u03B1 cos(\u03B8)}
+\defUniStr{TU}{Don \u\EURO Story "\u03B1 cos(\u03B8)"}
+
+\textField[\TU{\unicodeStr(TU)}\DV{\unicodeStr(VDV)}\V{\unicodeStr(VDV)}]{tst}{1.5in}{11bp}\olBdry
+\pushButton[\CA{\unicodeStr(VDV)}\AAmouseup{app.alert("Initialized to \\"\\u03B1 cos(\\u03B8)\\"");}]{btn}{1in}{11bp}\cgBdry[1em]
+\pushButton[\CA{Reset}\AAmouseup{this.resetForm();}]{reset}{}{11bp}
+
+Note the JavaScript alert message, we use the same markup as for \cs{defUniStr}, but use \cs{\cs{uXXXX}} rather than \cs{uXXXX}. See the source file.
+
+Initialize a combo box using unicode character strings.
+
+\defUniStr{myEuro}{\u20AC (Euro)}
+\defUniStr{myYen}{\u00A5 (Yen)}
+\defUniStr{mySheqel}{\u20AA (Sheqel)}
+\defUniStr{myPound}{\u00A3 (Pound)}
+\defUniStr{myFranc}{\u20A3 (Franc)}
+
+\comboBox[\Ff\FfEdit\DV{Euro}\V{Euro}\textFont{Arial}
+\BG{0.98 0.92 0.73}\BC{0 .6 0}]{myCombo}{1in}{11bp}
+{*{[(Euro)<\unicodeStr(myEuro)>]%
+ [(Yen)<\unicodeStr(myYen)>]%
+ [(Sheqel)<\unicodeStr(mySheqel)>]%
+ [(Pound)<\unicodeStr(myPound)>]%
+ [(Franc)<\unicodeStr(myFranc)>]}
+}
+
+\end{document}
Binary files old/doc/latex/forms16be/examples/forms16be-ef.pdf and new/doc/latex/forms16be/examples/forms16be-ef.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/forms16be/examples/forms16be-ef.tex new/doc/latex/forms16be/examples/forms16be-ef.tex
--- old/doc/latex/forms16be/examples/forms16be-ef.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/forms16be/examples/forms16be-ef.tex 2019-06-03 23:34:17.000000000 +0200
@@ -0,0 +1,56 @@
+\documentclass{article}
+\usepackage[designi,tight*]{web}
+\usepackage{eforms}[2019/05/24] % this version supports \tops, see below
+\usepackage{forms16be}
+
+% \previewOn \pmcaOn % try compiling with these switches un-commented
+
+
+\def\cs#1{\texttt{\char`\\#1}}
+\let\pkg\textsf
+
+\parindent0pt \parskip6pt
+
+\begin{document}
+
+Initialize a text field using unicode character strings,
+
+
+\defUniStr{VDV}{\u03B1 cos(\u03B8)}
+\defUniStr{TU}{Don \u\EURO Story "\u03B1 cos(\u03B8)"}
+
+Text field: \textField[%
+ \TU{\unicodeStr(TU)}
+ \DV{\unicodeStr(VDV)}
+ \V{\tops{$\alpha\cos(\theta)$}{\unicodeStr(VDV)}}
+]{tst}{1.5in}{11bp}\olBdry
+
+Button: \pushButton[%
+ \CA{\tops{$\alpha\cos(\theta)$}{\unicodeStr(VDV)}}
+ \AAmouseup{app.alert("Initialized to \\"\\u03B1 cos(\\u03B8)\\"");}
+]{btn}{1in}{11bp}\cgBdry[1em]
+
+\pushButton[\CA{Reset}\AAmouseup{this.resetForm();}]{reset}{}{11bp}
+
+Note the JavaScript alert message, we use the same markup as for
+\cs{defUniStr}, but use \cs{\cs{uXXXX}} rather than \cs{uXXXX}. See the
+source file.
+
+Initialize a combo box using unicode character strings.
+
+\defUniStr{myEuro}{\u20AC (Euro)}
+\defUniStr{myYen}{\u00A5 (Yen)}
+\defUniStr{mySheqel}{\u20AA (Sheqel)}
+\defUniStr{myPound}{\u00A3 (Pound)}
+\defUniStr{myFranc}{\u20A3 (Franc)}
+
+\comboBox[\Ff\FfEdit\DV{Euro}\V{\tops{Euro}{Euro}}\textFont{Arial}
+\BG{0.98 0.92 0.73}\BC{0 .6 0}]{myCombo}{1in}{11bp}
+{*{[(Euro)<\unicodeStr(myEuro)>]
+ [(Yen)<\unicodeStr(myYen)>]
+ [(Sheqel)<\unicodeStr(mySheqel)>]
+ [(Pound)<\unicodeStr(myPound)>]
+ [(Franc)<\unicodeStr(myFranc)>]}
+}
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/forms16be/examples/forms16be-hy.tex new/doc/latex/forms16be/examples/forms16be-hy.tex
--- old/doc/latex/forms16be/examples/forms16be-hy.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/forms16be/examples/forms16be-hy.tex 2019-06-03 23:34:17.000000000 +0200
@@ -0,0 +1,78 @@
+\documentclass{article}
+%\usepackage[designv,forcolorpaper,tight*]{web}
+\usepackage{hyperref}
+\usepackage{forms16be}
+
+\defUniStr{VDV}{\u03B1 cos(\u03B8)}
+\defUniStr{TU}{Don \u\EURO Story "\u03B1 cos(\u03B8)"}
+
+\makeatletter
+% Define two new keys udefault and uvalue to take big-endian values
+\define@key{Field}{udefault}{%
+ \def\Fld@udefault{#1}%
+}
+\define@key{Field}{uvalue}{%
+ \Hy@pdfstringdef\Fld@uvalue{#1}%
+}
+\let\Fld@udefault\ltx@empty
+\let\Fld@uvalue\@empty
+\def\PDFForm@Text{%
+ /Subtype/Widget%
+ \Fld@annotflags
+ \Fld@pageobjref
+ \Fld@annotnames
+ /FT/Tx%
+ \Fld@flags
+ /Q \Fld@align
+ /BS<>%
+ \ifcase0\ifnum\Fld@rotation=\z@ \else 1\fi
+ \ifx\Fld@bordercolor\relax\else 1\fi
+ \ifx\Fld@bcolor\relax \else 1\fi
+ \space
+ \else
+ /MK<<%
+ \ifnum\Fld@rotation=\z@
+ \else
+ /R \Fld@rotation
+ \fi
+ \ifx\Fld@bordercolor\relax
+ \else
+ /BC[\Fld@bordercolor]%
+ \fi
+ \ifx\Fld@bcolor\relax
+ \else
+ /BG[\Fld@bcolor]%
+ \fi
+ >>%
+ \fi
+ /DA(/Helv \strip@pt\Fld@charsize\space Tf%
+ \ifx\Fld@color\@empty\else\space\Fld@color\fi)%
+% Determine which key to used based on uvalue and udefault
+\ifx\Fld@udefault\ltx@empty
+ /DV(\Hy@escapestring{\Fld@default})\else
+ /DV<\Hy@escapestring{\Fld@udefault}>\fi
+\ifx\Fld@uvalue\@empty
+ /V(\Hy@escapestring{\Fld@value})\else
+ /V<\Hy@escapestring{\Fld@uvalue}>\fi
+ \Fld@additionalactions
+ \ifnum\Fld@maxlen>\z@/MaxLen \Fld@maxlen \fi
+}
+\makeatother
+
+\def\cs#1{\texttt{\char`\\#1}}
+\let\pkg\textsf
+
+\parindent0pt \parskip6pt
+
+\begin{document}
+\begin{Form}
+
+The \pkg{hyperref} package does not support initializing form fields with big-endian, but it is possible
+to modify some \pkg{hyperref} core code to get the desired result. The maintainer can take this example
+and generalize it to all appropriate form fields and properties, it there is a demand.
+
+\def\LayoutTextField#1#2{#2}
+\TextField[uvalue={\unicodeStr(VDV)},udefault={\unicodeStr(VDV)}]{textfield}
+
+\end{Form}
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/forms16be.doc.tlpobj new/tlpkg/tlpobj/forms16be.doc.tlpobj
--- old/tlpkg/tlpobj/forms16be.doc.tlpobj 2019-02-28 03:39:00.000000000 +0100
+++ new/tlpkg/tlpobj/forms16be.doc.tlpobj 2019-06-04 01:39:15.000000000 +0200
@@ -1,13 +1,13 @@
name forms16be.doc
category Package
-revision 45178
+revision 51305
shortdesc doc files of forms16be
relocated 1
-docfiles size=336
+docfiles size=381
RELOC/doc/latex/forms16be/README.md
RELOC/doc/latex/forms16be/doc/forms16be-man.pdf
RELOC/doc/latex/forms16be/doc/forms16be-man.tex
- RELOC/doc/latex/forms16be/examples/forms16b3-ap.tex
- RELOC/doc/latex/forms16be/examples/forms16b3-ef.pdf
- RELOC/doc/latex/forms16be/examples/forms16b3-ef.tex
- RELOC/doc/latex/forms16be/examples/forms16b3-hy.tex
+ RELOC/doc/latex/forms16be/examples/forms16be-ap.tex
+ RELOC/doc/latex/forms16be/examples/forms16be-ef.pdf
+ RELOC/doc/latex/forms16be/examples/forms16be-ef.tex
+ RELOC/doc/latex/forms16be/examples/forms16be-hy.tex
++++++ forms16be.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/forms16be/forms16be.sty new/tex/latex/forms16be/forms16be.sty
--- old/tex/latex/forms16be/forms16be.sty 2017-08-31 01:01:11.000000000 +0200
+++ new/tex/latex/forms16be/forms16be.sty 2019-06-03 23:34:17.000000000 +0200
@@ -8,9 +8,8 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% forms16be.sty package, %%
-%% Copyright (C) 2017 D. P. Story %%
+%% Copyright (C) 2017--2019 %%
%% dpstory@acrotex.net %%
-%% storyd@nwfsc.edu %%
%% %%
%% This program can redistributed and/or modified under %%
%% the terms of the LaTeX Project Public License %%
@@ -20,7 +19,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{forms16be}
- [2017/08/28 v1.2 Provides UTF-16BE encoding for text strings (dps)]
+ [2019/03/20 v1.3 Provides UTF-16BE encoding for text strings (dps)]
\def\U@csarg#1#2{\expandafter#1\csname#2\endcsname}
\providecommand\aeb@exiii{\expandafter\expandafter\expandafter}
\def\fbe@sanitize{\@makeother\"\@makeother\#\@makeother\$%
@@ -37,15 +36,20 @@
\aeb@exiii\@getRawUnicode\fi#1}
\def\getRawUnicode@p(#1){\expandafter\@getRawUnicode#1}
\providecommand{\@getRawUnicode}[4]{#1#2#3#4\@stringiiUnicode}
-\def\unicodeStr(#1){\expandafter
- \ifx\csname aeb@aDescript@#1\endcsname\relax
- FEFF#1\else\aeb@exiii\stringiiUnicode\aref(#1)\relax\fi}
\def\defUniStr#1{\def\U@uniStrName{#1}\bgroup\fbe@sanitize
\obeyspaces\getUniDescript}
{\obeyspaces\gdef\getUniDescript#1{\gdef\U@description{#1}%
\U@NameUniStr}}
\def\U@NameUniStr{\global\U@csarg\let
- {aeb@aDescript@\U@uniStrName}\U@description\egroup}
+ {aeb@aDescript@\U@uniStrName}\U@description\egroup
+ \U@csarg\xdef{expanded@\U@uniStrName}%
+ {\U@buildUnicodeStr(\U@uniStrName)}}
+\def\U@buildUnicodeStr(#1){\expandafter
+ \ifx\csname aeb@aDescript@#1\endcsname\relax
+ \else\aeb@exiii\stringiiUnicode\aref(#1)\relax\fi}
+\def\unicodeStr(#1){\expandafter
+ \ifx\csname aeb@aDescript@#1\endcsname\relax
+ FEFF#1\else\csname expanded@#1\endcsname\fi}
\InputIfFileExists{uni4basic-latin.def}{\PackageInfo{forms16be}
{Inputting uni4basic-latin.def\MessageBreak definitions}}
{\PackageError{forms16be}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/forms16be/uni4basic-latin.def new/tex/latex/forms16be/uni4basic-latin.def
--- old/tex/latex/forms16be/uni4basic-latin.def 2017-08-28 01:54:58.000000000 +0200
+++ new/tex/latex/forms16be/uni4basic-latin.def 2019-06-03 23:34:17.000000000 +0200
@@ -8,9 +8,8 @@
%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% forms16be.sty package, %%
-%% Copyright (C) 2017 D. P. Story %%
+%% Copyright (C) 2017--2019 %%
%% dpstory@acrotex.net %%
-%% storyd@nwfsc.edu %%
%% %%
%% This program can redistributed and/or modified under %%
%% the terms of the LaTeX Project Public License %%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/forms16be.tlpobj new/tlpkg/tlpobj/forms16be.tlpobj
--- old/tlpkg/tlpobj/forms16be.tlpobj 2019-02-28 03:39:00.000000000 +0100
+++ new/tlpkg/tlpobj/forms16be.tlpobj 2019-06-04 01:39:16.000000000 +0200
@@ -1,6 +1,6 @@
name forms16be
category Package
-revision 45178
+revision 51305
shortdesc Initialize form properties using big-endian encoding
relocated 1
longdesc This package provides support for UTF-16BE Unicode character
@@ -19,7 +19,7 @@
RELOC/tex/latex/forms16be/forms16be.sty
RELOC/tex/latex/forms16be/uni4basic-latin.def
catalogue-ctan /macros/latex/contrib/forms16be
-catalogue-date 2018-06-12 05:18:15 +0200
+catalogue-date 2019-06-03 19:37:03 +0200
catalogue-license lppl1.2
catalogue-topics form-fillin pdf-feat adobe-distiller
-catalogue-version 1.2
+catalogue-version 1.3
++++++ fourier.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fourier/README new/doc/fonts/fourier/README
--- old/doc/fonts/fourier/README 2006-01-09 01:47:01.000000000 +0100
+++ new/doc/fonts/fourier/README 2020-03-05 01:50:34.000000000 +0100
@@ -1,14 +1,36 @@
-Fourier-GUTenberg distribution, Michel Bovani michel.bovani@wanadoo.fr
+Fourier-GUTenberg distribution, Michel Bovani michel.bovani@icloud.com
1 VERSIONS
2 LICENCE
3 INSTALLATION
-4 CONFIGURATION
-5 USAGE
+4 USAGE
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
1 VERSION
-This version number is 1.4.1 (2005-1-30)
+This version number is 2.2 (2020-03-03)
+NEW in version 2.2 :
+* fourier-orns have now a noOTF option in order to use it with type1 PostScript fonts and luaTeX/XeTeX engines.
+* chars in the OTF fonts are now slotted in place of digits or letters.
+* fourier calls fournier-orns with the noOTF option.
+* the \pertenthousand fourier composite char, which have been dropped by the new latex, is back.
+
+NEW in version 2.1:
+* in fourier-orns.sty, the otf versions of the font are now searched by file name rather than by font name in order xelatex to find them easily.
+Thanks to Marcel Krüger and Norbert Preining for pointing this out.
+* in fourier-orns.sty, the \danger command is now also defined in the otf context.
+* in fourier.sty there is now a warning message to suggest the use of fourier-otf.sty when xelatex or lualatex are used. Thanks to Daniel Flipo for suggesting this.
+
+
+NEW in version 2.0:
+* In expert modes (need you buy the expert utopia pfb fonts):
+ - Possibility is provided to use superior letters of the commercial utopia font
+ - Slanted small caps
+* New ornaments
+ - Six oldpilcrow variants
+ - \leafNW, \leafSE and \leafSW
+ - The \danger command is now deprecated and replaced by \warning
+ - Opentype versions of the ornament fonts are provided and can be used with lualatex or xelatex (thanks to Daniel Flipo)
+
NEW in version 1.4.1:
* no more gap in long arrows symbols
@@ -156,29 +178,7 @@
(or to modify this file). Mac fonts should be contverted to pfb format (with
t1unmac, for instance).
-4 - CONFIGURATION
-With updmap
-run
-% updmap --enable Map fourier.map
-
-if you need to install the commercial packages
-
-% updmap --enable Map fourier-utopia-expert.map
-
-If you don't have updmap or don't want to use it
-For dvips, add these lines in config.ps
-p +fourier.map
-eventually
-p +fourier-utopia-expert.map
-
-For pdf(la)tex add these lines in pdftex.cfg
-map +fourier.map
-eventually
-map +fourier-utopia-expert.map
-
-If you have problems when installing fourier, please tell me.
-
-5 - USAGE
+4 - USAGE
If you need more symbols ask me (I don't promise anything if you need a
complete alphabet!)
Binary files old/doc/fonts/fourier/fourier-doc-en.pdf and new/doc/fonts/fourier/fourier-doc-en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fourier/fourier-doc-en.tex new/doc/fonts/fourier/fourier-doc-en.tex
--- old/doc/fonts/fourier/fourier-doc-en.tex 2006-01-09 01:47:01.000000000 +0100
+++ new/doc/fonts/fourier/fourier-doc-en.tex 2019-12-01 22:47:27.000000000 +0100
@@ -1,15 +1,15 @@
\documentclass[a4paper,11pt]{article}
-\usepackage[latin1]{inputenc}
+\usepackage[utf8]{inputenc}
\usepackage{amsmath}
\usepackage[sloped]{fourier}
\usepackage{bm}
-\usepackage[frenchb,english]{babel}
+\usepackage[french,english]{babel}
\renewcommand{\labelitemi}{\lefthand}
\setlength{\leftmargini}{1em}
\newcommand{\fourier}{Fourier-GUT\textit{enberg}}
\renewcommand{\ttdefault}{lmtt}
\title{\decofourleft{}\,Fourier-GUT{\itshape enberg}\,\decofourright}
-\author{Michel Bovani\\\texttt{michel.bovani@wanadoo.fr}}
+\author{Michel Bovani\\\texttt{michel.bovani@icloud.com}}
%%\renewcommand{\FrenchLabelItem}{\textbullet}
\begin{document}
\maketitle
@@ -27,7 +27,7 @@
\item \fourier{} provides all complementary typefaces needed to allow Utopia based \TeX{} typesetting.
The system is absolutely stand-alone: apart from Utopia and fourier, no other typefaces are required.
\item \fourier{} provides two greeks, slanted and upright, that may be used in the same document.
-\item It make it possible to typeset ``� la french'': upright roman uppercases,
+\item It make it possible to typeset ``à la française'': upright roman uppercases,
and upright greek in math mode.
\item \fourier{} do not use OT1 encoding at all. As in standard \LaTeX{} greek uppercases
are in the text OT1 font, maths encodings have been redefined.
@@ -46,60 +46,6 @@
\textit{Please don't call it if you call \texttt{fourier}}.
\end{itemize}
-\section{Installation \textsc{\&} setup}
-The texmf tree provides a standard TDS.
-You have to install all the \texttt{fourier} directories of the fourier texmf tree
-in one of yours texmf trees, according to your TDS specifications.
-
-\begin{description}
-\item[WARNING:] Note that in not up to date distributions, the \fourier{} map files
-should be in
-
-\texttt{texmf/dvips/fourier}
-
-and \emph{not} in
-
-\texttt{texmf/fonts/map/dvips/fourier}
-\end{description}
-If you don't still have the four Utopia fonts, you have to install them too in
-
-\texttt{texmf/fonts/type1/adobe/utopia/}
-
-If you have a licence for the commercial Utopia packages, you have to
-rename the *.pfb files to suit the declarations in \texttt{fourier-utopia-expert.map} (or to
-modify this file). Mac fonts should be contverted to pfb format (with
-\texttt{t1unmac}, for instance).
-
-You have now to setup your installation.
-Depending, of the choosen texmf tree, it is possible that you have to regenerate
-first the database (\texttt{mktexlsr} command, for instance).
-
-Then, if you have a recent \texttt{web2c} distribution
-(teTeX, TeXlive, fpTeX...), just run updmap.
-
-\begin{description}
-\item[UNIX:]\quad
-\begin{verbatim}
- % updmap --enable Map fourier.map
-\end{verbatim}
-If you want to install the commercial complement too (remember that you will have to buy it...)
-\begin{verbatim}
- % updmap --enable Map fourier-utopia-expert.map
-\end{verbatim}
-\item[Windows:]\quad
-\begin{verbatim}
- % updmap --enable Map=fourier.map
-\end{verbatim}
-If you want to install the commercial complement too (remember that you will have to buy it...)
-\begin{verbatim}
- % updmap --enable Map=fourier-utopia-expert.map
-\end{verbatim}
-
-\end{description}
- Please note that the setting
- of the dvi previewer is not documented here. On a \texttt{web2c} distribution, \texttt{updmap} should do it.
-
-If you don't have \texttt{updmap} or if the syntax doens not match the described command, please tell me.
\section{Usage}
\subsection{Calling \fourier}
@@ -111,11 +57,14 @@
\begin{enumerate}
\item \texttt{sloped} (default): in maths, lowercase greek is slanted, uppercase greek is upright, roman uppercase are slanted.
\[M\in\Gamma \iff OM=x\rho\]
-\item \texttt{upright} (� la french): in maths, lowercase and uppercase greeks are upright, and so is roman uppercase.
+\item \texttt{upright} (à la french): in maths, lowercase and uppercase greeks are upright, and so is roman uppercase.
\[\mathrm{M}\in\Gamma \iff \mathrm{OM}=x\otherrho\]
\item \texttt{widespace}: this option offers a larger interword space to those who think that the standard space of Utopia is too narrow\ldots
\item \texttt{expert}, \texttt{oldstyle}, \texttt{fulloldstyle}: in order to use these options you need the commercial complements of Utopia.
The \texttt{expert} option provides small caps (not faked), semi-bold, extra-black, (see the commands below) and more symbols in the TS1 companion encoding. The \texttt{oldstyle} option is the same, with oldstyle digits in text mode, and the \texttt{fulloldstyle} option is the same with oldstyle digits in text mode and in math mode.
+
+\lefthand{} (new in \fourier{} 2.0) With \texttt{expert}, \texttt{oldstyle} or \texttt{fulloldstyle} options, you get the \verb=\superieures= new command, which permits to use the superior letters of the (commercial) expert font if those letters exsists. You also get a new \texttt{sci} font shape (\verb=\fontshape{sci}\selectfont=) and the two associated NFSS commands \verb=\scishape= and \verb=\textsci=. Those commands are for slanted small capitals. \warning{} The \texttt{it} and \texttt{sc} selectors are \emph{not} combinable to get those new features.
+
\item \texttt{poorman} (default): if you don't have the commercial complement, you must use this option. The main disadvantage is that small caps will became \textsc{reduced Caps}.
\end{enumerate}
\subsection{Text commands}
@@ -143,27 +92,7 @@
\end{itemize}
\par
\subsection{Fourier ornaments}
-\fourier{} provides several logos and ornaments:
-\begin{itemize}
-\item A ``starred'' bullet: \verb=\starredbullet= \starredbullet
-\item A variant of the euro symbol: \verb=\eurologo= \eurologo, \textbf{\eurologo}.
-Please note that the \verb=\textit= command will not change the slant of this symbol, but \verb=\textsl{\eurologo}= \textsl{\eurologo} will do it.
-\item Decos and logos: \verb=\noway= \noway, \verb=\danger= \danger, \verb=\textxswup= \textxswup,
-\verb=\textxswdown= \textxswdown, \verb=\decoone= \decoone, \verb=\decotwo= \decotwo,
-\verb=\decothreeleft= \decothreeleft, \verb=\decothreeright= \decothreeright,
-\verb=\decofourleft= \decofourleft, \verb=\decofourright= \decofourright,\verb=\floweroneleft= \floweroneleft,
-\verb=\floweroneright= \floweroneright,\verb=\lefthand= \lefthand, \verb=\righthand= \righthand, \verb=\decosix= \decosix, \verb=\bomb= \bomb.
-\item Smileys: \verb=\grimace= \grimace, \verb=\textthing= \textthing.
-\item Leaves: \verb=\leafleft= \leafleft, \verb=\leafright=\leafright, \verb=\leafNE= \leafNE, \verb=\aldineleft= \aldineleft,
-\\ \verb=\aldineright= \aldineright, \verb=\aldine= \aldine, \verb=\aldinesmall= \aldinesmall.
-\end{itemize}
-
-Finally, some symbols are also provided in math mode, with other names:
-\begin{itemize}
-\item\verb=$\thething$= $\thething$ is a \emph{QEDsymbol}
-for a false proof. Of course, you don't need it!
-\item\verb=$\xswordsup$=, \verb=$\xsworddown$= $\xswordsup$ may be used as tags for a debatted statement, or for anything else. $\xswordsdown$
-\end{itemize}
+\fourier{} calls the fourier-ornaments companion package. See the \texttt{fourier-orns} documentation for details.
\subsection{Mathematical encodings}
\subsection*{Compatibility with amsmath}
Binary files old/doc/fonts/fourier/fourier-orns-doc.pdf and new/doc/fonts/fourier/fourier-orns-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fourier/fourier-orns-doc.tex new/doc/fonts/fourier/fourier-orns-doc.tex
--- old/doc/fonts/fourier/fourier-orns-doc.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/fourier/fourier-orns-doc.tex 2020-03-05 01:50:34.000000000 +0100
@@ -0,0 +1,131 @@
+% !TEX TS-program = LuaLaTeX
+\documentclass[a4paper,11pt,draft]{article}
+\usepackage[utf8]{inputenc}
+\usepackage{array,xcolor}
+\usepackage{fourier-orns}
+\usepackage[french,english]{babel}
+\setlength{\leftmargini}{1em}
+\newcommand{\fourier}{Fourier-GUT\kern-0.15em\textit{enberg}}
+\title{\floweroneleft{}\,The \emph{fourier-orns} package\,\floweroneright}
+\author{Michel Bovani\\\texttt{michel.bovani@icloud.com}}
+%%\renewcommand{\FrenchLabelItem}{\textbullet}
+\renewcommand\arraystretch{1.5}
+\renewcommand{\labelitemi}{\starredbullet}
+\setmainfont{Linux Libertine O}
+\begin{document}
+\maketitle
+
+\fourier{} provides several logos and ornaments: they are now usable by those who do not want to use
+the \fourier{} font system. In this case, just call the \textit{fourier-orns} package (\verb=\usepackage{fourier-orns}=).
+Remember that:
+\begin{itemize}
+\item You have to install \fourier{} anyway.
+\item If you call \textit{fourier}, you should \emph{not} call \textit{fourier-orns}, because \textit{fourier} will do it anyway.
+All the commands described here may be used with \textit{fourier}.
+\item Thanks to Daniel Flipo (\texttt{daniel.flipo@free.fr}), there are now opentype versions of the fourier ornaments fonts. Those fonts are automatically selected and the \texttt{fontspec} package is called, when the \TeX{} engine is lua\TeX{} or Xe\TeX{}.
+\item There is a \texttt{noOTF} option which force the use of PostScript type 1 fonts, even when the \TeX{} engine is lua\TeX{} or Xe\TeX{}. Note that the \textit{fourier} call for \textit{fourier-orns} uses that option.
+\end{itemize}
+
+\bigskip
+
+Here are the provided symbols:
+
+\begin{itemize}
+\item A variant of the euro symbol: \verb=\eurologo= \eurologo, \textbf{\eurologo}.
+
+Please note that the \verb=\textit= command will not change the slant of this symbol,
+but \verb=\textsl{\eurologo}= \textsl{\eurologo} will do it.
+
+\item A ``starred'' bullet \verb=\starredbullet=: used as the item mark in this document.
+\item Smileys typesetted in \verb=\LARGE= size:
+
+\begin{tabular}{l>{\centering\LARGE}p{2cm}l>{\centering\LARGE}p{2cm}}
+ \verb=\grimace=& \grimace&\verb=\textthing= \textthing
+ \end{tabular}
+
+\clearpage
+\item Decos and logos typesetted in \verb=\LARGE= size:
+
+
+\begin{tabular}{l>{\centering\LARGE}p{2cm}l>{\centering\LARGE}p{2cm}}
+\verb=\noway= &\noway&\verb=\warning=& \warning\tabularnewline
+\verb=\textxswup=&\textxswup&\verb=\textxswdown= &\textxswdown\tabularnewline
+ \verb=\decoone= &\decoone& \verb=\decotwo= &\decotwo\tabularnewline
+ \verb=\decothreeleft= &\decothreeleft& \verb=\decothreeright=& \decothreeright\tabularnewline
+ \verb=\decofourleft= &\decofourleft&\verb=\decofourright= &\decofourright\tabularnewline
+ \verb=\floweroneleft= &\floweroneleft&\verb=\floweroneright= &\floweroneright\tabularnewline
+ \verb=\lefthand= &\lefthand&\verb=\righthand=& \righthand\tabularnewline
+\verb=\decosix= &\decosix&\verb=\bomb=&\bomb
+ \end{tabular}
+
+ \noindent{\Large\textcolor{red}{\warning}} The old command \verb=\danger= (fourier-orns 1.1) is now deprecated: use \verb=\warning= instead. Note that \verb=\danger= is still usable, provided you \emph{don't} use the \texttt{unicode-math} package.
+\item Leaves typesetted in \verb=\LARGE= size:
+
+\begin{tabular}{l>{\centering\LARGE}p{2cm}l>{\centering\LARGE}p{2cm}}
+\verb=\leafleft= &\leafleft&\verb=\leafright=&\leafright\tabularnewline
+\verb=\leafNW= &\leafNW& \verb=\leafNE=&\leafNE\tabularnewline
+ \verb=\leafSE= &\leafSE& \verb=\leafSW=&\leafSW\tabularnewline
+ \verb=\aldineleft= &\aldineleft&\verb=\aldineright=& \aldineright\tabularnewline
+ \verb=\aldine=&\aldine& \verb=\aldinesmall=& \aldinesmall
+ \end{tabular}
+\item A complete set of old style pilcrows here in \verb=\LARGE= size:
+
+\begin{tabular}{l>{\centering\LARGE}p{1cm}l>{\centering\LARGE}p{3cm}}
+\verb=\oldpilcrowone=&\oldpilcrowone&\verb=\oldpilcrowfive=&\oldpilcrowfive\tabularnewline
+\verb=\oldpilcrowtwo=&\oldpilcrowtwo&\verb=\oldpilcrowsix=&\oldpilcrowsix\tabularnewline
+\verb=\oldpilcrowthree=&\oldpilcrowthree&&\tabularnewline
+\verb=\oldpilcrowfour=&\oldpilcrowfour
+\end{tabular}
+
+Old pilcrow ``with tails'' can be used like that:
+\begin{verbatim}
+\definecolor{newred}{cmyk}{0,1,1,0.1}
+\noindent \textcolor{newred}{\oldpilcrowfour}\,We few,
+ we happy few, we band of brothers; \textcolor{newred}
+ {\oldpilcrowfive}\,For he to-day that sheds his blood with
+ me \textcolor{newred}{\oldpilcrowsix}\,Shall be my brother;
+be he ne'er so vile, \textcolor{newred}
+{\oldpilcrowfour}\,This day shall gentle his condition.
+\end{verbatim}
+
+\definecolor{newred}{cmyk}{0,1,1,0.1}
+\noindent \textcolor{newred}{\oldpilcrowfour}\,We few,
+ we happy few, we band of brothers; \textcolor{newred}
+ {\oldpilcrowfive}\,For he to-day that sheds his blood with
+ me \textcolor{newred}{\oldpilcrowsix}\,Shall be my brother;
+be he ne'er so vile, \textcolor{newred}
+{\oldpilcrowfour}\,This day shall gentle his condition.
+\end{itemize}
+
+{\centering {\Large\FourierOrns W}
+
+}
+\vspace\baselineskip
+
+Finally, the opentype version of \textit{fourier-orns} provides a \verb+\FourierOrns+ command in order to select the font. As chars in the font are now slotted in place of digits or letters, the correspondence in the table below can be used, but, remember, only when using opentype fonts.
+
+\begin{center}\begin{tabular}{ccccccccccc}
+\hline
+1&2&3&4&5&6&7&8&9&0\\
+%\hline
+{\FourierOrns 1}&{\FourierOrns 2}&{\FourierOrns 3}&{\FourierOrns 4}&
+{\FourierOrns 5}&{\FourierOrns 6}&{\FourierOrns 7}&{\FourierOrns 8}&{\FourierOrns 9}&{\FourierOrns 0}\\
+\hline
+A&B&C&D&E&F&G&H&I&J\\
+%\hline
+{\FourierOrns A}&{\FourierOrns B}&{\FourierOrns C}&{\FourierOrns D}&{\FourierOrns E}&
+{\FourierOrns F}&{\FourierOrns G}&{\FourierOrns H}&{\FourierOrns I}&{\FourierOrns J}\\
+\hline
+K&L&M&N&O&P&Q&R&S&T\\
+%\hline
+{\FourierOrns K }&{\FourierOrns L}&{\FourierOrns M}&{\FourierOrns N}&{\FourierOrns O}&
+{\FourierOrns P}&{\FourierOrns Q}&{\FourierOrns R}&{\FourierOrns S}&{\FourierOrns T}\\
+\hline
+U&V&W&X&Y&Z\\
+{\FourierOrns U}&{\FourierOrns V}&{\FourierOrns W}&{\FourierOrns X}&{\FourierOrns Y}
+&{\FourierOrns Z}\\
+\hline
+\end{tabular}\end{center}
+
+For instance, you could type \verb+{\FourierOrns E 2 F}+ to obtain {\FourierOrns E 2 F}.
+\end{document}
\ No newline at end of file
Binary files old/doc/fonts/fourier/fourier-orns.pdf and new/doc/fonts/fourier/fourier-orns.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fourier/fourier-orns.tex new/doc/fonts/fourier/fourier-orns.tex
--- old/doc/fonts/fourier/fourier-orns.tex 2006-01-09 01:47:01.000000000 +0100
+++ new/doc/fonts/fourier/fourier-orns.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,63 +0,0 @@
-\documentclass[a4paper,11pt]{article}
-\usepackage[latin1]{inputenc}
-\usepackage{array}
-\usepackage{fourier-orns}
-\usepackage[frenchb,english]{babel}
-\setlength{\leftmargini}{1em}
-\newcommand{\fourier}{Fourier-GUT\kern-0.15em\textit{enberg}}
-\title{\floweroneleft{}\,The \emph{fourier-orns} package\,\floweroneright}
-\author{Michel Bovani\\\texttt{michel.bovani@wanadoo.fr}}
-%%\renewcommand{\FrenchLabelItem}{\textbullet}
-\renewcommand\arraystretch{1.5}
-\renewcommand{\labelitemi}{\starredbullet}
-\begin{document}
-\maketitle
-
-\fourier{} provides several logos and ornaments: they are now usable by those who do not want to use
-the \fourier{} font system. In this case, just call the \textit{fourier-orns} package (\verb=\usepackage{fourier-orns}=).
-Remember that:
-\begin{itemize}
-\item You have to install \fourier{} anyway.
-\item If you call \textit{fourier}, you should \emph{not} call \textit{fourier-orns}, because \textit{fourier} will do it anyway.
-All the commands described here may be used with \textit{fourier}.
-\end{itemize}
-Here are the provided symbols:
-
-\begin{itemize}
-\item A variant of the euro symbol: \verb=\eurologo= \eurologo, \textbf{\eurologo}.
-
-Please note that the \verb=\textit= command will not change the slant of this symbol,
-but \verb=\textsl{\eurologo}= \textsl{\eurologo} will do it.
-
-\item A ``starred'' bullet \verb=\starredbullet=: used as the item mark in this document.
-\item Decos and logos typesetted in \verb=\LARGE= size:
-
-
-\begin{tabular}{l>{\centering\LARGE}p{2cm}l>{\centering\LARGE}p{2cm}}
-\verb=\noway= &\noway&\verb=\danger=& \danger\tabularnewline
-\verb=\textxswup=&\textxswup&\verb=\textxswdown= &\textxswdown\tabularnewline
- \verb=\decoone= &\decoone& \verb=\decotwo= &\decotwo\tabularnewline
- \verb=\decothreeleft= &\decothreeleft& \verb=\decothreeright=& \decothreeright\tabularnewline
- \verb=\decofourleft= &\decofourleft&\verb=\decofourright= &\decofourright\tabularnewline
- \verb=\floweroneleft= &\floweroneleft&\verb=\floweroneright= &\floweroneright\tabularnewline
- \verb=\lefthand= &\lefthand&\verb=\righthand=& \righthand\tabularnewline
-\verb=\decosix= &\decosix&\verb=\bomb=&\bomb
- \end{tabular}
-\item Smileys typesetted in \verb=\LARGE= size:
-
-\begin{tabular}{l>{\centering\LARGE}p{2cm}l>{\centering\LARGE}p{2cm}}
- \verb=\grimace=& \grimace&\verb=\textthing= \textthing
- \end{tabular}
-\item Leaves typesetted in \verb=\LARGE= size:
-
-\begin{tabular}{l>{\centering\LARGE}p{2cm}l>{\centering\LARGE}p{2cm}}
-\verb=\leafleft= &\leafleft&\verb=\leafright=&\leafright\tabularnewline
- \verb=\leafNE= &\leafNE& \verb=\aldine=&\aldine\tabularnewline
- \verb=\aldineleft= &\aldineleft&\verb=\aldineright=& \aldineright\tabularnewline
- \verb=\aldinesmall=& \aldinesmall&&
- \end{tabular}
-\end{itemize}
-
-
-
-\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fourier.doc.tlpobj new/tlpkg/tlpobj/fourier.doc.tlpobj
--- old/tlpkg/tlpobj/fourier.doc.tlpobj 2019-02-28 03:39:00.000000000 +0100
+++ new/tlpkg/tlpobj/fourier.doc.tlpobj 2020-03-05 02:15:36.000000000 +0100
@@ -1,11 +1,11 @@
name fourier.doc
category Package
-revision 15878
+revision 54090
shortdesc doc files of fourier
relocated 1
-docfiles size=49
+docfiles size=82
RELOC/doc/fonts/fourier/README
RELOC/doc/fonts/fourier/fourier-doc-en.pdf
RELOC/doc/fonts/fourier/fourier-doc-en.tex
- RELOC/doc/fonts/fourier/fourier-orns.pdf
- RELOC/doc/fonts/fourier/fourier-orns.tex
+ RELOC/doc/fonts/fourier/fourier-orns-doc.pdf
+ RELOC/doc/fonts/fourier/fourier-orns-doc.tex
++++++ fourier.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/fourier/fourier-orns.afm new/fonts/afm/public/fourier/fourier-orns.afm
--- old/fonts/afm/public/fourier/fourier-orns.afm 2006-01-09 02:04:13.000000000 +0100
+++ new/fonts/afm/public/fourier/fourier-orns.afm 2019-12-01 22:47:27.000000000 +0100
@@ -1,5 +1,5 @@
StartFontMetrics 2.0
-Comment Panose 2 0 5 0 8 0 0 2 0 4
+Comment UniqueID 23685440
FullName fourier-orns
FontName fourier-orns
FamilyName fourier-orns
@@ -7,44 +7,51 @@
Notice (C) 2004,GUTENBERG
Version 000.001
IsFixedPitch false
-ItalicAngle 0.00
-FontBBox 0 -243 1133 705
-Ascender 742
-Descender -230
-XHeight 490
-CapHeight 693
+ItalicAngle 0
+FontBBox 12 -249 6428 977
+Ascender 750
+Descender -250
+XHeight 500
+CapHeight 700
UnderlinePosition -100
UnderlineThickness 50
-StdHW 35
-StdVW 94
EncodingScheme FontSpecific
-StartCharMetrics 27
-C 32 ; WX 500 ; N space ; B 0 0 0 0 ;
-C 65 ; WX 1027 ; N noway ; B 42 -237 977 698 ;
-C 66 ; WX 1184 ; N beware ; B 45 -239 1133 699 ;
-C 76 ; WX 613 ; N bomb ; B 28 -238 585 841 ;
-C 77 ; WX 1005 ; N grimace ; B 26 -236 966 704 ;
-C 78 ; WX 900 ; N barcino ; B 108 -66 781 709 ;
-C 84 ; WX 1077 ; N xswordsup ; B 126 -87 957 709 ;
-C 85 ; WX 1077 ; N xswordsdown ; B 125 -87 956 709 ;
-C 88 ; WX 996 ; N decoone ; B 27 -208 968 721 ;
-C 89 ; WX 999 ; N decotwo ; B 59 -21 969 569 ;
-C 90 ; WX 999 ; N decothree ; B 59 -21 969 569 ;
-C 91 ; WX 999 ; N decofour ; B 32 -19 969 472 ;
-C 92 ; WX 999 ; N decofive ; B 33 -19 970 472 ;
-C 93 ; WX 835 ; N decosix ; B 21 -141 817 655 ;
-C 97 ; WX 742 ; N gland ; B 34 -245 685 681 ;
-C 98 ; WX 1001 ; N floweroneleft ; B 19 -200 980 697 ;
-C 99 ; WX 1001 ; N floweroneright ; B 20 -200 981 697 ;
-C 100 ; WX 518 ; N starredbullet ; B 20 114 498 592 ;
-C 102 ; WX 1001 ; N leaf ; B 20 -41 972 725 ;
-C 103 ; WX 1001 ; N leaftwo ; B 21 69 989 435 ;
-C 104 ; WX 1001 ; N leafthree ; B 21 69 989 435 ;
-C 106 ; WX 852 ; N aldinesmall ; B 17 -21 817 518 ;
-C 109 ; WX 999 ; N aldineone ; B 12 -248 985 745 ;
-C 110 ; WX 999 ; N aldinetwo ; B 13 -248 986 745 ;
-C 111 ; WX 766 ; N aldinethree ; B 55 -249 693 763 ;
-C 116 ; WX 1001 ; N lefthand ; B 23 -2 975 649 ;
-C 117 ; WX 1001 ; N righthand ; B 23 -2 975 649 ;
+StartCharMetrics 36
+C 0 ; WX 500 ; N space ; B 0 0 0 0 ;
+C 33 ; WX 1027 ; N noway ; B 42 -237 977 698 ;
+C 34 ; WX 1184 ; N beware ; B 45 -239 1133 699 ;
+C 44 ; WX 613 ; N bomb ; B 28 -238 585 841 ;
+C 45 ; WX 1005 ; N grimace ; B 26 -236 966 704 ;
+C 46 ; WX 900 ; N barcino ; B 108 -66 781 709 ;
+C 47 ; WX 622 ; N pilcrow ; B 25 -30 590 709 ;
+C 48 ; WX 624 ; N pilcrowtwo ; B 29 -32 601 709 ;
+C 49 ; WX 659 ; N pilcrowthree ; B 35 -108 923 864 ;
+C 50 ; WX 847 ; N pilcrowfour ; B 47 -108 1070 907 ;
+C 51 ; WX 847 ; N pilcrowfive ; B 47 -108 2939 977 ;
+C 52 ; WX 847 ; N pilcrowsix ; B 47 -108 6428 977 ;
+C 53 ; WX 1077 ; N xswordsup ; B 126 -87 957 709 ;
+C 54 ; WX 1077 ; N xswordsdown ; B 125 -87 956 709 ;
+C 56 ; WX 996 ; N decoone ; B 27 -208 968 721 ;
+C 57 ; WX 999 ; N decotwo ; B 59 -21 969 569 ;
+C 58 ; WX 999 ; N decothree ; B 59 -21 969 569 ;
+C 59 ; WX 999 ; N decofour ; B 32 -19 969 472 ;
+C 60 ; WX 999 ; N decofive ; B 33 -19 970 472 ;
+C 61 ; WX 835 ; N decosix ; B 21 -141 817 655 ;
+C 65 ; WX 742 ; N gland ; B 34 -245 685 681 ;
+C 66 ; WX 1001 ; N floweroneleft ; B 19 -200 980 697 ;
+C 67 ; WX 1001 ; N floweroneright ; B 20 -200 981 697 ;
+C 68 ; WX 518 ; N starredbullet ; B 20 114 498 592 ;
+C 70 ; WX 1001 ; N leafNE ; B 20 -41 972 725 ;
+C 71 ; WX 1000 ; N leafNW ; B 20 -41 972 725 ;
+C 72 ; WX 1000 ; N leafSE ; B 20 -28 987 717 ;
+C 73 ; WX 1000 ; N leafSW ; B 20 -28 987 717 ;
+C 74 ; WX 1001 ; N leaftwo ; B 21 69 989 435 ;
+C 75 ; WX 1001 ; N leafthree ; B 21 69 989 435 ;
+C 76 ; WX 852 ; N aldinesmall ; B 17 -21 817 518 ;
+C 77 ; WX 999 ; N aldineone ; B 12 -248 985 745 ;
+C 78 ; WX 999 ; N aldinetwo ; B 13 -248 986 745 ;
+C 79 ; WX 766 ; N aldinethree ; B 55 -249 693 763 ;
+C 84 ; WX 1001 ; N lefthand ; B 23 -2 975 649 ;
+C 85 ; WX 1001 ; N righthand ; B 23 -2 975 649 ;
EndCharMetrics
EndFontMetrics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/fourier/fourier-utopia-expert.map new/fonts/map/dvips/fourier/fourier-utopia-expert.map
--- old/fonts/map/dvips/fourier/fourier-utopia-expert.map 2006-01-10 00:35:02.000000000 +0100
+++ new/fonts/map/dvips/fourier/fourier-utopia-expert.map 2019-12-01 22:47:27.000000000 +0100
@@ -15,6 +15,8 @@
futso8x UtopiaExp-Semibold " .167 SlantFont " futr-sup
+}{}
+
+\DeclareFontShape{T1}{fut-sup}{m}{it}{
+ <-> futri-sup
+}{}
+
+\DeclareFontShape{T1}{fut-sup}{sb}{n}{
+ <-> futs-sup
+}{}
+
+\DeclareFontShape{T1}{fut-sup}{sb}{it}{
+ <-> futsi-sup
+}{}
+
+\DeclareFontShape{T1}{fut-sup}{b}{n}{
+ <-> futb-sup
+}{}
+
+\DeclareFontShape{T1}{fut-sup}{b}{it}{
+ <-> futbi-sup
+}{}
+
+\DeclareFontShape{T1}{fut-sup}{eb}{n}{
+ <-> futc-sup
+}{}
+
+\DeclareFontShape{T1}{fut-sup}{m}{sl}{<->ssub * fut-sup/m/it}{}
+\DeclareFontShape{T1}{fut-sup}{sb}{sl}{<->ssub * fut-sup/sb/it}{}
+\DeclareFontShape{T1}{fut-sup}{b}{sl}{<->ssub * fut-sup/sb/sl}{}
+\DeclareFontShape{T1}{fut-sup}{bx}{sl}{<->ssub * fut-sup/b/sl}{}
+\DeclareFontShape{T1}{fut-sup}{bx}{n}{<->ssub * fut-sup/b/n}{}
+\DeclareFontShape{T1}{fut-sup}{bx}{it}{<->ssub * fut-sup/b/it}{}
+
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fourier/t1futj.fd new/tex/latex/fourier/t1futj.fd
--- old/tex/latex/fourier/t1futj.fd 2006-01-13 00:56:08.000000000 +0100
+++ new/tex/latex/fourier/t1futj.fd 2019-12-01 22:47:27.000000000 +0100
@@ -45,6 +45,14 @@
<-> futsc9d
}{\SetFourierSpace}
+\DeclareFontShape{T1}{futj}{m}{sci}{
+ <-> futrci9d
+}{\SetFourierSpace}
+
+\DeclareFontShape{T1}{futj}{sb}{sci}{
+ <-> futsci9d
+}{\SetFourierSpace}
+
\DeclareFontShape{T1}{futj}{m}{tt}{
<-> futrd8t
}{\SetFourierSpace}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fourier/t1futx.fd new/tex/latex/fourier/t1futx.fd
--- old/tex/latex/fourier/t1futx.fd 2006-01-13 00:56:08.000000000 +0100
+++ new/tex/latex/fourier/t1futx.fd 2019-12-01 22:47:27.000000000 +0100
@@ -45,6 +45,14 @@
<-> futsc9e
}{\SetFourierSpace}
+\DeclareFontShape{T1}{futx}{m}{sci}{
+ <-> futrci9e
+}{\SetFourierSpace}
+
+\DeclareFontShape{T1}{futx}{sb}{sci}{
+ <-> futsci9e
+}{\SetFourierSpace}
+
\DeclareFontShape{T1}{futx}{m}{tt}{
<-> futrd8t
}{\SetFourierSpace}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fourier/ts1futj.fd new/tex/latex/fourier/ts1futj.fd
--- old/tex/latex/fourier/ts1futj.fd 2006-01-13 00:56:08.000000000 +0100
+++ new/tex/latex/fourier/ts1futj.fd 2019-12-01 22:47:27.000000000 +0100
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1futj.fd}
- [2004/03/26 Fontinst v1.926 font definitions for TS1/futj.]
+ [2004/03/02 Fontinst v1.926 font definitions for TS1/futj.]
\DeclareFontFamily{TS1}{futj}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fourier/ts1futs.fd new/tex/latex/fourier/ts1futs.fd
--- old/tex/latex/fourier/ts1futs.fd 2006-01-13 00:56:08.000000000 +0100
+++ new/tex/latex/fourier/ts1futs.fd 2019-12-01 22:47:27.000000000 +0100
@@ -1,11 +1,11 @@
%Filename: ts1futs.fd
%Created by: tex build-fourier
-%Created using fontinst v1.926
+%Created using fontinst v1.801
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1futs.fd}
- [2004/03/26 Fontinst v1.926 font definitions for TS1/futs.]
+ [2003/09/14 Fontinst v1.801 font definitions for TS1/futs.]
\DeclareFontFamily{TS1}{futs}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fourier/ts1futx.fd new/tex/latex/fourier/ts1futx.fd
--- old/tex/latex/fourier/ts1futx.fd 2006-01-13 00:56:08.000000000 +0100
+++ new/tex/latex/fourier/ts1futx.fd 2019-12-01 22:47:27.000000000 +0100
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1futx.fd}
- [2004/03/26 Fontinst v1.926 font definitions for TS1/futx.]
+ [2004/03/02 Fontinst v1.926 font definitions for TS1/futx.]
\DeclareFontFamily{TS1}{futx}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fourier/ufuts.fd new/tex/latex/fourier/ufuts.fd
--- old/tex/latex/fourier/ufuts.fd 2006-01-13 00:56:08.000000000 +0100
+++ new/tex/latex/fourier/ufuts.fd 2019-12-01 22:47:27.000000000 +0100
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ufuts.fd}
- [2004/03/26 Fontinst v1.926 font definitions for U/futs.]
+ [2004/03/02 Fontinst v1.926 font definitions for U/futs.]
\DeclareFontFamily{U}{futs}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fourier.tlpobj new/tlpkg/tlpobj/fourier.tlpobj
--- old/tlpkg/tlpobj/fourier.tlpobj 2019-02-28 03:39:01.000000000 +0100
+++ new/tlpkg/tlpobj/fourier.tlpobj 2020-03-05 02:15:36.000000000 +0100
@@ -1,6 +1,6 @@
name fourier
category Package
-revision 15878
+revision 54090
shortdesc Using Utopia fonts in LaTeX documents
relocated 1
longdesc Fourier-GUTenberg is a LaTeX typesetting system which uses
@@ -14,7 +14,7 @@
longdesc Utopia is a registered trademark of Adobe Systems Incorporated
execute addMap fourier.map
execute addMap fourier-utopia-expert.map
-runfiles size=379
+runfiles size=487
RELOC/fonts/afm/public/fourier/fourier-alt-black.afm
RELOC/fonts/afm/public/fourier/fourier-alt-bold.afm
RELOC/fonts/afm/public/fourier/fourier-alt-boldita.afm
@@ -33,6 +33,10 @@
RELOC/fonts/afm/public/fourier/fourier-orns.afm
RELOC/fonts/map/dvips/fourier/fourier-utopia-expert.map
RELOC/fonts/map/dvips/fourier/fourier.map
+ RELOC/fonts/opentype/public/fourier/FourierOrns-Bold.otf
+ RELOC/fonts/opentype/public/fourier/FourierOrns-BoldItalic.otf
+ RELOC/fonts/opentype/public/fourier/FourierOrns-Italic.otf
+ RELOC/fonts/opentype/public/fourier/FourierOrns-Regular.otf
RELOC/fonts/tfm/public/fourier/fourier-alt-black.tfm
RELOC/fonts/tfm/public/fourier/fourier-alt-bold-sl.tfm
RELOC/fonts/tfm/public/fourier/fourier-alt-bold.tfm
@@ -44,6 +48,8 @@
RELOC/fonts/tfm/public/fourier/fourier-alt-sl.tfm
RELOC/fonts/tfm/public/fourier/fourier-alt.tfm
RELOC/fonts/tfm/public/fourier/fourier-bb.tfm
+ RELOC/fonts/tfm/public/fourier/fourier-ligs-it.tfm
+ RELOC/fonts/tfm/public/fourier/fourier-ligs.tfm
RELOC/fonts/tfm/public/fourier/fourier-mcl.tfm
RELOC/fonts/tfm/public/fourier/fourier-mex.tfm
RELOC/fonts/tfm/public/fourier/fourier-ml.tfm
@@ -52,6 +58,9 @@
RELOC/fonts/tfm/public/fourier/fourier-mlitb.tfm
RELOC/fonts/tfm/public/fourier/fourier-ms.tfm
RELOC/fonts/tfm/public/fourier/fourier-orns.tfm
+ RELOC/fonts/tfm/public/fourier/fut-oldlatin-it.tfm
+ RELOC/fonts/tfm/public/fourier/fut-oldlatin.tfm
+ RELOC/fonts/tfm/public/fourier/futb-sup.tfm
RELOC/fonts/tfm/public/fourier/futb8c.tfm
RELOC/fonts/tfm/public/fourier/futb8r.tfm
RELOC/fonts/tfm/public/fourier/futb8t.tfm
@@ -60,6 +69,7 @@
RELOC/fonts/tfm/public/fourier/futb9d.tfm
RELOC/fonts/tfm/public/fourier/futb9e.tfm
RELOC/fonts/tfm/public/fourier/futbc8t.tfm
+ RELOC/fonts/tfm/public/fourier/futbi-sup.tfm
RELOC/fonts/tfm/public/fourier/futbi8c.tfm
RELOC/fonts/tfm/public/fourier/futbi8r.tfm
RELOC/fonts/tfm/public/fourier/futbi8t.tfm
@@ -76,6 +86,7 @@
RELOC/fonts/tfm/public/fourier/futbo9e.tfm
RELOC/fonts/tfm/public/fourier/futboorn.tfm
RELOC/fonts/tfm/public/fourier/futborn.tfm
+ RELOC/fonts/tfm/public/fourier/futc-sup.tfm
RELOC/fonts/tfm/public/fourier/futc8r.tfm
RELOC/fonts/tfm/public/fourier/futc8x.tfm
RELOC/fonts/tfm/public/fourier/futc9c.tfm
@@ -86,6 +97,7 @@
RELOC/fonts/tfm/public/fourier/futmib.tfm
RELOC/fonts/tfm/public/fourier/futmii.tfm
RELOC/fonts/tfm/public/fourier/futmiib.tfm
+ RELOC/fonts/tfm/public/fourier/futr-sup.tfm
RELOC/fonts/tfm/public/fourier/futr8c.tfm
RELOC/fonts/tfm/public/fourier/futr8r.tfm
RELOC/fonts/tfm/public/fourier/futr8t.tfm
@@ -97,8 +109,13 @@
RELOC/fonts/tfm/public/fourier/futrc8t.tfm
RELOC/fonts/tfm/public/fourier/futrc9d.tfm
RELOC/fonts/tfm/public/fourier/futrc9e.tfm
+ RELOC/fonts/tfm/public/fourier/futrci9d.tfm
+ RELOC/fonts/tfm/public/fourier/futrci9e.tfm
+ RELOC/fonts/tfm/public/fourier/futrco8r.tfm
+ RELOC/fonts/tfm/public/fourier/futrco9d.tfm
RELOC/fonts/tfm/public/fourier/futrd8r.tfm
RELOC/fonts/tfm/public/fourier/futrd8t.tfm
+ RELOC/fonts/tfm/public/fourier/futri-sup.tfm
RELOC/fonts/tfm/public/fourier/futri8c.tfm
RELOC/fonts/tfm/public/fourier/futri8r.tfm
RELOC/fonts/tfm/public/fourier/futri8t.tfm
@@ -115,6 +132,7 @@
RELOC/fonts/tfm/public/fourier/futro9e.tfm
RELOC/fonts/tfm/public/fourier/futroorn.tfm
RELOC/fonts/tfm/public/fourier/futrorn.tfm
+ RELOC/fonts/tfm/public/fourier/futs-sup.tfm
RELOC/fonts/tfm/public/fourier/futs8r.tfm
RELOC/fonts/tfm/public/fourier/futs8x.tfm
RELOC/fonts/tfm/public/fourier/futs9c.tfm
@@ -123,6 +141,10 @@
RELOC/fonts/tfm/public/fourier/futsc8r.tfm
RELOC/fonts/tfm/public/fourier/futsc9d.tfm
RELOC/fonts/tfm/public/fourier/futsc9e.tfm
+ RELOC/fonts/tfm/public/fourier/futsci9d.tfm
+ RELOC/fonts/tfm/public/fourier/futsci9e.tfm
+ RELOC/fonts/tfm/public/fourier/futsco8r.tfm
+ RELOC/fonts/tfm/public/fourier/futsi-sup.tfm
RELOC/fonts/tfm/public/fourier/futsi8r.tfm
RELOC/fonts/tfm/public/fourier/futsi8x.tfm
RELOC/fonts/tfm/public/fourier/futsi9c.tfm
@@ -136,6 +158,26 @@
RELOC/fonts/tfm/public/fourier/futsoorn.tfm
RELOC/fonts/tfm/public/fourier/futsorn.tfm
RELOC/fonts/tfm/public/fourier/futsy.tfm
+ RELOC/fonts/tfm/public/fourier/putb8a.tfm
+ RELOC/fonts/tfm/public/fourier/putb8x.tfm
+ RELOC/fonts/tfm/public/fourier/putbi8a.tfm
+ RELOC/fonts/tfm/public/fourier/putbi8x.tfm
+ RELOC/fonts/tfm/public/fourier/putbo8x.tfm
+ RELOC/fonts/tfm/public/fourier/putc8a.tfm
+ RELOC/fonts/tfm/public/fourier/putc8x.tfm
+ RELOC/fonts/tfm/public/fourier/putr8a.tfm
+ RELOC/fonts/tfm/public/fourier/putr8x.tfm
+ RELOC/fonts/tfm/public/fourier/putrc8a.tfm
+ RELOC/fonts/tfm/public/fourier/putrd8a.tfm
+ RELOC/fonts/tfm/public/fourier/putri8a.tfm
+ RELOC/fonts/tfm/public/fourier/putri8x.tfm
+ RELOC/fonts/tfm/public/fourier/putro8x.tfm
+ RELOC/fonts/tfm/public/fourier/puts8a.tfm
+ RELOC/fonts/tfm/public/fourier/puts8x.tfm
+ RELOC/fonts/tfm/public/fourier/putsc8a.tfm
+ RELOC/fonts/tfm/public/fourier/putsi8a.tfm
+ RELOC/fonts/tfm/public/fourier/putsi8x.tfm
+ RELOC/fonts/tfm/public/fourier/putso8x.tfm
RELOC/fonts/type1/public/fourier/fourier-alt-black.pfb
RELOC/fonts/type1/public/fourier/fourier-alt-bold.pfb
RELOC/fonts/type1/public/fourier/fourier-alt-boldita.pfb
@@ -152,12 +194,14 @@
RELOC/fonts/type1/public/fourier/fourier-mlitb.pfb
RELOC/fonts/type1/public/fourier/fourier-ms.pfb
RELOC/fonts/type1/public/fourier/fourier-orns.pfb
+ RELOC/fonts/vf/public/fourier/futb-sup.vf
RELOC/fonts/vf/public/fourier/futb8c.vf
RELOC/fonts/vf/public/fourier/futb8t.vf
RELOC/fonts/vf/public/fourier/futb9c.vf
RELOC/fonts/vf/public/fourier/futb9d.vf
RELOC/fonts/vf/public/fourier/futb9e.vf
RELOC/fonts/vf/public/fourier/futbc8t.vf
+ RELOC/fonts/vf/public/fourier/futbi-sup.vf
RELOC/fonts/vf/public/fourier/futbi8c.vf
RELOC/fonts/vf/public/fourier/futbi8t.vf
RELOC/fonts/vf/public/fourier/futbi9c.vf
@@ -170,6 +214,7 @@
RELOC/fonts/vf/public/fourier/futbo9e.vf
RELOC/fonts/vf/public/fourier/futboorn.vf
RELOC/fonts/vf/public/fourier/futborn.vf
+ RELOC/fonts/vf/public/fourier/futc-sup.vf
RELOC/fonts/vf/public/fourier/futc9c.vf
RELOC/fonts/vf/public/fourier/futc9d.vf
RELOC/fonts/vf/public/fourier/futc9e.vf
@@ -178,6 +223,7 @@
RELOC/fonts/vf/public/fourier/futmib.vf
RELOC/fonts/vf/public/fourier/futmii.vf
RELOC/fonts/vf/public/fourier/futmiib.vf
+ RELOC/fonts/vf/public/fourier/futr-sup.vf
RELOC/fonts/vf/public/fourier/futr8c.vf
RELOC/fonts/vf/public/fourier/futr8t.vf
RELOC/fonts/vf/public/fourier/futr9c.vf
@@ -186,7 +232,11 @@
RELOC/fonts/vf/public/fourier/futrc8t.vf
RELOC/fonts/vf/public/fourier/futrc9d.vf
RELOC/fonts/vf/public/fourier/futrc9e.vf
+ RELOC/fonts/vf/public/fourier/futrci9d.vf
+ RELOC/fonts/vf/public/fourier/futrci9e.vf
+ RELOC/fonts/vf/public/fourier/futrco9d.vf
RELOC/fonts/vf/public/fourier/futrd8t.vf
+ RELOC/fonts/vf/public/fourier/futri-sup.vf
RELOC/fonts/vf/public/fourier/futri8c.vf
RELOC/fonts/vf/public/fourier/futri8t.vf
RELOC/fonts/vf/public/fourier/futri9c.vf
@@ -199,11 +249,16 @@
RELOC/fonts/vf/public/fourier/futro9e.vf
RELOC/fonts/vf/public/fourier/futroorn.vf
RELOC/fonts/vf/public/fourier/futrorn.vf
+ RELOC/fonts/vf/public/fourier/futs-sup.vf
RELOC/fonts/vf/public/fourier/futs9c.vf
RELOC/fonts/vf/public/fourier/futs9d.vf
RELOC/fonts/vf/public/fourier/futs9e.vf
RELOC/fonts/vf/public/fourier/futsc9d.vf
RELOC/fonts/vf/public/fourier/futsc9e.vf
+ RELOC/fonts/vf/public/fourier/futsci9d.vf
+ RELOC/fonts/vf/public/fourier/futsci9e.vf
+ RELOC/fonts/vf/public/fourier/futsco9d.vf
+ RELOC/fonts/vf/public/fourier/futsi-sup.vf
RELOC/fonts/vf/public/fourier/futsi9c.vf
RELOC/fonts/vf/public/fourier/futsi9d.vf
RELOC/fonts/vf/public/fourier/futsi9e.vf
@@ -219,6 +274,7 @@
RELOC/tex/latex/fourier/fmxfutm.fd
RELOC/tex/latex/fourier/fourier-orns.sty
RELOC/tex/latex/fourier/fourier.sty
+ RELOC/tex/latex/fourier/t1fut-sup.fd
RELOC/tex/latex/fourier/t1futj.fd
RELOC/tex/latex/fourier/t1futs.fd
RELOC/tex/latex/fourier/t1futx.fd
@@ -228,7 +284,6 @@
RELOC/tex/latex/fourier/ufuts.fd
catalogue-also utopia
catalogue-ctan /fonts/fourier-GUT
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font font-maths font-type1
-catalogue-version 1.3
+catalogue-version 2.2
++++++ fpl.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fpl.doc.tlpobj new/tlpkg/tlpobj/fpl.doc.tlpobj
--- old/tlpkg/tlpobj/fpl.doc.tlpobj 2019-02-28 03:39:02.000000000 +0100
+++ new/tlpkg/tlpobj/fpl.doc.tlpobj 2020-03-24 01:58:41.000000000 +0100
@@ -1,6 +1,6 @@
name fpl.doc
category Package
-revision 49603
+revision 54512
shortdesc doc files of fpl
relocated 1
docfiles size=6
++++++ fpl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fpl.tlpobj new/tlpkg/tlpobj/fpl.tlpobj
--- old/tlpkg/tlpobj/fpl.tlpobj 2019-02-28 03:39:02.000000000 +0100
+++ new/tlpkg/tlpobj/fpl.tlpobj 2020-03-24 01:58:41.000000000 +0100
@@ -1,6 +1,6 @@
name fpl
category Package
-revision 49603
+revision 54512
shortdesc SC and OsF fonts for URW Palladio L
relocated 1
longdesc The FPL Fonts provide a set of SC/OsF fonts for URW Palladio L
@@ -36,7 +36,6 @@
catalogue-contact-bugs https://github.com/rstub/fpl/issues
catalogue-contact-repository https://github.com/rstub/fpl
catalogue-ctan /fonts/fpl
-catalogue-date 2019-01-04 17:37:23 +0100
-catalogue-license gpl2lppl
+catalogue-license gpl2 lppl
catalogue-topics font font-type1 font-sfd font-serif font-body font-proportional
catalogue-version 1.003
++++++ frenchmath.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/frenchmath/README.md new/doc/latex/frenchmath/README.md
--- old/doc/latex/frenchmath/README.md 2019-01-16 23:25:45.000000000 +0100
+++ new/doc/latex/frenchmath/README.md 2019-05-22 23:23:51.000000000 +0200
@@ -1,19 +1,35 @@
-The frenchmath package - Typesetting mathematics according to French rules.
+# The frenchmath package - Typesetting mathematics according to French rules
-LICENSE
-Released under the LaTeX Project Public License v1.3 or later. See http://www.latex-project.org/lppl.txt
-PURPOSE
+## Presentation
+
The package provides:
-- capital letters in roman style for mathematical mode (package option),
-- some useful macros and aliases for symbols used in France : infeg, supeg, paral,...
+- capital letters in upright shape for mathematical mode according to French rule (package option),
+- correct spacing after commas and before a semicolon in math mode,
+- some useful macros and aliases for symbols used in France : `\infeg`, `\supeg`, `\paral`,...
- several macros for writing french operator names like pgcd, ppcm, Card, rg, Vect,...
-- correct spacing before a semicolon in mathematical mode (according to french rule).
-DOCUMENTATION
+
+## Documentation
+
The documentation is in French.
-INSTALLATION
+
+## Installation
+
- run LaTeX on frenchmath.ins, you obtain the file frenchmath.sty,
- if then you run pdfLaTeX on frenchmath.dtx you get the file frenchmath.pdf which is also in the archive,
- put the files frenchmath.sty and frenchmath.pdf in your TeX Directory Structure.
+
+
+## Author
+
+Antoine Missier
+
+Email: antoine.missier@ac-toulouse.fr
+
+
+## License
+
+Released under the LaTeX Project Public License v1.3 or later.
+See http://www.latex-project.org/lppl.txt
Binary files old/doc/latex/frenchmath/frenchmath.pdf and new/doc/latex/frenchmath/frenchmath.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/frenchmath.doc.tlpobj new/tlpkg/tlpobj/frenchmath.doc.tlpobj
--- old/tlpkg/tlpobj/frenchmath.doc.tlpobj 2019-02-28 03:39:05.000000000 +0100
+++ new/tlpkg/tlpobj/frenchmath.doc.tlpobj 2019-05-23 01:38:52.000000000 +0200
@@ -1,8 +1,8 @@
name frenchmath.doc
category Package
-revision 49728
+revision 51192
shortdesc doc files of frenchmath
relocated 1
-docfiles size=107
+docfiles size=118
RELOC/doc/latex/frenchmath/README.md
RELOC/doc/latex/frenchmath/frenchmath.pdf
++++++ frenchmath.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/frenchmath/frenchmath.sty new/tex/latex/frenchmath/frenchmath.sty
--- old/tex/latex/frenchmath/frenchmath.sty 2019-01-16 23:25:45.000000000 +0100
+++ new/tex/latex/frenchmath/frenchmath.sty 2019-05-22 23:23:51.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2019 by Antoine Missier
+%% Copyright (C) 2019 by Antoine Missier
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -22,25 +22,70 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{frenchmath}
- [15/01/2019 v1.0 .dtx frenchmath file]
+ [2019/05/22 v1.4 .dtx frenchmath file]
\RequirePackage{ifthen}
\newboolean{capsit}
\DeclareOption{capsit}{\setboolean{capsit}{true}}
-\DeclareOption{capsrm}{\setboolean{capsit}{false}} % valeur par défaut
+\DeclareOption{capsup}{\setboolean{capsit}{false}} % valeur par défaut
\ProcessOptions \relax
\RequirePackage{mathrsfs} % fournit les majuscules cursives
\RequirePackage{amssymb} % fournit \leqslant, \geqslant et \varnothing
\RequirePackage{amsopn} % fournit \DeclareMathOperator
-\RequirePackage{xspace} % utile pour la commande \ssi
+\RequirePackage{xspace} % utile pour les commandes \curs, \ssi, \Oij
+\RequirePackage{icomma} % virgule intelligente
-\newcommand\curs{\mathscr}
+\DeclareSymbolFont{UpSh}{\encodingdefault}{\familydefault}{m}{n}
+\ifthenelse{\boolean{capsit}}{}{\AtBeginDocument{
+ \DeclareMathSymbol{A}\mathalpha{UpSh}{`A} %'A codage octal du A
+ \DeclareMathSymbol{B}\mathalpha{UpSh}{`B}
+ \DeclareMathSymbol{C}\mathalpha{UpSh}{`C}
+ \DeclareMathSymbol{D}\mathalpha{UpSh}{`D}
+ \DeclareMathSymbol{E}\mathalpha{UpSh}{`E}
+ \DeclareMathSymbol{F}\mathalpha{UpSh}{`F}
+ \DeclareMathSymbol{G}\mathalpha{UpSh}{`G}
+ \DeclareMathSymbol{H}\mathalpha{UpSh}{`H}
+ \DeclareMathSymbol{I}\mathalpha{UpSh}{`I}
+ \DeclareMathSymbol{J}\mathalpha{UpSh}{`J}
+ \DeclareMathSymbol{K}\mathalpha{UpSh}{`K}
+ \DeclareMathSymbol{L}\mathalpha{UpSh}{`L}
+ \DeclareMathSymbol{M}\mathalpha{UpSh}{`M}
+ \DeclareMathSymbol{N}\mathalpha{UpSh}{`N}
+ \DeclareMathSymbol{O}\mathalpha{UpSh}{`O}
+ \DeclareMathSymbol{P}\mathalpha{UpSh}{`P}
+ \DeclareMathSymbol{Q}\mathalpha{UpSh}{`Q}
+ \DeclareMathSymbol{R}\mathalpha{UpSh}{`R}
+ \DeclareMathSymbol{S}\mathalpha{UpSh}{`S}
+ \DeclareMathSymbol{T}\mathalpha{UpSh}{`T}
+ \DeclareMathSymbol{U}\mathalpha{UpSh}{`U}
+ \DeclareMathSymbol{V}\mathalpha{UpSh}{`V}
+ \DeclareMathSymbol{W}\mathalpha{UpSh}{`W}
+ \DeclareMathSymbol{X}\mathalpha{UpSh}{`X}
+ \DeclareMathSymbol{Y}\mathalpha{UpSh}{`Y}
+ \DeclareMathSymbol{Z}\mathalpha{UpSh}{`Z}
+}}
+\AtBeginDocument{\@ifpackageloaded{pstricks-add}{\psset{comma=true}}{}}
+\DeclareMathSymbol{;}\mathbin{UpSh}{059} % \mathpunct à l'origine
+
+\newcommand*\curs[1]{\ensuremath{\mathscr{#1}}\xspace}
\newcommand\infeg{\leqslant}
\newcommand\supeg{\geqslant}
\newcommand\vide{\varnothing}
-\newcommand{\paral}{\mathrel{/\!\!/}} % \parallel existe déjà : ||
+\newcommand\paral{\mathrel{/\!\!/}} % \parallel existe déjà : ||
\newcommand\ssi{si, et seulement si,\xspace}
-\newcommand*{\cmod}[1]{\quad[#1]}
+\newcommand*\cmod[1]{\quad[#1]}
+\newcommand\Oij{\ensuremath{
+ \left(O, \vec{\imath}, \vec{\jmath}\,\right)
+ }\xspace
+}
+\newcommand\Oijk{\ensuremath{
+ \left(O, \vec{\vphantom{t}\imath}, \vec{\vphantom{t}\jmath},
+ \vec{\vphantom{t}\smash{k}}\,\right)
+ }\xspace
+}
+\newcommand\Ouv{\ensuremath{
+ \left(O, \vec{u}, \vec{v}\,\right)}\xspace
+}
\DeclareMathOperator{\pgcd}{pgcd}
\DeclareMathOperator{\ppcm}{ppcm}
@@ -52,42 +97,7 @@
\DeclareMathOperator{\Vect}{\Vect}
\DeclareMathOperator{\ch}{ch}
\DeclareMathOperator{\sh}{sh}
-\DeclareMathOperator{\tgh}{th}
-
-\newcommand\virgdec{\DecimalMathComma} % pas d'espace
-\newcommand\virgstd{\StandardMathComma} % espace après la virgule
-
-\DeclareSymbolFont{Roman}{\encodingdefault}{\familydefault}{m}{n}
-\DeclareMathSymbol{;}\mathbin{Roman}{059} % \mathpunct à l'origine
-
-\ifthenelse{\boolean{capsit}}{}{%
-\DeclareMathSymbol{A}\mathalpha{Roman}{`A} %'A codage octal du A dans Roman
-\DeclareMathSymbol{B}\mathalpha{Roman}{`B}
-\DeclareMathSymbol{C}\mathalpha{Roman}{`C}
-\DeclareMathSymbol{D}\mathalpha{Roman}{`D}
-\DeclareMathSymbol{E}\mathalpha{Roman}{`E}
-\DeclareMathSymbol{F}\mathalpha{Roman}{`F}
-\DeclareMathSymbol{G}\mathalpha{Roman}{`G}
-\DeclareMathSymbol{H}\mathalpha{Roman}{`H}
-\DeclareMathSymbol{I}\mathalpha{Roman}{`I}
-\DeclareMathSymbol{J}\mathalpha{Roman}{`J}
-\DeclareMathSymbol{K}\mathalpha{Roman}{`K}
-\DeclareMathSymbol{L}\mathalpha{Roman}{`L}
-\DeclareMathSymbol{M}\mathalpha{Roman}{`M}
-\DeclareMathSymbol{N}\mathalpha{Roman}{`N}
-\DeclareMathSymbol{O}\mathalpha{Roman}{`O}
-\DeclareMathSymbol{P}\mathalpha{Roman}{`P}
-\DeclareMathSymbol{Q}\mathalpha{Roman}{`Q}
-\DeclareMathSymbol{R}\mathalpha{Roman}{`R}
-\DeclareMathSymbol{S}\mathalpha{Roman}{`S}
-\DeclareMathSymbol{T}\mathalpha{Roman}{`T}
-\DeclareMathSymbol{U}\mathalpha{Roman}{`U}
-\DeclareMathSymbol{V}\mathalpha{Roman}{`V}
-\DeclareMathSymbol{W}\mathalpha{Roman}{`W}
-\DeclareMathSymbol{X}\mathalpha{Roman}{`X}
-\DeclareMathSymbol{Y}\mathalpha{Roman}{`Y}
-\DeclareMathSymbol{Z}\mathalpha{Roman}{`Z}
-}
+\DeclareMathOperator{\tgh}{th} %\th existe déjà
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/frenchmath.tlpobj new/tlpkg/tlpobj/frenchmath.tlpobj
--- old/tlpkg/tlpobj/frenchmath.tlpobj 2019-02-28 03:39:06.000000000 +0100
+++ new/tlpkg/tlpobj/frenchmath.tlpobj 2019-05-23 01:38:52.000000000 +0200
@@ -1,18 +1,18 @@
name frenchmath
category Package
-revision 49728
+revision 51192
shortdesc Typesetting mathematics according to French rules
relocated 1
-longdesc The package provides: capital letters in roman style for
-longdesc mathematical mode (package option) some useful macros and
-longdesc aliases for symbols used in France : infeg, supeg, paral
-longdesc several macros for writing french operator names like pgcd,
-longdesc ppcm, Card, rg, Vect correct spacing before a semicolon in
-longdesc mathematical mode (according to french rule)
+longdesc The package provides: capital letters in upright shape for
+longdesc mathematical mode according to French rule (package option),
+longdesc correct spacing after commas and before a semicolon in math
+longdesc mode, some useful macros and aliases for symbols used in
+longdesc France: \infeg, \supeg, \paral, ... several macros for writing
+longdesc french operator names like pgcd, ppcm, Card, rg, Vect, ...
runfiles size=1
RELOC/tex/latex/frenchmath/frenchmath.sty
catalogue-ctan /macros/latex/contrib/frenchmath
-catalogue-date 2019-01-20 05:31:27 +0100
+catalogue-date 2019-05-22 19:53:08 +0200
catalogue-license lppl1.3
catalogue-topics maths french
-catalogue-version 1.0
+catalogue-version 1.4
++++++ garamond-math.doc.tar.xz ++++++
Binary files old/doc/fonts/garamond-math/Garamond-Math.pdf and new/doc/fonts/garamond-math/Garamond-Math.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/garamond-math/Garamond-Math.tex new/doc/fonts/garamond-math/Garamond-Math.tex
--- old/doc/fonts/garamond-math/Garamond-Math.tex 2019-02-04 22:34:30.000000000 +0100
+++ new/doc/fonts/garamond-math/Garamond-Math.tex 2019-11-16 23:15:05.000000000 +0100
@@ -3,21 +3,27 @@
\usepackage{amsmath}
\usepackage[math-style=ISO, bold-style=ISO]{unicode-math}
\usepackage{metalogo}
+\usepackage{extarrows}
+\makeatletter
+\renewcommand{\relbar}{\symbol{"E010}\mkern-.2mu\symbol{"E010}\mkern1.8mu}
+\renewcommand{\Relbar}{\symbol{"E011}\mkern-.2mu\symbol{"E011}\mkern1.8mu}
+\makeatother
% \setmainfont{EB Garamond}
-\setmainfont{Libertinus Sans}
+\setmainfont{EB Garamond}
\setmonofont{Source Code Pro}[Scale=.86]
-\setmathfont{Garamond-Math.otf}[Path=./ ]%, Scale=MatchUppercase]
-\setmathfont{Garamond-Math.otf}[version=GaramondMathI ,StylisticSet={1 },Path=./ ]%, Scale=MatchUppercase]
-\setmathfont{Garamond-Math.otf}[version=GaramondMathII ,StylisticSet={2 },Path=./ ]%, Scale=MatchUppercase]
-\setmathfont{Garamond-Math.otf}[version=GaramondMathIII ,StylisticSet={3 },Path=./ ]%, Scale=MatchUppercase]
-\setmathfont{Garamond-Math.otf}[version=GaramondMathIV ,StylisticSet={4 },Path=./ ]%, Scale=MatchUppercase]
-\setmathfont{Garamond-Math.otf}[version=GaramondMathV ,StylisticSet={5 },Path=./ ]%, Scale=MatchUppercase]
-\setmathfont{Garamond-Math.otf}[version=GaramondMathVI ,StylisticSet={6 },Path=./ ]%, Scale=MatchUppercase]
-\setmathfont{Garamond-Math.otf}[version=GaramondMathVII ,StylisticSet={7 },Path=./ ]%, Scale=MatchUppercase]
-\setmathfont{Garamond-Math.otf}[version=GaramondMathVIII,StylisticSet={8 },Path=./ ]%, Scale=MatchUppercase]
-\setmathfont{Garamond-Math.otf}[version=GaramondMathIX ,StylisticSet={9 },Path=./ ]%, Scale=MatchUppercase]
-\setmathfont{Garamond-Math.otf}[version=GaramondMathX ,StylisticSet={10},Path=./ ]%, Scale=MatchUppercase]
+\setmathfont{Garamond-Math.otf}[Path=../Release/ ]%, Scale=MatchUppercase]
+\setmathfont{Garamond-Math.otf}[version=GaramondMathI ,StylisticSet={1 },Path=../Release/ ]%, Scale=MatchUppercase]
+\setmathfont{Garamond-Math.otf}[version=GaramondMathII ,StylisticSet={2 },Path=../Release/ ]%, Scale=MatchUppercase]
+\setmathfont{Garamond-Math.otf}[version=GaramondMathIII ,StylisticSet={3 },Path=../Release/ ]%, Scale=MatchUppercase]
+\setmathfont{Garamond-Math.otf}[version=GaramondMathIV ,StylisticSet={4 },Path=../Release/ ]%, Scale=MatchUppercase]
+\setmathfont{Garamond-Math.otf}[version=GaramondMathV ,StylisticSet={5 },Path=../Release/ ]%, Scale=MatchUppercase]
+\setmathfont{Garamond-Math.otf}[version=GaramondMathVI ,StylisticSet={6 },Path=../Release/ ]%, Scale=MatchUppercase]
+\setmathfont{Garamond-Math.otf}[version=GaramondMathVII ,StylisticSet={7 },Path=../Release/ ]%, Scale=MatchUppercase]
+\setmathfont{Garamond-Math.otf}[version=GaramondMathVIII,StylisticSet={8 },Path=../Release/ ]%, Scale=MatchUppercase]
+\setmathfont{Garamond-Math.otf}[version=GaramondMathIX ,StylisticSet={9 },Path=../Release/ ]%, Scale=MatchUppercase]
+\setmathfont{Garamond-Math.otf}[version=GaramondMathX ,StylisticSet={10},Path=../Release/ ]%, Scale=MatchUppercase]
+\setmathfont{Garamond-Math.otf}[version=GaramondMathXI ,StylisticSet={11},Path=../Release/ ]%, Scale=MatchUppercase]
\def\Latinalphabets{ABCDEFGHIJKLMNOPQRSTUVWXYZ}
\def\latinalphabets{abcdefghijklmnopqrstuvwxyz}
@@ -29,7 +35,7 @@
\Upsilon \Phi \Chi \Psi \Omega
}
\def\greekalphabets{%
- \alpha \beta \gamma \delta \epsilon
+ \alpha \beta \gamma \delta \epsilon \varepsilon
\zeta \eta \theta \vartheta
\iota \kappa \varkappa \lambda \mu
\nu \xi \omicron \pi \varpi \rho
@@ -103,7 +109,7 @@
\newcommand{\dd}{\text{d}}
\newcommand{\norm}[1]{\left\lVert{#1}\right\rVert}
-\title{Garamond-Math, Ver. 2019-02-05}
+\title{Garamond-Math, Ver. 2019-08-16}
\author{Yuansheng Zhao, Xiangdong Zeng}
\begin{document}
@@ -112,11 +118,11 @@
Garamond-Math is an open type math font matching the \emph{EB Garamond (Octavio Pardo)}\footnote{https://ctan.org/pkg/ebgaramond/, and https://github.com/octaviopardo/EBGaramond12/} and \emph{EB Garamond (Georg Mayr-Duffner)}\footnote{https://github.com/georgd/EB-Garamond/}.
Many mathematical symbols are derived from other fonts, others are made from scratch. The metric is generated with a python script.
-The font is best used with \XeTeX, with other engine, one might end up getting very bad spacing.
+The font is mostly tested with \XeTeX, though it shoule also work with \LuaTeX.
-This font is still under development, do not expect the font to be free of bugs. We might update any components any at any time. Issues, bug reports, forks and other contributions are welcome. Please visit GitHub (https://github.com/YuanshengZhao/Garamond-Math/) for development details.
+Issues, bug reports, forks and other contributions are welcome. Please visit GitHub\footnote{https://github.com/YuanshengZhao/Garamond-Math/} for development details.
-The minimal example with \texttt{unicode-math} package is as following:
+A minimal example with \texttt{unicode-math} package is as following:
\begin{verbatim}
%Compile with `xelatex' command
\documentclass{article}
@@ -124,14 +130,14 @@
\setmainfont{EB Garamond}%You should have installed the font
\setmathfont{Garamond-Math.otf}[StylisticSet={7,9}]%Use StylisticSet that you like
\begin{document}
- \[x^3+y^3=z^3\]
+ \[x^3+y^3=z^3.\]
\end{document}
\end{verbatim}
+The result shoule be
+\[x^3+y^3=z^3.\]
-\section{Alphabets \& StylisticSet}
-\emph{The text font in this document is set to Libertinus Sans deliberately so that the difference between text and math can be easily seen.}
+\section{Alphabets \& StylisticSets}
\subsubsection*{Latin and Greek (StylisticSet 4/5 give semi/extra bold for \texttt{\backslash symbf})}
-Each letter is regarded as variable, so the spacing is larger than usual text. I recommend typing equations like this (pay attention to \texttt{\backslash symup} $\ee$, $\ii$, and text $\cos$, $\dd$): $\ee^{\ii k z}=\cos k z-\ii\int_0^{kz}\cos \zeta\,\dd\zeta$.
\[ \Latinalphabets\]
\[ \latinalphabets \]
\[ \symup{\Latinalphabets}\]
@@ -165,13 +171,13 @@
\[ \symtt{\Latinalphabets}\]
\[\symtt{\latinalphabets} \]
-\subsubsection*{Blackboard (StylisticSet 1 gives rounded XITS Math\footnote{https://github.com/khaledhosny/xits/})}
+\subsubsection*{Blackboard (StylisticSet 1 $\rightarrow$ rounded XITS Math\footnote{https://github.com/khaledhosny/xits/})}
\[ \symbb{\Latinalphabets} \]
\[\symbb{\latinalphabets} \]
\begingroup\mathversion{GaramondMathI}\[\symbb{\Latinalphabets}\]
\[\symbb{\latinalphabets}\]\endgroup
-\subsubsection*{Script: Rounded XITS Math [StylisticSet 3 gives scaled CM; 8 gives Garamond-compatible ones (experimental)]}
+\subsubsection*{Script: Rounded XITS Math [StylisticSet 3 $\rightarrow$ scaled CM; 8 $\rightarrow$ Garamond-compatible ones (experimental)]}
\[ \symscr{\Latinalphabets} \]
\[\symscr{\latinalphabets} \]
\[ \symbfscr{\Latinalphabets} \]
@@ -181,32 +187,54 @@
\begingroup\mathversion{GaramondMathVIII}\[\symscr{\Latinalphabets}\]
\[\symscr{\latinalphabets}\]\endgroup
+\subsubsection*{Fraktur: From Noto Sans Math\footnote{https://github.com/googlefonts/noto-fonts/}}
+\[ \symfrak{\Latinalphabets} \]
+\[\symfrak{\latinalphabets} \]
+\[ \symbffrak{\Latinalphabets} \]
+\[\symbffrak{\latinalphabets} \]
+
+
\subsubsection*{Digits: Same width between weight and serif/sans}
\[3.141592653589793238462643383279502884197169399375105820974944592307816406286\]
\[\symsf{3.141592653589793238462643383279502884197169399375105820974944592307816406286}\]
\[\symbf{3.141592653589793238462643383279502884197169399375105820974944592307816406286}\]
-\subsubsection*{\texttt{\backslash partial}: (StylisticSet 2 gives curved ones)}
+\subsubsection*{\texttt{\backslash partial}: (StylisticSet 2 $\rightarrow$ curved ones)}
\[\partial_\mu(\symup\partial^\mu\phi)-\symbf{\epsilon^{\lambda\mu\nu}\partial_\mu(A_\lambda\symbfup\partial_\nu f)}\]
\begingroup\mathversion{GaramondMathII}\[\partial_\mu(\symup\partial^\mu\phi)-\symbf{\epsilon^{\lambda\mu\nu}\partial_\mu(A_\lambda\symbfup\partial_\nu f)}\]\endgroup
-\subsubsection*{\texttt{\backslash hbar}: (StylisticSet 6 gives horizontal bars)}
+\subsubsection*{\texttt{\backslash hbar}: (StylisticSet 6 $\rightarrow$ horizontal bars)}
\[\text{$\hbar$\qquad \begingroup\mathversion{GaramondMathVI} $\hbar$\endgroup}\]
-\subsubsection*{Italic $\symbf h$: (StylisticSet 10 gives out-bending ones)}
+\subsubsection*{Italic $\symbf h$: (StylisticSet 10 $\rightarrow$ out-bending ones)}
\[\text{$\displaystyle\hbar=\frac {\symbf{h}}{2\uppi} $\qquad \begingroup\mathversion{GaramondMathX} $\displaystyle\hbar=\frac {\symbf{h}}{2\uppi} $\endgroup}\]
-\subsubsection*{\texttt{\backslash tilde}: (StylisticSet 9 gives ``normal'' ones)}
+\subsubsection*{\texttt{\backslash tilde}: (StylisticSet 9 $\rightarrow$ ``normal'' ones)}
\[\text{$\tilde F$\qquad \begingroup\mathversion{GaramondMathIX} $\tilde F$\endgroup}\]
-\subsubsection*{\texttt{\backslash int}: (StylisticSet 7 gives a variant with inversion symmetry)}
+\subsubsection*{\texttt{\backslash int}: (StylisticSet 7 $\rightarrow$ a variant with inversion symmetry)}
\[\oint_{\partial\Sigma}\vec E\cdot \dd{\vec{l}}=-\frac{1}{c}\frac{\dd}{\dd t}\iint_{\Sigma}\vec B \cdot \dd{\vec{S}}\]
\begingroup\mathversion{GaramondMathVII}\[\oint_{\partial\Sigma}\vec E\cdot \dd{\vec{l}}=-\frac{1}{c}\frac{\dd}{\dd t}\iint_{\Sigma}\vec B \cdot \dd{\vec{S}}\]\endgroup
+
+\subsubsection*{Binany Operators: (StylisticSet 11 $\rightarrow$ larger ones)}
+\[s=A+b\times 1\div x^3\]
+\begingroup\mathversion{GaramondMathXI}\[s=A+b\times 1\div x^3\]\endgroup
+
+\subsubsection*{Extensible Arrow Hack}
+The font contains the math table for constructing extensible arrow. However \texttt{unicode-math} does not privode an interface to that. In \LuaTeX ~one can use \texttt{\textbackslash Uhextensible}\footnote{https://tex.stackexchange.com/questions/423893/}. A more general solution is to add the following code in preamble.
+\begin{verbatim}
+\usepackage{extarrow} %or mathtools
+\makeatletter
+\renewcommand{\relbar}{\symbol{"E010}\mkern-.2mu\symbol{"E010}\mkern1.8mu}
+\renewcommand{\Relbar}{\symbol{"E011}\mkern-.2mu\symbol{"E011}\mkern1.8mu}
+\makeatother
+\end{verbatim}
+Then \texttt{\textbackslash xleftarrow} and other commands will work:
+\[\mathrm{CH}_3\mathrm{COO}\mathrm{H}+\mathrm{C}_2\mathrm{H}_5\mathrm{OH}\xrightarrow[{\triangle}]{\mathrm{H}_2\mathrm{SO}_4}\mathrm{CH}_3\mathrm{COOC}_2\mathrm{H}_5+\mathrm{H}_2\mathrm{O}.\]
\section{Known Issue}
\begin{itemize}
- \item As mentioned before, the font should only be used with \XeTeX.
- \item Various spacing problems. Though math fonts technically should not be kerned, some pairs looks very ugly (Ex. $VA$); sometimes sub/superscript may also have same problem.
+ \item Various spacing problems. Though math fonts technically should not be kerned, some pairs looks very ugly (Ex. $VA$); sometimes sub/superscript may also have same problem. However, do note that due to the mechanism in math mode, making all spacing look perfect is amlost impossible (as far as I can do, and low x-height and large italic angle only make things even worse), in many cases, adjusting manually (i.e. using \texttt{\textbackslash,} or \texttt{\textbackslash!}) is required.
\item Fake optical size. EB Garamond does not contain a complete set of glyphs (normal + bold + optical size of both weights). The ``optical size \texttt{ssty}'' is made by interpolating different weights at the present (without this, the double script is too thin to be readable).
\end{itemize}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/garamond-math/README.md new/doc/fonts/garamond-math/README.md
--- old/doc/fonts/garamond-math/README.md 2019-02-04 22:34:30.000000000 +0100
+++ new/doc/fonts/garamond-math/README.md 2019-11-16 23:15:05.000000000 +0100
@@ -1,5 +1,5 @@
<!-- README for CTAN -->
-# Garamond-Math Ver. 2019-02-05
+# Garamond-Math Ver. 2019-08-16
Garamond-Math is an open type math font matching the [EB Garamond (Octavio Pardo)](https://github.com/octaviopardo/EBGaramond12/) and [EB Garamond (Georg Mayr-Duffner)](https://github.com/georgd/EB-Garamond).
Many mathematical symbols are derived from other fonts (see below), others are made from scratch. The metric is generated with a python script.
@@ -7,20 +7,10 @@
## Notes
- *Important notes for this version*
- - Fixed various wrong mappings, add italic h.var.
- - Fraktur is (temporarily) not supported, Because (1) Originally they come from [TeX Gyre Termes Math](http://www.gust.org.pl/projects/e-foundry/tg-math/) and GUST and OFL are not completely compatible; (2) The glyphs are not modified at all, so there is in principle no need to include it (one can use `range` option in `unicode-math`)
- - Default `\mathbb` is swapped with original `StylisticSet=1`.
-
-- *Blackboard* (`\mathbb`):
- - Glyphs based on [XITS Math](https://github.com/khaledhosny/xits) are also available. However, the crossings and endpoints of strokes are rounded to fit the style of EB Garamond. They can be accessed via `StylisticSet=1`.
-
-- *Script* (`\mathscr`):
- - Default glyphs are from XITS Math. The weight (especially for bold) and crossings and endpoints of strokes are modified.
- - CM glyphs with a little modification are also available with `StylisticSet=3`
-
-- *Sans serif, typewriter*: from [Libertinus Math](https://github.com/khaledhosny/libertinus). This font has low x-height as Garamond do, though the bold italic Greeks are unavailable.
-
-- *Other glyphs available*: display `\int`, `\sum`, `\underbrace`, big delimiters, `\widehat`, arrows, binary relations derived, circled characters, etc, from the original EB Garamond.
+ - Massive metric adjustment. Now the metric is much closer to that of text.
+ - Now it should work with LuaTeX
+ - Added larger oprators etc;
+ - Reimport Fraktur from [Noto Sans Math](https://github.com/googlefonts/noto-fonts/).
- Stylistic sets: (`StylisticSet={#1,#2,...}` in [`unicode-math`](https://ctan.org/pkg/unicode-math?lang=en) package)
@@ -34,14 +24,14 @@
- `8` → Garamond-compatible `\mathcal` (experimental)
- `9` → `\tilde` variant
- `10` → out-bending italic h
+ - `11` → larger operators
## Known Issue
-- Currently only usable for `XeTeX` (with `unicode-math`). OTHER ENGINES (EX. `LuaTeX`, `MS Word`) WILL PRODUCE VERY BAD SPACINGS.
- Various spacing problems. Though math fonts technically should not be kerned, some pairs looks very ugly (Ex. `VA`); sometimes sub/superscript may also have same problem.
- Fake optical size. EB Garamond does not contain a complete set of glyphs (normal + bold + optical size of both weights). The "optical size `ssty`" is made by interpolating different weights at the present (without this, the double script is too thin to be readable).
## Technical Staff
-- This font is still under development, any components might be updated at any time. Issues, bug reports, forks and other contributions are welcome.
+- Issues, bug reports, forks and other contributions are welcome. Please visit [GitHub](https://github.com/YuanshengZhao/Garamond-Math/) for development details.
## License
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/garamond-math.doc.tlpobj new/tlpkg/tlpobj/garamond-math.doc.tlpobj
--- old/tlpkg/tlpobj/garamond-math.doc.tlpobj 2019-02-28 03:39:13.000000000 +0100
+++ new/tlpkg/tlpobj/garamond-math.doc.tlpobj 2019-11-17 01:55:34.000000000 +0100
@@ -1,9 +1,9 @@
name garamond-math.doc
category Package
-revision 49933
+revision 52820
shortdesc doc files of garamond-math
relocated 1
-docfiles size=74
+docfiles size=65
RELOC/doc/fonts/garamond-math/Garamond-Math.pdf
RELOC/doc/fonts/garamond-math/Garamond-Math.tex
RELOC/doc/fonts/garamond-math/README.md
++++++ garamond-math.tar.xz ++++++
Binary files old/fonts/opentype/public/garamond-math/Garamond-Math.otf and new/fonts/opentype/public/garamond-math/Garamond-Math.otf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/garamond-math.tlpobj new/tlpkg/tlpobj/garamond-math.tlpobj
--- old/tlpkg/tlpobj/garamond-math.tlpobj 2019-02-28 03:39:13.000000000 +0100
+++ new/tlpkg/tlpobj/garamond-math.tlpobj 2019-11-17 01:55:34.000000000 +0100
@@ -1,23 +1,24 @@
name garamond-math
category Package
-revision 49933
+revision 52820
shortdesc An OTF math font matching EB Garamond
relocated 1
-longdesc This is an open type math font matching EB Garamond (Octavio
-longdesc Pardo) and EB Garamond (Georg Mayr-Duffner). Many mathematical
-longdesc symbols are derived from other fonts, others are made from
-longdesc scratch. The metric is generated with a python script. The font
-longdesc is best used with XeTeX and the unicode-math package. Other
-longdesc engines (e.g. LuaTeX; also: MS Word) are likely to produce
-longdesc unsatifactory spacings. This font is still under development,
-longdesc so do not expect it to be free of bugs. Any component might be
-longdesc updated at any time. Issues, bug reports, forks, and other
-longdesc contributions are welcome.
-runfiles size=226
+longdesc Garamond-Math is an open type math font matching EB Garamond
+longdesc (Octavio Pardo) and EB Garamond (Georg Mayr-Duffner). Many
+longdesc mathematical symbols are derived from other fonts, others are
+longdesc made from scratch. The metric is generated with a Python
+longdesc script. The font is best used with XeTeX and the unicode-math
+longdesc package. Other engines (e.g. LuaTeX; also: MS Word) are likely
+longdesc to produce unsatifactory spacings. This font is still under
+longdesc development, so do not expect it to be free of bugs. Any
+longdesc component might be updated at any time. Issues, bug reports,
+longdesc forks, and other contributions are welcome.
+runfiles size=197
RELOC/fonts/opentype/public/garamond-math/Garamond-Math.otf
catalogue-contact-bugs https://github.com/YuanshengZhao/Garamond-Math/issues
+catalogue-contact-home https://github.com/YuanshengZhao/Garamond-Math
catalogue-contact-repository https://github.com/YuanshengZhao/Garamond-Math
catalogue-ctan /fonts/garamond-math
-catalogue-date 2019-02-06 05:12:24 +0100
+catalogue-date 2019-11-16 10:38:07 +0100
catalogue-license ofl
catalogue-topics font font-otf font-maths font-serif font-sans font-bbd
++++++ gastex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gastex.doc.tlpobj new/tlpkg/tlpobj/gastex.doc.tlpobj
--- old/tlpkg/tlpobj/gastex.doc.tlpobj 2019-02-28 03:39:14.000000000 +0100
+++ new/tlpkg/tlpobj/gastex.doc.tlpobj 2020-03-04 23:50:55.000000000 +0100
@@ -1,6 +1,6 @@
name gastex.doc
category Package
-revision 15878
+revision 54080
shortdesc doc files of gastex
relocated 1
docfiles size=6
++++++ gastex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gastex.tlpobj new/tlpkg/tlpobj/gastex.tlpobj
--- old/tlpkg/tlpobj/gastex.tlpobj 2019-02-28 03:39:14.000000000 +0100
+++ new/tlpkg/tlpobj/gastex.tlpobj 2020-03-04 23:50:55.000000000 +0100
@@ -1,6 +1,6 @@
name gastex
category Package
-revision 15878
+revision 54080
shortdesc Graphs and Automata Simplified in TeX
relocated 1
longdesc GasTeX is a set of LaTeX macros which enable the user to draw
@@ -14,9 +14,7 @@
RELOC/dvips/gastex/gastex.pro
RELOC/tex/latex/gastex/gastex.sty
catalogue-also pstricks-base
-catalogue-contact-home http://www.lsv.ens-cachan.fr/~gastin/gastex/gastex.html
catalogue-ctan /graphics/gastex
-catalogue-date 2018-09-15 11:08:35 +0200
catalogue-license lppl
catalogue-topics graphics-in-tex
catalogue-version 2.8
++++++ gatherenum.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/gatherenum/LICENSE new/doc/latex/gatherenum/LICENSE
--- old/doc/latex/gatherenum/LICENSE 2018-06-19 22:47:54.000000000 +0200
+++ new/doc/latex/gatherenum/LICENSE 2019-09-29 23:14:08.000000000 +0200
@@ -632,7 +632,7 @@
the "copyright" line and a pointer to where the full notice is found.
gatherenum
- Copyright (C) 2018 RIVAUD Julien
+ Copyright (C) 2018-2019 RIVAUD Julien
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
@@ -652,7 +652,7 @@
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
- gatherenum Copyright (C) 2018 RIVAUD Julien
+ gatherenum Copyright (C) 2018-2019 RIVAUD Julien
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.
Binary files old/doc/latex/gatherenum/gatherenum.pdf and new/doc/latex/gatherenum/gatherenum.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gatherenum.doc.tlpobj new/tlpkg/tlpobj/gatherenum.doc.tlpobj
--- old/tlpkg/tlpobj/gatherenum.doc.tlpobj 2019-02-28 03:39:15.000000000 +0100
+++ new/tlpkg/tlpobj/gatherenum.doc.tlpobj 2019-09-30 01:54:37.000000000 +0200
@@ -1,9 +1,9 @@
name gatherenum.doc
category Package
-revision 48051
+revision 52209
shortdesc doc files of gatherenum
relocated 1
-docfiles size=111
+docfiles size=107
RELOC/doc/latex/gatherenum/LICENSE
RELOC/doc/latex/gatherenum/README.md
RELOC/doc/latex/gatherenum/gatherenum.pdf
++++++ gatherenum.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/gatherenum/gatherenum.sty new/tex/latex/gatherenum/gatherenum.sty
--- old/tex/latex/gatherenum/gatherenum.sty 2018-06-19 22:47:54.000000000 +0200
+++ new/tex/latex/gatherenum/gatherenum.sty 2019-09-29 23:14:08.000000000 +0200
@@ -6,17 +6,17 @@
%%
%% gatherenum.dtx (with options: `package')
%%
-%% File: gatherenum.dtx (C) Copyright 2016-2018 RIVAUD Julien
+%% File: gatherenum.dtx (C) Copyright 2016-2019 RIVAUD Julien
%%
%% It may be distributed and/or modified under the conditions of the
%% General Public License (GPL), either version 3 of this
%% license or (at your option) any later version.
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\RequirePackage{expl3}[2016/01/19]
+\RequirePackage{expl3}[2018/06/19]
\def\ExplFileName{gatherenum}
\def\ExplFileDescription{Crossover between align* and enumerate}
-\def\ExplFileDate{2018/06/19}
-\def\ExplFileVersion{1.7}
+\def\ExplFileDate{2019/09/29}
+\def\ExplFileVersion{1.8}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\RequirePackage{enumitem}
@@ -44,7 +44,7 @@
\centering
\int_set_eq:NN \enitdp@gatherenum \enitdp@enumerate
\penalty \predisplaypenalty
- \begin{gatherenum}[
+ \gatherenum[
itemjoin=\skip_horizontal:n{1em plus 1fil},
#1,
mode=boxed,
@@ -56,11 +56,11 @@
}
}{
\clist_if_in:nnTF { #1 } { gathered } {
- \end{gatherenum}
+ \endgatherenum
\unskip
\int_set_eq:NN \clubpenalty \interlinepenalty
\int_set_eq:NN \widowpenalty \interlinepenalty
- \par
+ \use:c{@ @ par}% avoid l3docstrip replacement of @
}{
\__gatherenum_save_endenumerate:w
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gatherenum.tlpobj new/tlpkg/tlpobj/gatherenum.tlpobj
--- old/tlpkg/tlpobj/gatherenum.tlpobj 2019-02-28 03:39:15.000000000 +0100
+++ new/tlpkg/tlpobj/gatherenum.tlpobj 2019-09-30 01:54:37.000000000 +0200
@@ -1,6 +1,6 @@
name gatherenum
category Package
-revision 48051
+revision 52209
shortdesc A crossover of align* and enumerate
relocated 1
longdesc This package (ab)uses the inline enumeration capabilities of
@@ -19,7 +19,7 @@
catalogue-contact-bugs https://gitlab.com/frnchfrgg-latex/gatherenum/issues
catalogue-contact-repository https://gitlab.com/frnchfrgg-latex/gatherenum
catalogue-ctan /macros/latex/contrib/gatherenum
-catalogue-date 2018-06-24 05:03:49 +0200
+catalogue-date 2019-09-29 19:51:25 +0200
catalogue-license gpl3+
catalogue-topics list expl3
-catalogue-version 1.7
+catalogue-version 1.8
++++++ gbt7714.doc.tar.xz ++++++
++++ 2207 lines of diff (skipped)
++++++ gbt7714.tar.xz ++++++
++++ 8475 lines of diff (skipped)
++++++ gentium-tug.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gentium-tug/ChangeLog new/doc/fonts/gentium-tug/ChangeLog
--- old/doc/fonts/gentium-tug/ChangeLog 2015-05-13 23:29:46.000000000 +0200
+++ new/doc/fonts/gentium-tug/ChangeLog 2019-07-11 23:01:35.000000000 +0200
@@ -9,6 +9,11 @@
record of changes, and for more information on the individual font
projects.
+2019-07-09
+- update lgr-*.tfm to have ligatures for final sigma. (Ralf)
+- we'll call this version 1.1.1, since the glyphs did not change;
+ corresponding documentation and source updated (Karl)
+
2015-04-06
- update dvips/*.enc to use new names *.sc instead of *.SC. (Pavel/Karl)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gentium-tug/FONTLOG.txt new/doc/fonts/gentium-tug/FONTLOG.txt
--- old/doc/fonts/gentium-tug/FONTLOG.txt 2015-05-13 23:29:46.000000000 +0200
+++ new/doc/fonts/gentium-tug/FONTLOG.txt 2019-07-11 23:01:35.000000000 +0200
@@ -16,8 +16,10 @@
font projects.
The home page for the Gentium Plus PS fonts and TeX support package:
-http://tug.org/gentium
+https://tug.org/gentium
+9 July 2019 (TeX development team) Gentium Plus PS version 1.1.1
+- In lgr-*.tfm (only), add ligatures sigma + boundarychar -> final sigma.
6 April 2015 (TeX development team) Gentium Plus PS version 1.1
- Update to GentiumPlus 5.000.
@@ -50,7 +52,9 @@
The conversion process, including these changes, is implemented in the
Python and FontForge scripts included in the packages, e.g., ff-gentium.pe.
-
+Except that since the final sigma ligatures added in July 2019 only
+involve the TeX files, they were implemented with TeX tools;
+see ./source/fonts/gentium-tug/Makefile for specifics.
Acknowledgements
----------------
@@ -63,7 +67,7 @@
N: Karl Berry
E: karl@freefriends.org
-W: http://freefriends.org/~karl
+W: http://freefriends.org/~karl/
D: Documentation, licensing, distribution, SIL <-> TUG contact, etc.
N: Pavel Farar
@@ -75,10 +79,14 @@
D: ConTeXt support, conversion and generation scripts, etc.
N: Clea F. Rees
-W: http://cardiff.ac.uk/encap/contactsandpeople/profiles/rees-clea.html
+W: [404] http://cardiff.ac.uk/encap/contactsandpeople/profiles/rees-clea.html
D: Original LaTeX support, documentation, conversion.
N: Thomas A. Schmitz
E: thomas.schmitz@uni-bonn.de
-W: http://www.philologie.uni-bonn.de/personal/schmitz
+W: [404] http://www.philologie.uni-bonn.de/personal/schmitz
D: Initial version of TeX support files, AGR encoding, ConTeXt support
+
+N: Ralf Stubner
+E: ralf.stubner@gmail.com
+D: Ligatures for final sigma in lgr-*.tfm.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gentium-tug/Makefile new/doc/fonts/gentium-tug/Makefile
--- old/doc/fonts/gentium-tug/Makefile 2013-07-05 21:18:18.000000000 +0200
+++ new/doc/fonts/gentium-tug/Makefile 2019-07-11 23:01:35.000000000 +0200
@@ -3,12 +3,13 @@
env = TEXMFHOME=../../..
gentium.pdf: gentium.tex
- $(env) pdflatex '\nonstopmode\pdfmapfile{+gentium-type1.map}\input $<'
+ $(env) pdflatex '\nonstopmode\pdfsuppresswarningdupmap=1\pdfmapfile{+gentium-type1.map}\input $<'
# read the map file for running out of the development tree,
# without having the package installed, necessarily.
-dist:
+dist: clean
cd ../../../source/fonts/gentium-tug \
&& ./make-zip-4CTAN.sh -l
+
clean:
rm -f *.aux *.log *.out *.toc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gentium-tug/README new/doc/fonts/gentium-tug/README
--- old/doc/fonts/gentium-tug/README 2015-05-13 23:29:46.000000000 +0200
+++ new/doc/fonts/gentium-tug/README 2019-07-11 23:01:35.000000000 +0200
@@ -1,9 +1,9 @@
-$Id: README 12 2015-04-06 22:50:47Z karl $
+$Id: README 24 2019-07-09 22:04:39Z karl $
The home page for the original SIL Gentium font family is
-http://scripts.sil.org/Gentium.
+https://scripts.sil.org/Gentium.
The home page for this TeX package, gentium-tug, is
-http://tug.org/gentium. This TeX package consists of:
+https://tug.org/gentium. This TeX package consists of:
1. The original (unaltered) GentiumPlus, GentiumBook, and other
Gentium-family fonts in TrueType format, as developed by SIL and
@@ -14,7 +14,7 @@
to the TeX Users Group.
3. ConTeXt, LaTeX and other supporting files under the Expat license,
-text given below (also at http://directory.fsf.org/wiki/License:Expat).
+text given below (also at https://directory.fsf.org/wiki/License:Expat).
4. Documentation: the TeX-specific documentation is in gentium.{tex,pdf}
(also under Expat). We have also included the original documentation,
@@ -162,7 +162,7 @@
The package contains font files licensed under the SIL Open Font License,
while the rest are under the Expat License.
-Copyright (c) 2008-2015 TeX Users Group
+Copyright (c) 2008-2019 TeX Users Group
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Binary files old/doc/fonts/gentium-tug/gentium.pdf and new/doc/fonts/gentium-tug/gentium.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gentium-tug/gentium.tex new/doc/fonts/gentium-tug/gentium.tex
--- old/doc/fonts/gentium-tug/gentium.tex 2015-05-13 23:29:46.000000000 +0200
+++ new/doc/fonts/gentium-tug/gentium.tex 2019-07-11 23:01:35.000000000 +0200
@@ -1,7 +1,7 @@
% !TEX TS-program = pdflatex
% !TEX encoding = UTF-8 Unicode
-% $Id: gentium.tex 12 2015-04-06 22:50:47Z karl $
+% $Id: gentium.tex 24 2019-07-09 22:04:39Z karl $
% This file is part of the Gentium package for TeX.
% It is licensed under the Expat License, see doc//README for details.
@@ -56,10 +56,10 @@
\pdfinfo{%
/Creator (TeX)
/Producer (pdfTeX)
- /Author (Pavel Farář, Mojca Miklavec, Clea F.\ Rees)
+ /Author (Pavel Farář, Mojca Miklavec, Clea F.\ Rees, Thomas A. Schmitz, Karl Berry)
/Title (Gentium for TeX)
/Subject (TeX)
- /Keywords (TeX,LaTeX,font,fonts,tex,latex,gentium,GentiumPlus,GentiumBasic,Gentium,SIL,sil)}
+ /Keywords (TeX,LaTeX,ConTeXt,font,fonts,tex,latex,gentium,GentiumPlus,GentiumBasic,Gentium,SIL,sil)}
\pdfcatalog{%
/URL ()
/PageMode /UseOutlines}
@@ -94,10 +94,10 @@
routines found in this package). These Type~1 fonts use the name
`Gentium' by permission of \sil\ to the \TeX\ Users Group. Therefore
the name of this \TeX\ package, by request of \sil, is
-\pkgname{gentium-tug}. Its home page is \url{http://tug.org/gentium}.
+\pkgname{gentium-tug}. Its home page is \url{https://tug.org/gentium}.
Further information about the fonts themselves can be found in the
-included documentation and at \url{http://scripts.sil.org/gentium}. The
+included documentation and at \url{https://scripts.sil.org/gentium}. The
fonts are released under the \textsc{sil} Open Font License. For
details, see \url{ofl.txt} and \url{ofl-faq.txt}. (In the event of
releasing modified versions of the fonts, either TrueType or Type~1,
@@ -166,9 +166,9 @@
Instead, we refer you to an explanation of the system-wide installation,
with information for both \MiKTeX\ and \TeXLive, at
-\url{http://tug.org/fonts/fontinstall.html}. A corresponding
+\url{https://tug.org/fonts/fontinstall.html}. A corresponding
explanation for personal installation is at
-\url{http://tug.org/fonts/fontinstall-personal.html}.
+\url{https://tug.org/fonts/fontinstall-personal.html}.
Those pages describe using \path{testfont.tex} for a basic test of the
font; a tfm file name to use with that is \url{ec-gentiumplus-regular}.
@@ -200,7 +200,7 @@
encodings and some of those in the Text Companion encoding are
available, including the~\texteuro. You can see the available encodings
in table~\ref{encodings}. The Greek encoding LGR is supported only in
-\LaTeX, AGR only in \ConTeXt.
+\LaTeX, and AGR only in \ConTeXt.
\begin{table}[h]
\centering
@@ -303,7 +303,15 @@
results for 8-bit engines. These changes are irrelevant for Unicode
engines---they use the precomposed letters.
-The second change is in the letters dcaron (ď) and lcaron
+Another change concerning Greek was made in July 2019 (version 1.1.1):
+for the LGR encoding only (files \verb|lgr-gentiumplus-regular.tfm| and
+\verb|lgr-gentiumplus-regular.tfm|), ligatures were added such that a
+sigma at the end of a word (i.e., the compound-word-mark as a boundary
+character) or followed by punctuation is automatically changed to a
+final sigma, as is usual for that encoding. Thanks to Ralf Stubner for
+suggesting and then implementing this.
+
+The second general change is in the letters dcaron (ď) and lcaron
(ľ) that are used in the Czech and Slovak languages. (There was
no need to change tcaron (ť) and Lcaron (Ľ) with the same
accent.) There is no change of their shapes, and their advance widths
@@ -335,7 +343,7 @@
\section{Known bugs}
There are problems in older versions of \pdfTeX\ with small caps when
-using TrueType fonts. Especially the Latin encoding \textsc{t5} and all
+using TrueType fonts. In particular, the Latin encoding \textsc{t5} and all
Cyrillic encodings are unusable. You can use the Type~1 version of the
fonts or at least \pdfTeX\ version 1.40.13 to avoid these problems.
@@ -358,7 +366,9 @@
\subsection{SIL Open Font License}
-Copyright (c) 2003-2011 SIL International (http://www.sil.org/),
+\hfuzz=1.4pt
+
+Copyright (c) 2003-2011 SIL International (https://www.sil.org/),
with Reserved Font Names ``Gentium'' and ``SIL''.
This Font Software is licensed under the SIL Open Font License, Version 1.1.
@@ -467,7 +477,7 @@
\subsection{Expat License}
-Copyright (c) 2008-2013 TeX Users Group
+Copyright (c) 2008-2019 TeX Users Group
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gentium-tug.doc.tlpobj new/tlpkg/tlpobj/gentium-tug.doc.tlpobj
--- old/tlpkg/tlpobj/gentium-tug.doc.tlpobj 2019-02-28 03:39:19.000000000 +0100
+++ new/tlpkg/tlpobj/gentium-tug.doc.tlpobj 2020-03-24 01:58:41.000000000 +0100
@@ -1,6 +1,6 @@
name gentium-tug.doc
category Package
-revision 37378
+revision 54512
shortdesc doc files of gentium-tug
relocated 1
docfiles size=393
++++++ gentium-tug.tar.xz ++++++
Binary files old/fonts/tfm/public/gentium-tug/lgr-gentiumplus-italic.tfm and new/fonts/tfm/public/gentium-tug/lgr-gentiumplus-italic.tfm differ
Binary files old/fonts/tfm/public/gentium-tug/lgr-gentiumplus-regular.tfm and new/fonts/tfm/public/gentium-tug/lgr-gentiumplus-regular.tfm differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gentium-tug.tlpobj new/tlpkg/tlpobj/gentium-tug.tlpobj
--- old/tlpkg/tlpobj/gentium-tug.tlpobj 2019-02-28 03:39:20.000000000 +0100
+++ new/tlpkg/tlpobj/gentium-tug.tlpobj 2020-03-24 01:58:42.000000000 +0100
@@ -1,6 +1,6 @@
name gentium-tug
category Package
-revision 37378
+revision 54512
shortdesc Gentium fonts (in two formats) and support files
relocated 1
longdesc Gentium is a typeface family designed to enable the diverse
@@ -159,7 +159,6 @@
RELOC/tex/latex/gentium-tug/x2gentium.fd
catalogue-contact-home http://tug.org/gentium
catalogue-ctan /fonts/gentium-tug
-catalogue-date 2017-04-18 05:31:40 +0200
-catalogue-license other-free
-catalogue-topics font font-multilingual font-type1 font-ttf
-catalogue-version 1.1
+catalogue-license ofl other-free
+catalogue-topics font font-body font-multilingual font-greek font-cyrillic font-serif font-proportional font-type1 font-ttf font-supp font-t1enc
+catalogue-version 1.1.1
++++++ gentombow.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/gentombow/LICENSE new/doc/latex/gentombow/LICENSE
--- old/doc/latex/gentombow/LICENSE 2018-03-16 22:30:44.000000000 +0100
+++ new/doc/latex/gentombow/LICENSE 2019-07-21 22:51:18.000000000 +0200
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2018 Hironobu Yamashita
+Copyright (c) 2016-2019 Hironobu Yamashita
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/gentombow/Makefile new/doc/latex/gentombow/Makefile
--- old/doc/latex/gentombow/Makefile 2018-05-17 22:25:12.000000000 +0200
+++ new/doc/latex/gentombow/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-KANJI = -kanji=utf8
-FONTMAP = -f ipaex.map -f ptex-ipaex.map
-TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
-
-all: bounddvi.pdf bounddvi-en.pdf \
- gentombow.pdf gentombow-ja.pdf #pxgentombow.pdf
-
-.SUFFIXES: .tex .dvi .pdf
-.tex.dvi:
- platex $(KANJI) $<
- platex $(KANJI) $<
- rm *.aux *.log
-.dvi.pdf:
- dvipdfmx $(FONTMAP) $<
-
-bounddvi-en.dvi: bounddvi-en.tex
- latex $<
- latex $<
- rm *.aux *.log
-gentombow.pdf: gentombow.tex
- pdflatex $<
- pdflatex $<
- rm *.aux *.log
-
-.PHONY: install clean
-install:
- mkdir -p ${TEXMF}/doc/latex/gentombow
- cp ./Makefile ${TEXMF}/doc/latex/gentombow/
- cp ./LICENSE ${TEXMF}/doc/latex/gentombow/
- cp ./README.md ${TEXMF}/doc/latex/gentombow/
- cp ./*.pdf ${TEXMF}/doc/latex/gentombow/
- cp ./*.tex ${TEXMF}/doc/latex/gentombow/
- mkdir -p ${TEXMF}/tex/latex/gentombow
- cp ./*.sty ${TEXMF}/tex/latex/gentombow/
-clean:
- rm -f *.dvi *.pdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/gentombow/README.md new/doc/latex/gentombow/README.md
--- old/doc/latex/gentombow/README.md 2018-08-30 21:35:06.000000000 +0200
+++ new/doc/latex/gentombow/README.md 2019-07-21 22:51:18.000000000 +0200
@@ -44,6 +44,6 @@
## Release Date
-2018-08-30
+2019-07-21
Hironobu Yamashita
Binary files old/doc/latex/gentombow/gentombow-ja.pdf and new/doc/latex/gentombow/gentombow-ja.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/gentombow/gentombow-ja.tex new/doc/latex/gentombow/gentombow-ja.tex
--- old/doc/latex/gentombow/gentombow-ja.tex 2018-08-30 21:35:06.000000000 +0200
+++ new/doc/latex/gentombow/gentombow-ja.tex 2019-07-21 22:51:18.000000000 +0200
@@ -291,6 +291,9 @@
\item \verb+/BleedBox+: 裁ち落とし領域を含んだサイズ。
\item \verb+/CropBox+, \verb+/ArtBox+: 明示しない。
\end{itemize}
+注意:\textsf{pdfx}パッケージがPDF/Xモードで読み込まれていれば、
+このオプション機能は自動的に有効化されます。
+また、\verb+/CropBox+も明示します。
\section{その他の注意点}
@@ -444,6 +447,7 @@
\verb+pdfbox+オプションが正常動作するように改良、
\verb+\settombowbleed+が\verb+/TrimBox+に反映されな
かったバグの修正
+ \item 2019/07/21 v0.9k \textsf{pdfx}パッケージとの整合性をとる改良
\end{itemize}
\end{document}
Binary files old/doc/latex/gentombow/gentombow.pdf and new/doc/latex/gentombow/gentombow.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/gentombow/gentombow.tex new/doc/latex/gentombow/gentombow.tex
--- old/doc/latex/gentombow/gentombow.tex 2018-08-30 21:35:06.000000000 +0200
+++ new/doc/latex/gentombow/gentombow.tex 2019-07-21 22:51:18.000000000 +0200
@@ -252,6 +252,9 @@
\item \verb+/BleedBox+: paper size plus bleed margin.
\item \verb+/CropBox+ and \verb+/ArtBox+ are not set.
\end{itemize}
+Note: if the package \textsf{pdfx} is loaded with PDF/X mode,
+this optional feature is automatically enabled.
+Also, \verb+/CropBox+ is set explicitly.
\section{Additional Notes}
@@ -293,6 +296,7 @@
also with \verb+pdfbox+ option.
Fix a bug that \verb+\settombowbleed+ is not
considered by \verb+/TrimBox+.
+ \item 2019/07/21 v0.9k Support \textsf{pdfx} package.
\end{itemize}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gentombow.doc.tlpobj new/tlpkg/tlpobj/gentombow.doc.tlpobj
--- old/tlpkg/tlpobj/gentombow.doc.tlpobj 2019-02-28 03:39:25.000000000 +0100
+++ new/tlpkg/tlpobj/gentombow.doc.tlpobj 2019-07-22 01:53:34.000000000 +0200
@@ -1,11 +1,10 @@
name gentombow.doc
category Package
-revision 48512
+revision 51697
shortdesc doc files of gentombow
relocated 1
-docfiles size=149
+docfiles size=150
RELOC/doc/latex/gentombow/LICENSE
- RELOC/doc/latex/gentombow/Makefile
RELOC/doc/latex/gentombow/README.md
RELOC/doc/latex/gentombow/bounddvi-en.pdf
RELOC/doc/latex/gentombow/bounddvi-en.tex
++++++ gentombow.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/gentombow/gentombow.sty new/tex/latex/gentombow/gentombow.sty
--- old/tex/latex/gentombow/gentombow.sty 2018-08-30 21:35:06.000000000 +0200
+++ new/tex/latex/gentombow/gentombow.sty 2019-07-21 22:51:18.000000000 +0200
@@ -8,7 +8,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gentombow}
- [2018/08/30 v0.9j Generate crop mark 'tombow']
+ [2019/07/21 v0.9k Generate crop mark 'tombow']
\def\pxgtmb@pkgname{gentombow}
\@namedef{ver@pxgentombow.sty}{}% fake
@@ -290,6 +290,7 @@
%% prepare flag
\newif\ifpxgtmb@switch \pxgtmb@switchfalse
\newif\ifpxgtmb@landscape \pxgtmb@landscapefalse
+\newif\ifpxgtmb@pdfx@x \pxgtmb@pdfx@xfalse
%% passed from class options
%% should be declared first inside this package (least priority)
@@ -507,7 +508,7 @@
%% pdf "digital tombo" (driver-dependent)
% the box size calculation is delayed until \AtBeginDocument
% to allow users to change \@tombowbleed in the preamble
-\if 1\pxgtmb@pdfbox@status
+
% convert pt -> bp
\def\pxgtmb@PDF@setbp#1#2{%
\@tempdima=.996264#2\relax % 0.996264 = 72/72.27 (cf. 1in = 72.27pt = 72bp)
@@ -521,8 +522,8 @@
\def\pxgtmb@magscale{1}%
\fi
% set pdf boxes in bp unit
- %\pxgtmb@PDF@setbp\pxgtmb@PDF@crop@ur@x\stockwidth
- %\pxgtmb@PDF@setbp\pxgtmb@PDF@crop@ur@y\stockheight
+ \pxgtmb@PDF@setbp\pxgtmb@PDF@crop@ur@x\stockwidth
+ \pxgtmb@PDF@setbp\pxgtmb@PDF@crop@ur@y\stockheight
\pxgtmb@PDF@setbp\pxgtmb@PDF@trim@ll@x{\dimexpr(\stockwidth-\paperwidth)/2}%
\pxgtmb@PDF@setbp\pxgtmb@PDF@trim@ll@y{\dimexpr(\stockheight-\paperheight)/2}%
\pxgtmb@PDF@setbp\pxgtmb@PDF@trim@ur@x{\dimexpr(\stockwidth+\paperwidth)/2}%
@@ -532,8 +533,14 @@
\pxgtmb@PDF@setbp\pxgtmb@PDF@bleed@ur@x{\dimexpr(\stockwidth+\paperwidth)/2+\@tombowbleed}%
\pxgtmb@PDF@setbp\pxgtmb@PDF@bleed@ur@y{\dimexpr(\stockheight+\paperheight)/2+\@tombowbleed}%
\xdef\pxgtmb@PDF@CTM{%
- %% CropBox: implicit (same as MediaBox, large paper size)
- %/CropBox [0 0 \pxgtmb@PDF@crop@ur@x\space \pxgtmb@PDF@crop@ur@y]
+ %% CropBox: normally implicit (same as MediaBox, large paper size)
+ %% however, pdfx.sty in PDF/X mode sets /CropBox explicitly, so I need to override it!
+ \ifpxgtmb@pdfx@x
+ \noexpand\pxgtmb@PDF@begin
+ /CropBox [0 0
+ \pxgtmb@PDF@crop@ur@x\space
+ \pxgtmb@PDF@crop@ur@y] \noexpand\pxgtmb@PDF@end
+ \fi
%% BleedBox: explicit (final paper size + surrounding \@tombowbleed)
\noexpand\pxgtmb@PDF@begin
/BleedBox [\pxgtmb@PDF@bleed@ll@x\space
@@ -547,9 +554,20 @@
\pxgtmb@PDF@trim@ur@x\space
\pxgtmb@PDF@trim@ur@y] \noexpand\pxgtmb@PDF@end
%% ArtBox: implicit
+ %% [Note] PDF/X requires /TrimBox or /ArtBox but not both!
}%
\endgroup
}
+
+% do it
+\AtBeginDocument{\pxgtmb@PDF@emit}
+\def\pxgtmb@PDF@emit{%
+ % handle compatibility with pdfx.sty here;
+ % if pdfx.sty with PDF/X mode detected, force [pdfbox] option!
+ \pxgtmb@handle@pdfx
+ \ifpxgtmb@pdfx@x\def\pxgtmb@pdfbox@status{1}\fi
+ % start actual procedure for [pdfbox] option
+ \if 1\pxgtmb@pdfbox@status
%% supported drivers: dvips, dvipdfmx, XeTeX, pdfTeX, LuaTeX
\ifnum0\ifx\pdfvariable\@undefined\else\the\outputmode\fi=0\relax
\ifnum0\ifx\pdfpageattr\@undefined\else\the\pdfoutput\fi=0\relax
@@ -666,8 +684,7 @@
\def\pxgtmb@PDF@begin{}\def\pxgtmb@PDF@end{}%
\edef\pxgtmb@PDF@CTM{{\pxgtmb@PDF@CTM}}%
\expandafter\pdfpageattr\pxgtmb@PDF@CTM}
-\fi
-\else
+\fi\else
%% for LuaTeX
\def\pxgtmb@driver{l}
% force paper size
@@ -679,7 +696,8 @@
\edef\pxgtmb@PDF@CTM{pageattr{\pxgtmb@PDF@CTM}}%
\expandafter\pdfvariable\pxgtmb@PDF@CTM}
\fi
-\fi
+ \fi
+}
%% make visible tombow box according to the current status of
%% \@bannerfont, \@bannertoken, \@tombowwidth & \@tombowbleed
@@ -713,7 +731,7 @@
% because pdf boxes are calculated only inside \AtBeginDocument
\@onlypreamble\settombowbleed
-%% patch internal for pdfpages to work with tombow
+%% patch internal of pdfpages.sty to work with tombow
%% (tested on pdfpages 2017/10/31 v0.5l)
%% Note the code is the same as that of pxpdfpages.sty,
%% but reserved here since gentombow.sty can be used on
@@ -744,4 +762,8 @@
%% do it
\AtBeginDocument{\@ifpackageloaded{pdfpages}{\pxgtmb@patch@pdfpages}{}}
+%% patch pdfx.sty
+%% (tested on pdfx 2019/02/27 v1.6.3)
+\def\pxgtmb@handle@pdfx{\@ifpackageloaded{pdfx}{\let\ifpxgtmb@pdfx@x\ifpdfx@x}{}}
+
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gentombow.tlpobj new/tlpkg/tlpobj/gentombow.tlpobj
--- old/tlpkg/tlpobj/gentombow.tlpobj 2019-02-28 03:39:25.000000000 +0100
+++ new/tlpkg/tlpobj/gentombow.tlpobj 2019-07-22 01:53:35.000000000 +0200
@@ -1,6 +1,6 @@
name gentombow
category Package
-revision 48512
+revision 51697
shortdesc Generate Japanese-style crop marks
relocated 1
longdesc This bundle provides a LaTeX package for generating
@@ -19,6 +19,6 @@
RELOC/tex/latex/gentombow/pxgentombow.sty
catalogue-contact-repository https://github.com/aminophen/gentombow
catalogue-ctan /macros/latex/contrib/gentombow
-catalogue-date 2018-08-30 14:36:31 +0200
+catalogue-date 2019-07-21 14:39:06 +0200
catalogue-license bsd3
catalogue-topics japanese layout-page page-control
++++++ geometry.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/geometry/README.md new/doc/latex/geometry/README.md
--- old/doc/latex/geometry/README.md 2018-05-07 23:15:44.000000000 +0200
+++ new/doc/latex/geometry/README.md 2020-01-02 23:07:32.000000000 +0100
@@ -1,10 +1,10 @@
-LaTeX Package: Geometry 2010/09/12 v5.6
+LaTeX Package: Geometry 2020/01/02 v5.9
----------------------------------------
Flexible and complete interface to document dimensions.
Copyright (C) 1996-2010
by Hideo Umeki
-Copyright (C) 2018
+Copyright (C) 2018-202
Hideo Umeki and David Carlisle https://github.com/davidcarlisle/geometry
Abstract:
@@ -18,6 +18,10 @@
Recent changes:
+[Release 5.9]
+Do not load ifxetex and ifpdf packages (use combined iftex package)
+Include German translation of the documentation.
+
[Release 5.8]
Add xdvipdfmx and dvipdfmx alias for dvipdfm option.
@@ -28,9 +32,11 @@
Files:
* README.md - this file
- * changes.txt - history of changes
- * geometry.dtx - including sources and documentation
- * geometry.pdf - print-ready documentation
+ * changes.txt - history of changes
+ * geometry.dtx - including sources and documentation
+ * geometry.pdf - print-ready documentation
+ * geometry-de.dtx - German translation
+ * geometry-de.pdf - German translation
Installation:
[manual installation]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/geometry/changes.txt new/doc/latex/geometry/changes.txt
--- old/doc/latex/geometry/changes.txt 2018-05-07 23:15:44.000000000 +0200
+++ new/doc/latex/geometry/changes.txt 2020-01-02 23:07:32.000000000 +0100
@@ -1,3 +1,7 @@
+2020-01-02 Release 5.9
+ * Include German translation (previously distributed as geometry-de on ctan)
+ * Use iftex versions of \ifxetex, \ifpdf
+
2018-04-16 Release 5.8
* Documentation fixes.
* (x)dvipdfmx alias for dvipdfm otion.
Binary files old/doc/latex/geometry/geometry-de.pdf and new/doc/latex/geometry/geometry-de.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/geometry/geometry-samples-de.tex new/doc/latex/geometry/geometry-samples-de.tex
--- old/doc/latex/geometry/geometry-samples-de.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/geometry/geometry-samples-de.tex 2020-01-02 23:07:32.000000000 +0100
@@ -0,0 +1,73 @@
+%%
+%% This is file `geometry-samples-de.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% geometry-de.dtx (with options: `samples')
+%%
+%% Copyright (C) 1996-2010
+%% by Hideo Umeki
+%% Copyright (C) 2018-2020
+%% by Hideo Umeki and David Carlisle https://github.com/davidcarlisle/geometry
+%%
+%% This work 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 2005/12/01 or later.
+%%
+%% This work is "maintained" (as per the LPPL maintenance status)
+%% by David Carlisle.
+%%
+%% This work consists of the files geometry.dtx and
+%% the derived files: geometry.{sty,ins,drv}, geometry-samples.tex.
+%%
+\documentclass[12pt]{article}% uses letterpaper by default
+% \documentclass[12pt,a4paper]{article}% for A4 paper
+%---------------------------------------------------------------
+% Edit and uncomment one of the settings below
+%---------------------------------------------------------------
+% \usepackage{geometry}
+% \usepackage[centering]{geometry}
+% \usepackage[width=10cm,vscale=.7]{geometry}
+% \usepackage[margin=1cm, papersize={12cm,19cm}, resetpaper]{geometry}
+% \usepackage[margin=1cm,includeheadfoot]{geometry}
+\usepackage[margin=1cm,includeheadfoot,includemp]{geometry}
+% \usepackage[margin=1cm,bindingoffset=1cm,twoside]{geometry}
+% \usepackage[hmarginratio=2:1, vmargin=2cm]{geometry}
+% \usepackage[hscale=0.5,twoside]{geometry}
+% \usepackage[hscale=0.5,asymmetric]{geometry}
+% \usepackage[hscale=0.5,heightrounded]{geometry}
+% \usepackage[left=1cm,right=4cm,top=2cm,includefoot]{geometry}
+% \usepackage[lines=20,left=2cm,right=6cm,top=2cm,twoside]{geometry}
+% \usepackage[width=15cm, marginparwidth=3cm, includemp]{geometry}
+% \usepackage[hdivide={1cm,,2cm}, vdivide={3cm,8in,}, nohead]{geometry}
+% \usepackage[headsep=20pt, head=40pt,foot=20pt,includeheadfoot]{geometry}
+% \usepackage[text={6in,8in}, top=2cm, left=2cm]{geometry}
+% \usepackage[centering,includemp,twoside,landscape]{geometry}
+% \usepackage[mag=1414,margin=2cm]{geometry}
+% \usepackage[mag=1414,margin=2truecm,truedimen]{geometry}
+% \usepackage[a5paper, landscape, twocolumn, twoside,
+% left=2cm, hmarginratio=2:1, includemp, marginparwidth=43pt,
+% bottom=1cm, foot=.7cm, includefoot, textheight=11cm, heightrounded,
+% columnsep=1cm,verbose]{geometry}
+%---------------------------------------------------------------
+% No need to change below
+%---------------------------------------------------------------
+\geometry{verbose,showframe}% the options appended.
+\usepackage{lipsum}% for dummy text of 150 paragraphs
+\newcommand\mynote{\marginpar[\raggedright
+A sample margin note in the left side.]%
+{\raggedright A sample margin note.}}%
+\newcommand\myfootnote{\footnote{This is a sample footnote text.}}
+\begin{document}
+\lipsum[1-2]\mynote\lipsum[3-4]\mynote
+\lipsum[5-11]\mynote\lipsum[12]\myfootnote
+\lipsum[13-22]\mynote\lipsum[23-32]
+\end{document}
+\endinput
+%%
+%% End of file `geometry-samples-de.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/geometry/geometry-samples.tex new/doc/latex/geometry/geometry-samples.tex
--- old/doc/latex/geometry/geometry-samples.tex 2018-03-25 23:23:05.000000000 +0200
+++ new/doc/latex/geometry/geometry-samples.tex 2020-01-02 23:07:32.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% Copyright (C) 1996-2010
%% by Hideo Umeki
-%% Copyright (C) 2018
+%% Copyright (C) 2018-2020
%% by Hideo Umeki and David Carlisle https://github.com/davidcarlisle/geometry
%%
%% This work may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/geometry/geometry.cfg new/doc/latex/geometry/geometry.cfg
--- old/doc/latex/geometry/geometry.cfg 2018-03-25 23:23:05.000000000 +0200
+++ new/doc/latex/geometry/geometry.cfg 2020-01-02 23:07:32.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% Copyright (C) 1996-2010
%% by Hideo Umeki
-%% Copyright (C) 2018
+%% Copyright (C) 2018-2020
%% by Hideo Umeki and David Carlisle https://github.com/davidcarlisle/geometry
%%
%% This work may be distributed and/or modified under the conditions of
Binary files old/doc/latex/geometry/geometry.pdf and new/doc/latex/geometry/geometry.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/geometry.doc.tlpobj new/tlpkg/tlpobj/geometry.doc.tlpobj
--- old/tlpkg/tlpobj/geometry.doc.tlpobj 2019-02-28 03:39:25.000000000 +0100
+++ new/tlpkg/tlpobj/geometry.doc.tlpobj 2020-03-04 23:50:56.000000000 +0100
@@ -1,11 +1,13 @@
name geometry.doc
category Package
-revision 47638
+revision 54080
shortdesc doc files of geometry
relocated 1
-docfiles size=116
+docfiles size=230
RELOC/doc/latex/geometry/README.md
RELOC/doc/latex/geometry/changes.txt
+ RELOC/doc/latex/geometry/geometry-de.pdf
+ RELOC/doc/latex/geometry/geometry-samples-de.tex
RELOC/doc/latex/geometry/geometry-samples.tex
RELOC/doc/latex/geometry/geometry.cfg
RELOC/doc/latex/geometry/geometry.pdf
++++++ geometry.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/geometry/geometry.sty new/tex/latex/geometry/geometry.sty
--- old/tex/latex/geometry/geometry.sty 2018-05-07 23:15:44.000000000 +0200
+++ new/tex/latex/geometry/geometry.sty 2020-01-02 23:07:32.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% Copyright (C) 1996-2010
%% by Hideo Umeki
-%% Copyright (C) 2018
+%% Copyright (C) 2018-2020
%% by Hideo Umeki and David Carlisle https://github.com/davidcarlisle/geometry
%%
%% This work may be distributed and/or modified under the conditions of
@@ -27,11 +27,9 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{geometry}
- [2018/04/16 v5.8 Page Geometry]
+ [2020/01/02 v5.9 Page Geometry]
\RequirePackage{keyval}%
-\RequirePackage{ifpdf}%
\RequirePackage{ifvtex}%
-\RequirePackage{ifxetex}%
\newif\ifGm@verbose
\newif\ifGm@landscape
\newif\ifGm@swap@papersize
@@ -1043,7 +1041,7 @@
\setlength\pdfpagewidth{\Gm@pw}%
\setlength\pdfpageheight{\Gm@ph}}%
\ifnum\mag=\@m\else
- \@tempdima=\mag sp
+ \@tempdima=\mag sp%
\@ifundefined{pdfhorigin}{}{%
\divide\pdfhorigin\@tempdima
\multiply\pdfhorigin\@m
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/geometry.tlpobj new/tlpkg/tlpobj/geometry.tlpobj
--- old/tlpkg/tlpobj/geometry.tlpobj 2019-02-28 03:39:26.000000000 +0100
+++ new/tlpkg/tlpobj/geometry.tlpobj 2020-03-04 23:50:56.000000000 +0100
@@ -1,6 +1,6 @@
name geometry
category Package
-revision 47638
+revision 54080
shortdesc Flexible and complete interface to document dimensions
relocated 1
longdesc The package provides an easy and flexible user interface to
@@ -15,13 +15,14 @@
longdesc feature is the package's ability to communicate the paper size
longdesc it's set up to the output (whether via DVI \specials or via
longdesc direct interaction with pdf(La)TeX).
+depend graphics
+depend iftex
runfiles size=11
RELOC/tex/latex/geometry/geometry.sty
-catalogue-also vmargin typearea
+catalogue-also vmargin typearea geometry-de
catalogue-contact-bugs https://github.com/davidcarlisle/geometry/issues
catalogue-contact-repository https://github.com/davidcarlisle/geometry
catalogue-ctan /macros/latex/contrib/geometry
-catalogue-date 2018-05-07 13:41:20 +0200
-catalogue-license lppl
+catalogue-license lppl1.3c
catalogue-topics geometry
-catalogue-version 5.8
+catalogue-version 5.9
++++++ gfsdidot.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gfsdidot.doc.tlpobj new/tlpkg/tlpobj/gfsdidot.doc.tlpobj
--- old/tlpkg/tlpobj/gfsdidot.doc.tlpobj 2019-02-28 03:39:38.000000000 +0100
+++ new/tlpkg/tlpobj/gfsdidot.doc.tlpobj 2020-03-04 23:50:56.000000000 +0100
@@ -1,6 +1,6 @@
name gfsdidot.doc
category Package
-revision 46310
+revision 54080
shortdesc doc files of gfsdidot
relocated 1
docfiles size=187
++++++ gfsdidot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gfsdidot.tlpobj new/tlpkg/tlpobj/gfsdidot.tlpobj
--- old/tlpkg/tlpobj/gfsdidot.tlpobj 2019-02-28 03:39:39.000000000 +0100
+++ new/tlpkg/tlpobj/gfsdidot.tlpobj 2020-03-04 23:50:56.000000000 +0100
@@ -1,6 +1,6 @@
name gfsdidot
category Package
-revision 46310
+revision 54080
shortdesc A Greek font based on Didot's work
relocated 1
longdesc The design of Didot's 1805 Greek typeface was influenced by the
@@ -199,6 +199,5 @@
RELOC/tex/latex/gfsdidot/uudidotnums.fd
catalogue-contact-home http://myria.math.aegean.gr/labs/dt/
catalogue-ctan /fonts/greek/gfs/gfsdidot
-catalogue-date 2018-01-14 14:07:56 +0100
catalogue-license other-free
-catalogue-topics font font-serif font-greek font-multilingual font-type1 font-otf font-t1enc
+catalogue-topics font font-body font-serif font-greek font-multilingual font-type1 font-otf font-t1enc
++++++ gfsneohellenic.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gfsneohellenic.doc.tlpobj new/tlpkg/tlpobj/gfsneohellenic.doc.tlpobj
--- old/tlpkg/tlpobj/gfsneohellenic.doc.tlpobj 2019-02-28 03:39:40.000000000 +0100
+++ new/tlpkg/tlpobj/gfsneohellenic.doc.tlpobj 2020-03-04 23:50:57.000000000 +0100
@@ -1,6 +1,6 @@
name gfsneohellenic.doc
category Package
-revision 31979
+revision 54080
shortdesc doc files of gfsneohellenic
relocated 1
docfiles size=11
++++++ gfsneohellenic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gfsneohellenic.tlpobj new/tlpkg/tlpobj/gfsneohellenic.tlpobj
--- old/tlpkg/tlpobj/gfsneohellenic.tlpobj 2019-02-28 03:39:40.000000000 +0100
+++ new/tlpkg/tlpobj/gfsneohellenic.tlpobj 2020-03-04 23:50:57.000000000 +0100
@@ -1,7 +1,7 @@
name gfsneohellenic
category Package
-revision 31979
-shortdesc A Greek font in the Neo-Hellenic style
+revision 54080
+shortdesc A font in the Neo-Hellenic style
relocated 1
longdesc The NeoHellenic style evolved in academic circles in the 19th
longdesc and 20th century; the present font follows a cut commissioned
@@ -127,6 +127,5 @@
RELOC/tex/latex/gfsneohellenic/uneohellenicnums.fd
catalogue-contact-home http://myria.math.aegean.gr/labs/dt/
catalogue-ctan /fonts/greek/gfs/gfsneohellenic
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license other-free
-catalogue-topics font font-type1 font-otf font-greek
+catalogue-topics font font-otf font-greek
++++++ gfsneohellenicmath.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gfsneohellenicmath/README new/doc/fonts/gfsneohellenicmath/README
--- old/doc/fonts/gfsneohellenicmath/README 2018-03-07 22:46:06.000000000 +0100
+++ new/doc/fonts/gfsneohellenicmath/README 2019-10-29 22:23:22.000000000 +0100
@@ -1,4 +1,4 @@
-GFSNeohellenicMath (version 1.0)
+GFSNeohellenicMath (version 1.0.1)
----------------------------------
The font GFSNeohellenicMath was commissioned to the Greek Font Society (GFS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gfsneohellenicmath.doc.tlpobj new/tlpkg/tlpobj/gfsneohellenicmath.doc.tlpobj
--- old/tlpkg/tlpobj/gfsneohellenicmath.doc.tlpobj 2019-02-28 03:39:40.000000000 +0100
+++ new/tlpkg/tlpobj/gfsneohellenicmath.doc.tlpobj 2019-10-30 01:55:53.000000000 +0100
@@ -1,6 +1,6 @@
name gfsneohellenicmath.doc
category Package
-revision 46869
+revision 52570
shortdesc doc files of gfsneohellenicmath
relocated 1
docfiles size=30
++++++ gfsneohellenicmath.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/gfsneohellenicmath/gfsneohellenicot.sty new/tex/latex/gfsneohellenicmath/gfsneohellenicot.sty
--- old/tex/latex/gfsneohellenicmath/gfsneohellenicot.sty 2018-03-07 22:46:06.000000000 +0100
+++ new/tex/latex/gfsneohellenicmath/gfsneohellenicot.sty 2019-10-29 22:23:22.000000000 +0100
@@ -1,5 +1,5 @@
% Support file for GFSNeohellenic and GFSNeohellenicMath
-% version 1.0
+% version 1.0.1
\RequirePackage{fontspec}
\defaultfontfeatures{Ligatures=TeX}
\setmainfont[% main font
@@ -11,7 +11,7 @@
WordSpace={0.75,0.75,1},%
Scale=1.2%use instead of 12pt
]{GFSNeohellenic.otf}
-\newfontfamily\scshape[%
+\renewfontfamily\scshape[%
RawFeature=+smcp,RawFeature=+onum,WordSpace={0.75,0.75,1},LetterSpace=0.06,%
Scale=1.2%use instead of 12pt
]{GFSNeohellenic.otf}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gfsneohellenicmath.tlpobj new/tlpkg/tlpobj/gfsneohellenicmath.tlpobj
--- old/tlpkg/tlpobj/gfsneohellenicmath.tlpobj 2019-02-28 03:39:41.000000000 +0100
+++ new/tlpkg/tlpobj/gfsneohellenicmath.tlpobj 2019-10-30 01:55:53.000000000 +0100
@@ -1,6 +1,6 @@
name gfsneohellenicmath
category Package
-revision 46869
+revision 52570
shortdesc A Greek math font in the Neo-Hellenic style
relocated 1
longdesc The GFSNeohellenic font, a historic font first designed by
@@ -18,7 +18,7 @@
RELOC/fonts/opentype/public/gfsneohellenicmath/GFSNeohellenicMath.otf
RELOC/tex/latex/gfsneohellenicmath/gfsneohellenicot.sty
catalogue-ctan /fonts/gfsneohellenicmath
-catalogue-date 2018-04-29 07:15:59 +0200
+catalogue-date 2019-10-29 19:11:18 +0100
catalogue-license ofl
catalogue-topics font font-type1 font-otf font-greek maths font-maths
-catalogue-version 1.0
+catalogue-version 1.0.1
++++++ ghsystem.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ghsystem/README new/doc/latex/ghsystem/README
--- old/doc/latex/ghsystem/README 2016-07-16 23:41:37.000000000 +0200
+++ new/doc/latex/ghsystem/README 2020-02-17 23:17:09.000000000 +0100
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the GHSYSTEM package v4.8 2016/07/16
+the GHSYSTEM package v4.8c 2020/02/17
globally harmonized system
@@ -8,7 +8,7 @@
Web: https://github.com/cgnieder/ghsystem/
E-Mail: contact@mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2011-2016 Clemens Niederberger
+Copyright 2011--2020 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -34,7 +34,7 @@
- ghsystem_italian.def
- ghsystem_langtemplate.def
documentation and README:
- - ghsystem_en.tex, ghsystem_en.pdf,
+ - ghsystem-manual.tex, ghsystem-manual.cls, ghsystem-manual.pdf,
- README
--------------------------------------------------------------------------
If you have any ideas, questions, suggestions or bugs to report, please
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ghsystem/ghsystem-manual.cls new/doc/latex/ghsystem/ghsystem-manual.cls
--- old/doc/latex/ghsystem/ghsystem-manual.cls 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/ghsystem/ghsystem-manual.cls 2020-02-17 23:17:09.000000000 +0100
@@ -0,0 +1,272 @@
+% --------------------------------------------------------------------------
+% the GHSYSTEM package
+%
+% globally harmonised system
+%
+% --------------------------------------------------------------------------
+% Clemens Niederberger
+% --------------------------------------------------------------------------
+% https://github.org/cgnieder/ghsystem/
+% contact@mychemistry.eu
+% --------------------------------------------------------------------------
+% If you have any ideas, questions, suggestions or bugs to report, please
+% feel free to contact me.
+% --------------------------------------------------------------------------
+% Copyright 2011--2020 Clemens Niederberger
+%
+% 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 Clemens Niederberger.
+% --------------------------------------------------------------------------
+\ProvidesClass{ghsystem-manual}[2020/02/17]
+
+\LoadClass[load-preamble,add-index]{cnltx-doc}
+\RequirePackage{imakeidx}
+\RequirePackage[utf8]{inputenc}
+
+\RequirePackage{ghsystem,chemmacros}
+
+\setcnltx{
+ package = {ghsystem},
+ info = \acl*{ghs} ,
+ url = https://github.com/cgnieder/ghsystem/ ,
+ authors = Clemens Niederberger ,
+ email = contact@mychemistry.eu ,
+ abstract = {%
+ \centering
+ \includegraphics{chemmacros-logo.pdf}
+ \par
+ } ,
+ add-cmds = {
+ chemsetup,
+ ghs, ghslistall, ghspic, ghssetup
+ } ,
+ index-setup = { noclearpage , level = \addsec }
+}
+
+\RequirePackage{booktabs}
+
+\def\libertine@figurestyle{LF}
+\RequirePackage{amsmath}
+\undef\lvert \undef\lVert
+\undef\rvert \undef\rVert
+\RequirePackage[libertine]{newtxmath}
+\def\libertine@figurestyle{OsF}
+
+\RequirePackage[biblatex]{embrac}
+\ChangeEmph{[}[,.02em]{]}[.055em,-.08em]
+\ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em]
+
+\RequirePackage[accsupp]{acro}
+\acsetup{
+ long-format = \scshape ,
+ short-format = \scshape
+}
+
+\chemsetup{
+ greek = newtx ,
+ formula = chemformula ,
+ chemformula/format = \libertineLF
+}
+
+\ghssetup{
+ language = {german,english}
+}
+
+\sisetup{
+ detect-mode=false,
+ mode=text,
+ text-rm=\libertineLF
+}
+
+\RequirePackage{fontawesome}
+\RequirePackage{datetime2}
+\DTMsetup{useregional=numeric,datesep=/}
+\newrobustcmd*\ghsystem@add@version[2]{%
+ \csdef{ghsystem@ver@#2}{%
+ \DTMdate{#1}%
+ \csgdef{ghsystem@ver@#2used}{}%
+ \csdef{ghsystem@ver@#2}{\DTMdate{#1}}%
+ }%
+}
+
+\newrobustcmd*\ghsystem@date[1]{%
+ \ifcsdef{ghsystem@ver@#1used}{}{ (\csuse{ghsystem@ver@#1})}}
+\newrobustcmd*\ghsystem@ifnew[1]{\ifcsstring{c_ghsystem_version_tl}{#1}}
+\newrobustcmd*\ghsystem@NEW{\faStarO\ New}
+
+\renewrobustcmd*\sinceversion[1]{%
+ \ghsystem@ifnew{#1}%
+ {\cnltx@version@note{\textcolor{red}{\ghsystem@NEW}}}%
+ {\cnltx@version@note{\GetTranslation{cnltx-introduced}~#1\ghsystem@date{#1}}}%
+}
+\renewrobustcmd*\changedversion[1]{%
+ \cnltx@version@note{\GetTranslation{cnltx-changed}~#1\ghsystem@date{#1}}%
+}
+
+\newnote*\sincechanged[2]{%
+ \GetTranslation{cnltx-introduced}~#1\ghsystem@date{#1},
+ changed with version~#2\ghsystem@date{#2}\ghsystem@ifnew{#2}{ \ghsystem@NEW}{}%
+}
+
+\RenewDocumentEnvironment{commands}{}
+ {%
+ \cnltx@set@catcode_{12}%
+ \let\command\cnltx@command
+ \cnltxlist
+ }
+ {\endcnltxlist}
+
+\RequirePackage{tcolorbox,xsimverb}
+\tcbuselibrary{skins,breakable}
+\tcbset{enhanced,enhanced jigsaw}
+
+\newtcolorbox{bewareofthedog}{
+ colback = white ,
+ colframe = red ,
+ underlay={%
+ \path[draw=none]
+ (interior.south west)
+ rectangle node[red]{\Huge\bfseries !}
+ ([xshift=-4mm]interior.north west);
+ }%
+}
+
+\newtcolorbox{cnltxcode}[1][]{
+ boxrule = 1pt ,
+ colback = cnltxbg ,
+ colframe = cnltx ,
+ arc = 5pt ,
+ beforeafter skip = .5\baselineskip ,%
+ #1%
+}
+
+\newcommand*\ghsystem@readoptions[1]{%
+ \catcode`\^^M=13
+ \ghsystem@read@options{#1}%
+}
+
+\begingroup
+\catcode`\^^M=13
+\gdef\ghsystem@read@options#1#2^^M{%
+ \endgroup
+ \ifblank{#2}{}{\ghsystem@read@options@#2}%
+ #1%
+ \XSIMfilewritestart*{\jobname.tmp}%
+}%
+\endgroup
+\def\ghsystem@read@options@[#1]{\pgfqkeys{/cnltx}{#1}}
+
+\RenewDocumentEnvironment{sourcecode}{}
+ {%
+ \begingroup
+ \ghsystem@readoptions{%
+ \setlength\cnltx@sidebysidewidth
+ {\dimexpr .45\columnwidth -\lst@xleftmargin -\lst@xrightmargin\relax}%
+ \expanded{%
+ \noexpand\lstset{
+ style=cnltx,
+ \ifboolexpe{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} }
+ {linewidth=\cnltx@sidebysidewidth,}{}%
+ \expandonce\cnltx@local@listings@options
+ }%
+ }%
+ \XSIMgobblechars{2}%
+ }%
+ }
+ {%
+ \XSIMfilewritestop
+ \cnltxcode[breakable]%
+ \lstinputlisting[style=cnltx]{\jobname.tmp}%
+ \endcnltxcode
+ }
+
+\RenewDocumentEnvironment{example}{}
+ {%
+ \begingroup
+ \ghsystem@readoptions{%
+ \setlength\cnltx@sidebysidewidth
+ {\dimexpr .45\columnwidth -\lst@xleftmargin -\lst@xrightmargin\relax}%
+ \expanded{%
+ \noexpand\lstset{
+ style=cnltx,
+ \ifboolexpe{ bool {cnltx@sidebyside} and not bool {cnltx@codeonly} }
+ {linewidth=\cnltx@sidebysidewidth,}{}%
+ \expandonce\cnltx@local@listings@options
+ }%
+ }%
+ \XSIMgobblechars{2}%
+ }%
+ }
+ {%
+ \XSIMfilewritestop
+ \ifbool{cnltx@sidebyside}
+ {%
+ \cnltxcode
+ \noindent
+ \minipage[c]{\cnltx@sidebysidewidth}%
+ \cnltx@pre@source@hook
+ \lstinputlisting[style=cnltx] {\jobname.tmp}%
+ \cnltx@after@source@hook
+ \endminipage\hfill
+ \minipage[c]{\cnltx@sidebysidewidth}%
+ \cnltx@pre@example@hook
+ \input {\jobname.tmp}%
+ \cnltx@after@example@hook
+ \endminipage
+ }
+ {%
+ \cnltxcode[breakable]%
+ \cnltx@pre@source@hook
+ \lstinputlisting{\jobname.tmp}%
+ \cnltx@after@source@hook
+ \tcblower
+ \cnltx@pre@example@hook
+ \input {\jobname.tmp}%
+ \cnltx@after@example@hook
+ }%
+ \endcnltxcode
+ }
+
+\RequirePackage[
+ backend=biber,
+ style=cnltx,
+ sortlocale=en_US,
+ indexing=cite]{biblatex}
+\RequirePackage{csquotes,varioref}
+\defbibheading{bibliography}{\section{References}}
+
+\RequirePackage[biblatex]{embrac}[2012/06/29]
+\ChangeEmph{[}[,.02em]{]}[.055em,-.08em]
+\ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em]
+
+\ghsystem@add@version{2012-01-28}{3.0}
+\ghsystem@add@version{2012/01/30}{3.0a}
+\ghsystem@add@version{2012/02/05}{3.0c}
+\ghsystem@add@version{2012/05/13}{3.3a}
+\ghsystem@add@version{2012/05/18}{3.3b}
+\ghsystem@add@version{2012/05/18}{3.3c}
+\ghsystem@add@version{2012/07/24}{3.3d}
+\ghsystem@add@version{2013/02/19}{3.5a}
+\ghsystem@add@version{2013/07/06}{4.0}
+\ghsystem@add@version{2013/12/13}{4.0a}
+\ghsystem@add@version{2014/01/09}{4.2e}
+\ghsystem@add@version{2014/04/08}{4.5}
+\ghsystem@add@version{2014/04/13}{4.5a}
+\ghsystem@add@version{2014/06/30}{4.5b}
+\ghsystem@add@version{2014/08/08}{4.6}
+\ghsystem@add@version{2016/01/15}{4.7}
+\ghsystem@add@version{2016/07/16}{4.8}
+\ghsystem@add@version{2019/09/30}{4.8a}
+\ghsystem@add@version{2020/01/16}{4.8b}
+\ghsystem@add@version{2020/02/17}{4.8c}
+
+\endinput
Binary files old/doc/latex/ghsystem/ghsystem-manual.pdf and new/doc/latex/ghsystem/ghsystem-manual.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ghsystem/ghsystem-manual.tex new/doc/latex/ghsystem/ghsystem-manual.tex
--- old/doc/latex/ghsystem/ghsystem-manual.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/ghsystem/ghsystem-manual.tex 2020-02-17 23:17:09.000000000 +0100
@@ -0,0 +1,445 @@
+% arara: pdflatex
+% arara: biber
+% arara: pdflatex
+% arara: pdflatex
+% --------------------------------------------------------------------------
+% the GHSYSTEM package
+%
+% globally harmonized system
+%
+% --------------------------------------------------------------------------
+% Clemens Niederberger
+% --------------------------------------------------------------------------
+% https://github.com/cgnieder/ghsystem/
+% contact@mychemistry.eu
+% --------------------------------------------------------------------------
+% If you have any ideas, questions, suggestions or bugs to report, please
+% feel free to contact me.
+% --------------------------------------------------------------------------
+% Copyright 2011--2020 Clemens Niederberger
+%
+% 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 Clemens Niederberger.
+% --------------------------------------------------------------------------
+\documentclass{ghsystem-manual}
+
+\DeclareAcronym{ghs}{
+ short = ghs ,
+ long = Globally Harmonized System of Classification and Labelling of
+ Chemicals ,
+ pdfstring = GHS ,
+ accsupp = GHS
+}
+\DeclareAcronym{eu}{
+ short = EU ,
+ long = European Union ,
+ pdfstring = EU ,
+ accsupp = EU
+}
+\DeclareAcronym{UN}{
+ short = un ,
+ long = United Nations ,
+ pdfstring = UN ,
+ accsupp = UN
+}
+\DeclareAcronym{dvi}{
+ short = dvi ,
+ long = device independent file format ,
+ pdfstring = DVI ,
+ accsupp = DVO
+}
+\DeclareAcronym{pdf}{
+ short = pdf ,
+ long = portable document file ,
+ pdfstring = PDF ,
+ accsupp = PDF
+}
+
+
+\defbibheading{bibliography}{\addsec{References}}
+\addbibresource{cnltx.bib}
+\addbibresource{\jobname.bib}
+\begin{filecontents*}[overwrite]{\jobname.bib}
+@misc{eu:ghsystem_regulation,
+ author = {{The European Parliament and The Council of the European Union}},
+ title = {Regulation (EC) No 1272/2008 of the European Parliament and of
+ the Council} ,
+ shorthand = {EuP} ,
+ subtitle = {on classification, labelling and packaging of substances and
+ mixtures, amending and repealing Directives 67/548/EEC and 1999/45/EC, and
+ amending Regulation (EC) No 1907/2006} ,
+ journal = {Official Journal of the European Union} ,
+ date = {2008-12-16}
+}
+@online{unece:ghsystem_implementation,
+ author = {{United Nations Economic Commission for Europe}} ,
+ title = {GHS Implementation} ,
+ url =
+ {http://www.unece.org/trans/danger/publi/ghs/implementation_e.html} ,
+ urldate = {2012-03-20} ,
+ date = {2012-03-20}
+}
+\end{filecontents*}
+
+\newcommand*\tablehead[1]{\textrm{\bfseries#1}}
+
+\begin{document}
+
+\section{Introduction}
+As a chemist you are probably aware of the fact that the \acl{UN} have
+developed the \ac{ghs} as a global replacement for the various different
+systems in different countries. While it has not been implemented by all
+countries yet~\cite{unece:ghsystem_implementation}, it is only a matter of
+time.
+
+The package \ghsystem{} now enables you to typeset all the hazard and
+precautionary statements and pictograms in a very easy way. The statements
+are taken from \acs{eu} regulation 1272/2008~\cite{eu:ghsystem_regulation}.
+
+\section{Licence and Requirements}
+\license
+
+\ghsystem\ loads the following packages:
+\pkg{expl3}\footnote{\CTANurl{l3kernel}}~\cite{bnd:l3kernel}, \pkg{xparse} and
+\pkg{l3keys2e}\footnote{\CTANurl{l3packages}}~\cite{bnd:l3packages},
+\needpackage{chemmacros}~\cite{pkg:translations},
+\needpackage{translations}~\cite{pkg:translations},
+\needpackage{siunitx}~\cite{pkg:siunitx},
+\needpackage{graphicx}~\cite{pkg:graphicx},
+\needpackage{longtable}~\cite{pkg:longtable} and
+\needpackage{ifpdf}~\cite{pkg:ifpdf}.
+
+\section{Setup}
+% TODO
+% The simplest way is to load \pkg{chemmacros}~\cite{pkg:chemmacros} which loads
+% \ghsystem{} implicitily. All of \ghsystem's options belong to
+% \pkg{chemmacros}' module \module{ghsystem}. This means they can be setup with
+% \begin{sourcecode}
+% \chemsetup[ghsystem]{<options>} or
+% \chemsetup{ghsystem/<option1>,ghsystem/<option2>}
+% \end{sourcecode}
+% \sinceversion{4.0}However, \ghsystem{} can be loaded as a standalone package
+% and thus provides its own setup command:
+% \begin{commands}
+% \command{ghssetup}[\marg{options}]
+% Setup command for \ghsystem.
+% \end{commands}
+
+\section{Get Hazard and Precautionary Statements}
+\subsection{Simple Statements}
+The general usage is simple: you use the command
+\begin{commands}
+ \command{ghs}[\sarg\oarg{options}\marg{type}\marg{number}]
+ Get statement number \meta{number} of type \meta{type}.
+\end{commands}
+There are three types available: \code{h}, \code{euh} and \code{p}. The
+\meta{type} argument is case insensitive, so just type them in as you like.
+\begin{example}[side-by-side]
+ \ghs{h}{200} \par
+ \ghs{H}{224} \par
+ \ghs{euh}{001} \par
+ \ghs{Euh}{202} \par
+ \ghs{p}{201}
+\end{example}
+
+The starred version hides the identifier and only gives the statement. If you
+want to hide the statement itself instead you can use the option:
+\begin{options}
+ \keybool{hide}\Default{false}
+ Hide the statement.
+\end{options}
+
+There is an option to customize the output, too.
+\begin{options}
+ \keyval{space}{space command}\Default
+ Space between \meta{type} and \meta{number}.
+\end{options}
+\begin{example}[side-by-side]
+ \ghs{h}{200} \par
+ \ghs[space=\,]{h}{200} \par
+ \ghs*{h}{200} \par
+ \ghs[hide]{h}{200}
+\end{example}
+
+\subsection{Statements with Placeholders}
+Some of the statements contain placeholders. They can be one of the
+following:
+\begin{itemize}
+ \item \textit{\textless state route of exposure if it is conclusively proven
+ that no other routes of exposure cause the hazard\textgreater}
+ \item \textit{\textless state specific effect if known\textgreater}
+ \item \textit{\textless or state all organs affected, if known\textgreater}
+ \item \textit{\textless name of sensitising substance\textgreater}
+\end{itemize}
+
+Except the last one which needs to be filled in, they are hidden per default.
+They can be made visible with the option
+\begin{options}
+ \keybool{fill-in}\Default{false}
+ Show placeholders.
+\end{options}
+\begin{example}
+ \ghs{h}{340} \par
+ \ghs[fill-in]{h}{340} \par
+ \ghs{h}{360} \par
+ \ghs[fill-in]{h}{360} \par
+ \ghs{h}{370} \par
+ \ghs[fill-in]{h}{370} \par
+ \ghs{euh}{208} \par
+ \ghs[fill-in]{euh}{208}
+\end{example}
+
+These placeholders can be replaced with one of these options:
+\begin{options}
+ \keyval{exposure}{text}\Default
+ exposure placeholder
+ \keyval{effect}{text}\Default
+ effect placeholder
+ \keyval{organs}{text}\Default
+ organ placeholder
+ \keyval{substance}{text}\Default
+ substance placeholder
+\end{options}
+\begin{example}
+ \ghs[exposure=This is how you get exposed.]{h}{340} \par
+ \ghs[effect=These are the effects.]{h}{360} \par
+ \ghs[organs=to this organ]{h}{370} \par
+ \ghs[substance=substance]{euh}{208}
+\end{example}
+
+\subsection{Statements with Gaps}
+Some of the statements have gaps that can be filled.
+\begin{example}[side-by-side]
+ \ghs{p}{301} \par
+ \ghs{p}{401} \par
+ \ghs{p}{411} \par
+ \ghs{p}{413}
+\end{example}
+
+These gaps can be filled using these options:
+\begin{options}
+ \keyval{text}{text}
+ Fill the \code{text} gap.
+ \keyval{dots}{text}
+ Fill the \code{dots} gap.
+ \keyval{C-temperature}{num}
+ Fill the Celsius temperature gap.
+ \keyval{F-temperature}{num}
+ Fill the Fahrenheit temperature gap.
+ \keyval{kg-mass}{num}
+ Fill the \si{\GHSkilogram} mass gap.
+ \keyval{lbs-mass}{num}
+ Fill the \si{\GHSpounds} mass gap.
+\end{options}
+\begin{example}
+ \ghs[text=contact physician!]{p}{301} \par
+ \ghs[dots=here]{p}{401} \par
+ \ghs[C-temperature=50, F-temperature=122]{p}{411} \par
+ \ghs[kg-mass=5.0, lbs-mass=11, C-temperature=50, F-temperature=122]{p}{413}
+\end{example}
+
+\subsection{Combined Statements}
+There are some combinations of statements. They are input with a \code{+}
+between the numbers:
+\begin{example}
+ \ghs{p}{235+410} \\
+ \ghs{p}{301+330+331}
+\end{example}
+
+Note that you can only get combinations that officially exist. \emph{You
+ can't combine freely}.
+
+\section{Pictograms}
+\subsection{The Pictures}
+The \ac{ghs} defines a number of pictograms:
+
+\ghspic{explos} \ghspic{flame} \ghspic{flame-O} \ghspic{bottle} \ghspic{acid}
+\ghspic{skull} \ghspic{exclam} \ghspic{health} \ghspic{aqpol}
+
+\begin{commands}
+ \command{ghspic}[\oarg{options}\marg{name}]
+ Load pictogram \meta{name}.
+\end{commands}
+Table~\ref{tab:ghs_pictograms} shows all available pictograms and their names.
+To be more precise: it shows the names to use with the \cs{ghspic} command.
+The file names are \code{ghsystem\_\meta{name}.\meta{filetype}} where
+\meta{filetype} is \code{eps}, \code{pdf}, \code{jpg} or \code{png}, see also
+section~\ref{ssec:picture_type}.
+\begin{example}[side-by-side]
+ \ghspic{skull}
+\end{example}
+
+If you don't like the default size you can change it using this option:
+\begin{options}
+ \keyval{scale}{factor}\Default{1}
+ Scales the pictogram.
+\end{options}
+The pictures are actually quite large. The default setting scales them by a
+factor of $\frac{1}{20}$.
+\begin{example}[side-by-side]
+ \ghspic[scale=2]{skull}
+\end{example}
+
+If you want to use some specific \cs*{includegraphics} options, \eg, if
+you want to rotate the pictogram for some reason, use this option:
+\begin{options}
+ \keyval{includegraphics}{includegraphics keyvals}
+ Pass options to the underlying \cs*{includegraphics} command.
+\end{options}
+\begin{example}
+ \ghspic[includegraphics={angle=90}]{skull}
+\end{example}
+
+\begin{longtable}{>{\ttfamily}ll>{\ttfamily}ll}
+ \caption{All available \ac{ghs} pictograms.\label{tab:ghs_pictograms}} \\
+ \toprule
+ \normalfont\bfseries name & \bfseries pictogram &
+ \normalfont\bfseries name & \bfseries pictogram \\
+ \midrule\endfirsthead
+ \toprule
+ \normalfont\bfseries name & \bfseries pictogram &
+ \normalfont\bfseries name & \bfseries pictogram \\
+ \midrule\endhead
+ \bottomrule\endfoot
+ explos & \ghspic{explos} & explos-1 & \ghspic{explos-1} \\
+ explos-2 & \ghspic{explos-2} & explos-3 & \ghspic{explos-3} \\
+ explos-4 & \ghspic{explos-4} & explos-5 & \ghspic{explos-5} \\
+ explos-6 & \ghspic{explos-6} & & \\
+ flame & \ghspic{flame} & flame-2-white & \ghspic{flame-2-white} \\
+ flame-2-black & \ghspic{flame-2-black} & flame-3-white & \ghspic{flame-3-white} \\
+ flame-3-black & \ghspic{flame-3-black} & flame-4-1 & \ghspic{flame-4-1} \\
+ flame-4-2 & \ghspic{flame-4-2} &
+ flame-4-3-white & \ghspic{flame-4-3-white} \\
+ flame-4-3-black & \ghspic{flame-4-3-black} &
+ flame-5-2-white & \ghspic{flame-5-2-white} \\
+ flame-5-2-black & \ghspic{flame-5-2-black} & & \\
+ flame-O & \ghspic{flame-O} & flame-O-5-1 & \ghspic{flame-O-5-1} \\
+ bottle & \ghspic{bottle} & bottle-2-black & \ghspic{bottle-2-white} \\
+ bottle-2-white & \ghspic{bottle-2-black} & & \\
+ acid & \ghspic{acid} & acid-8 & \ghspic{acid-8} \\
+ skull & \ghspic{skull} & skull-2 & \ghspic{skull-2} \\
+ skull-6 & \ghspic{skull-6} & & \\
+ exclam & \ghspic{exclam} & & \\
+ health & \ghspic{health} & & \\
+ aqpol & \ghspic{aqpol} & & \\
+\end{longtable}
+
+\subsection{Picture Type Depending on Engine}\label{ssec:picture_type}
+As you probably know you can't use every picture type with every compiler
+engine. \pdfTeX{} in \acs{dvi} mode \emph{needs} \code{eps} pictures while
+\pdfTeX{} in \acs{pdf} mode, \XeTeX{} and \LuaTeX{} convert \code{eps}
+pictures into \code{pdf} files, given they have the rights to write in the
+directory the pictures are saved in.
+
+However, the latter can include \code{jpg} and \code{png} without any
+problems, while \pdfTeX{} in \acs{dvi} mode can't.
+
+To resolve this \ghsystem\ tests which engine is used and if \pdfTeX{} which
+mode is used and then chooses either \code{eps} or \code{pdf} for the
+pictograms. You are free to choose the picture type yourself with the option
+\begin{options}
+ \keychoice{pic-type}{eps,pdf,jpg,png}
+ Choose the picture type.
+\end{options}
+
+\section{Available Languages}\label{sec:ghsystem_language}
+Right now the H and P statements are available in English,
+French\footnote{Thanks to Bréal Frédéric and Beaude Aurélien!}, German,
+Italian\footnote{Thanks to Jonas Rivetti!} and Spanish\footnote{Thanks to
+ Ignacio Fernández Galván!}. The package adapts \pkg{chemmacros}' option
+\option{language} or if the option hasn't been used recognizes the language
+settings made with \pkg{babel} or \pkg{polyglossia}. To be more precise: the
+language selected at begin document is recognized. Later changes won't affect
+\ghsystem. If you want to use different languages you have to use \ghsystem's
+language option then.
+
+You can also choose the language explicitly.
+\begin{options}
+ \keyval{language}{lang}\Default{english}
+ Selects a language and if called in the preamble also loads the necessary
+ language file if it hasn't been loaded, yet. If the chosen file doesn't
+ exist it falls back to \code{english}. Currently available choices are
+ English, French, German, Italian, and Spanish. \meta{lang} can be a comma
+ separated list. Then the last language in the list will be the active
+ one. If you plan to switch languages within the document then you should
+ make sure to load all needed languages in the preamble first.
+\end{options}
+\begin{example}[side-by-side]
+ \ghs{h}{201}
+
+ \ghssetup{language=german}
+ \ghs{h}{201}
+\end{example}
+
+% There is another alternative:
+% \begin{commands}
+% \command{loadghsystemlanguage}[\marg{language}]
+% \sinceversion{4.0}Load the language used by \ghsystem.
+% \end{commands}
+
+I will add other languages some time in future. This may take a while,
+though. If you would be willing to contribute and write the statements of
+another language please feel free to contact
+me\footnote{\href{mailto:contact@mychemistry.eu}{contact@mychemistry.eu}}.
+Your \TeX\ distribution should contain a file
+\code{ghsystem\_langtemplate.def} which \emph{should} explain all immediate
+questions and can be used as a basis for a new language file.
+
+\section{List of All Statements}
+If for some reason you want to list all sentences you can use
+\begin{commands}
+ \command{ghslistall}[\oarg{options}]
+ Print a table with all defined statements.
+\end{commands}
+
+This command has a number of options to customize the table, which is created
+with the \env{longtable} environment of the \pkg{longtable} package.
+\begin{options}
+ \keyval{table-head-number}{text}\Default{Identifier}
+ The table head for the number.
+ \keyval{table-head-text}{text}\Default{Statement}
+ The table head for the statement.
+ \keyval{table-next-page}{text}\Default{continues on next page}
+ The hint for a next page.
+ \keyval{table-caption}{text}\Default{All H, EUH, and P Statements.}
+ The \meta{text} in \cs*{caption}\marg{text}.
+ \keyval{table-caption-short}{short text}\Default
+ The \meta{short text} in \cs*{caption}\oarg{short text}\marg{text}.
+ \keyval{table-label}{text}\Default{tab:ghs-hp-statements}
+ The label to refer to the table with \cs*{ref} and similar commands.
+ \keyval{table-row-sep}{dim}\Default{3pt}
+ The separation of the table rows. A \TeX\ dimension.
+ \keychoice{table-rules}{\default{default},booktabs,none}\Default{default}
+ The style of the horizontal rules in the table. \code{default} uses
+ \cs*{hline}, \code{booktabs} uses \cs*{toprule}, \cs*{midrule} and
+ \cs*{bottomrule}, resp. This option needs the \pkg{booktabs} package
+ which you have to load yourself then.
+ \keychoice{table-top-head-rule}{\default{default},booktabs,none}\Default{default}
+ Change top rule explicitly.
+ \keychoice{table-head-rule}{\default{default},booktabs,none}\Default{default}
+ Change rule below head explicitly.
+ \keychoice{table-foot-rule}{\default{default},booktabs,none}\Default{default}
+ Change foot rule explicitly.
+ \keychoice{table-last-foot-rule}{\default{default},booktabs,none}\Default{default}
+ Change last foot rule explicitly.
+\end{options}
+
+The code below shows how table~\ref{tab:ghs-hp-statements} was created:
+\begin{sourcecode}
+ \ghslistall[fill-in,table-rules=booktabs]
+\end{sourcecode}
+
+\ghslistall[fill-in,table-rules=booktabs]
+
+\printbibliography
+
+\end{document}
Binary files old/doc/latex/ghsystem/ghsystem_en.pdf and new/doc/latex/ghsystem/ghsystem_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ghsystem/ghsystem_en.tex new/doc/latex/ghsystem/ghsystem_en.tex
--- old/doc/latex/ghsystem/ghsystem_en.tex 2016-07-16 23:41:37.000000000 +0200
+++ new/doc/latex/ghsystem/ghsystem_en.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,494 +0,0 @@
-% arara: pdflatex
-% arara: biber
-% arara: pdflatex
-% arara: pdflatex
-% --------------------------------------------------------------------------
-% the GHSYSTEM package
-%
-% globally harmonized system
-%
-% --------------------------------------------------------------------------
-% Clemens Niederberger
-% --------------------------------------------------------------------------
-% https://github.com/cgnieder/ghsystem/
-% contact@mychemistry.eu
-% --------------------------------------------------------------------------
-% If you have any ideas, questions, suggestions or bugs to report, please
-% feel free to contact me.
-% --------------------------------------------------------------------------
-% Copyright 2011-2016 Clemens Niederberger
-%
-% 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 Clemens Niederberger.
-% --------------------------------------------------------------------------
-\documentclass[load-preamble+]{cnltx-doc}
-\usepackage[utf8]{inputenc}
-% \usepackage[greek=newtx]{chemmacros}
-\usepackage{ghsystem}
-\setcnltx{
- package = {ghsystem},
- info = \acl*{ghs} ,
- url = https://github.com/cgnieder/ghsystem/ ,
- authors = Clemens Niederberger ,
- email = contact@mychemistry.eu ,
- abstract = {%
- \centering
- \includegraphics{chemmacros-logo.pdf}
- \par
- } ,
- add-cmds = {
- chemsetup,
- ghs, ghslistall, ghspic, ghssetup
- } ,
- index-setup = noclearpage
-}
-
-\usepackage{booktabs}
-
-\expandafter\def\csname libertine@figurestyle\endcsname{LF}
-\usepackage[libertine]{newtxmath}
-\expandafter\def\csname libertine@figurestyle\endcsname{OsF}
-
-\usepackage[biblatex]{embrac}
-\ChangeEmph{[}[,.02em]{]}[.055em,-.08em]
-\ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em]
-
-\usepackage[accsupp]{acro}
-\acsetup{
- long-format = \scshape ,
- short-format = \scshape
-}
-\DeclareAcronym{ghs}{
- short = ghs ,
- long = Globally Harmonized System of Classification and Labelling of
- Chemicals ,
- pdfstring = GHS ,
- accsupp = GHS
-}
-\DeclareAcronym{eu}{
- short = EU ,
- long = European Union ,
- pdfstring = EU ,
- accsupp = EU
-}
-\DeclareAcronym{UN}{
- short = un ,
- long = United Nations ,
- pdfstring = UN ,
- accsupp = UN
-}
-\DeclareAcronym{dvi}{
- short = dvi ,
- long = device independent file format ,
- pdfstring = DVI ,
- accsupp = DVO
-}
-\DeclareAcronym{pdf}{
- short = pdf ,
- long = portable document file ,
- pdfstring = PDF ,
- accsupp = PDF
-}
-
-\chemsetup{
- greek = newtx ,
- formula = chemformula ,
- chemformula/format = \libertineLF
-}
-
-\ghssetup{
- language = {german,english}
-}
-
-\sisetup{
- detect-mode=false,
- mode=text,
- text-rm=\libertineLF
-}
-
-\usepackage{filecontents}
-
-\defbibheading{bibliography}{\addsec{References}}
-\addbibresource{\jobname.bib}
-\begin{filecontents*}{\jobname.bib}
-@misc{eu:ghsystem_regulation,
- author = {{The European Parliament and The Council of the European Union}},
- title = {Regulation (EC) No 1272/2008 of the European Parliament and of
- the Council} ,
- shorthand = {EuP} ,
- subtitle = {on classification, labelling and packaging of substances and
- mixtures, amending and repealing Directives 67/548/EEC and 1999/45/EC, and
- amending Regulation (EC) No 1907/2006} ,
- journal = {Official Journal of the European Union} ,
- date = {2008-12-16}
-}
-@online{unece:ghsystem_implementation,
- author = {{United Nations Economic Commission for Europe}} ,
- title = {GHS Implementation} ,
- url =
- {http://www.unece.org/trans/danger/publi/ghs/implementation_e.html} ,
- urldate = {2012-03-20} ,
- date = {2012-03-20}
-}
-\end{filecontents*}
-
-\newcommand*\tablehead[1]{\textrm{\bfseries#1}}
-
-\begin{document}
-
-\section{Introduction}
-As a chemist you are probably aware of the fact that the \acl{UN} have
-developed the \ac{ghs} as a global replacement for the various different
-systems in different countries. While it has not been implemented by all
-countries yet~\cite{unece:ghsystem_implementation}, it is only a matter of
-time.
-
-The package \ghsystem{} now enables you to typeset all the hazard and
-precautionary statements and pictograms in a very easy way. The statements
-are taken from \acs{eu} regulation 1272/2008~\cite{eu:ghsystem_regulation}.
-
-\section{Licence and Requirements}
-\license
-
-\ghsystem\ loads the following packages:
-\pkg{expl3}\footnote{\CTANurl{l3kernel}}~\cite{bnd:l3kernel}, \pkg{xparse} and
-\pkg{l3keys2e}\footnote{\CTANurl{l3packages}}~\cite{bnd:l3packages},
-\needpackage{chemmacros}~\cite{pkg:translations},
-\needpackage{translations}~\cite{pkg:translations},
-\needpackage{siunitx}~\cite{pkg:siunitx},
-\needpackage{graphicx}~\cite{pkg:graphicx},
-\needpackage{longtable}~\cite{pkg:longtable} and
-\needpackage{ifpdf}~\cite{pkg:ifpdf}.
-
-\section{Setup}
-% TODO
-% The simplest way is to load \pkg{chemmacros}~\cite{pkg:chemmacros} which loads
-% \ghsystem{} implicitily. All of \ghsystem's options belong to
-% \pkg{chemmacros}' module \module{ghsystem}. This means they can be setup with
-% \begin{sourcecode}
-% \chemsetup[ghsystem]{<options>} or
-% \chemsetup{ghsystem/<option1>,ghsystem/<option2>}
-% \end{sourcecode}
-% \sinceversion{4.0}However, \ghsystem{} can be loaded as a standalone package
-% and thus provides its own setup command:
-% \begin{commands}
-% \command{ghssetup}[\marg{options}]
-% Setup command for \ghsystem.
-% \end{commands}
-
-\section{Get Hazard and Precautionary Statements}
-\subsection{Simple Statements}
-The general usage is simple: you use the command
-\begin{commands}
- \command{ghs}[\sarg\oarg{options}\marg{type}\marg{number}]
- Get statement number \meta{number} of type \meta{type}.
-\end{commands}
-There are three types available: \code{h}, \code{euh} and \code{p}. The
-\meta{type} argument is case insensitive, so just type them in as you like.
-\begin{example}[side-by-side]
- \ghs{h}{200} \par
- \ghs{H}{224} \par
- \ghs{euh}{001} \par
- \ghs{Euh}{202} \par
- \ghs{p}{201}
-\end{example}
-
-The starred version hides the identifier and only gives the statement. If you
-want to hide the statement itself instead you can use the option:
-\begin{options}
- \keybool{hide}\Default{false}
- Hide the statement.
-\end{options}
-
-There is an option to customize the output, too.
-\begin{options}
- \keyval{space}{space command}\Default
- Space between \meta{type} and \meta{number}.
-\end{options}
-\begin{example}[side-by-side]
- \ghs{h}{200} \par
- \ghs[space=\,]{h}{200} \par
- \ghs*{h}{200} \par
- \ghs[hide]{h}{200}
-\end{example}
-
-\subsection{Statements with Placeholders}
-Some of the statements contain placeholders. They can be one of the
-following:
-\begin{itemize}
- \item \textit{\textless state route of exposure if it is conclusively proven
- that no other routes of exposure cause the hazard\textgreater}
- \item \textit{\textless state specific effect if known\textgreater}
- \item \textit{\textless or state all organs affected, if known\textgreater}
- \item \textit{\textless name of sensitising substance\textgreater}
-\end{itemize}
-
-Except the last one which needs to be filled in, they are hidden per default.
-They can be made visible with the option
-\begin{options}
- \keybool{fill-in}\Default{false}
- Show placeholders.
-\end{options}
-\begin{example}
- \ghs{h}{340} \par
- \ghs[fill-in]{h}{340} \par
- \ghs{h}{360} \par
- \ghs[fill-in]{h}{360} \par
- \ghs{h}{370} \par
- \ghs[fill-in]{h}{370} \par
- \ghs{euh}{208} \par
- \ghs[fill-in]{euh}{208}
-\end{example}
-
-These placeholders can be replaced with one of these options:
-\begin{options}
- \keyval{exposure}{text}\Default
- exposure placeholder
- \keyval{effect}{text}\Default
- effect placeholder
- \keyval{organs}{text}\Default
- organ placeholder
- \keyval{substance}{text}\Default
- substance placeholder
-\end{options}
-\begin{example}
- \ghs[exposure=This is how you get exposed.]{h}{340} \par
- \ghs[effect=These are the effects.]{h}{360} \par
- \ghs[organs=to this organ]{h}{370} \par
- \ghs[substance=substance]{euh}{208}
-\end{example}
-
-\subsection{Statements with Gaps}
-Some of the statements have gaps that can be filled.
-\begin{example}[side-by-side]
- \ghs{p}{301} \par
- \ghs{p}{401} \par
- \ghs{p}{411} \par
- \ghs{p}{413}
-\end{example}
-
-These gaps can be filled using these options:
-\begin{options}
- \keyval{text}{text}
- Fill the \code{text} gap.
- \keyval{dots}{text}
- Fill the \code{dots} gap.
- \keyval{C-temperature}{num}
- Fill the Celsius temperature gap.
- \keyval{F-temperature}{num}
- Fill the Fahrenheit temperature gap.
- \keyval{kg-mass}{num}
- Fill the \si{\GHSkilogram} mass gap.
- \keyval{lbs-mass}{num}
- Fill the \si{\GHSpounds} mass gap.
-\end{options}
-\begin{example}
- \ghs[text=contact physician!]{p}{301} \par
- \ghs[dots=here]{p}{401} \par
- \ghs[C-temperature=50, F-temperature=122]{p}{411} \par
- \ghs[kg-mass=5.0, lbs-mass=11, C-temperature=50, F-temperature=122]{p}{413}
-\end{example}
-
-\subsection{Combined Statements}
-There are some combinations of statements. They are input with a \code{+}
-between the numbers:
-\begin{example}
- \ghs{p}{235+410} \\
- \ghs{p}{301+330+331}
-\end{example}
-
-Note that you can only get combinations that officially exist. \emph{You
- can't combine freely}.
-
-\section{Pictograms}
-\subsection{The Pictures}
-The \ac{ghs} defines a number of pictograms:
-
-\ghspic{explos} \ghspic{flame} \ghspic{flame-O} \ghspic{bottle} \ghspic{acid}
-\ghspic{skull} \ghspic{exclam} \ghspic{health} \ghspic{aqpol}
-
-\begin{commands}
- \command{ghspic}[\oarg{options}\marg{name}]
- Load pictogram \meta{name}.
-\end{commands}
-Table~\ref{tab:ghs_pictograms} shows all available pictograms and their names.
-To be more precise: it shows the names to use with the \cs{ghspic} command.
-The file names are \code{ghsystem\_\meta{name}.\meta{filetype}} where
-\meta{filetype} is \code{eps}, \code{pdf}, \code{jpg} or \code{png}, see also
-section~\ref{ssec:picture_type}.
-\begin{example}[side-by-side]
- \ghspic{skull}
-\end{example}
-
-If you don't like the default size you can change it using this option:
-\begin{options}
- \keyval{scale}{factor}\Default{1}
- Scales the pictogram.
-\end{options}
-The pictures are actually quite large. The default setting scales them by a
-factor of $\frac{1}{20}$.
-\begin{example}[side-by-side]
- \ghspic[scale=2]{skull}
-\end{example}
-
-If you want to use some specific \cs*{includegraphics} options, \eg, if
-you want to rotate the pictogram for some reason, use this option:
-\begin{options}
- \keyval{includegraphics}{includegraphics keyvals}
- Pass options to the underlying \cs*{includegraphics} command.
-\end{options}
-\begin{example}
- \ghspic[includegraphics={angle=90}]{skull}
-\end{example}
-
-\begin{longtable}{>{\ttfamily}ll>{\ttfamily}ll}
- \caption{All available \ac{ghs} pictograms.\label{tab:ghs_pictograms}} \\
- \toprule
- \normalfont\bfseries name & \bfseries pictogram &
- \normalfont\bfseries name & \bfseries pictogram \\
- \midrule\endfirsthead
- \toprule
- \normalfont\bfseries name & \bfseries pictogram &
- \normalfont\bfseries name & \bfseries pictogram \\
- \midrule\endhead
- \bottomrule\endfoot
- explos & \ghspic{explos} & explos-1 & \ghspic{explos-1} \\
- explos-2 & \ghspic{explos-2} & explos-3 & \ghspic{explos-3} \\
- explos-4 & \ghspic{explos-4} & explos-5 & \ghspic{explos-5} \\
- explos-6 & \ghspic{explos-6} & & \\
- flame & \ghspic{flame} & flame-2-white & \ghspic{flame-2-white} \\
- flame-2-black & \ghspic{flame-2-black} & flame-3-white & \ghspic{flame-3-white} \\
- flame-3-black & \ghspic{flame-3-black} & flame-4-1 & \ghspic{flame-4-1} \\
- flame-4-2 & \ghspic{flame-4-2} &
- flame-4-3-white & \ghspic{flame-4-3-white} \\
- flame-4-3-black & \ghspic{flame-4-3-black} &
- flame-5-2-white & \ghspic{flame-5-2-white} \\
- flame-5-2-black & \ghspic{flame-5-2-black} & & \\
- flame-O & \ghspic{flame-O} & flame-O-5-1 & \ghspic{flame-O-5-1} \\
- bottle & \ghspic{bottle} & bottle-2-black & \ghspic{bottle-2-white} \\
- bottle-2-white & \ghspic{bottle-2-black} & & \\
- acid & \ghspic{acid} & acid-8 & \ghspic{acid-8} \\
- skull & \ghspic{skull} & skull-2 & \ghspic{skull-2} \\
- skull-6 & \ghspic{skull-6} & & \\
- exclam & \ghspic{exclam} & & \\
- health & \ghspic{health} & & \\
- aqpol & \ghspic{aqpol} & & \\
-\end{longtable}
-
-\subsection{Picture Type Depending on Engine}\label{ssec:picture_type}
-As you probably know you can't use every picture type with every compiler
-engine. \pdfTeX{} in \acs{dvi} mode \emph{needs} \code{eps} pictures while
-\pdfTeX{} in \acs{pdf} mode, \XeTeX{} and \LuaTeX{} convert \code{eps}
-pictures into \code{pdf} files, given they have the rights to write in the
-directory the pictures are saved in.
-
-However, the latter can include \code{jpg} and \code{png} without any
-problems, while \pdfTeX{} in \acs{dvi} mode can't.
-
-To resolve this \ghsystem\ tests which engine is used and if \pdfTeX{} which
-mode is used and then chooses either \code{eps} or \code{pdf} for the
-pictograms. You are free to choose the picture type yourself with the option
-\begin{options}
- \keychoice{pic-type}{eps,pdf,jpg,png}
- Choose the picture type.
-\end{options}
-
-\section{Available Languages}\label{sec:ghsystem_language}
-Right now the H and P statements are available in English,
-French\footnote{Thanks to Bréal Frédéric and Beaude Aurélien!}, German,
-Italian\footnote{Thanks to Jonas Rivetti!} and Spanish\footnote{Thanks to
- Ignacio Fernández Galván!}. The package adapts \pkg{chemmacros}' option
-\option{language} or if the option hasn't been used recognizes the language
-settings made with \pkg{babel} or \pkg{polyglossia}. To be more precise: the
-language selected at begin document is recognized. Later changes won't affect
-\ghsystem. If you want to use different languages you have to use \ghsystem's
-language option then.
-
-You can also choose the language explicitly.
-\begin{options}
- \keyval{language}{lang}\Default{english}
- Selects a language and if called in the preamble also loads the necessary
- language file if it hasn't been loaded, yet. If the chosen file doesn't
- exist it falls back to \code{english}. Currently available choices are
- English, French, German, Italian, and Spanish. \meta{lang} can be a comma
- separated list. Then the last language in the list will be the active
- one. If you plan to switch languages within the document then you should
- make sure to load all needed languages in the preamble first.
-\end{options}
-\begin{example}[side-by-side]
- \ghs{h}{201}
-
- \ghssetup{language=german}
- \ghs{h}{201}
-\end{example}
-
-% There is another alternative:
-% \begin{commands}
-% \command{loadghsystemlanguage}[\marg{language}]
-% \sinceversion{4.0}Load the language used by \ghsystem.
-% \end{commands}
-
-I will add other languages some time in future. This may take a while,
-though. If you would be willing to contribute and write the statements of
-another language please feel free to contact
-me\footnote{\href{mailto:contact@mychemistry.eu}{contact@mychemistry.eu}}.
-Your \TeX\ distribution should contain a file
-\code{ghsystem\_langtemplate.def} which \emph{should} explain all immediate
-questions and can be used as a basis for a new language file.
-
-\section{List of All Statements}
-If for some reason you want to list all sentences you can use
-\begin{commands}
- \command{ghslistall}[\oarg{options}]
- Print a table with all defined statements.
-\end{commands}
-
-This command has a number of options to customize the table, which is created
-with the \env{longtable} environment of the \pkg{longtable} package.
-\begin{options}
- \keyval{table-head-number}{text}\Default{Identifier}
- The table head for the number.
- \keyval{table-head-text}{text}\Default{Statement}
- The table head for the statement.
- \keyval{table-next-page}{text}\Default{continues on next page}
- The hint for a next page.
- \keyval{table-caption}{text}\Default{All H, EUH, and P Statements.}
- The \meta{text} in \cs*{caption}\marg{text}.
- \keyval{table-caption-short}{short text}\Default
- The \meta{short text} in \cs*{caption}\oarg{short text}\marg{text}.
- \keyval{table-label}{text}\Default{tab:ghs-hp-statements}
- The label to refer to the table with \cs*{ref} and similar commands.
- \keyval{table-row-sep}{dim}\Default{3pt}
- The separation of the table rows. A \TeX\ dimension.
- \keychoice{table-rules}{\default{default},booktabs,none}\Default{default}
- The style of the horizontal rules in the table. \code{default} uses
- \cs*{hline}, \code{booktabs} uses \cs*{toprule}, \cs*{midrule} and
- \cs*{bottomrule}, resp. This option needs the \pkg{booktabs} package
- which you have to load yourself then.
- \keychoice{table-top-head-rule}{\default{default},booktabs,none}\Default{default}
- Change top rule explicitly.
- \keychoice{table-head-rule}{\default{default},booktabs,none}\Default{default}
- Change rule below head explicitly.
- \keychoice{table-foot-rule}{\default{default},booktabs,none}\Default{default}
- Change foot rule explicitly.
- \keychoice{table-last-foot-rule}{\default{default},booktabs,none}\Default{default}
- Change last foot rule explicitly.
-\end{options}
-
-The code below shows how table~\ref{tab:ghs-hp-statements} was created:
-\begin{sourcecode}
- \ghslistall[fill-in,table-rules=booktabs]
-\end{sourcecode}
-
-\ghslistall[fill-in,table-rules=booktabs]
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ghsystem.doc.tlpobj new/tlpkg/tlpobj/ghsystem.doc.tlpobj
--- old/tlpkg/tlpobj/ghsystem.doc.tlpobj 2019-02-28 03:39:41.000000000 +0100
+++ new/tlpkg/tlpobj/ghsystem.doc.tlpobj 2020-02-18 01:54:44.000000000 +0100
@@ -1,9 +1,10 @@
name ghsystem.doc
category Package
-revision 41714
+revision 53822
shortdesc doc files of ghsystem
relocated 1
-docfiles size=198
+docfiles size=200
RELOC/doc/latex/ghsystem/README
- RELOC/doc/latex/ghsystem/ghsystem_en.pdf
- RELOC/doc/latex/ghsystem/ghsystem_en.tex
+ RELOC/doc/latex/ghsystem/ghsystem-manual.cls
+ RELOC/doc/latex/ghsystem/ghsystem-manual.pdf
+ RELOC/doc/latex/ghsystem/ghsystem-manual.tex
++++++ ghsystem.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ghsystem/ghsystem.sty new/tex/latex/ghsystem/ghsystem.sty
--- old/tex/latex/ghsystem/ghsystem.sty 2016-07-16 23:41:37.000000000 +0200
+++ new/tex/latex/ghsystem/ghsystem.sty 2020-02-17 23:17:09.000000000 +0100
@@ -12,7 +12,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2016 Clemens Niederberger
+% Copyright 2011--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -29,8 +29,8 @@
\RequirePackage{ expl3, xparse, chemmacros }
\ExplSyntaxOn
-\tl_const:Nn \c_ghsystem_version_tl {4.8}
-\tl_const:Nn \c_ghsystem_date_tl {2016/07/16}
+\tl_const:Nn \c_ghsystem_version_tl {4.8c}
+\tl_const:Nn \c_ghsystem_date_tl {2020/02/17}
\tl_const:Nn \c_ghsystem_info_tl {globally~ harmonised~ system}
\ProvidesExplPackage
@@ -106,14 +106,14 @@
\cs_new:Npn \ghsystem_text: {}
\cs_new:Npn \ghsystem_dash:
{
- \tex_penalty:D \c_ten_thousand
+ \tex_penalty:D 10000 \scan_stop:
-
\skip_horizontal:N \c_zero_skip
}
\cs_new:Npn \ghsystem_slash:
{
- \tex_penalty:D \c_ten_thousand
+ \tex_penalty:D 10000 \scan_stop:
/
\skip_horizontal:N \c_zero_skip
}
@@ -203,24 +203,50 @@
% statement
\cs_new_protected:Npn \ghsystem_add_statement:nnn #1#2#3
{
- \prop_put:cxn {l__ghsystem_ \str_lower_case:n {#1} _prop}
+ \prop_put:cxn {l__ghsystem_ \str_lowercase:n {#1} _prop}
{\l_ghsystem_current_language_file_tl-#2}
{#3}
}
-\cs_new:Npn \ghsystem_load_language_file:n #1
+\cs_new_protected:Npn \__ghsystem_load_language:n #1
+ {
+ \seq_gput_right:Nn \g__ghsystem_loadad_languages_seq {#1}
+ \str_set:Nn \l_ghsystem_current_language_str {#1}
+ \@onefilewithoptions
+ {\c__ghsystem_definition_file_prefix_tl _ #1} [][]
+ \c__ghsystem_definition_file_extension_tl
+ }
+\cs_generate_variant:Nn \__ghsystem_load_language:n {V}
+\cs_generate_variant:Nn \file_if_exist:nTF {V}
+
+\cs_new_protected:Npn \__ghsystem_load_language_file:n #1
+ {
+ \tl_set:Nx \l__ghsystem_tmpa_tl { \@trnslt@language {#1} }
+ \file_if_exist:nTF
+ {
+ \c__ghsystem_definition_file_prefix_tl _ \l__ghsystem_tmpa_tl .
+ \c__ghsystem_definition_file_extension_tl
+ }
+ { \__ghsystem_load_language:V \l__ghsystem_tmpa_tl }
+ {
+ \tl_set:Nx \l__ghsystem_tmpa_tl { \baselanguage {#1} }
+ \file_if_exist:nTF
+ {
+ \c__ghsystem_definition_file_prefix_tl _ \l__ghsystem_tmpa_tl .
+ \c__ghsystem_definition_file_extension_tl
+ }
+ { \__ghsystem_load_language:V \l__ghsystem_tmpa_tl }
+ { \errorTODO }
+ }
+ }
+
+\cs_new_protected:Npn \ghsystem_load_language_file:n #1
{
\ghsystem_if_language_file_loaded:nF {#1}
{
\cs_if_eq:NNTF \@onefilewithoptions\@notprerr
{ \msg_error:nnn {ghsystem} {language-file} {#1} }
- {
- \seq_gput_right:Nx \g__ghsystem_loadad_languages_seq
- { \@trnslt@language {#1} }
- \@onefilewithoptions
- {\c__ghsystem_definition_file_prefix_tl _ #1} [][]
- \c__ghsystem_definition_file_extension_tl
- }
+ { \__ghsystem_load_language_file:n {#1} }
}
}
\cs_generate_variant:Nn \ghsystem_load_language_file:n { V }
@@ -230,7 +256,12 @@
\seq_if_in:NxTF \g__ghsystem_loadad_languages_seq
{ \@trnslt@language {#1} }
{ \prg_return_true: }
- { \prg_return_false: }
+ {
+ \seq_if_in:NxTF \g__ghsystem_loadad_languages_seq
+ { \baselanguage {#1} }
+ { \prg_return_true: }
+ { \prg_return_false: }
+ }
}
% TODO: an neuen Mechanismus anpassen:
@@ -238,7 +269,6 @@
{
\ghsystem_if_language_file_loaded:nF {#1}
{ \ghsystem_load_language_file:n {#1} }
- \str_set:Nx \l_ghsystem_current_language_str { \@trnslt@language {#1} }
\bool_set_true:N \l__ghsystem_language_file_loaded_bool
}
\cs_generate_variant:Nn \ghsystem_load_language:n { V }
@@ -407,7 +437,7 @@
\cs_new_protected:Nn \__ghsystem_get_type:nN
{
- \tl_set:Nx #2 { \str_lower_case:n {#1} }
+ \tl_set:Nx #2 { \str_lowercase:n {#1} }
\str_case:VnF #2
{ {h} {} {p} {} {euh} {} }
{ \msg_error:nnn {ghsystem} {unknown-type} {#2} }
@@ -424,13 +454,13 @@
{
\bool_if:NT \l__ghsystem_show_number_bool
{
- \tl_upper_case:n {#1}
+ \text_uppercase:n {#1}
\tl_use:N \l__ghsystem_number_space_tl
#2 ~ + ~
\tl_if_in:nnTF {#3} { + }
{ \__ghsystem_is_combination_aux_iii:w #1,#3 \q_stop }
{
- \tl_upper_case:n {#1}
+ \text_uppercase:n {#1}
\tl_use:N \l__ghsystem_number_space_tl
#3 \bool_if:NF \l__ghsystem_hide_statement_bool { : ~ }
}
@@ -441,7 +471,7 @@
{
\bool_if:NT \l__ghsystem_show_number_bool
{
- \tl_upper_case:n {#1}
+ \text_uppercase:n {#1}
\tl_use:N \l__ghsystem_number_space_tl
#2 \bool_if:NF \l__ghsystem_hide_statement_bool { : ~ }
}
@@ -451,10 +481,10 @@
{
\bool_if:NT \l__ghsystem_show_number_bool
{
- \tl_upper_case:n {#1}
+ \text_uppercase:n {#1}
\tl_use:N \l__ghsystem_number_space_tl
#2 ~ + ~
- \tl_upper_case:n {#1}
+ \text_uppercase:n {#1}
\tl_use:N \l__ghsystem_number_space_tl
#3 \bool_if:NF \l__ghsystem_hide_statement_bool { : ~ }
}
@@ -495,7 +525,7 @@
\caption [ \l_ghsystem_table_caption_short_tl ]
{
\l_ghsystem_table_caption_tl
- \exp_args:No \label { \l__ghsystem_table_label_tl }
+ \exp_args:NV \label \l__ghsystem_table_label_tl
} \\
\l__ghsystem_table_top_head_rule_tl
\textbf { \l_ghsystem_identifier_tl } &
@@ -638,9 +668,10 @@
\chemmacros_load_module:n {nomenclature}
-\chemmacros_integrate_package:nnn {} {ghsystem} {2016/01/11}
+\cs_generate_variant:Nn \chemmacros_integrate_package:nnn {nnV}
+\chemmacros_integrate_package:nnV {} {ghsystem} \c_ghsystem_date_tl
-\tex_endinput:D
+\file_input_stop:
% --------------------------------------------------------------------------
VERSION HISTORY
@@ -680,7 +711,7 @@
proper value
2016/07/16 - version 4.8 - French translations, thanks to Bréal Frédéric and
Beaude Aurélien
-
-% --------------------------------------------------------------------------
-% TODO:
-- add option to switch between `longtable` and `supertabular` for \ghslistall ?
+2019/09/30 - version 4.8a - add \l_ghsystem_table_next_page_tl to the template
+ and the French translations
+2020/01/16 - version 4.8b - adapt to renaming of case changing functions
+2020/02/17 - version 4.8c - resolve bug with French and Lua- or XeLaTeX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ghsystem/language/ghsystem_english.def new/tex/latex/ghsystem/language/ghsystem_english.def
--- old/tex/latex/ghsystem/language/ghsystem_english.def 2016-07-16 23:41:37.000000000 +0200
+++ new/tex/latex/ghsystem/language/ghsystem_english.def 2020-02-17 23:17:09.000000000 +0100
@@ -11,7 +11,7 @@
% - If you have any ideas, questions, suggestions or bugs to report, please
% - feel free to contact me.
% --------------------------------------------------------------------------
-% - Copyright 2011-2016 Clemens Niederberger
+% - Copyright 2011--2020 Clemens Niederberger
% -
% - This work may be distributed and/or modified under the
% - conditions of the LaTeX Project Public License, either version 1.3
@@ -26,7 +26,7 @@
% - The Current Maintainer of this work is Clemens Niederberger.
% --------------------------------------------------------------------------
% ENGLISH DEFINITIONS
-\ghsystemlanguagefile{english}{2016/01/16}
+\ghsystemlanguagefile {english} {2020/02/17}
% table head and foot:
\tl_set:Nn \l_ghsystem_identifier_tl { Identifier }
@@ -61,7 +61,9 @@
%
\cs_set:Npn \ghsystem_organs:
{
- \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool }
+ \bool_lazy_and:nnT
+ { \l_ghsystem_fill_in_bool }
+ { !\l_ghsystem_organs_bool }
{
\c_space_tl
\ghsystem_filler:n { or~ state~ all~ organs~ affected,~ if~ known }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ghsystem/language/ghsystem_french.def new/tex/latex/ghsystem/language/ghsystem_french.def
--- old/tex/latex/ghsystem/language/ghsystem_french.def 2016-07-16 23:41:37.000000000 +0200
+++ new/tex/latex/ghsystem/language/ghsystem_french.def 2020-02-17 23:17:09.000000000 +0100
@@ -11,7 +11,7 @@
% - If you have any ideas, questions, suggestions or bugs to report, please
% - feel free to contact me.
% --------------------------------------------------------------------------
-% - Copyright 2011-2016 Clemens Niederberger
+% - Copyright 2011--2020 Clemens Niederberger
% -
% - This work may be distributed and/or modified under the
% - conditions of the LaTeX Project Public License, either version 1.3
@@ -29,20 +29,28 @@
% - Aurélien. Many thanks!
% FRENCH DEFINITIONS
-\ghsystemlanguagefile{french}{2016/07/16}
+\ghsystemlanguagefile {french} {2020/02/17}
% table head:
\tl_set:Nn \l_ghsystem_identifier_tl { num\'ero }
\tl_set:Nn \l_ghsystem_table_text_tl { phrases }
\tl_set:Nn \l_ghsystem_table_caption_tl { Toutes~ les~ phrases~ H,~ EUH~ et~ P }
+\tl_set:Nn \l_ghsystem_table_next_page_tl { suite~ sur~ la~ prochaine~ page }
-\group_begin:
-\char_set_catcode_active:N \^^@
-\char_set_lccode:nn { `^^@ } { `: }
-\tl_to_lowercase:n
+% with pdflatex babel sets the colon active:
+\bool_lazy_or:nnTF
+ { \sys_if_engine_luatex_p: }
+ { \sys_if_engine_xetex_p: }
+ { \tl_const:Nn \c_ghsystem_french_colon_tl { \c_colon_str } }
{
- \group_end:
- \tl_const:Nn \c_ghsystem_french_colon_tl { ^^@ }
+ \group_begin:
+ \char_set_catcode_active:N \^^~
+ \char_set_lccode:nn { `^^~ } { `: }
+ \tex_lowercase:D
+ {
+ \group_end:
+ \tl_const:Nn \c_ghsystem_french_colon_tl { ^^~ }
+ }
}
% fill-in functions:
@@ -75,7 +83,9 @@
%
\cs_set:Npn \ghsystem_organs:
{
- \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool }
+ \bool_lazy_and:nnT
+ { \l_ghsystem_fill_in_bool }
+ { !\l_ghsystem_organs_bool }
{
\c_space_tl
\ghsystem_filler:n
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ghsystem/language/ghsystem_german.def new/tex/latex/ghsystem/language/ghsystem_german.def
--- old/tex/latex/ghsystem/language/ghsystem_german.def 2016-07-16 23:41:37.000000000 +0200
+++ new/tex/latex/ghsystem/language/ghsystem_german.def 2020-02-17 23:17:09.000000000 +0100
@@ -11,7 +11,7 @@
% - If you have any ideas, questions, suggestions or bugs to report, please
% - feel free to contact me.
% --------------------------------------------------------------------------
-% - Copyright 2011-2016 Clemens Niederberger
+% - Copyright 2011--2020 Clemens Niederberger
% -
% - This work may be distributed and/or modified under the
% - conditions of the LaTeX Project Public License, either version 1.3
@@ -26,7 +26,7 @@
% - The Current Maintainer of this work is Clemens Niederberger.
% --------------------------------------------------------------------------
% GERMAN DEFINITIONS
-\ghsystemlanguagefile{german}{2016/01/16}
+\ghsystemlanguagefile {german} {2016/01/16}
% table head and foot:
\tl_set:Nn \l_ghsystem_identifier_tl { Nummer }
@@ -62,7 +62,9 @@
%
\cs_set:Npn \ghsystem_organs:
{
- \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool }
+ \bool_lazy_and:nnT
+ { \l_ghsystem_fill_in_bool }
+ { !\l_ghsystem_organs_bool }
{
\c_space_tl
\ghsystem_filler:n
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ghsystem/language/ghsystem_italian.def new/tex/latex/ghsystem/language/ghsystem_italian.def
--- old/tex/latex/ghsystem/language/ghsystem_italian.def 2016-07-16 23:41:37.000000000 +0200
+++ new/tex/latex/ghsystem/language/ghsystem_italian.def 2020-02-17 23:17:09.000000000 +0100
@@ -11,7 +11,7 @@
% - If you have any ideas, questions, suggestions or bugs to report, please
% - feel free to contact me.
% --------------------------------------------------------------------------
-% - Copyright 2011-2016 Clemens Niederberger
+% - Copyright 2011--2020 Clemens Niederberger
% -
% - This work may be distributed and/or modified under the
% - conditions of the LaTeX Project Public License, either version 1.3
@@ -28,7 +28,7 @@
% - the Italian translation was kindly provided by Jonas Rivetti. Many thanks!
% ITALIAN DEFINITIONS
-\ghsystemlanguagefile{italian}{2016/01/16}
+\ghsystemlanguagefile {italian} {2020/02/17}
% table head and foot:
\tl_set:Nn \l_ghsystem_identifier_tl { Numero }
@@ -66,7 +66,9 @@
%
\cs_set:Npn \ghsystem_organs:
{
- \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool }
+ \bool_lazy_and:nnT
+ { \l_ghsystem_fill_in_bool }
+ { !\l_ghsystem_organs_bool }
{
\c_space_tl
\ghsystem_filler:n
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ghsystem/language/ghsystem_langtemplate.def new/tex/latex/ghsystem/language/ghsystem_langtemplate.def
--- old/tex/latex/ghsystem/language/ghsystem_langtemplate.def 2016-07-16 23:41:37.000000000 +0200
+++ new/tex/latex/ghsystem/language/ghsystem_langtemplate.def 2020-02-17 23:17:09.000000000 +0100
@@ -11,7 +11,7 @@
% - If you have any ideas, questions, suggestions or bugs to report, please
% - feel free to contact me.
% --------------------------------------------------------------------------
-% - Copyright 2011-2016 Clemens Niederberger
+% - Copyright 2011--2020 Clemens Niederberger
% -
% - This work may be distributed and/or modified under the
% - conditions of the LaTeX Project Public License, either version 1.3
@@ -70,12 +70,13 @@
% -----------------------------------------------------------------------------
%
% <LANGUAGE> DEFINITIONS
-\ghsystemlanguagefile{language}{date}
+\ghsystemlanguagefile {language} {date}
% table head:
\tl_set:Nn \l_ghsystem_identifier_tl { ... }
\tl_set:Nn \l_ghsystem_table_text_tl { ... }
\tl_set:Nn \l_ghsystem_table_caption_tl { ... }
+\tl_set:Nn \l_ghsystem_table_next_page_tl { ... }
% fill-in functions:
% <state route of exposure if it is conclusively proven that no other routes of exposure cause the hazard>.
@@ -99,7 +100,9 @@
%
\cs_set:Npn \ghsystem_organs:
{
- \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool }
+ \bool_lazy_and:nnT
+ { \l_ghsystem_fill_in_bool }
+ { !\l_ghsystem_organs_bool }
{
\c_space_tl \ghsystem_filler:n { ... }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ghsystem/language/ghsystem_spanish.def new/tex/latex/ghsystem/language/ghsystem_spanish.def
--- old/tex/latex/ghsystem/language/ghsystem_spanish.def 2016-07-16 23:41:37.000000000 +0200
+++ new/tex/latex/ghsystem/language/ghsystem_spanish.def 2020-02-17 23:17:09.000000000 +0100
@@ -11,7 +11,7 @@
% - If you have any ideas, questions, suggestions or bugs to report, please
% - feel free to contact me.
% --------------------------------------------------------------------------
-% - Copyright 2011-2016 Clemens Niederberger
+% - Copyright 2011--2020 Clemens Niederberger
% -
% - This work may be distributed and/or modified under the
% - conditions of the LaTeX Project Public License, either version 1.3
@@ -29,7 +29,7 @@
% - Galván. Many thanks!
% SPANISH DEFINITIONS
-\ghsystemlanguagefile{spanish}{2016/01/16}
+\ghsystemlanguagefile {spanish} {2020/02/17}
% table head:
\tl_set:Nn \l_ghsystem_identifier_tl { Identificador }
@@ -67,7 +67,9 @@
%
\cs_set:Npn \ghsystem_organs:
{
- \bool_if:nT { \l_ghsystem_fill_in_bool && !\l_ghsystem_organs_bool }
+ \bool_lazy_and:nnT
+ { \l_ghsystem_fill_in_bool }
+ { !\l_ghsystem_organs_bool }
{
\c_space_tl
\ghsystem_filler:n
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ghsystem.tlpobj new/tlpkg/tlpobj/ghsystem.tlpobj
--- old/tlpkg/tlpobj/ghsystem.tlpobj 2019-02-28 03:39:42.000000000 +0100
+++ new/tlpkg/tlpobj/ghsystem.tlpobj 2020-02-18 01:54:45.000000000 +0100
@@ -1,6 +1,6 @@
name ghsystem
category Package
-revision 41714
+revision 53822
shortdesc Globally harmonised system of chemical (etc) naming
relocated 1
longdesc The package provides the means to typeset all the hazard and
@@ -171,7 +171,6 @@
RELOC/tex/latex/ghsystem/pictures/ghsystem_skull.tex
catalogue-contact-repository https://github.com/cgnieder/ghsystem/
catalogue-ctan /macros/latex/contrib/ghsystem
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license lppl1.3
catalogue-topics chemistry expl3
-catalogue-version 4.8
+catalogue-version 4.8c