openSUSE Commits
Threads by month
- ----- 2024 -----
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
May 2020
- 1 participants
- 4645 discussions
Hello community,
here is the log from the commit of package texlive-specs-k for openSUSE:Factory checked in at 2020-05-29 21:17:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-k (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-k.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-k"
Fri May 29 21:17:50 2020 rev:40 rq:806897 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-k/texlive-specs-k.changes 2019-11-07 23:10:52.336160695 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-k.new.3606/texlive-specs-k.changes 2020-05-29 21:27:32.088892040 +0200
@@ -1,0 +2,60 @@
+Mon May 18 08:47:10 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Wed May 6 11:27:35 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Scan *.def files as well for RequirePackage
+
+-------------------------------------------------------------------
+Tue May 5 13:55:07 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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:
----
gloss-occitan.tar.xz
guide-latex-fr.doc.tar.xz
New:
----
glosmathtools.doc.tar.xz
glosmathtools.tar.xz
gloss-occitan.source.tar.xz
glossaries-slovene.doc.tar.xz
glossaries-slovene.tar.xz
grfext.doc.tar.xz
grfext.tar.xz
grffile.doc.tar.xz
grffile.tar.xz
haranoaji-extra.doc.tar.xz
haranoaji-extra.tar.xz
haranoaji.doc.tar.xz
haranoaji.tar.xz
hep-paper.doc.tar.xz
hep-paper.tar.xz
hitszbeamer.doc.tar.xz
hitszbeamer.tar.xz
hitszthesis.doc.tar.xz
hitszthesis.tar.xz
hmtrump.doc.tar.xz
hmtrump.tar.xz
hobsub.doc.tar.xz
hobsub.tar.xz
hologo.doc.tar.xz
hologo.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-k.spec ++++++
++++ 12171 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-k/texlive-specs-k.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-k.new.3606/texlive-specs-k.spec
++++++ gitfile-info.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/support/gitfile-info/README new/doc/support/gitfile-info/README
--- old/doc/support/gitfile-info/README 2019-04-09 22:42:41.000000000 +0200
+++ new/doc/support/gitfile-info/README 2019-08-21 22:41:04.000000000 +0200
@@ -10,10 +10,11 @@
and want to show within the document who had edited what. This package gives you the
opportunity to do so.
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -+
- Version: 0.4
- Last Change: 2019-04-09
+ Version: 0.5
+ Last Change: 2019-08-21
Current Maintainer: André Hilbig
mail(a)andrehilbig.de
+ ahil.eu/gfi
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -+
This work may be distributed and/or modified under the
Binary files old/doc/support/gitfile-info/gitfile-info.pdf and new/doc/support/gitfile-info/gitfile-info.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gitfile-info.doc.tlpobj new/tlpkg/tlpobj/gitfile-info.doc.tlpobj
--- old/tlpkg/tlpobj/gitfile-info.doc.tlpobj 2019-04-10 01:38:59.000000000 +0200
+++ new/tlpkg/tlpobj/gitfile-info.doc.tlpobj 2019-08-22 01:53:46.000000000 +0200
@@ -1,6 +1,6 @@
name gitfile-info.doc
category Package
-revision 50885
+revision 51928
shortdesc doc files of gitfile-info
relocated 1
docfiles size=145
++++++ gitfile-info.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/gitfile-info/gitfile-info.sty new/tex/latex/gitfile-info/gitfile-info.sty
--- old/tex/latex/gitfile-info/gitfile-info.sty 2019-04-09 22:42:41.000000000 +0200
+++ new/tex/latex/gitfile-info/gitfile-info.sty 2019-08-21 22:41:04.000000000 +0200
@@ -7,7 +7,7 @@
%% gitfile-info.dtx (with options: `gitfile-info.sty,package')
%%
%% gitfile-info.dtx
-%% Copyright 2019-04-09:19:53:54 -- Version 0.4 André Hilbig, mail(a)andrehilbig.de
+%% Copyright 2019-08-21:13:19:44 -- Version 0.5 André Hilbig, mail(a)andrehilbig.de
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gitfile-info.tlpobj new/tlpkg/tlpobj/gitfile-info.tlpobj
--- old/tlpkg/tlpobj/gitfile-info.tlpobj 2019-04-10 01:38:59.000000000 +0200
+++ new/tlpkg/tlpobj/gitfile-info.tlpobj 2019-08-22 01:53:47.000000000 +0200
@@ -1,6 +1,6 @@
name gitfile-info
category Package
-revision 50885
+revision 51928
shortdesc Get git metadata for a specific file
relocated 1
longdesc If you are using git to control versions of LaTeX-files, you
@@ -17,7 +17,7 @@
RELOC/tex/latex/gitfile-info/gitfile-info.sty
catalogue-also gitinfo2
catalogue-ctan /support/gitfile-info
-catalogue-date 2019-04-09 20:48:15 +0200
+catalogue-date 2019-08-21 14:43:53 +0200
catalogue-license lppl1.3
catalogue-topics version-control
-catalogue-version 0.4
+catalogue-version 0.5
++++++ gloss-occitan.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gloss-occitan.doc.tlpobj new/tlpkg/tlpobj/gloss-occitan.doc.tlpobj
--- old/tlpkg/tlpobj/gloss-occitan.doc.tlpobj 2019-02-28 03:39:46.000000000 +0100
+++ new/tlpkg/tlpobj/gloss-occitan.doc.tlpobj 2019-11-01 02:04:44.000000000 +0100
@@ -1,6 +1,6 @@
name gloss-occitan.doc
category Package
-revision 39609
+revision 52593
shortdesc doc files of gloss-occitan
relocated 1
docfiles size=19
++++++ glossaries-extra.doc.tar.xz ++++++
++++ 43006 lines of diff (skipped)
++++++ glossaries-extra.tar.xz ++++++
++++ 3943 lines of diff (skipped)
++++++ glossaries-finnish.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/glossaries-finnish.doc.tlpobj new/tlpkg/tlpobj/glossaries-finnish.doc.tlpobj
--- old/tlpkg/tlpobj/glossaries-finnish.doc.tlpobj 2019-02-28 03:39:56.000000000 +0100
+++ new/tlpkg/tlpobj/glossaries-finnish.doc.tlpobj 2020-03-04 23:50:58.000000000 +0100
@@ -1,6 +1,6 @@
name glossaries-finnish.doc
category Package
-revision 45604
+revision 54080
shortdesc doc files of glossaries-finnish
relocated 1
docfiles size=36
++++++ glossaries-finnish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/glossaries-finnish.tlpobj new/tlpkg/tlpobj/glossaries-finnish.tlpobj
--- old/tlpkg/tlpobj/glossaries-finnish.tlpobj 2019-02-28 03:39:57.000000000 +0100
+++ new/tlpkg/tlpobj/glossaries-finnish.tlpobj 2020-03-04 23:50:58.000000000 +0100
@@ -1,16 +1,15 @@
name glossaries-finnish
category Package
-revision 45604
+revision 54080
shortdesc Finnish language module for glossaries package
relocated 1
-longdesc Finnish language module for glossariesr package.
+longdesc Finnish language module for glossaries package.
runfiles size=3
RELOC/tex/latex/glossaries-finnish/glossaries-finnish-ascii.ldf
RELOC/tex/latex/glossaries-finnish/glossaries-finnish-utf8.ldf
RELOC/tex/latex/glossaries-finnish/glossaries-finnish.ldf
catalogue-also glossaries
catalogue-ctan /macros/latex/contrib/glossaries-finnish
-catalogue-date 2017-10-29 05:37:01 +0100
catalogue-license lppl1.3
catalogue-topics glossary
catalogue-version 1.0
++++++ glossaries.doc.tar.xz ++++++
++++ 84962 lines of diff (skipped)
++++++ glossaries.tar.xz ++++++
++++ 1944 lines of diff (skipped)
++++++ glyphlist.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/glyphlist.tlpobj new/tlpkg/tlpobj/glyphlist.tlpobj
--- old/tlpkg/tlpobj/glyphlist.tlpobj 2019-02-28 03:39:59.000000000 +0100
+++ new/tlpkg/tlpobj/glyphlist.tlpobj 2020-03-04 23:50:58.000000000 +0100
@@ -1,6 +1,6 @@
name glyphlist
category Package
-revision 45696
+revision 54074
shortdesc Adobe Glyph List and TeX extensions
relocated 1
longdesc Map between traditional Adobe glyph names and Unicode points,
++++++ gnuplottex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/gnuplottex/example-pdf.tex new/doc/latex/gnuplottex/example-pdf.tex
--- old/doc/latex/gnuplottex/example-pdf.tex 2013-06-29 17:38:44.000000000 +0200
+++ new/doc/latex/gnuplottex/example-pdf.tex 2020-04-13 00:31:14.000000000 +0200
@@ -1,6 +1,6 @@
\documentclass[a4paper]{article}
-\usepackage{gnuplottex}
+\usepackage[subfolder]{gnuplottex}
\begin{document}
Binary files old/doc/latex/gnuplottex/gnuplottex.pdf and new/doc/latex/gnuplottex/gnuplottex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gnuplottex.doc.tlpobj new/tlpkg/tlpobj/gnuplottex.doc.tlpobj
--- old/tlpkg/tlpobj/gnuplottex.doc.tlpobj 2019-02-28 03:40:30.000000000 +0100
+++ new/tlpkg/tlpobj/gnuplottex.doc.tlpobj 2020-04-16 01:56:59.000000000 +0200
@@ -1,9 +1,9 @@
name gnuplottex.doc
category Package
-revision 41904
+revision 54758
shortdesc doc files of gnuplottex
relocated 1
-docfiles size=110
+docfiles size=111
RELOC/doc/latex/gnuplottex/README
RELOC/doc/latex/gnuplottex/SomeValuesForGnuplot.txt
RELOC/doc/latex/gnuplottex/example-pdf.tex
++++++ gnuplottex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/gnuplottex/gnuplottex.sty new/tex/latex/gnuplottex/gnuplottex.sty
--- old/tex/latex/gnuplottex/gnuplottex.sty 2016-08-23 00:30:56.000000000 +0200
+++ new/tex/latex/gnuplottex/gnuplottex.sty 2020-04-13 00:31:14.000000000 +0200
@@ -20,7 +20,7 @@
%%
%% Antoine Chambert-Loir
%% <chambert(a)math.polytechnique.fr>
-%% http://www.math.polytechnique.fr/\protect \unhbox \voidb@x \penalty \@M \ {}chambert
+%% http://www.math.polytechnique.fr/\protect \unhbox \voidb@x \protect \penalty \@M \ {}chambert
%%
%% Ecole polytechnique, Palaiseau Cedex, France
%%
@@ -41,7 +41,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{gnuplottex}
- [2016/08/21 v0.9.2 gnuplot graphs in LaTeX]
+ [2020/03/19 v0.9.5 gnuplot graphs in LaTeX]
\RequirePackage{graphicx,moreverb,keyval,ifthen,catchfile}
\newif\ifShellEscape
\newif\ifmiktex \miktexfalse
@@ -71,7 +71,7 @@
\immediate\write18{touch \tmpfile}
\fi
\ifmiktex
-\IfFileExists{\tmpfile.}{\ShellEscapetrue}{\ShellEscapefalse}
+\IfFileExists{\tmpfile}{\ShellEscapetrue}{\ShellEscapefalse}
\immediate\write18{del "\tmpfile"}
\else
\IfFileExists{\tmpfile}{\ShellEscapetrue}{\ShellEscapefalse}
@@ -81,37 +81,39 @@
\fi
\ifusesubfolder
- \ifmiktex
- \immediate\write18{mkdir gnuplottex}
- \immediate\write18{echo test > "gnuplottex/\tmpfile"}
- \else
- \immediate\write18{mkdir -p "gnuplottex"}
- \immediate\write18{touch "gnuplottex/\tmpfile"}
- \fi
- \IfFileExists{gnuplottex/\tmpfile}{
+ \def\subfolder{gnuplottex}
+ \ifShellEscape
\ifmiktex
- \immediate\write18{del "gnuplottex\@backslashchar\tmpfile"}
+ \immediate\write18{mkdir \subfolder}
+ \immediate\write18{echo test > "\subfolder/\tmpfile"}
\else
- \immediate\write18{rm -f "gnuplottex/\tmpfile"}
+ \immediate\write18{mkdir -p "\subfolder"}
+ \immediate\write18{touch "\subfolder/\tmpfile"}
\fi
- \def\subfolder{gnuplottex/}
- }{
- \PackageWarningNoLine{gnuplottex}
- {Creation of subfolder failed.\MessageBreak
- You'll need to create the folder yourself}
- \def\subfolder{}
- }
+ \IfFileExists{gnuplottex/\tmpfile}{
+ \ifmiktex
+ \immediate\write18{del "\subfolder\@backslashchar\tmpfile"}
+ \else
+ \immediate\write18{rm -f "\subfolder/\tmpfile"}
+ \fi
+ }{
+ \PackageWarningNoLine{gnuplottex}
+ {Creation of subfolder failed.\MessageBreak
+ You'll need to create the folder yourself}
+ \def\subfolder{}
+ }
+ \fi
\else
- \def\subfolder{}
+ \def\subfolder{.}
\fi
\ifShellEscape
\PackageInfo{gnuplottex}
- {Automatically converting gnuplot files.}
+ {Automatically converting gnuplot files}
\else
\PackageWarningNoLine{gnuplottex}
{Shell escape not enabled.\MessageBreak
- You'll need to convert the graphs yourself.}
+ You'll need to convert the graphs yourself}
\fi
\newcounter{fignum}
\def\figname{\jobname-gnuplottex-fig\thefignum}
@@ -121,18 +123,18 @@
\def\gnuplotverbatimwrite#1{%
\def\BeforeStream
{\message{Opening gnuplot stream #1}%
- \immediate\write\verbatim@out{\string set terminal \gnuplotterminal \gnuplotterminaloptions}
-\immediate\write\verbatim@out{\string set output '\subfolder\figname.\gnuplottexextension{\gnuplotterminal}'}
+ \immediate\write\verbatim@out{\string set terminal \gnuplotterminal \gnuplotterminaloptions}%
+\immediate\write\verbatim@out{\string set output '\subfolder/\figname.\gnuplottexextension{\gnuplotterminal}'}%
\ifusesiunitx
\ifthenelse{\equal{\extension}{\string tex}}{\usesiunitxingnuplot}{\PackageWarningNoLine{gnuplottex}{Axis numbers not written in \noexpand\num{}. Use a terminal that allows TeX output to enable this feature.}}
\else
\relax
\fi
- }
- \@bsphack
- \immediate\openout \verbatim@out #1
+ }%
+ \@bsphack%
+ \immediate\openout \verbatim@out #1%
\BeforeStream%
- \let\do\@makeother\dospecials
+ \let\do\@makeother\dospecials%
\catcode`\^^M\active
\def\verbatim@processline{%
\immediate\write\verbatim@out
@@ -168,36 +170,36 @@
\define@key{pic}{terminal}[latex]{\def\gnuplotterminal{#1}}
\define@key{pic}{terminaloptions}{\def\gnuplotterminaloptions{ #1}}
\newenvironment{gnuplot}[1][]{\stepcounter{fignum}%
-\def\gnuplotterminal{latex}
-\def\gnuplotterminaloptions{}
-\def\gnuplotscale{1}
-\setkeys{pic}{#1}
- \xdef\gnuplotCutFile{\subfolder\figname.gnuplot}
+\def\gnuplotterminal{latex}%%
+\def\gnuplotterminaloptions{}%%
+\def\gnuplotscale{1}%%
+\setkeys{pic}{#1}%%
+ \xdef\gnuplotCutFile{\subfolder/\figname.gnuplot}%%
\gnuplotverbatimwrite{\gnuplotCutFile}}
{\endgnuplotverbatimwrite%
\gnuplotgraphicsprocess%
\gnuplotgraphicsinclude}
\def\extension{\gnuplottexextension{\gnuplotterminal}}
\long\gdef\gnuplotgraphicsprocess{%
-\ifShellEscape
-\IfFileExists{\subfolder\figname.gnuplot}{%
+\ifShellEscape%
+\IfFileExists{\subfolder/\figname.gnuplot}{%
\ifmiktex
- \immediate\write18{\gnuplotexe\space \subfolder\figname.gnuplot}
+ \immediate\write18{\gnuplotexe\space \subfolder/\figname.gnuplot}%
\else
- \immediate\write18{\gnuplotexe\space \subfolder\figname.gnuplot\space 2>>\jobname.gnuploterrors}
- \fi
-\IfFileExists{\subfolder\figname.\extension}{%
-\PackageInfo{gnuplottex}{\subfolder\figname.gnuplot converted}
+ \immediate\write18{\gnuplotexe\space \subfolder/\figname.gnuplot\space 2>>\jobname.gnuploterrors}%
+ \fi%
+\IfFileExists{\subfolder/\figname.\extension}{%
+\PackageInfo{gnuplottex}{\subfolder/\figname.gnuplot converted}%
\ifcleanup
\ifmiktex
- \immediate\write18{del "\subfolder\figname.gnuplot"}
+ \immediate\write18{del "\subfolder/\figname.gnuplot"}%
\else
- \immediate\write18{rm -f "\subfolder\figname.gnuplot"}
- \fi
- \fi
+ \immediate\write18{rm -f "\subfolder/\figname.gnuplot"}%
+ \fi%
+ \fi%
}
{\PackageWarningNoLine{gnuplottex}
-{Conversion of \subfolder\figname.gnuplot failed}}}{}
+{Conversion of \subfolder/\figname.gnuplot failed}}}{}%
\fi}
\long\def\gnuploterrors@eatpar#1#2\@nil{\def\gnuploterrors@{#2}}
\AtEndDocument{%
@@ -210,23 +212,23 @@
\PackageWarningNoLine{gnuplottex}{Gnuplot execution produced errors:^^J%
\detokenize\expandafter{\gnuploterrors@}}%
\fi
- }{}%
+ }{}
\fi
}
\long\gdef\gnuplotgraphicsinclude{%
-\IfFileExists{\subfolder\figname.\extension}{%
+\IfFileExists{\subfolder/\figname.\extension}{%
\ifthenelse{\equal{\extension}{\string tex}}
-{\scalebox{\gnuplotscale}{\input{\subfolder\figname.\extension}}}
-{\includegraphics[scale=\gnuplotscale]{\subfolder\figname.\extension}}
+{\scalebox{\gnuplotscale}{\input{\subfolder/\figname.\extension}}}
+{\includegraphics[scale=\gnuplotscale]{\subfolder/\figname.\extension}}
}
{\PackageWarningNoLine{gnuplottex}
-{Please convert \subfolder\figname.gnuplot manually}}
+{Please convert \subfolder/\figname.gnuplot manually}}
}
\newcommand{\gnuplotloadfilewrite}[2]{%
\immediate\openout \verbatim@out #1%
\message{Opening gnuplot stream #1}%
\immediate\write\verbatim@out{\string set terminal \gnuplotterminal \gnuplotterminaloptions}%
- \immediate\write\verbatim@out{\string set output '\subfolder\figname.\gnuplottexextension{\gnuplotterminal}'}%
+ \immediate\write\verbatim@out{\string set output '\subfolder/\figname.\gnuplottexextension{\gnuplotterminal}'}%
\ifusesiunitx
\ifthenelse{\equal{\extension}{\string tex}}{\usesiunitxingnuplot}{\PackageWarningNoLine{gnuplottex}{Axis numbers not written in \noexpand\num{}. Use a terminal that allows TeX output to enable this feature.}}
\else
@@ -249,7 +251,7 @@
\def\gnuplotterminaloptions{}
\def\gnuplotscale{1}
\setkeys{pic}{#1}
- \xdef\gnuplotCutFile{\subfolder\figname.gnuplot}
+ \xdef\gnuplotCutFile{\subfolder/\figname.gnuplot}
\gnuplotloadfilewrite{\gnuplotCutFile}{#2}
\gnuplotgraphicsprocess%
\gnuplotgraphicsinclude
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gnuplottex.tlpobj new/tlpkg/tlpobj/gnuplottex.tlpobj
--- old/tlpkg/tlpobj/gnuplottex.tlpobj 2019-02-28 03:40:30.000000000 +0100
+++ new/tlpkg/tlpobj/gnuplottex.tlpobj 2020-04-16 01:56:59.000000000 +0200
@@ -1,6 +1,6 @@
name gnuplottex
category Package
-revision 41904
+revision 54758
shortdesc Embed Gnuplot commands in LaTeX documents
relocated 1
longdesc This package allows you to include Gnuplot graphs in your LaTeX
@@ -14,7 +14,6 @@
RELOC/tex/latex/gnuplottex/gnuplottex.sty
catalogue-also context-gnuplot
catalogue-ctan /macros/latex/contrib/gnuplottex
-catalogue-date 2016-08-21 22:13:00 +0200
catalogue-license gpl2
catalogue-topics graphics-inline
-catalogue-version 0.9.2
+catalogue-version 0.9.5
++++++ gofonts.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gofonts/README new/doc/fonts/gofonts/README
--- old/doc/fonts/gofonts/README 2017-04-10 00:50:14.000000000 +0200
+++ new/doc/fonts/gofonts/README 2019-10-13 23:39:15.000000000 +0200
@@ -1,4 +1,4 @@
-This is the README for the gofonts package, version 2017-04-02.
+This is the README for the gofonts package, version 2019-10-12.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
support for the GoSans and GoMono families of fonts designed
@@ -44,12 +44,16 @@
Options scaled=<number> or scale=<number> may be used to
scale the fonts.
-Font encodings supported are OT1, T1, LY1 and TS1.
+Font encodings supported are OT1, T1, TS1, LY1 and LGR.
For GoSans, the medium option activates that series as the
default bold series. Commands \gomedium and \gobold allow for
localized use of those series.
+Commands \golgr and \gomonolgr allow for localized use
+of LGR-encoded type1 fonts.
+
+
The original TrueType fonts were obtained from
https://go.googlesource.com/image
Binary files old/doc/fonts/gofonts/go-samples.pdf and new/doc/fonts/gofonts/go-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/gofonts/go-samples.tex new/doc/fonts/gofonts/go-samples.tex
--- old/doc/fonts/gofonts/go-samples.tex 2017-04-01 22:56:19.000000000 +0200
+++ new/doc/fonts/gofonts/go-samples.tex 2019-06-04 23:20:25.000000000 +0200
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage[T1]{fontenc}
+\usepackage[LGR,T1]{fontenc}
\usepackage[sfdefault]{GoSans}
\usepackage{GoMono}
\usepackage{lipsum}
@@ -47,6 +47,16 @@
Officially broken off. Often offline, find me flowerless.
+
+\section*{LGR}
+
+
+{\golgr\noindent
+ a b g d e z h j i k l m n x o p r s t u f q y w\\
+ A B G D E Z H J I K L M N X O P R S T U F Q Y W\\
+}
+
+
\section*{Go Mono}
\ttfamily\sloppy
@@ -73,4 +83,18 @@
1234567890
+\subsection*{Non-Ligatures}
+
+
+Officially broken off. Often offline, find me flowerless.
+
+\section*{LGR}
+
+
+{\gomonolgr\noindent
+ a b g d e z h j i k l m n x o p r s t u f q y w\\
+ A B G D E Z H J I K L M N X O P R S T U F Q Y W\\
+}
+
+
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gofonts.doc.tlpobj new/tlpkg/tlpobj/gofonts.doc.tlpobj
--- old/tlpkg/tlpobj/gofonts.doc.tlpobj 2019-02-28 03:40:31.000000000 +0100
+++ new/tlpkg/tlpobj/gofonts.doc.tlpobj 2020-03-24 01:58:49.000000000 +0100
@@ -1,9 +1,9 @@
name gofonts.doc
category Package
-revision 43726
+revision 54512
shortdesc doc files of gofonts
relocated 1
-docfiles size=103
+docfiles size=81
RELOC/doc/fonts/gofonts/License
RELOC/doc/fonts/gofonts/README
RELOC/doc/fonts/gofonts/go-samples.pdf
++++++ gofonts.tar.xz ++++++
++++ 2719 lines of diff (skipped)
++++++ grabbox.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/grabbox/README.md new/doc/latex/grabbox/README.md
--- old/doc/latex/grabbox/README.md 2018-10-18 22:29:35.000000000 +0200
+++ new/doc/latex/grabbox/README.md 2019-05-08 23:17:53.000000000 +0200
@@ -1,6 +1,6 @@
grabbox: utilities to get an argument as a box
-Copyright (C) 2018 by Jonathan P. Spratte
+Copyright (C) 2018-2019 by Jonathan P. Spratte
This package may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this license or (at
@@ -11,9 +11,9 @@
The package provides
- - `\grabbox<*>{<register>}[<pre>]{<mode>}[<post>]{<next>}`: grab the
+ - `\grabbox<*>[<prepre>]{<register>}[<pre>]{<mode>}[<post>]{<next>}`: grab the
next argument as a box in `<mode>` (`\hbox`, `\vbox` or `\vtop`) and save it
in box `<register>`. After the box is saved execute `<next>`. Inside of the
- box one can inject `<pre>` before the contents and `<post>` after them. If
- the star is not given spaces are stripped from the start and the end of the
- box.
+ box one can inject `<prepre>` and `<pre>` before the contents and `<post>`
+ after them. If the star is not given spaces are stripped from the start and
+ the end of the box.
Binary files old/doc/latex/grabbox/grabbox.pdf and new/doc/latex/grabbox/grabbox.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/grabbox.doc.tlpobj new/tlpkg/tlpobj/grabbox.doc.tlpobj
--- old/tlpkg/tlpobj/grabbox.doc.tlpobj 2019-02-28 03:40:36.000000000 +0100
+++ new/tlpkg/tlpobj/grabbox.doc.tlpobj 2019-05-09 01:38:32.000000000 +0200
@@ -1,6 +1,6 @@
name grabbox.doc
category Package
-revision 49546
+revision 51052
shortdesc doc files of grabbox
relocated 1
docfiles size=87
++++++ grabbox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/grabbox/grabbox.sty new/tex/latex/grabbox/grabbox.sty
--- old/tex/latex/grabbox/grabbox.sty 2018-12-30 23:12:59.000000000 +0100
+++ new/tex/latex/grabbox/grabbox.sty 2019-05-08 23:17:53.000000000 +0200
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% --------------------------------------------------------------
%%
-%% Copyright (C) 2018 Jonathan P. Spratte
+%% Copyright (C) 2018-2019 Jonathan P. Spratte
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this license or
@@ -29,8 +29,8 @@
%% and the derived files grabbox.pdf and
%% grabbox.sty.
%%
-\newcommand*\grabbox@date{2018-12-29}
-\newcommand*\grabbox(a)version{1.3}
+\newcommand*\grabbox@date{2019-05-08}
+\newcommand*\grabbox(a)version{1.4}
\ProvidesPackage{grabbox}
[%
\grabbox@date\space v\grabbox@version\space utilities to get an argument as
@@ -50,8 +50,6 @@
{%
\grabbox@def#1##1{\def#2{##1}\grabbox@opt#3#4}%
}
-\long\def\grabbox@afterelsefi#1\else#2\fi{\fi#1}
-\long\def\grabbox@afterfi#1\fi{\fi#1}
\grabbox@def\grabbox@opt#1#2%
{%
\@ifnextchar[
@@ -77,19 +75,6 @@
{%
\ifhmode\unskip\fi
}
-\grabbox@def\grabbox@unpack
- {%
- \begingroup
- \edef\grabbox@test{\grabbox@type}%
- \expandafter\ifx\grabbox@test\hbox
- \endgroup
- \grabbox@afterelsefi\unhbox
- \else
- \endgroup
- \grabbox@afterfi\unvbox
- \fi
- \grabbox@name
- }
\grabbox@def\grabbox
{%
\@ifstar
@@ -108,6 +93,21 @@
\afterassignment\grabbox@intermediate
\setbox\grabbox@name\grabbox@type
}
+\grabbox@def\@grabbox
+ {%
+ \@ifstar
+ {\@grabbox@spaces@true\@grabbox@a}
+ {\@grabbox@spaces@false\@grabbox@a}%
+ }
+\grabbox@ldef\@grabbox@a#1#2#3#4#5%
+ {%
+ \def\grabbox@into@prepre{#1}%
+ \def\grabbox@name {#2}%
+ \def\grabbox@into@pre {#3}%
+ \def\grabbox@type {#4}%
+ \def\grabbox@into@post {#5}%
+ \grabbox@d
+ }
\grabbox@def\grabbox@intermediate
{%
\grabbox@into@prepre
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/grabbox.tlpobj new/tlpkg/tlpobj/grabbox.tlpobj
--- old/tlpkg/tlpobj/grabbox.tlpobj 2019-02-28 03:40:36.000000000 +0100
+++ new/tlpkg/tlpobj/grabbox.tlpobj 2019-05-09 01:38:32.000000000 +0200
@@ -1,6 +1,6 @@
name grabbox
category Package
-revision 49546
+revision 51052
shortdesc Read an argument into a box and execute the code afterwards
relocated 1
longdesc The package provides the command \grabbox, which grabs an
@@ -9,7 +9,7 @@
RELOC/tex/latex/grabbox/grabbox.sty
catalogue-contact-repository https://gitlass.de/jonathan/grabbox
catalogue-ctan /macros/latex/contrib/grabbox
-catalogue-date 2018-12-29 21:54:58 +0100
+catalogue-date 2019-05-08 20:23:42 +0200
catalogue-license lppl1.3c
catalogue-topics boxing
-catalogue-version 1.3
+catalogue-version 1.4
++++++ graphics-def.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/graphics-def/CONTRIBUTING.md new/doc/latex/graphics-def/CONTRIBUTING.md
--- old/doc/latex/graphics-def/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/graphics-def/CONTRIBUTING.md 2020-03-24 21:52:52.000000000 +0100
@@ -0,0 +1,96 @@
+Thanks for considering contributing to LaTeX2e: feedback, fixes and
+ideas are all useful. Here, we ([The LaTeX3
+Project](https://www.latex-project.org)) have collected together a few
+pointers to help things along.
+
+## Bugs
+
+There are thousands of packages and tools and the LaTeX Project Team
+only supports a few dozen core packages beside the kernel code. We
+also don't maintain any tools or the TeX-engines themselves! So if a
+bug is due to code from a contributed third-party package then the LaTeX
+Project Team is not able to help or fix the code as that is maintained
+by others. As such, we ask you follow the procedure below as it will
+help to weed cases where we cannot help.
+
+To report a bug it is important to provide a short test file that
+exhibits the issue. The [`latexbug`](https://github.com/latex3/latexbug)
+package should be loaded at the very top of any such test file used to
+report a bug in LaTeX as follows:
+
+```latex
+\RequirePackage{latexbug} % <- first line
+\documentclass{article} % or some other class
+... % code showing the problem
+```
+
+If the `latexbug` package is not part of your distribution you can
+download it
+[GitHub](https://raw.githubusercontent.com/latex3/latexbug/master/latexbug.sty).
+In that case simply place it in the directory next to your test file (or
+place it into your local `texmf` tree so that it will be always found –
+how to do that depends on the installation you use).
+
+If `latexbug` complains about third-party packages you should first
+remove those from your test file. If that is not possible, then the
+bug is most likely in one of these packages and you should report the
+problem to the maintainers of the package instead of opening an issue
+here. However, if you think the bug is in core LaTeX (as maintained
+by the LaTeX Team) even though you need the third-party packages to
+demonstrate the problem, then please continue and send the bug report
+to us but explain this explicitly in your description of the bug.
+
+
+## Font related issues
+
+Problems that are clearly due to using a specific font setup or a
+specific font are normally out of scope as we do not maintain fonts
+for LaTeX and can't help with problems in that area. Especially with
+XeTeX and LuaTeX people may experience issues due to font usage that
+are either due to the font itself or to different versions or
+treatment on different platforms. So please use Computer Modern or
+Latin Modern fonts in the test files.
+
+
+
+## Layout and interface deficiencies
+
+Upfront we should probably stress that 'deficiencies' in the design of
+of the standard document classes (`article`, `report` and `book`) as
+well a questionable but long established interface behavior of commands
+is something that we will normally not change, even if we can all agree
+that a different behavior or a different layout would have been a better
+choice. You are, of course, welcome to report issues in these areas,
+using the procedure explained below, but in all likelihood such reports
+will be marked as 'won't fix'.
+
+The reason is is that the kernel interfaces and the document classes
+have been used for many years in essentially all documents (even
+documents using different classes often build them upon the standard
+classes in the background) and thus such changes would break or as a
+minimum noticeably change nearly all existing documents. See also the
+file [LaTeX2e News Issue
+07](https://www.latex-project.org/news/latex2e-news/ltnews07.pdf) with
+regard to this policy.
+
+## Code contributions
+
+If you want to discuss a possible contribution before (or instead of)
+making a pull request, drop a line to
+[the team](mailto:latex-team@latex-project.org).
+
+The stability of LaTeX is very important and this means that change in
+the kernel is necessarily very conservative. It also means that a lot of
+discussion happens before any changes are made. If you do decide to post
+a pull request, please bear this in mind: we do appreciate ideas, but
+cannot always integrate them into the kernel.
+
+If you are submitting a pull request, notice that
+
+- The first line of commit messages should be a short summary (up to about
+ 50 chars); leave a blank line then give more detail if required
+- We use Travis-CI for (light) testing so add `[ci skip]` to documentation-only
+ commit messages
+- We favour a single linear history so will rebase accepted pull requests
+- Where a commit fixes or closes an issue, please include this information
+ in the first line of the commit message [`(fixes #X)` or similar]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/graphics-def/README.md new/doc/latex/graphics-def/README.md
--- old/doc/latex/graphics-def/README.md 2018-01-09 23:36:08.000000000 +0100
+++ new/doc/latex/graphics-def/README.md 2020-03-24 21:52:52.000000000 +0100
@@ -1,7 +1,7 @@
LaTeX support for color and graphics
====================================
-Release 2018-01-08
+Release 2020-03-24
This bundle contains the 'engine-dependent' part of support for
color and graphics in LaTeX2e (the code here will also function
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/graphics-def.doc.tlpobj new/tlpkg/tlpobj/graphics-def.doc.tlpobj
--- old/tlpkg/tlpobj/graphics-def.doc.tlpobj 2019-02-28 03:40:40.000000000 +0100
+++ new/tlpkg/tlpobj/graphics-def.doc.tlpobj 2020-03-25 16:13:13.000000000 +0100
@@ -1,7 +1,8 @@
name graphics-def.doc
category Package
-revision 46267
+revision 54522
shortdesc doc files of graphics-def
relocated 1
-docfiles size=1
+docfiles size=3
+ RELOC/doc/latex/graphics-def/CONTRIBUTING.md
RELOC/doc/latex/graphics-def/README.md
++++++ graphics-def.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics-def/dvisvgm.def new/tex/latex/graphics-def/dvisvgm.def
--- old/tex/latex/graphics-def/dvisvgm.def 2017-06-23 00:35:35.000000000 +0200
+++ new/tex/latex/graphics-def/dvisvgm.def 2020-03-24 21:52:52.000000000 +0100
@@ -1,5 +1,5 @@
% Copyright 2015 by Till Tantau
-% Copyright 2016 by Till Tantau and LaTeX3 Project
+% Copyright 2016 2018 by Till Tantau and LaTeX3 Project
%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -15,9 +15,9 @@
%%
%% https://github.com/latex3/graphics-def/issues
%
-\ProvidesFile{dvisvgm.def}[2017/06/20 v1.0b dvisvgm graphics driver for latex]
-\def\GPT@space{ }
+\ProvidesFile{dvisvgm.def}[2020/03/22 v1.2 dvisvgm graphics driver for latex]
% The following is copied from dvips.def:
+\def\GPT@space{ }
\def\c@lor@arg#1{%
\dimen@#1\p@
\ifdim\dimen@<\z@\dimen@\maxdimen\fi
@@ -72,11 +72,85 @@
\def\reset@color{\special{color pop}}
\def\set@page@color{\special{bgcolor \current@color}}
\def\define@color@named#1#2{\expandafter\let\csname col@#1\endcsname\@nnil}
-\def\Grot@start{\special{dvisvgm:raw <g transform="translate({?x},{?y})scale(1,-1)rotate(\Grot@angle)scale(-1,1)translate({?x},{?y})scale(-1)">}}
-\def\Grot@end{\special{dvisvgm:raw </g>}}
-\def\Gscale@start{\special{dvisvgm:raw <g transform="translate({?x},{?y})scale(\Gscale@x,\Gscale@y)scale(-1)translate({?x},{?y})scale(-1)">}}
-\def\Gscale@end{\special{dvisvgm:raw </g>}}
-\def\Gin(a)extensions{.png,.jpg,.jpeg,.svg}
+\def\Grot@start{%
+ \special{ps: gsave currentpoint currentpoint translate \Grot@angle\GPT@space neg rotate neg exch neg exch translate}%
+ \special{dvisvgm:bbox \strip@pt\wd\z@ pt \strip@pt\ht\z@ pt \strip@pt\dp\z@ pt transform}%
+ \special{ps: grestore}%
+ \special{dvisvgm:raw <g transform="translate({?x},{?y})scale(1,-1)rotate(\Grot@angle)scale(-1,1)translate({?x},{?y})scale(-1)">}%
+ \special{dvisvgm:bbox lock}%
+}
+\def\Grot@end{\special{dvisvgm:bbox unlock}\special{dvisvgm:raw </g>}}
+\def\Gscale@start{%
+ \special{ps: gsave currentpoint currentpoint translate \Gscale@x\GPT@space \Gscale@y\GPT@space scale neg exch neg exch translate}%
+ \special{dvisvgm:bbox \strip@pt\wd\z@ pt \strip@pt\ht\z@ pt \strip@pt\dp\z@ pt transform}%
+ \special{ps: grestore}%
+ \special{dvisvgm:raw <g transform="translate({?x},{?y})scale(\Gscale@x,\Gscale@y)scale(-1)translate({?x},{?y})scale(-1)">}%
+ \special{dvisvgm:bbox lock}%
+}
+\let\Gscale@end\Grot@end
+\def\Gin(a)extensions{.svg,.eps,.png,.jpg,.jpeg}
+\def\Ginclude@pdf#1{\Ginclude@psorpdf{#1}{pdffile}}
+\def\Ginclude@eps#1{\let\Gin@page\@empty\Ginclude@psorpdf{#1}{PSfile}}
+\def\Ginclude@psorpdf#1#2{%
+ \message{<#1>}%
+ \bgroup
+ \def\@tempa{!}%
+ \dimen@\Gin@req@width
+ \dimen(a)ii.1bp%
+ \divide\dimen@\dimen@ii
+ \@tempdima\Gin@req@height
+ \divide\@tempdima\dimen@ii
+ \special{#2="#1"\GPT@space
+ \ifx\Gin@page\@empty\else page=\Gin@page\GPT@space\fi
+ llx=\Gin@llx\GPT@space
+ lly=\Gin@lly\GPT@space
+ urx=\Gin@urx\GPT@space
+ ury=\Gin@ury\GPT@space
+ \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\GPT@space\fi
+ \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\GPT@space\fi
+ \ifGin@clip clip\fi
+ }%
+ \egroup}
+\@namedef{Gin@rule@.ps}#1{{eps}{.ps}{#1}}
+\@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}}
+\@namedef{Gin@rule@.mps}#1{{eps}{.mps}{#1}}
+\@namedef{Gin@rule@.pdf}#1{{pdf}{.xbb}{#1}}
+% BoundingBox determination (from dvipdfmx.def)
+\def\Gread@pdf#1{%
+ \Gread@generic{#1}\Gread@extractbb@aux%
+}%
+\def\Gread@extractbb@aux#1{%
+ \ifeof\@inputcheck%
+ \immediate\openin\@inputcheck=%
+ "|extractbb %
+ \ifx\Gin@page\@empty\else -p \Gin@page\GPT@space\fi
+ \ifx\Gin@pagebox\@empty\else -B \Gin@pagebox\GPT@space\fi
+ -O \Gin@base\Gin@ext"%
+ \fi%
+ \Gread@true%
+ \let\@tempb\Gread@false%
+ \ifeof\@inputcheck%
+ \@latex@error%
+ {Cannot run pipe command. Try --shell-escape\MessageBreak%
+ (--enable-pipes in MikTeX) option}%
+ {Alternatively, execute\MessageBreak\space\space
+ extractbb
+ \ifx\Gin@page\@empty\else -p \Gin@page\GPT@space\fi
+ \ifx\Gin@pagebox\@empty\else -B \Gin@pagebox\GPT@space\fi
+ \Gin@base\Gin@ext\MessageBreak in a terminal.}%
+ \else%
+ \loop%
+ \read\@inputcheck to\@tempa%
+ \ifeof\@inputcheck%
+ \Gread@false%
+ \else%
+ \expandafter\Gread@find@bb\@tempa:.\\%
+ \fi%
+ \ifGread@%
+ \repeat%
+ \immediate\closein\@inputcheck%
+ \fi%
+}
\def\Ginclude@bitmap#1{%
\dimen@\Gin@urx pt%
\advance\dimen@ by-\Gin@llx pt%
@@ -87,17 +161,17 @@
\dimen@\Gin@svg@real@height@bp pt%
\advance\dimen@ by-\Gin@ury pt%
\edef\Gin@svg@view@base{\strip@pt\dimen@}%
-% \kern-\Gin@llx bp%
- \raise\Gin@req@height\hbox{%
+ \Gin@req@width0.99626\Gin@req@width%
+ \Gin@req@height0.99626\Gin@req@height%
+ \raise\strip@pt\Gin@req@height bp\hbox{%
\special{dvisvgm: raw
<g transform="translate({?x},{?y})">
<svg overflow="\ifGin@clip hidden\else visible\fi" width="\strip@pt\Gin@req@width" height="\strip@pt\Gin@req@height"
viewBox="\Gin@llx\GPT@space\Gin@svg@view@base\GPT@space\Gin@svg@view@width\GPT@space\Gin@svg@view@height">
- <image width="\Gin@svg@real@width@bp" height="\Gin@svg@real@height@bp"
+ <image width="\Gin@svg@real@width@bp" height="\Gin@svg@real@height@bp"
xlink:href="#1"/>
</svg>
</g>}%
-% \special{dvisvgm: img \strip@pt\Gin@req@width\GPT@space \strip@pt\Gin@req@height\GPT@space #1}
}%
}
@@ -139,32 +213,33 @@
\fi
\edef\Gin@setter{\def\noexpand\Gin@urx{\Gin@urx}\def\noexpand\Gin@ury{\Gin@ury}}%
\expandafter\endgroup\Gin@setter%
- \def\Gin@llx{0}%
+ \def\Gin@llx{0}%
\def\Gin@lly{0}%
\edef\Gin@svg@real@width@bp{\Gin@urx}%
- \edef\Gin@svg@real@height@bp{\Gin@ury}%
+ \edef\Gin@svg@real@height@bp{\Gin@ury}%
}
\def\Gin@partext{\par}
\def\Gread@svg@height#1height={\@ifnextchar\relax{}{\@ifnextchar'\Gread@svg@height@apo\Gread@svg@height@double}}
-\def\Gread@svg@height@apo'#1'#2\relax{\afterassignment\Gin@gobble@till@relax\dimen@#1pt\relax\dimen@0.99626\dimen@\edef\Gin@ury{\strip@pt\dimen@}}
-\def\Gread@svg@height@double"#1"#2\relax{\afterassignment\Gin@gobble@till@relax\dimen@#1pt\relax\dimen@0.99626\dimen@\edef\Gin@ury{\strip@pt\dimen@}}
+\def\Gread@svg@height@apo'#1'#2\relax{\afterassignment\Gin@gobble@till@relax\dimen@#1pt\relax\edef\Gin@ury{\strip@pt\dimen@}}
+\def\Gread@svg@height@double"#1"#2\relax{\afterassignment\Gin@gobble@till@relax\dimen@#1pt\relax\edef\Gin@ury{\strip@pt\dimen@}}
\def\Gread@svg@width#1width={\@ifnextchar\relax{}{\@ifnextchar'\Gread@svg@width@apo\Gread@svg@width@double}}
-\def\Gread@svg@width@apo'#1'#2\relax{\afterassignment\Gin@gobble@till@relax\dimen@#1pt\relax\dimen@0.99626\dimen@\edef\Gin@urx{\strip@pt\dimen@}}
-\def\Gread@svg@width@double"#1"#2\relax{\afterassignment\Gin@gobble@till@relax\dimen@#1pt\relax\dimen@0.99626\dimen@\edef\Gin@urx{\strip@pt\dimen@}}
+\def\Gread@svg@width@apo'#1'#2\relax{\afterassignment\Gin@gobble@till@relax\dimen@#1pt\relax\edef\Gin@urx{\strip@pt\dimen@}}
+\def\Gread@svg@width@double"#1"#2\relax{\afterassignment\Gin@gobble@till@relax\dimen@#1pt\relax\edef\Gin@urx{\strip@pt\dimen@}}
\def\Gin@gobble@till@relax#1\relax{}
+\edef\Gin@hash@tag{\string#}
\@namedef{Gin@rule@.jpg}#1{{bitmap}{.xbb}{#1}}
\@namedef{Gin@rule@.jpeg}#1{{bitmap}{.xbb}{#1}}
\@namedef{Gin@rule@.png}#1{{bitmap}{.xbb}{#1}}
-% Replace
+% Replace
\def\Gread@bitmap#1{%
- \Gread@eps{#1}%
- \dimen@\Gin@urx bp%
- \advance\dimen@ by-\Gin@llx bp%
+ \Gread@generic{#1}\Gread@extractbb@aux%
+ \dimen@\Gin@urx pt%
+ \advance\dimen@ by-\Gin@llx pt%
\edef\Gin@svg@real@width@bp{\strip@pt\dimen@}%
- \dimen@\Gin@ury bp%
- \advance\dimen@ by-\Gin@lly bp%
+ \dimen@\Gin@ury pt%
+ \advance\dimen@ by-\Gin@lly pt%
\edef\Gin@svg@real@height@bp{\strip@pt\dimen@}%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics-def/luatex.def new/tex/latex/graphics-def/luatex.def
--- old/tex/latex/graphics-def/luatex.def 2018-01-09 23:36:08.000000000 +0100
+++ new/tex/latex/graphics-def/luatex.def 2020-03-24 21:52:52.000000000 +0100
@@ -128,14 +128,17 @@
\AtBeginDocument{%
\def\KV@Gin@bbllx{%
\PackageError{luatex.def}{%
- Options `bblly', `bblly', `bburx' and `bbury'\MessageBreak
- are not supported by luatex driver:\MessageBreak
+ Options `bblly', `bblly', `bburx', `bbury',\MessageBreak
+ `natheight' and `natwidth' are not\MessageBreak
+ supported by luatex driver:\MessageBreak
use `viewport' instead%
}\@ehc
}%
\let\KV@Gin@bblly\KV@Gin@bbllx
\let\KV@Gin@bburx\KV@Gin@bbllx
\let\KV@Gin@bbury\KV@Gin@bbllx
+ \let\KV@Gin@natwidth\KV@Gin@bbllx
+ \let\KV@Gin@natheight\KV@Gin@bbllx
\def\KV@Gin@bb{%
\PackageInfo{luatex.def}%
{Option `bb' equivalent to `viewport' for luatex driver}%
@@ -575,18 +578,18 @@
% b) and shell escape is enabled (possibly restricted),
% c) and \DoNotLoadEpstopdf either does not exist or is not \relax,
% d) and neither pst-pdf nor pdftricks is loaded (by \begin{document}).
-%
+%
% In other words, by default .eps files will be automatically
% converted to .pdf files when outputting pdf. This can be wrong!
% If the .pdf is the source, rather than the .eps, you should put
% \newcommand{\DoNotLoadEpstopdf}{}
% before even the \documentclass line of your document.
-%
+%
% More information about the epstopdf run will be in the .log file;
% see http://ctan.org/pkg/epstopdf-pkg for more info about the
% epstopdf package itself. In turn, it calls the epstopdf script
% (http://ctan.org/pkg/epstopdf).
-%
+%
% For the first discussion and background on this, see the thread on latex-l:
% http://thread.gmane.org/gmane.comp.tex.latex.latex3/1465
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics-def/pdftex.def new/tex/latex/graphics-def/pdftex.def
--- old/tex/latex/graphics-def/pdftex.def 2018-01-09 23:36:08.000000000 +0100
+++ new/tex/latex/graphics-def/pdftex.def 2020-03-24 21:52:52.000000000 +0100
@@ -142,14 +142,17 @@
\AtBeginDocument{%
\def\KV@Gin@bbllx{%
\PackageError{pdftex.def}{%
- Options `bblly', `bblly', `bburx' and `bbury'\MessageBreak
- are not supported by pdftex driver:\MessageBreak
+ Options `bblly', `bblly', `bburx', `bbury',\MessageBreak
+ `natheight' and `natwidth' are not\MessageBreak
+ supported by pdftex driver:\MessageBreak
use `viewport' instead%
}\@ehc
}%
\let\KV@Gin@bblly\KV@Gin@bbllx
\let\KV@Gin@bburx\KV@Gin@bbllx
\let\KV@Gin@bbury\KV@Gin@bbllx
+ \let\KV@Gin@natwidth\KV@Gin@bbllx
+ \let\KV@Gin@natheight\KV@Gin@bbllx
\def\KV@Gin@bb{%
\PackageInfo{pdftex.def}%
{Option `bb' equivalent to `viewport' with pdftex driver}%
@@ -585,18 +588,18 @@
% b) and shell escape (\write18) is enabled (possibly restricted),
% c) and \DoNotLoadEpstopdf either does not exist or is not \relax,
% d) and neither pst-pdf nor pdftricks is loaded (by \begin{document}).
-%
+%
% In other words, by default .eps files will be automatically
% converted to .pdf files when outputting pdf. This can be wrong!
% If the .pdf is the source, rather than the .eps, you should put
% \newcommand{\DoNotLoadEpstopdf}{}
% before even the \documentclass line of your document.
-%
+%
% More information about the epstopdf run will be in the .log file;
% see http://ctan.org/pkg/epstopdf-pkg for more info about the
% epstopdf package itself. In turn, it calls the epstopdf script
% (http://ctan.org/pkg/epstopdf).
-%
+%
% For the first discussion and background on this, see the thread on latex-l:
% http://thread.gmane.org/gmane.comp.tex.latex.latex3/1465
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/graphics-def.tlpobj new/tlpkg/tlpobj/graphics-def.tlpobj
--- old/tlpkg/tlpobj/graphics-def.tlpobj 2019-02-28 03:40:40.000000000 +0100
+++ new/tlpkg/tlpobj/graphics-def.tlpobj 2020-03-25 16:13:13.000000000 +0100
@@ -1,6 +1,6 @@
name graphics-def
category Package
-revision 46267
+revision 54522
shortdesc Colour and graphics option files
relocated 1
longdesc This bundle is a combined distribution consisting of dvips.def,
@@ -9,7 +9,7 @@
longdesc color packages. It is hoped that by combining their source
longdesc repositories at https://github.com/latex3/graphics-def it will
longdesc be easier to coordinate updates.
-runfiles size=21
+runfiles size=22
RELOC/tex/latex/graphics-def/dvipdfmx.def
RELOC/tex/latex/graphics-def/dvips.def
RELOC/tex/latex/graphics-def/dvisvgm.def
@@ -20,6 +20,5 @@
catalogue-contact-home https://www.latex-project.org/
catalogue-contact-repository https://github.com/latex3/graphics-def
catalogue-ctan /macros/latex/contrib/graphics-def
-catalogue-date 2018-01-09 10:47:08 +0100
catalogue-license lppl1.3c
catalogue-topics graphics-drv
++++++ graphics-pln.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/plain/graphics-pln/README.md new/doc/plain/graphics-pln/README.md
--- old/doc/plain/graphics-pln/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/plain/graphics-pln/README.md 2020-03-03 23:03:11.000000000 +0100
@@ -0,0 +1,112 @@
+# graphics-pln
+
+## Graphics code for non-LaTeX users.
+
+This directory provides a small wrapper file such that users of
+formats based on plain TeX may make use of some of the parts of the
+standard LaTeX distribution.
+
+These files are *NOT* supported by the LaTeX3 project, and any
+problems with them should *NOT* be reported to the LaTeX bugs system.
+
+Problems should be reported as issues at
+https://github.com/davidcarlisle/graphics-pln/issues
+
+
+David Carlisle
+1995/01/29
+1996/11/13
+2016/08/17
+2017/06/01
+2018/01/16
+2020/03/02
+
+Copyright 1995 1996 2016 2017 2018 2020 David Carlisle
+
+ All the files in this directory may be redistributed and/or modified
+ under the terms of the LaTeX Project Public License distributed from
+ CTAN archives in directory macros/latex/base/lppl.txt; either
+ version 1 of the License, or (at your option) any later version.
+
+
+
+This directory contains
+
+- README.md
+ This file.
+
+- exmplpic.tex
+ A plain TeX document using LaTeX' `picture mode': a portable
+ means of producing simple diagrams.
+
+- exmplgrf.tex
+ A plain TeX document using the LaTeX graphicx package, for
+ rotating and scaling text, and include PostScript and other
+ graphics formats. (This will include the file a.ps available
+ in the LaTeX graphics distribution.)
+
+- exmplcol.tex
+ A plain TeX document using the LaTeX color package, for
+ producing colour.
+
+- exmplpfg.tex
+ A plain TeX document using the contributed LaTeX psfrag package,
+ for including PostScript documents, while replacing certain text
+ strings with TeX typeset replacements. This uses the example.eps
+ figure from the psfrag 3.0 distribution.
+
+- miniltx.tex
+ A small `miniLaTeX' that defines fakes or otherwise hacks
+ sufficient bits of LaTeX internals so that the packages can load.
+
+- picture.tex
+ The user interface to the picture environment.
+ `\input picture`
+ Normally a plain-style syntax is used, viz
+ ```
+ \picture(100,100)
+ ....
+ \endpicture
+ ```
+
+ However if the command `\LaTeXbegin` is issued, then a LaTeX
+ syntax of
+ \begin{picture}(100,100)
+ ....
+ \end{picture}
+ May be used. this may be prefered if the picture is being copied
+ from a LaTeX document, or if it is produced automatically from
+ a drawing tool such as xfig or texcad.
+
+- autopict.sty
+ This is a frozen copy of a file that used to be distributed with
+ LaTeX but is no longer needed in that context, it is basically
+ the source of LaTeX Picture mode from LaTeX in 2014. The
+ original use for this package was to build a latex format in
+ which some environments such as picture and tabbing were not
+ defined by default, to save space if working with TeX on a
+ machine with 640K memory.
+
+
+- graphicx.tex
+ The user interface to the graphicx package.
+ `\input graphicx`
+ See the documentation in grfguide.ps in the LaTeX graphics
+ distribution.
+ This file sets the driver to be dvips, pdftex or luatex.
+ If you use another driver, define `\Gin@driver` before inputting the file.
+
+- color.tex
+ The user interface to the color package.
+ `\input color`
+ See the documentation in grfguide.ps in the LaTeX graphics
+ distribution.
+ This file sets the driver to be dvips, pdftex or luatex.
+ If you use another driver, define `\Gin@driver` before inputting the file.
+
+
+- psfrag.tex
+ The user interface to the psfrag package.
+ `\input psfrag`
+ See the documentation in pfgguide.tex in the psfrag distribution,
+ and the example document pfgexmpl.tex included here.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/plain/graphics-pln/README.txt new/doc/plain/graphics-pln/README.txt
--- old/doc/plain/graphics-pln/README.txt 2018-01-18 00:47:04.000000000 +0100
+++ new/doc/plain/graphics-pln/README.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,107 +0,0 @@
-
-Graphics code for non-LaTeX users.
-==================================
-
-This directory provides a small wrapper file such that users of
-formats based on plain TeX may make use of some of the parts of the
-standard LaTeX distribution.
-
-These files are *NOT* supported by the LaTeX3 project, and any
-problems with them should *NOT* be reported to the LaTeX bugs system.
-
-Problems should be reported as issues at
-https://github.com/davidcarlisle/dpctex/tree/master/graphics-pln
-
-
-David Carlisle 1995/01/29
- 1996/11/13
- 2016/08/17
- 2017/06/01
- 2018/01/16
-
-Copyright 1995 1996 2016 2017 2018 David Carlisle
-
- All the files in this directory may be redistributed and/or modified
- under the terms of the LaTeX Project Public License distributed from
- CTAN archives in directory macros/latex/base/lppl.txt; either
- version 1 of the License, or (at your option) any later version.
-
-
-
-This directory contains
-
-README.txt This file.
-
-exmplpic.tex
- A plain TeX document using LaTeX' `picture mode': a portable
- means of producing simple diagrams.
-
-exmplgrf.tex
- A plain TeX document using the LaTeX graphicx package, for
- rotating and scaling text, and include PostScript and other
- graphics formats. (This will include the file a.ps available
- in the LaTeX graphics distribution.)
-
-exmplcol.tex
- A plain TeX document using the LaTeX color package, for
- producing colour.
-
-exmplpfg.tex
- A plain TeX document using the contributed LaTeX psfrag package,
- for including PostScript documents, while replacing certain text
- strings with TeX typeset replacements. This uses the example.eps
- figure from the psfrag 3.0 distribution.
-
-miniltx.tex
- A small `miniLaTeX' that defines fakes or otherwise hacks
- sufficient bits of LaTeX internals so that the packages can load.
-
-picture.tex
- The user interface to the picture environment.
- \input picture.
- Normally a plain-style syntax is used, viz
- \picture(100,100)
- ....
- \endpicture
-
- However if the command \LaTeXbegin is issued, then a LaTeX
- syntax of
- \begin{picture}(100,100)
- ....
- \end{picture}
- May be used. this may be prefered if the picture is being copied
- from a LaTeX document, or if it is produced automatically from
- a drawing tool such as xfig or texcad.
-
-autopict.sty
- This is a frozen copy of a file that used to be distributed with
- LaTeX but is no longer needed in that context, it is basocally
- the source of LaTeX Picture mode from LaTeX in 2014. The
- original use for this package was to build a latex format in
- which some environments such as picture and tabbing were not
- defined by default, to save space if working with TeX on a
- machine with 640K memory.
-
-
-graphicx.tex
- The user interface to the graphicx package.
- \input graphicx
- See the documentation in grfguide.ps in the LaTeX graphics
- distribution.
- This file sets the driver to be dvips. If you
- use another driver, edit accordingly.
-
-color.tex
- The user interface to the color package.
- \input color
- See the documentation in grfguide.ps in the LaTeX graphics
- distribution.
- This file sets the driver to be dvips. If you
- use another driver, edit accordingly.
-
-
-psfrag.tex
- The user interface to the psfrag package.
- \input psfrag
- See the documentation in pfgguide.tex in the psfrag distribution,
- and the example document pfgexmpl.tex included here.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/plain/graphics-pln/exmplgrf.tex new/doc/plain/graphics-pln/exmplgrf.tex
--- old/doc/plain/graphics-pln/exmplgrf.tex 2009-11-22 19:58:23.000000000 +0100
+++ new/doc/plain/graphics-pln/exmplgrf.tex 2020-03-03 23:03:11.000000000 +0100
@@ -1,9 +1,9 @@
\input graphicx
-\includegraphics{a}
+\includegraphics{example-image}
-\includegraphics[scale=2]{a}
+\includegraphics[scale=2]{example-image}
hello\rotatebox[origin=c]{180}{hello}hello
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/plain/graphics-pln/exmplpfg.tex new/doc/plain/graphics-pln/exmplpfg.tex
--- old/doc/plain/graphics-pln/exmplpfg.tex 2009-11-22 19:58:23.000000000 +0100
+++ new/doc/plain/graphics-pln/exmplpfg.tex 2020-03-03 23:03:11.000000000 +0100
@@ -1,4 +1,7 @@
+% using psfrag example eps
+% /usr/local/texlive/2019/texmf-dist/doc/latex/psfrag/example.eps
+
\input psfrag
First without psfrag:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/graphics-pln.doc.tlpobj new/tlpkg/tlpobj/graphics-pln.doc.tlpobj
--- old/tlpkg/tlpobj/graphics-pln.doc.tlpobj 2019-02-28 03:40:40.000000000 +0100
+++ new/tlpkg/tlpobj/graphics-pln.doc.tlpobj 2020-03-04 23:50:58.000000000 +0100
@@ -1,10 +1,10 @@
name graphics-pln.doc
category Package
-revision 46363
+revision 54080
shortdesc doc files of graphics-pln
relocated 1
docfiles size=5
- RELOC/doc/plain/graphics-pln/README.txt
+ RELOC/doc/plain/graphics-pln/README.md
RELOC/doc/plain/graphics-pln/exmplcol.tex
RELOC/doc/plain/graphics-pln/exmplgrf.tex
RELOC/doc/plain/graphics-pln/exmplpfg.tex
++++++ graphics-pln.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/graphics-pln/color.tex new/tex/plain/graphics-pln/color.tex
--- old/tex/plain/graphics-pln/color.tex 2016-08-17 23:35:53.000000000 +0200
+++ new/tex/plain/graphics-pln/color.tex 2020-03-03 23:03:11.000000000 +0100
@@ -3,7 +3,30 @@
\input miniltx
-\def\Gin(a)driver{dvips.def}
+
+
+\ifx\Gin@driver\@undefined
+ \ifx\directlua\@undefined
+ \ifx\pdfoutput\@undefined
+ \def\Gin(a)driver{dvips.def}
+ \else
+ \ifnum\pdfoutput=1
+ \def\Gin(a)driver{pdftex.def}
+ \else
+ \def\Gin(a)driver{dvips.def}
+ \fi
+ \fi
+ \else
+ \def\Gin(a)driver{luatex.def}
+ \fi
+\fi
+
+
+
+\let\@color@protected\protected
+\expandafter\@gobble\csname protected\endcsname
+
\input color.sty
+\let\protected\@color@protected
\resetatcatcode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/graphics-pln/graphicx.tex new/tex/plain/graphics-pln/graphicx.tex
--- old/tex/plain/graphics-pln/graphicx.tex 2017-06-11 23:49:52.000000000 +0200
+++ new/tex/plain/graphics-pln/graphicx.tex 2020-03-03 23:03:11.000000000 +0100
@@ -9,9 +9,28 @@
\let\ttfamily\tt
\fi
-\def\Gin(a)driver{dvips.def}
-\input graphicx.sty
+\ifx\Gin@driver\@undefined
+ \ifx\directlua\@undefined
+ \ifx\pdfoutput\@undefined
+ \def\Gin(a)driver{dvips.def}
+ \else
+ \ifnum\pdfoutput=1
+ \def\Gin(a)driver{pdftex.def}
+ \else
+ \def\Gin(a)driver{dvips.def}
+ \fi
+ \fi
+ \else
+ \def\Gin(a)driver{luatex.def}
+ \fi
+\fi
+\let\GRAPHICS@detokenize\detokenize
+\ifx\detokenize\@undefined
+ \def\detokenize#1{#1}
+\fi
+\input graphicx.sty
+\let\detokenize\GRAPHICS@detokenize
\resetatcatcode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/graphics-pln/miniltx.tex new/tex/plain/graphics-pln/miniltx.tex
--- old/tex/plain/graphics-pln/miniltx.tex 2017-06-11 23:49:52.000000000 +0200
+++ new/tex/plain/graphics-pln/miniltx.tex 2020-03-03 23:03:11.000000000 +0100
@@ -2,7 +2,7 @@
%%%
%%% Parts of LaTeX: Slightly changed/simplified in places.
%%% Changes
-%%% Copyright 1996-2017 David Carlisle LaTeX3 Project
+%%% Copyright 1996-2020 David Carlisle LaTeX3 Project
%%% Original Code
%%% Copyright 1993-1996 LaTeX3 Project and original authors
%%%
@@ -10,7 +10,7 @@
%%% or any other LaTeX related support address.
%%%
%%% Problems should be reported as issues at
-%%% https://github.com/davidcarlisle/dpctex/tree/master/graphics-pln
+%%% https://github.com/davidcarlisle/graphics-pln/issues
%%%
%%%
%%% This file may be distributed under the terms of the LPPL, see
@@ -25,6 +25,8 @@
% 2010/02/03 accept *-form of \ProcessOptions [KB/DL]
% 2016/08/17 fix catcode @ handling (again), document github address [DC]
% 2017/06/01 assorted updates to cover updated latex drivers
+% 2019/07/20 more updates for latex drivers
+% 2020/03/02 move to own git repository and add newcommand fix from issue #2
\edef\resetatcatcode{\catcode`\noexpand\@\the\catcode`\@\relax}
@@ -115,6 +117,8 @@
\ifx#2\@empty\else\expandafter\zap@space\fi
#2}
+\def\strip@prefix#1>{}
+
\let\@empty\empty
\def\@pkgextension{sty}
@@ -243,6 +247,17 @@
{\def\reserved@a{\renew@command\reserved@a}}%
\reserved@a}%
+% Missing \x@protect definition added 2020/03/02
+\def\x@protect#1{%
+ \ifx\protect\@typeset@protect\else
+ \@x@protect#1%
+ \fi
+}
+\def\@x@protect#1\fi#2#3{%
+ \fi\protect#1%
+}
+\let\@typeset@protect\relax
+
\def\@ifundefined#1{%
\expandafter\ifx\csname#1\endcsname\relax
\expandafter\@firstoftwo
@@ -509,3 +524,13 @@
% 1996/11/21
\def\@warning{\immediate\write16}
+
+% 2019/07/20
+\def\quote@name#1{"\quote@@name#1\@gobble""}
+\def\quote@@name#1"{#1\quote@@name}
+\def\unquote@name#1{\quote@@name#1\@gobble"}
+
+\ifx\set@curr@file\@undefined
+ \def\set@curr@file#1{\xdef\@curr@file{#1}}
+\fi
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/graphics-pln.tlpobj new/tlpkg/tlpobj/graphics-pln.tlpobj
--- old/tlpkg/tlpobj/graphics-pln.tlpobj 2019-02-28 03:40:40.000000000 +0100
+++ new/tlpkg/tlpobj/graphics-pln.tlpobj 2020-03-04 23:50:58.000000000 +0100
@@ -1,6 +1,6 @@
name graphics-pln
category Package
-revision 46363
+revision 54080
shortdesc LaTeX-style graphics for Plain TeX users
relocated 1
longdesc The Plain TeX graphics package is mostly a thin shell around
@@ -16,10 +16,9 @@
RELOC/tex/plain/graphics-pln/miniltx.tex
RELOC/tex/plain/graphics-pln/picture.tex
RELOC/tex/plain/graphics-pln/psfrag.tex
-catalogue-contact-bugs https://github.com/davidcarlisle/dpctex/issues
-catalogue-contact-home https://github.com/davidcarlisle/dpctex/
-catalogue-contact-repository https://github.com/davidcarlisle/dpctex/tree/master/graphics-pln
+catalogue-contact-bugs https://github.com/davidcarlisle/graphics-pln/issues
+catalogue-contact-home https://github.com/davidcarlisle/graphics-pln
+catalogue-contact-repository https://github.com/davidcarlisle/graphics-pln
catalogue-ctan /macros/plain/graphics
-catalogue-date 2018-01-17 16:05:35 +0100
catalogue-license lppl1
catalogue-topics graphics-incl plain-ext
++++++ graphics.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/graphics/README.md new/doc/latex/graphics/README.md
--- old/doc/latex/graphics/README.md 2018-04-07 22:53:05.000000000 +0200
+++ new/doc/latex/graphics/README.md 2020-02-02 23:42:01.000000000 +0100
@@ -1,118 +1,40 @@
-## README for the Standard LaTeX `Graphics` bundle
+The LaTeX `graphics` bundle
+===========================
-This bundle consists of LaTeX2e packages written and supported by
-members of the LaTeX3 Project Team.
+Release 2020-02-02
-It is a collection of LaTeX packages for:
-- producing colour
-- including graphics (eg PostScript) files
-- rotation and scaling of text
-in LaTeX documents.
+Overview
+--------
+This bundle consists of packages supporting basic color, graphics and text
+manipulation operations in LaTeX. The packages provided here are
+- `color`: Core color support
+- `graphics`: The original LaTeX graphics inclusion interface
+- `graphicx`: Extended interface for graphics inclusion
+- `lscape`: Production of landscape pages
+- `keyval`: Core key-value support for LaTeX
+- `rotating`: Support for rotating material
+- `trig`: Support for fast trigonometric calculations in TeX
-### THIS DIRECTORY CONTAINS
+plus the legacy stub `epsfig` (now subsumed into `graphics`).
-#### Support files
+Installation
+------------
-| File | Notes |
-| --- | --- |
-| README.md | This file |
-| changes.txt | Log of changes to the packages |
-| graphics.ins | Install file for docstrip |
+We no longer distribute installation instructions for the various TeX
+implementations. All modern TeX systems include `graphics` as-standard, and end
+users should in general use the release versions supplied in this way.
-#### Basic packages
+Release distribution is carried out only through the CTAN archives.
-| File | Notes |
-| --- | --- |
-| color.dtx | Source for color package |
-| graphics.dtx | Source for graphics package |
-| trig.dtx | Source for trig package (required by graphics) |
-
-#### Extension Packages
-
-| File | Notes |
-| --- | --- |
-| graphicx.dtx | Source for graphicx package (extension of graphics) |
-| epsfig.dtx | Source for epsfig package (extension of graphicx). |
-| rotating.dtx | Source for rotating package (extension of graphicx). |
-| keyval.dtx | Source for keyval pacakge (required by both the above) |
-| lscape.sty | Produce landscape pages in a (mainly) portrait document |
-
-#### Driver Files
-
-| File | Notes |
-| --- | --- |
-| drivers.dtx | Source for driver files for supported drivers |
-
-#### User Documentation
-
-| File | Notes |
-| --- | --- |
-| grfguide.tex | User Guide to all the packages in this bundle |
-| | **WARNING:** *This file calls color and graphics packages without a driver option. You **must** therefore set up two files `color.cfg` and `graphics.cfg` containing (for example) `\ExecuteOptions{dvips}` before running this file.* |
-| rotex.tex | Examples of use of rotating package |
-
-
-
-### TO UNPACK THE PACKAGES
-
- latex graphics.ins
-
-This will produce the `.sty` package files.
-
-Similarly you can run
-
- latex graphics-drivers.ins
-
-to produce the `.def` driver files.
-
-Not all supported drivers are included in this file as they are
-maintained elsewhere.
-
-
-### USING THE PACKAGES
-
-Move files ending in `.sty` or `.def` to a standard TeX input directory.
-
-Make a default option for your site by creating two files `color.cfg` and `graphics.cfg`
-containing (if dvips is your default driver)
- \ExecuteOptions{dvips}
-
-You may then LaTeX the user guide by running:
-
- latex grfguide.tex
-
-
-
-### Copyright
-
-Copyright is maintained on each of these packages by the author(s)
-of the package.
-
-
-### Distribution Conditions
-
-All the files in this bundle may be distributed 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
- https://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.
-
-The list of all files belonging to this bundle is listed above.
-
-The use of these files is otherwise unrestricted.
-
-
-### Reporting Bugs
-
-If you wish to report a problem or bug in any of these packages
-please use the
-[Issue Tracker for LaTeX2e on GitHub](https://github.com/latex3/latex2e/issues)
-and follow the guidelines that pop up if you press the `New issue` button.
+Reporting Bugs
+--------------
+If you wish to report a problem or bug in the `graphics` bundle
+please use the [Issue Tracker for LaTeX2e on
+GitHub](https://github.com/latex3/latex2e/issues)
+and follow the guidelines that pop up if you press the "New issue" button.
In particular, to check that you are really seeing a bug, please write
a short, self-contained document that shows the problem. This should
@@ -124,9 +46,19 @@
If the bug turns out to be with third-party software then please
contact the developer, and not us!
+License
+-------
+The contents of this bundle are distributed under the [LaTeX Project
+Public License](https://www.latex-project.org/lppl/lppl-1-3c/),
+version 1.3c or later.
-### Copyright
+Copyright
+---------
+
+Copyright is maintained on each of these packages by the author(s)
+of the package.
-This README file is copyright 1993-2017 The LaTeX3 Project.
+-----
+<p>Copyright (C) 1993-2020 The LaTeX Project <br />
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/graphics/changes.txt new/doc/latex/graphics/changes.txt
--- old/doc/latex/graphics/changes.txt 2018-04-07 22:53:05.000000000 +0200
+++ new/doc/latex/graphics/changes.txt 2020-02-02 23:42:01.000000000 +0100
@@ -3,6 +3,46 @@
completeness or accuracy and it contains some references to files that
are not part of the distribution.
=======================================================================
+
+#########################
+# 2020-02-02 Release
+#########################
+
+2019-11-30 David Carlisle <David.Carlisle(a)latex-project.org>
+
+ * graphics.dtx: proteced definitions gh/208
+ * graphicx.dtx: proteced definitions gh/208
+
+2019-11-23 David Carlisle <David.Carlisle(a)latex-project.org>
+
+ * color.dtx: Made commands robust gh/208
+
+
+#########################
+# 2019-10-01 PL 2 Release
+#########################
+
+2019-11-03 David Carlisle <David.Carlisle(a)latex-project.org>
+
+ * graphics.dtx: add additional trial with known
+ extensions if supplied filename has a . but the file is not found
+ (gh/204)
+
+2019-10-08 David Carlisle <David.Carlisle(a)latex-project.org>
+
+ * graphics.dtx: fallback definitions of \set@curr@file etc added
+
+#########################
+# 2019-10-01 Release
+#########################
+
+2019-07-01 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * graphics.dtx (subsection{Graphics Inclusion}):
+ Support UTF-8 and space in graphic files.
+
+#########################
+
2017-06-25 Joseph Wright <latex-bugs(a)latex-project.org>
* New decodearray key, adopted from older pdftex.def
@@ -51,7 +91,7 @@
2016-06-17 David Carlisle <latex-bugs(a)latex-project.org>
* drivers.dtx: guards for contributed packages and plain TeX.
-
+
2016-06-02 David Carlisle <latex-bugs(a)latex-project.org>
* graphics.dtx, color.dtx, drivers.dtx: add pagesize special support to dvips
@@ -934,12 +974,11 @@
1994-03-09 David Carlisle <latex-bugs(a)latex-project.org>
* \reflectbox added.
-
+
* \rotatebox* removed
-
+
* The order of the arguments of \includegraphics corrected
-
+
* \includegraphics[lower-l,lower-r][upper-l,upper-r]{file}
-
+
* \definecolor not \newcolor to define colours
-
Binary files old/doc/latex/graphics/color.pdf and new/doc/latex/graphics/color.pdf differ
Binary files old/doc/latex/graphics/drivers.pdf and new/doc/latex/graphics/drivers.pdf differ
Binary files old/doc/latex/graphics/epsfig.pdf and new/doc/latex/graphics/epsfig.pdf differ
Binary files old/doc/latex/graphics/graphics.pdf and new/doc/latex/graphics/graphics.pdf differ
Binary files old/doc/latex/graphics/graphicx.pdf and new/doc/latex/graphics/graphicx.pdf differ
Binary files old/doc/latex/graphics/grfguide.pdf and new/doc/latex/graphics/grfguide.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/graphics/grfguide.tex new/doc/latex/graphics/grfguide.tex
--- old/doc/latex/graphics/grfguide.tex 2017-06-26 23:22:32.000000000 +0200
+++ new/doc/latex/graphics/grfguide.tex 2020-02-02 23:42:01.000000000 +0100
@@ -1,5 +1,5 @@
%% grfguide.tex Copyright (C) 1994 1995 1996 1998 1999 David Carlisle
-%% Copyright (C) 2005 2014 2016 2017 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2005-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
@@ -261,7 +261,7 @@
\begin{quote}\raggedright
|dviwindo|
\end{quote}
-
+
\section[Colour]{Colour\footnote{%
The basic \package{color} package functionality described here
@@ -294,7 +294,7 @@
\textbf{x11} (Colour names from the X Window System), etc. The
standard distribution does not currently have such models, but the
\textbf{named} model could be used as an example of how to define a new
-colour model. The names used in the \textbf{named} model are those
+colour model. The names used in the \textbf{named} model are those
suggested by Jim Hafner in his \textsf{colordvi} and \textsf{foiltex}
packages, and implemented originally in the |color.pro| header file for
the \texttt{dvips} driver.
@@ -303,7 +303,7 @@
Most of the options to the \package{color} package just specify a
driver, e.g., \ |dvips|, as discussed in section~\ref{drivers}.
-One special option for the \package{color} package
+One special option for the \package{color} package
that is of interest is |monochrome.|
If this option is selected the colour commands are all
disabled so that they do not generate errors, but do not generate colour
@@ -404,7 +404,7 @@
\subsection{Named Colours}
Using the \textbf{named} colour model has certain advantages over
-using other colour models.
+using other colour models.
Firstly as the |dvi| file contains a request
for a colour by \emph{name}, the actual mix of primary colours used to
@@ -493,7 +493,7 @@
\begin{description}
\item[\package{graphics}] The `standard' graphics package.
\item[\package{graphicx}] The `extended' or `enhanced' graphics
- package.
+ package.
\end{description}
The two differ only in the format of optional arguments for the
commands defined. The command names, and the mandatory arguments are
@@ -594,15 +594,15 @@
If |!| is used as either length argument, the other argument is used
to determine a scale factor that is used in both directions.
Normally \emph{v-length} refers to the height of the box, but in the
- star form, it refers to the `height + depth'.
+ star form, it refers to the `height + depth'.
As normal for \LaTeXe\ box length arguments, |\height|,
|\width|, |\totalheight|, |\depth| may be used to refer to the
original size of the box.
-|\resizebox{1in}{\height}{Some text}|:
+|\resizebox{1in}{\height}{Some text}|:
\resizebox{1in}{\height}{Some text}
-|\resizebox{1in}{!}{Some text}|:
+|\resizebox{1in}{!}{Some text}|:
\resizebox{1in}{!}{Some text}
\subsection{Including Graphics Files}
@@ -656,7 +656,7 @@
compatibility with older packages.
Specifying |bbllx=a,bblly=b,bburx=c,bbury=d|
is equivalent to specifying |bb = a b c d|.
-\item[natwidth,natheight] Again an alternative to |bb|.
+\item[natwidth,natheight] Again an alternative to |bb|.
|natheight=h,natwidth=w| is equivalent to |bb = 0 0 h w|.
\item[hiresbb]\NEWfeature{1996/10/29}
Boolean valued key. If set to |true| (just specifying |hiresbb|
@@ -705,7 +705,7 @@
\item[totalheight]\NEWfeature{1995/06/01}
Specify the total height (height $+$ depth) of the figure.
This will differ from the `height' if rotation has occurred.
- In particular if the figure has been rotated by $-90^\circ$
+ In particular if the figure has been rotated by $-90^\circ$
then it will have zero height but large depth.
\item[keepaspectratio]\NEWfeature{1995/09/27}
Boolean valued key like `clip'.
@@ -721,7 +721,7 @@
\item[ext] Specify the file extension. This should \emph{only} be
used in conjunction with |type|.
\item[read] Specify the file extension of the `read file'. This
- should \emph{only} be used in conjunction with |type|.
+ should \emph{only} be used in conjunction with |type|.
\item[command] Specify any command to be applied to the file. This
should \emph{only} be used in conjunction with |type|.
\item[quiet]\NEWfeature{2017/06/01}
@@ -756,16 +756,16 @@
|\rotatebox| or |\scalebox| command.
The keys are read left-to-right, so |[angle=90, height=1in]| means
-rotate by 90 degrees, and then scale to a height of 1in.
+rotate by 90 degrees, and then scale to a height of 1in.
|[height=1in, angle=90]| would result in a final \emph{width} of 1in.
-If the \textsf{calc} package is also loaded the lengths may use
-\textsf{calc} syntax, for instance to specify a width of 2\,cm
+If the \textsf{calc} package is also loaded the lengths may use
+\textsf{calc} syntax, for instance to specify a width of 2\,cm
less than the text width: |[width=\textwidth-2cm]|.
\TeX\ leaves the space specified either in the file, or in
the optional arguments. If any part of the image is actually outside
-this area, it will by default overprint the surrounding text.
+this area, it will by default overprint the surrounding text.
If the star form is used, or |clip| specified, any part of the image
outside this area will not be printed.
@@ -858,9 +858,9 @@
system behaves when a file with extension \emph{ext} is specified.
(The extension may be specified explicitly or, if the argument to
|\includegraphics| does not have an extension, it may be a default
- extension from the \emph{ext-list} specified with
+ extension from the \emph{ext-list} specified with
|\DeclareGraphicsExtensions|.)
-
+
\emph{ext} the file extension for which this rule applies. As a special
case, \emph{ext} may be given as |*| to denote the default behaviour for
all undeclared extensions (see the example below).
@@ -878,7 +878,7 @@
|{}|, then the system will not try to locate an external file for size
info, and the size must be specified in the arguments of
|\includegraphics|. If the driver file specifies a procedure for
-reading size files for \emph{type}, that will be used, otherwise the
+reading size files for \emph{type}, that will be used, otherwise the
procedure for reading |eps| files will be used. Thus the size of
bitmap files may be specified in a file with a PostScript style
|%%BoundingBox| line, if no other specific format is available.
@@ -914,7 +914,7 @@
which incantation causes the |kpsewhich| program to find the
file, by searching along \LaTeX's path, and then pass the full path
name to the |zcat| program so that it can uncompress the file.
-Any such uses are very system dependent, and would best be placed in
+Any such uses are very system dependent, and would best be placed in
a |graphics.cfg| file, thus keeping the document itself portable.
\subsection{Global setting of keys}
@@ -953,13 +953,13 @@
As the author of the class you may want to give the users the
possibility of using either interface in their letters (should they
-need to include any further graphics into the letter body).
+need to include any further graphics into the letter body).
In this case the class should load the \package{graphics} package (not
\package{graphicx}, as this would commit any users of the class to the
\package{keyval} interface). The logo should be included with
|\includegraphics| either with \emph{no} optional argument (if the
correct size information is in the file) or \emph{both} optional
-arguments otherwise.
+arguments otherwise.
Do not use the \emph{one} optional argument form, as the meaning of this
argument would change (and generate errors) if the user were to load
\package{graphicx} as well as your class.
Binary files old/doc/latex/graphics/keyval.pdf and new/doc/latex/graphics/keyval.pdf differ
Binary files old/doc/latex/graphics/lscape.pdf and new/doc/latex/graphics/lscape.pdf differ
Binary files old/doc/latex/graphics/rotating.pdf and new/doc/latex/graphics/rotating.pdf differ
Binary files old/doc/latex/graphics/rotex.pdf and new/doc/latex/graphics/rotex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/graphics/rotex.tex new/doc/latex/graphics/rotex.tex
--- old/doc/latex/graphics/rotex.tex 2017-06-26 23:22:32.000000000 +0200
+++ new/doc/latex/graphics/rotex.tex 2020-02-02 23:42:01.000000000 +0100
@@ -75,7 +75,7 @@
`rlap' to ensure that all the texts are printed at the same point.
Just to show that \TeX\ can handle PostScript muckings-about
properly\ldots
-\begin{example}
+\begin{example}
\newcount\wang
\newsavebox{\wangtext}
\newdimen\wangspace
@@ -100,7 +100,7 @@
\end{turn} end here
\end{example}
The environment `Sideways' is a special case, setting the rotation to $-90$,
-and leaving the correct space for the rotated box.
+and leaving the correct space for the rotated box.
\begin{example}
Start here
\begin{sideways}%
@@ -120,18 +120,18 @@
you have to adjust the box in the normal \LaTeX\ way:
\begin{example}
\newsavebox{\foo}
-\savebox{\foo}{\parbox{1in}{Save
-the whales Save the whale
-Save the whale
+\savebox{\foo}{\parbox{1in}{Save
+the whales Save the whale
+Save the whale
Save the whale}}%
Start
\begin{turn}{45}\usebox{\foo}\end{turn}
End
\end{example}
\begin{example}
-\savebox{\foo}{\parbox[b]{1in}{Save
-the whales Save the whale
-Save the whale
+\savebox{\foo}{\parbox[b]{1in}{Save
+the whales Save the whale
+Save the whale
Save the whale}}%
Start
\begin{turn}{45}\usebox{\foo}\end{turn}
@@ -139,7 +139,7 @@
\end{example}
\def\testrot#1{%
-\savebox{\foo}{\parbox{1in}{Save
+\savebox{\foo}{\parbox{1in}{Save
the whales Save the whale Save the whale Save the whale}}%
\framebox{---\begin{turn}{#1}\framebox{\usebox{\foo}}\end{turn}---}}%
@@ -272,9 +272,9 @@
PostScript files which are being incorporated using can be
rotated at will, while Figure \ref{fig2} shows, in contrast, how
`includegraphics' itself handles rotation. It is also possible to rotate the
-whole of the figure environment, including caption,
+whole of the figure environment, including caption,
by using the `sidewaysfigure' ands `sidewaystable' environments
-in place of `figure' and `table'.
+in place of `figure' and `table'.
Sideways figures and tables always take up the whole page. They can be
rotated so that the bottom ot the figures is on the left or the right;
@@ -315,7 +315,7 @@
\begin{tabular}{|llllllllp{1in}lp{1in}|}
\hline
Context &Length &Breadth/ &Depth &Profile &Pottery &Flint &Animal &Stone &Other &C14 Dates \\
- & &Diameter & & & & &
+ & &Diameter & & & & &
Bones&&&\\
\hline
&&&&&&&&&&\\
@@ -331,7 +331,7 @@
794 &2.89m &0.75m &0.25m &Irreg. &P16 &$\times$3 & --- & --- &--- &---\\
\hline
\end{tabular}
-
+
\caption[Grooved Ware and Beaker Features, their Finds and
Radiocarbon Dates]{Grooved Ware and Beaker Features, their
Finds and Radiocarbon Dates; For a breakdown of the Pottery
@@ -425,7 +425,7 @@
\begin{tabular}{|llllllllp{1in}lp{1in}|}
\hline
Context &Length &Breadth/ &Depth &Profile &Pottery &Flint &Animal &Stone &Other &C14 Dates \\
- & &Diameter & & & & &
+ & &Diameter & & & & &
Bones&&&\\
\hline
&&&&&&&&&&\\
@@ -441,7 +441,7 @@
794 &2.89m &0.75m &0.25m &Irreg. &P16 &$\times$3 & --- & --- &--- &---\\
\hline
\end{tabular}
-
+
\caption[Grooved Ware and Beaker Features, their Finds and
Radiocarbon Dates]{Grooved Ware and Beaker Features, their
Finds and Radiocarbon Dates; For a breakdown of the Pottery
Binary files old/doc/latex/graphics/trig.pdf and new/doc/latex/graphics/trig.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/graphics.doc.tlpobj new/tlpkg/tlpobj/graphics.doc.tlpobj
--- old/tlpkg/tlpobj/graphics.doc.tlpobj 2019-02-28 03:40:39.000000000 +0100
+++ new/tlpkg/tlpobj/graphics.doc.tlpobj 2020-02-03 01:54:44.000000000 +0100
@@ -1,9 +1,9 @@
name graphics.doc
category Package
-revision 47350
+revision 53640
shortdesc doc files of graphics
relocated 1
-docfiles size=622
+docfiles size=626
RELOC/doc/latex/graphics/README.md
RELOC/doc/latex/graphics/cat.eps
RELOC/doc/latex/graphics/changes.txt
++++++ graphics.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/color.sty new/tex/latex/graphics/color.sty
--- old/tex/latex/graphics/color.sty 2018-04-07 22:53:05.000000000 +0200
+++ new/tex/latex/graphics/color.sty 2020-02-02 23:42:01.000000000 +0100
@@ -12,7 +12,7 @@
%%
%%
%% color.dtx Copyright (C) 1994--1999 David Carlisle
-%% Copyright (C) 2005--2016 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2005-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{color}
- [2016/07/10 v1.1e Standard LaTeX Color (DPC)]
+ [2019/11/23 v1.2a Standard LaTeX Color (DPC)]
\edef\Gin@codes{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax
\catcode`\noexpand\"\the\catcode`\"\relax
@@ -98,28 +98,28 @@
\csname\string\color @#1\endcsname
\set@color}%
\ignorespaces}
-\def\textcolor#1#{\@textcolor{#1}}
+\protected\def\textcolor#1#{\@textcolor{#1}}
\def\@textcolor#1#2#3{\protect\leavevmode{\color#1{#2}#3}}
-\def\pagecolor{%
+\protected\def\pagecolor{%
\begingroup
\let\ignorespaces\endgroup
\let\set@color\set@page@color
\color}
-\def\nopagecolor{%
+\protected\def\nopagecolor{%
\@ifundefined{no@page@color}{%
\PackageInfo{color}{\string\nopagecolor\space is not supported}%
}{%
\no@page@color
}%
}
-\def\definecolor#1#2#3{%
+\protected\def\definecolor#1#2#3{%
\@ifundefined{color@#2}%
{\c@lor@error{model `#2'}}%
{\@ifundefined{\string\color @#1}{}%
{\PackageInfo{color}{Redefining color #1}}%
\csname color@#2\expandafter\endcsname
\csname\string\color @#1\endcsname{#3}}}
-\def\DefineNamedColor#1#2#3#4{%
+\protected\def\DefineNamedColor#1#2#3#4{%
\@ifundefined{define@color@#1}%
{\c@lor@error{model `#1'}}%
{\@ifundefined{color@#3}%
@@ -148,13 +148,13 @@
\@ifundefined{ver@\Gin@driver}{\input{\Gin@driver}}{}
\fi
\@ifundefined{c@lor@namefile}{}{\input{\c@lor@namefile}}
-\def\normalcolor{\let\current@color\default@color\set@color}
+\protected\def\normalcolor{\let\current@color\default@color\set@color}
\AtBeginDocument{\let\default@color\current@color}
\def\color@block#1#2#3{%
{\set@color\rlap{\ifcolors@\vrule\@width#1\@height#2\@depth#3\fi}}}
-\def\colorbox#1#{\color@box{#1}}
+\protected\def\colorbox#1#{\color@box{#1}}
\def\color@box#1#2{\color@b@x\relax{\color#1{#2}}}
-\def\fcolorbox#1#{\color@fbox{#1}}
+\protected\def\fcolorbox#1#{\color@fbox{#1}}
\def\color@fbox#1#2#3{%
\color@b@x{\fboxsep\z@\color#1{#2}\fbox}{\color#1{#3}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/dvipdf.def new/tex/latex/graphics/dvipdf.def
--- old/tex/latex/graphics/dvipdf.def 2016-06-17 12:20:33.000000000 +0200
+++ new/tex/latex/graphics/dvipdf.def 2020-02-02 23:42:01.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/dvipsnam.def new/tex/latex/graphics/dvipsnam.def
--- old/tex/latex/graphics/dvipsnam.def 2016-06-17 12:20:33.000000000 +0200
+++ new/tex/latex/graphics/dvipsnam.def 2020-02-02 23:42:01.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/dvipsone.def new/tex/latex/graphics/dvipsone.def
--- old/tex/latex/graphics/dvipsone.def 2016-06-17 12:20:33.000000000 +0200
+++ new/tex/latex/graphics/dvipsone.def 2020-02-02 23:42:01.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/dviwin.def new/tex/latex/graphics/dviwin.def
--- old/tex/latex/graphics/dviwin.def 2016-06-17 12:20:33.000000000 +0200
+++ new/tex/latex/graphics/dviwin.def 2020-02-02 23:42:01.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/emtex.def new/tex/latex/graphics/emtex.def
--- old/tex/latex/graphics/emtex.def 2016-06-17 12:20:33.000000000 +0200
+++ new/tex/latex/graphics/emtex.def 2020-02-02 23:42:01.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/epsfig.sty new/tex/latex/graphics/epsfig.sty
--- old/tex/latex/graphics/epsfig.sty 2018-04-07 22:53:05.000000000 +0200
+++ new/tex/latex/graphics/epsfig.sty 2020-02-02 23:42:01.000000000 +0100
@@ -12,7 +12,7 @@
%%
%%
%% epsfig.dtx Copyright (C) 1994-1996 1999 Sebastian Rahtz
-%% Copyright (C) 2000--2015,2017 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/graphics-2017-06-25.sty new/tex/latex/graphics/graphics-2017-06-25.sty
--- old/tex/latex/graphics/graphics-2017-06-25.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/graphics/graphics-2017-06-25.sty 2020-02-02 23:42:01.000000000 +0100
@@ -0,0 +1,526 @@
+%%
+%% This is file `graphics.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% graphics.dtx (with options: `package')
+%%
+%% The source is maintained by the LaTeX Project team and bug
+%% reports for it can be opened at https://latex-project.org/bugs/
+%% (but please observe conditions on bug reports sent to that address!)
+%%
+%%
+%% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
+%% Copyright (C) 1995--2017 David Carlisle, LaTeX3 Project
+%%
+%% This file is part of the Standard LaTeX `Graphics Bundle'.
+%% It may be distributed under the terms of the LaTeX Project Public
+%% License, as described in lppl.txt in the base LaTeX distribution.
+%% Either version 1.3c or, at your option, any later version.
+%%
+%% This file has the LPPL maintenance status "maintained".
+%%
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesPackage{graphics}
+ [2017/06/25 v1.2c Standard LaTeX Graphics (DPC,SPQR)]
+\edef\Gin@codes{%
+ \catcode`\noexpand\^^A\the\catcode`\^^A\relax
+ \catcode`\noexpand\"\the\catcode`\"\relax
+ \catcode`\noexpand\*\the\catcode`\*\relax
+ \catcode`\noexpand\!\the\catcode`\!\relax
+ \catcode`\noexpand\:\the\catcode`\:\relax}
+\catcode`\^^A=\catcode`\%
+\@makeother\"%
+\catcode`\*=11
+\@makeother\!%
+\@makeother\:%
+\RequirePackage{trig}
+\providecommand\Grot@start{\@latex@error{Rotation not supported}\@ehc
+ \global\let\Grot@start\relax}
+\providecommand\Grot@end{}
+\providecommand\Gscale@start{\@latex@error{Scaling not supported}\@ehc
+ \global\let\Gscale@start\relax}
+\providecommand\Gscale@end{}
+\edef\Gread@BBox{\@percentchar\@percentchar BoundingBox}
+\DeclareOption{draft}{\Gin@drafttrue}
+\DeclareOption{final}{\Gin@draftfalse}
+\newif\ifGin@draft
+\DeclareOption{hiresbb}{%
+ \edef\Gread@BBox{\@percentchar\@percentchar HiResBoundingBox}}
+\DeclareOption{demo}{%
+ \AtBeginDocument{%
+ \def\Ginclude@graphics#1{%
+ \rule{\@ifundefined{Gin@@ewidth}{150pt}{\Gin@@ewidth}}%
+ {\@ifundefined{Gin@@eheight}{100pt}{\Gin@@eheight}}}}}
+\newif\ifGin@setpagesize\Gin@setpagesizetrue
+\DeclareOption{setpagesize}{\Gin@setpagesizetrue}
+\DeclareOption{nosetpagesize}{\Gin@setpagesizefalse}
+\providecommand\Gin@driver{}
+\DeclareOption{dvips}{\def\Gin(a)driver{dvips.def}}
+\DeclareOption{xdvi}{\ExecuteOptions{dvips}}
+\DeclareOption{dvipdf}{\def\Gin(a)driver{dvipdf.def}}
+\DeclareOption{dvipdfm}{\def\Gin(a)driver{dvipdfmx.def}}
+\DeclareOption{dvipdfmx}{\def\Gin(a)driver{dvipdfmx.def}}
+\DeclareOption{xetex}{\def\Gin(a)driver{xetex.def}}
+\DeclareOption{pdftex}{\def\Gin(a)driver{pdftex.def}}
+\DeclareOption{luatex}{\def\Gin(a)driver{luatex.def}}
+\DeclareOption{dvisvgm}{\def\Gin(a)driver{dvisvgm.def}}
+\DeclareOption{dvipsone}{\def\Gin(a)driver{dvipsone.def}}
+\DeclareOption{dviwindo}{\ExecuteOptions{dvipsone}}
+\DeclareOption{emtex}{\def\Gin(a)driver{emtex.def}}
+\DeclareOption{dviwin}{\def\Gin(a)driver{dviwin.def}}
+\DeclareOption{oztex}{\ExecuteOptions{dvips}}
+\DeclareOption{textures}{\def\Gin(a)driver{textures.def}}
+\DeclareOption{pctexps}{\def\Gin(a)driver{pctexps.def}}
+\DeclareOption{pctexwin}{\def\Gin(a)driver{pctexwin.def}}
+\DeclareOption{pctexhp}{\def\Gin(a)driver{pctexhp.def}}
+\DeclareOption{pctex32}{\def\Gin(a)driver{pctex32.def}}
+\DeclareOption{truetex}{\def\Gin(a)driver{truetex.def}}
+\DeclareOption{tcidvi}{\def\Gin(a)driver{tcidvi.def}}
+\DeclareOption{vtex}{\def\Gin(a)driver{vtex.def}}
+\DeclareOption{debugshow}{\catcode`\^^A=9 \let\GDebug\typeout}
+\InputIfFileExists{graphics.cfg}{}{}
+\DeclareOption{hiderotate}{%
+ \def\Grot@start{\begingroup\setbox\z@\hbox\bgroup}
+ \def\Grot@end{\egroup\endgroup}}
+\DeclareOption{hidescale}{%
+ \def\Gscale@start{\begingroup\setbox\z@\hbox\bgroup}
+ \def\Gscale@end{\egroup\endgroup}}
+\ProcessOptions
+\if!\Gin@driver!
+ \PackageError{graphics}
+ {No driver specified}
+ {You should make a default driver option in a file \MessageBreak
+ graphics.cfg\MessageBreak
+ eg: \protect\ExecuteOptions{textures}%
+ }
+\else
+ \PackageInfo{graphics}{Driver file: \Gin@driver}
+ \@ifundefined{ver@\Gin@driver}{\input{\Gin@driver}}{}
+\fi
+\def\Gin@llx{0}
+\let\Gin@lly\Gin@llx
+\let\Gin@urx\Gin@llx
+\let\Gin@ury\Gin@llx
+\let\Gin@nat@width\leftmarginv
+\let\Gin@nat@height\leftmarginvi
+\newif\ifGin@clip
+\newcommand\DeclareGraphicsExtensions[1]{%
+ \edef\Gin@extensions{\zap@space#1 \@empty}}
+\providecommand\Gin@extensions{}
+\def\includegraphics{%
+ \leavevmode
+ \@ifstar
+ {\Gin@cliptrue\Gin@i}%
+ {\Gin@clipfalse\Gin@i}}
+\def\Gin@i{%
+ \@ifnextchar[%]
+ \Gin@ii
+ {\Gin@bboxfalse\Ginclude@graphics}}
+\def\Gin@ii[#1]{%
+ \@ifnextchar[%]
+ {\Gin@iii[#1]}
+ {\Gin@iii[0,0][#1]}}
+\def\Gin@iii[#1,#2][#3,#4]#5{%
+ \begingroup
+ \Gin@bboxtrue
+ \Gin@defaultbp\Gin@llx{#1}%
+ \Gin@defaultbp\Gin@lly{#2}%
+ \Gin@defaultbp\Gin@urx{#3}%
+ \Gin@defaultbp\Gin@ury{#4}%
+ \Ginclude@graphics{#5}%
+ \endgroup}
+\def\Gin@defaultbp#1#2{%
+ \afterassignment\Gin@def@bp\dimen@#2bp\relax{#1}{#2}}
+\def\Gin@def@bp#1\relax#2#3{%
+ \if!#1!%
+ \def#2{#3}%
+ \else
+ \dimen@.99626\dimen@
+ \edef#2{\strip@pt\dimen@}%
+ \fi}
+\def\DeclareGraphicsRule#1#2#3#4{%
+ \edef\@tempa{\string *}\def\@tempb{#3}%
+ \expandafter\edef\csname Gin@rule@#1\endcsname##1%
+ {{#2}%
+ {\ifx\@tempa\@tempb\noexpand\Gin@ext\else#3\fi}%
+ {\ifx\indent#4\indent##1\else#4\fi}}}
+\def\graphicspath#1{\def\Ginput@path{#1}}
+\ifx\Ginput@path\@undefined
+ \let\Ginput@path\input@path
+\fi
+\def\Gin@getbase#1{%
+ \edef\Gin@tempa{%
+ \def\noexpand\@tempa####1#1\space{%
+ \def\noexpand\Gin@base{####1}}}%
+ \IfFileExists{\filename@area\filename@base#1}%
+ {\Gin@tempa
+ \expandafter\@tempa\@filef@und
+ \edef\Gin@ext{#1}}{}}%
+\let\Gin@ext\relax
+\def\Gin(a)sepdefault{.}
+\def\Ginclude@graphics#1{%
+ \begingroup
+ \let\input@path\Ginput@path
+ \filename@parse{#1}%
+ \ifx\filename@ext\relax
+ \@for\Gin@temp:=\Gin@extensions\do{%
+ \ifx\Gin@ext\relax
+ \Gin@getbase\Gin@temp
+ \fi}%
+ \else
+ \Gin@getbase{\Gin@sepdefault\filename@ext}%
+ \ifx\Gin@ext\relax
+ \@warning{File `#1' not found}%
+ \def\Gin@base{\filename@area\filename@base}%
+ \edef\Gin@ext{\Gin@sepdefault\filename@ext}%
+ \fi
+ \fi
+ \ifx\Gin@ext\relax
+ \@latex@error{File `#1' not found}%
+ {I could not locate the file with any of these extensions:^^J%
+ \Gin@extensions^^J\@ehc}%
+ \else
+ \@ifundefined{Gin@rule@\Gin@ext}%
+ {\ifx\Gin@rule@*\@undefined
+ \@latex@error{Unknown graphics extension: \Gin@ext}\@ehc
+ \else
+ \expandafter\Gin@setfile\Gin@rule@*{\Gin@base\Gin@ext}%
+ \fi}%
+ {\expandafter\expandafter\expandafter\Gin@setfile
+ \csname Gin@rule@\Gin@ext\endcsname{\Gin@base\Gin@ext}}%
+ \fi
+ \endgroup}
+\newif\ifGread@\Gread@true
+\def\Gin@setfile#1#2#3{%
+ \ifx\\#2\\\Gread@false\fi
+ \ifGin@bbox\else
+ \ifGread@
+ \csname Gread@%
+ \expandafter\ifx\csname Gread@#1\endcsname\relax
+ eps%
+ \else
+ #1%
+ \fi
+ \endcsname{\Gin@base#2}%
+ \else
+ \Gin@nosize{#3}%
+ \fi
+ \fi
+ \Gin@viewport@code
+ \Gin@nat@height\Gin@ury bp%
+ \advance\Gin@nat@height-\Gin@lly bp%
+ \Gin@nat@width\Gin@urx bp%
+ \advance\Gin@nat@width-\Gin@llx bp%
+ \Gin@req@sizes
+ \expandafter\ifx\csname Ginclude@#1\endcsname\relax
+ \Gin@drafttrue
+ \expandafter\ifx\csname Gread@#1\endcsname\relax
+ \@latex@error{Can not include graphics of type: #1}\@ehc
+ \global\expandafter\let\csname Gread@#1\endcsname\@empty
+ \fi
+ \fi
+ \leavevmode
+ \ifGin@draft
+ \hb@xt@\Gin@req@width{%
+ \vrule\hss
+ \vbox to \Gin@req@height{%
+ \hrule \@width \Gin@req@width
+ \vss
+ \edef\@tempa{#3}%
+ \rlap{ \ttfamily\expandafter\strip@prefix\meaning\@tempa}%
+ \vss
+ \hrule}%
+ \hss\vrule}%
+ \else
+ \@addtofilelist{#3}%
+ \ProvidesFile{#3}[Graphic file (type #1)]%
+ \setbox\z@\hbox{\csname Ginclude@#1\endcsname{#3}}%
+ \dp\z@\z@
+ \ht\z@\Gin@req@height
+ \wd\z@\Gin@req@width
+ \box\z@
+ \fi}
+\let\Gin@decode\@empty
+\def\Gin@exclamation{!}
+\let\Gin@page\@empty
+\def\Gin@pagebox{cropbox}
+\newif\ifGin@interpolate
+\let\Gin@log\wlog
+\let\Gin@req@sizes\relax
+\def\Gin@scalex{1}%
+\let\Gin@scaley\Gin@exclamation
+\let\Gin@req@height\Gin@nat@height
+\let\Gin@req@width\Gin@nat@width
+\let\Gin@viewport@code\relax
+\def\Gin@nosize#1{%
+ \@latex@error
+ {Cannot determine size of graphic in #1 (no size specified)}%
+ \@ehc}
+\newif\ifGin@bbox
+\def\Gread@generic#1#2{%
+ \edef\Gread@attr@hash{%
+ \ifx\Gin@pagebox\@empty\else
+ :\Gin@pagebox
+ \fi
+ \ifx\Gin@page\@empty\else
+ :P\Gin@page
+ \fi
+ }%
+ \@ifundefined{#1 bbox\Gread@attr@hash}%
+ {\Gread@generic@aux{#1}{#2}}
+ {%
+ \expandafter\global\expandafter\let\expandafter\@gtempa
+ \csname #1 bbox\Gread@attr@hash\endcsname
+ }%
+ \expandafter\Gread@parse@bb\@gtempa\\%
+}
+\def\Gread@generic@aux#1#2{%
+ \begingroup
+ \@tempcnta\z@
+ \loop\ifnum\@tempcnta<\@xxxii
+ \catcode\@tempcnta14 %
+ \advance\@tempcnta\@ne
+ \repeat
+ \catcode`\^^?14 %
+ \let\do\@makeother
+ \dospecials
+ \catcode`\ 10 %
+ \catcode`\^^I10 %
+ \catcode\endlinechar5 %
+ \@makeother\:%
+ \@makeother\-%
+ \immediate\openin\@inputcheck"#1" %
+ #2{#1}%
+ \ifGin@bbox
+ \expandafter\xdef\csname #1 bbox\Gread@attr@hash\endcsname{\@gtempa}%
+ \else
+ \@latex@error
+ {Cannot determine size of graphic in #1 (no BoundingBox)}%
+ \@ehc
+ \gdef\@gtempa{0 0 72 72 }%
+ \fi
+ \endgroup
+}
+\def\Gread@eps#1{%
+ \Gread@generic{#1}\Gread@eps@aux
+}
+\def\Gread@eps@aux#1{%
+ \ifeof\@inputcheck
+ \@latex@error{File `#1' not found}\@ehc
+ \else
+ \Gread@true
+ \let\@tempb\Gread@false
+ \loop
+ \read\@inputcheck to\@tempa
+ \ifeof\@inputcheck
+ \Gread@false
+ \else
+ \expandafter\Gread@find@bb\@tempa:.\\%
+ \fi
+ \ifGread@
+ \repeat
+ \immediate\closein\@inputcheck
+ \fi
+}
+\long\def\Gread@find@bb#1:#2#3\\{%
+ \def\@tempa{#1}%
+ \ifx\@tempa\Gread@BBox
+ \Gread@test@atend#2#3()\\%
+ \fi}
+\def\Gread@test@atend#1(#2)#3\\{%
+ \def\@tempa{#2}%
+ \ifx\@tempa\Gread@atend
+ \Gread@true
+ \let\@tempb\relax
+ \else
+ \gdef\@gtempa{#1}%
+ \@tempb
+ \Gin@bboxtrue
+ \fi}
+\def\Gread@parse@bb#1 #2 #3 #4 #5\\{%
+ \Gin@defaultbp\Gin@llx{#1}%
+ \Gin@defaultbp\Gin@lly{#2}%
+ \Gin@defaultbp\Gin@urx{#3}%
+ \Gin@defaultbp\Gin@ury{#4}}%
+\def\Gread@atend{atend}
+\let\Grot@height\@ovxx
+\let\Grot@left\@ovyy
+\let\Grot@right\@ovdx
+\let\Grot@depth\@ovdy
+\let\Grot@l\@ovro
+\let\Grot@r\@ovri
+\let\Grot@h\@xdim
+\let\Grot@d\@ydim
+\let\Grot@x\@linelen
+\let\Grot@y\@dashdim
+\long\def\rotatebox#1#2{%
+ \leavevmode
+ \Grot@setangle{#1}%
+ \setbox\z@\hbox{{#2}}%
+ \Grot@x\z@
+ \Grot@y\z@
+ \Grot@box}
+\def\Grot@setangle#1{\edef\Grot@angle{#1}}
+\def\Grot@Px#1#2#3{%
+ #1\Grot@cos#2%
+ \advance#1-\Grot@sin#3}
+\def\Grot@Py#1#2#3{%
+ #1\Grot@sin#2%
+ \advance#1\Grot@cos#3}
+\def\Grot@box{%
+ \begingroup
+ \CalculateSin\Grot@angle
+ \CalculateCos\Grot@angle
+ \edef\Grot@sin{\UseSin\Grot@angle}%
+ \edef\Grot@cos{\UseCos\Grot@angle}%
+^^A \GDebug{Rotate: angle \Grot@angle, sine is \Grot@sin,
+^^A cosine is \Grot@cos}%
+ \Grot@r\wd\z@ \advance\Grot@r-\Grot@x
+ \Grot@l\z@ \advance\Grot@l-\Grot@x
+ \Grot@h\ht\z@ \advance\Grot@h-\Grot@y
+ \Grot@d-\dp\z@ \advance\Grot@d-\Grot@y
+ \ifdim\Grot@sin\p@>\z@
+ \ifdim\Grot@cos\p@>\z@
+ \Grot@Py\Grot@height \Grot@r\Grot@h%B
+ \Grot@Px\Grot@right \Grot@r\Grot@d%E
+ \Grot@Px\Grot@left \Grot@l\Grot@h%C
+ \Grot@Py\Grot@depth \Grot@l\Grot@d%D
+ \else
+ \Grot@Py\Grot@height \Grot@r\Grot@d%E
+ \Grot@Px\Grot@right \Grot@l\Grot@d%D
+ \Grot@Px\Grot@left \Grot@r\Grot@h%B
+ \Grot@Py\Grot@depth \Grot@l\Grot@h%C
+ \fi
+ \else
+ \ifdim\Grot@cos\p@<\z@
+ \Grot@Py\Grot@height \Grot@l\Grot@d%D
+ \Grot@Px\Grot@right \Grot@l\Grot@h%C
+ \Grot@Px\Grot@left \Grot@r\Grot@d%E
+ \Grot@Py\Grot@depth \Grot@r\Grot@h%B
+ \else
+ \Grot@Py\Grot@height \Grot@l\Grot@h%C
+ \Grot@Px\Grot@right \Grot@r\Grot@h%B
+ \Grot@Px\Grot@left \Grot@l\Grot@d%D
+ \Grot@Py\Grot@depth \Grot@r\Grot@d%E
+ \fi
+ \fi
+ \advance\Grot@height\Grot@y
+ \advance\Grot@depth\Grot@y
+ \Grot@Px\dimen@ \Grot@x\Grot@y
+ \Grot@Py\dimen@ii \Grot@x\Grot@y
+ \dimen@-\dimen@ \advance\dimen@-\Grot@left
+ \dimen@ii-\dimen@ii \advance\dimen@ii\Grot@y
+^^A \GDebug{Rotate: (l,r,h,d)^^J%
+^^A Original \the\Grot@l,\the\Grot@r,\the\Grot@h,\the\Grot@d,^^J%
+^^A New..... \the\Grot@left,\the\Grot@right,%
+^^A \the\Grot@height,\the\Grot@depth}%
+ \setbox\z@\hbox{%
+ \kern\dimen@
+ \raise\dimen@ii\hbox{\Grot@start\box\z@\Grot@end}}%
+ \ht\z@\Grot@height
+ \dp\z@-\Grot@depth
+ \advance\Grot@right-\Grot@left\wd\z@\Grot@right
+ \leavevmode\box\z@
+ \endgroup}
+\def\scalebox#1{%
+ \@ifnextchar[{\Gscale@box{#1}}{\Gscale@box{#1}[#1]}}
+\long\def\Gscale@box#1[#2]#3{%
+ \leavevmode
+ \def\Gscale@x{#1}\def\Gscale@y{#2}%
+ \setbox\z@\hbox{{#3}}%
+ \setbox\tw@\hbox{\Gscale@start\rlap{\copy\z@}\Gscale@end}%
+ \ifdim#2\p@<\z@
+ \ht\tw@-#2\dp\z@
+ \dp\tw@-#2\ht\z@
+ \else
+ \ht\tw@#2\ht\z@
+ \dp\tw@#2\dp\z@
+ \fi
+ \ifdim#1\p@<\z@
+ \hb@xt@-#1\wd\z@{\kern-#1\wd\z@\box\tw@\hss}%
+ \else
+ \hb@xt@#1\wd\z@{\box\tw@\kern#1\wd\z@\hss}%
+ \fi}
+\def\reflectbox{\Gscale@box-1[1]}
+\def\resizebox{%
+ \leavevmode
+ \@ifstar{\Gscale@@box\totalheight}{\Gscale@@box\height}}
+\def\Gscale@@box#1#2#3{%
+ \let\@tempa\Gin@exclamation
+ \expandafter\def\expandafter\@tempb\expandafter{\string#2}%
+ \expandafter\def\expandafter\@tempc\expandafter{\string#3}%
+ \ifx\@tempb\@tempa
+ \ifx\@tempc\@tempa
+ \toks@{\mbox}%
+ \else
+ \toks@{\Gscale@box@dd{#3}#1}%
+ \fi
+ \else
+ \ifx\@tempc\@tempa
+ \toks@{\Gscale@box@dd{#2}\width}%
+ \else
+ \toks@{\Gscale@box@dddd{#2}\width{#3}#1}%
+ \fi
+ \fi
+ \the\toks@}
+\long\def\Gscale@box@dd#1#2#3{%
+ \@begin@tempboxa\hbox{#3}%
+ \setlength\@tempdima{#1}%
+ \setlength\@tempdimb{#2}%
+ \Gscale@div\@tempa\@tempdima\@tempdimb
+ \Gscale@box\@tempa[\@tempa]{\box\@tempboxa}%
+ \@end@tempboxa}
+\long\def\Gscale@box@dddd#1#2#3#4#5{%
+ \@begin@tempboxa\hbox{#5}%
+ \setlength\@tempdima{#1}%
+ \setlength\@tempdimb{#2}%
+ \Gscale@div\@tempa\@tempdima\@tempdimb
+ \setlength\@tempdima{#3}%
+ \setlength\@tempdimb{#4}%
+ \Gscale@div\@tempb\@tempdima\@tempdimb
+ \ifGin@iso
+ \ifdim\@tempa\p@>\@tempb\p@
+ \let\@tempa\@tempb
+ \else
+ \let\@tempb\@tempa
+ \fi
+ \fi
+ \Gscale@box\@tempa[\@tempb]{\box\@tempboxa}%
+ \@end@tempboxa}
+\newif\ifGin@iso
+\def\Gscale@div#1#2#3{%
+ \setlength\dimen@{#3}%
+ \ifdim\dimen@=\z@
+ \PackageError{graphics}{Division by 0}\@eha
+ \dimen@#2%
+ \fi
+ \edef\@tempd{\the\dimen@}%
+ \setlength\dimen@{#2}%
+ \count@65536\relax
+ \ifdim\dimen@<\z@
+ \dimen@-\dimen@
+ \count@-\count@
+ \fi
+ \ifdim\dimen@>\z@
+ \loop
+ \ifdim\ifnum\count@<\tw@\maxdimen\else\dimen@\fi<8192\p@
+ \dimen@\tw@\dimen@
+ \divide\count@\tw@
+ \repeat
+ \dimen@ii\@tempd\relax
+ \divide\dimen@ii\count@
+ \divide\dimen@\dimen@ii
+ \fi
+ \edef#1{\strip@pt\dimen@}}
+\Gin@codes
+\let\Gin@codes\relax
+% alow use of current .def files
+\def\quote@name#1{"\quote@@name#1\@gobble""}
+\def\quote@@name#1"{#1\quote@@name}
+\def\unquote@name#1{\quote@@name#1\@gobble"}
+%
+\endinput
+%%
+%% End of file `graphics.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/graphics.sty new/tex/latex/graphics/graphics.sty
--- old/tex/latex/graphics/graphics.sty 2018-04-07 22:53:05.000000000 +0200
+++ new/tex/latex/graphics/graphics.sty 2020-02-02 23:42:01.000000000 +0100
@@ -12,7 +12,7 @@
%%
%%
%% graphics.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
-%% Copyright (C) 1995--2017 David Carlisle, LaTeX3 Project
+%% Copyright (C) 1995-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
@@ -22,8 +22,14 @@
%% This file has the LPPL maintenance status "maintained".
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\providecommand\DeclareRelease[3]{}
+\providecommand\DeclareCurrentRelease[2]{}
+
+\DeclareRelease{}{2017-06-25}{graphics-2017-06-25.sty}
+\DeclareCurrentRelease{}{2019-10-01}
+
\ProvidesPackage{graphics}
- [2017/06/25 v1.2c Standard LaTeX Graphics (DPC,SPQR)]
+ [2019/11/30 v1.4a Standard LaTeX Graphics (DPC,SPQR)]
\edef\Gin@codes{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax
\catcode`\noexpand\"\the\catcode`\"\relax
@@ -109,7 +115,7 @@
\newcommand\DeclareGraphicsExtensions[1]{%
\edef\Gin@extensions{\zap@space#1 \@empty}}
\providecommand\Gin@extensions{}
-\def\includegraphics{%
+\protected\def\includegraphics{%
\leavevmode
\@ifstar
{\Gin@cliptrue\Gin@i}%
@@ -156,14 +162,49 @@
\def\noexpand\Gin@base{####1}}}%
\IfFileExists{\filename@area\filename@base#1}%
{\Gin@tempa
- \expandafter\@tempa\@filef@und
+ \edef\uq@filef@und{\expandafter\unquote@name
+ \expandafter{\@filef@und}}%
+ \expandafter\@tempa\uq@filef@und
\edef\Gin@ext{#1}}{}}%
\let\Gin@ext\relax
\def\Gin(a)sepdefault{.}
+\edef\Gin@gzext{\detokenize{gz}}
+\def\Gin@temp#1{%
+ \begingroup
+ \escapechar\m@ne
+ \xdef\@curr@file{\expandafter\string\csname #1\endcsname}%
+ \endgroup
+}
+\ifx\set@curr@file\@Gin@temp
+ \let\set@curr@file\@undefined
+\fi
+\ifx\set@curr@file\@undefined
+\def\set@curr@file#1{%
+ \begingroup
+ \escapechar\m@ne
+ \xdef\@curr@file{\expandafter\string\csname\@firstofone#1\@empty\endcsname}%
+ \endgroup
+}
+\def\quote@name#1{"\quote@@name#1\@gobble""}
+\def\quote@@name#1"{#1\quote@@name}
+\def\unquote@name#1{\quote@@name#1\@gobble"}
+\fi
\def\Ginclude@graphics#1{%
+ \ifx\detokenize\@undefined\else
+ \edef\Gin@extensions{\detokenize\expandafter{\Gin@extensions}}%
+ \fi
\begingroup
\let\input@path\Ginput@path
- \filename@parse{#1}%
+ \set@curr@file{#1}%
+ \expandafter\filename@parse\expandafter{\@curr@file}%
+ \ifx\filename@ext\Gin@gzext
+ \expandafter\filename@parse\expandafter{\filename@base}%
+ \ifx\filename@ext\relax
+ \let\filename@ext\Gin@gzext
+ \else
+ \edef\Gin@ext{\Gin@ext\Gin@sepdefault\Gin@gzext}%
+ \fi
+ \fi
\ifx\filename@ext\relax
\@for\Gin@temp:=\Gin@extensions\do{%
\ifx\Gin@ext\relax
@@ -171,6 +212,20 @@
\fi}%
\else
\Gin@getbase{\Gin@sepdefault\filename@ext}%
+\ifx\Gin@ext\relax
+\let\Gin@savedbase\filename@base
+\let\Gin@savedext\filename@ext
+ \edef\filename@base{\filename@base\Gin@sepdefault\filename@ext}%
+ \let\filename@ext\relax
+ \@for\Gin@temp:=\Gin@extensions\do{%
+ \ifx\Gin@ext\relax
+ \Gin@getbase\Gin@temp
+ \fi}%
+ \ifx\Gin@ext\relax
+ \let\filename@base\Gin@savedbase
+ \let\filename@ext\Gin@savedext
+ \fi
+\fi
\ifx\Gin@ext\relax
\@warning{File `#1' not found}%
\def\Gin@base{\filename@area\filename@base}%
@@ -291,7 +346,7 @@
\catcode\endlinechar5 %
\@makeother\:%
\@makeother\-%
- \immediate\openin\@inputcheck"#1" %
+ \immediate\openin\@inputcheck\quote@name{#1} %
#2{#1}%
\ifGin@bbox
\expandafter\xdef\csname #1 bbox\Gread@attr@hash\endcsname{\@gtempa}%
@@ -355,7 +410,7 @@
\let\Grot@d\@ydim
\let\Grot@x\@linelen
\let\Grot@y\@dashdim
-\long\def\rotatebox#1#2{%
+\protected\long\def\rotatebox#1#2{%
\leavevmode
\Grot@setangle{#1}%
\setbox\z@\hbox{{#2}}%
@@ -424,7 +479,7 @@
\advance\Grot@right-\Grot@left\wd\z@\Grot@right
\leavevmode\box\z@
\endgroup}
-\def\scalebox#1{%
+\protected\def\scalebox#1{%
\@ifnextchar[{\Gscale@box{#1}}{\Gscale@box{#1}[#1]}}
\long\def\Gscale@box#1[#2]#3{%
\leavevmode
@@ -443,8 +498,8 @@
\else
\hb@xt@#1\wd\z@{\box\tw@\kern#1\wd\z@\hss}%
\fi}
-\def\reflectbox{\Gscale@box-1[1]}
-\def\resizebox{%
+\protected\def\reflectbox{\Gscale@box-1[1]}
+\protected\def\resizebox{%
\leavevmode
\@ifstar{\Gscale@@box\totalheight}{\Gscale@@box\height}}
\def\Gscale@@box#1#2#3{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/graphicx.sty new/tex/latex/graphics/graphicx.sty
--- old/tex/latex/graphics/graphicx.sty 2018-04-07 22:53:05.000000000 +0200
+++ new/tex/latex/graphics/graphicx.sty 2020-02-02 23:42:01.000000000 +0100
@@ -12,7 +12,7 @@
%%
%%
%% graphicx.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
-%% Copyright (C) 1995--2015,2017 David Carlisle, LaTeX3 Project
+%% Copyright (C) 1995-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
@@ -21,7 +21,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{graphicx}
- [2017/06/01 v1.1a Enhanced LaTeX Graphics (DPC,SPQR)]
+ [2019/11/30 v1.2a Enhanced LaTeX Graphics (DPC,SPQR)]
\DeclareOption{unknownkeysallowed}
{\PassOptionsToPackage\CurrentOption{keyval}}
\DeclareOption*{\PassOptionsToPackage\CurrentOption{graphics}}
@@ -236,7 +236,7 @@
\the\toks@
\endgroup
\fi}
-\def\rotatebox{%
+\protected\def\rotatebox{%
\leavevmode
\@ifnextchar[\Grot@box@kv\Grot@box@std}
\long\def\Grot@box@std#1#2{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/keyval.sty new/tex/latex/graphics/keyval.sty
--- old/tex/latex/graphics/keyval.sty 2018-04-07 22:53:05.000000000 +0200
+++ new/tex/latex/graphics/keyval.sty 2020-02-02 23:42:01.000000000 +0100
@@ -12,7 +12,7 @@
%%
%%
%% keyval.dtx Copyright (C) 1993 1994 1995 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/lscape.sty new/tex/latex/graphics/lscape.sty
--- old/tex/latex/graphics/lscape.sty 2018-04-07 22:53:05.000000000 +0200
+++ new/tex/latex/graphics/lscape.sty 2020-02-02 23:42:01.000000000 +0100
@@ -12,7 +12,7 @@
%%
%%
%% lscape.dtx Copyright (C) 1994 1999-2000 David Carlisle
-%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/pctex32.def new/tex/latex/graphics/pctex32.def
--- old/tex/latex/graphics/pctex32.def 2016-06-17 12:20:33.000000000 +0200
+++ new/tex/latex/graphics/pctex32.def 2020-02-02 23:42:01.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/pctexhp.def new/tex/latex/graphics/pctexhp.def
--- old/tex/latex/graphics/pctexhp.def 2016-06-17 12:20:33.000000000 +0200
+++ new/tex/latex/graphics/pctexhp.def 2020-02-02 23:42:01.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/pctexps.def new/tex/latex/graphics/pctexps.def
--- old/tex/latex/graphics/pctexps.def 2016-06-17 12:20:33.000000000 +0200
+++ new/tex/latex/graphics/pctexps.def 2020-02-02 23:42:01.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/pctexwin.def new/tex/latex/graphics/pctexwin.def
--- old/tex/latex/graphics/pctexwin.def 2016-06-17 12:20:33.000000000 +0200
+++ new/tex/latex/graphics/pctexwin.def 2020-02-02 23:42:01.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/rotating.sty new/tex/latex/graphics/rotating.sty
--- old/tex/latex/graphics/rotating.sty 2018-04-07 22:53:05.000000000 +0200
+++ new/tex/latex/graphics/rotating.sty 2020-02-02 23:42:01.000000000 +0100
@@ -11,9 +11,9 @@
%% (but please observe conditions on bug reports sent to that address!)
%%
%%
-%% Copyright 1995--1999 Sebastian Rahtz and Leonor Barroca
-%% Copyright 2001--2003,2007--2009 Robin Fairbairns
-%% Copyright 2016 LaTeX3 Project
+%% Copyright (C) 1995--1999 Sebastian Rahtz and Leonor Barroca
+%% Copyright (C) 2001--2003,2007--2009 Robin Fairbairns
+%% Copyright (C) 2016-2020 LaTeX3 Project
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{rotating}%
[2016/08/11 v2.16d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/tcidvi.def new/tex/latex/graphics/tcidvi.def
--- old/tex/latex/graphics/tcidvi.def 2016-06-17 12:20:33.000000000 +0200
+++ new/tex/latex/graphics/tcidvi.def 2020-02-02 23:42:01.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/trig.sty new/tex/latex/graphics/trig.sty
--- old/tex/latex/graphics/trig.sty 2018-04-07 22:53:05.000000000 +0200
+++ new/tex/latex/graphics/trig.sty 2020-02-02 23:42:01.000000000 +0100
@@ -12,7 +12,7 @@
%%
%%
%% File: trig.dtx Copyright (C) 1993 1994 1995 1996 1997 1999 David Carlisle
-%% Copyright (C) 2000--2015 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/graphics/truetex.def new/tex/latex/graphics/truetex.def
--- old/tex/latex/graphics/truetex.def 2016-06-17 12:20:33.000000000 +0200
+++ new/tex/latex/graphics/truetex.def 2020-02-02 23:42:01.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% drivers.dtx Copyright (C) 1994 David Carlisle Sebastian Rahtz
%% Copyright (C) 1995 1996 1997 1998 1999 David Carlisle
-%% Copyright (C) 2000--2016 David Carlisle, LaTeX3 Project
+%% Copyright (C) 2000-2020 David Carlisle, LaTeX3 Project
%%
%% This file is part of the Standard LaTeX `Graphics Bundle'.
%% It may be distributed under the terms of the LaTeX Project Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/graphics.tlpobj new/tlpkg/tlpobj/graphics.tlpobj
--- old/tlpkg/tlpobj/graphics.tlpobj 2019-02-28 03:40:40.000000000 +0100
+++ new/tlpkg/tlpobj/graphics.tlpobj 2020-02-03 01:54:45.000000000 +0100
@@ -1,6 +1,6 @@
name graphics
category Package
-revision 47350
+revision 53640
catalogue latex-graphics
shortdesc The LaTeX standard graphics bundle
relocated 1
@@ -9,7 +9,8 @@
longdesc of text in LaTeX documents. It comprises the packages color,
longdesc graphics, graphicx, trig, epsfig, keyval, and lscape.
depend graphics-cfg
-runfiles size=31
+depend graphics-def
+runfiles size=36
RELOC/tex/latex/graphics/color.sty
RELOC/tex/latex/graphics/dvipdf.def
RELOC/tex/latex/graphics/dvipsnam.def
@@ -17,6 +18,7 @@
RELOC/tex/latex/graphics/dviwin.def
RELOC/tex/latex/graphics/emtex.def
RELOC/tex/latex/graphics/epsfig.sty
+ RELOC/tex/latex/graphics/graphics-2017-06-25.sty
RELOC/tex/latex/graphics/graphics.sty
RELOC/tex/latex/graphics/graphicx.sty
RELOC/tex/latex/graphics/keyval.sty
@@ -32,6 +34,5 @@
catalogue-contact-bugs https://www.latex-project.org/bugs/
catalogue-contact-home https://www.latex-project.org/
catalogue-ctan /macros/latex/required/graphics
-catalogue-date 2018-04-07 07:05:08 +0200
catalogue-license lppl1.3c
-catalogue-topics collection
+catalogue-topics graphics collection
++++++ greek-fontenc.doc.tar.xz ++++++
++++ 12156 lines of diff (skipped)
++++++ greek-fontenc.tar.xz ++++++
++++ 3182 lines of diff (skipped)
++++++ greek-inputenc.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/greek-inputenc/README new/doc/latex/greek-inputenc/README
--- old/doc/latex/greek-inputenc/README 2015-08-09 00:55:00.000000000 +0200
+++ new/doc/latex/greek-inputenc/README 2019-07-11 23:00:51.000000000 +0200
@@ -4,7 +4,7 @@
*************************************
:Author: Apostolos Syropoulos, Dimitrios Filippou, Günter Milde
-:Date: 2015-08-07
+:Date: 2019-07-11
:Copyright: © 1999 Dimitrios Filippou,
© 2000 Apostolos Syropoulos,
© 2013 Günter Milde <milde(a)users.sf.net>
@@ -32,7 +32,11 @@
1.5.1 2015-06-04 Fix definition of spacing diacritical characters in utf8.dfu.
1.6 2015-08-05 Fix output of accented characters with "textalpha" if the
current font encoding is not LGR (wrap in \ensuregreek),
- .. Map GREEK ... SYMBOL characters.
+.. Map GREEK ... SYMBOL characters.
+1.7 2019-07-11 Use LICR macros instead of transliteration and remove
+ ``\textbullet`` substitution character from iso-8859-7.def.
+ (Missing characters will now result in the standard
+ ``inputenc`` error message.)
===== ============ =============================================================
@@ -51,16 +55,16 @@
`<iso-8859-7.def>`_
Greek input encoding file for `ISO 8859-7`_ by Apostolos Syropoulos.
- [#transliteration]_
`<macgreek.def>`_
Greek input encoding file for Macintosh (ELOT 823) by Dimitrios Filippou.
[#transliteration]_
Test examples and output:
- :utf-8: `<greek-utf8.tex>`_, `<greek-utf8.pdf>`_ (comprehensive example)
- :iso 8859-7: `<test-iso-8859-7.tex>`_, `<test-iso-8859-7.pdf>`_ (basic test)
-
+ :utf-8: `<greek-utf8.tex>`_, `<greek-utf8.pdf>`_
+ (comprehensive example)
+ :iso 8859-7: `<inputenc-iso-8859-7.tex>`_, `<inputenc-iso-8859-7.pdf>`_
+ (basic test)
.. [#transliteration] Currently, these files translate to a Latin
transcription particular to the LGR font encoding. Drawbacks include:
@@ -127,6 +131,8 @@
As a result, only the deprecated character ``037E GREEK QUESTION MARK``
works with both, Xe/LuaTeX and 8-bit TeX.
+Alternatively, the `textalpha` and `alphabeta` packages from greek-fontenc_
+can be loaded with the "keep-semicolon_" option.
.. References
==========
@@ -134,7 +140,7 @@
.. _ISO 8859-7: http://en.wikipedia.org/wiki/ISO/IEC_8859-7
.. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
-.. _PyLit: http://pylit.berlios.de
+.. _PyLit: http://repo.or.cz/pylit.git
.. _reStructuredText: http://docutils.sourceforge.net/rst.html
.. _Docutils: http://docutils.sourceforge.net/rst.html
.. _TDS: http://www.tex.ac.uk/cgi-bin/texfaq2html?label=tds
@@ -146,4 +152,6 @@
.. _ibycus-babel: http://www.ctan.org/pkg/ibycus-babel
.. _inputenc: http://www.ctan.org/pkg/inputenc
.. _lgrx: http://www.ctan.org/pkg/lgrx
-.. _usage.pdf: http://mirrors.ctan.org/macros/latex/contrib/babel-contrib/greek/usage.pdf
+.. _usage.pdf: http://mirrors.ctan.org/language/babel/contrib/greek/usage.pdf
+.. _keep-semicolon:
+ http://mirrors.ctan.org/language/greek/greek-fontenc/textalpha.sty.html#kee…
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/greek-inputenc/README.html new/doc/latex/greek-inputenc/README.html
--- old/doc/latex/greek-inputenc/README.html 2015-08-09 00:55:00.000000000 +0200
+++ new/doc/latex/greek-inputenc/README.html 2019-07-11 23:00:51.000000000 +0200
@@ -1,16 +1,19 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" />
+<meta charset="utf-8"/>
+<meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" />
<title>greek-inputenc</title>
<meta name="author" content="Apostolos Syropoulos, Dimitrios Filippou, Günter Milde" />
+<meta name="dcterms.date" content="2019-07-11" />
+<meta name="dcterms.rights" content="© 1999 Dimitrios Filippou, © 2000 Apostolos Syropoulos, © 2013 Günter Milde <milde@users.sf.net>" />
+<link rel="schema.dcterms" href="http://purl.org/dc/terms/">
<style type="text/css">
/* Minimal style sheet for the HTML output of Docutils. */
/* */
/* :Author: Günter Milde, based on html4css1.css by David Goodger */
-/* :Id: $Id: minimal.css 7893 2015-05-11 15:38:58Z milde $ */
+/* :Id: $Id$ */
/* :Copyright: © 2015 Günter Milde. */
/* :License: Released under the terms of the `2-Clause BSD license`_, */
/* in short: */
@@ -29,10 +32,13 @@
/* .. _CSS2.1: http://www.w3.org/TR/CSS2 */
/* .. _validates: http://jigsaw.w3.org/css-validator/validator$link */
-/* Figure/table alignment */
-.align-left { text-align: left; }
-.align-right { text-align: right; }
-.align-center { clear: both; text-align: center;}
+/* alignment of text and inline objects inside block objects*/
+.align-left { text-align: left; }
+.align-right { text-align: right; }
+.align-center { clear: both; text-align: center; }
+.align-top { vertical-align: top; }
+.align-middle { vertical-align: middle; }
+.align-bottom { vertical-align: bottom; }
/* titles */
h1.title, p.subtitle {
@@ -100,9 +106,10 @@
/* Table of Contents */
div.topic.contents { margin: 0; }
-ul.auto-toc {
+div.topic.contents ul {
list-style-type: none;
- padding-left: 1.5em; }
+ padding-left: 1.5em;
+}
/* Enumerated Lists */
ol.arabic { list-style: decimal }
@@ -162,8 +169,19 @@
span.option { white-space: nowrap; }
/* Footnotes and Citations */
+dl.footnote.superscript > dd {margin-left: 1em; }
+dl.footnote.brackets > dd {margin-left: 2em; }
dl > dt.label { font-weight: normal; }
-dt.label > span.fn-backref { margin: 0.2em; }
+a.footnote-reference.brackets:before,
+dt.label > span.brackets:before { content: "["; }
+a.footnote-reference.brackets:after,
+dt.label > span.brackets:after { content: "]"; }
+a.footnote-reference.superscript,
+dl.footnote.superscript > dt.label {
+ vertical-align: super;
+ font-size: smaller;
+}
+dt.label > span.fn-backref { margin-left: 0.2em; }
dt.label > span.fn-backref > a { font-style: italic; }
/* Line Blocks */
@@ -174,28 +192,34 @@
margin-left: 40px;
}
-/* Images and Figures */
-img.align-left,
+/* Figures, Images, and Tables */
.figure.align-left,
-object.align-left {
- display: block;
+img.align-left,
+object.align-left,
+table.align-left {
margin-right: auto;
}
-img.align-center,
.figure.align-center,
+img.align-center,
object.align-center {
+ margin-left: auto;
+ margin-right: auto;
display: block;
+}
+table.align-center {
margin-left: auto;
margin-right: auto;
}
-img.align-right,
.figure.align-right,
-object.align-right {
- display: block;
+img.align-right,
+object.align-right,
+table.align-right {
margin-left: auto;
}
-/* reset inner alignment in figures */
-div.align-right { text-align: inherit }
+/* reset inner alignment in figures and tables */
+/* div.align-left, div.align-center, div.align-right, */
+table.align-left, table.align-center, table.align-right
+{ text-align: inherit }
/* Admonitions and System Messages */
div.admonition,
@@ -216,13 +240,14 @@
}
/* Text Blocks */
+blockquote,
div.topic,
pre.literal-block,
pre.doctest-block,
pre.math,
pre.code {
- margin-right: 40px;
- margin-left: 40px;
+ margin-left: 1.5em;
+ margin-right: 1.5em
}
pre.code .ln { color: gray; } /* line numbers */
@@ -255,7 +280,7 @@
/* Rules for easy reading and pre-defined style variants. */
/* */
/* :Author: Günter Milde, based on html4css1.css by David Goodger */
-/* :Id: $Id: plain.css 7893 2015-05-11 15:38:58Z milde $ */
+/* :Id: $Id$ */
/* :Copyright: © 2015 Günter Milde. */
/* :License: Released under the terms of the `2-Clause BSD license`_, */
/* in short: */
@@ -275,8 +300,8 @@
/* "page layout" */
body {
- padding: 0 5%;
- margin: 8px 0;
+ margin: 0;
+ background-color: #dbdbdb;
}
div.document {
line-height:1.3;
@@ -285,7 +310,9 @@
/* avoid long lines --> better reading */
/* OTOH: lines should not be too short because of missing hyphenation, */
max-width: 50em;
+ padding: 1px 2%; /* 1px on top avoids grey bar above title (mozilla) */
margin: auto;
+ background-color: white;
}
/* Sections */
@@ -319,9 +346,9 @@
/* Definition Lists */
-dl > dd p:first-child { margin-top: 0; }
+dl > dd > p:first-child { margin-top: 0; }
/* :last-child is not part of CSS 2.1 (introduced in CSS 3) */
-/* dl > dd p:last-child { margin-bottom: 0; } */
+dl > dd > p:last-child { margin-bottom: 0; }
/* lists nested in definition lists */
/* :only-child is not part of CSS 2.1 (introduced in CSS 3) */
@@ -377,19 +404,9 @@
/* ============ */
/* Literal Blocks */
-pre.literal-block, pre.doctest-block,
-pre.math, pre.code {
- margin-left: 1.5em;
- margin-right: 1.5em
-}
/* Block Quotes */
-blockquote,
-div.topic {
- margin-left: 1.5em;
- margin-right: 1.5em
-}
blockquote > table,
div.topic > table {
margin-top: 0;
@@ -406,6 +423,8 @@
/* th { vertical-align: bottom; } */
+table tr { text-align: left; }
+
/* "booktabs" style (no vertical lines) */
table.booktabs {
border: 0;
@@ -418,7 +437,6 @@
}
table.booktabs th {
border-bottom: thin solid;
- text-align: left;
}
/* numbered tables (counter defined in div.document) */
@@ -448,16 +466,20 @@
/* ~~~~~~~~~~~~~ */
/* Images and Figures */
-img.align-left,
+
+/* let content flow to the side of aligned images and figures */
.figure.align-left,
+img.align-left,
object.align-left {
+ display: block;
clear: left;
float: left;
margin-right: 1em
}
-img.align-right,
.figure.align-right,
+img.align-right,
object.align-right {
+ display: block;
clear: right;
float: right;
margin-left: 1em
@@ -479,6 +501,7 @@
/* Code */
+pre.code { padding: 0.7ex }
pre.code, code { background-color: #eeeeee }
pre.code .ln { color: gray; } /* line numbers */
/* basic highlighting: for a complete scheme, see */
@@ -540,13 +563,12 @@
<body>
<div class="document" id="greek-inputenc">
<h1 class="title">greek-inputenc</h1>
-
<p class="subtitle" id="greek-input-encoding-definition-files">Greek input encoding definition files</p>
<dl class="docinfo simple">
<dt class="author">Author</dt>
<dd class="author"><p>Apostolos Syropoulos, Dimitrios Filippou, Günter Milde</p></dd>
<dt class="date">Date</dt>
-<dd class="date">2015-08-07</dd>
+<dd class="date">2019-07-11</dd>
<dt class="copyright">Copyright</dt>
<dd class="copyright">© 1999 Dimitrios Filippou,
© 2000 Apostolos Syropoulos,
@@ -621,6 +643,13 @@
<td></td>
<td><p>Map GREEK … SYMBOL characters.</p></td>
</tr>
+<tr><td><p>1.7</p></td>
+<td><p>2019-07-11</p></td>
+<td><p>Use LICR macros instead of transliteration and remove
+<span class="docutils literal">\textbullet</span> substitution character from iso-8859-7.def.
+(Missing characters will now result in the standard
+<span class="docutils literal">inputenc</span> error message.)</p></td>
+</tr>
</tbody>
</table>
</div>
@@ -632,30 +661,30 @@
symbols present in the LGR encoding.</p>
<p>This file requires <span class="docutils literal">lgrenc.def</span> version 0.8.2 or newer from the
<a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a> package.</p>
-<p>The literate source was converted with <a class="reference external" href="http://pylit.berlios.de">PyLit</a> to <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> and
+<p>The literate source was converted with <a class="reference external" href="http://repo.or.cz/pylit.git">PyLit</a> to <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> and
with <a class="reference external" href="http://docutils.sourceforge.net/rst.html">Docutils</a> to <a class="reference external" href="lgrenc.dfu.html">lgrenc.dfu.html</a>.</p>
</dd>
<dt><a class="reference external" href="iso-8859-7.def">iso-8859-7.def</a></dt>
-<dd><p>Greek input encoding file for <a class="reference external" href="http://en.wikipedia.org/wiki/ISO/IEC_8859-7">ISO 8859-7</a> by Apostolos Syropoulos.
-<a class="footnote-reference" href="#transliteration" id="id1">[1]</a></p>
+<dd><p>Greek input encoding file for <a class="reference external" href="http://en.wikipedia.org/wiki/ISO/IEC_8859-7">ISO 8859-7</a> by Apostolos Syropoulos.</p>
</dd>
<dt><a class="reference external" href="macgreek.def">macgreek.def</a></dt>
-<dd><p>Greek input encoding file for Macintosh (ELOT 823) by Dimitrios Filippou.
-<a class="footnote-reference" href="#transliteration" id="id2">[1]</a></p>
+<dd><p>Greek input encoding file for Macintosh (ELOT 823) by Dimitrios Filippou.<a class="footnote-reference superscript" href="#transliteration" id="id1">1</a></p>
</dd>
<dt>Test examples and output:</dt>
<dd><dl class="field-list simple">
<dt>utf-8</dt>
-<dd><p><a class="reference external" href="greek-utf8.tex">greek-utf8.tex</a>, <a class="reference external" href="greek-utf8.pdf">greek-utf8.pdf</a> (comprehensive example)</p>
+<dd><p><a class="reference external" href="greek-utf8.tex">greek-utf8.tex</a>, <a class="reference external" href="greek-utf8.pdf">greek-utf8.pdf</a>
+(comprehensive example)</p>
</dd>
<dt>iso 8859-7</dt>
-<dd><p><a class="reference external" href="test-iso-8859-7.tex">test-iso-8859-7.tex</a>, <a class="reference external" href="test-iso-8859-7.pdf">test-iso-8859-7.pdf</a> (basic test)</p>
+<dd><p><a class="reference external" href="inputenc-iso-8859-7.tex">inputenc-iso-8859-7.tex</a>, <a class="reference external" href="inputenc-iso-8859-7.pdf">inputenc-iso-8859-7.pdf</a>
+(basic test)</p>
</dd>
</dl>
</dd>
</dl>
-<dl class="footnote">
-<dt class="label" id="transliteration">[1]<span class="fn-backref">(<a href="#id1">1</a>,<a href="#id2">2</a>)</span></dt>
+<dl class="footnote superscript">
+<dt class="label" id="transliteration"><span class="superscript"><a class="fn-backref" href="#id1">1</a></span></dt>
<dd><p>Currently, these files translate to a Latin
transcription particular to the LGR font encoding. Drawbacks include:
Latin characters in PDF strings (<a class="reference external" href="http://www.ctan.org/pkg/hyperref">hyperref</a> bookmarks and TOC sidebar, cf.
@@ -693,7 +722,7 @@
<h2>Warning</h2>
<p>LGR is no “standard font encoding”. Latin characters and some other ASCII
symbols are mapped to Greek equivalents if LGR is the active font encoding.
-(See <a class="reference external" href="http://mirrors.ctan.org/macros/latex/contrib/babel-contrib/greek/usage.pdf">usage.pdf</a> for a description of this Latin-Greek transliteration.)</p>
+(See <a class="reference external" href="http://mirrors.ctan.org/language/babel/contrib/greek/usage.pdf">usage.pdf</a> for a description of this Latin-Greek transliteration.)</p>
<p>This means you need an explicit font-encoding switch for Latin words and
abbreviations in Greek text, e.g.,
not <span class="docutils literal"><span class="pre">\foreignlanguage{greek}{((ηία</span> αντίσταση <span class="pre">750-kΩ))}</span></span>
@@ -707,6 +736,8 @@
</ul>
<p>As a result, only the deprecated character <span class="docutils literal">037E GREEK QUESTION MARK</span>
works with both, Xe/LuaTeX and 8-bit TeX.</p>
+<p>Alternatively, the <cite>textalpha</cite> and <cite>alphabeta</cite> packages from <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a>
+can be loaded with the “<a class="reference external" href="http://mirrors.ctan.org/language/greek/greek-fontenc/textalpha.sty.html#kee…">keep-semicolon</a>” option.</p>
<!-- References
========== -->
</div>
Binary files old/doc/latex/greek-inputenc/greek-utf8-minimal.pdf and new/doc/latex/greek-inputenc/greek-utf8-minimal.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/greek-inputenc/greek-utf8-minimal.tex new/doc/latex/greek-inputenc/greek-utf8-minimal.tex
--- old/doc/latex/greek-inputenc/greek-utf8-minimal.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/greek-inputenc/greek-utf8-minimal.tex 2019-07-11 23:00:51.000000000 +0200
@@ -0,0 +1,434 @@
+\documentclass[a4paper]{article}
+\usepackage[LGR,T1]{fontenc}
+\usepackage[utf8]{inputenc}
+% \usepackage{textalpha}
+% \usepackage{alphabeta}
+\usepackage{textcomp}
+\usepackage[colorlinks]{hyperref}
+\usepackage{bookmark}
+% \usepackage{parskip}
+\usepackage{booktabs}
+
+\usepackage{lmodern}
+% \usepackage{kerkis}
+% \usepackage{gfsdidot}
+
+% Greek utf8 definitions work with and without "Babel",
+% with monotonic, polytonic, and ancient Greek variants.
+% However, this document uses babel language switches, so it requires Babel:
+\usepackage[greek,english]{babel}
+% \languageattribute{greek}{polutoniko}
+% \languageattribute{greek}{ancient}
+
+\begin{document}
+
+\section*{Greek Unicode with 8-bit TeX and \emph{inputenc}}
+
+\begin{abstract}
+ Small test of Unicode input for Greek letters.
+\end{abstract}
+
+Without the "textalpha" or "alphabeta" packages, Greek Unicode characters
+must be wrapped in \verb+\ensuregreek{}+, \verb+\textgreek{}+, or\\
+\verb+\foreignlanguage{greek}{}+ or follow the declarations
+\verb+\greekscript+, \verb+\greektext+, or \verb+\setlanguage{greek}+ to set
+the correct font encoding (LGR).
+
+\begin{quote}
+ \greekscript
+ Τί φήις; Ἱδὼν ἐνθέδε παῖδ’ ἐλευθέραν
+ τὰς πλησίον Νύμφας στεφανοῦσαν, Σώστρατε,
+ ἐρῶν άπῆλθες εὐθύς;
+\end{quote}
+
+The MIKRO SIGN and OHM SIGN characters are set up by textcomp for
+any font encoding:
+\begin{quote}
+ With a a 50\,kΩ resistor, the current is 20\,µA.
+\end{quote}
+However, if the similar looking Greek Unicode characters are used, LGR is
+required for GREEK CAPITAL LETTER OMEGA. On the other hand, GREEK SMALL
+LETTER MU works in any font encoding because it translates to
+\verb+\textmu+, the LICR also used by textcomp for the MICRO SIGN.
+\begin{quote}
+ With a a 50\,k\ensuregreek{Ω} resistor, the current is 20\,μA.
+\end{quote}
+
+
+\section{Warning: unsafe ASCII input}
+
+LGR is no ``standard font encoding''. Latin characters and some other ASCII
+symbols are mapped to Greek equivalents if LGR is the active font encoding.
+(See
+\href{http://mirrors.ctan.org/language/babel/contrib/greek/usage.pdf}{usage.pdf}
+for a description of this Latin-Greek transliteration.)
+
+This means you need an explicit language and/or font-encoding switch for
+Latin words and abbreviations in Greek text, e.g., not
+\foreignlanguage{greek}{((ηία αντίσταση 750-kΩ))} but
+\foreignlanguage{greek}{((ηία αντίσταση 750-\textlatin{k}Ω))}
+
+Special care is also required with the question mark characters:
+\begin{itemize}
+ \item The Unicode standard says: ``character 003B SEMICOLON, and not
+ 037E GREEK QUESTION MARK, is the preferred character for a `Greek
+ question mark' (erotimatiko)'',
+ \item The LGR font encoding maps a SEMICOLON to a middle dot (ano teleia),
+ while the Latin question mark ``?'' is mapped to the erotimatiko.
+\end{itemize}
+As a result, only the deprecated character 037E GREEK QUESTION MARK works
+with both, Xe/LuaTeX and 8-bit TeX.
+
+With the \emph{textalpha} package's ``keep-semicolon'' option, the
+SEMICOLON character can be used for the erotimatiko also with LGR encoded
+fonts.
+
+
+\section{Supported Characters}
+
+Unicode definitions exist for all non-ASCII characters that can be rendered
+with an LGR-encoded font.
+
+
+\subsection{Greek and Coptic}
+
+\greekscript
+\begin{tabular}{rrrrrrrrrrrrrrrrr}
+\toprule
+ & 0 & 1 & 2 & 3 & 4 & 5 & 6 & 7 & 8 & 9 & A & B & \textlatin C & D & E & F\\
+\midrule
+\textlatin{370} & * & * & * & * & ʹ & ͵ & * & * & & & ͺ & * & * & * & ; & \\
+\textlatin{380} & & & & & ΄ & ΅ & Ά & · & Έ & Ή & Ί & & Ό & & Ύ & Ώ\\
+\textlatin{390} & ΐ & Α & Β & Γ & Δ & Ε & Ζ & Η & Θ & Ι & Κ & Λ & Μ & Ν & Ξ & Ο\\
+\textlatin{3A0} & Π & Ρ & & Σ & Τ & Υ & Φ & Χ & Ψ & Ω & Ϊ & Ϋ & ά & έ & ή & ί\\
+\textlatin{3B0} & ΰ & α & β & γ & δ & ε & ζ & η & θ & ι & κ & λ & μ & ν & ξ & ο\\
+\textlatin{3C0} & π & ρ & ς & σ & τ & υ & φ & χ & ψ & ω & ϊ & ϋ & ό & ύ & ώ & \\
+\textlatin{3D0} & * & * & * & * & * & * & * & * & Ϙ & ϙ & Ϛ & ϛ & Ϝ & ϝ & * & ϟ\\
+\textlatin{3E0} & Ϡ & ϡ & * & * & * & * & * & * & * & * & * & * & * & * & * & *\\
+\textlatin{3F0} & * & * & * & * & * & * & * & * & * & * & * & * & * & * & * & *\\
+\bottomrule
+\end{tabular}
+\latintext
+
+\noindent
+legend: * glyph missing in LGR, [space] Unicode point not defined
+
+
+\subsection{Greek Extended}
+
+\greekscript
+\begin{tabular}{rrrrrrrrrrrrrrrrr}
+\toprule
+ & 0 & 1 & 2 & 3 & 4 & 5 & 6 & 7 & 8 & 9 & A & B & \textlatin C & D & E & F\\
+\midrule
+\textlatin{1F00} & ἀ & ἁ & ἂ & ἃ & ἄ & ἅ & ἆ & ἇ & Ἀ & Ἁ & Ἂ & Ἃ & Ἄ & Ἅ & Ἆ & Ἇ\\
+\textlatin{1F10} & ἐ & ἑ & ἒ & ἓ & ἔ & ἕ & & & Ἐ & Ἑ & Ἒ & Ἓ & Ἔ & Ἕ & & \\
+\textlatin{1F20} & ἠ & ἡ & ἢ & ἣ & ἤ & ἥ & ἦ & ἧ & Ἠ & Ἡ & Ἢ & Ἣ & Ἤ & Ἥ & Ἦ & Ἧ\\
+\textlatin{1F30} & ἰ & ἱ & ἲ & ἳ & ἴ & ἵ & ἶ & ἷ & Ἰ & Ἱ & Ἲ & Ἳ & Ἴ & Ἵ & Ἶ & Ἷ\\
+\textlatin{1F40} & ὀ & ὁ & ὂ & ὃ & ὄ & ὅ & & & Ὀ & Ὁ & Ὂ & Ὃ & Ὄ & Ὅ & & \\
+\textlatin{1F50} & ὐ & ὑ & ὒ & ὓ & ὔ & ὕ & ὖ & ὗ & & Ὑ & & Ὓ & & Ὕ & & Ὗ\\
+\textlatin{1F60} & ὠ & ὡ & ὢ & ὣ & ὤ & ὥ & ὦ & ὧ & Ὠ & Ὡ & Ὢ & Ὣ & Ὤ & Ὥ & Ὦ & Ὧ\\
+\textlatin{1F70} & ὰ & ά & ὲ & έ & ὴ & ή & ὶ & ί & ὸ & ό & ὺ & ύ & ὼ & ώ & & \\
+\textlatin{1F80} & ᾀ & ᾁ & ᾂ & ᾃ & ᾄ & ᾅ & ᾆ & ᾇ & ᾈ & ᾉ & ᾊ & ᾋ & ᾌ & ᾍ & ᾎ & ᾏ\\
+\textlatin{1F90} & ᾐ & ᾑ & ᾒ & ᾓ & ᾔ & ᾕ & ᾖ & ᾗ & ᾘ & ᾙ & ᾚ & ᾛ & ᾜ & ᾝ & ᾞ & ᾟ\\
+\textlatin{1FA0} & ᾠ & ᾡ & ᾢ & ᾣ & ᾤ & ᾥ & ᾦ & ᾧ & ᾨ & ᾩ & ᾪ & ᾫ & ᾬ & ᾭ & ᾮ & ᾯ\\
+\textlatin{1FB0} & ᾰ & ᾱ & ᾲ & ᾳ & ᾴ & & ᾶ & ᾷ & Ᾰ & Ᾱ & Ὰ & Ά & ᾼ & ᾽ & ι & ᾿\\
+\textlatin{1FC0} & ῀ & ῁ & ῂ & ῃ & ῄ & & ῆ & ῇ & Ὲ & Έ & Ὴ & Ή & ῌ & ῍ & ῎ & ῏\\
+\textlatin{1FD0} & ῐ & ῑ & ῒ & ΐ & & & ῖ & ῗ & Ῐ & Ῑ & Ὶ & Ί & & ῝ & ῞ & ῟\\
+\textlatin{1FE0} & ῠ & ῡ & ῢ & ΰ & ῤ & ῥ & ῦ & ῧ & Ῠ & Ῡ & Ὺ & Ύ & Ῥ & ῭ & ΅ & `\\
+\textlatin{1FF0} & & & ῲ & ῳ & ῴ & & ῶ & ῷ & Ὸ & Ό & Ὼ & Ώ & ῼ & ´ & ῾ & \\
+\bottomrule
+\end{tabular}
+\latintext
+
+\subsection{Other Unicode Blocks}
+
+\begin{description}
+
+\item [Latin-1 Supplement]: \ensuregreek{¨ « ¯ ´ · »}
+\item [IPA Extensions]: \ensuregreek{ə} LATIN SMALL LETTER SCHWA
+\item [Spacing Modifier Letters]:
+ \ensuregreek{˘a} (here followed by letter alpha)
+\item [General Punctuation]:
+ \ensuregreek{– — ‘ ’ ‰} ZWNJ (zero width no joiner, prevents kerning
+ and ligatures, e.g. \ensuregreek{AU} vs. \ensuregreek{AU} and
+ \ensuregreek{'a} vs. \ensuregreek{'a})
+\item [Currency Symbols]: \ensuregreek{€}
+\item [Letter-like Symbols]: Ω % OHM SIGN, preferred representation is 03A9
+\item [Ancient Greek Numbers]: \ensuregreek{
+ 𐅄 % \textPiDelta{} % GREEK ACROPHONIC ATTIC FIFTY
+ 𐅅 % \textPiEta{} % GREEK ACROPHONIC ATTIC FIVE HUNDRED
+ 𐅆 % \textPiChi{} % GREEK ACROPHONIC ATTIC FIVE THOUSAND
+ 𐅇 % \textPiMu{} % GREEK ACROPHONIC ATTIC FIFTY THOUSAND
+ }
+\end{description}
+
+\newpage
+
+\section{Test up/downcasing}
+
+Capital Greek letters have diacritics (except the dialytika) to the left
+(instead of above) and drop them in uppercase, e.g.
+\foreignlanguage{greek}{μαΐστρος $\mapsto$ \MakeUppercase{μαΐστρος}}.
+
+Tonos and dasia on the first vowel of a diphthong (\ensuregreek{άι, άυ, έι})
+imply a \emph{hiatus}. A dialytika must be placed on the second
+vowel if they are dropped (\ensuregreek{\MakeUppercase{\'ai, \'au, \'ei}}).
+
+The auto-hiatus feature in lgrxenc.def works with the Latin
+transcription and with character-macros (%
+\ensuregreek{\MakeUppercase{%
+ \'ai,
+ \'\textalpha \textupsilon,
+ \'\textepsilon \textiota
+}})
+and also if the first character is wrapped in \verb+\ensuregreek+ (as done by
+the lgrenc.dfu definition for accented characters) or a literal Unicode
+character
+(\ensuregreek{\MakeUppercase{%
+ \ensuregreek{\'\textalpha}\textiota,
+ ά\textupsilon,
+ ά\textiota
+}})
+but not if the second character of the diphthong is a Unicode literal
+(\ensuregreek{\MakeUppercase{%
+ \'\textalpha ι,
+ άυ,
+ \'\textepsilon ι
+}}).
+
+Therefore, the diaresis is missing in the following examples:
+\ensuregreek{άυλος $\mapsto$ \MakeUppercase{άυλος},
+ ἄυλος $\mapsto$ \MakeUppercase{ἄυλος},
+ μάινα $\mapsto$ \MakeUppercase{μάινα},
+ κέικ, $\mapsto$ \MakeUppercase{κέικ},
+ ἀυπνία $\mapsto$ \MakeUppercase{ἀυπνία}}.
+
+Fixing this shortcoming requires knowledge of what
+\verb+\LGR@ifnextchar+ ``sees'' when the next character is an upcased
+Unicode literal.
+
+As an ugly workaround, use \verb+\textiota+ resp. \verb+\textupsilon+
+for the character that should get the diaresis:
+\ensuregreek{ἀ\textupsilon{}πνία $\mapsto$ \MakeUppercase{ἀ\textupsilon{}πνία}}.
+
+
+
+The following subsections test MakeUppercase and MakeLowercase with all
+characters defined in lgrenc.dfu:
+
+\subsection{Greek and Coptic}
+
+\newcommand{\GreekAndCoptic}{ʹ͵ͺ; ΄ ΅Ά·ΈΉΊΌΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩΪΫϘϚϜϠ}
+\newcommand{\greekandcoptic}{άέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώϙϛϝϟϡ}
+
+Characters of the Greek and Coptic Unicode Block:
+\begin{quote}
+ \selectlanguage{greek}
+ \GreekAndCoptic\\
+ \greekandcoptic
+\end{quote}
+MakeUppercase:
+\begin{quote}
+ \selectlanguage{greek}
+ \MakeUppercase{\GreekAndCoptic}\\
+ \MakeUppercase{\greekandcoptic}
+\end{quote}
+Letters and ypogegrammeni upcased, tonos dropped, dialytika kept.
+
+There is no capital Koppa in LGR, therefore \ensuregreek{ϟ} is left unchanged
+with MakeUppercase.
+
+
+MakeLowercase:
+
+\begin{quote}
+ \selectlanguage{greek}
+ \MakeLowercase{\GreekAndCoptic}\\
+ \MakeLowercase{\greekandcoptic}
+\end{quote}
+
+The lowercase of \ensuregreek{Σ} is the «auto-sigma» (\verb+\textautosigma+):
+\ensuregreek{ΣΣ $\mapsto$ \MakeLowercase{ΣΣ}}. Add a ZWNJ or use the
+\verb+\noboundary+ macro to prevent conversion to final sigma:
+\ensuregreek{\MakeLowercase{ΣΣ}}. The lowercase of GREEK LETTER STIGMA
+\ensuregreek{Ϛ} is \ensuregreek{\MakeLowercase{Ϛ}}.
+
+
+\subsection{Greek extended}
+
+MakeUppercase:
+
+\selectlanguage{greek}
+
+\MakeUppercase{ ἀ ἁ ἂ ἃ ἄ ἅ ἆ ἇ Ἀ Ἁ Ἂ Ἃ Ἄ Ἅ Ἆ Ἇ }\\
+\MakeUppercase{ ἐ ἑ ἒ ἓ ἔ ἕ Ἐ Ἑ Ἒ Ἓ Ἔ Ἕ }\\
+\MakeUppercase{ ἠ ἡ ἢ ἣ ἤ ἥ ἦ ἧ Ἠ Ἡ Ἢ Ἣ Ἤ Ἥ Ἦ Ἧ }\\
+\MakeUppercase{ ἰ ἱ ἲ ἳ ἴ ἵ ἶ ἷ Ἰ Ἱ Ἲ Ἳ Ἴ Ἵ Ἶ Ἷ }\\
+\MakeUppercase{ ὀ ὁ ὂ ὃ ὄ ὅ Ὀ Ὁ Ὂ Ὃ Ὄ Ὅ }\\
+\MakeUppercase{ ὐ ὑ ὒ ὓ ὔ ὕ ὖ ὗ Ὑ Ὓ Ὕ Ὗ }\\
+\MakeUppercase{ ὠ ὡ ὢ ὣ ὤ ὥ ὦ ὧ Ὠ Ὡ Ὢ Ὣ Ὤ Ὥ Ὦ Ὧ }\\
+\MakeUppercase{ ὰ ά ὲ έ ὴ ή ὶ ί ὸ ό ὺ ύ ὼ ώ }\\
+\MakeUppercase{ ᾀ ᾁ ᾂ ᾃ ᾄ ᾅ ᾆ ᾇ ᾈ ᾉ ᾊ ᾋ ᾌ ᾍ ᾎ ᾏ }\\
+\MakeUppercase{ ᾐ ᾑ ᾒ ᾓ ᾔ ᾕ ᾖ ᾗ ᾘ ᾙ ᾚ ᾛ ᾜ ᾝ ᾞ ᾟ }\\
+\MakeUppercase{ ᾠ ᾡ ᾢ ᾣ ᾤ ᾥ ᾦ ᾧ ᾨ ᾩ ᾪ ᾫ ᾬ ᾭ ᾮ ᾯ }\\
+\MakeUppercase{ ᾰ ᾱ ᾲ ᾳ ᾴ ᾶ ᾷ Ᾰ Ᾱ Ὰ Ά ᾼ ᾽ ι ᾿ }\\
+\MakeUppercase{ ῀ ῁ ῂ ῃ ῄ ῆ ῇ Ὲ Έ Ὴ Ή ῌ ῍ ῎ ῏ }\\
+\MakeUppercase{ ῐ ῑ ῒ ΐ ῖ ῗ Ῐ Ῑ Ὶ Ί ῝ ῞ ῟ }\\
+\MakeUppercase{ ῠ ῡ ῢ ΰ ῤ ῥ ῦ ῧ Ῠ Ῡ Ὺ Ύ Ῥ ῭ ΅ ` }\\
+\MakeUppercase{ ῲ ῳ ῴ ῶ ῷ Ὸ Ό Ὼ Ώ ῼ ´ ῾ }
+\selectlanguage{english}
+
+MakeLowercase:
+
+\selectlanguage{greek}
+\MakeLowercase{ ἀ ἁ ἂ ἃ ἄ ἅ ἆ ἇ Ἀ Ἁ Ἂ Ἃ Ἄ Ἅ Ἆ Ἇ }\\
+\MakeLowercase{ ἐ ἑ ἒ ἓ ἔ ἕ Ἐ Ἑ Ἒ Ἓ Ἔ Ἕ }\\
+\MakeLowercase{ ἠ ἡ ἢ ἣ ἤ ἥ ἦ ἧ Ἠ Ἡ Ἢ Ἣ Ἤ Ἥ Ἦ Ἧ }\\
+\MakeLowercase{ ἰ ἱ ἲ ἳ ἴ ἵ ἶ ἷ Ἰ Ἱ Ἲ Ἳ Ἴ Ἵ Ἶ Ἷ }\\
+\MakeLowercase{ ὀ ὁ ὂ ὃ ὄ ὅ Ὀ Ὁ Ὂ Ὃ Ὄ Ὅ }\\
+\MakeLowercase{ ὐ ὑ ὒ ὓ ὔ ὕ ὖ ὗ Ὑ Ὓ Ὕ Ὗ }\\
+\MakeLowercase{ ὠ ὡ ὢ ὣ ὤ ὥ ὦ ὧ Ὠ Ὡ Ὢ Ὣ Ὤ Ὥ Ὦ Ὧ }\\
+\MakeLowercase{ ὰ ά ὲ έ ὴ ή ὶ ί ὸ ό ὺ ύ ὼ ώ }\\
+\MakeLowercase{ ᾀ ᾁ ᾂ ᾃ ᾄ ᾅ ᾆ ᾇ ᾈ ᾉ ᾊ ᾋ ᾌ ᾍ ᾎ ᾏ }\\
+\MakeLowercase{ ᾐ ᾑ ᾒ ᾓ ᾔ ᾕ ᾖ ᾗ ᾘ ᾙ ᾚ ᾛ ᾜ ᾝ ᾞ ᾟ }\\
+\MakeLowercase{ ᾠ ᾡ ᾢ ᾣ ᾤ ᾥ ᾦ ᾧ ᾨ ᾩ ᾪ ᾫ ᾬ ᾭ ᾮ ᾯ }\\
+\MakeLowercase{ ᾰ ᾱ ᾲ ᾳ ᾴ ᾶ ᾷ Ᾰ Ᾱ Ὰ Ά ᾼ ᾽ ι ᾿ }\\
+\MakeLowercase{ ῀ ῁ ῂ ῃ ῄ ῆ ῇ Ὲ Έ Ὴ Ή ῌ ῍ ῎ ῏ }\\
+\MakeLowercase{ ῐ ῑ ῒ ΐ ῖ ῗ Ῐ Ῑ Ὶ Ί ῝ ῞ ῟ }\\
+\MakeLowercase{ ῠ ῡ ῢ ΰ ῤ ῥ ῦ ῧ Ῠ Ῡ Ὺ Ύ Ῥ ῭ ΅ ` }\\
+\MakeLowercase{ ῲ ῳ ῴ ῶ ῷ Ὸ Ό Ὼ Ώ ῼ ´ ῾ }
+
+\textlatin{Test the iota subscript:}
+\textAlpha\prosgegrammeni ᾼ Α\prosgegrammeni ᾈ Ἀ\prosgegrammeni
+\MakeLowercase{\textAlpha\prosgegrammeni ᾼ Α\prosgegrammeni ᾈ
+ Ἀ\prosgegrammeni}
+
+\textAlpha\ypogegrammeni ᾼ Α\ypogegrammeni ᾈ Ἀ\ypogegrammeni
+\MakeLowercase{\textAlpha\ypogegrammeni ᾼ Α\ypogegrammeni ᾈ
+ Ἀ\ypogegrammeni}
+\MakeUppercase{\textAlpha\ypogegrammeni ᾼ Α\ypogegrammeni ᾈ
+ Ἀ\ypogegrammeni}
+
+\selectlanguage{english}
+
+
+\subsection{Other Unicode Blocks}
+
+MakeUppercase does not change non-letter symbols and the letter shwa
+(there is a capital Cyrillic schwa in T2A encoded fonts):
+\begin{quote}
+ \greekscript
+ \MakeUppercase{¨ « ¯ ´ · »}
+ \MakeUppercase{ə}
+ \MakeUppercase{˘a}
+ \MakeUppercase{– — ‘ ’ ‰ au}
+ \MakeUppercase{€}
+ % \MakeUppercase{Ω}
+ \MakeUppercase{
+ 𐅄 % GREEK ACROPHONIC ATTIC FIFTY
+ 𐅅 % GREEK ACROPHONIC ATTIC FIVE HUNDRED
+ 𐅆 % GREEK ACROPHONIC ATTIC FIVE THOUSAND
+ 𐅇 % GREEK ACROPHONIC ATTIC FIFTY THOUSAND
+ }
+\end{quote}
+MakeLowercase does not change non-letter symbols either:
+\begin{quote}
+ \greekscript
+ \MakeLowercase{¨ « ¯ ´ · »}
+ \MakeLowercase{ə}
+ \MakeLowercase{˘A}
+ \MakeLowercase{– — ‘ ’ ‰ AU}
+ \MakeLowercase{€}
+ % \MakeLowercase{Ω}
+ \MakeLowercase{
+ 𐅄 % GREEK ACROPHONIC ATTIC FIFTY
+ 𐅅 % GREEK ACROPHONIC ATTIC FIVE HUNDRED
+ 𐅆 % GREEK ACROPHONIC ATTIC FIVE THOUSAND
+ 𐅇 % GREEK ACROPHONIC ATTIC FIFTY THOUSAND
+ }
+\end{quote}
+
+\section{Test kerning/ligatures}
+
+
+check for kerning and unwanted ligatures:
+
+\begin{quote}
+ \greekscript
+
+Αἀα Αἁα Αἂα Αἃα Αἄα Αἅα Αἆα Αἇα ΑἈα ΑἉα ΑἊα ΑἋα ΑἌα ΑἍα ΑἎα ΑἏα
+
+Αἐα Αἑα Αἒα Αἓα Αἔα Αἕα ΑἘα ΑἙα ΑἚα ΑἛα ΑἜα ΑἝα
+
+Αἠα Αἡα Αἢα Αἣα Αἤα Αἥα Αἦα Αἧα ΑἨα ΑἩα ΑἪα ΑἫα ΑἬα ΑἭα ΑἮα ΑἯα
+
+Αἰα Αἱα Αἲα Αἳα Αἴα Αἵα Αἶα Αἷα ΑἸα ΑἹα ΑἺα ΑἻα ΑἼα ΑἽα ΑἾα ΑἿα
+
+Αὀα Αὁα Αὂα Αὃα Αὄα Αὅα ΑὈα ΑὉα ΑὊα ΑὋα ΑὌα ΑὍα
+
+Αὐα Αὑα Αὒα Αὓα Αὔα Αὕα Αὖα Αὗα ΑὙα ΑὛα ΑὝα ΑὟα
+
+Αὠα Αὡα Αὢα Αὣα Αὤα Αὥα Αὦα Αὧα ΑὨα ΑὩα ΑὪα ΑὫα ΑὬα ΑὭα ΑὮα ΑὯα
+
+Αὰα Αάα Αὲα Αέα Αὴα Αήα Αὶα Αία Αὸα Αόα Αὺα Αύα Αὼα Αώα
+
+Αᾀα Αᾁα Αᾂα Αᾃα Αᾄα Αᾅα Αᾆα Αᾇα Αᾈα Αᾉα Αᾊα Αᾋα Αᾌα Αᾍα Αᾎα Αᾏα
+
+Αᾐα Αᾑα Αᾒα Αᾓα Αᾔα Αᾕα Αᾖα Αᾗα Αᾘα Αᾙα Αᾚα Αᾛα Αᾜα Αᾝα Αᾞα Αᾟα
+
+Αᾠα Αᾡα Αᾢα Αᾣα Αᾤα Αᾥα Αᾦα Αᾧα Αᾨα Αᾩα Αᾪα Αᾫα Αᾬα Αᾭα Αᾮα Αᾯα
+
+Αᾰα Αᾱα Αᾲα Αᾳα Αᾴα Αᾶα Αᾷα ΑᾸα ΑᾹα ΑᾺα ΑΆα Αᾼα Α᾽α Αια Α᾿α
+
+Α῀α Α῁α Αῂα Αῃα Αῄα Αῆα Αῇα ΑῈα ΑΈα ΑῊα ΑΉα Αῌα Α῍α Α῎α Α῏α
+
+Αῐα Αῑα Αῒα Αΐα Αῖα Αῗα ΑῘα ΑῙα ΑῚα ΑΊα Α῝α Α῞α Α῟α
+
+Αῠα Αῡα Αῢα Αΰα Αῤα Αῥα Αῦα Αῧα ΑῨα ΑῩα ΑῪα ΑΎα ΑῬα Α῭α Α΅α Α`α
+
+Αῲα Αῳα Αῴα Αῶα Αῷα ΑῸα ΑΌα ΑῺα ΑΏα Αῼα Α´α Α῾α
+
+\end{quote}
+
+\end{document}
+
+
+Problems with text-extraction from PDF with Kerkis:
+
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F
+370 * * * * ΄ ͵ * * ι * * * ;
+380 ΄ ΅ ΄Α ΄Ε ΄Η ΄Ι ΄Ο ΄Υ ΄Ω
+390 ΐ Α Β Γ ∆ Ε Ζ Η Θ Ι Κ Λ Μ Ν Ξ Ο
+3Α0 Π Ρ Σ Τ Υ Φ Χ Ψ Ω Ϊ Ϋ ά έ ή ί
+3Β0 ΰ α ϐ γ δ ε Ϲ η ϑ ι κ λ µ ν ξ ο
+3῝0 π ϱ ς σ τ υ ϕ χ ψ ω ϊ ϋ ό ύ ώ
+3∆0 * * * * * * * * Ϟ Ϝ ϝ Ϝ ϝ * ϟ
+3Ε0 ϡ * * * * * * * * * * * * * *
+3Φ0 * * * * * * * * * * * * * * * *
+
+
+0387 GREEK ANO TELEIA missing
+03B6 zeta replaced by 03F9 GREEK CAPITAL LUNATE SIGMA SYMBOL
+03B8 GREEK SMALL LETTER THETA replaced by 03D1 GREEK THETA SYMBOL
+03C1 GREEK SMALL LETTER RHO replaced by 03F1 GREEK RHO SYMBOL
+03C6 GREEK SMALL LETTER PHI replaced by 03D5 GREEK PHI SYMBOL
+
+
+and GFS Didot:
+
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F
+370 * * * * ´ ͵ * * ι * * * ;
+380 ´ ῆ Α
+ ´ ´ ´Ε ´Η ´Ι ´Ο ´Υ ´Ω
+390 ῆ ´ι Α Β Γ ∆ Ε Ζ Η Θ Ι Κ Λ Μ Ν Ξ Ο
+3Α0 Π Ρ Σ Τ Υ Φ Χ Ψ Ω ῆ
+ Ι ῆ
+ Υ ά έ ή ί
+3Β0 ῆ ´υ α β γ δ ε ζ η ϑ ι κ λ μ ν ξ ο
+ 3῝0 π ρ ς σ τ υ φ χ ψ ω ι
+ ῆ υ
+ ῆ ό ύ ώ
+3∆0 * * * * * * * * Ϛ Ϝ Ϝ * Ϟ
+3Ε0 * * * * * * * * * * * * * *
+3Φ0 * * * * * * * * * * * * * * * *
Binary files old/doc/latex/greek-inputenc/greek-utf8.pdf and new/doc/latex/greek-inputenc/greek-utf8.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/greek-inputenc/greek-utf8.tex new/doc/latex/greek-inputenc/greek-utf8.tex
--- old/doc/latex/greek-inputenc/greek-utf8.tex 2015-08-09 00:55:00.000000000 +0200
+++ new/doc/latex/greek-inputenc/greek-utf8.tex 2019-07-11 23:00:51.000000000 +0200
@@ -1,4 +1,4 @@
-\documentclass[a4paper]{article}
+\documentclass[a4paper]{scrartcl}
\usepackage{cmap} % fix search and cut-and-paste in Acrobat Reader
\usepackage[LGR,T1]{fontenc}
\usepackage[utf8]{inputenc}
@@ -27,10 +27,12 @@
\author{Günter Milde}
\maketitle
-\abstract{ The definitions in \texttt{lgrenc.dfu} provide UTF-8 support for
+\begin{abstract}
+The definitions in \texttt{lgrenc.dfu} provide UTF-8 support for
the Greek script based on \emph{inputenc} and the \emph{LaTeX internal
character representation} macros (LICRs) defined in the \emph{greek-fontenc}
package.
+\end{abstract}
\section{Requirements}
@@ -137,7 +139,7 @@
LGR is no ``standard font encoding''. Latin characters and some other ASCII
symbols are mapped to Greek equivalents if LGR is the active font encoding.
(See
-\href{http://mirrors.ctan.org/macros/latex/contrib/babel-contrib/greek/usage.pdf}{usage.pdf}
+\href{http://mirrors.ctan.org/language/babel/contrib/greek/usage.pdf}{usage.pdf}
for a description of this Latin-Greek transliteration.)
This means you need an explicit language and/or font-encoding switch for
@@ -176,7 +178,6 @@
\subsection{Greek and Coptic}
-\centerline{
\begin{tabular}{rrrrrrrrrrrrrrrrr}
\toprule
& 0 & 1 & 2 & 3 & 4 & 5 & 6 & 7 & 8 & 9 & A & B & \textlatin C & D & E & F\\
@@ -192,14 +193,13 @@
\textlatin{3F0} & * & * & * & * & * & * & * & * & * & * & * & * & * & * & * & *\\
\bottomrule
\end{tabular}
-} % end centerline
-\noindent
+
+ \noindent
legend: * glyph missing in LGR, [space] Unicode point not defined
\subsection{Greek Extended}
-\centerline{
\begin{tabular}{rrrrrrrrrrrrrrrrr}
\toprule
& 0 & 1 & 2 & 3 & 4 & 5 & 6 & 7 & 8 & 9 & A & B & \textlatin C & D & E & F\\
@@ -222,7 +222,7 @@
\textlatin{1FF0} & & & ῲ & ῳ & ῴ & & ῶ & ῷ & Ὸ & Ό & Ὼ & Ώ & ῼ & ´ & ῾ & \\
\bottomrule
\end{tabular}
-} % end centerline
+
\subsection{Other Unicode Blocks}
@@ -401,7 +401,7 @@
𐅇 % GREEK ACROPHONIC ATTIC FIFTY THOUSAND
}
\end{quote}
-MakeLowercase does not change non-letter symbols, too:
+MakeLowercase does not change non-letter symbols, either:
\begin{quote}
\greekscript
\MakeLowercase{¨ « ¯ ´ · »}
Binary files old/doc/latex/greek-inputenc/inputenc-iso-8859-7.pdf and new/doc/latex/greek-inputenc/inputenc-iso-8859-7.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/greek-inputenc/inputenc-iso-8859-7.tex new/doc/latex/greek-inputenc/inputenc-iso-8859-7.tex
--- old/doc/latex/greek-inputenc/inputenc-iso-8859-7.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/greek-inputenc/inputenc-iso-8859-7.tex 2019-07-11 23:00:51.000000000 +0200
@@ -0,0 +1,84 @@
+%% LyX 2.4.0dev created this file. For more info, see https://www.lyx.org/.
+%% Do not edit unless you really know what you are doing.
+\documentclass[greek,english]{article}
+\usepackage{lmodern}
+\usepackage[LGR,T1]{fontenc}
+\usepackage[iso-8859-7]{inputenc}
+\usepackage{textcomp}
+\usepackage{babel}
+\usepackage{xfrac}
+\usepackage{textalpha}
+
+\newcommand{\nd}{\textlatin{\sfrac{n}{d}}}
+
+\newcommand{\topic}{\medskip\noindent}
+
+\begin{document}
+
+\subsection*{Input encoding ISO 8859-7}
+
+Greek:
+
+... 0 1 2 3 4 5 6 7 8 9 A B C D E F
+
+A: \foreignlanguage{greek}{\textlatin{\small NBSP} � � � � \nd{} � �
+ � � � � � \textlatin{\small SHY} \nd{} �}
+
+B: \foreignlanguage{greek}{� � � � � � � �
+ � � � � � � � �}
+
+C: \foreignlanguage{greek}{� � � � � � � � � � � � � � � �}
+
+D: \foreignlanguage{greek}{� � \nd{} � � � � � � � � � � � � �}
+
+E: \foreignlanguage{greek}{� � � � � � � � � � � � � � � �}
+
+F: \foreignlanguage{greek}{� � � � � � � � � � � � � � � \nd}
+
+
+\topic English (with package `textalpha'):
+
+... 0 1 2 3 4 5 6 7 8 9 A B C D E F
+
+A: {\textlatin{\small NBSP} � � � � \nd{} � �
+ � � � � � \textlatin{\small SHY} \nd{} �}
+
+B: {� � � � � � � �
+ � � � � � � � �}
+
+C: {� � � � � � � � � � � � � � � �}
+
+D: {� � \nd{} � � � � � � � � � � � � �}
+
+E: {� � � � � � � � � � � � � � � �}
+
+F: {� � � � � � � � � � � � � � � \nd}
+
+\topic
+{\footnotesize
+Legend:
+
+SHY: Soft Hyphen
+
+NBSP: No Break Space
+
+\nd: not defined in LGR font encoding
+}
+
+
+\subsubsection*{Test No Break Space and Soft Hyphen}
+
+\begin{description}
+
+\item[|] \hfill $\leftarrow$ margins $\rightarrow$ \hfill |
+\item[NBSP:]
+ \begin{flushleft} (flush left) No�Break�Space No�Break�Space
+ No�Break�Space No�Break�Space No�Break�Space
+ \end{flushleft}
+
+\item[SHY:] \ldots{} Soft�Hyphen Soft�Hyphen Soft�Hyphen
+ Soft�Hyphen Soft�Hyphen Soft�Hyphen
+\item[|] \hfill $\leftarrow$ margins $\rightarrow$ \hfill |
+\end{description}
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/greek-inputenc/lgrenc.dfu.html new/doc/latex/greek-inputenc/lgrenc.dfu.html
--- old/doc/latex/greek-inputenc/lgrenc.dfu.html 2015-08-09 00:55:00.000000000 +0200
+++ new/doc/latex/greek-inputenc/lgrenc.dfu.html 2019-07-11 23:00:51.000000000 +0200
@@ -1,15 +1,17 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" />
+<meta charset="utf-8"/>
+<meta name="generator" content="Docutils 0.15b.dev: http://docutils.sourceforge.net/" />
<title>lgrenc.dfu</title>
+<meta name="dcterms.rights" content="© 2010 Günter Milde" />
+<link rel="schema.dcterms" href="http://purl.org/dc/terms/">
<style type="text/css">
/* Minimal style sheet for the HTML output of Docutils. */
/* */
/* :Author: Günter Milde, based on html4css1.css by David Goodger */
-/* :Id: $Id: minimal.css 7893 2015-05-11 15:38:58Z milde $ */
+/* :Id: $Id$ */
/* :Copyright: © 2015 Günter Milde. */
/* :License: Released under the terms of the `2-Clause BSD license`_, */
/* in short: */
@@ -28,10 +30,13 @@
/* .. _CSS2.1: http://www.w3.org/TR/CSS2 */
/* .. _validates: http://jigsaw.w3.org/css-validator/validator$link */
-/* Figure/table alignment */
-.align-left { text-align: left; }
-.align-right { text-align: right; }
-.align-center { clear: both; text-align: center;}
+/* alignment of text and inline objects inside block objects*/
+.align-left { text-align: left; }
+.align-right { text-align: right; }
+.align-center { clear: both; text-align: center; }
+.align-top { vertical-align: top; }
+.align-middle { vertical-align: middle; }
+.align-bottom { vertical-align: bottom; }
/* titles */
h1.title, p.subtitle {
@@ -99,9 +104,10 @@
/* Table of Contents */
div.topic.contents { margin: 0; }
-ul.auto-toc {
+div.topic.contents ul {
list-style-type: none;
- padding-left: 1.5em; }
+ padding-left: 1.5em;
+}
/* Enumerated Lists */
ol.arabic { list-style: decimal }
@@ -161,8 +167,19 @@
span.option { white-space: nowrap; }
/* Footnotes and Citations */
+dl.footnote.superscript > dd {margin-left: 1em; }
+dl.footnote.brackets > dd {margin-left: 2em; }
dl > dt.label { font-weight: normal; }
-dt.label > span.fn-backref { margin: 0.2em; }
+a.footnote-reference.brackets:before,
+dt.label > span.brackets:before { content: "["; }
+a.footnote-reference.brackets:after,
+dt.label > span.brackets:after { content: "]"; }
+a.footnote-reference.superscript,
+dl.footnote.superscript > dt.label {
+ vertical-align: super;
+ font-size: smaller;
+}
+dt.label > span.fn-backref { margin-left: 0.2em; }
dt.label > span.fn-backref > a { font-style: italic; }
/* Line Blocks */
@@ -173,28 +190,34 @@
margin-left: 40px;
}
-/* Images and Figures */
-img.align-left,
+/* Figures, Images, and Tables */
.figure.align-left,
-object.align-left {
- display: block;
+img.align-left,
+object.align-left,
+table.align-left {
margin-right: auto;
}
-img.align-center,
.figure.align-center,
+img.align-center,
object.align-center {
+ margin-left: auto;
+ margin-right: auto;
display: block;
+}
+table.align-center {
margin-left: auto;
margin-right: auto;
}
-img.align-right,
.figure.align-right,
-object.align-right {
- display: block;
+img.align-right,
+object.align-right,
+table.align-right {
margin-left: auto;
}
-/* reset inner alignment in figures */
-div.align-right { text-align: inherit }
+/* reset inner alignment in figures and tables */
+/* div.align-left, div.align-center, div.align-right, */
+table.align-left, table.align-center, table.align-right
+{ text-align: inherit }
/* Admonitions and System Messages */
div.admonition,
@@ -215,13 +238,14 @@
}
/* Text Blocks */
+blockquote,
div.topic,
pre.literal-block,
pre.doctest-block,
pre.math,
pre.code {
- margin-right: 40px;
- margin-left: 40px;
+ margin-left: 1.5em;
+ margin-right: 1.5em
}
pre.code .ln { color: gray; } /* line numbers */
@@ -254,7 +278,7 @@
/* Rules for easy reading and pre-defined style variants. */
/* */
/* :Author: Günter Milde, based on html4css1.css by David Goodger */
-/* :Id: $Id: plain.css 7893 2015-05-11 15:38:58Z milde $ */
+/* :Id: $Id$ */
/* :Copyright: © 2015 Günter Milde. */
/* :License: Released under the terms of the `2-Clause BSD license`_, */
/* in short: */
@@ -274,8 +298,8 @@
/* "page layout" */
body {
- padding: 0 5%;
- margin: 8px 0;
+ margin: 0;
+ background-color: #dbdbdb;
}
div.document {
line-height:1.3;
@@ -284,7 +308,9 @@
/* avoid long lines --> better reading */
/* OTOH: lines should not be too short because of missing hyphenation, */
max-width: 50em;
+ padding: 1px 2%; /* 1px on top avoids grey bar above title (mozilla) */
margin: auto;
+ background-color: white;
}
/* Sections */
@@ -318,9 +344,9 @@
/* Definition Lists */
-dl > dd p:first-child { margin-top: 0; }
+dl > dd > p:first-child { margin-top: 0; }
/* :last-child is not part of CSS 2.1 (introduced in CSS 3) */
-/* dl > dd p:last-child { margin-bottom: 0; } */
+dl > dd > p:last-child { margin-bottom: 0; }
/* lists nested in definition lists */
/* :only-child is not part of CSS 2.1 (introduced in CSS 3) */
@@ -376,19 +402,9 @@
/* ============ */
/* Literal Blocks */
-pre.literal-block, pre.doctest-block,
-pre.math, pre.code {
- margin-left: 1.5em;
- margin-right: 1.5em
-}
/* Block Quotes */
-blockquote,
-div.topic {
- margin-left: 1.5em;
- margin-right: 1.5em
-}
blockquote > table,
div.topic > table {
margin-top: 0;
@@ -405,6 +421,8 @@
/* th { vertical-align: bottom; } */
+table tr { text-align: left; }
+
/* "booktabs" style (no vertical lines) */
table.booktabs {
border: 0;
@@ -417,7 +435,6 @@
}
table.booktabs th {
border-bottom: thin solid;
- text-align: left;
}
/* numbered tables (counter defined in div.document) */
@@ -447,16 +464,20 @@
/* ~~~~~~~~~~~~~ */
/* Images and Figures */
-img.align-left,
+
+/* let content flow to the side of aligned images and figures */
.figure.align-left,
+img.align-left,
object.align-left {
+ display: block;
clear: left;
float: left;
margin-right: 1em
}
-img.align-right,
.figure.align-right,
+img.align-right,
object.align-right {
+ display: block;
clear: right;
float: right;
margin-left: 1em
@@ -478,6 +499,7 @@
/* Code */
+pre.code { padding: 0.7ex }
pre.code, code { background-color: #eeeeee }
pre.code .ln { color: gray; } /* line numbers */
/* basic highlighting: for a complete scheme, see */
@@ -539,7 +561,6 @@
<body>
<div class="document" id="lgrenc-dfu">
<h1 class="title">lgrenc.dfu</h1>
-
<p class="subtitle" id="greek-unicode-support-with-inputenc">Greek Unicode support with inputenc</p>
<dl class="docinfo">
<dt class="copyright">Copyright</dt>
@@ -550,7 +571,7 @@
version 1.3 of this license or any later version.</p>
</dd>
<dt class="identification">Identification</dt>
-<dd class="identification"><pre class="literal-block">\ProvidesFile{lgrenc.dfu}[2015/08/05 1.6 UTF-8 support for Greek]</pre>
+<dd class="identification"><pre class="literal-block">\ProvidesFile{lgrenc.dfu}[2019/07/11 1.7 UTF-8 support for Greek]</pre>
</dd>
</dl>
<p>Based on a <a class="reference external" href="http://www.eutypon.gr/eutypon/pdf/e2008-20/e20-a03.pdf">babel patch</a> by Werner Lemberg, with input from the <a class="reference external" href="http://www.ctan.org/pkg/ucs">ucs</a>
@@ -613,6 +634,10 @@
<td></td>
<td><p>Map GREEK … SYMBOL characters.</p></td>
</tr>
+<tr><td><p>1.7</p></td>
+<td><p>2019-07-11</p></td>
+<td><p>Remove some duplicate definitions (punctuation, Euro).</p></td>
+</tr>
</tbody>
</table>
</dd>
@@ -654,7 +679,7 @@
\DeclareUnicodeCharacter{00AB}{\guillemotleft} % «
\DeclareUnicodeCharacter{00AF}{\textasciimacron} % ¯
\DeclareUnicodeCharacter{00B4}{\textasciiacute} % ´
-\DeclareUnicodeCharacter{00B7}{\textperiodcentered} % ·
+\DeclareUnicodeCharacter{00B7}{\textperiodcentered} % · = ano teleia
\DeclareUnicodeCharacter{00BB}{\guillemotright} % »</pre>
</div>
<div class="section" id="ipa-extensions-t3">
@@ -665,21 +690,6 @@
<h2>Spacing Modifier Letters</h2>
<pre class="literal-block">\DeclareUnicodeCharacter{02D8}{\textasciibreve} % ˘</pre>
</div>
-<div class="section" id="general-punctuation">
-<h2>General Punctuation</h2>
-<pre class="literal-block">\DeclareUnicodeCharacter{2013}{\textendash} % –
-\DeclareUnicodeCharacter{2014}{\textemdash} % —
-\DeclareUnicodeCharacter{2018}{\textquoteleft} % ‘
-\DeclareUnicodeCharacter{2019}{\textquoteright} % ’
-\DeclareUnicodeCharacter{201A}{\quotesinglbase} % ‚
-\DeclareUnicodeCharacter{2030}{\textperthousand} % ‰
-\DeclareUnicodeCharacter{2039}{\guilsinglleft} % ‹
-\DeclareUnicodeCharacter{203A}{\guilsinglright} % ›</pre>
-</div>
-<div class="section" id="currency-symbols">
-<h2>Currency Symbols</h2>
-<pre class="literal-block">\DeclareUnicodeCharacter{20AC}{\texteuro} % €</pre>
-</div>
<div class="section" id="greek-and-coptic">
<h2>Greek and Coptic</h2>
<pre class="literal-block">% NR Unicode Name % babel name, PU name
@@ -1034,8 +1044,8 @@
\DeclareUnicodeCharacter{1FEA}{\ensuregreek{\accvaria\textUpsilon}} % Ὺ
\DeclareUnicodeCharacter{1FEB}{\ensuregreek{\acctonos\textUpsilon}} % Ύ
\DeclareUnicodeCharacter{1FEC}{\ensuregreek{\accdasia\textRho}} % Ῥ
-\DeclareUnicodeCharacter{1FED}{\ensuregreek{\accdialytikavaria{}}} % ῭
-\DeclareUnicodeCharacter{1FEE}{\ensuregreek{\accdialytikatonos{}}} % ΅
+\DeclareUnicodeCharacter{1FED}{\accdialytikavaria{ }} % ῭
+\DeclareUnicodeCharacter{1FEE}{\accdialytikatonos{ }} % ΅
\DeclareUnicodeCharacter{1FEF}{\accvaria{ }} % `
\DeclareUnicodeCharacter{1FF2}{\ensuregreek{\accvaria\textomega\ypogegrammeni}} % ῲ
@@ -1048,17 +1058,23 @@
\DeclareUnicodeCharacter{1FFA}{\ensuregreek{\accvaria\textOmega}} % Ὼ
\DeclareUnicodeCharacter{1FFB}{\ensuregreek{\acctonos\textOmega}} % Ώ
\DeclareUnicodeCharacter{1FFC}{\ensuregreek{\textOmega\prosgegrammeni}} % ῼ
-\DeclareUnicodeCharacter{1FFD}{\ensuregreek{\acctonos{}}} % ´
+\DeclareUnicodeCharacter{1FFD}{\acctonos{ }} % ´
\DeclareUnicodeCharacter{1FFE}{\accdasia{ }} % ῾</pre>
</div>
-<div class="section" id="id1">
+<div class="section" id="general-punctuation">
<h2>General Punctuation</h2>
<pre class="literal-block">\DeclareUnicodeCharacter{2013}{\textendash} % –
\DeclareUnicodeCharacter{2014}{\textemdash} % —
\DeclareUnicodeCharacter{2018}{\textquoteleft} % ‘
\DeclareUnicodeCharacter{2019}{\textquoteright} % ’
+\DeclareUnicodeCharacter{201A}{\quotesinglbase} % ‚
\DeclareUnicodeCharacter{2030}{\textperthousand} % ‰
-\DeclareUnicodeCharacter{20AC}{\texteuro} % €</pre>
+\DeclareUnicodeCharacter{2039}{\guilsinglleft} % ‹
+\DeclareUnicodeCharacter{203A}{\guilsinglright} % ›</pre>
+</div>
+<div class="section" id="currency-symbols">
+<h2>Currency Symbols</h2>
+<pre class="literal-block">\DeclareUnicodeCharacter{20AC}{\texteuro} % €</pre>
</div>
<div class="section" id="letterlike-symbols">
<h2>Letterlike Symbols</h2>
Binary files old/doc/latex/greek-inputenc/test-iso-8859-7.pdf and new/doc/latex/greek-inputenc/test-iso-8859-7.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/greek-inputenc/test-iso-8859-7.tex new/doc/latex/greek-inputenc/test-iso-8859-7.tex
--- old/doc/latex/greek-inputenc/test-iso-8859-7.tex 2013-05-27 06:55:18.000000000 +0200
+++ new/doc/latex/greek-inputenc/test-iso-8859-7.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-\documentclass[a4paper,11pt]{article}
-\usepackage[greek]{babel}
-\usepackage[iso-8859-7]{inputenc}
-\begin{document}
-���� ����� ��� ����
-���� ������ ����!
-\textlatin{This is a text in english}
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/greek-inputenc.doc.tlpobj new/tlpkg/tlpobj/greek-inputenc.doc.tlpobj
--- old/tlpkg/tlpobj/greek-inputenc.doc.tlpobj 2019-02-28 03:40:44.000000000 +0100
+++ new/tlpkg/tlpobj/greek-inputenc.doc.tlpobj 2019-07-12 01:55:19.000000000 +0200
@@ -1,14 +1,16 @@
name greek-inputenc.doc
category Package
-revision 40613
+revision 51612
shortdesc doc files of greek-inputenc
relocated 1
-docfiles size=130
+docfiles size=237
RELOC/doc/latex/greek-inputenc/README
RELOC/doc/latex/greek-inputenc/README.html
+ RELOC/doc/latex/greek-inputenc/greek-utf8-minimal.pdf
+ RELOC/doc/latex/greek-inputenc/greek-utf8-minimal.tex
RELOC/doc/latex/greek-inputenc/greek-utf8.pdf
RELOC/doc/latex/greek-inputenc/greek-utf8.tex
+ RELOC/doc/latex/greek-inputenc/inputenc-iso-8859-7.pdf
+ RELOC/doc/latex/greek-inputenc/inputenc-iso-8859-7.tex
RELOC/doc/latex/greek-inputenc/lgrenc.dfu.html
- RELOC/doc/latex/greek-inputenc/test-iso-8859-7.pdf
- RELOC/doc/latex/greek-inputenc/test-iso-8859-7.tex
RELOC/doc/latex/greek-inputenc/unicode-licr.txt
++++++ greek-inputenc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/greek-inputenc/iso-8859-7.def new/tex/latex/greek-inputenc/iso-8859-7.def
--- old/tex/latex/greek-inputenc/iso-8859-7.def 2008-06-10 15:29:46.000000000 +0200
+++ new/tex/latex/greek-inputenc/iso-8859-7.def 2019-07-11 23:00:51.000000000 +0200
@@ -1,5 +1,5 @@
\ProvidesFile{iso-8859-7.def}
- [2000/05/28 v1.2 Greek input encoding file]
+ [2019/01/08 v1.7 Greek input encoding file]
%% iso-8859-7 input encoding file by Apostolos Syropoulos
%% with modifications by C.Beccari
%%
@@ -8,152 +8,114 @@
%% This fil 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.
-%%
-%%
+%%
+%%
%% IMPORTANT NOTICE:
-%%
+%%
%% This file is subject to the LPPL licence, version 1.3 or any subsequent
%% version. Copy of the LaTeX Project Public Licence is downloadable from
%% any CTAN archive.
-%%
-\DeclareInputText{128}{\textbullet}
-\DeclareInputText{129}{\textbullet}
-\DeclareInputText{130}{\textbullet}
-\DeclareInputText{131}{\textbullet}
-\DeclareInputText{132}{\textbullet}
-\DeclareInputText{133}{\textbullet}
-\DeclareInputText{134}{\textbullet}
-\DeclareInputText{135}{\textbullet}
-\DeclareInputText{136}{\textbullet}
-\DeclareInputText{137}{\textbullet}
-\DeclareInputText{138}{\textbullet}
-\DeclareInputText{139}{\textbullet}
-\DeclareInputText{140}{\textbullet}
-\DeclareInputText{141}{\textbullet}
-\DeclareInputText{142}{\textbullet}
-\DeclareInputText{143}{\textbullet}
-\DeclareInputText{144}{\textbullet}
-\DeclareInputText{145}{``}
-\DeclareInputText{146}{''}
-\DeclareInputText{147}{``}
-\DeclareInputText{148}{''}
-\DeclareInputText{149}{\textbullet}
-\DeclareInputText{150}{\textbullet}
-\DeclareInputText{151}{\textbullet}
-\DeclareInputText{152}{\textbullet}
-\DeclareInputText{153}{\textbullet}
-\DeclareInputText{154}{\textbullet}
-\DeclareInputText{155}{\textbullet}
-\DeclareInputText{156}{\textbullet}
-\DeclareInputText{157}{\textbullet}
-\DeclareInputText{158}{\textbullet}
-\DeclareInputText{159}{\textbullet}
-\DeclareInputText{160}{\textbullet}
-\DeclareInputText{161}{\textbullet}
-\DeclareInputText{162}{'A}
-\DeclareInputText{163}{\textbullet}
-\DeclareInputText{164}{\textbullet}
-\DeclareInputText{165}{\textbullet}
-\DeclareInputText{166}{\textbullet}
-\DeclareInputText{167}{\textbullet}
-\DeclareInputText{168}{\textbullet}
-\DeclareInputText{169}{\textbullet}
-\DeclareInputText{170}{\textbullet}
-\DeclareInputText{171}{((}
-\DeclareInputText{172}{\textbullet}
-\DeclareInputText{173}{\textbullet}
-\DeclareInputText{174}{\textbullet}
-\DeclareInputText{175}{\textbullet}
-\DeclareInputText{176}{\textbullet}
-\DeclareInputText{177}{\textbullet}
-\DeclareInputText{178}{\textbullet}
-\DeclareInputText{179}{\textbullet}
-\DeclareInputText{180}{\textbullet}
-\DeclareInputText{181}{\textbullet}
-\DeclareInputText{182}{'A}
-\DeclareInputText{183}{\textbullet}
-\DeclareInputText{184}{'E}
-\DeclareInputText{185}{'H}
-\DeclareInputText{186}{'I}
-\DeclareInputText{187}{))}
-\DeclareInputText{188}{'O}
-\DeclareInputText{189}{\textbullet}
-\DeclareInputText{190}{'U}
-\DeclareInputText{191}{'W}
-%\DeclareInputText{192}{"'i}
-\chardef\idiaerac=242
-\DeclareInputText{192}{\char\idiaerac}
-\DeclareInputText{193}{A}
-\DeclareInputText{194}{B}
-\DeclareInputText{195}{G}
-\DeclareInputText{196}{D}
-\DeclareInputText{197}{E}
-\DeclareInputText{198}{Z}
-\DeclareInputText{199}{H}
-\DeclareInputText{200}{J}
-\DeclareInputText{201}{I}
-\DeclareInputText{202}{K}
-\DeclareInputText{203}{L}
-\DeclareInputText{204}{M}
-\DeclareInputText{205}{N}
-\DeclareInputText{206}{X}
-\DeclareInputText{207}{O}
-\DeclareInputText{208}{P}
-\DeclareInputText{209}{R}
-\DeclareInputText{210}{\textbullet}
-\DeclareInputText{211}{S}
-\DeclareInputText{212}{T}
-\DeclareInputText{213}{U}
-\DeclareInputText{214}{F}
-\DeclareInputText{215}{Q}
-\DeclareInputText{216}{Y}
-\DeclareInputText{217}{W}
-%\DeclareInputText{218}{"I}
-%\DeclareInputText{219}{"U}
-\chardef\Idiaer=219
-\chardef\Udiaer=223
-\DeclareInputText{218}{\char\Idiaer}
-\DeclareInputText{219}{\char\Udiaer}
-\DeclareInputText{220}{'a}
-\DeclareInputText{221}{'e}
-\DeclareInputText{222}{'h}
-\DeclareInputText{223}{'i}
-%\DeclareInputText{224}{"'u}
-\chardef\udiaerac=246
-\DeclareInputText{224}{\char\udiaerac}
-\DeclareInputText{225}{a}
-\DeclareInputText{226}{b}
-\DeclareInputText{227}{g}
-\DeclareInputText{228}{d}
-\DeclareInputText{229}{e}
-\DeclareInputText{230}{z}
-\DeclareInputText{231}{h}
-\DeclareInputText{232}{j}
-\DeclareInputText{233}{i}
-\DeclareInputText{234}{k}
-\DeclareInputText{235}{l}
-\DeclareInputText{236}{m}
-\DeclareInputText{237}{n}
-\DeclareInputText{238}{x}
-\DeclareInputText{239}{o}
-\DeclareInputText{240}{p}
-\DeclareInputText{241}{r}
-\DeclareInputText{242}{s}
-\DeclareInputText{243}{s}
-\DeclareInputText{244}{t}
-\DeclareInputText{245}{u}
-\DeclareInputText{246}{f}
-\DeclareInputText{247}{q}
-\DeclareInputText{248}{y}
-\DeclareInputText{249}{w}
-%\DeclareInputText{250}{"i}
-%\DeclareInputText{251}{"u}
-\chardef\idiaer=240
-\chardef\udiaer=244
-\DeclareInputText{250}{\char\idiaer}
-\DeclareInputText{251}{\char\udiaer}
-\DeclareInputText{252}{'o}
-\DeclareInputText{253}{'u}
-\DeclareInputText{254}{'w}
-\DeclareInputText{255}{\textbullet}
+%%
+\ProvideTextCommandDefault{\textdegree}{\ensuremath{{^\circ}}}
+\ProvideTextCommandDefault{\textonehalf}{\ensuremath{\frac12}}
+\ProvideTextCommandDefault{\texttwosuperior}{\ensuremath{{^2}}}
+\ProvideTextCommandDefault{\textthreesuperior}{\ensuremath{^3}}
+\ProvideTextCommandDefault{\textplusminus}{\ensuremath{\pm}}
+
+\DeclareInputText{160}{\nobreakspace}
+\DeclareInputText{161}{\textquoteleft}
+\DeclareInputText{162}{\textquoteright}
+\DeclareInputText{163}{\pounds}
+\DeclareInputText{164}{\texteuro}
+%\DeclareInputText{165}{} % 0x20AF DRACHMA SIGN
+\DeclareInputText{166}{\textbrokenbar}
+\DeclareInputText{167}{\textsection}
+\DeclareInputText{168}{\textasciidieresis}
+\DeclareInputText{169}{\textcopyright}
+\DeclareInputText{170}{\ypogegrammeni}
+\DeclareInputText{171}{\guillemotleft}
+\DeclareInputText{172}{\textlnot}
+\DeclareInputText{173}{\-}
+%\DeclareInputText{174}{} not defined
+\DeclareInputText{175}{\textemdash} % HORIZONTAL BAR 0x2015
+\DeclareInputText{176}{\textdegree}
+\DeclareInputMath{177}{\textplusminus}
+\DeclareInputText{178}{\texttwosuperior}
+\DeclareInputText{179}{\textthreesuperior}
+\DeclareInputText{180}{\acctonos{ }}
+\DeclareInputText{181}{\accdialytikatonos{ }}
+\DeclareInputText{182}{\ensuregreek{\acctonos\textAlpha}}
+\DeclareInputText{183}{\textperiodcentered}
+\DeclareInputText{184}{\ensuregreek{\acctonos\textEpsilon}}
+\DeclareInputText{185}{\ensuregreek{\acctonos\textEta}}
+\DeclareInputText{186}{\ensuregreek{\acctonos\textIota}}
+\DeclareInputText{187}{\guillemotright}
+\DeclareInputText{188}{\ensuregreek{\acctonos\textOmicron}}
+\DeclareInputText{189}{\textonehalf}
+\DeclareInputText{190}{\ensuregreek{\acctonos\textUpsilon}}
+\DeclareInputText{191}{\ensuregreek{\acctonos\textOmega}}
+\DeclareInputText{192}{\ensuregreek{\accdialytikatonos\textiota}}
+\DeclareInputText{193}{\textAlpha} % Α
+\DeclareInputText{194}{\textBeta} % Β
+\DeclareInputText{195}{\textGamma} % Γ
+\DeclareInputText{196}{\textDelta} % Δ
+\DeclareInputText{197}{\textEpsilon} % Ε
+\DeclareInputText{198}{\textZeta} % Ζ
+\DeclareInputText{199}{\textEta} % Η
+\DeclareInputText{200}{\textTheta} % Θ
+\DeclareInputText{201}{\textIota} % Ι
+\DeclareInputText{202}{\textKappa} % Κ
+\DeclareInputText{203}{\textLambda} % Λ
+\DeclareInputText{204}{\textMu} % Μ
+\DeclareInputText{205}{\textNu} % Ν
+\DeclareInputText{206}{\textXi} % Ξ
+\DeclareInputText{207}{\textOmicron} % Ο
+\DeclareInputText{208}{\textPi} % Π
+\DeclareInputText{209}{\textRho} % Ρ
+%\DeclareInputText{210} not defined
+\DeclareInputText{211}{\textSigma} % Σ
+\DeclareInputText{212}{\textTau} % Τ
+\DeclareInputText{213}{\textUpsilon} % Υ
+\DeclareInputText{214}{\textPhi} % Φ
+\DeclareInputText{215}{\textChi} % Χ
+\DeclareInputText{216}{\textPsi} % Ψ
+\DeclareInputText{217}{\textOmega} % Ω
+\DeclareInputText{218}{\ensuregreek{\accdialytika\textIota}}
+\DeclareInputText{219}{\ensuregreek{\accdialytika\textUpsilon}}
+\DeclareInputText{220}{\ensuregreek{\acctonos\textalpha}} % ά
+\DeclareInputText{221}{\ensuregreek{\acctonos\textepsilon}} % έ
+\DeclareInputText{222}{\ensuregreek{\acctonos\texteta}} % ή
+\DeclareInputText{223}{\ensuregreek{\acctonos\textiota}} % ί
+\DeclareInputText{224}{\ensuregreek{\accdialytikatonos\textupsilon}}
+\DeclareInputText{225}{\textalpha} % α
+\DeclareInputText{226}{\textbeta} % β
+\DeclareInputText{227}{\textgamma} % γ
+\DeclareInputText{228}{\textdelta} % δ
+\DeclareInputText{229}{\textepsilon} % ε
+\DeclareInputText{230}{\textzeta} % ζ
+\DeclareInputText{231}{\texteta} % η
+\DeclareInputText{232}{\texttheta} % θ
+\DeclareInputText{233}{\textiota} % ι
+\DeclareInputText{234}{\textkappa} % κ
+\DeclareInputText{235}{\textlambda} % λ
+\DeclareInputText{236}{\textmu} % μ
+\DeclareInputText{237}{\textnu} % ν
+\DeclareInputText{238}{\textxi} % ξ
+\DeclareInputText{239}{\textomicron} % ο
+\DeclareInputText{240}{\textpi} % π
+\DeclareInputText{241}{\textrho} % ρ
+\DeclareInputText{242}{\textvarsigma} % ς
+\DeclareInputText{243}{\textsigma} % σ
+\DeclareInputText{244}{\texttau} % τ
+\DeclareInputText{245}{\textupsilon} % υ
+\DeclareInputText{246}{\textphi} % φ
+\DeclareInputText{247}{\textchi} % χ
+\DeclareInputText{248}{\textpsi} % ψ
+\DeclareInputText{249}{\textomega} % ω
+\DeclareInputText{250}{\ensuregreek{\accdialytika\textiota}}
+\DeclareInputText{251}{\ensuregreek{\accdialytika\textupsilon}}
+\DeclareInputText{252}{\ensuregreek{\acctonos\textomicron}}
+\DeclareInputText{253}{\ensuregreek{\acctonos\textupsilon}}
+\DeclareInputText{254}{\ensuregreek{\acctonos\textomega}}
+%\DeclareInputText{255} not defined
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/greek-inputenc/lgrenc.dfu new/tex/latex/greek-inputenc/lgrenc.dfu
--- old/tex/latex/greek-inputenc/lgrenc.dfu 2015-08-09 00:55:00.000000000 +0200
+++ new/tex/latex/greek-inputenc/lgrenc.dfu 2019-07-11 23:00:51.000000000 +0200
@@ -2,7 +2,7 @@
% **********
% Greek Unicode support with inputenc
% ===================================
-%
+%
% :Copyright: © 2010 Günter Milde
% :Licence: This work may be distributed and/or modified under the
% conditions of the `LaTeX Project Public License`_, either
@@ -10,15 +10,15 @@
% :Identification:
% ::
-\ProvidesFile{lgrenc.dfu}[2015/08/05 1.6 UTF-8 support for Greek]
+\ProvidesFile{lgrenc.dfu}[2019/07/11 1.7 UTF-8 support for Greek]
% Based on a `babel patch`_ by Werner Lemberg, with input from the ucs_
% package (``ucsencs.def``) by Dominique Unruh and ``CB.enc`` by
% Apostolos Syropoulos.
-%
+%
% Changelog:
% .. class:: borderless
-%
+%
% ===== =========== ===========================================================
% 0.1 2010-06-16 initial version
% 0.2 2012-06-27 support for accented Greek characters with textalpha_
@@ -32,56 +32,57 @@
% 1.6 2015-08-05 Fix output of accented characters with "textalpha" if the
% current font encoding is not LGR (wrap in \ensuregreek),
% .. Map GREEK ... SYMBOL characters.
+% 1.7 2019-07-11 Remove some duplicate definitions (punctuation, Euro).
% ===== =========== ===========================================================
-%
+%
% Usage
% -----
-%
+%
% Requires comprehensive LGR font encoding definitions from greek-fontenc_:
-%
+%
% .. code:: latex
-%
+%
% \usepackage[LGR,T1]{fontenc} % define LGR and T1 encodings
% \usepackage[utf8]{inputenc} % standard UTF-8 input encoding
-%
+%
% By default, text containing Greek Unicode characters must be marked as
% requiring a font encoding that supports Greek script, e.g. by setting the
% language to ``greek`` or ``polutonikogreek``. This is a generic feature of
% inputenc_'s `utf8` option (an equivalent restriction holds for the Cyrillic
% script).
-%
+%
% With the textalpha_ or alphabeta_ packages of the greek-fontenc_ package,
% Greek Unicode literals can be used without special markup also in non-Greek
% documents:
-%
+%
% .. code:: latex
-%
+%
% \usepackage[utf8]{inputenc} % standard UTF-8 input encoding
% \usepackage[T1]{fontenc} % use T1 font encoding as default
% \usepackage{textalpha} % define LGR font encoding as Greek default
-%
+%
% With the ``normalize-symbols`` option to textalpha_ or alphabeta_,
% GREEK ... SYMBOL characters are mapped to the corresponding letters
% (requires greek-fontenc_ >= 0.13):
-%
+%
% .. code:: latex
-%
+%
% \usepackage[utf8]{inputenc}
% \usepackage[T1]{fontenc}
-% \usepackage[normalize-symbols]{textalpha}
-%
-%
+% \usepackage[normalize-symbols]{textalpha}
+%
+%
% Character Declarations
% ----------------------
-%
+%
% Some characters exist in other font encodings too. Care has been taken
% to ensure the definitions match with other ``*.dfu`` and ``*enc.def``
% files.
-%
+%
% Wrap definition in ``\ensuregreek`` if a Unicode character is mapped to two
% characters (letter+sub-iota) or with non-Greek accents to make sure these
% characters work in any font encoding if the textalpha_ package is used.
-%
+%
% Latin-1 Supplement (T1)
% ~~~~~~~~~~~~~~~~~~~~~~~
% ::
@@ -90,7 +91,7 @@
\DeclareUnicodeCharacter{00AB}{\guillemotleft} % «
\DeclareUnicodeCharacter{00AF}{\textasciimacron} % ¯
\DeclareUnicodeCharacter{00B4}{\textasciiacute} % ´
-\DeclareUnicodeCharacter{00B7}{\textperiodcentered} % ·
+\DeclareUnicodeCharacter{00B7}{\textperiodcentered} % · = ano teleia
\DeclareUnicodeCharacter{00BB}{\guillemotright} % »
% IPA Extensions (T3)
@@ -105,28 +106,9 @@
\DeclareUnicodeCharacter{02D8}{\textasciibreve} % ˘
-% General Punctuation
-% ~~~~~~~~~~~~~~~~~~~
-% ::
-
-\DeclareUnicodeCharacter{2013}{\textendash} % –
-\DeclareUnicodeCharacter{2014}{\textemdash} % —
-\DeclareUnicodeCharacter{2018}{\textquoteleft} % ‘
-\DeclareUnicodeCharacter{2019}{\textquoteright} % ’
-\DeclareUnicodeCharacter{201A}{\quotesinglbase} % ‚
-\DeclareUnicodeCharacter{2030}{\textperthousand} % ‰
-\DeclareUnicodeCharacter{2039}{\guilsinglleft} % ‹
-\DeclareUnicodeCharacter{203A}{\guilsinglright} % ›
-
-% Currency Symbols
-% ~~~~~~~~~~~~~~~~
-% ::
-
-\DeclareUnicodeCharacter{20AC}{\texteuro} % €
-
% Greek and Coptic
% ~~~~~~~~~~~~~~~~
-%
+%
% ::
% NR Unicode Name % babel name, PU name
@@ -483,8 +465,8 @@
\DeclareUnicodeCharacter{1FEA}{\ensuregreek{\accvaria\textUpsilon}} % Ὺ
\DeclareUnicodeCharacter{1FEB}{\ensuregreek{\acctonos\textUpsilon}} % Ύ
\DeclareUnicodeCharacter{1FEC}{\ensuregreek{\accdasia\textRho}} % Ῥ
-\DeclareUnicodeCharacter{1FED}{\ensuregreek{\accdialytikavaria{}}} % ῭
-\DeclareUnicodeCharacter{1FEE}{\ensuregreek{\accdialytikatonos{}}} % ΅
+\DeclareUnicodeCharacter{1FED}{\accdialytikavaria{ }} % ῭
+\DeclareUnicodeCharacter{1FEE}{\accdialytikatonos{ }} % ΅
\DeclareUnicodeCharacter{1FEF}{\accvaria{ }} % `
\DeclareUnicodeCharacter{1FF2}{\ensuregreek{\accvaria\textomega\ypogegrammeni}} % ῲ
@@ -497,7 +479,7 @@
\DeclareUnicodeCharacter{1FFA}{\ensuregreek{\accvaria\textOmega}} % Ὼ
\DeclareUnicodeCharacter{1FFB}{\ensuregreek{\acctonos\textOmega}} % Ώ
\DeclareUnicodeCharacter{1FFC}{\ensuregreek{\textOmega\prosgegrammeni}} % ῼ
-\DeclareUnicodeCharacter{1FFD}{\ensuregreek{\acctonos{}}} % ´
+\DeclareUnicodeCharacter{1FFD}{\acctonos{ }} % ´
\DeclareUnicodeCharacter{1FFE}{\accdasia{ }} % ῾
% General Punctuation
@@ -508,8 +490,16 @@
\DeclareUnicodeCharacter{2014}{\textemdash} % —
\DeclareUnicodeCharacter{2018}{\textquoteleft} % ‘
\DeclareUnicodeCharacter{2019}{\textquoteright} % ’
+\DeclareUnicodeCharacter{201A}{\quotesinglbase} % ‚
\DeclareUnicodeCharacter{2030}{\textperthousand} % ‰
-\DeclareUnicodeCharacter{20AC}{\texteuro} % €
+\DeclareUnicodeCharacter{2039}{\guilsinglleft} % ‹
+\DeclareUnicodeCharacter{203A}{\guilsinglright} % ›
+
+% Currency Symbols
+% ~~~~~~~~~~~~~~~~
+% ::
+
+\DeclareUnicodeCharacter{20AC}{\texteuro} % €
% Letterlike Symbols
% ~~~~~~~~~~~~~~~~~~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/greek-inputenc.tlpobj new/tlpkg/tlpobj/greek-inputenc.tlpobj
--- old/tlpkg/tlpobj/greek-inputenc.tlpobj 2019-02-28 03:40:44.000000000 +0100
+++ new/tlpkg/tlpobj/greek-inputenc.tlpobj 2019-07-12 01:55:19.000000000 +0200
@@ -1,6 +1,6 @@
name greek-inputenc
category Package
-revision 40613
+revision 51612
shortdesc Greek encoding support for inputenc
relocated 1
longdesc The bundle provides UTF-8, Macintosh Greek encoding and ISO
@@ -10,7 +10,7 @@
RELOC/tex/latex/greek-inputenc/lgrenc.dfu
RELOC/tex/latex/greek-inputenc/macgreek.def
catalogue-ctan /language/greek/greek-inputenc
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-07-11 18:26:13 +0200
catalogue-license lppl1.3
catalogue-topics inputenc greek
-catalogue-version 1.6
+catalogue-version 1.7
++++++ gregoriotex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex new/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex
--- old/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex 2019-03-12 22:56:46.000000000 +0100
+++ new/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex 2019-05-06 23:28:23.000000000 +0200
@@ -938,9 +938,9 @@
& \texttt{firstletter} & The center of the first letter/character of the syllable will align with the alignment point of the neumes\\
\end{argtable}
-\textbf{Nota Bene:} What constitutes the ``vowel'' of the syllable is determined by the language the lyric text is written in, as specified by the use of the \texttt{language} header in the gabc file. Out of the box, Gregorio\TeX\ explicitly supports only Latin and English, but the rules for Latin have a high degree of overlap with many Romance languages, allowing them to fall back on the Latin rules with acceptable results.
+\textbf{Nota Bene:} What constitutes the ``vowel'' of the syllable is determined by the language the lyric text is written in, as specified by the use of the \texttt{language} header in the gabc file. Out of the box, Gregorio\TeX\ explicitly supports Latin, English, Church Slavonic and Hungarian. Polish, Czech, and Slovak are supported as aliases for Church Slavonic. Furthermore the rules for Latin have a high degree of overlap with many Romance languages, allowing them to fall back on the Latin rules with acceptable results.
-You can also define your own languages in \texttt{gregorio-vowels.dat}. If you do define a language, please consider sharing your work by submitting it to the project (see CONTRIBUTING.md for instructions).
+You can also define your own languages in \texttt{gregorio-vowels.dat} (see \nameref{customvowels} for details). If you do define a language, please consider sharing your work by submitting it to the project (see CONTRIBUTING.md for instructions).
Finally, in cases where you want some sort of exceptional alignment, you can force Gregorio to consider a particular part of the syllable to be the ``vowel'' by enclosing it in curly braces (``\{'' and ``\}'') in your gabc file. Curly braces only affect alignment when using vowel centering. Syllable centering will always use the entire syllable, and firstletter centering will always use the first character of the syllable --- regardless of curly braces in the gabc file.
@@ -1366,7 +1366,7 @@
Macro to set the font to be used for the ancient notation.
\begin{argtable}
- \#1 & string & the name of the font\\
+ \#1 & string & the name of the font, either \texttt{gregall}, \texttt{grelaon}, or \texttt{gresgmodern}\\
\#2 & integer & point size at which the font should be loaded\\
\end{argtable}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/luatex/gregoriotex/Gabc.tex new/texmf-dist/doc/luatex/gregoriotex/Gabc.tex
--- old/texmf-dist/doc/luatex/gregoriotex/Gabc.tex 2019-03-12 22:56:46.000000000 +0100
+++ new/texmf-dist/doc/luatex/gregoriotex/Gabc.tex 2019-05-06 23:28:23.000000000 +0200
@@ -388,6 +388,8 @@
If you are using a language for which built-in language rules do not exist and the fallbacks are insufficient, then you may wish to provide your own set of vowel detection rules. This can be done with a special file:\verb=gregorio-vowels.dat=. See \nameref{customvowels} for information about how to create and use this file.
+Languages which are currently supported are Latin, English, Church Slavonic and Hungarian. Polish, Czech, and Slovak are supported as aliases for Church Slavonic. All of these languages can be specified by name (in which case both titlecase and lowercase names are recognized) and by using their ISO 639 (-1 two-letter, -2/T three-letter, or -2/B three-letter) standard abbreviations.
+
\subsection{Notation --- Note Syntax}\label{notesyntax}
@@ -1101,6 +1103,8 @@
enclosed in square brackets, and a semicolon. The language specified
applies until the next language statement.
+When choosing the name for your language, it is preferable that you use the ISO 639-1 standard (two-letter) code. All other names should be listed as aliases (see above). If you plan to submit your vowel detection rules for inclusion in the Gregorio source, then this will be required.
+
\item[vowel]
The \texttt{vowel} keyword indicates that the characters which follow,
@@ -1138,9 +1142,11 @@
By way of example, here is a vowel file that works for English:
\begin{lstlisting}[autogobble]
-alias [english] to [English];
+alias [english] to [en];
+alias [English] to [en];
+alias [eng] to [en];
-language [English];
+language [en];
vowel aàáAÀÁ;
vowel eèéëEÈÉË;
Binary files old/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf and new/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf differ
Binary files old/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf and new/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex new/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
--- old/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex 2019-03-12 22:56:46.000000000 +0100
+++ new/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex 2019-05-06 23:28:23.000000000 +0200
@@ -183,7 +183,7 @@
\vspace{1cm}
- \large Version \textbf{5.2.0}, 10 March 2019 %% PARSE_VERSION_DATE
+ \large Version \textbf{5.2.1}, 6 April 2019 %% PARSE_VERSION_DATE
\vspace{1.5cm}
\end{center}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gregoriotex.doc.tlpobj new/tlpkg/tlpobj/gregoriotex.doc.tlpobj
--- old/tlpkg/tlpobj/gregoriotex.doc.tlpobj 2019-03-13 02:24:49.000000000 +0100
+++ new/tlpkg/tlpobj/gregoriotex.doc.tlpobj 2019-05-07 01:39:52.000000000 +0200
@@ -1,6 +1,6 @@
name gregoriotex.doc
category Package
-revision 50357
+revision 51029
shortdesc doc files of gregoriotex
docfiles size=457
texmf-dist/doc/luatex/gregoriotex/Appendix_Font_Tables.tex
++++++ gregoriotex.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-k/gregoriotex.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-k.new.3606/gregoriotex.tar.xz differ: char 9216735, line 35844
++++++ gridset.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/gridset/LICENSE.md new/doc/latex/gridset/LICENSE.md
--- old/doc/latex/gridset/LICENSE.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/gridset/LICENSE.md 2020-02-12 23:21:36.000000000 +0100
@@ -0,0 +1,19 @@
+----------------------------------------------------------------------------
+
+This work may be distributed and/or modified under the conditions of the
+LaTeX Project Public License, version 1.3c of the license. 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 2005/12/01
+or later. This work has the LPPL maintenance status “maintained”.
+The current maintainer and author of this work is Markus Kohm.
+
+----------------------------------------------------------------------------
+
+Dieses Werk darf nach den Bedingungen der LaTeX Project Public Lizenz
+in der Version 1.3c, verteilt und/oder verändert werden. Die aktuelle
+Version dieser Lizenz ist http://www.latex-project.org/lppl.txt und
+Version 1.3c oder später ist Teil aller Verteilungen von LaTeX 2005/12/01
+oder später. Dieses Werk hat den LPPL-Verwaltungs-Status „maintained”
+Der aktuelle Verwalter und Autor dieses Werks ist Markus Kohm.
+
+----------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/gridset/README.md new/doc/latex/gridset/README.md
--- old/doc/latex/gridset/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/gridset/README.md 2020-02-12 23:21:36.000000000 +0100
@@ -0,0 +1,50 @@
+# gridset
+
+An experimental LaTeX package for semi-manual grid (a.k.a. in-register) setting
+
+------------------------------------------------------------------------------
+
+LaTeX package `gridset`
+Copyright (c) 2008—2020 Markus Kohm
+Release: 2020-02-12 v0.3
+License: LPPL 1.3c (see LICENSE.md)
+CTAN Location: https://ctan.org/pkg/gridset
+
+------------------------------------------------------------------------------
+
+## Summary
+
+This package provides commands to save positions to and restore positions from
+`aux`-file. This may be used for grid setting (a.k.a. strict in-register
+setting).
+
+## Status Note
+
+This package should not have been released, because it was only a very
+quick implementation of an idea. You should not use it for any productive
+purpose. It has been made for testing only. I would prefer to retire it
+from any distribution. Nevertheless I know few persons using the package.
+So it will be still there but without any support!
+
+## Installation
+
+The package is part of [TeX Live](https://tug.org/texlive) (and therefore
+also [MacTeX](https://tug.org/mactex)) and [MiKTeX](http://miktex.org). Users
+should use the packages provided by their TeX distribution.
+
+However, manual extraction can be used to try out the developer version.
+
+To extract the package use:
+
+```bash
+tex gridset.dtx
+```
+
+To create the manual use:
+
+```bash
+pdflatex gridset.dtx
+mkindex gridset
+pdflatex gridset.dtx
+pdflatex gridset.dtx
+```
Binary files old/doc/latex/gridset/gridset.pdf and new/doc/latex/gridset/gridset.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gridset.doc.tlpobj new/tlpkg/tlpobj/gridset.doc.tlpobj
--- old/tlpkg/tlpobj/gridset.doc.tlpobj 2019-02-28 03:41:14.000000000 +0100
+++ new/tlpkg/tlpobj/gridset.doc.tlpobj 2020-02-13 01:54:42.000000000 +0100
@@ -1,7 +1,9 @@
name gridset.doc
category Package
-revision 15878
+revision 53762
shortdesc doc files of gridset
relocated 1
-docfiles size=30
+docfiles size=57
+ RELOC/doc/latex/gridset/LICENSE.md
+ RELOC/doc/latex/gridset/README.md
RELOC/doc/latex/gridset/gridset.pdf
++++++ gridset.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/gridset/gridset.sty new/tex/latex/gridset/gridset.sty
--- old/tex/latex/gridset/gridset.sty 2009-06-20 18:43:21.000000000 +0200
+++ new/tex/latex/gridset/gridset.sty 2020-02-12 23:21:36.000000000 +0100
@@ -1,249 +1,75 @@
-% \CheckSum{416}
-% \iffalse meta-comment
-%
-% gridset.dtx
-%
+%%
+%% This is file `gridset.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% gridset.dtx (with options: `package')
+%%
+%% IMPORTANT NOTE:
+%%
+%% This is a generated file and you are not allowed to distribute it
+%% without the source ot the work. See below about more informations
+%% about the files the work consists of.
+%%
+%% Copyright (C) 2008-2020 Markus Kohm
+%%
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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.3 or later is part of all distributions of LaTeX
-%% version 2003/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status "maintained".
%%
-%% The author of the initial version of these work was
-%% Markus Kohm <komascript(a)gmx.info>
+%% The author and current maintainer of this work is
+%% Markus Kohm <komascript(a)gmx.info>.
%%
-%% This work consists of the files gridset.dtx and README.
+%% This work consists of the files gridset.dtx and README.md.
%%
%% Important Recommendation:
-%% The LPPL requires that distributions of the Work contain all the files of
-%% the Work (see ``Important Recommendations'' at lppl.txt).
+%% The LPPL requires that distributions of the Work contain all the files of
+%% the Work (see ``Important Recommendations'' at lppl.txt).
%%
-%
-%<*dtx>
-\def\FmtName{LaTeX2e}
-\ifx\FmtName\fmtname
- % Give me the package or the documentation
- \ifnum \catcode`\@=12\relax
- % Give me the documentation
- \ProvidesFile{gridset.dtx}
-%</dtx>
-%<*dtx|tex|package|example>
-%<package>\ProvidesPackage{gridset}
-%<tex>\ProvidesFile{gridset.tex}
-%<example>\ProvidesFile{gridsetexample.tex}
- [2008/11/12 v0.1 grid - aka in-register - setting]
-%</dtx|tex|package|example>
-%<*dtx|tex>
- \documentclass{ltxdoc}
- \begin{document}
- \RecordChanges
-%<*!tex>
- \GetFileInfo{gridset.dtx}
-%</!tex>
-%<tex> \GetFileInfo{gridset.tex}
- \DocInput{gridset.dtx}
-%<tex>\end{document}
-%</dtx|tex>
-%<*dtx>
- \expandafter\expandafter\expandafter\enddocument
- \fi
-\else
- % Make the package
- \def\batchfile{gridset.dtx}
- \let\batchendinput\endinput
-%</dtx>
-%<*ins>
-%<ins>\def\batchfile{gridset.ins}
- \input docstrip.tex
-
- \ifToplevel{%
- \let\ifalpha\iffalse
- }
- \keepsilent
- \askforoverwritefalse
- \usedir{tex/latex/gridset}
- \preamble
-Copyright (c) Markus Kohm 2008
-
-IMPORTANT NOTE:
-
-This is a generated file and you are not allowed to distribute it
-without the source ot the work. See below about more informations
-about the files the work consists of.
-
-\endpreamble
-
- \generate{%
- \file{gridset.tex}{\from{gridset.dtx}{tex}}%
- \file{gridset.ins}{\from{gridset.dtx}{ins}}%
- \file{gridsetx.sty}{\from{gridset.dtx}{package}}%
- \file{gridsetexample.tex}{\from{gridset.dtx}{example}}%
- }
-
- \ifToplevel{%
- \Msg{*********************************************************************}
- \Msg{*}
- \Msg{* gridset}
- \Msg{* =======}
- \Msg{*}
- \ifalpha% ALPHA
- \Msg{* THIS IS AN ALPHA VERSION!}
- \Msg{* DON'T USE IT ONLY TEST IT!}
- \Msg{*}
+\ProvidesPackage{gridset}
+ [2020-02-12 v0.3 grid - a.k.a. in-register - setting]
+\newcommand*{\gridset@luaorpdf}[1]{%
+ \expandafter\newcommand\csname gridset@#1\endcsname{}%
+ \ifcsname pdf#1\endcsname
+ \expandafter\let\csname gridset@#1\expandafter\endcsname
+ \csname pdf#1\endcsname
+ \else
+ \ifcsname #1\endcsname
+ \expandafter\let\csname gridset@#1\expandafter\endcsname
+ \csname #1\endcsname
+ \else
+ \PackageError{gridset}{%
+ neither \expandafter\string\csname #1\endcsname\space
+ nor \xpandafter\string\csname pdf#1\endcsname\space
+ defined%
+ }{This package needs either PDFTeX or LuaTeX or XeTeX.}%
\fi
- \Msg{* To finish the installation run}
- \Msg{* \space\space latex gridset.dtx}
- \Msg{* or}
- \Msg{* \space\space pdflatex gridset.dtx}
- \Msg{* and then copy}
- \Msg{* \space\space gridset.sty to .../tex/latex/gridset/}
- \Msg{* \space\space gridset.dvi or gridset.pdf to .../doc/latex/gridset/}
- \Msg{* \space\space gridset.dtx and README to .../source/latex/gridset/}
- \Msg{* where .../ is your local TDS tree.}
- \Msg{* On some systems you'll get the local TDS tree using:}
- \Msg{* \space\space kpsewhich -var-value=TEXMFLOCAL}
- \Msg{*}
- \Msg{*********************************************************************}
-%<*!ins>
- \csname fi\endcsname\csname fi\endcsname\endinput
-%</!ins>
- }
-
-%</ins>
-%<*dtx>
-\fi
-\csname batchendinput\endcsname
-%</dtx>
-% \fi ^^A meta-comment
-%
-% \title{Semi-Manual Grid Setting Using \textsf{gridset}\iftrue^^A ALPHA
-% \footnote{This is an alpha version! Don't use it! Only test it! There's no
-% support and everything may change!}\fi
-% }
-% \author{Markus Kohm}
-% \date{\filedate~\fileversion}
-% \maketitle
-% \begin{abstract}
-% Grid setting\,---\,also known as strict in-register setting\,---\,is
-% something, that should be done for a lot of documents but is not easy
-% using \LaTeX{}. Package \textsf{gridset} helps to get the information
-% needed for grid setting. It does not implement auto grid setting, but
-% there is a command \cs{vskipnextgrid}, that moves to the next grid
-% position. This may be enough under some circumstances. In other
-% circumstances it may fail. So \textsf{gridset} is only one more step for
-% grid setting not a complete solution.
-% \end{abstract}
-% \tableofcontents
-% \section{User Manual}
-%
-% \DescribeMacro{\gridinterval}%
-% This macro contains a number without unit! The number is the distance
-% between two grid lines in unit `scale points' (sp). You may set it so
-% another value using, e.g.
-% \begin{flushleft}
-% |\newlength{\|\meta{name of your length}|}|\\
-% |\setlength{\|\meta{name of your length}|}{|\meta{new length value}|}|\\
-% |\newcounter{\|\meta{name of your counter}|}|\\
-% |\setcounter{\|\meta{name of your counter}|}{\|\meta{name of your
-% length}|}|\\
-% |\edef\gridinterval{\|\meta{name of your length}|}|\\
-% \end{flushleft}
-%
-% \DescribeMacro{\gridbase}%
-% This macro contains an integer number, that represents the y-coordinate of
-% the upper start of the grid. If you want to change it, just save a position
-% and \cs{edef} the \cs{gridbase} to the y-pos of that position.
-%
-% Most time you don't need to change \cs{gridinterval} and \cs{gridposition},
-% because they are initialized to a base line grid at start of first page.
-% Because of this, it doesn't matter, that changing them is not really user
-% friendly.
-%
-% \DescribeMacro{\savepos}%
-% \cs{savepos}\marg{unique name} saves informations about the current position
-% to the \texttt{aux}-file. These informations are read at next \LaTeX{} run
-% and may be used (see \cs{the\dots} commands below) then. The \meta{unique
-% name} has to be a position name, that is unique for all saved position
-% informations of the current document.
-%
-% \DescribeMacro{\vskipnextgrid}
-% This command moves to the next grid position. To achieve this, a position
-% information is saved at this and used at next \LaTeX{} run. The used name
-% of the position information is \texttt{vb!\meta{number of
-% skip}}. \meta{number of skip} is the number of the current
-% \cs{vskipnextgrid} usage. Counter \texttt{gridcnt} is used to number the
-% usage of \cs{vskipnextgrid}.
-%
-% \DescribeMacro{\thegridinfo}
-% \cs{thegridinfo}\marg{name} outputs
-% \begin{itemize}
-% \item arabic page number of the named position,
-% \item grid base, that was valid saving the information of the named
-% position,
-% \item grid interval, that was valid saving the information of the named
-% position,
-% \item x-coordinate of the named position,
-% \item y-coordinate of the named position.
-% \end{itemize}
-% The coordinates and intervals are numbers without units. The unit is `scale
-% points' (sp).
-%
-% \DescribeMacro{\theposinfo}
-% \cs{theposinfo}\marg{name} outputs
-% \begin{itemize}
-% \item y-coordinate of the named position,
-% \item grid line number (first is 0) of the next grid position,
-% \item offset of the next grid position from grid base,
-% \item distance to the next grid position.
-% \end{itemize}
-% The coordinates, offsets and distances are numbers without units. The unit
-% is `scale points' (sp).
-%
-% \DescribeMacro{\theypos}
-% \cs{theypos}\marg{name} outputs the y-coordinate of the named position.
-%
-%
-% \StopEventually{\PrintIndex\PrintChanges}
-%
-% \section{Implementation}
-%
-% \iffalse meta-comment
-%<*package>
-% \fi ^^A meta-comment
-% \begin{macrocode}
-%<package>\ProvidesPackage{gridset}[\fileversion\space (package)]
-% \end{macrocode}
-%
-% \begin{macro}{\gridbase}
-% \begin{macro}{\gridinterval}
-% These contain the grid information. \cs{gridbase} is a integer number
-% representing the absolute y coordinate of the upper end of the
-% grid relative to the same reference point \cs{pdfsavepos}
-% uses. \cs{gridinterval} is a integer number representing the distance of
-% two grid lines. The unit is `scaled point' (sp) both time.
-% \begin{macrocode}
+ \fi
+}
+\gridset@luaorpdf{pageheight}
+\gridset@luaorpdf{pagewidth}
+\gridset@luaorpdf{savepos}
+\gridset@luaorpdf{lastxpos}
+\gridset@luaorpdf{lastypos}
\newcommand*{\gridbase}{}
\newcommand*{\gridinterval}{}
-% \end{macrocode}
-% \cs{gridbase} and \cs{gridinterval} need to be initialized at the start of
-% the first page (fixme: shouldn't this be done at the start of every
-% page?). We use this occasion to also initialize \cs{pdfpageheight} and
-% \cs{pdfpagewidth} if this hasn't been done already.
-% \begin{macrocode}
\AtBeginDocument{%
- \ifdim\pdfpageheight=\z@
- \pdfpageheight=\pageheight
+ \ifdim\gridset@pageheight=\z@
+ \gridset@pageheight=\paperheight
\fi
- \ifdim\pdfpagewidth=\z@
- \pdfpagewidth=\pagewidth
+ \ifdim\gridset@pagewidth=\z@
+ \gridset@pagewidth=\paperwidth
\fi
\begingroup
- \@tempdima=\dimexpr \pdfpageheight - \topmargin - 1in
- - \headheight - \headsep
+ \@tempdima=\dimexpr \gridset@pageheight - \topmargin - 1in
+ - \headheight - \headsep
- \topskip \relax
\@tempcnta=\@tempdima
\xdef\gridbase{\the\@tempcnta}%
@@ -251,67 +77,29 @@
\xdef\gridinterval{\the\@tempcnta}%
\endgroup
}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\savepos}
-% Save current position on the page to the \texttt{aux}-file. The argument
-% is a unique name for the position. The saved informations are:
-% \begin{itemize}
-% \item the name of the position,
-% \item the arabic page number of the page with the position,
-% \item the grid base, that was valid for this position,
-% \item the grid interval, that was valid for this position,
-% \item the x-coordinate of the absolute position,
-% \item the y-coordinate of the absolute position.
-% \end{itemize}
-% \begin{macrocode}
-\newcommand*{\savepos}[1]{%
+\newcommand*{\SavePos}[1]{%
\begingroup
- \pdfsavepos
+ \gridset@savepos
\protected@write\@auxout{}{%
\protect\newpos{#1}{\the\count\z@}{\gridbase}{\gridinterval}{%
- \noexpand\number\pdflastxpos
+ \noexpand\number\gridset@lastxpos
}{%
- \noexpand\number\pdflastypos
+ \noexpand\number\gridset@lastypos
}%
}%
\endgroup
}
-% \end{macrocode}
-% \end{macro}
-%
-% \begin{macro}{\newpos}
-% This is the command, that has been written to the \texttt{aux}-file.
-% Reading the \texttt{aux}-file it defines several position dependant macros
-% to store the position information. Reading the \texttt{aux}-file while
-% \cs{begin{document}} a double definition test is done. Reading the
-% \texttt{aux}-file while \cs{end{document}} a test is done, if the position
-% has been changed and notes the user about needed additional \LaTeX{} runs.
-% (fixme: shouldn't the test be done with the x- and the y-coordinate
-% instead of the vskip only?)
-% The defined macros are:
-% \begin{description}
-% \item[\cs{pos@\meta{position name}@page}] the arabic page number of the
-% position
-% \item[\cs{pos@\meta{position name}@base}] the valid grid base while
-% saving the position
-% \item[\cs{pos@\meta{position name}@interval}] the valid grid interval
-% while saving the position
-% \item[\cs{pos@\meta{position name}@x}] the x-coordinate of the position
-% \item[\cs{pos@\meta{position name}@y}] the y-coordinate of the postion
-% \item[\cs{pos@\meta{position name}@line}] the number of the next grid line
-% for the position (first grid line has number 0)
-% \item[\cs{pos@\meta{position name}@offset}] distance of the next grid line
-% from the grid base
-% \item[\cs{pos@\meta{position name}@vskip}] distance to the next grid line
-% for the position
-% \end{description}
-% All values are integers. The unit to all values is `scaled points'
-% (sp). See \cs{pdfsavepos} at the pdf\TeX{} user manual for more
-% information.
-% \begin{macrocode}
+\ifx\savepos\gridset@savepos
+ \PackageInfo{gridset}{LuaTeX detected.\MessageBreak
+ Note, gridset command is \string\SavePos\MessageBreak
+ but not \string\savepos, which is\MessageBreak
+ a LuaTeX primitive
+ }%
+\else
+ \PackageInfo{gridset}{\string\savepos\space defined as an alias of
+ \string\SavePos}%
+ \newcommand*{\savepos}{\SavePos}%
+\fi
\newcommand*{\newpos}[6]{%
\grid@unique@test{#1}{#2}%
\expandafter\global\@namedef{pos@#1@page}{#2}%
@@ -326,7 +114,7 @@
\expandafter\xdef\csname pos@#1@line\endcsname{\the\@tempcnta}%
\@tempcnta=\numexpr \@tempcnta * \@nameuse{pos@#1@interval}\relax
\expandafter\xdef\csname pos@#1@offset\endcsname{\the\@tempcnta}%
- \@tempcnta=\numexpr \@nameuse{pos@#1@y}
+ \@tempcnta=\numexpr \@nameuse{pos@#1@y}
- ( \@nameuse{pos@#1@base} - \@tempcnta )\relax
\expandafter\let\expandafter\@tempa\csname pos@#1@vskip\endcsname%
\expandafter\xdef\csname pos@#1@vskip\endcsname{\the\@tempcnta}%
@@ -335,10 +123,6 @@
\fi
\endgroup
}
-% \end{macrocode}
-% \begin{macro}{\grid@unique@test}
-% A very simple test to warn if a position name isn't unique.
-% \begin{macrocode}
\newcommand*{\grid@unique@test}[2]{%
\expandafter\ifx\csname pos@#1@page\endcsname\relax\else
\PackageError{gridset}{position `#1' is not unique.\@gobble}{%
@@ -355,13 +139,6 @@
\AtBeginDocument{%
\global\let\grid@unique@test\@gobble
}
-% \end{macrocode}
-% \end{macro}
-% \begin{macro}{\grid@ReRunMessage}
-% The change test will be done for each \cs{newpos} but one user information
-% at the end of the document should be enough. So we use a message macro,
-% that destroys itself after first usage.
-% \begin{macrocode}
\newcommand*\grid@ReRunMessage{}
\AtBeginDocument{%
\renewcommand*\grid@ReRunMessage{%
@@ -371,30 +148,12 @@
\global\let\grid@ReRunMessage\relax
}%
}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\vskipnextgrid}
-% \begin{macro}{gridcnt}
-% Move to next grid position. The counter \texttt{gridcnt} is used to give
-% every move to position a unique position name. The names are
-% `\texttt{vp!\meta{number of the move to position}}'. You may use this to
-% get informations e.g. about the last move to position.
-% \begin{macrocode}
\newcounter{gridcnt}
\newcommand*{\vskipnextgrid}{%
\begingroup
\stepcounter{gridcnt}\edef\@tempa{vp!\thegridcnt}%
\ifvmode
-% \end{macrocode}
-% \cs{pdfsavepos} in vertical mode is a problem, because the base line
-% alignment will be done at least at paragraph breaking. Because of this,
-% we have to leave the vertical mode and do it then. But remark: If you
-% change the base line skip e.g. changing the font size, the next line would
-% not be grid aligned!
-% \begin{macrocode}
- \leavevmode\savepos{\@tempa}%
+ \leavevmode\SavePos{\@tempa}%
\expandafter\ifx\csname pos@\@tempa @vskip\endcsname\relax
\else
\expandafter\ifnum \csname pos@\@tempa @vskip\endcsname =\z@\else
@@ -406,31 +165,36 @@
\fi
\fi
\else
-% \end{macrocode}
-% \cs{pdfsavepos} in horizontal mode is a problem too, because we have to
-% enter the vertical mode to do vertical skips. Because of this, the remark
-% is the same like the vertical mode remark.
-% \begin{macrocode}
\parskip=\z@
- \savepos{vp!\thegridcnt}%
+ \SavePos{vp!\thegridcnt}%
\expandafter\ifx\csname pos@\@tempa @vskip\endcsname\relax
\else
\expandafter\ifnum \csname pos@\@tempa @vskip\endcsname =\z@\else
- \PackageInfo{gridset}{%
+ \PackageInfo{gridset}{%
hmode \string\vskip\csname pos@\@tempa @vskip\endcsname sp%
}%
- \vskip -\baselineskip
- \expandafter\vskip\csname pos@\@tempa @vskip\endcsname sp\relax
+ \vskip \dimexpr -\baselineskip
+ + \csname pos@\@tempa @vskip\endcsname sp\relax
+ \leavevmode
\if@twoside
\expandafter\ifodd\csname pos@\@tempa @page\endcsname\relax
- \leavevmode\hskip \dimexpr - 1in - \oddsidemargin - \parindent
+ \hskip \dimexpr -1in - \oddsidemargin - \parindent
+ \if@twocolumn\if@firstcolumn\else
+ - \columnwidth - \columnsep
+ \fi\fi
+ \csname pos@\@tempa @x\endcsname sp\relax
\else
- \leavevmode\hskip \dimexpr - 1in - \evensidemargin - \parindent
+ \hskip \dimexpr -1in - \evensidemargin - \parindent
+ \if@twocolumn\if@firstcolumn\else
+ - \columnwidth - \columnsep
+ \fi\fi
+ \csname pos@\@tempa @x\endcsname sp\relax
\fi
\else
- \leavevmode\hskip \dimexpr - 1in - \oddsidemargin - \parindent
+ \hskip \dimexpr -1in - \oddsidemargin - \parindent
+ \if@twocolumn\if@firstcolumn\else
+ - \columnwidth - \columnsep
+ \fi\fi
+ \csname pos@\@tempa @x\endcsname sp\relax
\fi
\fi
@@ -438,19 +202,6 @@
\fi
\endgroup
}
-% \end{macrocode}
-% (fixme: A better solution would be to first move and then set the
-% position. But that solution needs some more tests and maybe some more
-% ideas, because after moving the position is on grid and so the saved x-pos
-% would be on grid.)
-% \end{macro}
-% \end{macro}
-%
-% \begin{macro}{\thegridinfo}
-% \begin{macro}{\theposinfo}
-% \begin{macro}{\theypos}
-% Some informations about the grid (valid for a position) or the position.
-% \begin{macrocode}
\newcommand*{\thegridinfo}[1]{%
page=\@nameuse{pos@#1@page},
base=\@nameuse{pos@#1@base},
@@ -465,108 +216,6 @@
movedown=\@nameuse{pos@#1@vskip}%
}
\newcommand*{\theypos}[1]{\@nameuse{pos@#1@y}}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-%
-% \iffalse meta-comment
-%<*FALSE>
-\csname endinput\endcsname
-%</FALSE>
-%</package>
-% \fi ^^A meta-comment
-%
-% \section{Example}
-%
-% You may try the following example document. You have to do several \LaTeX{}
-% runs until no new rerun warning occurs.
-% \iffalse meta-comment
-%<*example>
-% \fi ^^A meta-comment
-% \begin{macrocode}
-\documentclass[a4paper,12pt]{article}
-\usepackage{gridset}
-\usepackage{blindtext}
-\raggedbottom
-
-\pagestyle{myheadings}
-
-\begin{document}
-\markright{gridbase=\gridbase, gridinterval=\gridinterval\ without move down}%
-\newcounter{Zeile}%
-\makeatletter
-\@whilenum \value{Zeile}<40\do {%
- \stepcounter{Zeile}%
- \theZeile. Zeile:
- \savepos{\thepage.\theZeile}\thegridinfo{\thepage.\theZeile}\par
-}%
-\makeatother
-\clearpage
-\setcounter{Zeile}{0}
-\makeatletter
-\@whilenum \value{Zeile}<20\do {%
- \stepcounter{Zeile}%
- \theZeile. Zeile:
- \savepos{\thepage.\theZeile}\theposinfo{\thepage.\theZeile}\par
-}%
-\makeatother
-\clearpage
-\parskip=.5\baselineskip
-\setcounter{Zeile}{0}
-\makeatletter
-\@whilenum \value{Zeile}<20\do {%
- \stepcounter{Zeile}%
- \theZeile. Zeile:
- \savepos{\thepage.\theZeile}\theposinfo{\thepage.\theZeile}\par
-}%
-\makeatother
-\clearpage
-\markright{gridbase=\gridbase, gridinterval=\gridinterval\ with real move down
-at vmode}%
-\parskip=.5\baselineskip
-\setcounter{Zeile}{0}
-\makeatletter
-\@whilenum \value{Zeile}<25\do {%
- \stepcounter{Zeile}%
- \vskipnextgrid\theZeile. Zeile: \theposinfo{vp!\thegridcnt}\par
-}%
-\makeatother
-\clearpage
-\markright{gridbase=\gridbase, gridinterval=\gridinterval\ with real move down
-at hmode}%
-\parskip=.5\baselineskip
-\setcounter{Zeile}{0}
-\makeatletter
-\@whilenum \value{Zeile}<25\do {%
- \stepcounter{Zeile}%
- \theZeile. Zeile: \vskipnextgrid\theposinfo{vp!\thegridcnt}\par
-}%
-\makeatother
-\clearpage
-\parskip=0pt
-\blindtext
-\begin{itemize}
-\item Test
-\item Test
-\end{itemize}
-\vskipnextgrid\theposinfo{vp!\thegridcnt}\blindtext
-
-\end{document}
-% \end{macrocode}
-% \iffalse meta-comment
-%</example>
-% \fi ^^A meta-comment
-%
-% \Finale
-%
\endinput
-%
-% end of `gridset.dtx'
-%
-% \iffalse meta-comment
-%%% Local Variables:
-%%% mode: docTeX
-%%% TeX-master: t
-%%% End:
-% \fi ^^A meta-comment
+%%
+%% End of file `gridset.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gridset.tlpobj new/tlpkg/tlpobj/gridset.tlpobj
--- old/tlpkg/tlpobj/gridset.tlpobj 2019-02-28 03:41:14.000000000 +0100
+++ new/tlpkg/tlpobj/gridset.tlpobj 2020-02-13 01:54:42.000000000 +0100
@@ -1,6 +1,6 @@
name gridset
category Package
-revision 15878
+revision 53762
shortdesc Grid, a.k.a. in-register, setting
relocated 1
longdesc Grid setting -- also known as strict in-register setting -- is
@@ -12,11 +12,11 @@
longdesc circumstances, but in other circumstances it may fail. Thus
longdesc gridset is only one more step for grid setting, not a complete
longdesc solution.
-runfiles size=5
+runfiles size=2
RELOC/tex/latex/gridset/gridset.sty
-catalogue-contact-home http://komascript.de/gridset
+catalogue-contact-home https://komascript.de/gridset
+catalogue-contact-repository https://github.com/komascript/gridset.git
catalogue-ctan /macros/latex/contrib/gridset
-catalogue-date 2017-04-18 05:31:40 +0200
-catalogue-license lppl
+catalogue-license lppl1.3c
catalogue-topics typeset-grid
-catalogue-version 0.1
+catalogue-version 0.3
++++++ gridslides.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gridslides.doc.tlpobj new/tlpkg/tlpobj/gridslides.doc.tlpobj
--- old/tlpkg/tlpobj/gridslides.doc.tlpobj 2019-02-28 03:41:14.000000000 +0100
+++ new/tlpkg/tlpobj/gridslides.doc.tlpobj 2020-03-24 01:58:51.000000000 +0100
@@ -1,6 +1,6 @@
name gridslides.doc
category Package
-revision 45933
+revision 54512
shortdesc doc files of gridslides
relocated 1
docfiles size=177
++++++ gridslides.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gridslides.tlpobj new/tlpkg/tlpobj/gridslides.tlpobj
--- old/tlpkg/tlpobj/gridslides.tlpobj 2019-02-28 03:41:14.000000000 +0100
+++ new/tlpkg/tlpobj/gridslides.tlpobj 2020-03-24 01:58:51.000000000 +0100
@@ -1,6 +1,6 @@
name gridslides
category Package
-revision 45933
+revision 54512
shortdesc Free form slides with blocks placed on a grid
relocated 1
longdesc This package allows creating free form slides with blocks
@@ -16,7 +16,6 @@
catalogue-contact-bugs https://github.com/minad/gridslides/issues
catalogue-contact-repository https://github.com/minad/gridslides
catalogue-ctan /macros/latex/contrib/gridslides
-catalogue-date 2017-11-28 17:33:59 +0100
-catalogue-license lppl1.3gpl2
+catalogue-license lppl1.3 gpl2
catalogue-topics presentation class
catalogue-version 0.1.1
++++++ gsftopk.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/gsftopk.man1.pdf and new/texmf-dist/doc/man/man1/gsftopk.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gsftopk.doc.tlpobj new/tlpkg/tlpobj/gsftopk.doc.tlpobj
--- old/tlpkg/tlpobj/gsftopk.doc.tlpobj 2019-04-06 23:33:01.000000000 +0200
+++ new/tlpkg/tlpobj/gsftopk.doc.tlpobj 2019-11-19 01:55:44.000000000 +0100
@@ -1,6 +1,6 @@
name gsftopk.doc
category TLCore
-revision 50767
+revision 52851
shortdesc doc files of gsftopk
docfiles size=10
texmf-dist/doc/man/man1/gsftopk.1
++++++ gsftopk.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gsftopk.tlpobj new/tlpkg/tlpobj/gsftopk.tlpobj
--- old/tlpkg/tlpobj/gsftopk.tlpobj 2019-04-06 23:33:01.000000000 +0200
+++ new/tlpkg/tlpobj/gsftopk.tlpobj 2019-11-19 01:55:44.000000000 +0100
@@ -1,6 +1,6 @@
name gsftopk
category TLCore
-revision 50767
+revision 52851
shortdesc Convert "Ghostscript fonts" to PK files
longdesc Designed for use with xdvi and dvips this utility converts
longdesc Adobe Type 1 fonts to PK bitmap format. It should not
++++++ guitarchordschemes.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/guitarchordschemes.doc.tlpobj new/tlpkg/tlpobj/guitarchordschemes.doc.tlpobj
--- old/tlpkg/tlpobj/guitarchordschemes.doc.tlpobj 2019-02-28 03:41:30.000000000 +0100
+++ new/tlpkg/tlpobj/guitarchordschemes.doc.tlpobj 2020-03-24 01:58:51.000000000 +0100
@@ -1,6 +1,6 @@
name guitarchordschemes.doc
category Package
-revision 41880
+revision 54512
shortdesc doc files of guitarchordschemes
relocated 1
docfiles size=108
++++++ guitarchordschemes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/guitarchordschemes.tlpobj new/tlpkg/tlpobj/guitarchordschemes.tlpobj
--- old/tlpkg/tlpobj/guitarchordschemes.tlpobj 2019-02-28 03:41:30.000000000 +0100
+++ new/tlpkg/tlpobj/guitarchordschemes.tlpobj 2020-03-24 01:58:51.000000000 +0100
@@ -1,6 +1,6 @@
name guitarchordschemes
category Package
-revision 41880
+revision 54512
shortdesc Guitar Chord and Scale Tablatures
relocated 1
longdesc This package provides two commands (\chordscheme and \scales).
@@ -11,9 +11,8 @@
runfiles size=6
RELOC/tex/latex/guitarchordschemes/guitarchordschemes.sty
catalogue-also guitar
-catalogue-contact-repository https://bitbucket.org/cgnieder/guitarchordschemes
+catalogue-contact-repository https://github.com/cgnieder/guitarchordschemes
catalogue-ctan /macros/latex/contrib/guitarchordschemes
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license lppl1.3
catalogue-topics music chords
catalogue-version 0.7
++++++ guitlogo.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/guitlogo/README new/doc/latex/guitlogo/README
--- old/doc/latex/guitlogo/README 2012-08-20 00:14:17.000000000 +0200
+++ new/doc/latex/guitlogo/README 2019-07-08 23:27:12.000000000 +0200
@@ -5,26 +5,34 @@
correttamente il logo del "Gruppo Utilizzatori Italiani di TeX" usando il
colore di default del testo oppure un colore qualunque selezionabile
dall'utente, secondo lo schema del logo presente sul sito del Gruppo
-(http://www.guitex.org). Sono altresì presenti comandi che facilitano la
+(https://www.guitex.org). Sono altresì presenti comandi che facilitano la
scrittura dell'espansione completa dell'acronimo GuIT, degli indirizzi del
sito internet del Gruppo e del forum pubblico, del logo del convegno
GuITmeeting e della rivista Ars TeXnica. Opzionalmente, tramite l'uso di
hyperref, i prodotti dei comandi appena citati possono diventare
-collegamenti ipertestuali al sito del Gruppo (http://www.guitex.org).
+collegamenti ipertestuali al sito del Gruppo (https://www.guitex.org).
[ The guit.sty package provides some commands useful to correctly write the
logo of "Gruppo Utilizzatori Italiani di TeX" (Italian TeX User Group),
using the default document color or any other color the user may ever
choose, in conformity with logo's scheme as seen on the Group site
- (http://www.guitex.org). Likewise, commands are available that simplify
+ (https://www.guitex.org). Likewise, commands are available that simplify
the writing of GuIT acronym's complete expansion, of the addresses of
Group's internet site and public forum, the meeting GuITmeeting and
magazine Ars TeXnica's logo. Optionally, using hyperref, the outputs of
the above cited commands can become hyperlinks to Group's site
- (http://www.guitex.org).
+ (https://www.guitex.org).
Documentation available in Italian only.]
+Modifiche nella versione 1.0.0-alpha.3 (2019/07/08)
+o url viene caricato con l'opzione hyphens
+
+Modifiche nella versione 1.0.0-alpha.2 (2019/06/27)
+o Aggiornato l'indirizzo del sito internet del gruppo
+
+Modifiche nella versione 1.0.0-alpha.1 (2012/11/03)
+o Aggiunto il supporto per Latin Modern
Modifiche nella versione 0.9.2 (2012/08/17)
o Aggiornato l'indirizzo del sito internet
@@ -113,15 +121,15 @@
o Prima release del pacchetto
-------------------------------------------------------------------
- Copyright 2003, 2004, 2005, 2006, 2009, 2012 Gruppo Utilizzatori Italiani
- di TeX
+ Copyright 2003, 2004, 2005, 2006, 2009, 2012, 2019 Gruppo Utilizzatori
+ Italiani di TeX
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
version 1.3a of this license or (at your option) any
later version.
The latest version of the license is in
- http://www.latex-project.org/lppl.txt
+ https://www.latex-project.org/lppl.txt
Author: Emanuele Vicentini
(emanuelevicentini at yahoo dot it)
@@ -148,7 +156,7 @@
o spostate guit.sty e guit.cfg dove la vostra installazione di LaTeX possa
trovarli (nel sottoalbero locale potrebbe essere in tex/latex/GuIT/) ed
aggiornate il database o l'analoga struttura dati usata dalla vostra
- distribuzione di LaTeX (maggiori informazioni su http://www.guitex.org)
+ distribuzione di LaTeX (maggiori informazioni su https://www.guitex.org)
Per rigenerare la documentazione:
o eseguite: latex guit.dtx (due volte)
@@ -162,6 +170,6 @@
fornita dal bundle PSNFSS.
-17 agosto 2012
+8 luglio 2019
Emanuele Vicentini
(emanuelevicentini at yahoo dot it)
Binary files old/doc/latex/guitlogo/guit.pdf and new/doc/latex/guitlogo/guit.pdf differ
Binary files old/doc/latex/guitlogo/guittest.pdf and new/doc/latex/guitlogo/guittest.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/guitlogo/guittest.tex new/doc/latex/guitlogo/guittest.tex
--- old/doc/latex/guitlogo/guittest.tex 2012-08-20 00:14:17.000000000 +0200
+++ new/doc/latex/guitlogo/guittest.tex 2019-06-30 23:01:55.000000000 +0200
@@ -6,15 +6,15 @@
%%
%% guit.dtx (with options: `test')
%%
-%% Copyright 2003, 2004, 2005, 2006, 2009, 2012 Gruppo Utilizzatori Italiani
-%% di TeX
+%% Copyright 2003, 2004, 2005, 2006, 2009, 2012, 2019 Gruppo Utilizzatori
+%% Italiani di TeX
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
%% version 1.3a of this license or (at your option) any
%% later version.
%% The latest version of the license is in
-%% http://www.latex-project.org/lppl.txt
+%% https://www.latex-project.org/lppl.txt
%%
%% Author: Emanuele Vicentini
%% (emanuelevicentini at yahoo dot it)
@@ -26,7 +26,7 @@
%% This work consists of the files: README, guit.dtx, guit.ins and the
%% derived files guit.sty, guit.cfg and guittest.tex
%%
-\documentclass[12pt, a4paper]{article}
+\documentclass[11pt, a4paper]{article}
\usepackage[margin=1in, noheadfoot]{geometry}
\usepackage{booktabs, guit, rotating, hyperref}
@@ -39,7 +39,7 @@
direi che \`e passabile, no?}. Diamoci\footnote{Un'altra nota:
\fontfamily{pzc}\fontseries{mb}\fontshape{it}\selectfont\guittext} dentro
con qualche cosa\footnote{Un ultima nota: Copyright 2003, 2004, 2005, 2006,
-2009, 2012 \guittext} di ``strambo'':
+2009, 2012, 2019 \guittext} di ``strambo'':
\begin{center}
\itshape\guit~agus \TeX~go br\'ach!\\
@@ -83,6 +83,7 @@
Font & Logo \\
\midrule
Computer Modern Roman & \guit[family=cmr] \\
+Latin Modern & \guit[family=lmr] \\
Times New Roman & \guit[family=ptm] \\
Palatino & \guit[family=ppl] \\
NewCentury Schoolbook & \guit[family=pnc] \\
@@ -97,7 +98,7 @@
\begingroup
\let\pippo\par
\makeatletter
- \@tfor\famiglia:={cmr}{ptm}{ppl}{pnc}{bch}{pbk}\do{%
+ \@tfor\famiglia:={cmr}{lmr}{ptm}{ppl}{pnc}{bch}{pbk}\do{%
\noindent
\setupGuIT[family=\famiglia]
\@tfor\dimensione:=\tiny\scriptsize\footnotesize\small\normalsize
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/guitlogo.doc.tlpobj new/tlpkg/tlpobj/guitlogo.doc.tlpobj
--- old/tlpkg/tlpobj/guitlogo.doc.tlpobj 2019-02-28 03:41:30.000000000 +0100
+++ new/tlpkg/tlpobj/guitlogo.doc.tlpobj 2019-07-09 01:53:26.000000000 +0200
@@ -1,9 +1,9 @@
name guitlogo.doc
category Package
-revision 27458
+revision 51582
shortdesc doc files of guitlogo
relocated 1
-docfiles size=128
+docfiles size=121
RELOC/doc/latex/guitlogo/README
RELOC/doc/latex/guitlogo/guit.pdf
RELOC/doc/latex/guitlogo/guittest.pdf
++++++ guitlogo.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/guitlogo/guit.cfg new/tex/latex/guitlogo/guit.cfg
--- old/tex/latex/guitlogo/guit.cfg 2012-08-20 00:14:17.000000000 +0200
+++ new/tex/latex/guitlogo/guit.cfg 2019-07-08 23:27:12.000000000 +0200
@@ -6,15 +6,15 @@
%%
%% guit.dtx (with options: `cfg')
%%
-%% Copyright 2003, 2004, 2005, 2006, 2009, 2012 Gruppo Utilizzatori Italiani
-%% di TeX
+%% Copyright 2003, 2004, 2005, 2006, 2009, 2012, 2019 Gruppo Utilizzatori
+%% Italiani di TeX
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
%% version 1.3a of this license or (at your option) any
%% later version.
%% The latest version of the license is in
-%% http://www.latex-project.org/lppl.txt
+%% https://www.latex-project.org/lppl.txt
%%
%% Author: Emanuele Vicentini
%% (emanuelevicentini at yahoo dot it)
@@ -26,9 +26,12 @@
%% This work consists of the files: README, guit.dtx, guit.ins and the
%% derived files guit.sty, guit.cfg and guittest.tex
%%
-\ProvidesFile{guit.cfg}[2009/07/31 v0.9.1 File di configurazione di guit.sty]
+\ProvidesFile{guit.cfg}[2019/07/08 v1.0.0-alpha.3 File di configurazione di guit.sty]
%% Esempi:
%% \GuITcolor{1, 0, 1, 0.6}
+%% \DeclareGuITLogoCommand{lmr}{-0.26em}{0.714ex}{-0.125em}{-0.125em}
+%% \AliasGuITLogoCommand{lmr}{b}{lmr}{m}
+%% \AliasGuITLogoCommand{lmr}{bx}{lmr}{m}
%% \DeclareGuITLogoCommand{ptm}{-0.27em}{0.5475ex}{-0.125em}{-0.125em}
%% \DeclareGuITLogoCommand{ptm}[bx]{-0.345em}{0.68ex}{-0.125em}{-0.125em}
%% \DeclareGuITLogoCommand{ppl}{-0.276em}{0.717ex}{-0.125em}{-0.125em}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/guitlogo/guit.sty new/tex/latex/guitlogo/guit.sty
--- old/tex/latex/guitlogo/guit.sty 2012-08-20 00:14:17.000000000 +0200
+++ new/tex/latex/guitlogo/guit.sty 2019-07-08 23:27:12.000000000 +0200
@@ -6,15 +6,15 @@
%%
%% guit.dtx (with options: `style')
%%
-%% Copyright 2003, 2004, 2005, 2006, 2009, 2012 Gruppo Utilizzatori Italiani
-%% di TeX
+%% Copyright 2003, 2004, 2005, 2006, 2009, 2012, 2019 Gruppo Utilizzatori
+%% Italiani di TeX
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
%% version 1.3a of this license or (at your option) any
%% later version.
%% The latest version of the license is in
-%% http://www.latex-project.org/lppl.txt
+%% https://www.latex-project.org/lppl.txt
%%
%% Author: Emanuele Vicentini
%% (emanuelevicentini at yahoo dot it)
@@ -27,8 +27,9 @@
%% derived files guit.sty, guit.cfg and guittest.tex
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{guit}[2012/08/17 v0.9.2 Logo del GuIT]
-\RequirePackage{graphics, url}
+\ProvidesPackage{guit}[2019/07/08 v1.0.0-alpha.3 Logo del GuIT]
+\RequirePackage{graphics}
+\RequirePackage[hyphens]{url}
\RequirePackage{xcolor}[2004/07/04]
\RequirePackage{xkeyval}[2005/05/07]
\newif\if@guit@colorized
@@ -37,7 +38,7 @@
\DeclareOption{nocolor}{\AtEndOfPackage{\setupGuIT[color=no]}}
\DeclareOption{link}{\AtEndOfPackage{\setupGuIT[link=yes]}}
\ProcessOptions\relax
-\DeclareRobustCommand{\setupGuIT}[1][color=no, link=no, family=, series=, url=http://www.guitex.org, document=, year=, style=display]{%
+\DeclareRobustCommand{\setupGuIT}[1][color=no, link=no, family=, series=, url=https://www.guitex.org, document=, year=, style=display]{%
\setkeys*{guit}{#1}%
\ignorespaces}
\let\setupguit\setupGuIT
@@ -141,6 +142,9 @@
\define@key{guit}{cmr/m}[cmr/m]{%
\def\@guit@family{cmr}%
\def\@guit@series{m}}
+\@gen@guit@fntcmd{lmr}{-0.26em}{0.714ex}{-0.125em}{-0.125em}
+\AliasGuITLogoCommand{lmr}{b}{lmr}{m}
+\AliasGuITLogoCommand{lmr}{bx}{lmr}{m}
\@gen@guit@fntcmd{ptm}{-0.27em}{0.5475ex}{-0.125em}{-0.125em}
\@gen@guit@fntcmd{ptm}[bx]{-0.345em}{0.68ex}{-0.125em}{-0.125em}
\@gen@guit@fntcmd{ppl}{-0.276em}{0.717ex}{-0.125em}{-0.125em}
@@ -205,7 +209,7 @@
\define@cmdkey{guit}[@guit@]{document}{\relax}
\let\guiturl\GuITurl
\DeclareRobustCommand*{\GuITforum}[1][]{%
- \guiturl[#1, document=forum]}
+ \guiturl[#1, document=home/it/forum/index]}
\let\guitforum\GuITforum
\DeclareRobustCommand*{\GuITmeeting}{%
\@ifstar\@guit@meeting@color@on\@guit@meeting@color@off}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/guitlogo.tlpobj new/tlpkg/tlpobj/guitlogo.tlpobj
--- old/tlpkg/tlpobj/guitlogo.tlpobj 2019-02-28 03:41:30.000000000 +0100
+++ new/tlpkg/tlpobj/guitlogo.tlpobj 2019-07-09 01:53:26.000000000 +0200
@@ -1,24 +1,26 @@
name guitlogo
category Package
-revision 27458
+revision 51582
shortdesc Macros for typesetting the GuIT logo
relocated 1
-longdesc Guit provides some commands useful to correctly write the logo
-longdesc of GUIT -- "Gruppo Utilizzatori Italiani di TeX" (Italian TeX
+longdesc This package provides some commands useful to correctly write
+longdesc the logo of "Gruppo Utilizzatori Italiani di TeX" (Italian TeX
longdesc User Group), using the default document color or any other
-longdesc color the user may ever choose, in conformity with logo's
-longdesc scheme as seen on the Group web site
-longdesc (http://www.guit.sssup.it). Likewise, commands are provided
-longdesc that simplify the writing of GuIT acronym's complete expansion,
-longdesc of the addresses of Group's internet site and public forum and
-longdesc 'GuITmeeting' logo. Optionally, using hyperref, the outputs of
-longdesc the above cited commands can become hyperlinks to Group's site.
-longdesc Documentation is available in Italian, only.
+longdesc color the user may ever choose, in conformity with the logo's
+longdesc scheme as seen on the group's website https://www.guitex.org.
+longdesc Likewise, commands are provided that simplify the writing of
+longdesc the GuIT acronym's complete expansion, of the addresses of the
+longdesc group's internet site and public forum, and the meeting
+longdesc 'GuITmeeting' and the magazine Ars TeXnica's logo. Optionally,
+longdesc using hyperref, the outputs of the above cited commands can
+longdesc become hyperlinks to the group's website
+longdesc https://www.guitex.org. The Documentation is available in
+longdesc Italian only.
runfiles size=4
RELOC/tex/latex/guitlogo/guit.cfg
RELOC/tex/latex/guitlogo/guit.sty
catalogue-ctan /macros/latex/contrib/GuIT/GuITlogo
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl
+catalogue-date 2019-07-08 10:39:21 +0200
+catalogue-license lppl1.3a
catalogue-topics logo
-catalogue-version 0.9.2
+catalogue-version 1.0.0-alpha.3
++++++ gustlib.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gustlib.doc.tlpobj new/tlpkg/tlpobj/gustlib.doc.tlpobj
--- old/tlpkg/tlpobj/gustlib.doc.tlpobj 2019-02-28 03:41:30.000000000 +0100
+++ new/tlpkg/tlpobj/gustlib.doc.tlpobj 2020-03-04 23:50:59.000000000 +0100
@@ -1,6 +1,6 @@
name gustlib.doc
category Package
-revision 45712
+revision 54074
shortdesc doc files of gustlib
relocated 1
docfiles size=5
++++++ gustlib.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gustlib.tlpobj new/tlpkg/tlpobj/gustlib.tlpobj
--- old/tlpkg/tlpobj/gustlib.tlpobj 2019-02-28 03:41:30.000000000 +0100
+++ new/tlpkg/tlpobj/gustlib.tlpobj 2020-03-04 23:50:59.000000000 +0100
@@ -1,6 +1,6 @@
name gustlib
category Package
-revision 45712
+revision 54074
shortdesc plain macros for much core and extra functionality, from GUST
relocated 1
longdesc Includes bibliography support, token manipulation,
++++++ gustprog.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gustprog.doc.tlpobj new/tlpkg/tlpobj/gustprog.doc.tlpobj
--- old/tlpkg/tlpobj/gustprog.doc.tlpobj 2019-02-28 03:41:31.000000000 +0100
+++ new/tlpkg/tlpobj/gustprog.doc.tlpobj 2020-03-04 23:50:59.000000000 +0100
@@ -1,6 +1,6 @@
name gustprog.doc
category Package
-revision 45712
+revision 54074
shortdesc doc files of gustprog
relocated 1
docfiles size=82
++++++ gzt.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/gzt/CHANGELOG.md new/doc/latex/gzt/CHANGELOG.md
--- old/doc/latex/gzt/CHANGELOG.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/gzt/CHANGELOG.md 2020-03-18 22:18:01.000000000 +0100
@@ -0,0 +1,42 @@
+# [Unreleased]
+
+# [1.0.0] - 2020-03-17
+
+## Added
+- CHANGELOG file (following https://keepachangelog.com/en/1.0.0/).
+- Semantic versionning (following https://semver.org/).
+
+## Changed
+- Compilation date displayed only if the issue number is not specified
+ (`gztarticle` classonly).
+- Prevent column breaks within items of "Comité de rédaction" (at the price of
+ unbalanced columns).
+
+## Fixed
+- Track changes in `expl3`.
+- Superflous uppercases removed.
+- Index directive in `latexmk` config file modernized.
+
+# [0.98] - 2018-04-09
+
+## Changed
+- Support for `biblatex` 3.8 changes.
+- Track changes in `expl3`.
+- Special editions implemented.
+
+## Fixed
+- Several bug fixes.
+
+# [0.96] - 2017-04-07
+
+## Changed
+- Figures and tables:
+ - with recurrent label and number but without any caption,
+ - with caption but without any recurrent label nor numbered,
+ implemented.
+- Frames without any label, number nor caption implemented.
+- Track changes in `expl3`.
+
+# [0.9] - 2015-05-02
+
+- Initial CTAN release of the `gzt` bundle.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/gzt/README.md new/doc/latex/gzt/README.md
--- old/doc/latex/gzt/README.md 2018-04-08 22:06:15.000000000 +0200
+++ new/doc/latex/gzt/README.md 2020-03-18 22:18:01.000000000 +0100
@@ -1,81 +1,10 @@
-# Overview
+This bundle provides two classes and BibLaTeX styles for the French journal [“La
+Gazette des Mathématiciens”](https://smf.emath.fr/les-publications/la-gazette):
-The purpose of the current LaTeX bundle, `gzt`, is to provide two classes and
-`biblatex styles` for
-the French journal
-["La Gazette des Mathématiciens"](http://smf4.emath.fr/Publications/Gazette/):
-
-- `gzt` for the complete issues of the journal, aimed for the Gazette's team,
-- `gztarticle`, intended for the authors who wish to publish an article in the
- Gazette. This class goal is to:
- - faithfully reproduce the layout of the Gazette, thus enabling the authors
- to be able to work their document in actual conditions,
- - provide a number of tools (commands and environments) to facilitate the
- drafting of documents, in particular those containing mathematical
- formulas.
-
-# Copyright and Licence
-
-## Author
-
-Denis Bitouzé
-
-## Release
-
-2018/04/07 v0.98
-
-## Copyright
-
-Copyright 2014-2018 Denis Bitouzé
-
-## Licence
-
-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 the license is in http://www.latex-project.org/lppl.txt
-and version 1.3 or later is part of all distributions of LaTeX version
-2003/06/01 or later.
-
-This work has the LPPL maintenance status "maintained".
-
-#Installation
-
-- `gzt` is bundled with the main TeX distributions TeX Live (and its
- variants) and MiKTeX.
-- `gzt` starts life on [Github](https://github.com/dbitouze/gzt) where
- you can always find development releases.
-- The latest official release is put onto [CTAN](http://ctan.org/pkg/gzt)
- but users can get the latest stable version by updating their TeX
- distributions (upgrading if necessary for TeX Live).
-
-#Help
-
-## Documentation
-
-`gzt` is provided with an extensive documentation (in French) in the
-`doc/latex/gzt/french/` directory in the distribution, also
-available
-[on CTAN](http://mirrors.ctan.org/macros/latex/contrib/gzt/doc/gzt-fr.pdf).
-
-## Templates and samples
-
-`gzt` comes with a template attached to the documentation above.
-
-## Questions and answers
-
-Users can ask questions about `gzt` e.g. on Q & A sites:
-
-- [in French](http://texnique.fr/osqa/tags/gzt/)
-- [in English](http://tex.stackexchange.com/questions/tagged/gzt)
-
-# Debug and feature requests
-
-Suggestions and bug reports are welcome.
-
-- Go to the Github [issues page](https://github.com/dbitouze/gzt/issues/).
-- If not already reported, [open an issue](https://github.com/dbitouze/gzt/issues/new/).
-- Add
- a [minimal working example](http://www.tex.ac.uk/cgi-bin/texfaq2html?label=minxampl) if
- possible. This helps a great deal facilitate a swift response.
+- `gzt` for the complete issues of the journal, aimed at the Gazette’s team,
+- `gztarticle`, intended for authors who wish to publish an article in the
+ Gazette. This class’s goals are to
+ - faithfully reproduce the layout of the Gazette, thus enabling the authors to
+ be able to work their document in actual conditions, and
+ - provide a number of tools (commands and environments) to facilitate the
+ drafting of documents, in particular those containing mathematical formulas.
Binary files old/doc/latex/gzt/french/gzt-fr.pdf and new/doc/latex/gzt/french/gzt-fr.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/gzt/french/gzt-fr.tex new/doc/latex/gzt/french/gzt-fr.tex
--- old/doc/latex/gzt/french/gzt-fr.tex 2018-04-08 22:06:15.000000000 +0200
+++ new/doc/latex/gzt/french/gzt-fr.tex 2020-03-18 22:18:01.000000000 +0100
@@ -1,7 +1,7 @@
\documentclass{gztarticle}
%
-\newdate{release-date}{07}{04}{2018}
-\newcommand{\releaseversion}{0.98}
+\newdate{release-date}{17}{03}{2020}
+\newcommand{\releaseversion}{1.0.0}
%
\usepackage{denisbdoc}
\usepackage[firstpage]{draftwatermark}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gzt.doc.tlpobj new/tlpkg/tlpobj/gzt.doc.tlpobj
--- old/tlpkg/tlpobj/gzt.doc.tlpobj 2019-02-28 03:41:31.000000000 +0100
+++ new/tlpkg/tlpobj/gzt.doc.tlpobj 2020-03-19 01:54:36.000000000 +0100
@@ -1,9 +1,10 @@
name gzt.doc
category Package
-revision 47381
+revision 54390
shortdesc doc files of gzt
relocated 1
-docfiles size=176
+docfiles size=178
+ RELOC/doc/latex/gzt/CHANGELOG.md
RELOC/doc/latex/gzt/README.md
RELOC/doc/latex/gzt/english/README-TRANSLATION.md
RELOC/doc/latex/gzt/french/denis.png
++++++ gzt.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/gzt/gzt.cls new/tex/latex/gzt/gzt.cls
--- old/tex/latex/gzt/gzt.cls 2018-04-08 22:06:15.000000000 +0200
+++ new/tex/latex/gzt/gzt.cls 2020-03-18 22:18:01.000000000 +0100
@@ -7,7 +7,7 @@
%% gzt.dtx (with options: `class')
%% -----------------------------------------------------------------------------
%% gzt --- SMF bundle of classes for the French journal "La Gazette des
-%% Math'ematiciens", version 0.98
+%% Math'ematiciens", version 1.0.0
%%
%% E-mail: denis.bitouze(a)univ-littoral.fr
%% Released under the LaTeX Project Public License v1.3c or later
@@ -81,8 +81,8 @@
\ExplSyntaxOn
\ProvidesExplClass
{gzt}
- {2018/04/07}
- {0.98}
+ {2020-03-17}
+ {1.0.0}
{
SMF~class~for~the~French~journal^^J
"La~Gazette~des~Math'ematiciens".
@@ -313,7 +313,7 @@
\AtEndPreamble{
\tl_const:Nn \c__gzt_frontcover_header_string_tl {
\bool_if:NT {\g__gzt_special_edition_bool} {
- \tl_upper_case:n {\c__gzt_long_special_edition_string_tl}
+ \text_uppercase:n {\c__gzt_long_special_edition_string_tl}
\medskip
\par
\normalsize
@@ -415,12 +415,12 @@
\tl_const:Nn \c__gzt_Cad_string_tl {C'est-\`a-dire}
\tl_const:Nn \c__gzt_footer_string_tl {
\c__gzt_footer_size_font_tl
- \textcolor{__gzt_smf_number_color}{\MakeTextUppercase{\c__gzt_smf_short_string_tl}}
+ \textcolor{__gzt_smf_number_color}{\text_uppercase:n {\c__gzt_smf_short_string_tl}}
\c_space_tl
\textcolor{__gzt_date_color}{
\textendash{}\c_space_tl
- \MakeTextUppercase{\c__gzt_journal_short_title_string_tl}
- \bool_if:nF { \g__gzt_inside_frontcover_bool || \g__gzt_backmatter_bool || \g__gzt_for_authors_bool }
+ \text_uppercase:n {\c__gzt_journal_short_title_string_tl}
+ \bool_if:nF { \g__gzt_inside_frontcover_bool || \g__gzt_backmatter_bool || {\int_compare_p:nNn {\g__gzt_issue_number_int}={0}} }
{
\c_space_tl\textendash{}\c_space_tl
\l__gzt_uppercased_date_format\displaydate{__gzt_date}
@@ -449,10 +449,14 @@
\tl_const:Nn \c__gzt_aside_string_tl {--}
\tl_const:Nn \c__gzt_draftwatermark_string_tl {draft}
\tl_const:Nn \c__gzt_compiled_string_tl {
- \IfLanguageName{french}{
- Compil\'e~le~
- }{
- Compiled~on~
+ \int_compare:nNnT {\g__gzt_issue_number_int}={0} {
+ \c__gzt_footer_size_font_tl
+ \IfLanguageName{french}{
+ Compil\'e~le~
+ }{
+ Compiled~on~
+ }
+ \today
}
}
\bool_new:N \g__gzt_frontcover_bool
@@ -647,16 +651,16 @@
\dim_set:Nn \l__gzt_thumbnail_width_dim {30mm}
\dim_new:N \g__gzt_abstract_box_width_dim
\dim_new:N \c__gzt_original_parindent_dim
-\dim_set_eq:NN \c__gzt_original_parindent_dim \parindent
+\dim_gset_eq:NN \c__gzt_original_parindent_dim \parindent
\dim_new:N \l__gzt_between_rubric_head_text_and_abstract_dim
\dim_new:N \g__gzt_minitoc_circle_diameter_dim
\dim_new:N \g__gzt_minitoc_textwidth_dim
\dim_new:N \g__gzt_minitoc_xshift_dim
\dim_new:N \g__gzt_minitoc_yshift_dim
-\dim_set:Nn \g__gzt_minitoc_circle_diameter_dim {142mm}
-\dim_set:Nn \g__gzt_minitoc_textwidth_dim {65mm}
-\dim_set:Nn \g__gzt_minitoc_xshift_dim {-22mm}
-\dim_set:Nn \g__gzt_minitoc_yshift_dim {30mm}
+\dim_gset:Nn \g__gzt_minitoc_circle_diameter_dim {142mm}
+\dim_gset:Nn \g__gzt_minitoc_textwidth_dim {65mm}
+\dim_gset:Nn \g__gzt_minitoc_xshift_dim {-22mm}
+\dim_gset:Nn \g__gzt_minitoc_yshift_dim {30mm}
\dim_const:Nn \c__gzt_minitoc_from_circle_xshift_dim {-15mm}
\dim_const:Nn \c__gzt_minitoc_from_circle_yshift_dim {-\c__gzt_minitoc_from_circle_xshift_dim}
\dim_const:Nn \c__gzt_footer_height_font_dim {3mm}
@@ -1143,9 +1147,12 @@
}
\tl_if_in:NnF \l__gzt_people_speciality { NoValue } { ~(\l__gzt_people_speciality) }
]
- \l__gzt_people_affiliation_tl%
- \newline%
- \href{mailto:\l__gzt_people_email_tl}{\nolinkurl{\l__gzt_people_email_tl}}%
+ \leavevmode
+ \vbox_top:n {%
+ \l__gzt_people_affiliation_tl%
+ \newline%
+ \href{mailto:\l__gzt_people_email_tl}{\nolinkurl{\l__gzt_people_email_tl}}%
+ }
\DTLiflastrow{%
}{%
\medskip%
@@ -1280,7 +1287,7 @@
\g__gzt_special_edition_title_tl
}
}{
- \MakeUppercase {\c__gzt_journal_title_string_tl}
+ \text_uppercase:n {\c__gzt_journal_title_string_tl}
}
};
\node[name=__gzt_binding_nw,inner~sep=\c_zero_dim,fill=\g__gzt_special_edition_color_tl,rotate=90,anchor=east] at
@@ -1316,19 +1323,19 @@
\begin{multicols}{2}
\setlength{\columnsep}{1mm}
\bool_if:NTF {\g__gzt_special_edition_bool} {
- \begin{description}[leftmargin=1em,style=nextline]
+ \begin{description}[leftmargin=1em,style=nextline,labelindent=\c_zero_dim]
\__gzt_display_people_by_role:n {editor}
\end{description}
}{%
\begin{description}[leftmargin=1em]
\item[\c__gzt_editors_in_chief_string_tl] \
- \begin{description}[leftmargin=1em,style=nextline]
+ \begin{description}[leftmargin=1em,style=nextline,labelindent=\c_zero_dim]
\__gzt_display_people_by_role:n {editorinchief}
\end{description}
\bigskip
\par
\item[\c__gzt_editors_string_tl] \
- \begin{description}[leftmargin=1em,style=nextline]
+ \begin{description}[leftmargin=1em,style=nextline,labelindent=\c_zero_dim]
\__gzt_display_people_by_role:n {editor}
\end{description}
\end{description}
@@ -1830,7 +1837,7 @@
\tl_new:N \g__gzt_citeinterviewee_tl%
\tl_new:N \g__gzt_blx_given_first_inits_tl%
\@ifpackagelater{biblatex}{2016/01/01}{%
- \tl_set:Nn \g__gzt_blx_given_first_inits_false_tl
+ \tl_gset:Nn \g__gzt_blx_given_first_inits_false_tl
{%
\togglefalse{abx@bool@giveninits}%
}
@@ -2717,12 +2724,12 @@
\setfoot%
[]%
[%
- \uppercase{\c__gzt_footer_string_tl}
+ \c__gzt_footer_string_tl
]%
[]%
{}%
{%
- \uppercase{\c__gzt_footer_string_tl}%
+ \c__gzt_footer_string_tl%
}%
{}%
}%
@@ -2749,14 +2756,14 @@
\setfoot%
[\c__gzt_footer_size_font_tl\thepage]%
[%
- \uppercase{\c__gzt_footer_string_tl}
+ \c__gzt_footer_string_tl
]%
[
]%
{
}%
{%
- \uppercase{\c__gzt_footer_string_tl}%
+ \c__gzt_footer_string_tl%
}%
{\c__gzt_footer_size_font_tl\thepage}%
}%
@@ -2790,12 +2797,12 @@
\setfoot%
[\c__gzt_footer_size_font_tl\thepage]%
[%
- \uppercase{\c__gzt_footer_string_tl}
+ \c__gzt_footer_string_tl
]%
[]%
{}%
{%
- \uppercase{\c__gzt_footer_string_tl}%
+ \c__gzt_footer_string_tl%
}%
{\c__gzt_footer_size_font_tl\thepage}%
}%
@@ -2824,12 +2831,12 @@
\setfoot%
[\c__gzt_footer_size_font_tl\thepage]%
[%
- \uppercase{\c__gzt_footer_string_tl}
+ \c__gzt_footer_string_tl
]%
[]%
{}%
{%
- \uppercase{\c__gzt_footer_string_tl}%
+ \c__gzt_footer_string_tl%
}%
{\c__gzt_footer_size_font_tl\thepage}%
}
@@ -2842,12 +2849,12 @@
\setfoot%
[\c__gzt_footer_size_font_tl\thepage]%
[%
- \uppercase{\c__gzt_footer_string_tl}
+ \c__gzt_footer_string_tl
]%
[]%
{}%
{%
- \uppercase{\c__gzt_footer_string_tl}%
+ \c__gzt_footer_string_tl%
}%
{\c__gzt_footer_size_font_tl\thepage}%
}%
@@ -2873,12 +2880,12 @@
\setfoot%
[]%
[%
- \uppercase{\c__gzt_footer_string_tl}
+ \c__gzt_footer_string_tl
]%
[]%
{}%
{%
- \uppercase{\c__gzt_footer_string_tl}%
+ \c__gzt_footer_string_tl%
}%
{}%
}%
@@ -2930,24 +2937,24 @@
\setfoot%
[\c__gzt_footer_size_font_tl\thepage]%
[%
- \uppercase{\c__gzt_footer_string_tl}
+ \c__gzt_footer_string_tl
]%
- [\c__gzt_footer_size_font_tl \c__gzt_compiled_string_tl\today]%
- {\c__gzt_footer_size_font_tl \c__gzt_compiled_string_tl\today}%
+ [\c__gzt_compiled_string_tl]%
+ {\c__gzt_compiled_string_tl}%
{%
- \uppercase{\c__gzt_footer_string_tl}%
+ \c__gzt_footer_string_tl%
}%
{\c__gzt_footer_size_font_tl\thepage}%
}{
\setfoot%
[\c__gzt_footer_size_font_tl\thepage]%
[%
- \uppercase{\c__gzt_footer_string_tl}
+ \c__gzt_footer_string_tl
]%
[]%
{}%
{%
- \uppercase{\c__gzt_footer_string_tl}%
+ \c__gzt_footer_string_tl%
}%
{\c__gzt_footer_size_font_tl\thepage}%
}
@@ -3587,7 +3594,7 @@
\@ifpackageloaded{draftwatermark}{%
\SetWatermarkColor{gray!10}%
\SetWatermarkFontSize{30mm}%
- \SetWatermarkText{\MakeUppercase{\c__gzt_draftwatermark_string_tl}}%
+ \SetWatermarkText{\text_uppercase:n{\c__gzt_draftwatermark_string_tl}}%
}{%
}
\tikzset{
@@ -3811,7 +3818,7 @@
\tl_clear:N \l__gzt_newtheorem_frenchtitle_tl
\tl_clear:N \l__gzt_newtheorem_englishtitle_tl
\tl_set:Nn \l__gzt_newtheorem_englishtitle_tl {
- \MakeUppercase #2
+ \text_uppercase:n {#2}
}
\tl_set:Nf \l__gzt_newtheorem_frenchtitle_tl {
\l__gzt_newtheorem_englishtitle_tl
@@ -3939,11 +3946,11 @@
\ExplSyntaxOff
%% ----------------------------------------------------------------------------
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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.3 or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/gzt/gzt.dbx new/tex/latex/gzt/gzt.dbx
--- old/tex/latex/gzt/gzt.dbx 2018-04-08 22:06:15.000000000 +0200
+++ new/tex/latex/gzt/gzt.dbx 2020-03-18 22:18:01.000000000 +0100
@@ -7,7 +7,7 @@
%% gzt.dtx (with options: `datamodel')
%% -----------------------------------------------------------------------------
%% gzt --- SMF bundle of classes for the French journal "La Gazette des
-%% Math'ematiciens", version 0.98
+%% Math'ematiciens", version 1.0.0
%%
%% E-mail: denis.bitouze(a)univ-littoral.fr
%% Released under the LaTeX Project Public License v1.3c or later
@@ -222,11 +222,11 @@
}
%% ----------------------------------------------------------------------------
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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.3 or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/gzt/gzt.lbx new/tex/latex/gzt/gzt.lbx
--- old/tex/latex/gzt/gzt.lbx 2018-04-08 22:06:15.000000000 +0200
+++ new/tex/latex/gzt/gzt.lbx 2020-03-18 22:18:01.000000000 +0100
@@ -7,27 +7,27 @@
%% gzt.dtx (with options: `languagemodel')
%% -----------------------------------------------------------------------------
%% gzt --- SMF bundle of classes for the French journal "La Gazette des
-%% Math'ematiciens", version 0.98
+%% Math'ematiciens", version 1.0.0
%%
%% E-mail: denis.bitouze(a)univ-littoral.fr
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% -----------------------------------------------------------------------------
- \ProvidesFile{gzt.lbx}
- \InheritBibliographyExtras{french}% extras are inherited from French...
- \DeclareBibliographyStrings{%
- inherit = {french},% .... as well as all the keys
- number = {{\no}{\no}},
- volume = {{volume}{vol\adddot}},
- volumes = {{volumes}{vol\adddot}},
- }
+\ProvidesFile{gzt.lbx}
+\InheritBibliographyExtras{french}% extras are inherited from French...
+\DeclareBibliographyStrings{%
+ inherit = {french},% .... as well as all the keys
+ number = {{\no}{\no}},
+ volume = {{volume}{vol\adddot}},
+ volumes = {{volumes}{vol\adddot}},
+}
%% ----------------------------------------------------------------------------
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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.3 or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/gzt/gztarticle.cls new/tex/latex/gzt/gztarticle.cls
--- old/tex/latex/gzt/gztarticle.cls 2018-04-08 22:06:15.000000000 +0200
+++ new/tex/latex/gzt/gztarticle.cls 2020-03-18 22:18:01.000000000 +0100
@@ -7,7 +7,7 @@
%% gzt.dtx (with options: `class-article')
%% -----------------------------------------------------------------------------
%% gzt --- SMF bundle of classes for the French journal "La Gazette des
-%% Math'ematiciens", version 0.98
+%% Math'ematiciens", version 1.0.0
%%
%% E-mail: denis.bitouze(a)univ-littoral.fr
%% Released under the LaTeX Project Public License v1.3c or later
@@ -61,8 +61,8 @@
\ExplSyntaxOn
\ProvidesExplClass
{gztarticle}
- {2018/04/07}
- {0.98}
+ {2020-03-17}
+ {1.0.0}
{
SMF~class~for~the~French~journal^^J
"La~Gazette~des~Math'ematiciens".
@@ -222,7 +222,7 @@
\AtEndPreamble{
\tl_const:Nn \c__gzt_frontcover_header_string_tl {
\bool_if:NT {\g__gzt_special_edition_bool} {
- \tl_upper_case:n {\c__gzt_long_special_edition_string_tl}
+ \text_uppercase:n {\c__gzt_long_special_edition_string_tl}
\medskip
\par
\normalsize
@@ -324,11 +324,21 @@
\tl_const:Nn \c__gzt_Cad_string_tl {C'est-\`a-dire}
\tl_const:Nn \c__gzt_footer_string_tl {
\c__gzt_footer_size_font_tl
- \textcolor{__gzt_smf_number_color}{\MakeTextUppercase{\c__gzt_smf_short_string_tl}}
+ \textcolor{__gzt_smf_number_color}{\text_uppercase:n {\c__gzt_smf_short_string_tl}}
\c_space_tl
\textcolor{__gzt_date_color}{
\textendash{}\c_space_tl
- \MakeTextUppercase{\c__gzt_journal_short_title_string_tl}
+ \text_uppercase:n {\c__gzt_journal_short_title_string_tl}
+ \bool_if:nF { \g__gzt_inside_frontcover_bool || \g__gzt_backmatter_bool || {\int_compare_p:nNn {\g__gzt_issue_number_int}={0}} }
+ {
+ \c_space_tl\textendash{}\c_space_tl
+ \l__gzt_uppercased_date_format\displaydate{__gzt_date}
+ \bool_if:NF {\g__gzt_special_edition_bool} {
+ \c_space_tl
+ \textendash{}\c_space_tl
+ \textcolor{__gzt_smf_number_color}{\No\int_use:N\g__gzt_issue_number_int}
+ }
+ }
}
}
\file_if_exist:nTF { logo_SMF.pdf }{%
@@ -348,10 +358,14 @@
\tl_const:Nn \c__gzt_aside_string_tl {--}
\tl_const:Nn \c__gzt_draftwatermark_string_tl {draft}
\tl_const:Nn \c__gzt_compiled_string_tl {
- \IfLanguageName{french}{
- Compil\'e~le~
- }{
- Compiled~on~
+ \int_compare:nNnT {\g__gzt_issue_number_int}={0} {
+ \c__gzt_footer_size_font_tl
+ \IfLanguageName{french}{
+ Compil\'e~le~
+ }{
+ Compiled~on~
+ }
+ \today
}
}
\bool_new:N \g__gzt_frontcover_bool
@@ -546,16 +560,16 @@
\dim_set:Nn \l__gzt_thumbnail_width_dim {30mm}
\dim_new:N \g__gzt_abstract_box_width_dim
\dim_new:N \c__gzt_original_parindent_dim
-\dim_set_eq:NN \c__gzt_original_parindent_dim \parindent
+\dim_gset_eq:NN \c__gzt_original_parindent_dim \parindent
\dim_new:N \l__gzt_between_rubric_head_text_and_abstract_dim
\dim_new:N \g__gzt_minitoc_circle_diameter_dim
\dim_new:N \g__gzt_minitoc_textwidth_dim
\dim_new:N \g__gzt_minitoc_xshift_dim
\dim_new:N \g__gzt_minitoc_yshift_dim
-\dim_set:Nn \g__gzt_minitoc_circle_diameter_dim {142mm}
-\dim_set:Nn \g__gzt_minitoc_textwidth_dim {65mm}
-\dim_set:Nn \g__gzt_minitoc_xshift_dim {-22mm}
-\dim_set:Nn \g__gzt_minitoc_yshift_dim {30mm}
+\dim_gset:Nn \g__gzt_minitoc_circle_diameter_dim {142mm}
+\dim_gset:Nn \g__gzt_minitoc_textwidth_dim {65mm}
+\dim_gset:Nn \g__gzt_minitoc_xshift_dim {-22mm}
+\dim_gset:Nn \g__gzt_minitoc_yshift_dim {30mm}
\dim_const:Nn \c__gzt_minitoc_from_circle_xshift_dim {-15mm}
\dim_const:Nn \c__gzt_minitoc_from_circle_yshift_dim {-\c__gzt_minitoc_from_circle_xshift_dim}
\dim_const:Nn \c__gzt_footer_height_font_dim {3mm}
@@ -1042,9 +1056,12 @@
}
\tl_if_in:NnF \l__gzt_people_speciality { NoValue } { ~(\l__gzt_people_speciality) }
]
- \l__gzt_people_affiliation_tl%
- \newline%
- \href{mailto:\l__gzt_people_email_tl}{\nolinkurl{\l__gzt_people_email_tl}}%
+ \leavevmode
+ \vbox_top:n {%
+ \l__gzt_people_affiliation_tl%
+ \newline%
+ \href{mailto:\l__gzt_people_email_tl}{\nolinkurl{\l__gzt_people_email_tl}}%
+ }
\DTLiflastrow{%
}{%
\medskip%
@@ -1179,7 +1196,7 @@
\g__gzt_special_edition_title_tl
}
}{
- \MakeUppercase {\c__gzt_journal_title_string_tl}
+ \text_uppercase:n {\c__gzt_journal_title_string_tl}
}
};
\node[name=__gzt_binding_nw,inner~sep=\c_zero_dim,fill=\g__gzt_special_edition_color_tl,rotate=90,anchor=east] at
@@ -1215,19 +1232,19 @@
\begin{multicols}{2}
\setlength{\columnsep}{1mm}
\bool_if:NTF {\g__gzt_special_edition_bool} {
- \begin{description}[leftmargin=1em,style=nextline]
+ \begin{description}[leftmargin=1em,style=nextline,labelindent=\c_zero_dim]
\__gzt_display_people_by_role:n {editor}
\end{description}
}{%
\begin{description}[leftmargin=1em]
\item[\c__gzt_editors_in_chief_string_tl] \
- \begin{description}[leftmargin=1em,style=nextline]
+ \begin{description}[leftmargin=1em,style=nextline,labelindent=\c_zero_dim]
\__gzt_display_people_by_role:n {editorinchief}
\end{description}
\bigskip
\par
\item[\c__gzt_editors_string_tl] \
- \begin{description}[leftmargin=1em,style=nextline]
+ \begin{description}[leftmargin=1em,style=nextline,labelindent=\c_zero_dim]
\__gzt_display_people_by_role:n {editor}
\end{description}
\end{description}
@@ -1484,6 +1501,36 @@
\NewDocumentCommand \academicsignature { m } {
\__gzt_display_academic_signature:n {#1}
}
+\cs_new_protected:Nn \__gzt_uppercased_monthname_french:n
+{
+ \@orgargctr=#1\relax
+ \ifcase\@orgargctr
+ \PackageError{datetime}{Invalid~month~number~\the\@orgargctr}{%
+ Month~numbers~should~go~from~1~(janvier)~to~12~(decembre)}%
+ \or JANVIER%
+ \or F\'EVRIER%
+ \or MARS%
+ \or AVRIL%
+ \or MAI%
+ \or JUIN%
+ \or JUILLET%
+ \or AO\^UT%
+ \or SEPTEMBRE%
+ \or OCTOBRE%
+ \or NOVEMBRE%
+ \or D\'ECEMBRE%
+ \else
+ \PackageError{datetime}{Invalid~month~number~\the\@orgargctr}{%
+ Month~numbers~should~go~from~1~(janvier)~to~12~(decembre)}%
+ \fi
+}
+\newdate{__gzt_date}
+ {1}
+ {\int_use:N \g__gzt_issue_month_int}
+ {\int_use:N \g__gzt_issue_year_int}
+\newdateformat{l__gzt_uppercased_date_format}{
+ \__gzt_uppercased_monthname_french:n {\THEMONTH}~\THEYEAR
+}
\AtBeginDocument{%
\tl_new:N \g__gzt_bib_issue_date_tl
\tl_gset:Nn \g__gzt_bib_issue_date_tl {
@@ -1596,7 +1643,7 @@
\tl_new:N \g__gzt_citeinterviewee_tl%
\tl_new:N \g__gzt_blx_given_first_inits_tl%
\@ifpackagelater{biblatex}{2016/01/01}{%
- \tl_set:Nn \g__gzt_blx_given_first_inits_false_tl
+ \tl_gset:Nn \g__gzt_blx_given_first_inits_false_tl
{%
\togglefalse{abx@bool@giveninits}%
}
@@ -1919,6 +1966,163 @@
\file_if_exist:nT { \c__gzt_acronyms_file_string_tl } {%
\AtEndPreamble{\loadglsentries{\c__gzt_acronyms_file_string_tl}}
}
+\tl_new:N \g__gzt_boxed_issue_number_tl%
+\tl_gset:Nn \g__gzt_boxed_issue_number_tl {%
+ \tcbox{\Large\No\g__gzt_issue_number_int}
+}
+\cs_new_protected:Nn \__gzt_boxed_issue_number:nn
+{
+ \noindent%
+ \raisebox{\baselineskip}{%
+ \tl_if_empty:nF {#1} {%
+ \makebox[\c_zero_dim][r]{%
+ % \hspace*{\l__gzt_thumbnail_width_dim}%
+ \begin{adjustbox}{valign=t}
+ \includegraphics[width=\l__gzt_thumbnail_width_dim]{#1}%
+ \end{adjustbox}%
+ }%
+ }%
+ \bool_if:NTF {\g__gzt_special_edition_bool} {
+ \tl_set:Nn \l_tmpa_tl {\c__gzt_short_special_edition_string_tl}
+ }{
+ \tl_set:Nn \l_tmpa_tl {\No\int_use:N\g__gzt_issue_number_int}
+ }
+ \begin{adjustbox}{valign=t}
+ \begin{tcolorbox}[%
+ enhanced,%
+ title=\l_tmpa_tl,%\int_use:N \g__gzt_issue_number_int,%
+ fonttitle=\Large,%
+ colback=white,%
+ sharp~corners=all,%
+ height=33mm,%
+ boxrule=\c_zero_dim,%
+ % frame~hidden,%
+ attach~boxed~title~to~top~left,%
+ tikznode~boxed~title={minimum~width=\c__gzt_boxed_issue_number_width_dim},%
+ boxed~title~style={%
+ size=minimal,%
+ height=\c__gzt_boxed_issue_number_height_dim,%
+ center~upper,%
+ before={},%
+ colback=__gzt_boxed_issue_number_bg_color,%
+ sharp~corners=all,%
+ frame~hidden,%
+ valign=center,%
+ }%
+ ]
+ \__gzt_reflected_text:n { #2 }%
+ \end{tcolorbox}
+ \end{adjustbox}%
+ }%
+ \par%
+}
+\cs_new_protected:Nn \__gzt_before_frontmatter_stuff:
+{
+ \bool_gset_true:N \g__gzt_frontmatter_bool%
+ \pagestyle{__gzt_frontmatter_ps}%
+ \exp_after:wN\newgeometry\exp_after:wN{\c__gzt_front_matter_geometry_tl}%
+}
+\cs_new_protected:Nn \__gzt_after_frontmatter_stuff:
+{
+ \color{__gzt_default_text_color}
+ \normalsize%
+ \clearpage%
+ \bool_gset_false:N \g__gzt_frontmatter_bool%
+}
+\cs_new_protected:Nn \__gzt_before_editorial_presidentmessage:nn
+{
+ \__gzt_before_frontmatter_stuff: {}
+ \__gzt_boxed_issue_number:nn {#1}{#2}
+ \color{__gzt_frontmatter_text_color}%
+ \fontsize{11}{13.6}\selectfont
+ \RaggedRight
+}
+\cs_new_protected:Nn \__gzt_after_editorial_presidentmessage:
+{
+ \justifying
+ \bigskip
+ \par
+}
+\cs_new_protected:Nn \__gzt_before_display_editorial:n
+{
+ \__gzt_before_editorial_presidentmessage:nn {}{#1}
+}
+\cs_new_protected:Nn \__gzt_after_display_editorial:
+{
+ \__gzt_after_editorial_presidentmessage: {}
+ \hspace*{\fill}%
+ \bool_if:NTF {\g__gzt_special_edition_bool} {
+ \AtNextCitekey{\defcounter{maxnames}{100}}
+ \__gzt_citeauthor_no_firstinits:n {\c__gzt_issue_bib_key_tl -editorinchief- 1}
+ }{
+ \DTLforeach*[\DTLiseq{\l__gzt_people_role_tl}{editorinchief}]{people}{%
+ \l__gzt_firstlastname=first-last-name%
+ ,\l__gzt_people_role_tl=role%
+ }{%
+ \__gzt_citeauthor_no_firstinits:n {\c__gzt_issue_bib_key_tl -editorinchief- \exp_not:V\DTLcurrentindex}%
+ }
+ }
+ %
+ \__gzt_after_frontmatter_stuff: {}
+}
+\cs_new_protected:Nn \__gzt_display_editorial:n
+{
+ \__gzt_before_display_editorial:n {#1}
+ \file_if_exist_input:nF {\c__gzt_editorial_file_string_tl}
+ {%
+ \msg_error:nn { gzt } { editorial-file-missing }
+ }
+ \__gzt_after_display_editorial: {}
+}
+\AtEndPreamble{%
+ \tl_set_eq:NN \g__gzt_editorial_heading_tl \c__gzt_editorial_heading_string_tl
+ \bool_if:NT {\g__gzt_special_edition_bool} {
+ \tl_if_empty:NF \g__gzt_special_edition_editorial_heading_tl {%
+ \tl_set_eq:NN \g__gzt_editorial_heading_tl \g__gzt_special_edition_editorial_heading_tl
+ }
+ }
+ \NewDocumentCommand \editorial { O{\g__gzt_editorial_heading_tl} }
+ {
+ \bool_if:NF {\g__gzt_for_authors_bool} {
+ \__gzt_display_editorial:n {#1}
+ }
+ }
+}
+\cs_new_protected:Nn \__gzt_before_display_presidentmessage:
+{
+ \__gzt_before_editorial_presidentmessage:nn {\c__gzt_smf_logo_file_string_tl}{\c__gzt_president_message_string_tl}
+ \phantomsection
+ \par%
+ \addcontentsline{toc}{part}{\g__gzt_smf_short_string_tl}%
+ \addcontentsline{toc}{chapter}{\c__gzt_president_message_string_tl}%
+}
+\cs_new_protected:Nn \__gzt_after_display_presidentmessage:
+{
+ \__gzt_after_editorial_presidentmessage: {}
+ %
+ \hspace*{\fill}%
+ \c__gzt_president_message_date_string_tl%
+ \displaydate{__gzt_president_message_date}%
+ \\[1.5mm]
+ \hspace*{\fill}%
+ \__gzt_display_people_by_role:n { president }%
+ ,\c_space_tl
+ \c__gzt_president_signatory_string_tl
+ %
+ \__gzt_after_frontmatter_stuff: {}
+}
+\cs_new_protected:Nn \__gzt_display_president_message:
+{
+ \__gzt_before_display_presidentmessage: {}
+ \file_input:n {\c__gzt_president_message_file_string_tl}
+ \__gzt_after_display_presidentmessage: {}
+}
+\NewDocumentCommand \presidentmessage {}
+{
+ \bool_if:NF {\g__gzt_for_authors_bool} {
+ \__gzt_display_president_message: {}
+ }
+}
\titleformat{\chapter}%
[block]
{\Huge\bfseries}
@@ -2082,16 +2286,16 @@
\setfoot%
[\c__gzt_footer_size_font_tl\thepage]%
[%
- \uppercase{\c__gzt_footer_string_tl}
+ \c__gzt_footer_string_tl
]%
[
- \c__gzt_footer_size_font_tl \c__gzt_compiled_string_tl\today
+\c__gzt_compiled_string_tl
]%
{
- \c__gzt_footer_size_font_tl \c__gzt_compiled_string_tl\today
+\c__gzt_compiled_string_tl
}%
{%
- \uppercase{\c__gzt_footer_string_tl}%
+ \c__gzt_footer_string_tl%
}%
{\c__gzt_footer_size_font_tl\thepage}%
}%
@@ -2130,24 +2334,24 @@
\setfoot%
[\c__gzt_footer_size_font_tl\thepage]%
[%
- \uppercase{\c__gzt_footer_string_tl}
+ \c__gzt_footer_string_tl
]%
- [\c__gzt_footer_size_font_tl \c__gzt_compiled_string_tl\today]%
- {\c__gzt_footer_size_font_tl \c__gzt_compiled_string_tl\today}%
+ [\c__gzt_compiled_string_tl]%
+ {\c__gzt_compiled_string_tl}%
{%
- \uppercase{\c__gzt_footer_string_tl}%
+ \c__gzt_footer_string_tl%
}%
{\c__gzt_footer_size_font_tl\thepage}%
}{
\setfoot%
[\c__gzt_footer_size_font_tl\thepage]%
[%
- \uppercase{\c__gzt_footer_string_tl}
+ \c__gzt_footer_string_tl
]%
[]%
{}%
{%
- \uppercase{\c__gzt_footer_string_tl}%
+ \c__gzt_footer_string_tl%
}%
{\c__gzt_footer_size_font_tl\thepage}%
}
@@ -2566,7 +2770,7 @@
{
editorial .code:n = {%
\AtBeginDocument{%
- \__gzt_before_display_editorial: {}%
+ \__gzt_before_display_editorial:n {}%
}
\AtEndDocument{%
\__gzt_after_display_editorial: {}%
@@ -2656,7 +2860,7 @@
\@ifpackageloaded{draftwatermark}{%
\SetWatermarkColor{gray!10}%
\SetWatermarkFontSize{30mm}%
- \SetWatermarkText{\MakeUppercase{\c__gzt_draftwatermark_string_tl}}%
+ \SetWatermarkText{\text_uppercase:n{\c__gzt_draftwatermark_string_tl}}%
}{%
}
\tikzset{
@@ -2880,7 +3084,7 @@
\tl_clear:N \l__gzt_newtheorem_frenchtitle_tl
\tl_clear:N \l__gzt_newtheorem_englishtitle_tl
\tl_set:Nn \l__gzt_newtheorem_englishtitle_tl {
- \MakeUppercase #2
+ \text_uppercase:n {#2}
}
\tl_set:Nf \l__gzt_newtheorem_frenchtitle_tl {
\l__gzt_newtheorem_englishtitle_tl
@@ -3008,11 +3212,11 @@
\ExplSyntaxOff
%% ----------------------------------------------------------------------------
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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.3 or later is part of all distributions of LaTeX
+%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%%
%% This work has the LPPL maintenance status `maintained'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/gzt.tlpobj new/tlpkg/tlpobj/gzt.tlpobj
--- old/tlpkg/tlpobj/gzt.tlpobj 2019-02-28 03:41:31.000000000 +0100
+++ new/tlpkg/tlpobj/gzt.tlpobj 2020-03-19 01:54:36.000000000 +0100
@@ -1,6 +1,6 @@
name gzt
category Package
-revision 47381
+revision 54390
shortdesc Bundle of classes for "La Gazette des Mathematiciens"
relocated 1
longdesc This bundle provides two classes and BibLaTeX styles for the
@@ -13,7 +13,7 @@
longdesc number of tools (commands and environments) to facilitate the
longdesc drafting of documents, in particular those containing
longdesc mathematical formulas.
-runfiles size=66
+runfiles size=67
RELOC/tex/latex/gzt/gzt.cfg
RELOC/tex/latex/gzt/gzt.cls
RELOC/tex/latex/gzt/gzt.dbx
@@ -21,8 +21,9 @@
RELOC/tex/latex/gzt/gztarticle.cls
RELOC/tex/latex/gzt/images/README-PICTOGRAMS.md
RELOC/tex/latex/gzt/images/gzt-logo.pdf
+catalogue-contact-bugs https://github.com/dbitouze/gzt/issues
+catalogue-contact-repository https://github.com/dbitouze/gzt
catalogue-ctan /macros/latex/contrib/gzt
-catalogue-date 2018-04-08 13:24:08 +0200
catalogue-license lppl1.3
catalogue-topics journalpub class french
-catalogue-version 0.98
+catalogue-version 1.0.0
++++++ hagenberg-thesis.doc.tar.xz ++++++
++++ 11827 lines of diff (skipped)
++++++ hagenberg-thesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hagenberg-thesis/hgb.sty new/tex/latex/hagenberg-thesis/hgb.sty
--- old/tex/latex/hagenberg-thesis/hgb.sty 2018-12-01 23:48:38.000000000 +0100
+++ new/tex/latex/hagenberg-thesis/hgb.sty 2019-05-17 22:56:56.000000000 +0200
@@ -5,26 +5,31 @@
%% File encoding: ASCII
\NeedsTeXFormat{LaTeX2e}
-\newcommand{\hgbDate}{2018/11/28} % version string
+\newcommand{\hgbDate}{2019/05/11} % version string
\ProvidesPackage{hgb}[\hgbDate]
+\typeout{******************* hgb.sty (options=\@nameuse{opt@hgb.sty}) ***********************}
% Create a default/fallback main language so it is set no matter what
\providecommand{\hgb@MainLanguage}{german}
-% Then pass the language options (german/ngerman/english) from the class file
+\RequirePackage{xifthen}
+\newboolean{hgb@SmartQuotesOn}
+\setboolean{hgb@SmartQuotesOn}{false}
+
+% Handle package options passed from the class file
\DeclareOption{english}{\renewcommand{\hgb@MainLanguage}{english}}
\DeclareOption{german}{\renewcommand{\hgb@MainLanguage}{german}}
\DeclareOption{ngerman}{\renewcommand{\hgb@MainLanguage}{german}}
+\DeclareOption{smartquotes}{\setboolean{hgb@SmartQuotesOn}{true}}
\ProcessOptions*
-
%% Required Packages ----------------------------------------------------------
-\RequirePackage{lmodern} % use Latin Modern Fonts
-\RequirePackage{cmap} % make generated PDF files "searchable and copyable"
-\RequirePackage[T1]{fontenc} % T1 font encoding for improved hyphenation
-\RequirePackage{xifthen}
+\RequirePackage{lmodern} % use Latin Modern Fonts
+\RequirePackage{cmap} % make generated PDF files "searchable and copyable"
+\RequirePackage[utf8]{inputenc}
+\RequirePackage[T1]{fontenc} % T1 font encoding for improved hyphenation
% Set main language by selectively loading babel with the 'main' parameter (babel 3.9+)
\ifthenelse{\equal{\hgb@MainLanguage}{german}}%
@@ -32,6 +37,29 @@
\ifthenelse{\equal{\hgb@MainLanguage}{english}}%
{\RequirePackage[main=english,ngerman]{babel}}{}
+%% Setup for smart quotes (csquotes package) -- experimental! ----------------------------------
+
+\ifthenelse{\boolean{hgb@SmartQuotesOn}}{
+ \languageshorthands{none}% %% turn off babel's shorthands (permanently)
+ \usepackage[autostyle=true,german=quotes]{csquotes}%
+ \MakeOuterQuote{"}%
+ \EnableQuotes}{}
+
+%% Language environments ------------------------------------------------------
+
+% Switch from German to English (babel)
+\newenvironment{english}%
+{\begin{otherlanguage}{english}%
+ \ifthenelse{\boolean{hgb@SmartQuotesOn}}{\EnableQuotes}{}}%
+{\end{otherlanguage}\ignorespacesafterend}%
+
+% Switch from English to German (babel)
+\newenvironment{german}%
+{\begin{otherlanguage}{ngerman}%
+ \ifthenelse{\boolean{hgb@SmartQuotesOn}}{\EnableQuotes}{}}%
+{\end{otherlanguage}}%
+
+%% ------------------------------------------------------
\RequirePackage{datetime}
\RequirePackage{upquote} % uses "right" quotes in the verbatim environment
@@ -82,19 +110,6 @@
\RequirePackage[figure,table,table*]{hypcap} % do not redefine figure* for use in article (without captions)
-%% Language environments ------------------------------------------------------
-
-% Switch from German to English (babel)
-\newenvironment{english}%
-{\begin{otherlanguage}{english}}%
-{\end{otherlanguage}}
-
-% Switch from English to German (babel)
-\newenvironment{german}%
-{\begin{otherlanguage}{ngerman}}%
-{\end{otherlanguage}}
-
-
%% Miscellaneous Utility Commands ---------------------------------------------
\newcommand\trennstrich{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hagenberg-thesis/hgbabbrev.sty new/tex/latex/hagenberg-thesis/hgbabbrev.sty
--- old/tex/latex/hagenberg-thesis/hgbabbrev.sty 2018-12-01 23:48:38.000000000 +0100
+++ new/tex/latex/hagenberg-thesis/hgbabbrev.sty 2019-05-17 22:56:56.000000000 +0200
@@ -4,7 +4,7 @@
%% GitHub: https://github.com/Digital-Media/HagenbergThesis
%% File encoding: ASCII
-\ProvidesPackage{hgbabbrev}[2018/11/28]
+\ProvidesPackage{hgbabbrev}[2019/05/11]
\newcommand{\latex}{La\-TeX\xspace} % no ornamental LaTeX anymore
\newcommand{\tex}{TeX\xspace} % no ornamental LaTeX anymore
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hagenberg-thesis/hgbalgo.sty new/tex/latex/hagenberg-thesis/hgbalgo.sty
--- old/tex/latex/hagenberg-thesis/hgbalgo.sty 2018-12-01 23:48:38.000000000 +0100
+++ new/tex/latex/hagenberg-thesis/hgbalgo.sty 2019-05-17 22:56:56.000000000 +0200
@@ -11,7 +11,7 @@
%% GitHub: https://github.com/Digital-Media/HagenbergThesis
%% File encoding: ASCII
-\ProvidesPackage{hgbalgo}[2018/11/28]
+\ProvidesPackage{hgbalgo}[2019/05/11]
\RequirePackage[]{algpseudocode} % imports algpseudocode + algorithmicx (use 'noend' to turn off 'end')
\RequirePackage{calc} % for numeric calculations
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hagenberg-thesis/hgbarticle.cls new/tex/latex/hagenberg-thesis/hgbarticle.cls
--- old/tex/latex/hagenberg-thesis/hgbarticle.cls 2018-12-01 23:48:38.000000000 +0100
+++ new/tex/latex/hagenberg-thesis/hgbarticle.cls 2019-05-17 22:56:56.000000000 +0200
@@ -8,7 +8,7 @@
%% Package Information --------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{hgbarticle}[2018/11/28]
+\ProvidesClass{hgbarticle}[2019/05/11]
\RequirePackage{xifthen}
@@ -17,33 +17,15 @@
\else{\errmessage{hgbarticle: *** LaTeX NOT running in PDF mode ***}}
\fi
+%% Handling class options --------------------------------------------------------------
-%% Command for language defintion ---------------------------------------------
-
-\newcommand{\hgb@MainLanguage}{german} % also referenced in hgb.sty
-
-
-%% Class options --------------------------------------------------------------
-
-\DeclareOption{twocolumn}{%
- \PassOptionsToClass{\CurrentOption}{article}
-}
-
-\DeclareOption{english}{%
- \renewcommand{\hgb@MainLanguage}{english}
-}
-
-\DeclareOption{german}{%
- \renewcommand{\hgb@MainLanguage}{german}
-}
-
-\DeclareOption*{%
- \ClassWarning{hgbarticle}{Unknown document option '\CurrentOption'.}
-}
-
+\DeclareOption{twocolumn}{\PassOptionsToClass{\CurrentOption}{article}}
+\DeclareOption{english}{\PassOptionsToPackage{\CurrentOption}{hgb}}
+\DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{hgb}}
+\DeclareOption{smartquotes}{\PassOptionsToPackage{\CurrentOption}{hgb}}
+\DeclareOption*{\ClassWarning{hgbarticle}{Unknown document option '\CurrentOption'.}}
\ProcessOptions
-
%% Paper options and style file -----------------------------------------------
\LoadClass[a4paper,11pt]{article}
@@ -54,7 +36,7 @@
\RequirePackage[top=36mm,bottom=40mm,left=32mm,right=32mm]{geometry} %showframe
\fi%
-\RequirePackage{hgb} % load associated style file hgb.sty
+\RequirePackage{hgb} % load style file hgb.sty with options registered above
%% Set title font to SF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hagenberg-thesis/hgbbib.sty new/tex/latex/hagenberg-thesis/hgbbib.sty
--- old/tex/latex/hagenberg-thesis/hgbbib.sty 2018-12-01 23:48:38.000000000 +0100
+++ new/tex/latex/hagenberg-thesis/hgbbib.sty 2019-05-17 22:56:56.000000000 +0200
@@ -5,7 +5,7 @@
%% GitHub: https://github.com/Digital-Media/HagenbergThesis
%% File encoding: ASCII
-\ProvidesPackage{hgbbib}[2018/11/28]
+\ProvidesPackage{hgbbib}[2019/05/11]
\usepackage{csquotes} % recommended for biblatex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hagenberg-thesis/hgbheadings.sty new/tex/latex/hagenberg-thesis/hgbheadings.sty
--- old/tex/latex/hagenberg-thesis/hgbheadings.sty 2018-12-01 23:48:38.000000000 +0100
+++ new/tex/latex/hagenberg-thesis/hgbheadings.sty 2019-05-17 22:56:56.000000000 +0200
@@ -5,7 +5,7 @@
%% GitHub: https://github.com/Digital-Media/HagenbergThesis
%% File encoding: ASCII
-\ProvidesPackage{hgbheadings}[2018/11/28]
+\ProvidesPackage{hgbheadings}[2019/05/11]
\RequirePackage{fancyhdr}
\pagestyle{fancy}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hagenberg-thesis/hgblistings.sty new/tex/latex/hagenberg-thesis/hgblistings.sty
--- old/tex/latex/hagenberg-thesis/hgblistings.sty 2018-12-01 23:48:38.000000000 +0100
+++ new/tex/latex/hagenberg-thesis/hgblistings.sty 2019-05-17 22:56:56.000000000 +0200
@@ -4,7 +4,7 @@
%% GitHub: https://github.com/Digital-Media/HagenbergThesis
%% File encoding: UTF-8
-\ProvidesPackage{hgblistings}[2018/11/28]
+\ProvidesPackage{hgblistings}[2019/05/11]
\RequirePackage{ifthen}
\RequirePackage{textcomp} %% required for upquote option
@@ -130,13 +130,199 @@
% Language Definition and Code Environment for JavaScript
-\lstdefinelanguage{JavaScript}
-{ keywords={attributes, class, classend, do, empty, endif, endwhile, fail, function,%
- functionend, if, implements, in, inherit, inout, not, of, operations, out,%
- return, set, then, types, while, use},
- sensitive=false,
- morecomment=[l]{//},
- morecomment=[s]{/*}{*/}
+\lstdefinelanguage{JavaScript}{
+ alsoletter={.},
+ keywords={arguments, await, break, case, catch, class, const, continue, debugger,%
+ default, delete, do, else, enum, eval, export, extends, false, finally, for,%
+ function, if, implements, import, in, instanceof, interface, let, new, null,%
+ package, private, protected, public, return, static, super, switch, this,%
+ throw, true, try, typeof, var, void, while, with, yield}, % JavaScript ES6 keywords
+ morekeywords={add, apply, args, Array, Array.from, Array.isArray, Array.of,%
+ Array.prototype, ArrayBuffer, bind, Boolean, call, charAt, charCodeAt, clear,%
+ codePointAt, concat, constructor, copyWithin, DataView, Date, Date.now,%
+ Date.parse, Date.prototype, Date.UTC, decodeURI, decodeURIComponent, encodeURI,%
+ encodeURIComponent, endsWith, entries, Error, Error.prototype, EvalError, every,%
+ false, fill, filter, find, findIndex, Float32Array, Float64Array, forEach,%
+ FulfillPromise, Function, Function.length, get, getDate, getDay, getFullYear,%
+ getHours, getMilliseconds, getMinutes, getMonth, getSeconds, getTime,%
+ getTimezoneOffset, getUTCDate, getUTCDay, getUTCFullYear, getUTCHours,%
+ getUTCMilliseconds, getUTCMinutes, getUTCMonth, getUTCSeconds, has,hasInstance,%
+ hasOwnProperty, ignoreCase, includes, indexOf, indexOf, Infinity, Int8Array,%
+ Int16Array, Int32Array, isConcatSpreadable, isFinite, isNaN, IsPromise,%
+ isPrototypeOf, Iterable, iterator, join, JSON, JSON.parse, JSON.stringify, keys,%
+ lastIndexOf, lastIndexOf, length, localeCompare, map, Map, match, match, Math,%
+ Math.abs , Math.acos, Math.acosh, Math.asin, Math.asinh, Math.atan, Math.atan2,%
+ Math.atanh, Math.cbrt, Math.ceil, Math.clz32, Math.cos, Math.cosh, Math.E,%
+ Math.exp, Math.expm1, Math.floor, Math.fround, Math.hypot, Math.imul, Math.LN2,%
+ Math.LN10, Math.log, Math.log1p, Math.log2, Math.LOG2E, Math.log10, Math.LOG10E,%
+ Math.max, Math.min, Math.PI, Math.pow, Math.random, Math.round, Math.sign,%
+ Math.sin, Math.sinh, Math.sqrt, Math.SQRT1_2, Math.SQRT2, Math.tan, Math.tanh,%
+ Math.trunc, message, multiline, name, NaN, NewPromiseCapability, next, normalize,%
+ null, Number, Number.EPSILON, Number.isFinite, Number.isInteger, Number.isNaN,%
+ Number.isSafeInteger, Number.MAX_SAFE_INTEGER, Number.MAX_VALUE,%
+ Number.MIN_SAFE_INTEGER, Number.MIN_VALUE, Number.NaN, Number.NEGATIVE_INFINITY,%
+ Number.parseFloat, Number.parseInt, Number.POSITIVE_INFINITY, Number.prototype,%
+ Object, Object, Object.assign, Object.create, Object.defineProperties,%
+ Object.defineProperty, Object.freeze, Object.getOwnPropertyDescriptor,%
+ Object.getOwnPropertyNames, Object.getOwnPropertySymbols, Object.getPrototypeOf,%
+ Object.is, Object.isExtensible, Object.isFrozen, Object.isSealed, Object.keys,%
+ Object.preventExtensions, Object.prototype, Object.seal, Object.setPrototypeOf,%
+ of, parseFloat, parseInt, pop, Promise, Promise.all , Promise.race,%
+ Promise.reject, Promise.resolve, PromiseReactionJob, propertyIsEnumerable,%
+ prototype, Proxy, Proxy.revocable , push, RangeError, reduce, reduceRight,%
+ ReferenceError, Reflect, Reflect.apply, Reflect.construct,%
+ Reflect.defineProperty, Reflect.deleteProperty, Reflect.enumerate, Reflect.get,%
+ Reflect.getOwnPropertyDescriptor, Reflect.getPrototypeOf, Reflect.has,%
+ Reflect.isExtensible, Reflect.ownKeys, Reflect.preventExtensions, Reflect.set,%
+ Reflect.setPrototypeOf, Reflection, RegExp, RegExp, RegExp.prototype, repeat,%
+ replace, replace, reverse, search, search, Set, set, setDate, setFullYear,%
+ setHours, setMilliseconds, setMinutes, setMonth, setSeconds, setTime, setUTCDate,%
+ setUTCFullYear, setUTCHours, setUTCMilliseconds, setUTCMinutes, setUTCMonth,%
+ setUTCSeconds, shift, slice, slice, some, sort, species, splice, split, split,%
+ startsWith, String, String.fromCharCode, String.fromCodePoint, String.raw,%
+ substring, Symbol, Symbol.for, Symbol.hasInstance, Symbol.isConcatSpreadable,%
+ Symbol.iterator, Symbol.keyFor, Symbol.match, Symbol.prototype, Symbol.replace,%
+ Symbol.replace, Symbol.search, Symbol.species, Symbol.split, Symbol.toPrimitive,%
+ Symbol.toStringTag, Symbol.unscopables, SyntaxError, then, toDateString,%
+ toExponential, toFixed, toISOString, toJSON, toLocaleDateString,%
+ toLocaleLowerCase, toLocaleString, toLocaleString, toLocaleString, toLocaleString,%
+ toLocaleTimeString, toLocaleUpperCase, toLowerCase, toPrecision, toPrimitive,%
+ toString, toStringTag, toTimeString, toUpperCase, toUTCString,%
+ TriggerPromiseReactions, trim, true, TypeError, Uint8Array, Uint8ClampedArray,%
+ Uint16Array, Uint32Array, undefined, unscopables, unshift, URIError, valueOf,%
+ WeakMap, WeakSet}, % JavaScript extended keywords
+ morekeywords={app.all, app.delete, app.disable, app.disabled, app.enable, app.enabled,%
+ app.engine, app.get, app.listen, app.locals, app.METHOD, app.mountpath, app.param,%
+ app.path, app.post, app.put, app.render, app.route, app.set, app.use, express,%
+ express.Router, express.static, req.acceptLanguages, req.accepts,%
+ req.acceptsCharsets, req.acceptsEncodings, req.app, req.baseUrl, req.body,%
+ req.cookies, req.fresh, req.get, req.hostname, req.ip, req.ips, req.is,%
+ req.method, req.originalUrl, req.param, req.params, req.path, req.protocol,%
+ req.query, req.range, req.route, req.secure, req.signedCookies, req.stale,%
+ req.subdomains, req.xhr, res.app, res.append, res.attachment, res.clearCookie,%
+ res.cookies, res.download, res.end, res.format, res.get, res.headersSent,%
+ res.json, res.jsonp, res.links, res.locals, res.location, res.redirect,%
+ res.render, res.sendFile, res.sendStatus, res.set, res.status, res.type, res.vary,%
+ router.all, router.METHOD, router.param, router.route, router.use}, % express keywords
+ morekeywords={agent.createConnection, agent.destroy, agent.freeSockets, agent.getName,%
+ agent.maxFreeSockets, agent.maxSockets, agent.requests, agent.sockets,%
+ certificate.exportChallenge, certificate.exportPublicKey, certificate.verifySpkac,%
+ child.channel, child.connected, child.disconnect, child.kill, child.pid,%
+ child.send, child.stderr, child.stdin, child.stdio, child.stdout,%
+ child_process.exec, child_process.execFile, child_process.execFileSync,%
+ child_process.execSync, child_process.fork, child_process.spawn,%
+ child_process.spawnSync, cipher.final, cipher.getAuthTag, cipher.setAAD,%
+ cipher.setAutoPadding, cipher.update, clearImmediate, clearImmediate,%
+ clearInterval, clearInterval, clearTimeout, clearTimeout, console, console.assert,%
+ console.dir, console.error, console.info, console.log, console.time,%
+ console.timeEnd, console.trace, console.warn, decipher.final, decipher.setAAD,%
+ decipher.setAuthTag, decipher.setAutoPadding, decipher.update, dgram.createSocket,%
+ dgram.createSocket, diffieHellman.computeSecret, diffieHellman.generateKeys,%
+ diffieHellman.getGenerator, diffieHellman.getPrime, diffieHellman.getPrivateKey,%
+ diffieHellman.getPublicKey, diffieHellman.setPrivateKey,%
+ diffieHellman.setPublicKey, diffieHellman.verifyError, dns.getServers,%
+ dns.getServers, dns.lookup, dns.lookup, dns.lookupService, dns.resolve,%
+ dns.resolve4, dns.resolve6, dns.resolveCname, dns.resolveMx, dns.resolveNaptr,%
+ dns.resolveNs, dns.resolvePtr, dns.resolveSoa, dns.resolveSrv, dns.resolveTxt,%
+ dns.reverse, dns.setServers, ecdh.computeSecret, ecdh.generateKeys,%
+ ecdh.getPrivateKey, ecdh.getPublicKey, ecdh.setPrivateKey, ecdh.setPublicKey,%
+ error.address, error.code, error.errno, error.message, error.path, error.port,%
+ error.stack, error.syscall, exports, fs.access, fs.accessSync, fs.appendFile,%
+ fs.appendFileSync, fs.chmod, fs.chmodSync, fs.chown, fs.chownSync, fs.close,%
+ fs.closeSync, fs.constants, fs.createReadStream, fs.createWriteStream,%
+ fs.exists, global, http.createServer, http.get, http.globalAgent,%
+ http.request, https.createServer, https.get, https.globalAgent, https.request,%
+ message.destroy, message.headers, message.httpVersion, message.method,%
+ message.rawHeaders, message.rawTrailers, message.setTimeout, message.socket,%
+ message.statusCode, message.statusMessage, message.trailers, message.url,%
+ module, module.children, module.exports, module.filename, module.id,%
+ module.loaded, module.parent, module.require, os.arch, os.constants,%
+ os.cpus, os.endianness, os.EOL, os.freemem, os.homedir, os.hostname,%
+ os.loadavg, os.networkInterfaces, os.platform, os.release, os.tmpdir,%
+ os.totalmem, os.type, os.uptime, os.userInfo, path.basename, path.delimiter,%
+ path.dirname, path.extname, path.format, path.isAbsolute, path.join,%
+ path.normalize, path.parse, path.posix, path.relative, path.resolve,%
+ path.sep, path.win32, process, process.abort, process.arch, process.argv,%
+ process.argv0, process.channel, process.chdir, process.config,%
+ process.connected, process.cpuUsage, process.cwd, process.disconnect,%
+ process.emitWarning, process.env, process.execArgv, process.execPath,%
+ process.exit, process.exitCode, process.getegid, process.geteuid,%
+ process.getgid, process.getgroups, process.getuid, process.hrtime,%
+ process.initgroups, process.kill, process.mainModule, process.memoryUsage,%
+ process.nextTick, process.pid, process.platform, process.release,%
+ process.send, process.setegid, process.seteuid, process.setgid,%
+ process.setgroups, process.setuid, process.stderr, process.stdin,%
+ process.stdout, process.title, process.umask, process.uptime,%
+ process.version, process.versions, querystring.escape, querystring.parse,%
+ querystring.stringify, querystring.unescape, r.clearLine, readable.pause,%
+ readable.pipe, readable.push, readable.push, readable.read, readable.read,%
+ readable.resume, readable.setEncoding, readable.unpipe, readable.unshift,%
+ readable.wrap, readable._read, readStream.bytesRead, readStream.isRaw,%
+ readStream.path, readStream.setRawMode, repl.start, request.abort,%
+ request.aborted, request.end, request.flushHeaders, request.setNoDelay,%
+ request.setSocketKeepAlive, request.setTimeout, request.write, require,%
+ require.cache, require.extensions, response.addTrailers, response.end,%
+ response.finished, response.getHeader, response.getHeaderNames,%
+ response.getHeaders, response.hasHeader, response.headersSent,%
+ response.removeHeader, response.sendDate, response.setHeader,%
+ response.setTimeout, response.statusCode, response.statusMessage,%
+ response.write, response.writeContinue, response.writeHead,%
+ rl.clearScreenDown, rl.close, rl.createInterface, rl.cursorTo,%
+ rl.emitKeypressEvents, rl.moveCursor, rl.pause, rl.prompt, rl.question,%
+ rl.resume, rl.setPrompt, rl.write, script.runInNewContext,%
+ script.runInThisContext, server.addContext, server.address,%
+ server.address, server.close, server.close, server.connections,%
+ server.getTicketKeys, server.listen, server.listen, server.setTicketKeys,%
+ server.setTimeout, server.setTimeout, server.timeout, server.timeout,%
+ setImmediate, setInterval, setTimeout, socket.addMembership,%
+ socket.address, socket.bind, socket.bind, socket.close,%
+ socket.dropMembership, socket.ref, socket.send, socket.setBroadcast,%
+ socket.setMulticastLoopback, socket.setMulticastTTL, socket.setTTL,%
+ socket.unref, stream.Readable, stringDecoder.end, stringDecoder.write,%
+ timeout.ref, timeout.unref, tls.connect, tls.createSecureContext,%
+ tls.createServer, tls.getCiphers, tlsSocket.address,%
+ tlsSocket.authorizationError, tlsSocket.authorized, tlsSocket.encrypted,%
+ tlsSocket.getCipher, tlsSocket.getEphemeralKeyInfo,%
+ tlsSocket.getPeerCertificate, tlsSocket.getProtocol, tlsSocket.getSession,%
+ tlsSocket.getTLSTicket, tlsSocket.localAddress, tlsSocket.localPort,%
+ tlsSocket.remoteAddress, tlsSocket.remoteFamily, tlsSocket.remotePort,%
+ tlsSocket.renegotiate, tlsSocket.setMaxSendFragment, transform._flush,%
+ transform._transform, util.debuglog, util.deprecate, util.format,%
+ util.inherits, util.inspect, v8.getHeapStatistics, v8.setFlagsFromString,%
+ vm.createContext, vm.isContext, vm.runInContext, vm.runInDebugContext,%
+ vm.runInNewContext, vm.runInThisContext, watcher.close, worker.disconnect,%
+ worker.exitedAfterDisconnect, worker.id, worker.isConnected,%
+ worker.isDead, worker.kill, worker.process, worker.send, worker.suicide,%
+ writable.cork, writable.end, writable.setDefaultEncoding, writable.write,%
+ writeStream.bytesWritten, writeStream.columns, writeStream.path,%
+ writeStream.rows, zlib, zlib.createGunzip, zlib.createGzip, zlib.createInflate,%
+ zlib.createInflateRaw, zlib.createUnzip, zlib.deflate, zlib.deflateRaw,%
+ zlib.deflateRawSync, zlib.deflateSync, zlib.gunzip, zlib.gunzipSync,%
+ zlib.gzip, zlib.gzipSync, zlib.inflate, zlib.inflateRaw, zlib.inflateRawSync,%
+ zlib.inflateSync, zlib.unzip, zlib.unzipSync, __dirname, __filename}, % Node.js keywords
+ morekeywords={assert, assert.deepEqual, assert.deepStrictEqual,%
+ assert.doesNotThrow, assert.equal, assert.fail, assert.ifError,%
+ assert.notDeepEqual, assert.notDeepStrictEqual, assert.notEqual,%
+ assert.notStrictEqual, assert.ok, assert.strictEqual, assert.throws, describe,%
+ toBe, it, xdescribe, beforeEach, afterEach, beforeAll, afterAll, expect, it,%
+ xit, xdiscribe, pending, and.callThrough, and.returnValue, and.returnValues,%
+ and.callFake, and.throwError, and.stub, .not, .calls.any, .calls.count,%
+ .calls.argsFor, .calls.allArgs, .calls.all, .calls.mostRecent, .calls.first,%
+ .calls.reset, jasmine.createSpy, jasmine.createSpyObj, jasmine.any,%
+ jasmine.anything, jasmine.objectContaining, jasmine.arrayContaining,%
+ jasmine.stringMatching, asymmetricMatch, jasmine.clock, .not.toBeTruthy,%
+ .toBeTruthy, .not.toBeFalsy, .toBeFalsy, .not.toBeDefined .toBeDefined,%
+ .not.toBeNull .toBeNull, .not.toEqual .toEqual, .not.toBeCloseTo .toBeCloseTo,%
+ .not.toContain, .toContain, .not.toMatch, .toMatch, .not.toBeGreaterThan,%
+ .toBeGreaterThan, .not.toBeLessThan, .toBeLessThan, .toThrow, .not.toThrow,%
+ .toBeNull, .not.toBeNull, .toBeDefined, .not.toBeDefined}, % Node.js Assert, Jasmine, ... keywords
+ sensitive=true,
+ morestring=[b]",
+ morestring=[d]',
+ morestring=[s]{`}{`},
+ morecomment=[l]{//},
+ morecomment=[s]{/*}{*/},
+ morecomment=[s]{/**}{*/}
}
\lstnewenvironment{JsCode}[1][]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hagenberg-thesis/hgbmath.sty new/tex/latex/hagenberg-thesis/hgbmath.sty
--- old/tex/latex/hagenberg-thesis/hgbmath.sty 2018-12-01 23:48:38.000000000 +0100
+++ new/tex/latex/hagenberg-thesis/hgbmath.sty 2019-05-17 22:56:56.000000000 +0200
@@ -5,7 +5,7 @@
%% File encoding: ASCII
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{hgbmath}[2018/11/28]
+\ProvidesPackage{hgbmath}[2019/05/11]
\RequirePackage{amsmath,amsfonts,amssymb,amsbsy}
\RequirePackage{subdepth} % for positioning of sub and super scripts
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hagenberg-thesis/hgbreport.cls new/tex/latex/hagenberg-thesis/hgbreport.cls
--- old/tex/latex/hagenberg-thesis/hgbreport.cls 2018-12-01 23:48:38.000000000 +0100
+++ new/tex/latex/hagenberg-thesis/hgbreport.cls 2019-05-17 22:56:56.000000000 +0200
@@ -8,7 +8,9 @@
%% Package Information --------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{hgbreport}[2018/11/28]
+\ProvidesClass{hgbreport}[2019/05/11]
+
+\typeout{****************** hgbreport.cls (options=\@nameuse{opt@hgbreport.cls}) ***********************}
\RequirePackage{xifthen}
@@ -17,30 +19,13 @@
\else{\errmessage{hgbreport: *** LaTeX NOT running in PDF mode ***}}
\fi
+%% Handling class options --------------------------------------------------------------
-%% Command for language defintion ---------------------------------------------
-
-\newcommand{\hgb@MainLanguage}{german} % also referenced in hgb.sty
-
-
-%% Class options --------------------------------------------------------------
-
-\DeclareOption{notitlepage}{%
- \PassOptionsToClass{\CurrentOption}{report}
-}
-
-\DeclareOption{english}{%
- \renewcommand{\hgb@MainLanguage}{english}
-}
-
-\DeclareOption{german}{%
- \renewcommand{\hgb@MainLanguage}{german}
-}
-
-\DeclareOption*{%
- \ClassWarning{hgbreport}{Unknown document option '\CurrentOption'.}
-}
-
+\DeclareOption{notitlepage}{\PassOptionsToClass{\CurrentOption}{report}}
+\DeclareOption{english}{\PassOptionsToPackage{\CurrentOption}{hgb}}
+\DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{hgb}}
+\DeclareOption{smartquotes}{\PassOptionsToPackage{\CurrentOption}{hgb}}
+\DeclareOption*{\ClassWarning{hgbreport}{Unknown document option '\CurrentOption'.}}
\ProcessOptions
@@ -49,7 +34,7 @@
\LoadClass[a4paper,11pt,onecolumn]{report}
\RequirePackage[top=36mm,bottom=40mm,left=32mm,right=32mm]{geometry} %showframe
-\RequirePackage{hgb} % load associated style file hgb.sty
+\RequirePackage{hgb} % load style file hgb.sty with options registered above
%% Set title font to SF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hagenberg-thesis/hgbthesis.cls new/tex/latex/hagenberg-thesis/hgbthesis.cls
--- old/tex/latex/hagenberg-thesis/hgbthesis.cls 2018-12-01 23:48:38.000000000 +0100
+++ new/tex/latex/hagenberg-thesis/hgbthesis.cls 2019-05-17 22:56:56.000000000 +0200
@@ -8,7 +8,7 @@
%% Package Information --------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{hgbthesis}[2018/11/28]
+\ProvidesClass{hgbthesis}[2019/05/11]
\RequirePackage{xifthen}
@@ -30,55 +30,35 @@
\newcommand{\@titlepagefont}{\sffamily}
-%% Class options --------------------------------------------------------------
-
-\DeclareOption{master}{
- \renewcommand{\@maketitlepages}{\@mastertitlepages}
-}
+%% Handling class options --------------------------------------------------------------
\DeclareOption{diplom}{%
\renewcommand{\@maketitlepages}{\@diplomatitlepages}
\ClassWarning{hgbthesis}{Deprecated: Document option '\CurrentOption' is deprecated, use 'diploma' instead.}
}
-\DeclareOption{diploma}{%
- \renewcommand{\@maketitlepages}{\@diplomatitlepages}
-}
-
-\DeclareOption{bachelor}{%
- \renewcommand{\@maketitlepages}{\@bachelortitlepages}
-}
-
\DeclareOption{praktikum}{%
\renewcommand{\@maketitlepages}{\@internshiptitlepages}
\ClassWarning{hgbthesis}{Deprecated: Document option '\CurrentOption' is deprecated, use 'internship' instead.}
}
-\DeclareOption{internship}{%
- \renewcommand{\@maketitlepages}{\@internshiptitlepages}
-}
-
-\DeclareOption{english}{%
- \renewcommand{\hgb@MainLanguage}{english}
-}
-
-\DeclareOption{german}{%
- \renewcommand{\hgb@MainLanguage}{german}
-}
-
-\DeclareOption*{%
- \ClassWarning{hgbthesis}{Unknown document option '\CurrentOption'.}
-}
-
+\DeclareOption{master}{\renewcommand{\@maketitlepages}{\@mastertitlepages}}
+\DeclareOption{diploma}{\renewcommand{\@maketitlepages}{\@diplomatitlepages}}
+\DeclareOption{bachelor}{\renewcommand{\@maketitlepages}{\@bachelortitlepages}}
+\DeclareOption{internship}{\renewcommand{\@maketitlepages}{\@internshiptitlepages}}
+
+\DeclareOption{english}{\PassOptionsToPackage{\CurrentOption}{hgb}}
+\DeclareOption{german}{\PassOptionsToPackage{\CurrentOption}{hgb}}
+\DeclareOption{smartquotes}{\PassOptionsToPackage{\CurrentOption}{hgb}}
+\DeclareOption*{\ClassWarning{hgbthesis}{Unknown document option '\CurrentOption'.}}
\ProcessOptions
-
%% Paper Options and Style File -----------------------------------------------
\LoadClass[a4paper,11pt,oneside]{book}
\RequirePackage[top=36mm,bottom=40mm,left=32mm,right=32mm]{geometry} %showframe
-\RequirePackage{hgb} % load associated style file hgb.sty
+\RequirePackage{hgb} % load style file hgb.sty with options registered above
%% Setup for Pages in the Front Matter ----------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hagenberg-thesis.tlpobj new/tlpkg/tlpobj/hagenberg-thesis.tlpobj
--- old/tlpkg/tlpobj/hagenberg-thesis.tlpobj 2019-02-28 03:41:35.000000000 +0100
+++ new/tlpkg/tlpobj/hagenberg-thesis.tlpobj 2019-05-18 01:38:57.000000000 +0200
@@ -1,6 +1,6 @@
name hagenberg-thesis
category Package
-revision 49298
+revision 51150
shortdesc A Collection of LaTeX classes, style files, and example documents for academic manuscripts
relocated 1
longdesc This bundle contains a collection of modern LaTeX classes,
@@ -8,7 +8,7 @@
longdesc Master, or Diploma theses and related academic manuscripts in
longdesc English and German. Includes a comprehensive tutorial (in
longdesc German) with detailed instructions and authoring guidelines.
-runfiles size=19
+runfiles size=22
RELOC/tex/latex/hagenberg-thesis/hgb.sty
RELOC/tex/latex/hagenberg-thesis/hgbabbrev.sty
RELOC/tex/latex/hagenberg-thesis/hgbalgo.sty
@@ -21,6 +21,6 @@
RELOC/tex/latex/hagenberg-thesis/hgbthesis.cls
catalogue-contact-repository https://github.com/Digital-Media/HagenbergThesis
catalogue-ctan /macros/latex/contrib/hagenberg-thesis
-catalogue-date 2018-12-01 11:09:26 +0100
+catalogue-date 2019-05-17 10:59:38 +0200
catalogue-license cc-by-4
catalogue-topics dissertation class
++++++ halloweenmath.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/halloweenmath/00readme.txt new/doc/latex/halloweenmath/00readme.txt
--- old/doc/latex/halloweenmath/00readme.txt 2017-04-26 00:27:20.000000000 +0200
+++ new/doc/latex/halloweenmath/00readme.txt 2019-11-01 21:59:13.000000000 +0100
@@ -4,7 +4,7 @@
This file is part of a work named "halloweenmath package".
-Copyright (C) 2017 by Gustavo MEZZETTI.
+Copyright (C) 2019 by Gustavo MEZZETTI.
The halloweenmath package may be distributed and/or modified under
the conditions of the LaTeX Project Public License, either version 1.3
@@ -26,7 +26,7 @@
package, explains how to install it and how to generate its--alas, still
incomplete!--documentation.
-April 25, 2017 (vers. 0.10a)
+November 1, 2019 (vers. 0.11)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/halloweenmath/Makefile new/doc/latex/halloweenmath/Makefile
--- old/doc/latex/halloweenmath/Makefile 2017-04-26 00:27:20.000000000 +0200
+++ new/doc/latex/halloweenmath/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,147 +0,0 @@
-# makefile
-#
-# 2017 Apr 25
-#
-# Macro definitions
-#
-# - parameters:
-ROOT_NAME = halloweenmath
-# (the following need not be redefined, although it can be)
-BUNDLE_NAME = $(ROOT_NAME) package
-#
-# - all the rest:
-DTX_NAME = $(ROOT_NAME).dtx
-INS_NAME = $(ROOT_NAME).ins
-LOG_FILE = $(ROOT_NAME).log
-DOC_AUX_FIL = $(LOG_FILE) $(ROOT_NAME).aux \
- $(ROOT_NAME).glo $(ROOT_NAME).gls \
- $(ROOT_NAME).idx $(ROOT_NAME).ind \
- $(ROOT_NAME).ilg $(ROOT_NAME).glg \
- $(ROOT_NAME).toc $(ROOT_NAME).lof \
- $(ROOT_NAME).hd $(ROOT_NAME).out
-DOCUM_FILE = $(ROOT_NAME).pdf
-CODE_FILES = $(ROOT_NAME).sty
-#
-LATEX = pdflatex
-MAKEINDEX = makeindex
-REMOVE = -rm
-
-#
-define GEN_FAKE_INDEX
- @echo '\\begin{theindex}' > $(ROOT_NAME).ind
- @echo '\\end{theindex}' >> $(ROOT_NAME).ind
- @echo "Generating fake .ind file."
-endef
-#
-define GEN_FAKE_GLOSSARY
- @echo '\\begin{theglossary}' > $(ROOT_NAME).gls
- @echo '\\end{theglossary}' >> $(ROOT_NAME).gls
- @echo "Generating fake .gls file."
-endef
-
-
-
-.PHONY: default
-.PHONY: code doc
-.PHONY: clean cleandoc cleanaux cleancode cleanlog cleanall
-.PHONY: help
-
-# Default target
-default: doc code
-
-# Generating the code
-################################################################
-# #
-# PLEASE NOTE THAT THE INSTALLER SCRIPT IS EXECUTED WITH #
-# openout_any=r #
-# #
-################################################################
-code:
- openout_any=r tex $(INS_NAME)
-
-# Generating the documentation
-doc: $(DOCUM_FILE)
-
-$(DOCUM_FILE): $(DTX_NAME)
-# Hack for getting index and glossary in the toc since first run:
- $(GEN_FAKE_INDEX)
- $(GEN_FAKE_GLOSSARY)
-# We know how many runs are needed:
- $(LATEX) $(DTX_NAME)
- $(LATEX) $(DTX_NAME)
- $(MAKEINDEX) -s gind.ist -t $(ROOT_NAME).ilg -o $(ROOT_NAME).ind \
- $(ROOT_NAME).idx
- $(MAKEINDEX) -s gglo.ist -t $(ROOT_NAME).glg -o $(ROOT_NAME).gls \
- $(ROOT_NAME).glo
- $(LATEX) $(DTX_NAME)
- $(LATEX) $(DTX_NAME)
-# Hyperlinks in the indexes seem not to work properly without the
-# following additional run:
- $(MAKEINDEX) -s gind.ist -t $(ROOT_NAME).ilg -o $(ROOT_NAME).ind \
- $(ROOT_NAME).idx
- $(MAKEINDEX) -s gglo.ist -t $(ROOT_NAME).glg -o $(ROOT_NAME).gls \
- $(ROOT_NAME).glo
- $(LATEX) $(DTX_NAME)
-
-# Cleaning up: command "make clean" defaults to "make cleanall"
-clean: cleanall
-
-# Cleaning the code files
-cleancode:
- $(REMOVE) $(CODE_FILES)
-
-# Cleaning the documentation files
-cleandoc: cleanaux
- $(REMOVE) $(DOCUM_FILE)
-
-# Cleaning just the auxiliary files used in producing the documentation
-cleanaux:
- $(REMOVE) $(DOC_AUX_FIL)
-
-# Cleaning only the transcript file (e.g., after "make code")
-cleanlog:
- $(REMOVE) $(LOG_FILE)
-
-# Cleaning up all the generated files
-cleanall: cleancode cleandoc
-
-# Giving help
-help:
- @echo "Here is a list of the available commands:"
- @echo
- @echo " make"
- @echo " Generate both the code and the documentation (see below)."
- @echo
- @echo " make code"
- @echo " Generate all the LaTeX \"executables\" (e.g., \`.sty' files)"
- @echo " of the $(BUNDLE_NAME);"
- @echo " these files go into the LaTeX input directories."
- @echo
- @echo " make doc"
- @echo " Generate the documentation (in PDF); the resulting PDF file"
- @echo " goes into the LaTeX documentation directories (the auxiliary"
- @echo " files may be discarded)."
- @echo
- @echo " make clean"
- @echo " make cleanall"
- @echo " These two commands are synonyms; they remove all of the"
- @echo " generated files (both code and documentation)."
- @echo
- @echo " make cleancode"
- @echo " Remove the LaTeX source files (the \"code files\")."
- @echo
- @echo " make cleandoc"
- @echo " Remove the documentation, together with all the auxiliary"
- @echo " files used to generate it."
- @echo
- @echo " make cleanaux"
- @echo " Remove only the auxiliary files used to generate the"
- @echo " documentation."
- @echo
- @echo " make cleanlog"
- @echo " Remove just the transcript file (e.g., after \"make doc\")."
- @echo
- @echo " make help"
- @echo " Print this help message."
- @echo
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/halloweenmath/README new/doc/latex/halloweenmath/README
--- old/doc/latex/halloweenmath/README 2017-04-26 00:27:20.000000000 +0200
+++ new/doc/latex/halloweenmath/README 2019-11-01 21:59:13.000000000 +0100
@@ -1,4 +1,4 @@
-(Version indicator: 2017 Apr 25)
+(Version indicator: 2019 Nov 01)
The halloweenmath package originated from a question asked for enjoyment
on TeX-LaTeX Stack Exchange <http://tex.stackexchange.com> by the user
Binary files old/doc/latex/halloweenmath/halloweenmath-doc.pdf and new/doc/latex/halloweenmath/halloweenmath-doc.pdf differ
Binary files old/doc/latex/halloweenmath/halloweenmath-man.pdf and new/doc/latex/halloweenmath/halloweenmath-man.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/halloweenmath/halloweenmath-man.tex new/doc/latex/halloweenmath/halloweenmath-man.tex
--- old/doc/latex/halloweenmath/halloweenmath-man.tex 2017-04-26 00:27:20.000000000 +0200
+++ new/doc/latex/halloweenmath/halloweenmath-man.tex 2019-11-01 21:59:13.000000000 +0100
@@ -1,21 +1,21 @@
\documentclass[a4paper]{article}
\usepackage[T1]{fontenc}
\usepackage{amsmath,amsfonts}
-\usepackage{halloweenmath}[2017/04/16]
+\usepackage{halloweenmath}[2019/11/01]
\usepackage{array}
\usepackage[bookmarksnumbered]{hyperref}
\title{User's manual\\for the \halloweenmath\ package}
\author{G. Mezzetti}
-\date{April~25, 2017}
+\date{November~1, 2019}
\hypersetup{
pdftitle = {User's manual for the halloweenmath package},
pdfauthor = {G. Mezzetti},
pdfsubject = {The halloweenmath LaTeX package},
pdfkeywords = {TeX,LaTeX,Halloween,math,math symbold},
- pdfcreationdate = {D:20170425120000},
- pdfmoddate = {D:20170425120000}
+ pdfcreationdate = {D:20191101120000},
+ pdfmoddate = {D:20191101120000}
}
\DeclareTextFontCommand{\packlass}{\normalfont\sffamily}
@@ -31,7 +31,7 @@
\newcolumntype{H}[3]{>{\hb@xt@ #3\bgroup#1}c<{#2\egroup}}
\newcolumntype{U}[2]{H{\hss$#1}{$\hss}{#2}(a){\hspace{.5em}}}
\newcolumntype{V}[1]{H{\ttfamily}{\hss}{#1}}
-\newcolumntype{W}[1]{H{}{\hss}{#1}}
+\newcolumntype{Q}[1]{H{}{\hss}{#1}}
\newcolumntype{O}{U{}{15\p@}}
\newcolumntype{D}{U{\displaystyle}{30\p@}}
\newcolumntype{L}{OD}
@@ -60,7 +60,7 @@
}
\newenvironment{xasymtable}[1][\tw@]{%
\def\arraystretch{\tw@}%
- \@symtable{AW{200\p@}}{#1}%
+ \@symtable{AQ{200\p@}}{#1}%
}{%
\end@symtable
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/halloweenmath/manifest.txt new/doc/latex/halloweenmath/manifest.txt
--- old/doc/latex/halloweenmath/manifest.txt 2017-04-26 00:27:20.000000000 +0200
+++ new/doc/latex/halloweenmath/manifest.txt 2019-11-01 21:59:13.000000000 +0100
@@ -3,7 +3,7 @@
This file is part of a work named "halloweenmath package".
-Copyright (C) 2017 by Gustavo MEZZETTI.
+Copyright (C) 2019 by Gustavo MEZZETTI.
The halloweenmath package may be distributed and/or modified under
the conditions of the LaTeX Project Public License, either version 1.3
@@ -21,7 +21,7 @@
used in the LaTeX Project Public License, are to be interpreted in the
case of this work.
-April 25, 2017 (vers. 0.10a)
+November 1, 2019 (vers. 0.11)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/halloweenmath.doc.tlpobj new/tlpkg/tlpobj/halloweenmath.doc.tlpobj
--- old/tlpkg/tlpobj/halloweenmath.doc.tlpobj 2019-02-28 03:41:35.000000000 +0100
+++ new/tlpkg/tlpobj/halloweenmath.doc.tlpobj 2019-11-02 16:11:43.000000000 +0100
@@ -1,11 +1,10 @@
name halloweenmath.doc
category Package
-revision 44043
+revision 52602
shortdesc doc files of halloweenmath
relocated 1
-docfiles size=232
+docfiles size=231
RELOC/doc/latex/halloweenmath/00readme.txt
- RELOC/doc/latex/halloweenmath/Makefile
RELOC/doc/latex/halloweenmath/README
RELOC/doc/latex/halloweenmath/halloweenmath-doc.pdf
RELOC/doc/latex/halloweenmath/halloweenmath-man.pdf
++++++ halloweenmath.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/halloweenmath/halloweenmath.sty new/tex/latex/halloweenmath/halloweenmath.sty
--- old/tex/latex/halloweenmath/halloweenmath.sty 2017-04-26 00:27:20.000000000 +0200
+++ new/tex/latex/halloweenmath/halloweenmath.sty 2019-11-01 21:59:13.000000000 +0100
@@ -9,7 +9,7 @@
%% This is a generated file.
%% It is part of a work named "halloweenmath package".
%%
-%% Copyright (C) 2017 by Gustavo MEZZETTI.
+%% Copyright (C) 2019 by Gustavo MEZZETTI.
%%
%% The halloweenmath package may be distributed and/or modified under
%% the conditions of the LaTeX Project Public License, either version 1.3
@@ -31,7 +31,7 @@
%% only part of the Work" in the sense of the LaTeX Project Public
%% License, and should be avoided.
%%
-%% April 25, 2017 (vers. 0.10a)
+%% November 1, 2019 (vers. 0.11)
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -50,7 +50,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}[2004/06/01] % LaTeX2e is required!
\ProvidesPackage{halloweenmath}
- [2017/04/25 v0.10a (development)]
+ [2019/11/01 v0.11 (development)]
\newcommand*\@HwM@say@BOO{%
\begingroup
\escapechar \m@ne
@@ -95,7 +95,7 @@
\RequirePackage{amsmath,pict2e}
\@ifdefinable\@HwM@tempa{}
\newcommand*\@HwM@thickness@units@for[1]{\fontdimen 8 #1\thr@@}
-\@ifdefinable\@HwM@right@or@left{}
+\@ifdefinable\@HwM@right@or@left{\let \@HwM@right@or@left=\@gobbletwo}
\newcommand*\@HwM@set@right@dir{%
\let \@HwM@right@or@left \@firstoftwo
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/halloweenmath.tlpobj new/tlpkg/tlpobj/halloweenmath.tlpobj
--- old/tlpkg/tlpobj/halloweenmath.tlpobj 2019-02-28 03:41:36.000000000 +0100
+++ new/tlpkg/tlpobj/halloweenmath.tlpobj 2019-11-02 16:11:43.000000000 +0100
@@ -1,6 +1,6 @@
name halloweenmath
category Package
-revision 44043
+revision 52602
shortdesc Scary and creepy math symbols with AMS-LaTeX integration
relocated 1
longdesc The package defines a handful of commands for typesetting
@@ -13,7 +13,7 @@
runfiles size=11
RELOC/tex/latex/halloweenmath/halloweenmath.sty
catalogue-ctan /macros/latex/contrib/halloweenmath
-catalogue-date 2017-04-25 15:13:11 +0200
+catalogue-date 2019-11-01 20:00:26 +0100
catalogue-license lppl1.3
-catalogue-topics maths maths-symbol
-catalogue-version 0.10a
+catalogue-topics amusements maths maths-symbol
+catalogue-version 0.11
++++++ har2nat.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/har2nat.doc.tlpobj new/tlpkg/tlpobj/har2nat.doc.tlpobj
--- old/tlpkg/tlpobj/har2nat.doc.tlpobj 2019-02-28 03:41:37.000000000 +0100
+++ new/tlpkg/tlpobj/har2nat.doc.tlpobj 2020-03-04 23:50:59.000000000 +0100
@@ -1,6 +1,6 @@
name har2nat.doc
category Package
-revision 17356
+revision 54080
shortdesc doc files of har2nat
relocated 1
docfiles size=57
++++++ har2nat.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/har2nat.tlpobj new/tlpkg/tlpobj/har2nat.tlpobj
--- old/tlpkg/tlpobj/har2nat.tlpobj 2019-02-28 03:41:37.000000000 +0100
+++ new/tlpkg/tlpobj/har2nat.tlpobj 2020-03-04 23:50:59.000000000 +0100
@@ -1,19 +1,18 @@
name har2nat
category Package
-revision 17356
+revision 54080
shortdesc Replace the harvard package with natbib
relocated 1
longdesc This small package allows a LaTeX document containing the
longdesc citation commands provided by the Harvard package to be
longdesc compiled using the natbib package. Migration from harvard to
longdesc natbib thus can be achieved simply by replacing
-longdesc \usepackage{harvard} with \usepackage{natbib}
-longdesc \usepackage{har2nat} It is important that har2nat be loaded
+longdesc \usepackage{harvard} with usepackage{natbib}
+longdesc usepackage{har2nat} It is important that har2nat be loaded
longdesc after natbib, since it modifies natbib commands.
runfiles size=1
RELOC/tex/latex/har2nat/har2nat.sty
catalogue-ctan /macros/latex/contrib/har2nat
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics bibtex-supp
catalogue-version 1.0
++++++ hepunits.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hepunits/ChangeLog new/doc/latex/hepunits/ChangeLog
--- old/doc/latex/hepunits/ChangeLog 2007-09-29 01:13:53.000000000 +0200
+++ new/doc/latex/hepunits/ChangeLog 2020-04-12 00:24:37.000000000 +0200
@@ -1,3 +1,24 @@
+2020-04-10 Andy Buckley <andy.buckley(a)cern.ch>
+
+ * Release version 2.0.0.
+
+ * Update to use siunitx.
+
+ * Refine eV and eV/c kerns, with bold font-series specifialisation.
+
+ * Change 'overc' and 'overcsq' macros to e.g. \MeVc and \MeVcsq.
+
+ * Removing 'inverse eV' units.
+
+ * Make the units non-freestanding by default, and exclude
+ non-essential convenience prefixed macros for SI units unless
+ requsted via a package option.
+
+2009-01-13 Andy Buckley <andy(a)insectnation.org>
+
+ * Added cross-section units of millibarns and upwards for e.g. LHC
+ total cross-sections.
+
2007-09-27 Andy Buckley <andy(a)insectnation.org>
* Ready for the momentous 1.1.1 release.
@@ -22,4 +43,3 @@
* Added SIunits options passing.
* Started ChangeLog.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hepunits/README new/doc/latex/hepunits/README
--- old/doc/latex/hepunits/README 2007-09-29 01:13:53.000000000 +0200
+++ new/doc/latex/hepunits/README 2020-04-12 00:24:37.000000000 +0200
@@ -2,18 +2,18 @@
by Andy Buckley <andy(a)insectnation.org>
-----------------------------------------------------------
-hepunits is a LaTeX package built on the SIunits package which
-adds a collection of useful HEP units to the existing SIunits set.
-These include the energy units \MeV, \GeV, \TeV and the derived
-momentum and mass units \MeVoverc, \MeVovercsq and so on.
+hepunits is a LaTeX package built on the siunitx package which adds a collection
+of useful HEP units to the existing siunitx set. These include a refined
+definition of the \electronvolt energy unit (accounting for missing kerns),
+convenience derived units \eV, \MeV, \GeV, \TeV, their associated derived
+momentum and mass units \MeVc, \MeVcsq and so on (also with kern corrections),
+and convenience-prefixed cross-section and luminosity units.
-Additionally, some units are added for pure convenience. The
-contents of the package with the exception of the energy units
-mentioned above are subject to deprecation and addition, so please
-provide feedback on which HEP units you'd like added to the
-package.
+Additionally, some units are provided (for now) for pure convenience via the
+[sicmds] package option. Please provide feedback if you'd like to see more
+HEP-specific units added.
-This material is subject to the LaTeX Project Public License.
+This material is subject to the LaTeX Project Public License.
See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
for the details of that license.
Binary files old/doc/latex/hepunits/hepunits.pdf and new/doc/latex/hepunits/hepunits.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hepunits/hepunits.tex new/doc/latex/hepunits/hepunits.tex
--- old/doc/latex/hepunits/hepunits.tex 2007-09-29 01:13:53.000000000 +0200
+++ new/doc/latex/hepunits/hepunits.tex 2020-04-12 00:24:37.000000000 +0200
@@ -1,8 +1,10 @@
\documentclass[12pt]{article}
-\usepackage{maybemath, xspace, setspace, fancyvrb, a4wide}
-\usepackage{url, relsize, booktabs, ccaption, braket}
-\usepackage{hepunits}
+\usepackage{xspace,setspace,fancyvrb,a4wide}
+\usepackage{url,relsize,booktabs,ccaption,braket}
\usepackage[colorlinks=true,bookmarks=true]{hyperref}
+\usepackage{mathpazo,microtype}
+
+\usepackage[sicmds,freestanding]{hepunits}
\newcommand{\hepunits}{\texttt{hepunits}\xspace}
\let\OldCite\cite
@@ -14,187 +16,192 @@
\author{Andy Buckley, \texttt{andy(a)insectnation.org}}
\title{The \hepunits \LaTeX{} package}
-\newcommand{\Or}{\ensuremath{\vert}\xspace}
-\newcommand{\manifestsAs}{\ensuremath{\Rightarrow\quad}\xspace}
-\newcommand{\texcmd}[1]{\texttt{\char`\\#1}}
-\newcommand{\texenv}[1]{\texttt{\char`#1}}
+\newcommand{\texcmd}[1]{\texttt{\char`\\#1}}
+\newcommand{\texenv}[1]{\texttt{\char`#1}}
\newcommand{\texopt}[1]{\texttt{\char`#1}}
\newcommand{\texarg}[1]{\texttt{\char`#1}}
\newcommand{\texpkg}[1]{\texttt{\char`#1}}
\newcommand{\texcls}[1]{\texttt{\char`#1}}
-\newcommand{\texcommand}[1]{\texcmd{#1}}
+\newcommand{\texcommand}[1]{\texcmd{#1}}
\newcommand{\texoption}[1]{\texopt{#1}}
\newcommand{\texgen}[1]{\ensuremath{\braket{\text{\emph{#1}}}}}
\newenvironment{snippet}{\Verbatim}{\endVerbatim}
+
+
\begin{document}
\maketitle
-\abstract{%
- The \hepunits package extends the existing (and excellent) \texpkg{SIunits}
- package to support units commonly used in high-energy physics. HEP uses a
- rather specialised set of units to describe measurements of energies, masses,
- momenta, reaction cross-sections, luminosities and so-on. Using this package
- will provide particle physicists with a consistent and accurate way to refer
- to dimensionful HEP quantities.
-%
-}
+
+%\abstract{%
+The \hepunits~v2 package extends the existing (and excellent) \texpkg{siunitx}
+package to support units commonly used in high-energy physics. HEP uses a
+rather specialised set of units to describe measurements of energies, masses,
+momenta, reaction cross-sections, luminosities and so-on. Using this package
+provides particle physicists with a consistent and accurate way to refer to
+dimensionful HEP quantities. It additionally tweaks the often problematic
+character spacing around the \si\eV and \si\eVcsq units, as an ``eV kern''
+is not typically defined in \LaTeX{} fonts. %
+%}
+
\section{Recommended usage}
-The basic usage mode for \hepunits is to place
+The basic usage mode for \hepunits is to place |\usepackage{hepunits}|
+% %
+% \begin{snippet}
+% \usepackage{hepunits}
+% \end{snippet}
+% %
+in the preamble of your document.
+
+This loads the \texpkg{amsmath} (for \texcmd{mspace}/\texcmd{mkern}) and
+\texpkg{siunitx} packages, as well as defining new HEP units using the
+\texpkg{siunitx} mechanisms. For convenience, it also sets the \texpkg{siunitx}
+defaults to detect the surrounding text style (include displayed mathematics)
+and to use text-mode rendering of units, again to match the surrounding text
+font for numbers and unit text. If these features aren't wanted, or you want to
+set any of the myriad other \texpkg{siunitx} rendering options, call the
+\texcmd{sisetup} macro \emph{after} the |\usepackage{hepunits}| call.
+
+
+\section{Options}
+\hepunits accepts three optional arguments during import:
%
-\begin{snippet}
-\usepackage{hepunits}
-\end{snippet}
+\begin{description}
+\item[sicmds:] Also define convenience short versions of SI units, e.g.~\texcmd{cm};
+\item[noprefixcmds:] Don't define convenience SI-prefixed versions of HEP units, e.g.~\texcmd{GeV} in addition to \texcmd{eV};
+\item[freestanding:] Make the unit macros also usable outside the \texcmd{SI} and \texcmd{si} macros (equivalent to |\sisetup{free-standing-units=true}|.
+\end{description}
%
-in the preamble of your document. \hepunits also supports the \texpkg{SIunits}
-optional arguments (\texopt{thickspace}, \texopt{amssymb} and so-on), which are
-passed on directly to the \texpkg{SIunits} package. By default the
-\texopt{mediumspace}, \texopt{thickqspace}, \texopt{squaren} and
-\texopt{textstyle} options are passed, but these can be overridden.
-\texopt{amssymb} and \texopt{squaren} are considered to be mutually exclusive
-options, but you can choose to pass neither option to \texpkg{SIunits} by using
-the \hepunits \texopt{noamssquareissue} option. Additionally, the \hepunits
-\texopt{notextstyle} option can be used to turn the \texpkg{SIunits}
-\texopt{textstyle} off. On the whole, though, you should be able to use
-\hepunits with no options in most circumstances and are likely only to need them
-if you want access to the binary or derived units (using \texopt{binary} and
-\texopt{derived}/\texopt{derivedinbase} respectively).
-
-Finally, the only \hepunits-specific option is \texopt{noprefixcmds}. This is
-discussed at the end of the document and is probably only useful for macro
-language pedants!\footnote{No offence intended to macro language pedants, of course\dots}
+These can be used as follows: |\usepackage[sicmds,freestanding]{heputils}|.
\section{Requirements}
-\hepunits requires the \texpkg{SIunits}, \texpkg{xspace} and \texpkg{amsmath}
+\hepunits requires the \texpkg{siunitx} and \texpkg{amsmath}
packages to be installed as part of your \TeX{} distribution. I don't know of
any distributions for which this isn't the case, so chances are you're safe to
-just install \hepunits and use it right away!
+just install \hepunits and use it right away.
\section{Provided units}
The HEP units provided by \hepunits are listed in Tables \ref{tab:normunits} and
\ref{tab:hepunits} below. All the example outputs have been produced with a
-command like |\unit{1.0}{|\texgen{unit}|}| where \texgen{unit} is one of the
-unit commands listed in the tables.
+command like |\SI{1.0}{|\texgen{unit}|}| where \texgen{unit} is one of the unit
+commands listed in the first columns of the tables. Note that standard
+\texpkg{siunitx} parsing extensions like |\SI{1.23e-4}{\GeV}| $\to$
+\SI{1.23e-4}{\GeV}, and significant-digit control, also work but aren't shown
+here in the interests of brevity.
\begin{table}[ht]
-\centering
-\begin{tabular}{ll}
-\toprule
-Unit command & Example \\
-
-\midrule
-Lengths & \\
-\texcmd{nm} & \unit{1.0}{\nm} \\
-\texcmd{micron} & \unit{1.0}{\micron} \\
-\texcmd{mm} & \unit{1.0}{\mm} \\
-\texcmd{cm} & \unit{1.0}{\cm} \\
-
-\midrule
-Times & \\
-\texcmd{ns} & \unit{1.0}{\ns} \\
-\texcmd{ps} & \unit{1.0}{\ps} \\
-\texcmd{fs} & \unit{1.0}{\fs} \\
-\texcmd{as} & \unit{1.0}{\as} \\
-
-\midrule
-Rates & \\
-\texcmd{mHz} & \unit{1.0}{\mHz} \\
-\texcmd{Hz} & \unit{1.0}{\Hz} \\
-\texcmd{kHz} & \unit{1.0}{\kHz} \\
-\texcmd{MHz} & \unit{1.0}{\MHz} \\
-\texcmd{GHz} & \unit{1.0}{\GHz} \\
-\texcmd{THz} & \unit{1.0}{\THz} \\
-
-\midrule
-Misc. & \\
-\texcmd{mrad} & \unit{1.0}{\mrad} \\
-\texcmd{gauss} & \unit{1.0}{\gauss} \\
-
-\bottomrule
-\end{tabular}
-\caption{List of non-HEP specific units provided by \hepunits}
-\label{tab:normunits}
+ \centering
+ \begin{tabular}{lllll}
+ \toprule
+ Unit command & Normal & Italic & Bold & Math \\
+
+ \midrule
+ Lengths \\
+ \texcmd{nm} & \SI{1.0}{\nm} & \textit{\SI{1.0}{\nm}} & \textbf{\SI{1.0}{\nm}} & $x = \SI{1.0}{\nm}$ \\
+ \texcmd{um} & \SI{1.0}{\um} & \textit{\SI{1.0}{\um}} & \textbf{\SI{1.0}{\um}} & $x = \SI{1.0}{\um}$ \\
+ \texcmd{mm} & \SI{1.0}{\mm} & \textit{\SI{1.0}{\mm}} & \textbf{\SI{1.0}{\mm}} & $x = \SI{1.0}{\mm}$ \\
+ \texcmd{cm} & \SI{1.0}{\cm} & \textit{\SI{1.0}{\cm}} & \textbf{\SI{1.0}{\cm}} & $x = \SI{1.0}{\cm}$ \\
+ \texcmd{micron} & \SI{1.0}{\um} & \textit{\SI{1.0}{\um}} & \textbf{\SI{1.0}{\um}} & $x = \SI{1.0}{\um}$ \\
+
+ \midrule
+ Times \\
+ \texcmd{ns} & \SI{1.0}{\ns} & \textit{\SI{1.0}{\ns}} & \textbf{\SI{1.0}{\ns}} & $x = \SI{1.0}{\ns}$ \\
+ \texcmd{ps} & \SI{1.0}{\ps} & \textit{\SI{1.0}{\ps}} & \textbf{\SI{1.0}{\ps}} & $x = \SI{1.0}{\ps}$ \\
+ \texcmd{fs} & \SI{1.0}{\fs} & \textit{\SI{1.0}{\fs}} & \textbf{\SI{1.0}{\fs}} & $x = \SI{1.0}{\fs}$ \\
+ \texcmd{as} & \SI{1.0}{\as} & \textit{\SI{1.0}{\as}} & \textbf{\SI{1.0}{\as}} & $x = \SI{1.0}{\as}$ \\
+
+ \midrule
+ Rates \\
+ \texcmd{mHz} & \SI{1.0}{\mHz} & \textit{\SI{1.0}{\mHz}} & \textbf{\SI{1.0}{\mHz}} & $x = \SI{1.0}{\mHz}$ \\
+ \texcmd{Hz} & \SI{1.0}{\Hz} & \textit{\SI{1.0}{\Hz}} & \textbf{\SI{1.0}{\Hz}} & $x = \SI{1.0}{\Hz}$ \\
+ \texcmd{kHz} & \SI{1.0}{\kHz} & \textit{\SI{1.0}{\kHz}} & \textbf{\SI{1.0}{\kHz}} & $x = \SI{1.0}{\kHz}$ \\
+ \texcmd{MHz} & \SI{1.0}{\MHz} & \textit{\SI{1.0}{\MHz}} & \textbf{\SI{1.0}{\MHz}} & $x = \SI{1.0}{\MHz}$ \\
+ \texcmd{GHz} & \SI{1.0}{\GHz} & \textit{\SI{1.0}{\GHz}} & \textbf{\SI{1.0}{\GHz}} & $x = \SI{1.0}{\GHz}$ \\
+ \texcmd{THz} & \SI{1.0}{\THz} & \textit{\SI{1.0}{\THz}} & \textbf{\SI{1.0}{\THz}} & $x = \SI{1.0}{\THz}$ \\
+
+ \midrule
+ Misc. \\
+ \texcmd{mrad} & \SI{1.0}{\mrad} & \textit{\SI{1.0}{\mrad}} & \textbf{\SI{1.0}{\mrad}} & $x = \SI{1.0}{\mrad}$ \\
+ \texcmd{gauss} & \SI{1.0}{\gauss} & \textit{\SI{1.0}{\gauss}} & \textbf{\SI{1.0}{\gauss}} & $x = \SI{1.0}{\gauss}$ \\
+ \bottomrule
+ \end{tabular}
+ \caption{List of non-HEP specific units provided by \hepunits. Other than \texttt{\textbackslash{}gauss}, these units are only available via the \texttt{sicmds} package option.}
+ \label{tab:normunits}
\end{table}
\begin{table}[ht]
-\centering
-\begin{tabular}{ll}
-\toprule
-Unit command & Example \\
-\midrule
-Luminosities & \\
-\texcmd{invcmsqpersecond} & \unit{1.0}{\invcmsqpersecond} \\
-\texcmd{invcmsqpersec} & \unit{1.0}{\invcmsqpersec} \\
-\texcmd{lumiunits} & \unit{1.0}{\lumiunits} \\
-
-\midrule
-Cross-sections & \\
-\texcmd{barn} & \unit{1.0}{\barn} \\
-\texcmd{invbarn} & \unit{1.0}{\invbarn} \\
-\texcmd{nanobarn} & \unit{1.0}{\nanobarn} \\
-\texcmd{invnanobarn} / \texcmd{invnb} & \unit{1.0}{\invnanobarn} \\
-\texcmd{picobarn} & \unit{1.0}{\picobarn} \\
-\texcmd{invpicobarn} / \texcmd{invpb} & \unit{1.0}{\invpicobarn} \\
-\texcmd{femtobarn} & \unit{1.0}{\femtobarn} \\
-\texcmd{invfemtobarn} / \texcmd{invfb} & \unit{1.0}{\invfemtobarn} \\
-\texcmd{attobarn} & \unit{1.0}{\attobarn} \\
-\texcmd{invattobarn} / \texcmd{invab} & \unit{1.0}{\invattobarn} \\
-
-\bottomrule
-\end{tabular}
-\caption{List of HEP-specific units provided by \hepunits}
-\label{tab:hepunits}
+ \centering
+ \begin{tabular}{lllll}
+ \toprule
+ Unit command & Normal & Italic & Bold & Math \\
+ \midrule
+ Luminosities \\
+ \texcmd{invcmsq} & \SI{1.0}{\invcmsq} & \textit{\SI{1.0}{\invcmsq}} & \textbf{\SI{1.0}{\invcmsq}} & $x = \SI{1.0}{\invcmsq}$ \\
+ \texcmd{invcmsqpersecond} & \SI{1.0}{\invcmsqpersecond} & \textit{\SI{1.0}{\invcmsqpersecond}} & \textbf{\SI{1.0}{\invcmsqpersecond}} & $x = \SI{1.0}{\invcmsqpersecond}$ \\
+ \texcmd{invcmsqpersec} & \SI{1.0}{\invcmsqpersec} & \textit{\SI{1.0}{\invcmsqpersec}} & \textbf{\SI{1.0}{\invcmsqpersec}} & $x = \SI{1.0}{\invcmsqpersec}$ \\
+
+ \midrule
+ Cross-sections \\
+ \texcmd{barn} & \SI{1.23e-4}{\barn} & \textit{\SI{1.0}{\barn}} & \textbf{\SI{1.0}{\barn}} & $x = \SI{1.0}{\barn}$ \\
+ \texcmd{invbarn} & \SI{1.0}{\invbarn} & \textit{\SI{1.0}{\invbarn}} & \textbf{\SI{1.0}{\invbarn}} & $x = \SI{1.0}{\invbarn}$ \\
+ \texcmd{nanobarn} & \SI{1.0}{\nanobarn} & \textit{\SI{1.0}{\nanobarn}} & \textbf{\SI{1.0}{\nanobarn}} & $x = \SI{1.0}{\nanobarn}$ \\
+ \texcmd{invnanobarn} / \texcmd{invnb} & \SI{1.0}{\invnanobarn} & \textit{\SI{1.0}{\invnanobarn}} & \textbf{\SI{1.0}{\invnanobarn}} & $x = \SI{1.0}{\invnanobarn}$ \\
+ \texcmd{picobarn} & \SI{1.0}{\picobarn} & \textit{\SI{1.0}{\picobarn}} & \textbf{\SI{1.0}{\picobarn}} & $x = \SI{1.0}{\picobarn}$ \\
+ \texcmd{invpicobarn} / \texcmd{invpb} & \SI{1.0}{\invpicobarn} & \textit{\SI{1.0}{\invpicobarn}} & \textbf{\SI{1.0}{\invpicobarn}} & $x = \SI{1.0}{\invpicobarn}$ \\
+ \texcmd{femtobarn} & \SI{1.0}{\femtobarn} & \textit{\SI{1.0}{\femtobarn}} & \textbf{\SI{1.0}{\femtobarn}} & $x = \SI{1.0}{\femtobarn}$ \\
+ \texcmd{invfemtobarn} / \texcmd{invfb} & \SI{1.0}{\invfemtobarn} & \textit{\SI{1.0}{\invfemtobarn}} & \textbf{\SI{1.0}{\invfemtobarn}} & $x = \SI{1.0}{\invfemtobarn}$ \\
+ \texcmd{attobarn} & \SI{1.0}{\attobarn} & \textit{\SI{1.0}{\attobarn}} & \textbf{\SI{1.0}{\attobarn}} & $x = \SI{1.0}{\attobarn}$ \\
+ \texcmd{invattobarn} / \texcmd{invab} & \SI{1.0}{\invattobarn} & \textit{\SI{1.0}{\invattobarn}} & \textbf{\SI{1.0}{\invattobarn}} & $x = \SI{1.0}{\invattobarn}$ \\
+
+ \bottomrule
+ \end{tabular}
+ \caption{List of HEP-specific luminosity units provided by \hepunits.}
+ \label{tab:hepunits}
\end{table}
\begin{table}[ht]
-\centering
-\begin{tabular}{ll}
-\toprule
-Unit command & Example \\
-\midrule
-\eV-based units & \\
-\texcmd{eV} & \unit{1.0}{\eV} \\
-\texcmd{inveV} & \unit{1.0}{\inveV} \\
-\texcmd{eVoverc} & \unit{1.0}{\eVoverc} \\
-\texcmd{eVovercsq} & \unit{1.0}{\eVovercsq} \\
-\texcmd{meV} & \unit{1.0}{\meV} \\
-\texcmd{keV} & \unit{1.0}{\keV} \\
-\texcmd{MeV} & \unit{1.0}{\MeV} \\
-\texcmd{GeV} & \unit{1.0}{\GeV} \\
-\texcmd{TeV} & \unit{1.0}{\TeV} \\
-\texcmd{minveV} & \unit{1.0}{\minveV} \\
-\texcmd{kinveV} & \unit{1.0}{\kinveV} \\
-\texcmd{MinveV} & \unit{1.0}{\MinveV} \\
-\texcmd{GinveV} & \unit{1.0}{\GinveV} \\
-\texcmd{TinveV} & \unit{1.0}{\TinveV} \\
-\texcmd{meVoverc} & \unit{1.0}{\meVoverc} \\
-\texcmd{keVoverc} & \unit{1.0}{\keVoverc} \\
-\texcmd{MeVoverc} & \unit{1.0}{\MeVoverc} \\
-\texcmd{GeVoverc} & \unit{1.0}{\GeVoverc} \\
-\texcmd{TeVoverc} & \unit{1.0}{\TeVoverc} \\
-\texcmd{meVovercsq} & \unit{1.0}{\meVovercsq} \\
-\texcmd{keVovercsq} & \unit{1.0}{\keVovercsq} \\
-\texcmd{MeVovercsq} & \unit{1.0}{\MeVovercsq} \\
-\texcmd{GeVovercsq} & \unit{1.0}{\GeVovercsq} \\
-\texcmd{TeVovercsq} & \unit{1.0}{\TeVovercsq} \\
-
-\bottomrule
-\end{tabular}
-\contcaption{List of HEP-specific units provided by \hepunits (cont.)}
-\label{tab:hepunits2}
+ \centering
+ \begin{tabular}{lllll}
+ \toprule
+ Unit command & Normal & Italic & Bold & Math \\
+ \midrule
+ \eV-based units \\
+ %\multicolumn{4}{\eV-based units} \\
+ \texcmd{eV} & \SI{1.0}{\eV} & \textit{\SI{1.0}{\eV}} & \textbf{\SI{1.0}{\eV}} & $x = \SI{1.0}{\eV}$ \\
+ \texcmd{eVc} & \SI{1.0}{\eVc} & \textit{\SI{1.0}{\eVc}} & \textbf{\SI{1.0}{\eVc}} & $x = \SI{1.0}{\eVc}$ \\
+ \texcmd{eVcsq} & \SI{1.0}{\eVcsq} & \textit{\SI{1.0}{\eVcsq}} & \textbf{\SI{1.0}{\eVcsq}} & $x = \SI{1.0}{\eVcsq}$ \\
+ \texcmd{meV} & \SI{1.0}{\meV} & \textit{\SI{1.0}{\meV}} & \textbf{\SI{1.0}{\meV}} & $x = \SI{1.0}{\meV}$ \\
+ \texcmd{keV} & \SI{1.0}{\keV} & \textit{\SI{1.0}{\keV}} & \textbf{\SI{1.0}{\keV}} & $x = \SI{1.0}{\keV}$ \\
+ \texcmd{MeV} & \SI{1.0}{\MeV} & \textit{\SI{1.0}{\MeV}} & \textbf{\SI{1.0}{\MeV}} & $x = \SI{1.0}{\MeV}$ \\
+ \texcmd{GeV} & \SI{1.0}{\GeV} & \textit{\SI{1.0}{\GeV}} & \textbf{\SI{1.0}{\GeV}} & $x = \SI{1.0}{\GeV}$ \\
+ \texcmd{TeV} & \SI{1.0}{\TeV} & \textit{\SI{1.0}{\TeV}} & \textbf{\SI{1.0}{\TeV}} & $x = \SI{1.0}{\TeV}$ \\
+ \texcmd{meVc} & \SI{1.0}{\meVc} & \textit{\SI{1.0}{\meVc}} & \textbf{\SI{1.0}{\meVc}} & $x = \SI{1.0}{\meVc}$ \\
+ \texcmd{keVc} & \SI{1.0}{\keVc} & \textit{\SI{1.0}{\keVc}} & \textbf{\SI{1.0}{\keVc}} & $x = \SI{1.0}{\keVc}$ \\
+ \texcmd{MeVc} & \SI{1.0}{\MeVc} & \textit{\SI{1.0}{\MeVc}} & \textbf{\SI{1.0}{\MeVc}} & $x = \SI{1.0}{\MeVc}$ \\
+ \texcmd{GeVc} & \SI{1.0}{\GeVc} & \textit{\SI{1.0}{\GeVc}} & \textbf{\SI{1.0}{\GeVc}} & $x = \SI{1.0}{\GeVc}$ \\
+ \texcmd{TeVc} & \SI{1.0}{\TeVc} & \textit{\SI{1.0}{\TeVc}} & \textbf{\SI{1.0}{\TeVc}} & $x = \SI{1.0}{\TeVc}$ \\
+ \texcmd{meVcsq} & \SI{1.0}{\meVcsq} & \textit{\SI{1.0}{\meVcsq}} & \textbf{\SI{1.0}{\meVcsq}} & $x = \SI{1.0}{\meVcsq}$ \\
+ \texcmd{keVcsq} & \SI{1.0}{\keVcsq} & \textit{\SI{1.0}{\keVcsq}} & \textbf{\SI{1.0}{\keVcsq}} & $x = \SI{1.0}{\keVcsq}$ \\
+ \texcmd{MeVcsq} & \SI{1.0}{\MeVcsq} & \textit{\SI{1.0}{\MeVcsq}} & \textbf{\SI{1.0}{\MeVcsq}} & $x = \SI{1.0}{\MeVcsq}$ \\
+ \texcmd{GeVcsq} & \SI{1.0}{\GeVcsq} & \textit{\SI{1.0}{\GeVcsq}} & \textbf{\SI{1.0}{\GeVcsq}} & $x = \SI{1.0}{\GeVcsq}$ \\
+ \texcmd{TeVcsq} & \SI{1.0}{\TeVcsq} & \textit{\SI{1.0}{\TeVcsq}} & \textbf{\SI{1.0}{\TeVcsq}} & $x = \SI{1.0}{\TeVcsq}$ \\
+ \bottomrule
+ \end{tabular}
+ \contcaption{List of HEP-specific units provided by \hepunits (cont.)}
+ \label{tab:hepunits2}
\end{table}
Note that a lot of these units have, for convenience, been provided as explicit
commands with various SI prefixes, rather than just defining the base unit and
-using the \texpkg{SIunits} prescription for the prefixes. Let's give a demo in
-case you don't know what I'm waffling about\dots the ``usual'' \texpkg{SUunits}
+using the \texpkg{siunitx} prescription for the prefixes. Let's give a demo in
+case you don't know what I'm waffling about\dots the ``usual'' \texpkg{siunitx}
way of doing things is like this:
-|\unit{1.0}{\mega\eVoverc}|. This produces ``\unit{1.0}{\mega\eVoverc}''
-just like |\unit{1.0}{\MeVoverc}| would do.
+|\SI{1.0}{\mega\eVc}|. This produces ``\SI{1.0}{\mega\eVc}''
+just like |\SI{1.0}{\MeVc}| would do.
I've chosen to provide the explicit prefixed commands for convenience: choose
your own favourite way (the same applies even more so for most of the non-HEP
@@ -207,13 +214,13 @@
\section{Summary}
\hepunits is a handy package for particle physicists who'd like their units to
-look right, with upright \micro{s} and properly italicised $c$s in the
-appropriate places. Fortunately most of the work has already been done by the
-marvellous \texpkg{SIunits} package and I've just provided a few more commands
-and an option passing wrapper on to that excellent piece of work.
+look right, with upright \si{\micro}{s}, properly italicised $c$s, and properly
+kerned \eV{s} in the appropriate places. Fortunately most of the work has
+already been done by the marvellous \texpkg{siunitx} package and I've just
+provided a few more commands and an option passing wrapper on to that excellent
+piece of work.
If you have any comments, criticism, huge cash donations etc., then please do
-send them my way. Email to |andy(a)insectnation.org| is preferred, but if you can
-find a way to get your message to me by carrier pigeon I'll be very impressed.
+send them my way.
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hepunits.doc.tlpobj new/tlpkg/tlpobj/hepunits.doc.tlpobj
--- old/tlpkg/tlpobj/hepunits.doc.tlpobj 2019-02-28 03:41:43.000000000 +0100
+++ new/tlpkg/tlpobj/hepunits.doc.tlpobj 2020-04-16 01:56:59.000000000 +0200
@@ -1,9 +1,9 @@
name hepunits.doc
category Package
-revision 15878
+revision 54758
shortdesc doc files of hepunits
relocated 1
-docfiles size=27
+docfiles size=30
RELOC/doc/latex/hepunits/ChangeLog
RELOC/doc/latex/hepunits/README
RELOC/doc/latex/hepunits/hepunits.pdf
++++++ hepunits.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hepunits/hepunits.sty new/tex/latex/hepunits/hepunits.sty
--- old/tex/latex/hepunits/hepunits.sty 2007-09-29 01:13:53.000000000 +0200
+++ new/tex/latex/hepunits/hepunits.sty 2020-04-12 00:24:37.000000000 +0200
@@ -9,164 +9,129 @@
%% Please let me know if you use hepunits and what you think of it.
%% I'll try to implement any suggested options that seem sensible!
-\def\fileversion{1.1.1}
-\def\filedate{2007/09/27}
+\def\fileversion{2.0.0}
+\def\filedate{2020/04/10}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{hepunits}[\filedate\space High-energy physics units by Andy Buckley (v\fileversion)]
-%% Now-redundant wrapper for declaring new units
-\DeclareRobustCommand{\@NewUnit}[2]{\addunit{#1}{#2}}
-%% Option handling variables
-\def\@empty{}
+%% Option handling
\def\@yes{yes}
\def\@HEPopt@noprefixcmds{}
-\def\@SIopt@cdot{}
-\def\@SIopt@space{mediumspace}
-\def\@SIopt@qspace{thickqspace}
-\def\@SIopt@amssquare{squaren}
-\def\@SIopt@pstricks{}
-\def\@SIopt@Gray{}
-\def\@SIopt@italian{}
-\def\@SIopt@textstyle{yes}
-\def\@SIopt@binary{}
-\def\@SIopt@noams{}
-\def\@SIopt@derivedinbase{}
-\def\@SIopt@derived{}
-
-%% Option for turning off explicit SI prefix commands
+\def\@HEPopt@sicmds{}
+\def\@HEPopt@freestanding{}
+\DeclareOption{sicmds}{\def\@HEPopt@sicmds{yes}}
\DeclareOption{noprefixcmds}{\def\@HEPopt@noprefixcmds{yes}}
-
-%% Options for passing to SIunits
-\DeclareOption{cdot}{\def\@SIopt@cdot{yes}}
-\DeclareOption{thickspace}{\def\@SIopt@space{thickspace}}
-\DeclareOption{mediumspace}{\def\@SIopt@space{mediumspace}}
-\DeclareOption{thinspace}{\def\@SIopt@space{thinspace}}
-\DeclareOption{thickqspace}{\def\@SIopt@qspace{thickqspace}}
-\DeclareOption{mediumqspace}{\def\@SIopt@qspace{mediumqspace}}
-\DeclareOption{thinqspace}{\def\@SIopt@qspace{thinqspace}}
-\DeclareOption{noamssquareissue}{\def\@SIopt@amssquare{}}
-\DeclareOption{amssymb}{\def\@SIopt@amssquare{amssymb}}
-\DeclareOption{squaren}{\def\@SIopt@amssquare{squaren}}
-\DeclareOption{pstricks}{\def\@SIopt@pstricks{yes}}
-\DeclareOption{Gray}{\def\@SIopt@Gray{yes}}
-\DeclareOption{italian}{\def\@SIopt@italian{yes}}
-\DeclareOption{textstyle}{\def\@SIopt@textstyle{yes}}
-\DeclareOption{notextstyle}{\def\@SIopt@textstyle{}}
-\DeclareOption{binary}{\def\@SIopt@binary{yes}}
-\DeclareOption{noams}{\def\@SIopt@noams{yes}}
-\DeclareOption{derivedinbase}{\def\@SIopt@derivedinbase{yes}}
-\DeclareOption{derived}{\def\@SIopt@derived{yes}}
-%\DeclareOption{noderived}{\def\@SIopt@derived{}}
-
+\DeclareOption{freestanding}{\def\@HEPopt@freestanding{yes}}
\ProcessOptions
+\ifx\@HEPopt@noprefixcmds\@yes\def\@HEPopt@sicmds\@empty\fi
-%% Pass the SIunits yes/no options
-\ifx\@SIopt@cdot\@yes\PassOptionsToPackage{cdot}{SIunits}\fi
-\ifx\@SIopt@pstricks\@yes\PassOptionsToPackage{pstricks}{SIunits}\fi
-\ifx\@SIopt@Gray\@yes\PassOptionsToPackage{Gray}{SIunits}\fi
-\ifx\@SIopt@italian\@yes\PassOptionsToPackage{italian}{SIunits}\fi
-\ifx\@SIopt@textstyle\@yes\PassOptionsToPackage{textstyle}{SIunits}\fi
-\ifx\@SIopt@binary\@yes\PassOptionsToPackage{binary}{SIunits}\fi
-\ifx\@SIopt@noams\@yes\PassOptionsToPackage{noams}{SIunits}\fi
-\ifx\@SIopt@derivedinbase\@yes\PassOptionsToPackage{derivedinbase}{SIunits}\fi
-\ifx\@SIopt@derived\@yes\PassOptionsToPackage{derived}{SIunits}\fi
-%% Pass the SIunits "choice" options
-\ifx\@SIopt@space\@empty\else\PassOptionsToPackage{\@SIopt@space}{SIunits}\fi
-\ifx\@SIopt@qspace\@empty\else\PassOptionsToPackage{\@SIopt@qspace}{SIunits}\fi
-\ifx\@SIopt@amssquare\@empty\else\PassOptionsToPackage{\@SIopt@amssquare}{SIunits}\fi
-%% Get the dependancy packages, now that the options
-%% have been processed
+%% Get the dependency packages
\RequirePackage{amsmath}
-\RequirePackage{xspace}
-\RequirePackage{SIunits}
+\RequirePackage{ifthen}
+\RequirePackage{siunitx}
+
+%% Pass default config to siunitx
+\sisetup{detect-all, detect-display-math, mode=text}
+\ifx\@HEPopt@freestanding\@yes
+\sisetup{free-standing-units=true}
+\fi
+
%% -------------------------------------------------
%% Units defined below here
%% -------------------------------------------------
-\@NewUnit{\Hz}{\hertz}
-\ifx\@HEPopt@noprefixcmds\@empty
+\DeclareSIUnit{\Hz}{\hertz}
+
+\ifx\@HEPopt@sicmds\@yes
%% Lengths
-\@NewUnit{\nm}{\nano\metre}
-\@NewUnit{\micron}{\micro\metre}
-\@NewUnit{\mm}{\milli\metre}
-\@NewUnit{\cm}{\centi\metre}
+\DeclareSIUnit{\fermi}{\femto\metre}
+\DeclareSIUnit{\nm}{\nano\metre}
+\DeclareSIUnit{\micron}{\micro\metre}
+\DeclareSIUnit{\um}{\micro\metre}
+\DeclareSIUnit{\mm}{\milli\metre}
+\DeclareSIUnit{\cm}{\centi\metre}
%% Angles
-\@NewUnit{\mrad}{\milli\rad}
+\DeclareSIUnit{\mrad}{\milli\radian}
%% Times
-\@NewUnit{\as}{\atto\second}
-\@NewUnit{\fs}{\femto\second}
-\@NewUnit{\ps}{\pico\second}
-\@NewUnit{\ns}{\nano\second}
+\DeclareSIUnit{\as}{\atto\second}
+\DeclareSIUnit{\fs}{\femto\second}
+\DeclareSIUnit{\ps}{\pico\second}
+\DeclareSIUnit{\ns}{\nano\second}
%% Rates
-\@NewUnit{\mHz}{\milli\hertz}
-\@NewUnit{\kHz}{\kilo\hertz}
-\@NewUnit{\MHz}{\mega\hertz}
-\@NewUnit{\GHz}{\giga\hertz}
-\@NewUnit{\THz}{\tera\hertz}
+\DeclareSIUnit{\mHz}{\milli\hertz}
+\DeclareSIUnit{\kHz}{\kilo\hertz}
+\DeclareSIUnit{\MHz}{\mega\hertz}
+\DeclareSIUnit{\GHz}{\giga\hertz}
+\DeclareSIUnit{\THz}{\tera\hertz}
\fi
+
%% Fields
-\@NewUnit{\gauss}{G}
+\DeclareSIUnit{\gauss}{G}
%% Luminosity
-\@NewUnit{\invcmsqpersecond}{\rpsquare{\centi\metre}\usk\reciprocal{\second}}
-\@NewUnit{\invcmsqpersec}{\invcmsqpersecond}
-\DeclareRobustCommand{\lumiunits}{\invcmsqpersecond}
+\DeclareSIUnit{\invcmsq}{\centi\metre\tothe{-2}}
+\DeclareSIUnit{\invcmsqpersecond}{\invcmsq\second\tothe{-1}}
+\DeclareSIUnit{\invcmsqpersec}{\invcmsqpersecond}
%% (Inverse) cross-sections
-\@NewUnit{\invbarn}{\reciprocal\barn\xspace}
+\DeclareSIUnit{\invbarn}{\barn\tothe{-1}}
\ifx\@HEPopt@noprefixcmds\@empty
-\@NewUnit{\nanobarn}{\nano\barn\xspace}
-\@NewUnit{\picobarn}{\pico\barn\xspace}
-\@NewUnit{\femtobarn}{\femto\barn\xspace}
-\@NewUnit{\attobarn}{\atto\barn\xspace}
-\@NewUnit{\zeptobarn}{\zepto\barn\xspace}
-\@NewUnit{\yoctobarn}{\yocto\barn\xspace}
-\@NewUnit{\invnanobarn}{\nano\invbarn\xspace}
-\@NewUnit{\invpicobarn}{\pico\invbarn\xspace}
-\@NewUnit{\invfemtobarn}{\femto\invbarn\xspace}
-\@NewUnit{\invattobarn}{\atto\invbarn\xspace}
-\@NewUnit{\invzeptobarn}{\zepto\invbarn\xspace}
-\@NewUnit{\invyoctobarn}{\yocto\invbarn\xspace}
-\@NewUnit{\invnb}{\invnanobarn}
-\@NewUnit{\invpb}{\invpicobarn}
-\@NewUnit{\invfb}{\invfemtobarn}
-\@NewUnit{\invab}{\invattobarn}
-\@NewUnit{\invzb}{\invzeptobarn}
-\@NewUnit{\invyb}{\invyoctobarn}
+\DeclareSIUnit{\millibarn}{\milli\barn}
+\DeclareSIUnit{\microbarn}{\micro\barn}
+\DeclareSIUnit{\nanobarn}{\nano\barn}
+\DeclareSIUnit{\picobarn}{\pico\barn}
+\DeclareSIUnit{\femtobarn}{\femto\barn}
+\DeclareSIUnit{\attobarn}{\atto\barn}
+\DeclareSIUnit{\zeptobarn}{\zepto\barn}
+\DeclareSIUnit{\yoctobarn}{\yocto\barn}
+\DeclareSIUnit{\invnanobarn}{\nano\invbarn}
+\DeclareSIUnit{\invpicobarn}{\pico\invbarn}
+\DeclareSIUnit{\invfemtobarn}{\femto\invbarn}
+\DeclareSIUnit{\invattobarn}{\atto\invbarn}
+\DeclareSIUnit{\invzeptobarn}{\zepto\invbarn}
+\DeclareSIUnit{\invyoctobarn}{\yocto\invbarn}
+\DeclareSIUnit{\invnb}{\invnanobarn}
+\DeclareSIUnit{\invpb}{\invpicobarn}
+\DeclareSIUnit{\invfb}{\invfemtobarn}
+\DeclareSIUnit{\invab}{\invattobarn}
+\DeclareSIUnit{\invzb}{\invzeptobarn}
+\DeclareSIUnit{\invyb}{\invyoctobarn}
\fi
%% HEP energy, momentum and mass units
-\DeclareRobustCommand{\clight}{\ensuremath{c}}
-\@NewUnit{\eV}{\electronvolt\xspace}
-\@NewUnit{\inveV}{\reciprocal\electronvolt\xspace}
-\@NewUnit{\eVoverc}{\ensuremath{\eV\!/\clight}\xspace}
-\@NewUnit{\eVovercsq}{\ensuremath{\eV\!/\clight^{2}}\xspace}
+% \DeclareSIUnit{\electronvolt}{\text{e\kern-1.2\scriptspace V}}
+\DeclareSIUnit{\electronvolt}{\text{e\kern-0.15ex V}}
+\DeclareSIUnit{\eV}{\electronvolt}
+\newcommand{\@eVoverc}[1][]{\ensuremath{
+ \eV
+ \ifthenelse{\equal{\f@series}{\bfdefault}}{/}{\mkern-\medmuskip/\mkern-\thinmuskip}
+ \text{\ensuremath{c#1}}
+ }}
+\DeclareSIUnit{\electronvoltc}{\@eVoverc}
+\DeclareSIUnit{\electronvoltcsq}{\@eVoverc[^2]}
+\DeclareSIUnit{\eVc}{\@eVoverc}
+\DeclareSIUnit{\eVcsq}{\@eVoverc[^2]}
\ifx\@HEPopt@noprefixcmds\@empty
-\@NewUnit{\meV}{\milli\eV}
-\@NewUnit{\keV}{\kilo\eV}
-\@NewUnit{\MeV}{\mega\eV}
-\@NewUnit{\GeV}{\giga\eV}
-\@NewUnit{\TeV}{\tera\eV}
-\@NewUnit{\minveV}{\milli\inveV}
-\@NewUnit{\kinveV}{\kilo\inveV}
-\@NewUnit{\MinveV}{\mega\inveV}
-\@NewUnit{\GinveV}{\giga\inveV}
-\@NewUnit{\TinveV}{\tera\inveV}
-\@NewUnit{\meVoverc}{\ensuremath{\milli\eVoverc}\xspace}
-\@NewUnit{\keVoverc}{\ensuremath{\kilo\eVoverc}\xspace}
-\@NewUnit{\MeVoverc}{\ensuremath{\mega\eVoverc}\xspace}
-\@NewUnit{\GeVoverc}{\ensuremath{\giga\eVoverc}\xspace}
-\@NewUnit{\TeVoverc}{\ensuremath{\tera\eVoverc}\xspace}
-\@NewUnit{\meVovercsq}{\ensuremath{\milli\eVovercsq}\xspace}
-\@NewUnit{\keVovercsq}{\ensuremath{\kilo\eVovercsq}\xspace}
-\@NewUnit{\MeVovercsq}{\ensuremath{\mega\eVovercsq}\xspace}
-\@NewUnit{\GeVovercsq}{\ensuremath{\giga\eVovercsq}\xspace}
-\@NewUnit{\TeVovercsq}{\ensuremath{\tera\eVovercsq}\xspace}
+\DeclareSIUnit{\meV}{\milli\eV}
+\DeclareSIUnit{\keV}{\kilo\eV}
+\DeclareSIUnit{\MeV}{\mega\eV}
+\DeclareSIUnit{\GeV}{\giga\eV}
+\DeclareSIUnit{\TeV}{\tera\eV}
+\DeclareSIUnit{\meVc}{\milli\eVc}
+\DeclareSIUnit{\keVc}{\kilo\eVc}
+\DeclareSIUnit{\MeVc}{\mega\eVc}
+\DeclareSIUnit{\GeVc}{\giga\eVc}
+\DeclareSIUnit{\TeVc}{\tera\eVc}
+\DeclareSIUnit{\meVcsq}{\milli\eVcsq}
+\DeclareSIUnit{\keVcsq}{\kilo\eVcsq}
+\DeclareSIUnit{\MeVcsq}{\mega\eVcsq}
+\DeclareSIUnit{\GeVcsq}{\giga\eVcsq}
+\DeclareSIUnit{\TeVcsq}{\tera\eVcsq}
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hepunits.tlpobj new/tlpkg/tlpobj/hepunits.tlpobj
--- old/tlpkg/tlpobj/hepunits.tlpobj 2019-02-28 03:41:44.000000000 +0100
+++ new/tlpkg/tlpobj/hepunits.tlpobj 2020-04-16 01:56:59.000000000 +0200
@@ -1,6 +1,6 @@
name hepunits
category Package
-revision 15878
+revision 54758
shortdesc A set of units useful in high energy physics applications
relocated 1
longdesc Hepunits is a LaTeX package built on the SIunits package which
@@ -11,7 +11,6 @@
runfiles size=2
RELOC/tex/latex/hepunits/hepunits.sty
catalogue-ctan /macros/latex/contrib/hepunits
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics physics
-catalogue-version 1.1.1
+catalogue-version 2.0.0
++++++ heuristica.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/heuristica/README new/doc/fonts/heuristica/README
--- old/doc/fonts/heuristica/README 2017-03-15 22:17:18.000000000 +0100
+++ new/doc/fonts/heuristica/README 2019-06-11 23:01:04.000000000 +0200
@@ -2,7 +2,13 @@
http://www.ctan.org/license/lppl1.3
for the details of that license.
-Current version: 1.09 2017-03-14
+Current version: 1.092 2019-06-10
+
+Changes in version 1.092
+Corrected an error in the last correction to the fd file. (Thanks, Frank Mittelbach.)
+
+Changes in version 1.091
+Corrected an error in the fd files. The use of \providecommand in the fd could cause problems for users who did not load heuristica.sty.
Changes in version 1.09
Added options to give the user complete control of all word-spacing parameters.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/heuristica.doc.tlpobj new/tlpkg/tlpobj/heuristica.doc.tlpobj
--- old/tlpkg/tlpobj/heuristica.doc.tlpobj 2019-02-28 03:41:44.000000000 +0100
+++ new/tlpkg/tlpobj/heuristica.doc.tlpobj 2019-06-12 01:38:44.000000000 +0200
@@ -1,6 +1,6 @@
name heuristica.doc
category Package
-revision 43507
+revision 51362
shortdesc doc files of heuristica
relocated 1
docfiles size=69
++++++ heuristica.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/LY1Heuristica-Inf.fd new/tex/latex/heuristica/LY1Heuristica-Inf.fd
--- old/tex/latex/heuristica/LY1Heuristica-Inf.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/LY1Heuristica-Inf.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{LY1}{Heuristica-Inf}{\Heuristica@sf}
\DeclareFontShape{LY1}{Heuristica-Inf}{m}{it}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/LY1Heuristica-Sup.fd new/tex/latex/heuristica/LY1Heuristica-Sup.fd
--- old/tex/latex/heuristica/LY1Heuristica-Sup.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/LY1Heuristica-Sup.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{LY1}{Heuristica-Sup}{\Heuristica@sf}
\DeclareFontShape{LY1}{Heuristica-Sup}{b}{it}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/LY1Heuristica-TLF.fd new/tex/latex/heuristica/LY1Heuristica-TLF.fd
--- old/tex/latex/heuristica/LY1Heuristica-TLF.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/LY1Heuristica-TLF.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{LY1}{Heuristica-TLF}{\Heuristica@sf}
\DeclareFontShape{LY1}{Heuristica-TLF}{m}{sc}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/LY1Heuristica-TOsF.fd new/tex/latex/heuristica/LY1Heuristica-TOsF.fd
--- old/tex/latex/heuristica/LY1Heuristica-TOsF.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/LY1Heuristica-TOsF.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{LY1}{Heuristica-TOsF}{\Heuristica@sf}
\DeclareFontShape{LY1}{Heuristica-TOsF}{m}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T1Heuristica-Inf.fd new/tex/latex/heuristica/T1Heuristica-Inf.fd
--- old/tex/latex/heuristica/T1Heuristica-Inf.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/T1Heuristica-Inf.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{T1}{Heuristica-Inf}{\Heuristica@sf}
\DeclareFontShape{T1}{Heuristica-Inf}{m}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T1Heuristica-Sup.fd new/tex/latex/heuristica/T1Heuristica-Sup.fd
--- old/tex/latex/heuristica/T1Heuristica-Sup.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/T1Heuristica-Sup.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{T1}{Heuristica-Sup}{\Heuristica@sf}
\DeclareFontShape{T1}{Heuristica-Sup}{b}{it}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T1Heuristica-TLF.fd new/tex/latex/heuristica/T1Heuristica-TLF.fd
--- old/tex/latex/heuristica/T1Heuristica-TLF.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/T1Heuristica-TLF.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{T1}{Heuristica-TLF}{\Heuristica@sf}
\DeclareFontShape{T1}{Heuristica-TLF}{m}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T1Heuristica-TOsF.fd new/tex/latex/heuristica/T1Heuristica-TOsF.fd
--- old/tex/latex/heuristica/T1Heuristica-TOsF.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/T1Heuristica-TOsF.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{T1}{Heuristica-TOsF}{\Heuristica@sf}
\DeclareFontShape{T1}{Heuristica-TOsF}{b}{it}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2AHeuristica-Inf.fd new/tex/latex/heuristica/T2AHeuristica-Inf.fd
--- old/tex/latex/heuristica/T2AHeuristica-Inf.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/T2AHeuristica-Inf.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{T2A}{Heuristica-Inf}{\Heuristica@sf}
\DeclareFontShape{T2A}{Heuristica-Inf}{b}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2AHeuristica-Sup.fd new/tex/latex/heuristica/T2AHeuristica-Sup.fd
--- old/tex/latex/heuristica/T2AHeuristica-Sup.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/T2AHeuristica-Sup.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{T2A}{Heuristica-Sup}{\Heuristica@sf}
\DeclareFontShape{T2A}{Heuristica-Sup}{m}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2AHeuristica-TLF.fd new/tex/latex/heuristica/T2AHeuristica-TLF.fd
--- old/tex/latex/heuristica/T2AHeuristica-TLF.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/T2AHeuristica-TLF.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{T2A}{Heuristica-TLF}{\Heuristica@sf}
\DeclareFontShape{T2A}{Heuristica-TLF}{b}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2AHeuristica-TOsF.fd new/tex/latex/heuristica/T2AHeuristica-TOsF.fd
--- old/tex/latex/heuristica/T2AHeuristica-TOsF.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/T2AHeuristica-TOsF.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{T2A}{Heuristica-TOsF}{\Heuristica@sf}
\DeclareFontShape{T2A}{Heuristica-TOsF}{m}{sc}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2BHeuristica-Inf.fd new/tex/latex/heuristica/T2BHeuristica-Inf.fd
--- old/tex/latex/heuristica/T2BHeuristica-Inf.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/T2BHeuristica-Inf.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{T2B}{Heuristica-Inf}{\Heuristica@sf}
\DeclareFontShape{T2B}{Heuristica-Inf}{b}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2BHeuristica-Sup.fd new/tex/latex/heuristica/T2BHeuristica-Sup.fd
--- old/tex/latex/heuristica/T2BHeuristica-Sup.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/T2BHeuristica-Sup.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{T2B}{Heuristica-Sup}{\Heuristica@sf}
\DeclareFontShape{T2B}{Heuristica-Sup}{m}{it}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2BHeuristica-TLF.fd new/tex/latex/heuristica/T2BHeuristica-TLF.fd
--- old/tex/latex/heuristica/T2BHeuristica-TLF.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/T2BHeuristica-TLF.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{T2B}{Heuristica-TLF}{\Heuristica@sf}
\DeclareFontShape{T2B}{Heuristica-TLF}{m}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2BHeuristica-TOsF.fd new/tex/latex/heuristica/T2BHeuristica-TOsF.fd
--- old/tex/latex/heuristica/T2BHeuristica-TOsF.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/T2BHeuristica-TOsF.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{T2B}{Heuristica-TOsF}{\Heuristica@sf}
\DeclareFontShape{T2B}{Heuristica-TOsF}{b}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2CHeuristica-Inf.fd new/tex/latex/heuristica/T2CHeuristica-Inf.fd
--- old/tex/latex/heuristica/T2CHeuristica-Inf.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/T2CHeuristica-Inf.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{T2C}{Heuristica-Inf}{\Heuristica@sf}
\DeclareFontShape{T2C}{Heuristica-Inf}{b}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2CHeuristica-Sup.fd new/tex/latex/heuristica/T2CHeuristica-Sup.fd
--- old/tex/latex/heuristica/T2CHeuristica-Sup.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/T2CHeuristica-Sup.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{T2C}{Heuristica-Sup}{\Heuristica@sf}
\DeclareFontShape{T2C}{Heuristica-Sup}{b}{it}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2CHeuristica-TLF.fd new/tex/latex/heuristica/T2CHeuristica-TLF.fd
--- old/tex/latex/heuristica/T2CHeuristica-TLF.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/T2CHeuristica-TLF.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{T2C}{Heuristica-TLF}{\Heuristica@sf}
\DeclareFontShape{T2C}{Heuristica-TLF}{b}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/T2CHeuristica-TOsF.fd new/tex/latex/heuristica/T2CHeuristica-TOsF.fd
--- old/tex/latex/heuristica/T2CHeuristica-TOsF.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/T2CHeuristica-TOsF.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{T2C}{Heuristica-TOsF}{\Heuristica@sf}
\DeclareFontShape{T2C}{Heuristica-TOsF}{b}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/TS1Heuristica-TLF.fd new/tex/latex/heuristica/TS1Heuristica-TLF.fd
--- old/tex/latex/heuristica/TS1Heuristica-TLF.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/TS1Heuristica-TLF.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{TS1}{Heuristica-TLF}{\Heuristica@sf}
\DeclareFontShape{TS1}{Heuristica-TLF}{m}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/heuristica/TS1Heuristica-TOsF.fd new/tex/latex/heuristica/TS1Heuristica-TOsF.fd
--- old/tex/latex/heuristica/TS1Heuristica-TOsF.fd 2017-03-15 22:17:18.000000000 +0100
+++ new/tex/latex/heuristica/TS1Heuristica-TOsF.fd 2019-06-11 23:01:04.000000000 +0200
@@ -9,7 +9,9 @@
\edef\Heuristica@@scale{s*[\csname Heuristica@scale\endcsname]}%
\fi
-\providecommand{\Heuristica@sf}{}
+\expandafter\ifx\csname Heuristica@sf\endcsname\relax
+ \global\let\Heuristica@sf\@empty
+\fi
\DeclareFontFamily{TS1}{Heuristica-TOsF}{\Heuristica@sf}
\DeclareFontShape{TS1}{Heuristica-TOsF}{b}{it}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/heuristica.tlpobj new/tlpkg/tlpobj/heuristica.tlpobj
--- old/tlpkg/tlpobj/heuristica.tlpobj 2019-02-28 03:41:44.000000000 +0100
+++ new/tlpkg/tlpobj/heuristica.tlpobj 2019-06-12 01:38:44.000000000 +0200
@@ -1,6 +1,6 @@
name heuristica
category Package
-revision 43507
+revision 51362
shortdesc Fonts extending Utopia, with LaTeX support files
relocated 1
longdesc The fonts extend the utopia set with Cyrillic glyphs,
@@ -239,7 +239,7 @@
RELOC/tex/latex/heuristica/heuristica.fontspec
RELOC/tex/latex/heuristica/heuristica.sty
catalogue-ctan /fonts/heuristica
-catalogue-date 2017-03-15 06:01:43 +0100
+catalogue-date 2019-06-11 09:58:58 +0200
catalogue-license ofl
catalogue-topics font font-type1 font-otf font-cyrillic cyrillic
-catalogue-version 1.09
+catalogue-version 1.092
++++++ hhtensor.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hhtensor.doc.tlpobj new/tlpkg/tlpobj/hhtensor.doc.tlpobj
--- old/tlpkg/tlpobj/hhtensor.doc.tlpobj 2019-02-28 03:41:48.000000000 +0100
+++ new/tlpkg/tlpobj/hhtensor.doc.tlpobj 2020-03-04 23:50:59.000000000 +0100
@@ -1,6 +1,6 @@
name hhtensor.doc
category Package
-revision 24981
+revision 54080
shortdesc doc files of hhtensor
relocated 1
docfiles size=93
++++++ hhtensor.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hhtensor.tlpobj new/tlpkg/tlpobj/hhtensor.tlpobj
--- old/tlpkg/tlpobj/hhtensor.tlpobj 2019-02-28 03:41:48.000000000 +0100
+++ new/tlpkg/tlpobj/hhtensor.tlpobj 2020-03-04 23:50:59.000000000 +0100
@@ -1,15 +1,14 @@
name hhtensor
category Package
-revision 24981
+revision 54080
shortdesc Print vectors, matrices, and tensors
relocated 1
longdesc This package provides commands for vectors, matrices, and
longdesc tensors with different styles -- arrows (as the LaTeX default),
-longdesc underlined, and bold).
+longdesc underlined, and bold.
runfiles size=1
RELOC/tex/latex/hhtensor/hhtensor.sty
catalogue-ctan /macros/latex/contrib/hhtensor
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics maths
catalogue-version 0.61
++++++ hithesis.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hithesis/README.md new/doc/latex/hithesis/README.md
--- old/doc/latex/hithesis/README.md 2019-02-19 23:19:26.000000000 +0100
+++ new/doc/latex/hithesis/README.md 2020-01-10 22:41:08.000000000 +0100
@@ -20,14 +20,13 @@
and version 1.3a or later is part of all distributions of LaTeX
version 2004/10/01 or later.
-
## hithesis是什么?
hithesis
旨在建立一个简单易用的哈尔滨工业大学学位论文LaTeX模板,包括本科论文、硕士论文、博士论文
。现 在支持本科、硕士、博士论文,对其它格式的支持会陆续加入。
hithesis 已收录在[CTAN](https://ctan.org/pkg/hithesis
-"CTAN")中,用户安装TeXLive将自带我工模板(版本日期>2017.08.28)。
+"CTAN**)中,用户安装TeXLive将自带我工模板(版本日期>2017.08.28)。
## 我工规范有歧义之处
@@ -42,14 +41,13 @@
### 呆萌的操作,傲娇的效果
- 极限程度实现了[《哈尔滨工业大学研究生学位论文撰写规范》](http://hitgs.hit.edu.cn/aa/fd/c3425a109309/page.htm)、[《哈尔滨工业大学本科生毕业论文撰写规范》](http://jwc.hit.edu.cn/2566/list.htm)
-- 这是[PlutoThesis](https://github.com/dustincys/PlutoThesis "PlutoThesis")的终极进化,PlutoThesis废弃不再维护。
+- 这是[PlutoThesis](https://github.com/dustincys/PlutoThesis "PlutoThesis**)的终极进化,PlutoThesis废弃不再维护。
- 更傻更简单的选项,例如论文主文件,只需要在文档类的括号中填写本硕博选项,字体选项(设置弹性间距或者刚性间距),文科生选项(目录可以设成四级目录),非全日制类型等,轻松设定目标格式。
- 自适应格式,例如图题和标题,标题字号在字数超过两行时自动由五号变小五号,实现自适应(硕博规范规定,字数多时用五号)
- 自动化中英文索引(博士规范要求,有需要时候添加)
- - 图书馆提交论文级的书签设置
+ - 图书馆提交论文级的电子版
- ……
-
### 矫正PlutoThesis的不足
- 纠正PlutoThesis页面向下溢出
@@ -75,7 +73,7 @@
- 行间距、段前后距离设置精确到小数后四位, 例如 1bp = 1.00374pt,1mm = 2.84526pt, 按照我工之要求, 行距在3mm~4mm之间,换算之后为20.50398~23.33863bp,严格符合规范要求,哪怕是显微镜级别
- 规范明确规定,数字间空格要求为汉字宽度的四分之一(形式类似与 12 2345 和 0.123 456 这样多于3位以上的整数或小数)。默认情况下在LaTeX中任何人工输入的空格均不正确(“\:”为4/18汉字宽度,“\;”为5/18汉字宽度,所以PlutoThesis中的数字间宽度错误)。hithesis模板中定义了精准的数字间宽度。
- - 重写了一堆重要函数,例如章节标题由原来的`BiChapter{}{}`方式进化为`chapter{}[]`,极大简化,后面方括号中为可选括号,硕本可以不用,用了自动忽略
+ - 重写了一堆重要函数,例如章节标题由原来的`BiChapter{}{}`方式进化为`chapter{}[**`,极大简化,后面方括号中为可选括号,硕本可以不用,用了自动忽略
- 严格符合(满足)两个规范要求,由于规范中有矛盾之处,例如本科生的标题段前距离有两处不一样的规定,刚性行距尽量满足行数(要求约33行)要求。
- 规范中给出了行距区间,为了规格严格,设置了弹性行距
- ……
@@ -103,9 +101,22 @@
### 关于hithesis的线上讨论区
-由于维护者(就是本书呆)已经是高龄不毕业刀客,课题繁忙,常常无法及时回答疑问。
-为了解决使用中遇到的问题,请各位刀客和大侠加入QQ群:259959600。
-群里有很多热心的LaTeX隐士高人如@poofee等,很乐于解答。
+~~由于维护者(就是本书呆)已经是高龄不毕业刀客,课题繁忙,常常无法及时回答疑问。~~
+为了解决使用中遇到的问题,请各位刀客和大侠加入QQ群hithesis讨论区:259959600。
+
+hithesis 高级群:476262502 (高级群为作者散布高级排版、制图、Linux管理、编码等
+知识和技术之所在,其要旨引用自《西游记》第八回,如来自言“叵耐不识我法门之要旨,
+怠慢了瑜伽之正宗”,以及“曹溪路险、鹫岭云深,故人不音杳!”。散布知识之后,作者将
+直播回答高级群中众生问题。(**由于工作关系直播暂停,开播时间待定**))。
+
+21 Oct 2019 添加:由于工作繁忙,改为西瓜小视频形式传播正能量(**包括Linux实用技术、
+排版、制图等等平时积累的经验和知识**)。
+
+西瓜视频ID:**石见石页**
+
+网址:https://www.ixigua.com/home/105143356290/
+
+hithesis群里有很多热心的LaTeX隐士高人如@poofee等,很乐于解答。
### 关于查重
@@ -115,14 +126,20 @@
会出现无法正常复制的情况(可能是系统的字体映射出现了误差)。一般需要在主文件的
选项中明确声明使用哪一种fontset。
-### 模板的编译方法、打印版、电子版及其他说明
+### 模板版本要求
-- 生成论文格式文件(第一步要生成 *.cls,*.cfg,*.ist,然后再生成论文)
+LaTeX 中的ctex package版本要求:
+
+ ctex >= v2.4.3 (2016年9月份发布)
注意,如果下载最新版本(>= 2018)的texlive或Miktex或Mactex,如果使用自带的模板,可能会出现一些错误,因为自带的版本老。
查看自带版本的命令是
- texdoc hithesis
+ texdoc hithesis
+
+### 模板的编译方法
+
+1. 生成论文格式文件(第一步要生成 *.cls,*.cfg,*.ist,然后再生成论文)
- 如果是Linux/Mac执行 (此处作者没测试过Mac,如遇到问题到谈论区可以问一下热心刀客大侠们,比如陈登泰教授、郭大侠等)
@@ -132,60 +149,66 @@
lualatex hithesis.ins
+ - 如果喜欢玩 make
-- 生成论文
-
- xelatex main.tex
- bibtex main
- xelatex main.tex
- xelatex main.tex
- splitindex main -- -s hithesis.ist # 自动生成索引
- xelatex main.tex
+ make cls
-- 生成文档
+2. 生成论文的方式
- xelatex hithesis.dtx
- makeindex -s gind.ist -o hithesis.ind hithesis.idx
- makeindex -s gglo.ist -o hithesis.gls hithesis.glo
- xelatex hithesis.dtx
- xelatex hithesis.dtx
+ - 手动狙击(源文件更改后每次编译逐行命令输入一轮)
-如果喜欢Makefile的是另一画风:
+ xelatex -shell-escape main.tex
+ bibtex main
+ xelatex -shell-escape main.tex
+ xelatex -shell-escape main.tex
+ splitindex main -- -s hithesis.ist # 自动生成索引
+ xelatex -shell-escape main.tex
+
+ - 半自动精确射击(源文件更改后每次编译敲一次)
-- 生成文档类
+ make thesis
- make cls
+ - 全自动火力覆盖(只需要输入一次命令,源文件更改后自动识别更改自动编译)
-- 生成论文
+ latexmk
- make thesis
+3. 生成文档(没什么用,因为有文档也基本没人看)
-- 生成文档
+ - 手动狙击(逐行命令输入一轮)
- make doc
-
-LaTeX 中的ctex package版本要求:
+ xelatex hithesis.dtx
+ makeindex -s gind.ist -o hithesis.ind hithesis.idx
+ makeindex -s gglo.ist -o hithesis.gls hithesis.glo
+ xelatex hithesis.dtx
+ xelatex hithesis.dtx
- ctex >= v2.4.3 (2016年9月份发布)
+ - 半自动精确射击(编译敲一次)
-注意,一般情况下,博士论文的打印版要求右翻页,最后向图书管提交的电子版不是右翻
-页,注意选项中的选项。
+ make doc
-由于维护者(就是本书呆)已经是高龄不毕业博士,课题繁忙,实在无空余时间再写详细文档以及 无偿解决一些用户要求(例如前面文档中[已经解决的算法格式各实验室要求不一致](https://github.com/dustincys/PlutoTh…
+### 打印版、电子版
-各位刀客和大侠如用的嗨,要解囊相助,请微信扫码~~
+注意,一般情况下,博士论文的打印版要求双面打印,本硕单面。
+博士论文在双面打印成册时,规范中没有明确规定是否要右翻页(右翻页是每一章的起始位
+置位于书的右侧页面),所以会出现DIY(或身不由己DIY)哪一处右翻页。
+`openright`选项设置为真时,会将所有章(即所有部分,包括前文和后文)起始设置成右翻页。
+如果想DIY(或身不由己DIY)在什么地方右翻页,将这个选项设置为false,然后在目标位
+置添加`\cleardoublepage`命令即可。
-![5](http://wx4.sinaimg.cn/large/61dccbaaly1fge32sbb32j20my0uz3zt.jpg "谢谢")
+最后向图书管提交的电子版不是右翻页且要求没有任何空白页,这时只需要设置选项`library=true`
+即可,这时候会强制`openright=false`。然后什么都不用做,就会出现如同`Sirius`同学
+的这种“书签还没整明白,论文居然已经通过了”的情况。
-如果用的非常嗨,
+### 幻灯片
-![10](http://wx4.sinaimg.cn/large/61dccbaaly1fge32tuvvsj20my0uzabc.jpg "谢谢")
+有些强迫症刀客喜欢用Beamer,推荐[progressbar主题](https://github.com/dustincys/progressbar),
+能够使用[pympress](https://github.com/Cimbali/pympress)播放双屏提示。
-那个,看在苦X高龄不毕业博士,还熬夜写代码的份上…… 唉……
+### 其他说明
-![1](http://wx4.sinaimg.cn/large/61dccbaaly1fge32qrvgij20my0uzjso.jpg "谢谢")
+由于维护者(就是本书呆)已经是高龄不毕业博士,课题繁忙,实在无空余时间再写详细文档以及 无偿解决一些用户要求(例如前面文档中[已经解决的算法格式各实验室要求不一致](https://github.com/dustincys/PlutoTh…
-或者随便吧……
+各位刀客和大侠如用的嗨,要解囊相助,请微信扫码~~
![wechat](http://wx2.sinaimg.cn/large/61dccbaaly1fqwvz6sd4ej20yi1au797.jpg "谢谢")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hithesis/body/introduction.tex new/doc/latex/hithesis/body/introduction.tex
--- old/doc/latex/hithesis/body/introduction.tex 2019-02-19 23:19:26.000000000 +0100
+++ new/doc/latex/hithesis/body/introduction.tex 2020-01-10 22:41:08.000000000 +0100
@@ -553,7 +553,7 @@
推荐使用glossaries包管理术语、缩略语,可以自动生成首次全写,非首次缩写。
\subsection{\TeX\ 源码编辑器}[\TeX editor]
-推荐:(1)付费软件Winedt;(2)免费软件kile;(3)vim或emacs或spacemacs等神级编
+推荐:(1)付费软件Winedt;(2)免费软件kile;(3)vim或emaces或sublime等神级编
译器(需要配置)。
\subsection{\LaTeX\ 排版重要原则}[\LaTeX\ typesetting rules]
@@ -586,3 +586,8 @@
only}
\end{figure}
+
+% Local Variables:
+% TeX-master: "../main"
+% TeX-engine: xetex
+% End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hithesis/dtx-style.sty new/doc/latex/hithesis/dtx-style.sty
--- old/doc/latex/hithesis/dtx-style.sty 2019-02-19 23:19:26.000000000 +0100
+++ new/doc/latex/hithesis/dtx-style.sty 2020-01-10 22:41:08.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2017-2019 by Chu Yanshuo <yanshuoc(a)gmail.com>
+%% Copyright (C) 2017-2020 by Chu Yanshuo <yanshuoc(a)gmail.com>
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3a
Binary files old/doc/latex/hithesis/hithesis.pdf and new/doc/latex/hithesis/hithesis.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hithesis/latexmkrc new/doc/latex/hithesis/latexmkrc
--- old/doc/latex/hithesis/latexmkrc 2019-02-19 23:19:26.000000000 +0100
+++ new/doc/latex/hithesis/latexmkrc 2020-01-10 22:41:08.000000000 +0100
@@ -8,7 +8,31 @@
$clean_ext = "synctex.gz acn acr alg aux bbl bcf blg brf fdb_latexmk glg glo gls idx ilg ind lof log lot out run.xml toc pdf thm toe ist idx";
$pdflatex = "xelatex -file-line-error --shell-escape -src-specials -synctex=1 -interaction=nonstopmode %O %S;cp %D %R.pdf";
$pdf_update_method = 0;
-
+$makeindex = 'internal splitindex';
+sub splitindex {
+ # Use splitindex instead of makeindex.
+ # The splitindex programe starts from an .idx file, makes a set of
+ # other .idx files for separate indexes, and then runs makeindex to
+ # make corresponding .ind files.
+ # However, it is possible that the document uses the splitindex
+ # package, but in a way compatible with the standard methods
+ # compatible with makeindex, i.e., with a single index and with the
+ # use of the \printindex command.
+ # Then we need to invoke makeindex.
+ # In addition, latexmk assumes that makeindex or its replacement makes
+ # an .ind file from an .idx file, and latexmk gives an error if it
+ # doesn't exist, we need to make an .ind file.
+ # Both problems are solved by running makeindex and then splitindex.
+ # Note: errors are returned by makeindex and splitindex for things
+ # like a missing input file. No error is returned for lines in an
+ # input file that are in an incorrect format; they are simply
+ # ignored. So no problem is caused by lines in the .idx file
+ # that are generated by splitindex in a format incompatible with
+ # makeindex.
+ my $ret1 = system( "makeindex", $$Psource );
+ my $ret2 = system( "splitindex", $$Psource );
+ return $ret1 || $ret2;
+}
@cus_dep_list = (@cus_dep_list, "idx ind 0 makenomenclature");
sub makenomenclature {
system("splitindex $_[0] -- -s $_[0].ist"); }
Binary files old/doc/latex/hithesis/main.pdf and new/doc/latex/hithesis/main.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hithesis/main.tex new/doc/latex/hithesis/main.tex
--- old/doc/latex/hithesis/main.tex 2019-02-19 23:19:26.000000000 +0100
+++ new/doc/latex/hithesis/main.tex 2020-01-10 22:41:08.000000000 +0100
@@ -1,5 +1,5 @@
% !Mode:: "TeX:UTF-8"
-\documentclass[newtxmath=true,newgeometry=two,capcenterlast=true,subcapcenterlast=true,openright=true,absupper=true,fontset=windowsnew,type=doctor]{hithesis}
+\documentclass[newtxmath=true,newgeometry=two,capcenterlast=true,subcapcenterlast=true,openright=false,library=false,absupper=true,fontset=windowsnew,type=doctor]{hithesis}
% 此处选项中不要有空格
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% 必填选项
@@ -20,7 +20,7 @@
% 后出现无法复制的问题以及想要解决排版如 biang biang 面的 biang 这类中易
% 宋体无法识别的汉字的问题。没有特殊的需要不推荐使用这个选项。
%
-% 如果是安装了 windowns 字体的 linux 系统,可以填写windowsnew(win vista
+% 如果是安装了 windows 字体的 linux 系统,可以填写windowsnew(win vista
% 以后 的字体)或 windowsold(vista 以前)或者想用思源宋体并且是已经安装
% 了思源宋体的任何系统,填写siyuan选项。缺省值为空,自动识别系统并匹配字体
% 。模板版中给出的思源字体定义文件定义的思源字体的版本是Adobe版,其他字体
@@ -49,6 +49,9 @@
% ,电子版要求非右翻页且无空白页。如果想DIY(或身不由己DIY)在什么地方右
% 翻页,将这个选项设置为false,然后在目标位置添加`\cleardoublepage`命令即
% 可。
+% library=true|false
+% 含义:是否为提交到图书馆的电子版。默认否。注意:如果设置成true,那么
+% openright选项将被强制转换为false。
% capcenterlast=true|false
% 含义:图题、表题最后一行是否居中对齐(我工规范要求居中,但不要求居中对
% 齐),此选项不在规范要求中,按个人喜好自行决定。默认否。
@@ -56,21 +59,21 @@
% 含义:子图图题最后一行是否居中对齐(我工规范要求居中,但不要求居中对齐
% ),此选项不在规范要求中,按个人喜好自行决定。默认否。
% absupper=true|false
-% 含义:中文目录中的英文索引在中文目录中的大小写样式歧义,在规范中要求首
-% 字母大写,在work样例中是全大写。该选项控制是否全大写。默认否。
+% 含义:中文目录中的英文摘要在中文目录中的大小写样式歧义,在规范中要求首
+% 字母大写,在work样例中是全大写。该选项控制是否全大写。默认否。
% bsmainpagenumberline=true|false
-% 含义:由于本科生论文官方模板的页码和页眉格式混乱,提供这个选项自定义设
-% 置是否在正文中显示页码横线,默认否。
+% 含义:由于本科生论文官方模板的页码和页眉格式混乱,提供这个选项自定义设
+% 置是否在正文中显示页码横线,默认否。
% bsfrontpagenumberline=true|false
-% 含义:由于本科生论文官方模板的页码和页眉格式混乱,提供这个选项自定义设
-% 置是否在前文中显示页码横线,默认否。
+% 含义:由于本科生论文官方模板的页码和页眉格式混乱,提供这个选项自定义设
+% 置是否在前文中显示页码横线,默认否。
% bsheadrule=true|false
-% 含义:由于本科生论文官方模板的页码和页眉格式混乱,提供这个选项自定义设
-% 置是否显示页眉横线,默认显示。
+% 含义:由于本科生论文官方模板的页码和页眉格式混乱,提供这个选项自定义设
+% 置是否显示页眉横线,默认显示。
% splitbibitem=true|false
-% 含义:参考文献每一个条目内能不能断页,应广大刀客要求添加。默认否。
+% 含义:参考文献每一个条目内能不能断页,应广大刀客要求添加。默认否。
% newtxmath=true|false
-% 含义:数学字体是否使用新罗马。默认是。
+% 含义:数学字体是否使用新罗马。默认是。
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{hithesis}
@@ -118,14 +121,18 @@
\include{back/resume} % 博士学位论文有个人简介
%本科书序为:
-%\include{body/conclusion} % 结论
-%\bibliographystyle{hithesis}
-%\bibliography{reference}
-%\authorization %授权
-%%\authorization[saomiao.pdf] %添加扫描页的命令,与上互斥
-%\include{body/acknowledgements} %致谢
-%\begin{appendix}%附录
-%\input{body/appendix01}%本科生翻译论文
-%\end{appendix}
+% \include{body/conclusion} % 结论
+% \bibliographystyle{hithesis}
+% \bibliography{reference}
+% \authorization %授权
+% % \authorization[saomiao.pdf] %添加扫描页的命令,与上互斥
+% \include{body/acknowledgements} %致谢
+% \begin{appendix}%附录
+% % \input{body/appendix01}%本科生翻译论文
+% \end{appendix}
\end{document}
+
+% Local Variables:
+% TeX-engine: xetex
+% End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/hithesis/reference.bib new/doc/latex/hithesis/reference.bib
--- old/doc/latex/hithesis/reference.bib 2019-02-19 23:19:26.000000000 +0100
+++ new/doc/latex/hithesis/reference.bib 2020-01-10 22:41:08.000000000 +0100
@@ -1,11 +1,5 @@
% !Mode:: "TeX:UTF-8"
-@ONLINE{DoeOnline,
-author = {Doe, Ringo},
-title = {This is a test entry of type {@ONLINE}},
-month = jun,
-year = {2009},
-url = {http://www.test.org/doe/}
-}
+
@INPROCEEDINGS{cnproceed,
author = {王重阳 and 黄药师 and 欧阳峰 and 洪七公 and 段皇帝},
title = {武林高手从入门到精通},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hithesis.doc.tlpobj new/tlpkg/tlpobj/hithesis.doc.tlpobj
--- old/tlpkg/tlpobj/hithesis.doc.tlpobj 2019-02-28 03:41:48.000000000 +0100
+++ new/tlpkg/tlpobj/hithesis.doc.tlpobj 2020-01-11 01:55:18.000000000 +0100
@@ -1,9 +1,9 @@
name hithesis.doc
category Package
-revision 50062
+revision 53362
shortdesc doc files of hithesis
relocated 1
-docfiles size=302
+docfiles size=304
RELOC/doc/latex/hithesis/README.md
RELOC/doc/latex/hithesis/back/acknowledgements.tex
RELOC/doc/latex/hithesis/back/appA.tex
++++++ hithesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/makeindex/hithesis/hithesis.ist new/makeindex/hithesis/hithesis.ist
--- old/makeindex/hithesis/hithesis.ist 2019-02-19 23:19:26.000000000 +0100
+++ new/makeindex/hithesis/hithesis.ist 2020-01-10 22:41:08.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2017-2019 by Chu Yanshuo <yanshuoc(a)gmail.com>
+%% Copyright (C) 2017-2020 by Chu Yanshuo <yanshuoc(a)gmail.com>
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hithesis/hithesis.cfg new/tex/latex/hithesis/hithesis.cfg
--- old/tex/latex/hithesis/hithesis.cfg 2019-02-19 23:19:26.000000000 +0100
+++ new/tex/latex/hithesis/hithesis.cfg 2020-01-10 22:41:08.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2017-2019 by Chu Yanshuo <yanshuoc(a)gmail.com>
+%% Copyright (C) 2017-2020 by Chu Yanshuo <yanshuoc(a)gmail.com>
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3a
@@ -23,7 +23,7 @@
%% This is the configuration file of the hithesis package with LaTeX2e.
%%
\ProvidesFile{hithesis.cfg}
-[2018/12/05 2.0.6 Harbin Institute of Technology Thesis Template]
+[2019/06/27 2.0.11 Harbin Institute of Technology Thesis Template]
\theorembodyfont{\normalfont}
\theoremheaderfont{\normalfont\heiti}
\theoremsymbol{\ensuremath{\square}}
@@ -171,7 +171,7 @@
本人郑重声明:此处所提交的学位论文《\hit@ctitle》,是本人在导师指导下,在哈尔滨工业大学攻读学位期间独立进行研究工作所取得的成果,且学位论文中除已标注引用文献的部分外不包含他人完成或已发表的研究成果。对本学位论文的研究工作做出重要贡献的个人和集体,均已在文中以明确方式注明。}
\newcommand{\hit(a)datefill}{\hspace{2.xn--5em}\hspace{1-648y.xn--5em}\hspace{1-l831a.xn--5em}}-5e1k
\newcommand{\hit@publication@ctitle}{攻读\hit@cxuewei 学位期间发表的论文及其他成果}
-\newcommand{\hit@publication@etitle}{Papers published in the period of PH.D. education}
+\newcommand{\hit@publication@etitle}{Papers published in the period of Ph.D. education}
\def\hit@index@etitle{Index}
\def\hit@hi{嗨!thesis}
\def\hit@cbraceleft{(}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hithesis/hithesis.cls new/tex/latex/hithesis/hithesis.cls
--- old/tex/latex/hithesis/hithesis.cls 2019-02-19 23:19:26.000000000 +0100
+++ new/tex/latex/hithesis/hithesis.cls 2020-01-10 22:41:08.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2017-2019 by Chu Yanshuo <yanshuoc(a)gmail.com>
+%% Copyright (C) 2017-2020 by Chu Yanshuo <yanshuoc(a)gmail.com>
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3a
@@ -25,7 +25,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{hithesis}
-[2018/12/05 2.0.6 Harbin Institute of Technology Thesis Template]
+[2019/06/27 2.0.11 Harbin Institute of Technology Thesis Template]
\RequirePackage{ifthen}
\RequirePackage{kvoptions}
\SetupKeyvalOptions{
@@ -58,6 +58,7 @@
\DeclareBoolOption[false]{subtitle}
\DeclareBoolOption[false]{debug}
\DeclareBoolOption[false]{openright}
+\DeclareBoolOption[false]{library}
\DeclareBoolOption[false]{capcenterlast}
\DeclareBoolOption[false]{subcapcenterlast}
\DeclareBoolOption[false]{absupper}
@@ -211,6 +212,7 @@
\newindex[]{china}
\newindex[]{english}
\RequirePackage{xltxtra}
+\ifhit@library\hit@openrightfalse\else\relax\fi
\let\hit@cleardoublepage\cleardoublepage
\newcommand{\hit@clearemptydoublepage}{%
\clearpage{\pagestyle{hit@empty}\hit@cleardoublepage}
@@ -222,18 +224,20 @@
\pagenumbering{Roman}
\pagestyle{hit@empty}
}
-
\renewcommand\mainmatter{%
\ifhit@tocblank%
\addtocontents{toc}{\vspace{\baselineskip}} %规范中并没有这一要求,此处不应该加
\addtocontents{toe}{\vspace{\baselineskip}}
\fi%
- \ifhit@openright\cleardoublepage\else\clearpage\fi
+ \ifhit@doctor%
+ \ifhit@library\clearpage\else\cleardoublepage\fi
+ \else%
+ \clearpage
+ \fi%
\@mainmattertrue
\pagenumbering{arabic}
\pagestyle{hit@headings}
}
-
\renewcommand\backmatter{%
\ifhit@openright\cleardoublepage\else\clearpage\fi
\@mainmattertrue}
@@ -246,6 +250,7 @@
\def\hit@def@fontsize#1#2{%
\expandafter\newcommand\csname #1\endcsname[1][1.3]{%
\fontsize{#2}{##1\dimexpr #2}\selectfont}}
+\hit@def@fontsize{dachu}{58bp}
\hit@def@fontsize{chuhao}{42bp}
\hit@def@fontsize{xiaochu}{36bp}
\hit@def@fontsize{yihao}{26bp}
@@ -356,7 +361,7 @@
\renewcommand{\eqref}[1]{\textup{(\ref{#1})}}
\setlength{\intextsep}{\ifhit@glue 8.50398bp \@plus 2.83465bp \@minus 0bp\else 8.50398bp\fi}
\setlength{\textfloatsep}{\ifhit@glue 8.50398bp \@plus 2.83465bp \@minus 0bp\else 8.50398bp\fi}
-\setlength{\floatsep}{\ifhit@glue 20.50398bp \@plus 2.83465bp \@minus 0bp\else 20.50398bp\fi}
+\setlength{\floatsep}{\ifhit@glue 12bp \@plus 2.83465bp \@minus 0bp\else 12bp\fi}
\g@addto@macro\appendix{\renewcommand*{\thefigure}{\thechapter-\arabic{figure}}}
\g@addto@macro\appendix{\renewcommand*{\thetable}{\thechapter-\arabic{table}}}
\g@addto@macro\appendix{\renewcommand*{\theequation}{\thechapter-\arabic{equation}}}
@@ -834,16 +839,16 @@
\xiaosi[1]%
\begin{titlepage}
\hit@first@titlepage
- \cleardoublepage
+ \ifhit@library\clearpage\else\cleardoublepage\fi
\hit@second@titlepage
- \cleardoublepage
+ \ifhit@library\clearpage\else\cleardoublepage\fi
\ifhit@bachelor
\relax
\else
\phantomsection
\pdfbookmark[0]{\hit@etitle}{etitle}
\hit@engcover
- \cleardoublepage
+ \ifhit@library\clearpage\else\cleardoublepage\fi
\fi
\end{titlepage}
\normalsize
@@ -924,7 +929,7 @@
\advance\leftskip\@tempdima
\hskip -\leftskip
% numberline is called here, and it uses \@tempdima
- {\ifhit@bachelor\sffamily\else\csname hit@toc@font\endcsname\fi\heiti #1}
+ {\ifhit@bachelor\rmfamily\else\csname hit@toc@font\endcsname\fi\heiti #1}
\leaders\hbox{$\m@th\mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill
\nobreak{\normalfont\normalcolor #2}\par
\penalty\@highpenalty
@@ -1068,6 +1073,7 @@
\let\p@enumiv\@empty
\renewcommand\theenumiv{\@arabic\c@enumiv}}%
\sloppy\frenchspacing
+ \flushbottom
\ifhit@splitbibitem
\clubpenalty0
\@clubpenalty \clubpenalty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/hithesis/hithesis.sty new/tex/latex/hithesis/hithesis.sty
--- old/tex/latex/hithesis/hithesis.sty 2019-02-19 23:19:26.000000000 +0100
+++ new/tex/latex/hithesis/hithesis.sty 2020-01-10 22:41:08.000000000 +0100
@@ -3,17 +3,12 @@
% 此文件声明不在规范中要求的格式所使用的宏包。
% (所以,格式基本上是自由发挥的。)
-
-\setCJKfamilyfont{siyuan}[]{SourceHanSerifCN-Regular}
-\newcommand{\highlight}[1]{{\CJKfamily{siyuan}\textbf{#1}}}
-
-
-
% 根据窝工规范中对数字书写规范的规定(6):
% 凡4位或4位以上的数都从个位起每3位数空半个数码(1/4汉字)。
% 注意此处,除此任何空格都是错误的(包括\:\;\ 等)
\RequirePackage{siunitx}
\sisetup{group-minimum-digits=4, group-separator= \hspace{0.25em}}
+\sisetup{detect-weight,detect-mode,detect-family}
% 处理数学公式中的黑斜体的宏包
\RequirePackage{bm}
@@ -38,17 +33,21 @@
% 算法的宏包,注意宏包兼容性,先后顺序为float、hyperref、algorithm(2e),否则无法
% 生成算法列表。我工算法混乱问题详见hithesis文档。各个实验室设置具体方法详见
% hithesis文档或者示例中给出的地址。
-\RequirePackage[boxed,linesnumbered,algochapter]{algorithm2e}
+\RequirePackage[algoruled,linesnumbered,algochapter]{algorithm2e}
+\SetAlCapSty{}
+\newcommand{\foocaption}[1]{ \def\@algocf@pre@plainruled{\hrule height1.5pt depth0pt\kern\interspacetitleruled #1 \kern\interspacealgoruled\hrule height1pt depth0pt\kern\interspacetitleruled} }
+\def\@algocf@post@ruled{\kern\interspacealgoruled\hrule height1.5pt\relax}%
+
\newcommand{\algoenname}{Algo.} %算法英文标题
\newfloatlist[chapter]{algoen}{aen}{\listalgoenname}{\algoenname}
\newfixedcaption{\algoencaption}{algoen}
\renewcommand{\thealgoen}{\thechapter-\arabic{algocf}}
-\renewcommand{\@cftmakeaentitle}{\chapter*{\listalgoenname\@mkboth{\bfseries\listalgoenname}{\bfseries\listalgoenname}}
+\renewcommand{\@cftmakeaentitle}{\chapter*{\listalgoenname\@mkboth{\listalgoenname}{\listalgoenname}}
}
\renewcommand{\algorithmcfname}{算法}
\setlength\AlCapSkip{1.2ex}
\SetAlgoSkip{1pt}
-\renewcommand{\algocf@captiontext}[2]{\wuhao#1\algocf@typo ~ \AlCapFnt{}#2} % text of caption
+\renewcommand{\algocf@captiontext}[2]{\wuhao#1\algocf@typo~\AlCapFnt{}#2} % text of caption
\expandafter\ifx\csname algocf@within\endcsname\relax% if \algocf@within doesn't exist
\renewcommand\thealgocf{\@arabic\c@algocf} % and the way it is printed
\else% else
@@ -62,7 +61,7 @@
\addtolength{\hsize}{-\algomargin}%
}
\newcommand{\AlgoBiCaption}[2]{%直接取出自定义的中英文标题条目加入到真正的\caption 中
- \caption[#1]{\protect\setlength{\baselineskip}{1.5em}#1 \protect \\ Algo. \thealgocf~~ #2} % \algoencaption{#2}
+ \caption[#1]{\protect\setlength{\baselineskip}{1.5em}#1 \protect \\ Algo.\thealgocf~#2} % \algoencaption{#2}
\addcontentsline{aen}{algoen}{\protect\numberline{\thealgoen}{#2}}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/hithesis.tlpobj new/tlpkg/tlpobj/hithesis.tlpobj
--- old/tlpkg/tlpobj/hithesis.tlpobj 2019-02-28 03:41:49.000000000 +0100
+++ new/tlpkg/tlpobj/hithesis.tlpobj 2020-01-11 01:55:18.000000000 +0100
@@ -1,10 +1,10 @@
name hithesis
category Package
-revision 50062
+revision 53362
shortdesc Harbin Institute of Technology Thesis Template
relocated 1
longdesc hithesis is a LaTeX thesis template package for Harbin
-longdesc Institute of Technolog supporting bachelor, master, doctor
+longdesc Institute of Technology supporting bachelor, master, doctor
longdesc dissertations.
runfiles size=53
RELOC/bibtex/bst/hithesis/hithesis.bst
@@ -20,7 +20,6 @@
catalogue-contact-repository https://github.com/dustincys
catalogue-contact-support https://github.com/dustincys/hithesis/issues
catalogue-ctan /macros/latex/contrib/hithesis
-catalogue-date 2019-02-19 14:16:02 +0100
catalogue-license lppl1.3a
-catalogue-topics dissertation
-catalogue-version 2.0.6
+catalogue-topics dissertation class chinese
+catalogue-version 2.0.11
1
0
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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Wed May 6 11:27:35 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Scan *.def files as well for RequirePackage
+
+-------------------------------------------------------------------
+Tue May 5 13:55:07 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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(a)cl.cam.ac.uk}}}
-\date{2003-08-13, version 1.0}
+ \emph{robin.fairbairns(a)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(a)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(a)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(a)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(a)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(a)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 <left_glyph> <right_glyph> <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 <marcpenninga(a)gmail.com>
.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(a)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 <marcpenninga(a)gmail.com>
.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 <marcpenninga(a)gmail.com>
+
+
+=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<GPLv2.txt>.
+
+
+=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(a)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<</W \Fld@borderwidth\space /S /\Fld@borderstyle>>%
- \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<</W \Fld@borderwidth\space /S /\Fld@borderstyle>>%
+ \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(a)acrotex.net %%
-%% storyd(a)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(a)acrotex.net %%
-%% storyd(a)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(a)wanadoo.fr
+Fourier-GUTenberg distribution, Michel Bovani michel.bovani(a)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(a)wanadoo.fr}}
+\author{Michel Bovani\\\texttt{michel.bovani(a)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(a)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(a)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(a)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 " <puts8x.pfb
futrc8r Utopia-RegularSC "TeXBase1Encoding ReEncodeFont " <8r.enc <putrc8a.pfb
futsc8r Utopia-SemiboldSC "TeXBase1Encoding ReEncodeFont " <8r.enc <putsc8a.pfb
+futrco8r Utopia-RegularSC " .167 SlantFont TeXBase1Encoding ReEncodeFont " <8r.enc <putrc8a.pfb
+futsco8r Utopia-SemiboldSC " .167 SlantFont TeXBase1Encoding ReEncodeFont " <8r.enc <putsc8a.pfb
futrd8r Utopia-Titling "TeXBase1Encoding ReEncodeFont " <8r.enc <putrd8a.pfb
futc8r Utopia-Black "TeXBase1Encoding ReEncodeFont " <8r.enc <putc8a.pfb
futc8x UtopiaExp-Black <putc8x.pfb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/fourier/fourier.map new/fonts/map/dvips/fourier/fourier.map
--- old/fonts/map/dvips/fourier/fourier.map 2006-01-10 00:35:02.000000000 +0100
+++ new/fonts/map/dvips/fourier/fourier.map 2019-12-01 22:47:27.000000000 +0100
@@ -1,6 +1,7 @@
%% Here is Fourier-GUtenberg (math complement for Utopia)
%%
-
+fourier-ligs-it fourier-ligs-it <fourier-ligs-it.pfb
+fourier-ligs fourier-ligs <fourier-ligs.pfb
fourier-orns fourier-orns <fourier-orns.pfb
fourier-alt Fourier-Alternate-Roman <fourier-alt.pfb
fourier-alt-semi Fourier-Alternate-SemiBold <fourier-alt-semi.pfb
Binary files old/fonts/opentype/public/fourier/FourierOrns-Bold.otf and new/fonts/opentype/public/fourier/FourierOrns-Bold.otf differ
Binary files old/fonts/opentype/public/fourier/FourierOrns-BoldItalic.otf and new/fonts/opentype/public/fourier/FourierOrns-BoldItalic.otf differ
Binary files old/fonts/opentype/public/fourier/FourierOrns-Italic.otf and new/fonts/opentype/public/fourier/FourierOrns-Italic.otf differ
Binary files old/fonts/opentype/public/fourier/FourierOrns-Regular.otf and new/fonts/opentype/public/fourier/FourierOrns-Regular.otf differ
Binary files old/fonts/tfm/public/fourier/fourier-bb.tfm and new/fonts/tfm/public/fourier/fourier-bb.tfm differ
Binary files old/fonts/tfm/public/fourier/fourier-ligs-it.tfm and new/fonts/tfm/public/fourier/fourier-ligs-it.tfm differ
Binary files old/fonts/tfm/public/fourier/fourier-ligs.tfm and new/fonts/tfm/public/fourier/fourier-ligs.tfm differ
Binary files old/fonts/tfm/public/fourier/fourier-mex.tfm and new/fonts/tfm/public/fourier/fourier-mex.tfm differ
Binary files old/fonts/tfm/public/fourier/fourier-orns.tfm and new/fonts/tfm/public/fourier/fourier-orns.tfm differ
Binary files old/fonts/tfm/public/fourier/fut-oldlatin-it.tfm and new/fonts/tfm/public/fourier/fut-oldlatin-it.tfm differ
Binary files old/fonts/tfm/public/fourier/fut-oldlatin.tfm and new/fonts/tfm/public/fourier/fut-oldlatin.tfm differ
Binary files old/fonts/tfm/public/fourier/futb-sup.tfm and new/fonts/tfm/public/fourier/futb-sup.tfm differ
Binary files old/fonts/tfm/public/fourier/futb8c.tfm and new/fonts/tfm/public/fourier/futb8c.tfm differ
Binary files old/fonts/tfm/public/fourier/futb9c.tfm and new/fonts/tfm/public/fourier/futb9c.tfm differ
Binary files old/fonts/tfm/public/fourier/futbi-sup.tfm and new/fonts/tfm/public/fourier/futbi-sup.tfm differ
Binary files old/fonts/tfm/public/fourier/futbi8c.tfm and new/fonts/tfm/public/fourier/futbi8c.tfm differ
Binary files old/fonts/tfm/public/fourier/futbi9c.tfm and new/fonts/tfm/public/fourier/futbi9c.tfm differ
Binary files old/fonts/tfm/public/fourier/futbo8c.tfm and new/fonts/tfm/public/fourier/futbo8c.tfm differ
Binary files old/fonts/tfm/public/fourier/futbo9c.tfm and new/fonts/tfm/public/fourier/futbo9c.tfm differ
Binary files old/fonts/tfm/public/fourier/futboorn.tfm and new/fonts/tfm/public/fourier/futboorn.tfm differ
Binary files old/fonts/tfm/public/fourier/futborn.tfm and new/fonts/tfm/public/fourier/futborn.tfm differ
Binary files old/fonts/tfm/public/fourier/futc-sup.tfm and new/fonts/tfm/public/fourier/futc-sup.tfm differ
Binary files old/fonts/tfm/public/fourier/futc9c.tfm and new/fonts/tfm/public/fourier/futc9c.tfm differ
Binary files old/fonts/tfm/public/fourier/futcorn.tfm and new/fonts/tfm/public/fourier/futcorn.tfm differ
Binary files old/fonts/tfm/public/fourier/futr-sup.tfm and new/fonts/tfm/public/fourier/futr-sup.tfm differ
Binary files old/fonts/tfm/public/fourier/futr8c.tfm and new/fonts/tfm/public/fourier/futr8c.tfm differ
Binary files old/fonts/tfm/public/fourier/futr9c.tfm and new/fonts/tfm/public/fourier/futr9c.tfm differ
Binary files old/fonts/tfm/public/fourier/futrci9d.tfm and new/fonts/tfm/public/fourier/futrci9d.tfm differ
Binary files old/fonts/tfm/public/fourier/futrci9e.tfm and new/fonts/tfm/public/fourier/futrci9e.tfm differ
Binary files old/fonts/tfm/public/fourier/futrco8r.tfm and new/fonts/tfm/public/fourier/futrco8r.tfm differ
Binary files old/fonts/tfm/public/fourier/futrco9d.tfm and new/fonts/tfm/public/fourier/futrco9d.tfm differ
Binary files old/fonts/tfm/public/fourier/futri-sup.tfm and new/fonts/tfm/public/fourier/futri-sup.tfm differ
Binary files old/fonts/tfm/public/fourier/futri8c.tfm and new/fonts/tfm/public/fourier/futri8c.tfm differ
Binary files old/fonts/tfm/public/fourier/futri9c.tfm and new/fonts/tfm/public/fourier/futri9c.tfm differ
Binary files old/fonts/tfm/public/fourier/futro8c.tfm and new/fonts/tfm/public/fourier/futro8c.tfm differ
Binary files old/fonts/tfm/public/fourier/futro9c.tfm and new/fonts/tfm/public/fourier/futro9c.tfm differ
Binary files old/fonts/tfm/public/fourier/futroorn.tfm and new/fonts/tfm/public/fourier/futroorn.tfm differ
Binary files old/fonts/tfm/public/fourier/futrorn.tfm and new/fonts/tfm/public/fourier/futrorn.tfm differ
Binary files old/fonts/tfm/public/fourier/futs-sup.tfm and new/fonts/tfm/public/fourier/futs-sup.tfm differ
Binary files old/fonts/tfm/public/fourier/futs9c.tfm and new/fonts/tfm/public/fourier/futs9c.tfm differ
Binary files old/fonts/tfm/public/fourier/futsci9d.tfm and new/fonts/tfm/public/fourier/futsci9d.tfm differ
Binary files old/fonts/tfm/public/fourier/futsci9e.tfm and new/fonts/tfm/public/fourier/futsci9e.tfm differ
Binary files old/fonts/tfm/public/fourier/futsco8r.tfm and new/fonts/tfm/public/fourier/futsco8r.tfm differ
Binary files old/fonts/tfm/public/fourier/futsi-sup.tfm and new/fonts/tfm/public/fourier/futsi-sup.tfm differ
Binary files old/fonts/tfm/public/fourier/futsi9c.tfm and new/fonts/tfm/public/fourier/futsi9c.tfm differ
Binary files old/fonts/tfm/public/fourier/futso9c.tfm and new/fonts/tfm/public/fourier/futso9c.tfm differ
Binary files old/fonts/tfm/public/fourier/futsoorn.tfm and new/fonts/tfm/public/fourier/futsoorn.tfm differ
Binary files old/fonts/tfm/public/fourier/futsorn.tfm and new/fonts/tfm/public/fourier/futsorn.tfm differ
Binary files old/fonts/tfm/public/fourier/putb8a.tfm and new/fonts/tfm/public/fourier/putb8a.tfm differ
Binary files old/fonts/tfm/public/fourier/putb8x.tfm and new/fonts/tfm/public/fourier/putb8x.tfm differ
Binary files old/fonts/tfm/public/fourier/putbi8a.tfm and new/fonts/tfm/public/fourier/putbi8a.tfm differ
Binary files old/fonts/tfm/public/fourier/putbi8x.tfm and new/fonts/tfm/public/fourier/putbi8x.tfm differ
Binary files old/fonts/tfm/public/fourier/putbo8x.tfm and new/fonts/tfm/public/fourier/putbo8x.tfm differ
Binary files old/fonts/tfm/public/fourier/putc8a.tfm and new/fonts/tfm/public/fourier/putc8a.tfm differ
Binary files old/fonts/tfm/public/fourier/putc8x.tfm and new/fonts/tfm/public/fourier/putc8x.tfm differ
Binary files old/fonts/tfm/public/fourier/putr8a.tfm and new/fonts/tfm/public/fourier/putr8a.tfm differ
Binary files old/fonts/tfm/public/fourier/putr8x.tfm and new/fonts/tfm/public/fourier/putr8x.tfm differ
Binary files old/fonts/tfm/public/fourier/putrc8a.tfm and new/fonts/tfm/public/fourier/putrc8a.tfm differ
Binary files old/fonts/tfm/public/fourier/putrd8a.tfm and new/fonts/tfm/public/fourier/putrd8a.tfm differ
Binary files old/fonts/tfm/public/fourier/putri8a.tfm and new/fonts/tfm/public/fourier/putri8a.tfm differ
Binary files old/fonts/tfm/public/fourier/putri8x.tfm and new/fonts/tfm/public/fourier/putri8x.tfm differ
Binary files old/fonts/tfm/public/fourier/putro8x.tfm and new/fonts/tfm/public/fourier/putro8x.tfm differ
Binary files old/fonts/tfm/public/fourier/puts8a.tfm and new/fonts/tfm/public/fourier/puts8a.tfm differ
Binary files old/fonts/tfm/public/fourier/puts8x.tfm and new/fonts/tfm/public/fourier/puts8x.tfm differ
Binary files old/fonts/tfm/public/fourier/putsc8a.tfm and new/fonts/tfm/public/fourier/putsc8a.tfm differ
Binary files old/fonts/tfm/public/fourier/putsi8a.tfm and new/fonts/tfm/public/fourier/putsi8a.tfm differ
Binary files old/fonts/tfm/public/fourier/putsi8x.tfm and new/fonts/tfm/public/fourier/putsi8x.tfm differ
Binary files old/fonts/tfm/public/fourier/putso8x.tfm and new/fonts/tfm/public/fourier/putso8x.tfm differ
Binary files old/fonts/type1/public/fourier/fourier-mex.pfb and new/fonts/type1/public/fourier/fourier-mex.pfb differ
Binary files old/fonts/type1/public/fourier/fourier-ms.pfb and new/fonts/type1/public/fourier/fourier-ms.pfb differ
Binary files old/fonts/type1/public/fourier/fourier-orns.pfb and new/fonts/type1/public/fourier/fourier-orns.pfb differ
Binary files old/fonts/vf/public/fourier/futb-sup.vf and new/fonts/vf/public/fourier/futb-sup.vf differ
Binary files old/fonts/vf/public/fourier/futb8c.vf and new/fonts/vf/public/fourier/futb8c.vf differ
Binary files old/fonts/vf/public/fourier/futb9c.vf and new/fonts/vf/public/fourier/futb9c.vf differ
Binary files old/fonts/vf/public/fourier/futbi-sup.vf and new/fonts/vf/public/fourier/futbi-sup.vf differ
Binary files old/fonts/vf/public/fourier/futbi8c.vf and new/fonts/vf/public/fourier/futbi8c.vf differ
Binary files old/fonts/vf/public/fourier/futbi9c.vf and new/fonts/vf/public/fourier/futbi9c.vf differ
Binary files old/fonts/vf/public/fourier/futbo8c.vf and new/fonts/vf/public/fourier/futbo8c.vf differ
Binary files old/fonts/vf/public/fourier/futbo9c.vf and new/fonts/vf/public/fourier/futbo9c.vf differ
Binary files old/fonts/vf/public/fourier/futboorn.vf and new/fonts/vf/public/fourier/futboorn.vf differ
Binary files old/fonts/vf/public/fourier/futborn.vf and new/fonts/vf/public/fourier/futborn.vf differ
Binary files old/fonts/vf/public/fourier/futc-sup.vf and new/fonts/vf/public/fourier/futc-sup.vf differ
Binary files old/fonts/vf/public/fourier/futc9c.vf and new/fonts/vf/public/fourier/futc9c.vf differ
Binary files old/fonts/vf/public/fourier/futcorn.vf and new/fonts/vf/public/fourier/futcorn.vf differ
Binary files old/fonts/vf/public/fourier/futr-sup.vf and new/fonts/vf/public/fourier/futr-sup.vf differ
Binary files old/fonts/vf/public/fourier/futr8c.vf and new/fonts/vf/public/fourier/futr8c.vf differ
Binary files old/fonts/vf/public/fourier/futr9c.vf and new/fonts/vf/public/fourier/futr9c.vf differ
Binary files old/fonts/vf/public/fourier/futrci9d.vf and new/fonts/vf/public/fourier/futrci9d.vf differ
Binary files old/fonts/vf/public/fourier/futrci9e.vf and new/fonts/vf/public/fourier/futrci9e.vf differ
Binary files old/fonts/vf/public/fourier/futrco9d.vf and new/fonts/vf/public/fourier/futrco9d.vf differ
Binary files old/fonts/vf/public/fourier/futri-sup.vf and new/fonts/vf/public/fourier/futri-sup.vf differ
Binary files old/fonts/vf/public/fourier/futri8c.vf and new/fonts/vf/public/fourier/futri8c.vf differ
Binary files old/fonts/vf/public/fourier/futri9c.vf and new/fonts/vf/public/fourier/futri9c.vf differ
Binary files old/fonts/vf/public/fourier/futro8c.vf and new/fonts/vf/public/fourier/futro8c.vf differ
Binary files old/fonts/vf/public/fourier/futro9c.vf and new/fonts/vf/public/fourier/futro9c.vf differ
Binary files old/fonts/vf/public/fourier/futroorn.vf and new/fonts/vf/public/fourier/futroorn.vf differ
Binary files old/fonts/vf/public/fourier/futrorn.vf and new/fonts/vf/public/fourier/futrorn.vf differ
Binary files old/fonts/vf/public/fourier/futs-sup.vf and new/fonts/vf/public/fourier/futs-sup.vf differ
Binary files old/fonts/vf/public/fourier/futs9c.vf and new/fonts/vf/public/fourier/futs9c.vf differ
Binary files old/fonts/vf/public/fourier/futsci9d.vf and new/fonts/vf/public/fourier/futsci9d.vf differ
Binary files old/fonts/vf/public/fourier/futsci9e.vf and new/fonts/vf/public/fourier/futsci9e.vf differ
Binary files old/fonts/vf/public/fourier/futsco9d.vf and new/fonts/vf/public/fourier/futsco9d.vf differ
Binary files old/fonts/vf/public/fourier/futsi-sup.vf and new/fonts/vf/public/fourier/futsi-sup.vf differ
Binary files old/fonts/vf/public/fourier/futsi9c.vf and new/fonts/vf/public/fourier/futsi9c.vf differ
Binary files old/fonts/vf/public/fourier/futso9c.vf and new/fonts/vf/public/fourier/futso9c.vf differ
Binary files old/fonts/vf/public/fourier/futsoorn.vf and new/fonts/vf/public/fourier/futsoorn.vf differ
Binary files old/fonts/vf/public/fourier/futsorn.vf and new/fonts/vf/public/fourier/futsorn.vf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fourier/fmxfutm.fd new/tex/latex/fourier/fmxfutm.fd
--- old/tex/latex/fourier/fmxfutm.fd 2006-01-13 00:56:08.000000000 +0100
+++ new/tex/latex/fourier/fmxfutm.fd 2020-03-05 01:50:34.000000000 +0100
@@ -12,4 +12,4 @@
-\endinput
+\endinput
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fourier/fourier-orns.sty new/tex/latex/fourier/fourier-orns.sty
--- old/tex/latex/fourier/fourier-orns.sty 2006-01-13 00:56:08.000000000 +0100
+++ new/tex/latex/fourier/fourier-orns.sty 2020-03-05 01:50:34.000000000 +0100
@@ -1,40 +1,106 @@
-\def\fileversion{1.1}%
-\def\filedate{2004/01/30}%
-\NeedsTeXFormat{LaTeX2e}%
+\NeedsTeXFormat{LaTeX2e}
+\def\fileversion{2.2}
+\def\filedate{2020/03/03}
\ProvidesPackage{fourier-orns}%
-[\filedate\space\fileversion\space fourier-ornaments package]%
+ [\filedate\space\fileversion\space fourier-ornaments package]
-\newcommand*{\TakeFourierOrnament}[1]{{%
-\fontencoding{U}\fontfamily{futs}\selectfont\char#1}}
-\newcommand*{\eurologo}{\TakeFourierOrnament{69}}
-\newcommand*{\noway}{\TakeFourierOrnament{65}}
-\newcommand*{\danger}{\TakeFourierOrnament{66}}
-\newcommand*{\bomb}{\TakeFourierOrnament{76}}
-\newcommand*{\grimace}{\TakeFourierOrnament{77}}
-\newcommand*{\textthing}{\TakeFourierOrnament{78}}
-\newcommand*{\textxswup}{\TakeFourierOrnament{84}}
-\newcommand*{\textxswdown}{\TakeFourierOrnament{85}}
-\newcommand*{\decoone}{\TakeFourierOrnament{88}}
-\newcommand*{\decothreeleft}{\TakeFourierOrnament{89}}
-\newcommand*{\decothreeright}{\TakeFourierOrnament{90}}
-\newcommand*{\decofourleft}{\TakeFourierOrnament{91}}
-\newcommand*{\decofourright}{\TakeFourierOrnament{92}}
-\newcommand*{\decosix}{\TakeFourierOrnament{93}}
-\newcommand*{\decotwo}{\TakeFourierOrnament{97}}
-\newcommand*{\floweroneleft}{\TakeFourierOrnament{98}}
-\newcommand*{\floweroneright}{\TakeFourierOrnament{99}}
-\newcommand*{\starredbullet}{\TakeFourierOrnament{100}}
-\newcommand*{\leafNE}{\TakeFourierOrnament{102}}
-\newcommand*{\leafleft}{\TakeFourierOrnament{103}}
-\newcommand*{\leafright}{\TakeFourierOrnament{104}}
-\newcommand*{\aldinesmall}{\TakeFourierOrnament{106}}
-\newcommand*{\aldineleft}{\TakeFourierOrnament{109}}
-\newcommand*{\aldineright}{\TakeFourierOrnament{110}}
-\newcommand*{\aldine}{\TakeFourierOrnament{111}}
-\newcommand*{\lefthand}{\TakeFourierOrnament{116}}
-\newcommand*{\righthand}{\TakeFourierOrnament{117}}
+\newif\ifFourier@noOTF
+\newif\ifFourier@TU
+\DeclareOption{noOTF}{\Fourier@noOTFtrue}
+\ProcessOptions
+\RequirePackage{iftex}[2019/10/24]
+\iftutex \Fourier@TUtrue \fi
+\ifFourier@noOTF \Fourier@TUfalse \fi
+\ifFourier@TU
+ \RequirePackage{fontspec}
+ \newfontfamily\FourierOrns{FourierOrns-Regular.otf}[
+ BoldFont = FourierOrns-Bold.otf ,
+ ItalicFont = FourierOrns-Italic.otf ,
+ BoldItalicFont = FourierOrns-BoldItalic.otf ]
+ \newcommand*{\TakeFourierOrnament}[1]{{\FourierOrns \char#1}}
+ \renewcommand*{\textpertenthousand}{\TakeFourierOrnament{37}}
+ \newcommand*{\eurologo}{\TakeFourierOrnament{101}}
+ \newcommand*{\noway}{\TakeFourierOrnament{48}}
+ \newcommand*{\warning}{\TakeFourierOrnament{49}}
+ \newcommand*{\caution}{\TakeFourierOrnament{50}}
+ \newcommand*{\oldpilcrowone}{\TakeFourierOrnament{51}}
+ \newcommand*{\oldpilcrowtwo}{\TakeFourierOrnament{52}}
+ \newcommand*{\oldpilcrowthree}{\TakeFourierOrnament{53}}
+ \newcommand*{\oldpilcrowfour}{\TakeFourierOrnament{54}}
+ \newcommand*{\oldpilcrowfive}{\TakeFourierOrnament{55}}
+ \newcommand*{\oldpilcrowsix}{\TakeFourierOrnament{56}}
+ \newcommand*{\bomb}{\TakeFourierOrnament{57}}
+ \newcommand*{\grimace}{\TakeFourierOrnament{89}}
+ \newcommand*{\textthing}{\TakeFourierOrnament{90}}
+ \newcommand*{\textxswup}{\TakeFourierOrnament{84}}
+ \newcommand*{\textxswdown}{\TakeFourierOrnament{83}}
+ \newcommand*{\decoone}{\TakeFourierOrnament{85}}
+ \newcommand*{\decothreeleft}{\TakeFourierOrnament{82}}
+ \newcommand*{\decothreeright}{\TakeFourierOrnament{81}}
+ \newcommand*{\decofourleft}{\TakeFourierOrnament{80}}
+ \newcommand*{\decofourright}{\TakeFourierOrnament{79}}
+ \newcommand*{\decosix}{\TakeFourierOrnament{86}}
+ \newcommand*{\decotwo}{\TakeFourierOrnament{87}}
+ \newcommand*{\floweroneleft}{\TakeFourierOrnament{69}}
+ \newcommand*{\floweroneright}{\TakeFourierOrnament{70}}
+ \newcommand*{\starredbullet}{\TakeFourierOrnament{88}}
+ \newcommand*{\leafNE}{\TakeFourierOrnament{71}}
+ \newcommand*{\leafSE}{\TakeFourierOrnament{73}}
+ \newcommand*{\leafNW}{\TakeFourierOrnament{72}}
+ \newcommand*{\leafSW}{\TakeFourierOrnament{74}}
+ \newcommand*{\leafleft}{\TakeFourierOrnament{76}}
+ \newcommand*{\leafright}{\TakeFourierOrnament{75}}
+ \newcommand*{\aldinesmall}{\TakeFourierOrnament{68}}
+ \newcommand*{\aldineleft}{\TakeFourierOrnament{65}}
+ \newcommand*{\aldineright}{\TakeFourierOrnament{66}}
+ \newcommand*{\aldine}{\TakeFourierOrnament{67}}
+ \newcommand*{\lefthand}{\TakeFourierOrnament{77}}
+ \newcommand*{\righthand}{\TakeFourierOrnament{78}}
+\else
+ \newcommand*{\TakeFourierOrnament}[1]{{%
+ \fontencoding{U}\fontfamily{futs}\selectfont\char#1}}
+ \newcommand*{\eurologo}{\TakeFourierOrnament{69}}
+ \newcommand*{\noway}{\TakeFourierOrnament{65}}
+ \newcommand*{\warning}{\TakeFourierOrnament{66}}
+ \newcommand*{\bomb}{\TakeFourierOrnament{76}}
+ \newcommand*{\grimace}{\TakeFourierOrnament{77}}
+ \newcommand*{\textthing}{\TakeFourierOrnament{78}}
+ \newcommand*{\oldpilcrowone}{\TakeFourierOrnament{79}}
+ \newcommand*{\oldpilcrowtwo}{\TakeFourierOrnament{80}}
+ \newcommand*{\oldpilcrowthree}{\TakeFourierOrnament{81}}
+ \newcommand*{\oldpilcrowfour}{\TakeFourierOrnament{82}}
+ \newcommand*{\oldpilcrowfive}{\TakeFourierOrnament{83}}
+ \newcommand*{\oldpilcrowsix}{\TakeFourierOrnament{84}}
+ \newcommand*{\textxswup}{\TakeFourierOrnament{85}}
+ \newcommand*{\textxswdown}{\TakeFourierOrnament{86}}
+ \newcommand*{\decoone}{\TakeFourierOrnament{88}}
+ \newcommand*{\decothreeleft}{\TakeFourierOrnament{89}}
+ \newcommand*{\decothreeright}{\TakeFourierOrnament{90}}
+ \newcommand*{\decofourleft}{\TakeFourierOrnament{91}}
+ \newcommand*{\decofourright}{\TakeFourierOrnament{92}}
+ \newcommand*{\decosix}{\TakeFourierOrnament{93}}
+ \newcommand*{\decotwo}{\TakeFourierOrnament{97}}
+ \newcommand*{\floweroneleft}{\TakeFourierOrnament{98}}
+ \newcommand*{\floweroneright}{\TakeFourierOrnament{99}}
+ \newcommand*{\starredbullet}{\TakeFourierOrnament{100}}
+ \newcommand*{\leafNE}{\TakeFourierOrnament{102}}
+ \newcommand*{\leafNW}{\TakeFourierOrnament{103}}
+ \newcommand*{\leafSE}{\TakeFourierOrnament{104}}
+ \newcommand*{\leafSW}{\TakeFourierOrnament{105}}
+ \newcommand*{\leafleft}{\TakeFourierOrnament{106}}
+ \newcommand*{\leafright}{\TakeFourierOrnament{107}}
+ \newcommand*{\aldinesmall}{\TakeFourierOrnament{108}}
+ \newcommand*{\aldineleft}{\TakeFourierOrnament{109}}
+ \newcommand*{\aldineright}{\TakeFourierOrnament{110}}
+ \newcommand*{\aldine}{\TakeFourierOrnament{111}}
+ \newcommand*{\lefthand}{\TakeFourierOrnament{116}}
+ \newcommand*{\righthand}{\TakeFourierOrnament{117}}
+\fi
+ \newcommand*{\danger}{\PackageWarning{fourier-orns}{%
+ Command \protect\danger\space is deprecated.\MessageBreak
+ Use \protect\warning\space instead; reported}%
+ \warning}
%
%
\endinput
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fourier/fourier.sty new/tex/latex/fourier/fourier.sty
--- old/tex/latex/fourier/fourier.sty 2006-01-13 00:56:08.000000000 +0100
+++ new/tex/latex/fourier/fourier.sty 2020-03-05 01:50:34.000000000 +0100
@@ -1,8 +1,16 @@
-\def\fileversion{1.4}%
-\def\filedate{2005/01/01}%
+\def\fileversion{2.2}%
+\def\filedate{2020/03/03}%
\NeedsTeXFormat{LaTeX2e}%
\ProvidesPackage{fourier}%
[\filedate\space\fileversion\space fourier-GUTenberg package]%
+\RequirePackage{iftex}[2019/10/24]
+\iftutex
+\PackageWarningNoLine{fourier}{%
+ Please consider loading "fourier-otf.sty" instead of\MessageBreak
+ "fourier.sty" with Unicode engines LuaTeX or XeTeX,\MessageBreak
+ so that Type1 fonts get replaced by OpenType fonts.\MessageBreak
+ See file "Erewhon-Math.pdf" for more information}
+\fi
\DeclareFontEncoding{FML}{}{}
\DeclareFontSubstitution{FML}{futm}{m}{it}
\DeclareFontEncoding{FMS}{}{}
@@ -37,16 +45,21 @@
\newcommand*{\sbseries}{\fontseries{sb}\selectfont}
\newcommand*{\blackseries}{\fontseries{eb}\selectfont}
\newcommand*{\titleshape}{\fontshape{tt}\selectfont}
+\newcommand*{\scishape}{\fontshape{sci}\selectfont}
\DeclareTextFontCommand{\textsb}{\sbseries}%
\DeclareTextFontCommand{\textblack}{\blackseries}%
\DeclareTextFontCommand{\texttitle}{\titleshape}%
+\DeclareTextFontCommand{\textsci}{\scishape}%
\newcommand*{\oldstyle}{\fontfamily{futj}\selectfont}
\newcommand*{\lining}{\fontfamily{futx}\selectfont}
+\newcommand{\superieures}[1]{{\fontfamily{fut-sup}\selectfont#1}}
\fi
\renewcommand{\rmdefault}{fut\textfamilyextension}
\RequirePackage[T1]{fontenc}
\RequirePackage{textcomp}
-\RequirePackage{fourier-orns}
+\RequirePackage[noOTF]{fourier-orns}
+\DeclareTextCommand{\textpertenthousand}{T1}
+ {\%\char 24\char 24 } % space or `relax as delimiter?
\DeclareSymbolFont{operators}{T1}{fut\mathfamilyextension}{m}{n}%
\SetSymbolFont{operators}{bold}{T1}{fut\mathfamilyextension}{b}{n}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fourier/t1fut-sup.fd new/tex/latex/fourier/t1fut-sup.fd
--- old/tex/latex/fourier/t1fut-sup.fd 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/fourier/t1fut-sup.fd 2019-12-01 22:47:27.000000000 +0100
@@ -0,0 +1,47 @@
+%Filename: t1fut-sup.fd
+%Created by: tex build-fourier
+%Created using fontinst v1.927
+
+%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
+
+\ProvidesFile{t1fut-sup.fd}
+ [2005/12/19 Fontinst v1.927 font definitions for T1/fut-sup.]
+
+\DeclareFontFamily{T1}{fut-sup}{}
+
+\DeclareFontShape{T1}{fut-sup}{m}{n}{
+ <-> 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(a)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 <prenom.nom(a)ac-toulouse.fr>
+%% Copyright (C) 2019 by Antoine Missier <antoine.missier(a)ac-toulouse.fr>
%%
%% 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(a)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(a)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(a)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{%
\(a)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 <latexgeometry(a)gmail.com>
-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 <latexgeometry(a)gmail.com>
+%% 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 <latexgeometry(a)gmail.com>
-%% 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 <latexgeometry(a)gmail.com>
-%% 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 <latexgeometry(a)gmail.com>
-%% 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(a)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(a)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(a)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(a)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(a)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(a)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 @@
% <or state all organs affected, if known>
\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 @@
% <or state all organs affected, if known>
\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 @@
% <or state all organs affected, if known>
\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 @@
% <or state all organs affected, if known>
\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 @@
% <or state all organs affected, if known>
\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 @@
% <or state all organs affected, if known>
\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
1
0
Hello community,
here is the log from the commit of package texlive-specs-i for openSUSE:Factory checked in at 2020-05-29 21:17:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-i (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-i.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-i"
Fri May 29 21:17:34 2020 rev:39 rq:806895 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-i/texlive-specs-i.changes 2019-11-07 23:10:34.368139453 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-i.new.3606/texlive-specs-i.changes 2020-05-29 21:26:25.140692539 +0200
@@ -1,0 +2,60 @@
+Mon May 18 08:47:10 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Wed May 6 11:27:35 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Scan *.def files as well for RequirePackage
+
+-------------------------------------------------------------------
+Tue May 5 13:55:07 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- Update to TeXLive 2020
+ * Port patches
+ kpathsea_cnf.dif
+ latexpand_perl.dif
+ luaotfload_varfonts.dif
+ luatex_cnf.dif
+ musixtex_various.dif
+ * Delete patches not needed anymore as files have moved
+ tetex_scripts.dif
+ * Delete patche updmap-map_roboto.dif as fixed upstream
+ * Add new patches to catch moved files
+ texlive-scripts-extra_scripts.dif
+ texlive-scripts_scripts.dif
+ * Add new patch xetex_conf.dif to fit FHS location
+ * Remove TeXLive installer files breaking rpm database
+ texlive-scripts.removes
+
+-------------------------------------------------------------------
New:
----
etbb.doc.tar.xz
etbb.tar.xz
etexcmds.doc.tar.xz
etexcmds.tar.xz
euclideangeometry.doc.tar.xz
euclideangeometry.tar.xz
expkv-cs.doc.tar.xz
expkv-cs.tar.xz
expkv-def.doc.tar.xz
expkv-def.tar.xz
expkv.doc.tar.xz
expkv.tar.xz
expose-expl3-dunkerque-2019.doc.tar.xz
fewerfloatpages.doc.tar.xz
fewerfloatpages.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-i.spec ++++++
++++ 13176 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-i/texlive-specs-i.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-i.new.3606/texlive-specs-i.spec
++++++ etoc.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/README.md new/doc/latex/etoc/README.md
--- old/doc/latex/etoc/README.md 2019-03-10 22:00:10.000000000 +0100
+++ new/doc/latex/etoc/README.md 2019-11-17 23:36:06.000000000 +0100
@@ -1,6 +1,6 @@
<!-- -->
- Source: etoc.dtx (v1.09-2019/03/09)
+ Source: etoc.dtx (v1.09b-2019/11/17)
Author: Jean-Francois Burnol
Author: Christine Roemer et al. (German tranlation)
Info: Completely customisable TOCs
@@ -48,22 +48,13 @@
INSTALLATION
============
-The simplest is to download
+To extract the package (.sty) and driver (.tex) files from etoc.dtx,
+execute `etex etoc.dtx`.
-> <http://mirrors.ctan.org/install/macros/latex/contrib/etoc.tds.zip>
-
-and then run `unzip etoc.tds.zip -d <DEST>` where `<DEST>` is a
-TDS-compliant repertory.
-
-Else, to extract the package (.sty) and driver (.tex) files from etoc.dtx:
-
-- if etoc.ins is present: etex etoc.ins
-- without etoc.ins: etex etoc.dtx
-
-It is also possible to run latex or pdflatex directly on etoc.dtx.
+It is also possible to execute latex or pdflatex directly on etoc.dtx.
To produce etoc.pdf one can run pdflatex (thrice) directly on etoc.dtx or on
-the file etoc.tex which was extracted from previous step.
+the file etoc.tex which was extracted from `etex etoc.dtx` step.
Options can be set in etoc.tex:
@@ -110,12 +101,21 @@
collaborators for the translation into German of the documentation.
This Work consists of the main source file etoc.dtx and the
-derived files etoc.sty, etoc.ins, etoc.tex, etoc-DE.tex,
+derived files etoc.sty, etoc.tex, etoc-DE.tex,
etoc.pdf, etoc-DE.pdf, etoc.dvi, etoc-DE.dvi.
RECENT CHANGES
==============
+v1.09a, v1.09b \[2019/11/17\]
+-----------------------------
+
+Sync with `memoir v3.7i` which has a better location of the TOC
+hyperref anchor. The `\etocaftertitlehook` can now freely be
+used also with memoir class (formerly its usage in case of
+memoir class was preempted by etoc itself). For more details
+refer to the section "Compatibility with the memoir class".
+
v1.09 \[2019/03/09\]
--------------------
Binary files old/doc/latex/etoc/etoc-DE.pdf and new/doc/latex/etoc/etoc-DE.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etoc-DE.tex new/doc/latex/etoc/etoc-DE.tex
--- old/doc/latex/etoc/etoc-DE.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etoc-DE.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,32 @@
+%%
+%% Package: etoc
+%% Version: 1.09b-2019/11/17
+%% License: LPPL 1.3c
+%% Copyright (C) 2012-2019 Jean-Francois Burnol
+%% <jfbu at free dot fr>
+%% Copyright (C) 2014-2019 Christine Roemer
+%% <Christine_Roemer at t-online dot de>
+%% and collaborators for the translation into German of the documentation
+%%
+%% run pdflatex thrice on this file etoc-DE.tex to produce the German
+%% documentation etoc-DE.pdf (without source code).
+%%
+%% Um etoc-DE.pdf zu erzeugen ist pdflatex dreimal mit etoc-DE.tex laufen
+%% zu lassen.
+%%
+\chardef\Withdvipdfmx 0 % replace 0 by 1 for using latex+dvipdfmx
+\chardef\NoSourceCode 1 % replace 1 by 0 for the doc *with* the source code
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile {etoc-DE.tex}[Driver for etoc German documentation]%
+%% or with german rather than ngerman in the two lines below
+\PassOptionsToClass {a4paper,fontsize=11pt,twoside,ngerman}{scrdoc}
+\PassOptionsToPackage {english,ngerman}{babel}
+\chardef\ForEnglish 0 % (\ForEnglish and \ForDeutsch flags can't be BOTH 1 ...)
+\chardef\ForDeutsch 1 %
+\input etoc.dtx
+%%% Local Variables:
+%%% mode: latex
+%%% End:
+\endinput
+%%
+%% End of file `etoc-DE.tex'.
Binary files old/doc/latex/etoc/etoc.pdf and new/doc/latex/etoc/etoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etoc.tex new/doc/latex/etoc/etoc.tex
--- old/doc/latex/etoc/etoc.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etoc.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,28 @@
+%%
+%% Package: etoc
+%% Version: 1.09b-2019/11/17
+%% License: LPPL 1.3c
+%% Copyright (C) 2012-2019 Jean-Francois Burnol
+%% <jfbu at free dot fr>
+%% Copyright (C) 2014-2019 Christine Roemer
+%% <Christine_Roemer at t-online dot de>
+%% and collaborators for the translation into German of the documentation
+%%
+%% run pdflatex thrice on this file etoc.tex to produce the documentation
+%% etoc.pdf, with source code included.
+%%
+\chardef\Withdvipdfmx 0 % replace 0 by 1 for using latex+dvipdfmx
+\chardef\NoSourceCode 0 % replace 0 by 1 for the doc *without* the source code
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesFile {etoc.tex}[Driver for etoc documentation]%
+\PassOptionsToClass {a4paper,fontsize=11pt,twoside}{scrdoc}
+\PassOptionsToPackage {ngerman,english}{babel}
+\chardef\ForEnglish 1 % (\ForEnglish and \ForDeutsch flags can't be BOTH 1 ...)
+\chardef\ForDeutsch 0 %
+\input etoc.dtx
+%%% Local Variables:
+%%% mode: latex
+%%% End:
+\endinput
+%%
+%% End of file `etoc.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-10.tex new/doc/latex/etoc/etocsnippet-10.tex
--- old/doc/latex/etoc/etocsnippet-10.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-10.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,16 @@
+%% LaTeX2e file `etocsnippet-10.tex'
+%% generated by the `filecontentsdef' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\begin{figure}[ht!]
+ \centering
+ \begingroup
+ \etocstandardlines
+ \renewcommand{\etocbkgcolorcmd}{\color{green!5}}
+ \renewcommand{\etocbelowtocskip}{0pt\relax}
+ \fboxsep1ex
+ \etocframedstyle [1]{\fbox{\makebox[.5\linewidth]{\etocfontminusone
+ \hyperref[toc:c]{I am from far away}}}}
+ \tableofcontents \label{toc:d} \ref{toc:c}
+ \endgroup
+\end{figure}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-20-A.tex new/doc/latex/etoc/etocsnippet-20-A.tex
--- old/doc/latex/etoc/etocsnippet-20-A.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-20-A.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,25 @@
+%% LaTeX2e file `etocsnippet-20-A.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\makeatletter
+\newcommand{\MyStandardTOC}{%
+ \begingroup
+ % for the book or article classes:
+ %\etocsetstyle{part}{}{}
+ % {\etocsavedparttocline{\etocnumber\hspace{1em}\etocname}{\etocpage}}{}%
+ % for the scrbook or scrartcl classes:
+ \etocsetstyle{part}{}{}
+ {\etocsavedparttocline{\numberline{\etocnumber}\etocname}{\etocpage}}{}%
+ % following is identical in book/article/scrbook/scrartcl classes:
+ \etocsetstyle{chapter}{}{} %%% only for book and scrbook
+ {\etocsavedchaptertocline{\numberline{\etocnumber}\etocname}{\etocpage}}{}%
+ \etocsetstyle{section}{}{}
+ {\etocsavedsectiontocline{\numberline{\etocnumber}\etocname}{\etocpage}}{}%
+ \etocsetstyle{subsection}{}{}
+ {\etocsavedsubsectiontocline{\numberline{\etocnumber}\etocname}{\etocpage}}{}%
+ % etc... if further sectioning units are used
+ \etocstandarddisplaystyle % this is for the title, page-marks, etc...
+ \tableofcontents
+ \endgroup}
+\makeatother
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-20-B.tex new/doc/latex/etoc/etocsnippet-20-B.tex
--- old/doc/latex/etoc/etocsnippet-20-B.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-20-B.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,26 @@
+%% LaTeX2e file `etocsnippet-20-B.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\etocsetstyle{section}{}
+ {\ifnum\etocthenumber=4
+ \etocsetstyle{subsection}
+ {\par\nopagebreak\begingroup
+ \leftskip1.5em \rightskip\@tocrmarg \parfillskip\@flushglue
+ \parindent 0pt \normalfont\normalsize\rmfamily\itshape
+ % \columnsep1em
+ % \begin{minipage}{\dimexpr\linewidth-\leftskip-\rightskip\relax}%
+ % \begin{multicols}{2}%
+ \etocskipfirstprefix}
+ {\allowbreak\,--\,}
+ {\etocname\ \textup{(\etocnumber)}}
+ {.\par\endgroup}%
+ % {.\par\end{multicols}\end{minipage}\par\endgroup}%
+ \else
+ \etocsetstyle{subsection}
+ {}{}
+ {\etocsavedsubsectiontocline{\numberline{\etocnumber}\etocname}{\etocpage}}
+ {}%
+ \fi}
+ {\etocsavedsectiontocline{\numberline{{\color{cyan}\etocthenumber}}\etocname}{\etocpage}}
+ {}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-21-A.tex new/doc/latex/etoc/etocsnippet-21-A.tex
--- old/doc/latex/etoc/etocsnippet-21-A.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-21-A.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,100 @@
+%% LaTeX2e file `etocsnippet-21-A.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+% it will be easy to globally shift the TOC horizontally if needed
+\def\TOCleftmargin {0pt}
+\def\TOCrightmargin {2.55em}% like LaTeX's \@tocrmarg
+
+% this is for dotted leaders
+\newbox\TOCleaderbox
+\def\TOCleaderboxwidth {0.7777em}% about like what standard classes do
+
+% vertical spacing
+\def\TOCverysmallvskip {0pt plus .2pt}
+\def\TOCmedvskip {1em plus 1pt}
+\def\TOCbigvskip {2.25em plus 1pt}
+
+% the ``numwidths'' for typesetting the numbering of division units.
+% I don't recall exactly how (and for which fonts) these figures were chosen.
+% They quickly prove too small if using Roman numerals (as do too the book
+% class defaults even though they are a bit larger).
+\def\TOCnumwidthB {1.5em} % chapter
+\def\TOCnumwidthC {2.278em}% section, I think default is 2.3em
+\def\TOCnumwidthD {3.056em}% analog in standard class is 3.2em
+\def\TOCnumwidthE {3.833em}% analog in standard class is 4.1em
+\def\TOCnumwidthF {4.611em}% analog in standard class is 5em
+\def\TOCnumwidthG {5.389em}% analog in standard class is 6em
+
+% The code for the ``global toc style''.
+
+\newcommand*\TOCglobalstyle {%
+\etocsettocstyle
+ {\if@twocolumn \@restonecoltrue \onecolumn \else \@restonecolfalse \fi
+ \parindent\z@ \leftskip\z@skip \rightskip \z@skip
+ \setbox\TOCleaderbox\hbox to \TOCleaderboxwidth{\hss.\hss}%
+ \chapter *{\noindent\kern\TOCleftmargin\relax % uses "pt"...
+ \contentsname
+ \@mkboth {\MakeUppercase \contentsname}{\MakeUppercase \contentsname}}%
+ \rightskip \TOCrightmargin\relax
+ \parfillskip -\rightskip % or a smaller value if desired
+ \leftskip \TOCleftmargin \relax }
+ {\if@restonecol \twocolumn \fi\cleardoublepage}%
+%
+\etocsetstyle{part}
+ {}
+ {\addpenalty {-\@highpenalty}%
+ \addvspace \TOCbigvskip
+ \leavevmode
+ {\large \bfseries % use a group to limit font change
+ \interlinepenalty\@M
+ \etocifnumbered{\etocnumber\hspace{1em}}{}%
+ \etocname
+ \nobreak\hfil\makebox[-\parfillskip][r]{\etocpage}}\par
+ \nobreak
+ }
+ {}
+ {}%
+%
+\etocsetstyle{chapter}
+ {\advance\leftskip\TOCnumwidthB\relax}
+ {\addpenalty {-\@highpenalty }%
+ \vskip \TOCmedvskip\relax
+ \leavevmode
+ {\interlinepenalty\@M
+ \etocifnumbered
+ {\llap{\makebox[\TOCnumwidthB][l]{\bfseries\etocnumber}}}
+ {\advance\leftskip-\TOCnumwidthB\relax}%
+ \bfseries\etocname
+ \nobreak\hfil\makebox[-\parfillskip][r]{\etocpage}\par }%
+ \penalty \@highpenalty
+ }
+ {}
+ {\advance\leftskip-\TOCnumwidthB\relax}%
+%
+ \TOCsetlinestyle {section} {\TOCnumwidthC}%
+ \TOCsetlinestyle {subsection} {\TOCnumwidthD}%
+ \TOCsetlinestyle {subsubsection}{\TOCnumwidthE}%
+ \TOCsetlinestyle {paragraph} {\TOCnumwidthF}%
+ \TOCsetlinestyle {subparagraph} {\TOCnumwidthG}%
+}% end of \TOCglobalstyle
+
+%The common code for line styles is abstracted into a macro:
+
+\newcommand\TOCsetlinestyle [2]{% #1= unit, #2= numwidth as macro
+\etocsetstyle{#1}
+ {\advance\leftskip#2\relax}
+ {\vskip \TOCverysmallvskip\relax
+ \leavevmode
+ {\interlinepenalty\@M
+ \etocifnumbered
+ {\llap{\makebox[#2][l]{\etocnumber}}}{\advance\leftskip-#2\relax}%
+ \etocname
+ \nobreak\leaders \copy\TOCleaderbox
+ \hfil\makebox[-\parfillskip][r]{\etocpage}%
+ \par }%
+ }
+ {}
+ {\advance\leftskip-#2\relax}%
+}
+\makeatother
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-21-B.tex new/doc/latex/etoc/etocsnippet-21-B.tex
--- old/doc/latex/etoc/etocsnippet-21-B.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-21-B.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,49 @@
+%% LaTeX2e file `etocsnippet-21-B.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\makeatletter
+\newcommand*\TOClocalstyle {%
+\etocsettocstyle
+ {\if@twocolumn \@restonecoltrue \onecolumn \else \@restonecolfalse \fi
+ \setbox\TOCleaderbox\hbox to \TOCleaderboxwidth{\hss.\hss}%
+ \parindent\z@
+ \dimen@ 2.25em % for left indenting
+ \section *{\kern\dimen@ % use of \dimen@ works here by sheer luck
+ \contentsname
+ % un-comment this if marks are wanted:
+ %\@mkboth {\MakeUppercase \contentsname}{\MakeUppercase \contentsname}%
+ }% end of \section
+ \parskip \z@skip
+ \vspace{-1.25\baselineskip}% somewhat ad hoc
+ \leftskip 2.25em
+ \rightskip 4.5em
+ \advance\rightskip-\TOCrightmargin\relax
+ \leavevmode\leaders\hrule\@height\p@\hfill\kern\z@\par
+ \rightskip 4.5em
+ \parfillskip -\TOCrightmargin\relax }
+ {\nobreak\vskip-.5\baselineskip
+ \leavevmode\leaders\hrule\@height\p@\hfill\kern\z@\par
+ \bigskip
+ \if@restonecol \twocolumn \fi }%
+%
+\etocsetstyle{section}
+ {\advance\leftskip\TOCnumwidthC\relax}
+ {\addpenalty \@secpenalty
+ \etociffirst{}{\addvspace{\TOCmedvskip}}%
+ \leavevmode
+ {\interlinepenalty\@M
+ \bfseries\etocifnumbered
+ {\llap{\makebox[\TOCnumwidthC][l]{\etocnumber}}}
+ {\advance\leftskip-\TOCnumwidthC}%
+ \etocname\nobreak\hfil\makebox[-\parfillskip][r]{\etocpage}\par }%
+ \penalty \@highpenalty }
+ {}
+ {\advance\leftskip-\TOCnumwidthC\relax}%
+% the rest is identical with code for global tocs:
+ \TOCsetlinestyle {subsection} {\TOCnumwidthD}%
+ \TOCsetlinestyle {subsubsection}{\TOCnumwidthE}%
+ \TOCsetlinestyle {paragraph} {\TOCnumwidthF}%
+ \TOCsetlinestyle {subparagraph} {\TOCnumwidthG}%
+}% end of \TOClocalstyle
+\makeatother
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-22-A.tex new/doc/latex/etoc/etocsnippet-22-A.tex
--- old/doc/latex/etoc/etocsnippet-22-A.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-22-A.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,35 @@
+%% LaTeX2e file `etocsnippet-22-A.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\etocdefaultlines
+\begingroup
+\renewcommand{\etoccolumnsep}{2em}
+\renewcommand{\etocinnerleftsep}{1.5em}
+\renewcommand{\etocinnerrightsep}{1.5em}
+% specify a background color for the toc contents
+\renewcommand{\etocbkgcolorcmd}{\color{yellow!10}}
+% set up the top and bottom rules
+\renewcommand{\etoctoprule}{\hrule height 1pt}
+\renewcommand{\etoctoprulecolorcmd}{\color{red!25}}
+\renewcommand{\etocbottomrule}{\hrule height 1pt}
+\renewcommand{\etocbottomrulecolorcmd}{\color{red!25}}
+% set up the left and right rules
+\renewcommand{\etocleftrule}{\vrule width 5pt}
+\renewcommand{\etocrightrule}{\vrule width 5pt}
+\renewcommand{\etocleftrulecolorcmd}{\color{red!25}}
+\renewcommand{\etocrightrulecolorcmd}{\color{red!25}}
+% use \fcolorbox to set up a colored frame for the title
+\fboxrule1pt
+\renewcommand{\etocbelowtocskip}{0pt\relax}
+\etocframedstyle {\normalsize\rmfamily\itshape
+ \fcolorbox{red}{white}{\parbox{.8\linewidth}{\centering
+ This is a table of contents \`a la \etoc, but just for
+ the sections and subsections in this part. As it is put
+ in a frame, it has to be small enough to fit on
+ one page. It has the label |toc:b|.}}}
+\begin{figure}[ht!]
+ \centering
+\tableofcontents \label{toc:b} \ref{toc:globalcmds}
+\end{figure}
+\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-23.tex new/doc/latex/etoc/etocsnippet-23.tex
--- old/doc/latex/etoc/etocsnippet-23.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-23.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,80 @@
+%% LaTeX2e file `etocsnippet-23.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\begin{figure}[htbp!]\centering
+\colorlet{subsecnum}{black}
+\colorlet{secbackground}{green!30}
+\colorlet{tocbackground}{red!20!green!20}
+
+\renewcommand{\etocbkgcolorcmd}{\color{tocbackground}}
+\renewcommand{\etocleftrulecolorcmd}{\color{tocbackground}}
+\renewcommand{\etocrightrulecolorcmd}{\color{tocbackground}}
+\renewcommand{\etocbottomrulecolorcmd}{\color{tocbackground}}
+\renewcommand{\etoctoprulecolorcmd}{\color{tocbackground}}
+
+\renewcommand{\etocleftrule}{\vrule width 3cm}
+\renewcommand{\etocrightrule}{\vrule width 1cm}
+\renewcommand{\etocbottomrule}{\hrule height 12pt}
+\renewcommand{\etoctoprule}{\hrule height 12pt}
+
+\renewcommand{\etocinnertopsep}{0pt}
+\renewcommand{\etocinnerbottomsep}{0pt}
+\renewcommand{\etocinnerleftsep}{0pt}
+\renewcommand{\etocinnerrightsep}{0pt}
+
+\newcommand\shiftedwhiterule[2]{%
+ \hbox to \linewidth{\color{white}%
+ \hskip#1\leaders\vrule height1pt\hfil}\nointerlineskip
+ \vskip#2}
+
+\etocsetstyle{subsubsection}
+{\etocskipfirstprefix}
+{\shiftedwhiterule{\leftskip}{6pt}}
+{\sffamily\footnotesize
+ \leftskip2.3cm\hangindent1cm\rightskip.5cm\relax
+ \makebox[1cm][l]{\color{subsecnum}\etocnumber}%
+ \color{black}\etocname
+ \nobreak\leaders\hbox to.2cm{\hss.}\hfill
+ \rlap{\makebox[.5cm][r]{\etocpage\hspace{.1cm}}}\par
+ \nointerlineskip\vskip3pt}
+{}
+
+\etocsetstyle{subsection}
+{\etocskipfirstprefix}
+{\shiftedwhiterule{1.5cm}{6pt}}
+{\sffamily\small
+ \leftskip1.5cm\hangindent.8cm\rightskip.5cm\relax
+ \makebox[.75cm][l]{\color{subsecnum}\etocnumber}%
+ \color{black}\etocname
+ \nobreak\leaders\hbox to.2cm{\hss.}\hfill
+ \rlap{\makebox[.5cm][r]{\etocpage\hspace{.1cm}}}\par
+ \nointerlineskip\vskip3pt}
+{}
+
+\newcommand{\coloredstuff}[2]{%
+ \leftskip0pt\rightskip0pt\parskip0pt
+ \fboxsep0pt % \colorbox uses \fboxsep also when no frame!
+ \noindent\colorbox{secbackground}
+ {\parbox{\linewidth}{%
+ \vskip5pt
+ {\noindent\color{#1}#2\par}\nointerlineskip
+ \vskip3pt}}%
+ \par\nointerlineskip}
+
+\etocsetstyle{section}
+{\coloredstuff{blue}{\hfil \bfseries\large Contents of Part One\hfil}}
+{\vskip3pt\sffamily\small}
+{\coloredstuff{blue}
+ {\leftskip1.5cm\rightskip.5cm\parfillskip-\rightskip
+ \makebox[0pt][r]{\makebox[.5cm][l]{\etocnumber}}%
+ \etocname\nobreak\hfill\makebox[.5cm][r]{\etocpage\hspace{.1cm}}}%
+ \vskip6pt}
+{}
+
+\etocframedstyle[1]{}
+\tableofcontents \label{toc:floating} \ref{toc:overview}
+\vspace{-\baselineskip}
+\centeredline{|\tableofcontents \ref{toc:overview}|
+(\emph{cf.} \hyperref[toc:clone]{this other toc})}
+\end{figure}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-24.tex new/doc/latex/etoc/etocsnippet-24.tex
--- old/doc/latex/etoc/etocsnippet-24.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-24.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,27 @@
+%% LaTeX2e file `etocsnippet-24.tex'
+%% generated by the `filecontentsdef' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\begingroup
+\newsavebox{\forsubsections}
+\etocsetstyle{part}{\upshape. \etocskipfirstprefix}
+ {. \upshape}
+ {\bfseries\etocname:~~}
+ {}
+\etocsetstyle{section}{\itshape\etocskipfirstprefix}
+ {, }
+ {\mdseries\etocname}
+ {}
+\etocsetstyle{subsection}
+ {\begin{lrbox}{\forsubsections}\upshape\etocskipfirstprefix}
+ {; }
+ {\etocname}
+ {\end{lrbox}\footnote{\unhbox\forsubsections.}}
+\etocsetstyle{subsubsection}
+ { (\itshape\etocskipfirstprefix}
+ {, }
+ {\etocname}
+ {\/\upshape)}
+\etocsettocstyle{Here is the inline table of contents. }{.\par}
+\tableofcontents \label{toc:crazyinline}
+\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-25.tex new/doc/latex/etoc/etocsnippet-25.tex
--- old/doc/latex/etoc/etocsnippet-25.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-25.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,25 @@
+%% LaTeX2e file `etocsnippet-25.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+ < in the preamble >
+\newcounter{visibletoc}
+\renewcommand{\etocaftertitlehook}
+ {\stepcounter{visibletoc}\etoctoccontentsline{visibletoc}{\thevisibletoc}}
+\etocsetlevel{visibletoc}{6}
+\begin{document}
+ < document body >
+\subsection{Surprising uses of etoc}
+\begingroup
+ \etocinline
+ \etocsetlevel{part}{1}
+ % \etocsetlevel{chapter}{1} % (no chapters in scrartcl class)
+ \etocsetlevel{visibletoc}{0}
+ \etocsetstyle{visibletoc}
+ {\etocskipfirstprefix}{, }{{\color{niceone}\etocname}}{}
+ \etocsettocstyle{}{} % don't set any title, rules or frame or multicol!
+ \etocsetnexttocdepth{visibletoc} % display only the `visibletoc' entries from .toc
+
+Here is the numbered and linked list of all tables of contents which are
+displayed within this document: \tableofcontents.
+\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-26.tex new/doc/latex/etoc/etocsnippet-26.tex
--- old/doc/latex/etoc/etocsnippet-26.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-26.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,20 @@
+%% LaTeX2e file `etocsnippet-26.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+ \etocsetnexttocdepth{2} % sections are at level 1 and will show up
+\begingroup
+ \etocsetlevel{exercise}{2} % but:
+ \etocsetlevel{chapter}{3} % no chapters
+ \etocsetlevel{subsection}{3} % no subsections
+ \etocsetlevel{part}{3} % no parts
+ \etocsetstyle{exercise}{}{} % \etocname = exercise number
+ {\noindent\etocname\strut\leaders\etoctoclineleaders\hfill\etocpage\par}
+ {\pagebreak[2]\vskip\baselineskip}
+ \etocsetstyle{section}{}{}
+ {\noindent\strut{\bfseries\large\etocnumber\hskip.5em\etocname}\par
+ \nopagebreak[3]}{}
+ \etocruledstyle[4]{\Large\bfseries List of the exercises}
+ \setlength{\columnseprule}{.4pt}
+ \tableofcontents
+\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-27.tex new/doc/latex/etoc/etocsnippet-27.tex
--- old/doc/latex/etoc/etocsnippet-27.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-27.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,62 @@
+%% LaTeX2e file `etocsnippet-27.tex'
+%% generated by the `filecontentsdef' environment
+%% from source `etoc' on 2019/11/17.
+%%
+% \newtoks\treetok % put this (uncommented) preferably in the preamble
+% \newtoks\tmptok % (idem)
+
+\newcommand*\appendtotok[2]{% #1=toks variable, #2=macro, expands once #2
+ #1\expandafter\expandafter\expandafter
+ {\expandafter\the\expandafter #1#2}}
+
+\newcommand*\PrepareSectionNode{%
+ \tmptok {\centering\bfseries}%
+ \appendtotok\tmptok\etocthelinkedname
+ \edef\foresttreenode{ [{\noexpand\parbox{2cm}{\the\tmptok}}}%
+}
+
+\newcommand*{\PrepareSubsectionNode}{%
+ \tmptok {\raggedright}%
+ \appendtotok\tmptok\etocthelinkedname
+ \edef\foresttreenode{ [{\noexpand\parbox{6cm}{\the\tmptok}}}%
+}
+
+\etocsetstyle{section}
+ {\etocskipfirstprefix}
+ {\appendtotok\treetok{ ]}}
+ {\PrepareSectionNode \appendtotok\treetok\foresttreenode}
+ {\appendtotok\treetok{ ]}}
+
+\etocsetstyle{subsection}
+ {\etocskipfirstprefix}
+ {\appendtotok\treetok{ ]}}
+ {\PrepareSubsectionNode \appendtotok\treetok\foresttreenode}
+ {\appendtotok\treetok{ ]}}
+
+\etocsettocstyle
+ {\treetok{[{\hyperref[part:overview]{Overview}}}}
+ {\global\appendtotok\treetok{ ]}}
+
+% forest does not like @\the\treetok if \treetok is empty. On first latex
+% run, this will be the case because the TOC style defined above will not
+% have been executed, as the label {toc:overview} does not refer to a valid
+% TOC yet. So we must give a safe default value to \treetok
+\treetok{[{run latex again}]}
+
+\begin{figure}[th!]\centering
+ \etocsetnexttocdepth{subsection}
+ \tableofcontents \label{toc:forest}\ref{toc:overview}
+ \hypersetup{hidelinks}%
+ \bracketset{action character=@}
+ \begin{forest}
+ for tree={anchor=center,child anchor=west,
+ grow'=east,draw,thick,
+ edge={draw,thick,dashed,color=teal}},
+ where={level()==1}{circle,thick,fill=blue!5,
+ before computing xy={l=3cm}}{},
+ where={level()==2}{fill=red!5,
+ before computing xy={l=6cm}}{},
+ rectangle, thick, fill=cyan!5, inner sep=6pt,
+ @\the\treetok
+ \end{forest}
+\end{figure}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-28.tex new/doc/latex/etoc/etocsnippet-28.tex
--- old/doc/latex/etoc/etocsnippet-28.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-28.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,48 @@
+%% LaTeX2e file `etocsnippet-28.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+% \newtoks\treetok % put this (uncommented) preferably in the preamble
+% \newtoks\sectiontok
+% \newtoks\subsectiontok
+\newcommand*{\treenode}{}
+
+\newcommand*{\appendchildtree}[2]{% token list t1 becomes: t1 child {t2}
+ \edef\tmp{\the#1 child {\the#2}}%
+ #1\expandafter{\tmp}%
+}
+\newcommand*{\preparetreenode}{%
+ \tmptok\expandafter{\etocthelinkednumber}% expanded one time (mandatory)
+ \edef\treenode{node {\the\tmptok}}%
+}
+
+\etocsetstyle{section}
+ {\etocskipfirstprefix}
+ {\appendchildtree\treetok\sectiontok}
+ {\preparetreenode \sectiontok\expandafter{\treenode}}
+ {\appendchildtree\treetok\sectiontok}
+
+\etocsetstyle{subsection}
+ {\etocskipfirstprefix}
+ {\appendchildtree\sectiontok\subsectiontok}
+ {\preparetreenode \subsectiontok\expandafter{\treenode}}
+ {\appendchildtree\sectiontok\subsectiontok}
+
+\etocsettocstyle
+ {\treetok{\node {\hyperref[part:overview]{Overview}}}}
+ {\global\appendtotok\treetok{ ;}}
+
+\begin{figure}[thbp!]\centering
+ \etocsetnexttocdepth{subsection}
+ \tableofcontents \label{toc:molecule} \ref{toc:overview}
+ \hypersetup{hidelinks}%
+ \begin{tikzpicture}
+ [grow cyclic,
+ level 1/.style={level distance=4cm,sibling angle=72},
+ level 2/.style={level distance=2cm,sibling angle=60},
+ every node/.style={ball color=red,circle,text=SkyBlue},
+ edge from parent path={[dashed,very thick,color=cyan]
+ (\tikzparentnode) --(\tikzchildnode)}]
+ \the\treetok
+ \end{tikzpicture}
+\end{figure}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-29.tex new/doc/latex/etoc/etocsnippet-29.tex
--- old/doc/latex/etoc/etocsnippet-29.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-29.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,120 @@
+%% LaTeX2e file `etocsnippet-29.tex'
+%% generated by the `filecontentsdef' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\begingroup
+% \newtoks\treetok % done in preamble
+% \newtoks\parttok
+
+\newcommand*\partnode {} % just to check we don't overwrite something
+\newcommand*\childnode {}
+
+\newcommand*\tmprotate {} % just to check we don't overwrite something
+\newcommand*\tmpoption {} % just to check we don't overwrite something
+\newcommand*\tmpstuff {} % just to check we don't overwrite something
+
+\newcommand*\appendtotok[2]{% #1=toks variable, #2=macro, expands once #2
+ #1\expandafter\expandafter\expandafter{\expandafter\the\expandafter #1#2}}
+
+\newcommand*{\appendchildtree}[3]{%
+% this is to construct "t1 child [#3]{t2}" from #1=t1 and #2=t2
+% t1 and t2 are two toks variable (not macros)
+% #3 = for example teal!60
+ \edef\tmpstuff {\the#1 child [#3]{\the#2}}%
+ #1\expandafter {\tmpstuff }%
+}
+
+\newcounter{partco}
+
+% 1,2,3,4,5,... -> 1,2,3,1,2,3,1,2,3
+\def\pseudomodthree #1{\numexpr #1 + 3 - 3*((#1+1)/3)\relax}
+
+\etocsetstyle{part}
+ {\etocskipfirstprefix}
+% This updates the global tree with the data from the previous
+% part and all its children sections. Moved here because for some parts the
+% sections are not displayed due to depth tags.
+ {\ifnum\value{partco}=3
+ \appendchildtree\treetok\parttok {branch color= green!50,level distance=10cm}%
+ \else
+\ifcase\pseudomodthree{\value{partco}}%
+ \or \appendchildtree\treetok\parttok {branch color= teal!60}% first
+ \or \appendchildtree\treetok\parttok {branch color= yellow!80}% second
+ \else\appendchildtree\treetok\parttok {branch color= green!50}% third and next ...
+ \fi\fi
+ }
+ {\stepcounter{partco}%
+% customize manually some TikZ set-up (should be done inside the TikZ thing I guess)
+ \def\tmpoption {}%
+ \def\tmprotate {}% first
+ %\ifnum\value{partco}=5 \def\tmprotate {[counterclockwise from =-40]}\fi
+ %\ifnum\value{partco}=8 \def\tmprotate {[counterclockwise from =-50]}\fi
+% define the part node
+ \edef\partnode{node \tmpoption
+ {\unexpanded\expandafter{\etocthelinkednumber}.
+ \unexpanded\expandafter{\etocthelinkedname}}\tmprotate }%
+% this is a starting point which will be filled it by the section children
+ \parttok\expandafter{\partnode}}
+ {\ifcase\pseudomodthree{\value{partco}}%
+ \or \appendchildtree\treetok\parttok {branch color= teal!60}% first
+ \or \appendchildtree\treetok\parttok {branch color= yellow!80}% second
+ \else\appendchildtree\treetok\parttok {branch color= green!50}% third and next ...
+ \fi
+ }
+
+\etocsetstyle{section}
+ {}
+ {}
+ {% define the section node
+ \edef\childnode{child {node {\unexpanded\expandafter{\etocthelinkednumber}
+ \unexpanded\expandafter{\etocthelinkedname}}}}%
+ % append it to the current \parttok
+ \appendtotok\parttok\childnode
+ }
+ {}
+
+\etocsettocstyle
+ {\setcounter{partco}{0}%
+ \treetok{\node [root concept]{\textbf{The \etoc documentation}}}}
+ {\global\appendtotok\treetok{ ;}}
+% The \global above is mandatory because etoc always typesets TOC inside a group
+
+\etocsetnexttocdepth{section}
+% use of depth tags to cut out some sections.
+\etocsettagdepth {preamble} {none}
+\etocsettagdepth {overview} {part}
+\etocsettagdepth {arbitrarily}{part}
+\etocsettagdepth {examples} {section}
+\etocsettagdepth {surprising} {part}
+\etocsettagdepth {linestyles} {part}
+\etocsettagdepth {globalcmds} {part}
+\etocsettagdepth {custom} {section}
+\etocsettagdepth {tips} {part}
+\etocsettagdepth {etocandworld}{part}
+\etocsettagdepth {code} {section}
+
+\tikzset{
+ branch color/.style={
+ concept color=#1!white,
+ every child/.append style={concept color=#1!white!30!white, font=\normalsize},
+ }
+}%
+
+\begin{figure}[thp!]
+\tableofcontents\label{toc:mindmap}%
+\centeredline{\resizebox{.85\paperwidth}{!}%
+{\begin{tikzpicture}[mindmap,
+ grow cyclic,
+ text width=2cm,
+ align=flush center,
+ nodes={concept},
+ concept color=orange!60,
+ root concept/.append style={text width=4cm, font=\Large},
+ level 1/.append style={level distance=5cm,sibling angle=40, text width=3cm},
+ level 2/.append style={level distance=7cm,sibling angle=30, text width=3cm},
+ level 1 concept/.append style={font=\normalsize},
+ ]
+\the\treetok
+\end{tikzpicture}}}
+\end{figure}
+\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-30-A.tex new/doc/latex/etoc/etocsnippet-30-A.tex
--- old/doc/latex/etoc/etocsnippet-30-A.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-30-A.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,40 @@
+%% LaTeX2e file `etocsnippet-30-A.tex'
+%% generated by the `filecontentsdef' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\begingroup
+\etocglobaldefs % necessary for \etocname etc... to survive &
+
+% observe the locations of the \\
+\etocsetstyle{part}
+ {}
+ {\\\hline}
+ {\strut\etocnumber &\bfseries\etocname&\etocpage }
+ {}
+
+\etocsetstyle{section}
+ {}
+ {\etociffirst{\etocifnumbered{\\\hline}{\\\hline\hline}}{\\}}
+ {\etocnumber&\etocname &\etocpage }
+ {}
+
+\etocsetstyle{subsection}
+ {}
+ {\\}
+ {&\makebox[1cm][c]{\etocnumber}%
+ \parbox[t]{\dimexpr6cm-\tabcolsep\relax}{\sloppy\itshape\etocname\strut}%
+ &\itshape\etocpage }
+ {}
+
+\etocsettocstyle
+ {\hypersetup{hidelinks}%
+ \begin{longtable}{|>{\bfseries}c|p{7cm}|r|}
+ \hline
+ \multicolumn{3}{|c|}{\Large\bfseries\strut\strut TABLE OF CONTENTS}%
+ }
+ {\\\hline\end{longtable}}
+
+\etocsetnexttocdepth {subsection}
+
+\tableofcontents
+\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-30-B.tex new/doc/latex/etoc/etocsnippet-30-B.tex
--- old/doc/latex/etoc/etocsnippet-30-B.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-30-B.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,23 @@
+%% LaTeX2e file `etocsnippet-30-B.tex'
+%% generated by the `filecontentsdef' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\begin{center}
+\etocsetstyle{section}
+ {}
+ {\etociffirst{\\\hline\hline}{\\\hline}}
+ {\etocname & \etocnumber & \etocpage }
+ {}
+
+\etocsettocstyle
+ {\hypersetup{hidelinks}\begin{tabular}{|p{4cm}|c|c|}\hline
+ \multicolumn{1}{|c|}{\bfseries Section}&
+ \bfseries number&
+ \bfseries page}
+ {\\\hline\end{tabular}}
+
+\etocglobaldefs % MANDATORY !!
+\etocsetnexttocdepth{1}
+
+\tableofcontents\ref{toc:overview}
+\end{center}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-31.tex new/doc/latex/etoc/etocsnippet-31.tex
--- old/doc/latex/etoc/etocsnippet-31.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-31.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,57 @@
+%% LaTeX2e file `etocsnippet-31.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\makeatletter
+\newcommand*\TOCcompute@numwidths [2]{% #1=empty/"local", #2=minimal indent
+ \begingroup
+ \def\TOCnumwidthB {0pt}%
+ \def\TOCnumwidthC {0pt}%
+ \def\TOCnumwidthD {0pt}%
+ \def\TOCnumwidthE {0pt}%
+ \def\TOCnumwidthF {0pt}%
+ \def\TOCnumwidthG {0pt}%
+ \etocsetstyle{part}{}{}{}{}%
+ \etocsetstyle{chapter}{}
+ {\setbox0\hbox{\bfseries\etocthenumber\kern#2}}
+ {\ifdim\wd0>\TOCnumwidthB\edef\TOCnumwidthB{\the\wd0}\fi}{}%
+ \etocsetstyle{section}{}
+ {\setbox0\hbox{\bfseries\etocthenumber\kern#2}}
+ {\ifdim\wd0>\TOCnumwidthC\edef\TOCnumwidthC{\the\wd0}\fi}{}%
+ \etocsetstyle{subsection}{}
+ {\setbox0\hbox{\etocthenumber\kern#2}}
+ {\ifdim\wd0>\TOCnumwidthD\edef\TOCnumwidthD{\the\wd0}\fi}{}%
+ \etocsetstyle{subsubsection}{}
+ {\setbox0\hbox{\etocthenumber\kern#2}}
+ {\ifdim\wd0>\TOCnumwidthE\edef\TOCnumwidthE{\the\wd0}\fi}{}%
+ \etocsetstyle{paragraph}{}
+ {\setbox0\hbox{\etocthenumber\kern#2}}
+ {\ifdim\wd0>\TOCnumwidthF\edef\TOCnumwidthF{\the\wd0}\fi}{}%
+ \etocsetstyle{subparagraph}{}
+ {\setbox0\hbox{\etocthenumber\kern#2}}
+ {\ifdim\wd0>\TOCnumwidthG\edef\TOCnumwidthG{\the\wd0}\fi}{}%
+ %
+ \etocsettocstyle{}
+ {\global\let\TOCnumwidthB\TOCnumwidthB
+ \global\let\TOCnumwidthC\TOCnumwidthC
+ \global\let\TOCnumwidthD\TOCnumwidthD
+ \global\let\TOCnumwidthE\TOCnumwidthE
+ \global\let\TOCnumwidthF\TOCnumwidthF
+ \global\let\TOCnumwidthG\TOCnumwidthG}%
+ \etocnopar
+ \csname #1tableofcontents\endcsname
+\typeout{Next TOCs will use \TOCnumwidthB\space for chapter number width}%
+\typeout{Next TOCs will use \TOCnumwidthC\space for section number width}%
+\typeout{Next TOCs will use \TOCnumwidthD\space for subsection number width}%
+\typeout{Next TOCs will use \TOCnumwidthE\space for subsubsection number width}%
+\typeout{Next TOCs will use \TOCnumwidthF\space for paragraph number width}%
+\typeout{Next TOCs will use \TOCnumwidthG\space for subparagraph number width}%
+ \endgroup
+}%
+\newcommand*\TOCcomputenumwidths [1][0.5em]{%
+ \TOCcompute@numwidths {}{#1}%
+}%
+\newcommand*\TOCcomputelocalnumwidths [1][0.5em]{%
+ \TOCcompute@numwidths {local}{#1}%
+}%
+\makeatother
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-32.tex new/doc/latex/etoc/etocsnippet-32.tex
--- old/doc/latex/etoc/etocsnippet-32.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-32.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,22 @@
+%% LaTeX2e file `etocsnippet-32.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\etocsetstyle{section}
+{\begin{enumerate}}
+{\normalsize\bfseries\rmfamily\item}
+{\etocname{} (page \etocpage)}
+{\end{enumerate}}
+
+\etocsetstyle{subsection}
+{\begin{enumerate}}
+{\normalfont\item}
+{\etocname{} (p.~\etocpage)}
+{\end{enumerate}}
+
+\etocsetstyle{subsubsection}
+{\par\nobreak\begingroup\normalfont
+ \footnotesize\itshape\etocskipfirstprefix}
+{\allowbreak\,--\,}
+{\etocname}
+{.\hfil\par\endgroup\pagebreak[3]}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-40.tex new/doc/latex/etoc/etocsnippet-40.tex
--- old/doc/latex/etoc/etocsnippet-40.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-40.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,19 @@
+%% LaTeX2e file `etocsnippet-40.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\etocsettocdepth {subsubsection} % set the initial tocdepth
+\etocdefaultlines % use the package default line styles. At this early stage in
+ % the document they had not yet been modified by \etocsetstyle
+ % commands, so \etoctoclines could have been used, too.
+\etocmarkboth\contentsname
+\etocmulticolstyle[1] % one-column display
+ {\pdfbookmark[1]{Table of contents}{MAINTOC}% create a bookmark in the pdf
+ \noindent\bfseries\Large
+ \leaders\hrule height1pt\hfill
+ \MakeUppercase{Table of Contents}}
+\begingroup % use a group to limit the scope of the
+ \etocsetlevel{subsection}{3} % subsection level change.
+ \etocsetlevel{subsubsection}{4} % anything > tocdepth=3.
+ \tableofcontents \label{toc:main}
+\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-46.tex new/doc/latex/etoc/etocsnippet-46.tex
--- old/doc/latex/etoc/etocsnippet-46.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-46.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,23 @@
+%% LaTeX2e file `etocsnippet-46.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\etocruledstyle[2]{\normalfont\normalsize\rmfamily\itshape
+ \fbox{\parbox{.6\linewidth}{
+ \leftskip 0pt plus .5fil
+ \rightskip 0pt plus -.5fil
+ \parfillskip 0pt plus 1fil This is the global table of
+ contents on two columns, using \etoc default line styles, but with
+ sections as chapters, and subsections as sections.
+ }}}
+\etocdefaultlines
+\etocsetnexttocdepth{1}
+\begingroup
+\etocsetlevel{section}{0}
+\etocsetlevel{subsection}{1}
+\renewcommand*{\etocfontone}{\normalfont \normalsize}
+\renewcommand*{\etoctoclineleaders}
+ {\hbox{\normalfont\normalsize\hbox to 1ex {\hss.\hss}}}
+\sloppy
+\tableofcontents
+\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-48.tex new/doc/latex/etoc/etocsnippet-48.tex
--- old/doc/latex/etoc/etocsnippet-48.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-48.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,74 @@
+%% LaTeX2e file `etocsnippet-48.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\begingroup
+\definecolor{subsecnum}{RGB}{13,151,225}
+\definecolor{secbackground}{RGB}{0,177,235}
+\definecolor{tocbackground}{RGB}{212,237,252}
+
+\renewcommand{\etocbkgcolorcmd}{\color{tocbackground}}
+\renewcommand{\etocleftrulecolorcmd}{\color{tocbackground}}
+\renewcommand{\etocrightrulecolorcmd}{\color{tocbackground}}
+\renewcommand{\etocbottomrulecolorcmd}{\color{tocbackground}}
+\renewcommand{\etoctoprulecolorcmd}{\color{tocbackground}}
+
+\renewcommand{\etocleftrule}{\vrule width 1cm}
+\renewcommand{\etocrightrule}{\vrule width .5cm}
+\renewcommand{\etocbottomrule}{\hrule height 12pt}
+\renewcommand{\etoctoprule}{\hrule height 12pt}
+
+\renewcommand{\etocinnertopsep}{0pt}
+\renewcommand{\etocinnerbottomsep}{0pt}
+\renewcommand{\etocinnerleftsep}{0pt}
+\renewcommand{\etocinnerrightsep}{0pt}
+
+\newcommand\shiftedwhiterule[2]{%
+ \hbox to \linewidth{\color{white}%
+ \hskip#1\leaders\vrule height1pt\hfil}\nointerlineskip\vskip#2}
+
+\etocsetstyle{subsubsection}{\etocskipfirstprefix}
+ {\shiftedwhiterule{\leftskip}{6pt}}
+ {\sffamily\footnotesize
+ \leftskip2.5cm\hangindent1cm\rightskip1cm\noindent
+ \hbox to 1cm{\color{subsecnum}\etocnumber\hss}%
+ \color{black}\etocname\leaders\hbox to .2cm{\hss.}\hfill
+ \rlap{\hbox to 1cm{\hss\etocpage\hskip.2cm}}\par
+ \nointerlineskip\vskip3pt}
+ {}
+
+\etocsetstyle{subsection}{\etocskipfirstprefix}
+ {\shiftedwhiterule{1.5cm}{6pt}}
+ {\sffamily\small
+ \leftskip1.5cm\hangindent1cm\rightskip1cm\noindent
+ \hbox to 1cm{\color{subsecnum}\etocnumber\hss}%
+ \color{black}\etocname\leaders\hbox to .2cm{\hss.}\hfill
+ \rlap{\hbox to 1cm{\hss\etocpage\hskip.2cm}}\par
+ \nointerlineskip\vskip6pt}
+ {}
+
+\newcommand{\coloredstuff}[2]{%
+ \leftskip0pt\rightskip0pt\parskip0pt
+ \fboxsep0pt % \colorbox uses \fboxsep also when no frame!
+ \noindent\colorbox{secbackground}
+ {\parbox{\linewidth}{%
+ \vskip5pt
+ {\noindent\color{#1}#2\par}\nointerlineskip
+ \vskip3pt}}%
+ \par\nointerlineskip}
+
+\etocsetstyle{section}
+{\coloredstuff{white}
+ {\hfil \hyperref[toc:b]{\bfseries\large I am a twin of
+ that other TOC (click me!)}\hfil}}
+{\vskip3pt\sffamily\small}
+{\coloredstuff{white}
+ {\leftskip1.5cm\rightskip.5cm\parfillskip-\rightskip
+ \makebox[0pt][r]{\makebox[.5cm][r]{\etocnumber\hspace{.2cm}}}%
+ \etocname\hfill\makebox[.5cm][r]{\etocpage\hspace{.2cm}}}%
+ \vskip6pt }
+{}
+
+\etocframedstyle[1]{}
+\tableofcontents \label{toc:clone} \ref{toc:globalcmds}
+\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-5.tex new/doc/latex/etoc/etocsnippet-5.tex
--- old/doc/latex/etoc/etocsnippet-5.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-5.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,30 @@
+%% LaTeX2e file `etocsnippet-5.tex'
+%% generated by the `filecontentsdef' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\begingroup\parindent 0pt \parfillskip 0pt \leftskip 0cm \rightskip 1cm
+\etocsetstyle {section}
+ {}
+ {\leavevmode\leftskip 0cm\relax}
+ {\bfseries\normalsize\makebox[.5cm][l]{\etocnumber.}%
+ \etocname\nobreak\hfill\nobreak
+ \rlap{\makebox[1cm]{\mdseries\etocpage}}\par}
+ {}
+\etocsetstyle {subsection}
+ {}
+ {\leavevmode\leftskip .5cm\relax }
+ {\mdseries\normalsize\makebox[1cm][l]{\etocnumber}%
+ \etocname\nobreak\hfill\nobreak
+ \rlap{\makebox[1cm]{\etocpage}}\par}
+ {}
+\etocsetstyle {subsubsection}
+ {}
+ {\leavevmode\leftskip 1.5cm\relax }
+ {\mdseries\normalsize\makebox[1cm][l]{\etocnumber}%
+ \etocname\nobreak\hfill\nobreak
+ \rlap{\makebox[1cm]{\etocpage}}\par}
+ {}
+\etocruledstyle[1]{\bfseries \Large My first \etoc: TOC of
+ \autoref{part:overview} (\nameref{part:overview})}
+\tableofcontents \ref {toc:overview}
+\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-52-A.tex new/doc/latex/etoc/etocsnippet-52-A.tex
--- old/doc/latex/etoc/etocsnippet-52-A.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-52-A.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,47 @@
+%% LaTeX2e file `etocsnippet-52-A.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\newsavebox\firstnamei \newsavebox\firstnumberi
+\newsavebox\lastnamei \newsavebox\lastnumberi
+\newsavebox\firstnameii \newsavebox\firstnumberii
+\newsavebox\lastnameii \newsavebox\lastnumberii
+\newcounter{mycounti} \newcounter{mycountii}
+\newcommand*{\thispartstatsauxi}{} \newcommand*{\thispartstatsauxii}{}
+\newcommand*{\oldtocdepth}{}
+\newcommand*{\thispartstats}{%
+ \setcounter{mycounti}{0}%
+ \setcounter{mycountii}{0}%
+ \def\thispartstatsauxi{%
+ \sbox{\firstnamei}{\etocname}%
+ \sbox{\firstnumberi}{\etocnumber}%
+ \def\thispartstatsauxi{}}%
+ \def\thispartstatsauxii{%
+ \sbox{\firstnameii}{\etocname}%
+ \sbox{\firstnumberii}{\etocnumber}%
+ \def\thispartstatsauxii{}}%
+ \begingroup
+ \etocsetstyle{subsection} {} {}
+ {\thispartstatsauxii
+ \stepcounter{mycountii}%
+ \sbox{\lastnameii}{\etocname}%
+ \sbox{\lastnumberii}{\etocnumber}} {}%
+ \etocsetstyle{section} {} {}
+ {\thispartstatsauxi
+ \stepcounter{mycounti}%
+ \sbox{\lastnamei}{\etocname}%
+ \sbox{\lastnumberi}{\etocnumber}}
+ {Here are some statistics for this part: it contains \arabic{mycounti}
+ section\ifnum\value{mycounti}>1 s\fi{} and \arabic{mycountii}
+ subsection\ifnum\value{mycountii}>1 s\fi. The name of the first section is
+ \unhbox\firstnamei{} and the corresponding number is \unhbox\firstnumberi.
+ The name of the last section is \unhbox\lastnamei{} and its number is
+ \unhbox\lastnumberi. The name of the first subsection is \unhbox\firstnameii{}
+ and the corresponding number is \unhbox\firstnumberii. The name of the last
+ subsection is \unhbox\lastnameii{} and its number is \unhbox\lastnumberii.}%
+ \etocinline % cancels the automatic \par automatically before the TOC
+ \etocsettocstyle {}{}
+ \etocsetnexttocdepth{2}%
+ \localtableofcontents % to be used at the top level of a Part.
+ \endgroup
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-52-B.tex new/doc/latex/etoc/etocsnippet-52-B.tex
--- old/doc/latex/etoc/etocsnippet-52-B.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-52-B.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,31 @@
+%% LaTeX2e file `etocsnippet-52-B.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\makeatletter
+\newcommand*\firstsubname {} \newcommand*\lastsubname {}
+\newcommand*\firstsubnumber {} \newcommand*\lastsubnumber {}
+\newcommand*\thisspecialstatsaux{}
+\newcommand*{\thisspecialstats}{%
+ \setcounter{mycounti}{0}%
+ \def\thisspecialstatsaux{%
+ \let\firstsubname\etocthelinkedname
+ \let\firstsubnumber\etocthelinkednumber
+ \def\thisspecialstatsaux{}}
+ \begingroup
+ \etocsetstyle{subsection} {} {}
+ {\thisspecialstatsaux
+ \stepcounter{mycounti}%
+ \let\lastsubname\etocthelinkedname
+ \let\lastsubnumber\etocthelinkednumber }
+ {Here are some statistics for this section. It contains \arabic{mycounti}
+ subsections. The name of its first is \emph{\firstsubname{}} and the
+ corresponding number is {\firstsubnumber}. The name of the last
+ subsection is \emph{\lastsubname{}} and its number is {\lastsubnumber}.}%
+ \etocsettocstyle {}{}
+ \etocinline
+ \etocsetnexttocdepth {1}%
+ \localtableofcontents % to be used within a section
+ \endgroup
+}
+\makeatother
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-53.tex new/doc/latex/etoc/etocsnippet-53.tex
--- old/doc/latex/etoc/etocsnippet-53.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-53.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,67 @@
+%% LaTeX2e file `etocsnippet-53.tex'
+%% generated by the `filecontentsdef' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\etocsetnexttocdepth {all}
+\begingroup
+\parindent 0pt \leftskip 0cm \rightskip .75cm \parfillskip -\rightskip
+\newcommand*{\EndParWithPagenoInMargin}
+ {\nobreak\hfill
+ \makebox[0.75cm][r]{\mdseries\normalsize\etocpage}%
+ \par}
+\renewcommand*\etoctoclineleaders
+ {\hbox{\normalfont\normalsize\hbox to .75ex {\hss.\hss}}}
+\newcommand*{\EndParWithPagenoInMarginAndLeaders}
+ {\nobreak\leaders\etoctoclineleaders\hfill
+ \makebox[0.75cm][r]{\mdseries\normalsize\etocpage}%
+ \par }
+\etocsetstyle {part}
+ {}
+ {\leavevmode\leftskip 1cm\relax}
+ {\bfseries\large\llap{\makebox[1cm][r]{\etocnumber\ \ }}%
+ \etocname\EndParWithPagenoInMargin\smallskip}
+ {}
+\etocsetstyle {section}
+ {}
+ {\leavevmode\leftskip 1.75cm\relax}
+ {\bfseries\normalsize\llap{\makebox[.75cm][l]{\etocnumber}}%
+ \etocname\EndParWithPagenoInMarginAndLeaders}
+ {}
+\etocsetstyle {subsection}
+ {}
+ {\leavevmode\leftskip 2.75cm\relax }
+ {\mdseries\normalsize\llap{\makebox[1cm][l]{\etocnumber}}%
+ \etocname\EndParWithPagenoInMarginAndLeaders}
+ {}
+\etocsetstyle {subsubsection}
+ {}
+ {\leavevmode\leftskip 4cm\relax }
+ {\mdseries\normalsize\llap{\makebox[1.25cm][l]{\etocnumber}}%
+ \etocname\EndParWithPagenoInMarginAndLeaders}
+ {}
+\etocsetstyle {paragraph}
+ {}
+ {\leavevmode\leftskip 5.5cm\relax }
+ {\mdseries\normalsize\llap{\makebox[1.5cm][l]{\etocnumber}}%
+ \etocname\EndParWithPagenoInMarginAndLeaders}
+ {}
+\etocsettagdepth {preamble} {none}
+\etocsettagdepth {overview} {part}
+%\etocsettagdepth {arbitrarily}{part}% not needed explicitely, keeps value
+%\etocsettagdepth {examples} {part}
+%\etocsettagdepth {surprising} {part}
+%\etocsettagdepth {linestyles} {part}
+\etocsettagdepth {globalcmds} {paragraph}
+\etocsettagdepth {custom} {part}
+%\etocsettagdepth {tips} {part}
+%\etocsettagdepth {etocandworld}{part}
+\etocsettagdepth {code} {none}
+\renewcommand\etoctoprule {\hrule height 3pt\relax }
+\renewcommand\etoctoprulecolorcmd {\color{blue}}
+\renewcommand\etocaftercontentshook
+ {\medskip\begingroup \color{blue}\hrule height 3pt \endgroup }
+\etocruledstyle [1]{\Large\bfseries
+ \fbox{\makebox[8cm]{A TOC using depth tags}}}
+\sloppy
+\tableofcontents
+\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-54.tex new/doc/latex/etoc/etocsnippet-54.tex
--- old/doc/latex/etoc/etocsnippet-54.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-54.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,50 @@
+%% LaTeX2e file `etocsnippet-54.tex'
+%% generated by the `filecontentshere' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\newtoks\toctabletok
+\newcommand*\appendtotok[2]{% #1=toks variable, #2=macro, expands once #2
+ #1\expandafter\expandafter\expandafter {\expandafter\the\expandafter #1#2}}
+
+\newcommand*\PreparePart{%
+ \toks0 \expandafter{\etocthelinkednumber}%
+ \toks2 \expandafter{\etocthelinkedname}%
+ \toks4 \expandafter{\etocthelinkedpage}%
+ \edef\toctablepiece {\noexpand\hline
+ \noexpand\strut\the\toks0 &\noexpand\bfseries\the\toks2
+ &\the\toks4 \noexpand\\\noexpand\hline}%
+}
+\newcommand*\PrepareSection{%
+ \toks0 \expandafter{\etocthelinkednumber}%
+ \toks2 \expandafter{\etocthelinkedname}%
+ \toks4 \expandafter{\etocthelinkedpage}%
+ \edef\toctablepiece {\the\toks0 &\the\toks2 &\the\toks4 \noexpand\\}%
+}
+% new version for 1.07k, 2014/03/06
+\newcommand*{\PrepareSubsection}{%
+ \toks0 \expandafter{\etocthelinkednumber}%
+ \toks2 \expandafter{\expandafter\itshape\etocthelinkedname\strut}%
+ \toks4 \expandafter{\expandafter\itshape\etocthelinkedpage}%
+ \edef\toctablepiece{&\noexpand\makebox[1cm][c]{\the\toks0}%
+ \noexpand\parbox[t]{\dimexpr6cm-\tabcolsep\relax}
+ {\noexpand\sloppy\the\toks2}%
+ &\the\toks4 \noexpand\\}%
+}
+
+\begingroup
+\etocsetstyle{part}{}{}{\PreparePart \appendtotok\toctabletok\toctablepiece}{}
+
+\etocsetstyle{section}{}{}{\PrepareSection \appendtotok\toctabletok\toctablepiece}{}
+
+\etocsetstyle{subsection}{}{}{\PrepareSubsection\appendtotok\toctabletok\toctablepiece}{}
+
+\etocsettocstyle
+ {\toctabletok{\hypersetup{hidelinks}%
+ \begin{longtable}{|>{\bfseries}c|p{7cm}|r|}\hline
+ \multicolumn{3}{|c|}{\Large\bfseries\strut TABLE OF CONTENTS}%
+ \\\hline\hline}}
+ {\global\toctabletok\expandafter{\the\toctabletok\hline\end{longtable}}}
+\etocsettocdepth {subsection}
+\tableofcontents
+\the\toctabletok
+\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-6.tex new/doc/latex/etoc/etocsnippet-6.tex
--- old/doc/latex/etoc/etocsnippet-6.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-6.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,53 @@
+%% LaTeX2e file `etocsnippet-6.tex'
+%% generated by the `filecontentsdef' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\begingroup
+\newcommand*{\DotsAndPage}
+{\nobreak\leaders\hbox{\bfseries\normalsize\hbox to .75ex {\hss.\hss}}%
+ \hfill\nobreak
+ \makebox[\rightskip][r]{\bfseries\normalsize\etocpage}\par}
+
+\etocsetstyle {part}
+{\parindent 0pt
+ \nobreak
+ \etocskipfirstprefix}
+{\pagebreak[3]\bigskip}
+{\large\rmfamily\bfseries\scshape\centering
+ \etocifnumbered{Part \etocnumber{} -- }{}\etocname\par}
+{}
+
+\etocsetstyle {section}
+{\leftskip 0pt \rightskip .75cm \parfillskip-\rightskip
+ \nobreak\medskip
+ \etocskipfirstprefix}
+{\leftskip 0pt \rightskip .75cm \parfillskip-\rightskip
+ \pagebreak[1]\smallskip}
+{\normalsize\rmfamily\bfseries\scshape
+ \etocnumber. \etocname\DotsAndPage }
+{\parfillskip 0pt plus 1fil\relax }
+
+\etocsetstyle {subsection}
+{\leftskip1cm\rightskip .75cm \parfillskip 0pt plus 1fil\relax
+ \nobreak\smallskip}
+{}
+{\footnotesize\sffamily\mdseries\itshape
+ \etocname{} (\etocnumber, p. \etocpage). }
+{\par\medskip}
+
+\etocsettagdepth {preamble} {none}
+%\etocsettagdepth {overview} {none}% not needed explicitely, keeps value
+%\etocsettagdepth {arbitrarily}{none}
+%\etocsettagdepth {examples} {none}
+%\etocsettagdepth {surprising} {none}
+\etocsettagdepth {linestyles} {subsection}
+\etocsettagdepth {globalcmds} {subsection}
+\etocsettagdepth {custom} {none}
+%\etocsettagdepth {tips} {none}
+%\etocsettagdepth {etocandworld}{none}
+%\etocsettagdepth {code} {none}
+
+\etocsettocstyle {\centering\LARGE\textsc{\contentsname}\par\nobreak\medskip}{}
+\etocsetnexttocdepth {subsection}
+\tableofcontents
+\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoc/etocsnippet-7.tex new/doc/latex/etoc/etocsnippet-7.tex
--- old/doc/latex/etoc/etocsnippet-7.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/etoc/etocsnippet-7.tex 2019-11-17 23:36:06.000000000 +0100
@@ -0,0 +1,32 @@
+%% LaTeX2e file `etocsnippet-7.tex'
+%% generated by the `filecontentsdef' environment
+%% from source `etoc' on 2019/11/17.
+%%
+\begingroup % we start a group to keep the style changes local
+\newlength{\tocleftmargin} \setlength{\tocleftmargin}{5cm}
+\newlength{\tocrightmargin} \setlength{\tocrightmargin}{1cm}
+
+\etocsetstyle{section} % will pretend to be a Chapter
+{\addvspace{1ex}\parfillskip0pt
+ \leftskip\tocleftmargin % (already done in title)
+ \rightskip\the\tocrightmargin plus 1fil
+ \parindent0pt\color{cyan}} % (already done)
+{\bfseries\LARGE\upshape\addvspace{1ex}\leavevmode}
+{\llap{Chapter\hspace{.5em}{\etocnumber}\hspace{.75cm}}\etocname
+ \hfill\makebox[-\tocrightmargin][l]{\makebox[0pt]{\etocpage}}\par}
+{}
+
+\etocsetstyle{subsection} % will pretend to be a Section
+{}
+{\mdseries\large\addvspace{.5ex}\leavevmode}
+{\llap{\etocnumber\hspace{.75cm}}\textit{\etocname}%
+ \hfill\makebox[-\tocrightmargin][l]{\makebox[0pt]{\etocpage}}\par}
+{}
+
+\def\tmptitle{My Beautiful Thesis}
+\etocsettocstyle{\color{cyan}\parindent0pt \leftskip\tocleftmargin
+ \leavevmode\leaders\hrule height 1pt\hfill\
+ \huge\textit{\tmptitle}\par}{\bigskip}
+
+\tableofcontents \ref{toc:overview}
+\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/etoc.doc.tlpobj new/tlpkg/tlpobj/etoc.doc.tlpobj
--- old/tlpkg/tlpobj/etoc.doc.tlpobj 2019-03-11 02:24:55.000000000 +0100
+++ new/tlpkg/tlpobj/etoc.doc.tlpobj 2019-11-18 01:54:58.000000000 +0100
@@ -1,9 +1,38 @@
name etoc.doc
category Package
-revision 50317
+revision 52842
shortdesc doc files of etoc
relocated 1
-docfiles size=292
+docfiles size=324
RELOC/doc/latex/etoc/README.md
RELOC/doc/latex/etoc/etoc-DE.pdf
+ RELOC/doc/latex/etoc/etoc-DE.tex
RELOC/doc/latex/etoc/etoc.pdf
+ RELOC/doc/latex/etoc/etoc.tex
+ RELOC/doc/latex/etoc/etocsnippet-10.tex
+ RELOC/doc/latex/etoc/etocsnippet-20-A.tex
+ RELOC/doc/latex/etoc/etocsnippet-20-B.tex
+ RELOC/doc/latex/etoc/etocsnippet-21-A.tex
+ RELOC/doc/latex/etoc/etocsnippet-21-B.tex
+ RELOC/doc/latex/etoc/etocsnippet-22-A.tex
+ RELOC/doc/latex/etoc/etocsnippet-23.tex
+ RELOC/doc/latex/etoc/etocsnippet-24.tex
+ RELOC/doc/latex/etoc/etocsnippet-25.tex
+ RELOC/doc/latex/etoc/etocsnippet-26.tex
+ RELOC/doc/latex/etoc/etocsnippet-27.tex
+ RELOC/doc/latex/etoc/etocsnippet-28.tex
+ RELOC/doc/latex/etoc/etocsnippet-29.tex
+ RELOC/doc/latex/etoc/etocsnippet-30-A.tex
+ RELOC/doc/latex/etoc/etocsnippet-30-B.tex
+ RELOC/doc/latex/etoc/etocsnippet-31.tex
+ RELOC/doc/latex/etoc/etocsnippet-32.tex
+ RELOC/doc/latex/etoc/etocsnippet-40.tex
+ RELOC/doc/latex/etoc/etocsnippet-46.tex
+ RELOC/doc/latex/etoc/etocsnippet-48.tex
+ RELOC/doc/latex/etoc/etocsnippet-5.tex
+ RELOC/doc/latex/etoc/etocsnippet-52-A.tex
+ RELOC/doc/latex/etoc/etocsnippet-52-B.tex
+ RELOC/doc/latex/etoc/etocsnippet-53.tex
+ RELOC/doc/latex/etoc/etocsnippet-54.tex
+ RELOC/doc/latex/etoc/etocsnippet-6.tex
+ RELOC/doc/latex/etoc/etocsnippet-7.tex
++++++ etoc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/etoc/etoc.sty new/tex/latex/etoc/etoc.sty
--- old/tex/latex/etoc/etoc.sty 2019-03-10 22:00:10.000000000 +0100
+++ new/tex/latex/etoc/etoc.sty 2019-11-17 23:36:06.000000000 +0100
@@ -23,10 +23,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{etoc}
- [2019/03/09 v1.09 Completely customisable TOCs (JFB)]
+ [2019/11/17 v1.09b Completely customisable TOCs (JFB)]
%%
%% Package: etoc
-%% Version: 1.09-2019/03/09
+%% Version: 1.09b-2019/11/17
%% License: LPPL 1.3c
%% Copyright (C) 2012-2019 Jean-Francois Burnol
%% <jfbu at free dot fr>
@@ -785,8 +785,8 @@
\let\tof@begingroup\@empty
\let\tof@endgroup \@empty
\@ifstar
- {\def\Etoc@aftertitlehook{}\Etoc@table@fcontents}
- {\let\Etoc@aftertitlehook\etocaftertitlehook\Etoc@table@fcontents}%
+ {\let\Etoc@aftertitlehook\@empty\Etoc@table@fcontents}
+ {\def\Etoc@aftertitlehook{\etocaftertitlehook}\Etoc@table@fcontents}%
}% \etoctableofcontents
\let\tableofcontents\etoctableofcontents
\newcommand*\localtableofcontents{%
@@ -796,8 +796,8 @@
\let\tof@begingroup\@empty
\let\tof@endgroup \@empty
\@ifstar
- {\def\Etoc@aftertitlehook{}\Etoc@localtable@fcontents}
- {\let\Etoc@aftertitlehook\etocaftertitlehook\Etoc@localtable@fcontents}%
+ {\let\Etoc@aftertitlehook\@empty\Etoc@localtable@fcontents}
+ {\def\Etoc@aftertitlehook{\etocaftertitlehook}\Etoc@localtable@fcontents}%
}% \localtableofcontents
\newcommand*\localtableofcontentswithrelativedepth[1]{%
\edef\Etoc@localtocdepth
@@ -1266,17 +1266,23 @@
\let\etocreportstylenomarks\etocbookstylenomarks
\def\etocmemoirtoctotocfmt #1#2{%
\def\Etoc@addsuitablecontentsline{\addcontentsline {toc}{#1}{#2}}%
- \renewcommand*\etocaftertitlehook{%
- \ifmem@em@starred@listof
- \else
- \phantomsection
- \aftergroup\Etoc@addsuitablecontentsline
- \fi}%
}
\def\etocmemoirstyle{%
\etocsettocstyle
- {\ensureonecol \par \begingroup \@nameuse {@tocmaketitle}
- \Etoc@aftertitlehook\let\Etoc@aftertitlehook\relax
+ {\ensureonecol \par \begingroup \phantomsection
+ \ifx\Etoc@aftertitlehook\@empty
+ \else
+ % non-starred variant
+ \ifmem@em@starred@listof
+ \else
+ \Etoc@addsuitablecontentsline
+ \fi
+ \fi
+ \@nameuse {@tocmaketitle} %<< space token here from memoir code
+ \ifx\Etoc@aftertitlehook\@empty
+ \else
+ \Etoc@aftertitlehook \let \Etoc@aftertitlehook \relax
+ \fi
\parskip \cftparskip \@nameuse {cfttocbeforelisthook}}
{\@nameuse {cfttocafterlisthook}\endgroup\restorefromonecol}}
\def\etocscrartclstyle{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/etoc.tlpobj new/tlpkg/tlpobj/etoc.tlpobj
--- old/tlpkg/tlpobj/etoc.tlpobj 2019-03-11 02:24:55.000000000 +0100
+++ new/tlpkg/tlpobj/etoc.tlpobj 2019-11-18 01:54:59.000000000 +0100
@@ -1,6 +1,6 @@
name etoc
category Package
-revision 50317
+revision 52842
shortdesc Completely customisable TOCs
relocated 1
longdesc The package gives the user complete control of how the entries
@@ -22,7 +22,7 @@
RELOC/tex/latex/etoc/etoc.sty
catalogue-also titletoc tocbasic
catalogue-ctan /macros/latex/contrib/etoc
-catalogue-date 2019-03-10 10:50:41 +0100
+catalogue-date 2019-11-17 14:31:10 +0100
catalogue-license lppl1.3c
catalogue-topics toc-etc etex
-catalogue-version 1.09
+catalogue-version 1.09b
++++++ etoolbox.doc.tar.xz ++++++
Binary files old/doc/latex/etoolbox/etoolbox.pdf and new/doc/latex/etoolbox/etoolbox.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/etoolbox/etoolbox.tex new/doc/latex/etoolbox/etoolbox.tex
--- old/doc/latex/etoolbox/etoolbox.tex 2018-08-19 23:24:51.000000000 +0200
+++ new/doc/latex/etoolbox/etoolbox.tex 2019-09-23 00:17:04.000000000 +0200
@@ -12,8 +12,8 @@
url={http://www.ctan.org/pkg/etoolbox/},
author={Philipp Lehman, Joseph Wright},
email={joseph.wright(a)morningstar2.co.uk},
- revision={v2.5e},
- date={2018/08/19}}
+ revision={v2.5h},
+ date={2019/09/21}}
\hypersetup{%
pdftitle={The etoolbox Package},
@@ -1297,6 +1297,15 @@
\begin{changelog}
+\begin{release}{2.5h}{2019-09-21}
+\item Add missing \cmd{gundef}
+\end{release}
+
+\begin{release}{2.5g}{2019-09-09}
+\item Update patching of \cmd{begin} and \cmd{end} in advance of \LaTeX{}
+ kernel changes
+\end{release}
+
\begin{release}{2.5f}{2018-08-18}
\item Fix issue with \cmd{ifdefempty}, \cmd{ifcsempty}, \cs{ifdefvoid}
and \cmd{ifcsvoid} when applied to macros expanding to space tokens
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/etoolbox.doc.tlpobj new/tlpkg/tlpobj/etoolbox.doc.tlpobj
--- old/tlpkg/tlpobj/etoolbox.doc.tlpobj 2019-02-28 03:35:51.000000000 +0100
+++ new/tlpkg/tlpobj/etoolbox.doc.tlpobj 2019-09-23 01:54:08.000000000 +0200
@@ -1,6 +1,6 @@
name etoolbox.doc
category Package
-revision 48436
+revision 52153
shortdesc doc files of etoolbox
relocated 1
docfiles size=75
++++++ etoolbox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/etoolbox/etoolbox.def new/tex/latex/etoolbox/etoolbox.def
--- old/tex/latex/etoolbox/etoolbox.def 2018-08-19 23:24:51.000000000 +0200
+++ new/tex/latex/etoolbox/etoolbox.def 2019-09-23 00:17:04.000000000 +0200
@@ -1,5 +1,5 @@
\ProvidesFile{etoolbox.def}
- [2018/08/19 v2.5f etoolbox debug messages (JAW)]
+ [2019/09/21 v2.5h etoolbox debug messages (JAW)]
\begingroup
\makeatletter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/etoolbox/etoolbox.sty new/tex/latex/etoolbox/etoolbox.sty
--- old/tex/latex/etoolbox/etoolbox.sty 2018-08-19 23:24:51.000000000 +0200
+++ new/tex/latex/etoolbox/etoolbox.sty 2019-09-23 00:17:04.000000000 +0200
@@ -1,5 +1,5 @@
% Copyright (c) 2007-2011 Philipp Lehman.
-% (c) 2015-2018 Joseph Wright
+% (c) 2015-2019 Joseph Wright
%
% Permission is granted to copy, distribute and/or modify this
% software under the terms of the LaTeX Project Public License
@@ -12,7 +12,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{etoolbox}
- [2018/08/19 v2.5f e-TeX tools for LaTeX (JAW)]
+ [2019/09/21 v2.5h e-TeX tools for LaTeX (JAW)]
\begingroup
\@ifundefined{eTeXversion}
@@ -268,8 +268,8 @@
{\@secondoftwo}
{\ifdefmacro{#1}
{\ifdefparam{#1}
- {\@secondoftwo}
- {\etb@ifdefempty{#1}}}
+ {\@secondoftwo}
+ {\etb@ifdefempty{#1}}}
{\@secondoftwo}}}
\def\etb@ifdefempty#1{%
@@ -295,8 +295,8 @@
{\@firstoftwo}
{\ifdefmacro{#1}
{\ifdefparam{#1}
- {\@secondoftwo}
- {\etb@ifdefempty{#1}}}
+ {\@secondoftwo}
+ {\etb@ifdefempty{#1}}}
{\@secondoftwo}}}
% {<csname>}{<true>}{<false>}
@@ -342,14 +342,14 @@
\ifdefmacro{#1}
{\ifdefmacro{#2}
{\begingroup
- \edef\etb@tempa{\expandafter\strip@prefix\meaning#1}%
- \edef\etb@tempb{\expandafter\strip@prefix\meaning#2}%
- \ifx\etb@tempa\etb@tempb
- \aftergroup\@firstoftwo
- \else
- \aftergroup\@secondoftwo
- \fi
- \endgroup}
+ \edef\etb@tempa{\expandafter\strip@prefix\meaning#1}%
+ \edef\etb@tempb{\expandafter\strip@prefix\meaning#2}%
+ \ifx\etb@tempa\etb@tempb
+ \aftergroup\@firstoftwo
+ \else
+ \aftergroup\@secondoftwo
+ \fi
+ \endgroup}
{\@secondoftwo}}
{\@secondoftwo}}
@@ -362,7 +362,7 @@
{\@secondoftwo}
{\expandafter\ifdefstrequal
\csname#1\expandafter\endcsname
- \csname#2\endcsname}}}
+ \csname#2\endcsname}}}
% {<cstoken>}{<string>}{<true>}{<false>}
@@ -888,6 +888,7 @@
% {<cstoken>}
\newrobustcmd{\undef}[1]{\let#1\etb@undefined}
+\newrobustcmd{\gundef}[1]{\global\let#1\etb@undefined}
% {<csname>}
@@ -1520,7 +1521,7 @@
{\noexpand\etb@listitem\noexpand\do{####1}%
\expandafter\noexpand
\csname etb@lst@\expandafter\@gobble\string#1\endcsname
- \noexpand\@nil}}}%
+ \noexpand\@nil}}}%
\@tempa}
\long\def\etb@lst@@notoken@do#1{%
@@ -1558,7 +1559,7 @@
{\noexpand\etb@listitem{####1}{####2}%
\expandafter\noexpand
\csname etb@lst@\expandafter\@gobble\string#1\endcsname
- {####1}\noexpand\@nil}}}%
+ {####1}\noexpand\@nil}}}%
\@tempa}
\long\def\etb@lst@@notoken@arg#1#2{%
@@ -1751,20 +1752,41 @@
\newrobustcmd{\AtBeginEnvironment}[1]{%
\csgappto{@begin@#1@hook}}
-\patchcmd\begin
- {\csname #1\endcsname}
- {\csuse{@begin@#1@hook}%
- \csname #1\endcsname}
- {}
- {\etb@warning{%
- Patching '\string\begin' failed!\MessageBreak
- '\string\AtBeginEnvironment' will not work\@gobble}}
+\ifcsname begin \endcsname
+ \expandafter\patchcmd\csname begin \endcsname
+ {\csname #1\endcsname}
+ {\csuse{@begin@#1@hook}%
+ \csname #1\endcsname}
+ {}
+ {\etb@warning{%
+ Patching '\string\begin' failed!\MessageBreak
+ '\string\AtBeginEnvironment' will not work\@gobble}}
+\else
+ \patchcmd\begin
+ {\csname #1\endcsname}
+ {\csuse{@begin@#1@hook}%
+ \csname #1\endcsname}
+ {}
+ {\etb@warning{%
+ Patching '\string\begin' failed!\MessageBreak
+ '\string\AtBeginEnvironment' will not work\@gobble}}
+\fi
% {<environment>}{<code>}
\newrobustcmd{\AtEndEnvironment}[1]{%
\csgappto{@end@#1@hook}}
+\ifcsname end \endcsname
+\expandafter\patchcmd\csname end \endcsname
+ {\csname end#1\endcsname}
+ {\csuse{@end@#1@hook}%
+ \csname end#1\endcsname}
+ {}
+ {\etb@warning{%
+ Patching '\string\end' failed!\MessageBreak
+ '\string\AtEndEnvironment' will not work\@gobble}}
+\else
\patchcmd\end
{\csname end#1\endcsname}
{\csuse{@end@#1@hook}%
@@ -1773,31 +1795,54 @@
{\etb@warning{%
Patching '\string\end' failed!\MessageBreak
'\string\AtEndEnvironment' will not work\@gobble}}
+\fi
% {<environment>}{<code>}
\newrobustcmd{\BeforeBeginEnvironment}[1]{%
\csgappto{@beforebegin@#1@hook}}
-\pretocmd\begin
- {\csuse{@beforebegin@#1@hook}}
- {}
- {\etb@warning{%
- Patching '\string\begin' failed!\MessageBreak
- '\string\BeforeBeginEnvironment' will not work\@gobble}}
+\ifcsname begin \endcsname
+ \expandafter\pretocmd\csname begin \endcsname
+ {\csuse{@beforebegin@#1@hook}}
+ {}
+ {\etb@warning{%
+ Patching '\string\begin' failed!\MessageBreak
+ '\string\BeforeBeginEnvironment' will not work\@gobble}}
+\else
+ \pretocmd\begin
+ {\csuse{@beforebegin@#1@hook}}
+ {}
+ {\etb@warning{%
+ Patching '\string\begin' failed!\MessageBreak
+ '\string\BeforeBeginEnvironment' will not work\@gobble}}
+\fi
% {<environment>}{<code>}
\newrobustcmd{\AfterEndEnvironment}[1]{%
\csgappto{@afterend@#1@hook}}
-\patchcmd\end
- {\if@ignore}
- {\csuse{@afterend@#1@hook}%
- \if@ignore}
- {}
- {\etb@warning{%
- Patching '\string\end' failed!\MessageBreak
- '\string\AfterEndEnvironment' will not work\@gobble}}
+\let\if@ignore\relax
+\ifcsname end \endcsname
+ \expandafter\patchcmd\csname end \endcsname
+ {\if@ignore}
+ {\csuse{@afterend@#1@hook}%
+ \if@ignore}
+ {}
+ {\etb@warning{%
+ Patching '\string\end' failed!\MessageBreak
+ '\string\AfterEndEnvironment' will not work\@gobble}}
+\else
+ \patchcmd\end
+ {\if@ignore}
+ {\csuse{@afterend@#1@hook}%
+ \if@ignore}
+ {}
+ {\etb@warning{%
+ Patching '\string\end' failed!\MessageBreak
+ '\string\AfterEndEnvironment' will not work\@gobble}}
+\fi
+\let\if@ignore\iffalse
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/etoolbox.tlpobj new/tlpkg/tlpobj/etoolbox.tlpobj
--- old/tlpkg/tlpobj/etoolbox.tlpobj 2019-02-28 03:35:51.000000000 +0100
+++ new/tlpkg/tlpobj/etoolbox.tlpobj 2019-09-23 01:54:08.000000000 +0200
@@ -1,6 +1,6 @@
name etoolbox
category Package
-revision 48436
+revision 52153
shortdesc e-TeX tools for LaTeX
relocated 1
longdesc The package is a toolbox of programming facilities geared
@@ -13,13 +13,13 @@
longdesc alternative ways of implementing some LaTeX kernel commands;
longdesc nevertheless, the package will not modify any part of the LaTeX
longdesc kernel.
-runfiles size=12
+runfiles size=13
RELOC/tex/latex/etoolbox/etoolbox.def
RELOC/tex/latex/etoolbox/etoolbox.sty
catalogue-contact-bugs https://github.com/josephwright/etoolbox/issues
catalogue-contact-repository https://github.com/josephwright/etoolbox/
catalogue-ctan /macros/latex/contrib/etoolbox
-catalogue-date 2018-08-19 12:54:37 +0200
+catalogue-date 2019-09-22 00:04:44 +0200
catalogue-license lppl1.3c
catalogue-topics macro-supp etex
-catalogue-version 2.5f
+catalogue-version 2.5h
++++++ europecv.doc.tar.xz ++++++
++++ 2006 lines of diff (skipped)
++++++ europecv.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvbg.def new/tex/latex/europecv/ecvbg.def
--- old/tex/latex/europecv/ecvbg.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvbg.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,22 +1,23 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation yet to be finished, 2019/03/19
+% Translation completed, 01/03/2020
\ProvidesFile{ecvbg.def}[europecv Bulgarian definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Лична информация}}
-\def\ecv@datekey{\ecv@utf{Aggiornato al}} % To be translated
-\def\ecv@namekey{\ecv@utf{Фамилия (ии), Собствено (и) име (на)}}
+\def\ecv@datekey{\ecv@utf{Актуализиран до}}
+\def\ecv@namekey{\ecv@utf{Собствено (и) име (на)~/ Фамилия (или)}}
\def\ecv@addresskey{\ecv@utf{Адрес}}
\def\ecv@telkey{\ecv@utf{Телефон}}
-\def\ecv@faxkey{\ecv@utf{Fax}}
+\def\ecv@faxkey{\ecv@utf{факс}}
\def\ecv@mobilekey{\ecv@utf{Мобилен телефон}}
-\def\ecv@officekey{\ecv@utf{Ufficio}} % To be translated
-\def\ecv@emailkey{\ecv@utf{E-mail}}
-\def\ecv@professionalkey{\ecv@utf{Email Professionale}} % To be translated
+\def\ecv@officekey{\ecv@utf{офис}}
+\def\ecv@emailkey{\ecv@utf{Е-мейл}}
+\def\ecv@professionalkey{\ecv@utf{Професионален имейл}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
-\def\ecv@homepagekey{\ecv@utf{Home page}}
+\def\ecv@homepagekey{\ecv@utf{Начална страница}}
\def\ecv@nationalitykey{\ecv@utf{Националност}}
\def\ecv@birthkey{\ecv@utf{Дата на раждане}}
\def\ecv@genderkey{\ecv@utf{Пол}}
@@ -39,6 +40,7 @@
\def\ecv@cefindepkey{\ecv@utf{Ниво на владеене - самостоятелно}}
\def\ecv@cefprofkey{\ecv@utf{Ниво на владеене - свободно}}
-\renewcommand*\ecvtitle{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
-r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]
+\renewcommand*{\ecvbranding}{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
+r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]}}
+\renewcommand*\ecvtitle{\ecvbranding\ecv@utf{
\Large\textbf{а\ecv@kern в\ecv@kern т\ecv@kern о\ecv@kern б\ecv@kern и\ecv@kern о\ecv@kern г\ecv@kern р\ecv@kern а\ecv@kern ф\ecv@kern и\ecv@kern я}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvca.def new/tex/latex/europecv/ecvca.def
--- old/tex/latex/europecv/ecvca.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvca.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,40 +1,41 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation yet to be finished, 2019/03/19
+% Translation completed, 01/03/2020
\ProvidesFile{ecvca.def}[europecv Catalan definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Informaci\'o personal}}
-\def\ecv@datekey{\ecv@utf{Aggiornato al}} % To be translated
-\def\ecv@namekey{\ecv@utf{Nom}}
+\def\ecv@datekey{\ecv@utf{Actualitzat fins avui}}
+\def\ecv@namekey{\ecv@utf{Nom~/ Cognoms}}
\def\ecv@addresskey{\ecv@utf{Adre\c{c}a }}
\def\ecv@faxkey{\ecv@utf{Fax}}
\def\ecv@telkey{\ecv@utf{Tel\`efon}}
\def\ecv@mobilekey{\ecv@utf{M\`obil: }}
-\def\ecv@officekey{\ecv@utf{Ufficio}} % To be translated
+\def\ecv@officekey{\ecv@utf{Oficina}}
\def\ecv@emailkey{\ecv@utf{Correu electr\`onic}}
-\def\ecv@professionalkey{\ecv@utf{Email Professionale}} % To be translated
+\def\ecv@professionalkey{\ecv@utf{correu electrònic professional}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
\def\ecv@nationalitykey{\ecv@utf{Nacionalitat}}
\def\ecv@birthkey{\ecv@utf{Data de naixement}}
-\def\ecv@genderkey{\ecv@utf{Gender}} % To be translated
+\def\ecv@genderkey{\ecv@utf{Gènere}}
% Footer
\def\ecv@pagekey{\ecv@utf{P\`agina}}
\def\ecv@cvofkey{\ecv@utf{Curriculum vit\ae\ de}}
% Language table
-\def\ecv@mothertonguekey{\ecv@utf{Mother tongue(s)}} % To be translated
-\def\ecv@assesskey{\ecv@utf{Self-assessment}} % To be translated
-\def\ecv@levelkey{\ecv@utf{European level}} % To be translated
-\def\ecv@understandkey{\ecv@utf{Understanding}} % To be translated
-\def\ecv@speakkey{\ecv@utf{Speaking}} % To be translated
-\def\ecv@writekey{\ecv@utf{Writing}} % To be translated
-\def\ecv@listenkey{\ecv@utf{Listening}} % To be translated
-\def\ecv@readkey{\ecv@utf{Reading}} % To be translated
-\def\ecv@interactkey{\ecv@utf{Spoken interaction}} % To be translated
-\def\ecv@productkey{\ecv@utf{Spoken production}} % To be translated
-\def\ecv@langfooterkey{\ecv@utf{Common European Framework of Reference (CEF) level}} % To be translated
-\def\ecv@cefbasickey{\ecv@utf{Basic user}} % To be translated
-\def\ecv@cefindepkey{\ecv@utf{Independent user}} % To be translated
-\def\ecv@cefprofkey{\ecv@utf{Proficient user}} % To be translated
+\def\ecv@mothertonguekey{\ecv@utf{Llengua materna}}
+\def\ecv@assesskey{\ecv@utf{Autoavaluació}}
+\def\ecv@levelkey{\ecv@utf{A nivell europeu}}
+\def\ecv@understandkey{\ecv@utf{Enteniment}}
+\def\ecv@speakkey{\ecv@utf{Parlant}}
+\def\ecv@writekey{\ecv@utf{Escriptura}}
+\def\ecv@listenkey{\ecv@utf{Escoltant}}
+\def\ecv@readkey{\ecv@utf{Lectura}}
+\def\ecv@interactkey{\ecv@utf{Interacció oral}}
+\def\ecv@productkey{\ecv@utf{Producció parlada}}
+\def\ecv@langfooterkey{\ecv@utf{Nivell Marc europeu comú de referència \ecv@upshape{(}CEF\ecv@upshape{)}}}
+\def\ecv@cefbasickey{\ecv@utf{Usuari bàsic}}
+\def\ecv@cefindepkey{\ecv@utf{Usuari independent}}
+\def\ecv@cefprofkey{\ecv@utf{Usuari competent}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvcs.def new/tex/latex/europecv/ecvcs.def
--- old/tex/latex/europecv/ecvcs.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvcs.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,19 +1,20 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation yet to be finished, 2019/03/19
+% Translation finished, 01/03/2020
\ProvidesFile{ecvcs.def}[europecv Czech definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Osobn{\'\i} {\'u}daje}}
-\def\ecv@datekey{\ecv@utf{Aggiornato al}} % To be translated
-\def\ecv@namekey{\ecv@utf{Jm{\'e}no / P{\v r}{\'\i}jmen{\'\i}}}
+\def\ecv@datekey{\ecv@utf{Aktualizováno na}}
+\def\ecv@namekey{\ecv@utf{Jm{\'e}no~/ P{\v r}{\'\i}jmen{\'\i}}}
\def\ecv@addresskey{\ecv@utf{Adresa}}
\def\ecv@telkey{\ecv@utf{Telefon}}
\def\ecv@faxkey{\ecv@utf{Fax}}
\def\ecv@mobilekey{\ecv@utf{Mobiln{\'\i} telefon}}
-\def\ecv@officekey{\ecv@utf{Ufficio}} % To be translated
+\def\ecv@officekey{\ecv@utf{Kancelář}}
\def\ecv@emailkey{\ecv@utf{E-mail}}
-\def\ecv@professionalkey{\ecv@utf{Email Professionale}} % To be translated
+\def\ecv@professionalkey{\ecv@utf{Profesionální e-mail}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
@@ -39,8 +40,8 @@
\def\ecv@cefindepkey{\ecv@utf{Samostatn{\'y} u{\v z}ivatel}}
\def\ecv@cefprofkey{\ecv@utf{Zku{\v s}en{\'y} u{\v z}ivatel}}
-\renewcommand*\ecvtitle{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
-r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]
+\renewcommand*{\ecvbranding}{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
+r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]}}
+\renewcommand*\ecvtitle{\ecvbranding\ecv@utf{
\Large\textbf{{\v z}\ecv@kern i\ecv@kern v\ecv@kern o\ecv@kern
t\ecv@kern o\ecv@kern p\ecv@kern i\ecv@kern s}}}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvda.def new/tex/latex/europecv/ecvda.def
--- old/tex/latex/europecv/ecvda.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvda.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,19 +1,20 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation yet to be finished, 2019/03/19
+% Translation finished, 01/03/2020
\ProvidesFile{ecvda.def}[europecv Danish definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Personlige oplysninger}}
-\def\ecv@datekey{\ecv@utf{Aggiornato al}} % To be translated
-\def\ecv@namekey{\ecv@utf{Efternavn(e), fornavn(e) og mellemnavn(e)}}
+\def\ecv@datekey{\ecv@utf{Opdateret til}}
+\def\ecv@namekey{\ecv@utf{Navn~/ Efternavn}}
\def\ecv@addresskey{\ecv@utf{Adresse(r)}}
\def\ecv@telkey{\ecv@utf{Telefon}}
\def\ecv@faxkey{\ecv@utf{Fax}}
\def\ecv@mobilekey{\ecv@utf{Mobil}}
-\def\ecv@officekey{\ecv@utf{Ufficio}} % To be translated
+\def\ecv@officekey{\ecv@utf{Kontor}}
\def\ecv@emailkey{\ecv@utf{E-mail-adresse(r)}}
-\def\ecv@professionalkey{\ecv@utf{Email Professionale}} % To be translated
+\def\ecv@professionalkey{\ecv@utf{Professionel e-mail}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
@@ -34,13 +35,14 @@
\def\ecv@readkey{\ecv@utf{L\ae se}}
\def\ecv@interactkey{\ecv@utf{Samtale}}
\def\ecv@productkey{\ecv@utf{Redeg\o re}}
-\def\ecv@langfooterkey{\ecv@utf{Europ\ae iske Referencerammes (CEF) niveau}}
+\def\ecv@langfooterkey{\ecv@utf{Europ\ae iske Referencerammes \ecv@upshape{(}CEF\ecv@upshape{)} niveau}}
\def\ecv@cefbasickey{\ecv@utf{Sprogbruger med basiskundskaber}}
\def\ecv@cefindepkey{\ecv@utf{Selvst\ae ndig sprogbruger}}
\def\ecv@cefprofkey{\ecv@utf{Kompetent sprogbruger}}
-\renewcommand*\ecvtitle{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
-r\ecv@kern o\ecv@kern p\ecv@kern \ae\ecv@kern i\ecv@kern s\ecv@kern k}\\[5pt]
+\renewcommand*{\ecvbranding}{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
+r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]}}
+\renewcommand*\ecvtitle{\ecvbranding\ecv@utf{
\Large\textbf{c\ecv@kern u\ecv@kern r\ecv@kern r\ecv@kern
i\ecv@kern c\ecv@kern u\ecv@kern l\ecv@kern u\ecv@kern m \ecv@kern v\ecv@kern
i\ecv@kern t\ecv@kern a\ecv@kern e}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvde.def new/tex/latex/europecv/ecvde.def
--- old/tex/latex/europecv/ecvde.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvde.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,11 +1,11 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvde.def}[europecv German definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Angaben zur Person}}
\def\ecv@datekey{\ecv@utf{Aktualisiert am}}
-\def\ecv@namekey{\ecv@utf{Nachname(n) / Vorname(n)}}
+\def\ecv@namekey{\ecv@utf{Nachname(n)~/ Vorname(n)}}
\def\ecv@addresskey{\ecv@utf{Adresse(n)}}
\def\ecv@telkey{\ecv@utf{Telefon}}
\def\ecv@mobilekey{\ecv@utf{Mobil}}
@@ -14,6 +14,7 @@
\def\ecv@emailkey{\ecv@utf{E-Mail}}
\def\ecv@professionalkey{\ecv@utf{E-Mail (gesch\"aftlich)}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
@@ -39,7 +40,8 @@
\def\ecv@cefindepkey{\ecv@utf{Selbst\"andige Sprachverwendung}}
\def\ecv@cefprofkey{\ecv@utf{Kompetente Sprachverwendung}}
-\renewcommand*\ecvtitle{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
-r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]
+\renewcommand*{\ecvbranding}{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
+r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]}}
+\renewcommand*\ecvtitle{\ecvbranding\ecv@utf{
\Large\textbf{L\ecv@kern e\ecv@kern b\ecv@kern e\ecv@kern
n\ecv@kern s\ecv@kern l\ecv@kern a\ecv@kern u\ecv@kern f\ecv@kern}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecven.def new/tex/latex/europecv/ecven.def
--- old/tex/latex/europecv/ecven.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecven.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,11 +1,11 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecven.def}[europecv English definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Personal information}}
\def\ecv@datekey{\ecv@utf{Updated \\}}
-\def\ecv@namekey{\ecv@utf{Surname / First name}}
+\def\ecv@namekey{\ecv@utf{Name~/ Surname}}
\def\ecv@addresskey{\ecv@utf{Address}}
\def\ecv@telkey{\ecv@utf{Telephone}}
\def\ecv@mobilekey{\ecv@utf{Mobile}}
@@ -14,6 +14,7 @@
\def\ecv@emailkey{\ecv@utf{Personal Email}}
\def\ecv@professionalkey{\ecv@utf{Professional Email}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
@@ -34,13 +35,14 @@
\def\ecv@readkey{\ecv@utf{Reading}}
\def\ecv@interactkey{\ecv@utf{Spoken interaction}}
\def\ecv@productkey{\ecv@utf{Spoken production}}
-\def\ecv@langfooterkey{\ecv@utf{Common European Framework of Reference (CEF) level}}
+\def\ecv@langfooterkey{\ecv@utf{Common European Framework of Reference \ecv@upshape{(}CEF\ecv@upshape{)} level}}
\def\ecv@cefbasickey{\ecv@utf{Basic user}}
\def\ecv@cefindepkey{\ecv@utf{Independent user}}
\def\ecv@cefprofkey{\ecv@utf{Proficient user}}
-\providecommand*{\ecvtitle}{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
-r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]
+\providecommand*{\ecvbranding}{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
+r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]}}
+\providecommand*{\ecvtitle}{\ecvbranding\ecv@utf{
\Large\textbf{C\ecv@kern u\ecv@kern r\ecv@kern r\ecv@kern
i\ecv@kern c\ecv@kern u\ecv@kern l\ecv@kern u\ecv@kern m \ecv@kern V\ecv@kern
-i\ecv@kern t\ecv@kern a\ecv@kern e}}}
\ No newline at end of file
+i\ecv@kern t\ecv@kern a\ecv@kern e}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecves.def new/tex/latex/europecv/ecves.def
--- old/tex/latex/europecv/ecves.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecves.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,11 +1,11 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecves.def}[europecv Spanish definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Informaci\'on personal}}
\def\ecv@datekey{\ecv@utf{Actualizado a}}
-\def\ecv@namekey{\ecv@utf{Apellido(s) / Nombre(s)}}
+\def\ecv@namekey{\ecv@utf{Nombre(s)~/ Apellido(s)}}
\def\ecv@addresskey{\ecv@utf{Direcci\'on(es)}}
\def\ecv@telkey{\ecv@utf{Tel\'efono(s)}}
\def\ecv@mobilekey{\ecv@utf{M\'ovil}}
@@ -14,6 +14,7 @@
\def\ecv@emailkey{\ecv@utf{Correo(s) electr\'onico(s)}}
\def\ecv@professionalkey{\ecv@utf{Correo(s) electr\'onico(s)} de trabajo}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
@@ -34,12 +35,11 @@
\def\ecv@readkey{\ecv@utf{Comprensi\'on de lectura}}
\def\ecv@interactkey{\ecv@utf{Interacci\'on oral}}
\def\ecv@productkey{\ecv@utf{Expresi\'on oral}}
-\def\ecv@langfooterkey{\ecv@utf{Nivel del Marco Europeo Com\'un de Referencia (MECR)}}
+\def\ecv@langfooterkey{\ecv@utf{Nivel del Marco Europeo Com\'un de Referencia \ecv@upshape{(}MECR\ecv@upshape{)}}}
\def\ecv@cefbasickey{\ecv@utf{Usuario b\'asico}}
\def\ecv@cefindepkey{\ecv@utf{Usuario independiente}}
\def\ecv@cefprofkey{\ecv@utf{Usuario competente}}
-\renewcommand*\ecvtitle{\ecv@utf{\Large\textbf{C\ecv@kern u\ecv@kern r\ecv@kern r\ecv@kern i\ecv@kern c\ecv@kern u\ecv@kern l\ecv@kern u\ecv@kern m \ecv@kern v\ecv@kern i\ecv@kern t\ecv@kern a\ecv@kern e}\\[5pt]
-\Large\textbf{E\ecv@kern u\ecv@kern
+\renewcommand*{\ecvbranding}{\\[5pt]\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}}}
-
+\renewcommand*\ecvtitle{\ecv@utf{\Large\textbf{C\ecv@kern u\ecv@kern r\ecv@kern r\ecv@kern i\ecv@kern c\ecv@kern u\ecv@kern l\ecv@kern u\ecv@kern m \ecv@kern v\ecv@kern i\ecv@kern t\ecv@kern a\ecv@kern e}}\ecvbranding}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvet.def new/tex/latex/europecv/ecvet.def
--- old/tex/latex/europecv/ecvet.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvet.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,11 +1,11 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvet.def}[europecv Estonian definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Isikuandmed}}
\def\ecv@datekey{\ecv@utf{Ajakohastatud}}
-\def\ecv@namekey{\ecv@utf{Perekonnanimi/eesnimi}}
+\def\ecv@namekey{\ecv@utf{Eesnimi~/ Perekonnanimi/}}
\def\ecv@addresskey{\ecv@utf{Aadress(id)}}
\def\ecv@telkey{\ecv@utf{Telefon(id)}}
\def\ecv@mobilekey{\ecv@utf{Mobiiltelefon}}
@@ -14,6 +14,7 @@
\def\ecv@emailkey{\ecv@utf{E-post(id)}}
\def\ecv@professionalkey{\ecv@utf{Töö E-post(id)}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
@@ -39,8 +40,9 @@
\def\ecv@cefindepkey{\ecv@utf{Iseseisev keelekasutus}}
\def\ecv@cefprofkey{\ecv@utf{Vaba keelekasutus}}
-\renewcommand*\ecvtitle{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
-r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s\ecv@kern i}\\[5pt]
+\renewcommand*{\ecvbranding}{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
+r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]}}
+\renewcommand*\ecvtitle{\ecvbranding\ecv@utf{
\Large\textbf{c\ecv@kern u\ecv@kern r\ecv@kern r\ecv@kern
i\ecv@kern c\ecv@kern u\ecv@kern l\ecv@kern u\ecv@kern m \ecv@kern v\ecv@kern
i\ecv@kern t\ecv@kern a\ecv@kern e}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvfi.def new/tex/latex/europecv/ecvfi.def
--- old/tex/latex/europecv/ecvfi.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvfi.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,11 +1,11 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvfi.def}[europecv Finnish definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Henkil\"otiedot}}
\def\ecv@datekey{\ecv@utf{Päivitetty}}
-\def\ecv@namekey{\ecv@utf{Suku-~ja etunimet}}
+\def\ecv@namekey{\ecv@utf{Etunimet~/ Suku-~ja}}
\def\ecv@addresskey{\ecv@utf{Osoitteet}}
\def\ecv@telkey{\ecv@utf{Puhelinnumero(t)}}
\def\ecv@mobilekey{\ecv@utf{Matkapuhelin}}
@@ -14,6 +14,7 @@
\def\ecv@emailkey{\ecv@utf{S\"ahk\"oposti(t)}}
\def\ecv@professionalkey{\ecv@utf{Ammatillinen Sähköposti}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
@@ -39,8 +40,9 @@
\def\ecv@cefindepkey{\ecv@utf{Itsen\"aisen kielenk\"aytt\"aj\"an kielitaito}}
\def\ecv@cefprofkey{\ecv@utf{Taitavan kielenk\"aytt\"aj\"an kielitaito}}
-\renewcommand*\ecvtitle{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
-r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s\ecv@kern}\\[5pt]
+\renewcommand*{\ecvbranding}{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
+r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]}}
+\renewcommand*\ecvtitle{\ecvbranding\ecv@utf{
\Large\textbf{a\ecv@kern n\ecv@kern s\ecv@kern i\ecv@kern
o\ecv@kern l\ecv@kern u\ecv@kern e\ecv@kern t\ecv@kern t\ecv@kern
e\ecv@kern l\ecv@kern o\ecv@kern m\ecv@kern a\ecv@kern l\ecv@kern
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvfr.def new/tex/latex/europecv/ecvfr.def
--- old/tex/latex/europecv/ecvfr.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvfr.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,11 +1,11 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvfr.def}[europecv French definitions]
% Informations personnelles
\def\ecv@infosectionkey{\ecv@utf{Informations personnelles}}
\def\ecv@datekey{\ecv@utf{Mis à jour pour}}
-\def\ecv@namekey{\ecv@utf{Nom(s) / Pr\'enom(s)}}
+\def\ecv@namekey{\ecv@utf{Pr\'enom(s)/ Nom(s)}}
\def\ecv@addresskey{\ecv@utf{Adresse(s)}}
\def\ecv@telkey{\ecv@utf{T\'el\'ephone(s)}}
\def\ecv@mobilekey{\ecv@utf{Portable}}
@@ -14,6 +14,7 @@
\def\ecv@emailkey{\ecv@utf{Courrier(s) \'electronique(s)}}
\def\ecv@professionalkey{\ecv@utf{E-mail Professionnel}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
@@ -34,11 +35,12 @@
\def\ecv@readkey{\ecv@utf{Lire}}
\def\ecv@interactkey{\ecv@utf{Prendre part \`a une conversation}}
\def\ecv@productkey{\ecv@utf{S'exprimer oralement en continu}}
-\def\ecv@langfooterkey{\ecv@utf{Niveau du Cadre europ\'een commun de r\'ef\'erence (CECR)}}
+\def\ecv@langfooterkey{\ecv@utf{Niveau du Cadre europ\'een commun de r\'ef\'erence \ecv@upshape{(}CECR\ecv@upshape{)}}}
\def\ecv@cefbasickey{\ecv@utf{Utilisateur \'el\'ementaire}}
\def\ecv@cefindepkey{\ecv@utf{Utilisateur Ind\'ependant}}
\def\ecv@cefprofkey{\ecv@utf{Utilisateur exp\'eriment\'e}}
-\renewcommand*\ecvtitle{\ecv@utf{\Large\textbf{C\ecv@kern u\ecv@kern r\ecv@kern r\ecv@kern i\ecv@kern c\ecv@kern u\ecv@kern l\ecv@kern u\ecv@kern m \ecv@kern v\ecv@kern i\ecv@kern t\ecv@kern a\ecv@kern e}\\[5pt]
-\Large\textbf{E\ecv@kern u\ecv@kern
+\renewcommand*{\ecvbranding}{\\[5pt]\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}}}
+\renewcommand*\ecvtitle{\ecv@utf{\Large\textbf{C\ecv@kern u\ecv@kern r\ecv@kern r\ecv@kern i\ecv@kern c\ecv@kern u\ecv@kern l\ecv@kern u\ecv@kern m \ecv@kern v\ecv@kern i\ecv@kern t\ecv@kern a\ecv@kern e
+}}\ecvbranding}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvgl.def new/tex/latex/europecv/ecvgl.def
--- old/tex/latex/europecv/ecvgl.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvgl.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,11 +1,11 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvgl.def}[europecv Galician definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Informaci\'on persoal}}
\def\ecv@datekey{\ecv@utf{Actualizado a}}
-\def\ecv@namekey{\ecv@utf{Apelidos / Nome}}
+\def\ecv@namekey{\ecv@utf{Nome~/ Apelidos}}
\def\ecv@addresskey{\ecv@utf{Direcci\'on}}
\def\ecv@faxkey{\ecv@utf{Fax}}
\def\ecv@telkey{\ecv@utf{Tel\'efono}}
@@ -14,6 +14,7 @@
\def\ecv@emailkey{\ecv@utf{Correo electr\'onico}}
\def\ecv@professionalkey{\ecv@utf{Correo profesional}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
@@ -34,12 +35,12 @@
\def\ecv@readkey{\ecv@utf{Comprensi\'on lectora}}
\def\ecv@interactkey{\ecv@utf{Interacci\'on oral}}
\def\ecv@productkey{\ecv@utf{Expresión oral}}
-\def\ecv@langfooterkey{\ecv@utf{Nivel do Marco Europeo Com\'un de Referencia (MECR)}}
+\def\ecv@langfooterkey{\ecv@utf{Nivel do Marco Europeo Com\'un de Referencia \ecv@upshape{(}MECR\ecv@upshape{)}}}
\def\ecv@cefbasickey{\ecv@utf{Usuario b\'asico}}
\def\ecv@cefindepkey{\ecv@utf{Usuario \mbox{independente}}}
\def\ecv@cefprofkey{\ecv@utf{Usuario \mbox{competente}}}
-\renewcommand*\ecvtitle{\ecv@utf{\Large\textbf{C\ecv@kern u\ecv@kern r\ecv@kern r\ecv@kern i\ecv@kern c\ecv@kern u\ecv@kern l\ecv@kern u\ecv@kern m \ecv@kern v\ecv@kern i\ecv@kern t\ecv@kern a\ecv@kern e}\\[5pt]
-\Large\textbf{E\ecv@kern u\ecv@kern
+\renewcommand*{\ecvbranding}{\\[5pt]\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}}}
-
+\renewcommand*\ecvtitle{\ecv@utf{\Large\textbf{C\ecv@kern u\ecv@kern r\ecv@kern r\ecv@kern i\ecv@kern c\ecv@kern u\ecv@kern l\ecv@kern u\ecv@kern m \ecv@kern v\ecv@kern i\ecv@kern t\ecv@kern a\ecv@kern e
+\ecvbranding}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvgr.def new/tex/latex/europecv/ecvgr.def
--- old/tex/latex/europecv/ecvgr.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvgr.def 2020-01-03 23:16:04.000000000 +0100
@@ -3,12 +3,12 @@
% WARNING: Requires the babel package loaded with options
% [english,greek] (at least) for \foreignlanguage
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvgr.def}[europecv Greek definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{\foreignlanguage{greek}{Προσωπικές πληροφορίες}}}
\def\ecv@datekey{\ecv@utf{\foreignlanguage{greek}{Επώνυμο (-α)~/ Όνομα (-τα)}}}
-\def\ecv@namekey{\ecv@utf{\foreignlanguage{greek}{Επώνυμο (-α)~/ Όνομα (-τα)}}}
+\def\ecv@namekey{\ecv@utf{\foreignlanguage{greek}{Όνομα (-α) ~/ Επώνυμο (-α)}}}
\def\ecv@addresskey{\ecv@utf{\foreignlanguage{greek}{Διεύθυνση~(-εις)}}}
\def\ecv@telkey{\ecv@utf{\foreignlanguage{greek}{Τηλέφωνο~(-α)}}}
\def\ecv@faxkey{\ecv@utf{Fax}}
@@ -17,6 +17,7 @@
\def\ecv@emailkey{\ecv@utf{\foreignlanguage{greek}{Ηλεκτρονικό ταχυδρομείο}}}
\def\ecv@professionalkey{\ecv@utf{\foreignlanguage{greek}{Επαγγελματικό μήνυμα ηλεκτρονικού ταχυδρομείου}}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
@@ -42,5 +43,6 @@
\def\ecv@cefindepkey{\ecv@utf{\foreignlanguage{greek}{Ανεξάρτητος χρήστης}}}
\def\ecv@cefprofkey{\ecv@utf{\foreignlanguage{greek}{Αυτάρκης χρήστης}}}
+\renewcommand*\ecvbranding{\ecv@utf{\Large\textbf{\foreignlanguage{english}{Europass}}}}
\renewcommand*\ecvtitle{\ecv@utf{\Large\textbf{\foreignlanguage{greek}{Β\ecv@kern ι\ecv@kern ο\ecv@kern γ\ecv@kern ρ\ecv@kern α\ecv@kern φ\ecv@kern ι\ecv@kern κ\ecv@kern ό}}\\[5pt]
-\Large\textbf{\foreignlanguage{greek}{σ\ecv@kern η\ecv@kern μ\ecv@kern ε\ecv@kern ί\ecv@kern ω\ecv@kern μ\ecv@kern α} \foreignlanguage{english}{Europass}}}}
+\Large\textbf{\foreignlanguage{greek}{σ\ecv@kern η\ecv@kern μ\ecv@kern ε\ecv@kern ί\ecv@kern ω\ecv@kern μ\ecv@kern α}}}\ecvbranding}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvhu.def new/tex/latex/europecv/ecvhu.def
--- old/tex/latex/europecv/ecvhu.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvhu.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,19 +1,20 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation yet to be finished, 2019/03/19
+% Translation finished, 01/03/2020
\ProvidesFile{ecvhu.def}[europecv Hungarian definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Szem\'elyi adatok}}
-\def\ecv@namekey{\ecv@utf{Vezet\'ekn\'ev/Ut\'on\'ev}}
-\def\ecv@datekey{\ecv@utf{Aggiornato al}} % To be translated
+\def\ecv@namekey{\ecv@utf{Név~/ Vezetéknév}}
+\def\ecv@datekey{\ecv@utf{Frissítve:}}
\def\ecv@addresskey{\ecv@utf{C\'\i m}}
\def\ecv@telkey{\ecv@utf{Telefonsz\'am}}
\def\ecv@mobilekey{\ecv@utf{Mobil}}
\def\ecv@faxkey{\ecv@utf{Fax}}
-\def\ecv@officekey{\ecv@utf{Ufficio}} % To be translated
+\def\ecv@officekey{\ecv@utf{Iroda}}
\def\ecv@emailkey{\ecv@utf{E-mail}}
-\def\ecv@professionalkey{\ecv@utf{Email Professionale}} % To be translated
+\def\ecv@professionalkey{\ecv@utf{Professzionális e-mail}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
@@ -34,13 +35,13 @@
\def\ecv@readkey{\ecv@utf{Olvas\'as}}
\def\ecv@interactkey{\ecv@utf{T\'arsalg\'as}}
\def\ecv@productkey{\ecv@utf{Folyamatos besz\'ed}}
-\def\ecv@langfooterkey{\ecv@utf{K\"oz\"os Eur\'opai Referenciakeret (KER) szintjei}}
+\def\ecv@langfooterkey{\ecv@utf{K\"oz\"os Eur\'opai Referenciakeret \ecv@upshape{(}KER\ecv@upshape{)} szintjei}}
\def\ecv@cefbasickey{\ecv@utf{alapszint\H u nyelvhaszn\'al\'o}}
\def\ecv@cefindepkey{\ecv@utf{\"on\'all\'o nyelvhaszn\'al\'o}}
\def\ecv@cefprofkey{\ecv@utf{mesterfok\'u nyelvhaszn\'al\'o}}
-\renewcommand*\ecvtitle{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
-r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]
+\renewcommand*{\ecvbranding}{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
+r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]}}
+\renewcommand*\ecvtitle{\ecvbranding\ecv@utf{
\Large\textbf{\"O\ecv@kern n\ecv@kern \'e\ecv@kern l\ecv@kern
e\ecv@kern t\ecv@kern r\ecv@kern a\ecv@kern j\ecv@kern z}}}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvis.def new/tex/latex/europecv/ecvis.def
--- old/tex/latex/europecv/ecvis.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvis.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,22 +1,23 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation yet to be finished, 2019/03/19
+% Translation completed, 01/03/2020
\ProvidesFile{ecvis.def}[europecv Icelandic definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Pers{\'o}nulegar uppl{\'y}singar}}
-\def\ecv@datekey{\ecv@utf{Aggiornato al}} % To be translated
-\def\ecv@namekey{\ecv@utf{Nafn}}
+\def\ecv@datekey{\ecv@utf{Uppfært til}}
+\def\ecv@namekey{\ecv@utf{Nafn~/ Eftirnafn}}
\def\ecv@addresskey{\ecv@utf{Heimilisfang/(-f{\"o}ng)}}
\def\ecv@telkey{\ecv@utf{S{\'\i}mi/(-ar)}}
\def\ecv@mobilekey{\ecv@utf{Fars{\'\i}mi}}
\def\ecv@faxkey{\ecv@utf{Fax}}
-\def\ecv@officekey{\ecv@utf{Ufficio}} % To be translated
+\def\ecv@officekey{\ecv@utf{Skrifstofu}}
\def\ecv@emailkey{\ecv@utf{Netfang/(-f{\"o}ng)}}
-\def\ecv@professionalkey{\ecv@utf{Email Professionale}} % To be translated
+\def\ecv@professionalkey{\ecv@utf{Faglegur tölvupóstur}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
-\def\ecv@homepagekey{\ecv@utf{Home page}}
+\def\ecv@homepagekey{\ecv@utf{Heimasíða}}
\def\ecv@nationalitykey{\ecv@utf{{\TH}j{\'o}{\dh}erni}}
\def\ecv@birthkey{\ecv@utf{F{\ae}{\dh}ingardagur}}
\def\ecv@genderkey{\ecv@utf{Kyn}}
@@ -39,7 +40,8 @@
\def\ecv@cefindepkey{\ecv@utf{Lengra komin(n)}}
\def\ecv@cefprofkey{\ecv@utf{Leikinn m{\'a}lnotandi}}
-\renewcommand*\ecvtitle{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
-r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]
+\renewcommand*{\ecvbranding}{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
+r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]}}
+\renewcommand*\ecvtitle{\ecvbranding\ecv@utf{
\Large\textbf{\ae\ecv@kern v\ecv@kern i\ecv@kern \'a\ecv@kern
g\ecv@kern r\ecv@kern i\ecv@kern p}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvit.def new/tex/latex/europecv/ecvit.def
--- old/tex/latex/europecv/ecvit.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvit.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,11 +1,11 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvit.def}[europecv Italian definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Informazioni personali}}
\def\ecv@datekey{\ecv@utf{Aggiornato al }}
-\def\ecv@namekey{\ecv@utf{Cognome nome}}
+\def\ecv@namekey{\ecv@utf{Nome~/ Cognome}}
\def\ecv@addresskey{\ecv@utf{Indirizzo}}
\def\ecv@telkey{\ecv@utf{Telefono}}
\def\ecv@mobilekey{\ecv@utf{Mobile}}
@@ -14,6 +14,7 @@
\def\ecv@emailkey{\ecv@utf{Email}}
\def\ecv@professionalkey{\ecv@utf{Email Professionale}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@nationalitykey{\ecv@utf{Nazionalit\`a}}
@@ -34,15 +35,16 @@
\def\ecv@readkey{\ecv@utf{Lettura}}
\def\ecv@interactkey{\ecv@utf{Interazione}}
\def\ecv@productkey{\ecv@utf{Produzione orale}}
-\def\ecv@langfooterkey{\ecv@utf{Quadro comune europeo di riferimento per le lingue}}
+\def\ecv@langfooterkey{\ecv@utf{Quadro comune europeo di riferimento per le lingue \ecv@upshape{(}ERL\ecv@upshape{)}}}
\def\ecv@cefbasickey{\ecv@utf{Livello elementare}}
\def\ecv@cefindepkey{\ecv@utf{Livello intermedio}}
\def\ecv@cefprofkey{\ecv@utf{Livello avanzato}}
+\renewcommand*{\ecvbranding}{\\[5pt]\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
+r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}}}
\renewcommand*{\ecvtitle}{\ecv@utf{%
\Large\textbf{C\ecv@kern u\ecv@kern r\ecv@kern r\ecv@kern
i\ecv@kern c\ecv@kern u\ecv@kern l\ecv@kern u\ecv@kern m \ecv@kern V\ecv@kern
-i\ecv@kern t\ecv@kern a\ecv@kern e}\\[5pt]
-\Large\textbf{E\ecv@kern u\ecv@kern r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}}}
+i\ecv@kern t\ecv@kern a\ecv@kern e}}\ecvbranding}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvlt.def new/tex/latex/europecv/ecvlt.def
--- old/tex/latex/europecv/ecvlt.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvlt.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,22 +1,23 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation yet to be finished, 2019/03/19
+% Translation completed, 01/03/2020
\ProvidesFile{ecvlt.def}[europecv Lithuanian definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Asmenin{\.e} informacija}}
-\def\ecv@datekey{\ecv@utf{Aggiornato al}} % To be translated
+\def\ecv@datekey{\ecv@utf{Atnaujinta}}
\def\ecv@namekey{\ecv@utf{Vardas~(-ai)~/ Pavard{\.e}~(-s)}}
\def\ecv@addresskey{\ecv@utf{Adresas~(-ai)}}
\def\ecv@telkey{\ecv@utf{Telefonas~(-ai)}}
\def\ecv@faxkey{\ecv@utf{Fax}}
\def\ecv@mobilekey{\ecv@utf{Mobilus}}
-\def\ecv@officekey{\ecv@utf{Ufficio}} % To be translated
+\def\ecv@officekey{\ecv@utf{Biuras}}
\def\ecv@emailkey{\ecv@utf{El. pa{\v s}tas~(-ai)}}
-\def\ecv@professionalkey{\ecv@utf{Email Professionale}} % To be translated
+\def\ecv@professionalkey{\ecv@utf{Profesionalus el. Paštas}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
-\def\ecv@homepagekey{\ecv@utf{Home page}}
+\def\ecv@homepagekey{\ecv@utf{Pagrindinis puslapis}}
\def\ecv@nationalitykey{\ecv@utf{Pilietyb{\.e}}}
\def\ecv@birthkey{\ecv@utf{Gimimo data}}
\def\ecv@genderkey{\ecv@utf{Lytis}}
@@ -39,8 +40,9 @@
\def\ecv@cefindepkey{\ecv@utf{Pa{\v z}eng{\k e}s vartotojas}}
\def\ecv@cefprofkey{\ecv@utf{{\k I}gud{\k e}s vartotojas}}
-\renewcommand*\ecvtitle{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
-r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]
+\renewcommand*{\ecvbranding}{\ecv@utf{\Large\textbf{E\ecv@kern u\ecv@kern
+r\ecv@kern o\ecv@kern p\ecv@kern a\ecv@kern s\ecv@kern s}\\[5pt]}}
+\renewcommand*\ecvtitle{\ecvbranding\ecv@utf{
\Large\textbf{G\ecv@kern y\ecv@kern v\ecv@kern e\ecv@kern
n\ecv@kern i\ecv@kern m\ecv@kern o \ecv@kern \ecv@kern a\ecv@kern p\ecv@kern
r\ecv@kern a\ecv@kern {\v s}\ecv@kern y\ecv@kern m\ecv@kern a\ecv@kern s}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvlv.def new/tex/latex/europecv/ecvlv.def
--- old/tex/latex/europecv/ecvlv.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvlv.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,11 +1,11 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvlv.def}[europecv Latvian definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Personas dati}}
\def\ecv@datekey{\ecv@utf{Atnaujinta iki al}}
-\def\ecv@namekey{\ecv@utf{Uzv{\=a}rds / V{\=a}rds}}
+\def\ecv@namekey{\ecv@utf{V{\=a}rds~/ Uzv{\=a}rds}}
\def\ecv@addresskey{\ecv@utf{Adrese}}
\def\ecv@telkey{\ecv@utf{T{\=a}lrunis}}
\def\ecv@mobilekey{\ecv@utf{Mobilais t{\=a}lrunis}}
@@ -14,6 +14,7 @@
\def\ecv@emailkey{\ecv@utf{E-pasts}}
\def\ecv@professionalkey{\ecv@utf{Profesionalus el. paštas}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvmt.def new/tex/latex/europecv/ecvmt.def
--- old/tex/latex/europecv/ecvmt.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvmt.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,12 +1,12 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvmt-utf8.def}[europecv Maltese definitions]
\inputencoding{utf8x}
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Tagħrif personali}}
def\ecv@datekey{\ecv@utf{Aġġornat għal}}
-\def\ecv@namekey{\ecv@utf{Kunjom(ijiet) Isem (Ismijiet)}}
+\def\ecv@namekey{\ecv@utf{Isem (Ismijiet)~/ Kunjom(ijiet)}}
\def\ecv@addresskey{\ecv@utf{L-indirizz}}
\def\ecv@faxkey{\ecv@utf{Fax}}
\def\ecv@telkey{\ecv@utf{In-numru tat-telefown}}
@@ -15,6 +15,7 @@
\def\ecv@emailkey{\ecv@utf{Email}}
\def\ecv@professionalkey{\ecv@utf{Email Professjonali}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
@@ -38,4 +39,4 @@
\def\ecv@langfooterkey{\ecv@utf{Qafas Ewropew ta’ Referenza Komuni għall-lingwi}}
\def\ecv@cefbasickey{\ecv@utf{Livell elementari}}
\def\ecv@cefindepkey{\ecv@utf{Livell intermedju}}
-\def\ecv@cefprofkey{\ecv@utf{Livell avvanzat}}
+\def\ecv@cefprofkey{\ecv@utf{Livell avvanzat}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvnl.def new/tex/latex/europecv/ecvnl.def
--- old/tex/latex/europecv/ecvnl.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvnl.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,19 +1,20 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvnl.def}[europecv Dutch definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Persoonsgegevens}}
def\ecv@datekey{\ecv@utf{Bijgewerkt naar}}
-\def\ecv@namekey{\ecv@utf{Achternaam~(-namen)/ Voornaam~(-namen)}}
+\def\ecv@namekey{\ecv@utf{Achternaam~(-namen)~/ Voornaam~(-namen)}}
\def\ecv@addresskey{\ecv@utf{Adres(sen)}}
\def\ecv@telkey{\ecv@utf{Telefoon(s)}}
\def\ecv@mobilekey{\ecv@utf{Mobiel}}
\def\ecv@faxkey{\ecv@utf{Fax}}
\def\ecv@officekey{\ecv@utf{Kantoor}}
\def\ecv@emailkey{\ecv@utf{E-mailadres(sen)}}
-\def\ecv@professionalkey{\ecv@utf{professionele e-mail}}
+\def\ecv@professionalkey{\ecv@utf{Professionele e-mail}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvno.def new/tex/latex/europecv/ecvno.def
--- old/tex/latex/europecv/ecvno.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvno.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,11 +1,11 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2018/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvno.def}[europecv Norwegian definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Personlige opplysninger}}
\def\ecv@datekey{\ecv@utf{Oppdatert til}}
-\def\ecv@namekey{\ecv@utf{Navn}}
+\def\ecv@namekey{\ecv@utf{Navn~/ Etternavn}}
\def\ecv@addresskey{\ecv@utf{Adresse(r)}}
\def\ecv@telkey{\ecv@utf{Telefonnumre}}
\def\ecv@faxkey{\ecv@utf{Fax}}
@@ -14,6 +14,7 @@
\def\ecv@emailkey{\ecv@utf{E-postadresse(r)}}
\def\ecv@professionalkey{\ecv@utf{Profesjonell e-post}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
@@ -34,7 +35,7 @@
\def\ecv@readkey{\ecv@utf{Lesing}}
\def\ecv@interactkey{\ecv@utf{Interaksjon}}
\def\ecv@productkey{\ecv@utf{Muntlig produksjon}}
-\def\ecv@langfooterkey{\ecv@utf{CEF-niv\aa. CEF (Common European Framework) er en felles europeisk referanseramme for spr\aa k.}}
+\def\ecv@langfooterkey{\ecv@utf{CEF-niv\aa. \ecv@upshape{(}CEF\ecv@upshape{)} er en felles europeisk referanseramme for spr\aa k.}}
\def\ecv@cefbasickey{\ecv@utf{Basisbruker}}
\def\ecv@cefindepkey{\ecv@utf{Selvstendig bruker}}
\def\ecv@cefprofkey{\ecv@utf{Avansert bruker}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvpl.def new/tex/latex/europecv/ecvpl.def
--- old/tex/latex/europecv/ecvpl.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvpl.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,22 +1,23 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvpl.def}[europecv Polish definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Dane osobowe}}
\def\ecv@datekey{\ecv@utf{Zaktualizowany do}}
-\def\ecv@namekey{\ecv@utf{Nazwisko / Imi\k{e}}}
+\def\ecv@namekey{\ecv@utf{Nazwisko~/ Imi\k{e}}}
\def\ecv@addresskey{\ecv@utf{Adres(y)}}
\def\ecv@telkey{\ecv@utf{Telefon(y)}}
\def\ecv@mobilekey{\ecv@utf{Tel. kom.}}
-\def\ecv@faxkey{\ecv@utf{Fax}}
+\def\ecv@faxkey{\ecv@utf{Faks}}
\def\ecv@officekey{\ecv@utf{Urząd}}
\def\ecv@emailkey{\ecv@utf{Email(e)}}
\def\ecv@professionalkey{\ecv@utf{Profesjonalny e-mail}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
-\def\ecv@homepagekey{\ecv@utf{Home page}}
+\def\ecv@homepagekey{\ecv@utf{Strona główna}}
\def\ecv@nationalitykey{\ecv@utf{Obywatelstwo}}
\def\ecv@birthkey{\ecv@utf{Data urodzenia}}
\def\ecv@genderkey{\ecv@utf{P{\l}e\'c}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvpt.def new/tex/latex/europecv/ecvpt.def
--- old/tex/latex/europecv/ecvpt.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvpt.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,11 +1,11 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvpt.def}[europecv Portuguese definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Informa\c{c}\~ao pessoal}}
\def\ecv@datekey{\ecv@utf{Atualizado a}}
-\def\ecv@namekey{\ecv@utf{Apelido(s) - Nome(s)}}
+\def\ecv@namekey{\ecv@utf{Nome(s)~/ Apelido(s)}}
\def\ecv@addresskey{\ecv@utf{Morada(s)}}
\def\ecv@telkey{\ecv@utf{Telefone(s)}}
\def\ecv@mobilekey{\ecv@utf{Telem\'ovel}}
@@ -14,6 +14,7 @@
\def\ecv@emailkey{\ecv@utf{\textit{E-mail} Pessoal}}
\def\ecv@professionalkey{\ecv@utf{\textit{E-mail} Profissional}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{\textit{Home page}}}
@@ -34,7 +35,7 @@
\def\ecv@readkey{\ecv@utf{Compreens\~ao escrita}}
\def\ecv@interactkey{\ecv@utf{Interac\c{c}\~ao oral}}
\def\ecv@productkey{\ecv@utf{Produ\c{c}\~ao oral}}
-\def\ecv@langfooterkey{\ecv@utf{N\'ivel do Quadro Europeu Comum de Refer\^encia (CECR)}}
+\def\ecv@langfooterkey{\ecv@utf{N\'ivel do Quadro Europeu Comum de Refer\^encia \ecv@upshape{(}CECR\ecv@upshape{)}}}
\def\ecv@cefbasickey{\ecv@utf{Utilizador elementar}}
\def\ecv@cefindepkey{\ecv@utf{Utilizador independente}}
\def\ecv@cefprofkey{\ecv@utf{Utilizador experiente}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvro.def new/tex/latex/europecv/ecvro.def
--- old/tex/latex/europecv/ecvro.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvro.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,6 +1,6 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvro.def}[europecv Romanian definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Informa{\c t}ii personale}}
@@ -14,6 +14,7 @@
\def\ecv@emailkey{\ecv@utf{E-mail}}
\def\ecv@professionalkey{\ecv@utf{E-mail profesional}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvsk.def new/tex/latex/europecv/ecvsk.def
--- old/tex/latex/europecv/ecvsk.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvsk.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,11 +1,11 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvsk.def}[europecv Slovak definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Osobn{\'e} {\'u}daje}}
\def\ecv@datekey{\ecv@utf{Aktualizované na}}
-\def\ecv@namekey{\ecv@utf{Priezvisko({\'a}) / Meno({\'a})}}
+\def\ecv@namekey{\ecv@utf{Meno({\'a})~/ Priezvisko({\'a})}}
\def\ecv@addresskey{\ecv@utf{Adresa(y)}}
\def\ecv@telkey{\ecv@utf{Telef\'on(y)}}
\def\ecv@mobilekey{\ecv@utf{Mobil}}
@@ -14,6 +14,7 @@
\def\ecv@emailkey{\ecv@utf{E-mail(y)}}
\def\ecv@professionalkey{\ecv@utf{Profesionálny e-mail}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
@@ -34,7 +35,7 @@
\def\ecv@readkey{\ecv@utf{{\v C}{\'\i}tanie}}
\def\ecv@interactkey{\ecv@utf{{\'U}stna interakcia}}
\def\ecv@productkey{\ecv@utf{Samostatn{\'y} {\'u}stny prejav}}
-\def\ecv@langfooterkey{\ecv@utf{{\'U}rove{\v n} podl'a Spolo{\v c}n{\'e}ho eur{\'o}pskeho referen{\v c}n{\'e}ho r{\'a}mca (CEF)}}
+\def\ecv@langfooterkey{\ecv@utf{{\'U}rove{\v n} podl'a Spolo{\v c}n{\'e}ho eur{\'o}pskeho referen{\v c}n{\'e}ho r{\'a}mca \ecv@upshape{(}CEF\ecv@upshape{)}}}
\def\ecv@cefbasickey{\ecv@utf{Pou{\v z}{\'\i}vatel' z{\'a}kladn{\'e}ho jazyka}}
\def\ecv@cefindepkey{\ecv@utf{Samostatn{\'y} pou{\v z}{\'\i}vatel'}}
\def\ecv@cefprofkey{\ecv@utf{Sk{\'u}sen{\'y} pou{\v z}{\'\i}vatel'}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvsl.def new/tex/latex/europecv/ecvsl.def
--- old/tex/latex/europecv/ecvsl.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvsl.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,6 +1,6 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvsl.def}[europecv Slovenian definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Osebni podatki}}
@@ -15,6 +15,7 @@
def\ecv@officekey{\ecv@utf{Urad}}
\def\ecv@professionalkey{\ecv@utf{Strokovni E-poštni naslov}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvsr.def new/tex/latex/europecv/ecvsr.def
--- old/tex/latex/europecv/ecvsr.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvsr.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,19 +1,20 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation completed on 2019/03/19
+% Translation completed on 01/03/2020
\ProvidesFile{ecvsr.def}[europecv Serbian definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Li{\v c}ni podaci}}
\def\ecv@datekey{\ecv@utf{Ažurirano}}
-\def\ecv@namekey{\ecv@utf{Prezime~/ ime}}
+\def\ecv@namekey{\ecv@utf{Ime~/ Prezime}}
\def\ecv@addresskey{\ecv@utf{Adresa}}
\def\ecv@telkey{\ecv@utf{Telefon}}
\def\ecv@mobilekey{\ecv@utf{Mobilan}}
\def\ecv@officekey{\ecv@utf{Ured}}
\def\ecv@faxkey{\ecv@utf{Fax}}
-\def\ecv@emailkey{\ecv@utf{E - mail}}
+\def\ecv@emailkey{\ecv@utf{E-mail}}
\def\ecv@professionalkey{\ecv@utf{Radnu E-poštu}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
@@ -34,12 +35,12 @@
\def\ecv@readkey{\ecv@utf{\v Citanje}}
\def\ecv@interactkey{\ecv@utf{Govorno sporazumevanje}}
\def\ecv@productkey{\ecv@utf{Samoizra\v zavanje}}
-\def\ecv@langfooterkey{\ecv@utf{Zajedni\v cki evropski referencni okvir za jezike(CEF)}}
+\def\ecv@langfooterkey{\ecv@utf{Zajedni\v cki evropski referencni okvir za jezike \ecv@upshape{(}CEF\ecv@upshape{)}}}
\def\ecv@cefbasickey{\ecv@utf{Osnovni korisnik}}
\def\ecv@cefindepkey{\ecv@utf{Samostalni korisnik}}
\def\ecv@cefprofkey{\ecv@utf{Osposobljeni korisnik}}
-\providecommand*{\ecvtitle}{\ecv@utf{\Large\textbf{E\ecv@kern v\ecv@kern
+\renewcommand*{\ecvtitle}{\ecv@utf{\Large\textbf{E\ecv@kern v\ecv@kern
r\ecv@kern o\ecv@kern p\ecv@kern s\ecv@kern k\ecv@kern i}\\[5pt]
\Large\textbf{C\ecv@kern u\ecv@kern r\ecv@kern r\ecv@kern
i\ecv@kern c\ecv@kern u\ecv@kern l\ecv@kern u\ecv@kern m \ecv@kern
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/ecvsv.def new/tex/latex/europecv/ecvsv.def
--- old/tex/latex/europecv/ecvsv.def 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/ecvsv.def 2020-01-03 23:16:04.000000000 +0100
@@ -1,19 +1,20 @@
%!TEX encoding = UTF-8 Unicode
%
-% Translation yet to be finished, 2019/03/19
+% Translation completed, 01/03/2020
\ProvidesFile{ecvsv.def}[europecv Swedish definitions]
% Personal information
\def\ecv@infosectionkey{\ecv@utf{Personuppgifter}}
-\def\ecv@datekey{\ecv@utf{Aggiornato al}} % To be translated
-\def\ecv@namekey{\ecv@utf{Efternamn / F\"ornamn}}
+\def\ecv@datekey{\ecv@utf{Uppdaterad till}}
+\def\ecv@namekey{\ecv@utf{F\"ornamn~/ Efternamn}}
\def\ecv@addresskey{\ecv@utf{Adress(er)}}
\def\ecv@telkey{\ecv@utf{Telefonnummer}}
\def\ecv@mobilekey{\ecv@utf{Mobil}}
\def\ecv@faxkey{\ecv@utf{Fax}}
-\def\ecv@officekey{\ecv@utf{Ufficio}} % To be translated
+\def\ecv@officekey{\ecv@utf{Office}}
\def\ecv@emailkey{\ecv@utf{E-postadress(er)}}
-\def\ecv@professionalkey{\ecv@utf{Email Professionale}} % To be translated
+\def\ecv@professionalkey{\ecv@utf{Professionell e-post}}
\def\ecv@skypekey{\ecv@utf{Skype}}
+\def\ecv@matrixriotkey{\ecv@utf{Matrix/Riot}}
\def\ecv@youtubekey{\ecv@utf{YouTube}}
\def\ecv@peckey{\ecv@utf{PEC}}
\def\ecv@homepagekey{\ecv@utf{Home page}}
@@ -34,7 +35,7 @@
\def\ecv@readkey{\ecv@utf{L\"asf\"orst\aa else}}
\def\ecv@interactkey{\ecv@utf{Muntlig interaktion}}
\def\ecv@productkey{\ecv@utf{Muntlig produktion}}
-\def\ecv@langfooterkey{\ecv@utf{Niv\aa n inom de Gemensamma europeiska referensramarna (CEF)}}
+\def\ecv@langfooterkey{\ecv@utf{Niv\aa n inom de Gemensamma europeiska referensramarna \ecv@upshape{(}CEF\ecv@upshape{)}}}
\def\ecv@cefbasickey{\ecv@utf{Den baspresterande spr\aa kanv\"andaren}}
\def\ecv@cefindepkey{\ecv@utf{Den sj\"alvst\"andige spr\aa kanv\"andaren}}
\def\ecv@cefprofkey{\ecv@utf{Den avancerade spr\aa kanv\"andaren}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/europecv/europecv.cls new/tex/latex/europecv/europecv.cls
--- old/tex/latex/europecv/europecv.cls 2019-03-19 22:27:58.000000000 +0100
+++ new/tex/latex/europecv/europecv.cls 2020-01-03 23:16:04.000000000 +0100
@@ -1,12 +1,12 @@
%!TEX encoding = UTF-8 Unicode
%
% European curriculum vitae class
-% Author: Nicola Vitacolonna (vitacolo(a)dimi.uniud.it) and Giuseppe Silano (giuseppe.silano(a)unisannio.it)
+% Author: Nicola Vitacolonna (nicola.vitacolonna(a)uniud.it) and Giuseppe Silano (giuseppe.silano(a)unisannio.it)
% This material is subject to the LaTeX Project Public License, either version 1.3
% See https://ctan.mirror.garr.it/mirrors/CTAN/help/Catalogue/licenses.lppl.html
% for the details of that license
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{europecv}[2019/03/19 (Unicode TeX detection) European curriculum vitae class]
+\ProvidesClass{europecv}[01/03/2020 (Unicode TeX detection) European curriculum vitae class]
% CV models and instructions:
% http://europass.cedefop.eu.int/htm/index.htm
@@ -18,6 +18,7 @@
% See comment below.
\newcommand\ecv@utf[1]{{\inputencoding{utf8x}#1}}
+\newcommand{\ecv@upshape}[1]{\upshape{#1}}
% Set language
\DeclareOption{english}{%
@@ -230,11 +231,11 @@
\DeclareOption{macukr}{\AtEndOfClass{\inputencoding{macukr}}}
% Set font
-\DeclareOption{helvetica}{%
+\DeclareOption{helvetica}{%
\renewcommand{\rmdefault}{phv}
\renewcommand{\sfdefault}{phv}
}
-\DeclareOption{arial}{%
+\DeclareOption{arial}{%
\renewcommand{\rmdefault}{ma1} % (this font is NOT installed by default!)
\renewcommand{\sfdefault}{ma1}
}
@@ -248,6 +249,13 @@
\AtEndOfPackage{\renewcommand*\ecvtitle{}}%
}
+% The nobranding function was created by Marc-Andre Hermanns
+
+% No branding (i.e., "Europass" logotype)
+\DeclareOption{nobranding}{%
+ \AtEndOfPackage{\renewcommand*\ecvbranding{}}%
+}
+
% Europass logo
\DeclareOption{logo}{%
\providecommand*\draweuropasslogo{%
@@ -255,7 +263,7 @@
}
\DeclareOption{nologo}{\renewcommand*\draweuropasslogo{}}
-% Flag pictures of the EC can be found at
+% Flag pictures of the EC can be found at
% http://europa.eu.int/abc/symbols/emblem/index_en.htm
\DeclareOption{noflag}{\providecommand*\draweuropeflag{}}
\DeclareOption{flagWB}{%
@@ -290,7 +298,7 @@
% Pass all other options (a4paper, 10pt, draft, openbib, etc...) to article
\DeclareOption*{%
\PassOptionsToClass{\CurrentOption}{article}%
-}
+}
\ExecuteOptions{english,noflag,logo,hrule} % Default options
@@ -300,7 +308,7 @@
%% start of addition (with permission) by David Carlisle
\ifx\Umathchar\@undefined
-%% encoding support for pdftex and classic TeX
+%% encoding support for pdftex and classic TeX
\RequirePackage{ucs}
\RequirePackage[utf8x]{inputenc}
\else
@@ -393,6 +401,7 @@
\newcommand*{\ecvemail}[1]{\def\ecv@email{#1}}
\newcommand*{\ecvprofessional}[1]{\def\ecv@professional{#1}}
\newcommand*{\ecvskype}[1]{\def\ecv@skype{#1}}
+\newcommand*{\ecvmatrixriot}[1]{\def\ecv@matrixriot{#1}}
\newcommand*{\ecvyoutube}[1]{\def\ecv@youtube{#1}}
\newcommand*{\ecvpec}[1]{\def\ecv@pec{#1}}
\newcommand*{\ecvhomepage}[1]{\def\ecv@homepage{#1}}
@@ -422,6 +431,7 @@
\ecvfootername{\ecv@name}
\ecvaddress{}
\ecvskype{}
+\ecvmatrixriot{}
\ecvyoutube{}
\ecvprofessional{}
\ecvtelephone{}
@@ -454,7 +464,7 @@
\tabularnewline[5pt]
\fi
\ifx\@empty\ecv@officeAddress \else
- \ecv@addresskey &\ecv@officeAddress
+ \ecv@addresskey &\ecv@officeAddress
\tabularnewline[5pt]
\fi
\fi
@@ -486,6 +496,9 @@
\ifx\@empty\ecv@skype\else
\ecv@skypekey &\ecv@skype \tabularnewline[5pt]
\fi
+\ifx\@empty\ecv@matrixriot\else
+\ecv@matrixriotkey &\ecv@matrixriot \tabularnewline[5pt]
+\fi
\ifx\@empty\ecv@youtube\else
\ecv@youtubekey &\ecv@youtube \tabularnewline[5pt]
\fi
@@ -632,7 +645,7 @@
% Text bullet
\newcommand{\ecvbullet}{\raisebox{.35ex}[0cm][0cm]{\tiny\textbullet}}
-
+
\newenvironment{europecv}{%
\ecvLeftColumnWidth{\ecv@leftcolwidth}
\setlength\arrayrulewidth{\ecv@rulewidth}
@@ -690,7 +703,7 @@
{\def\@noitemerr
{\@latex@warning{Empty `thebibliography' environment}}%
\endlist}
-
+
\newif\if@ecvitemstar
\newcommand\ecvitem{\@ifstar{\@ecvitemstartrue \@ecvitem}%
{\@ecvitemstarfalse\@ecvitem}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/europecv.tlpobj new/tlpkg/tlpobj/europecv.tlpobj
--- old/tlpkg/tlpobj/europecv.tlpobj 2019-03-20 02:24:12.000000000 +0100
+++ new/tlpkg/tlpobj/europecv.tlpobj 2020-03-04 23:50:52.000000000 +0100
@@ -1,6 +1,6 @@
name europecv
category Package
-revision 50470
+revision 54080
shortdesc Unofficial class for European curricula vitae
relocated 1
longdesc The europecv class is an unofficial LaTeX implementation of the
@@ -53,6 +53,5 @@
catalogue-also europasscv curve currvita cv esieecv vita
catalogue-contact-repository https://github.com/gsilano/EuropeCV
catalogue-ctan /macros/latex/contrib/europecv
-catalogue-date 2019-03-19 16:08:26 +0100
catalogue-license lppl
catalogue-topics cv class
++++++ euxm.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/euxm.tlpobj new/tlpkg/tlpobj/euxm.tlpobj
--- old/tlpkg/tlpobj/euxm.tlpobj 2019-02-28 03:35:55.000000000 +0100
+++ new/tlpkg/tlpobj/euxm.tlpobj 2020-03-04 23:50:52.000000000 +0100
@@ -1,6 +1,6 @@
name euxm
category Package
-revision 45696
+revision 54074
shortdesc extended Euler by DEK
relocated 1
longdesc Includes two additional characters needed for Concrete Math
++++++ exframe.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exframe/README.txt new/doc/latex/exframe/README.txt
--- old/doc/latex/exframe/README.txt 2019-01-21 22:40:19.000000000 +0100
+++ new/doc/latex/exframe/README.txt 2020-02-25 23:03:03.000000000 +0100
@@ -1,5 +1,5 @@
-exframe v3.1
-Copyright 2011-2019 Niklas Beisert
+exframe v3.4
+Copyright 2011-2020 Niklas Beisert
exframe is a LaTeX2e package which provides a general purpose
framework to describe and typeset exercises and exam questions
@@ -16,7 +16,16 @@
exframe.ins installation file
exframe.dtx source file
exframe.sty package file
- exfsmp1.tex sample latex file
+ exfsamp.tex standalone sample latex file
+ exfserm.tex multipart sample main file
+ exfser01.tex multipart sample sheet 1
+ exfser02.tex multipart sample sheet 2
+ exfser03.tex multipart sample sheet 3
+ exfseraa.tex multipart sample unused problems
+ exfserpe.tex multipart sample problem E
+ exfserpf.tex multipart sample problem F
+ exfsermk.sh multipart sample compile script
+ exfsermk.mak multipart sample makefile
exframe.pdf manual
The distribution consists of the files
@@ -25,7 +34,9 @@
Run "(pdf)latex exframe.dtx" to compile the manual exframe.pdf.
Run "latex exframe.ins" to create the package exframe.sty
-and the sample exfsmp1.tex.
+and the samples consisting of exfsamp.tex, exfserm.tex,
+exfser01.tex, exfser02.tex, exfser03.tex, exfseraa.tex,
+exfserpe.tex, exfserpf.tex, exfsermk.sh, exfsermk.mak.
Copy the file exframe.sty to an appropriate directory of your LaTeX
distribution, e.g. texmf-root/tex/latex/exframe.
Binary files old/doc/latex/exframe/exframe.pdf and new/doc/latex/exframe/exframe.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exframe/exfsamp.tex new/doc/latex/exframe/exfsamp.tex
--- old/doc/latex/exframe/exfsamp.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/exframe/exfsamp.tex 2020-02-25 23:03:03.000000000 +0100
@@ -0,0 +1,314 @@
+%%
+%% This is file `exfsamp.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% exframe.dtx (with options: `samplesingle')
+%%
+%% Copyright (C) 2011-2020 Niklas Beisert
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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.
+%%
+\NeedsTeXFormat{LaTeX2e}[1996/12/01]
+\ProvidesFile{exfsamp.tex}[2020/02/24 v3.4 standalone sample for exframe]
+\documentclass[12pt]{article}
+
+\usepackage{geometry}
+\geometry{layout=a4paper}
+\geometry{paper=a4paper}
+\geometry{margin=2.5cm}
+\parindent0pt
+\parskip0.5ex
+
+\usepackage{amsmath}
+\usepackage{hyperref}
+
+\PassOptionsToPackage{loadlang=en|de}{metastr}
+\PassOptionsToPackage{course=true}{metastr}
+%%\usepackage{metastr}
+%%\metasetlang{de}
+
+\usepackage[extstyle]{exframe}
+
+%%\exercisesetup{solutions=true}
+\exercisesetup{solutions=false}
+
+\exercisesetup{autolabelproblem=true}
+
+\exercisestyle{plainheader}
+\exerciseconfig{composeheaderbelowright}{\getsheetdata{points}}%
+
+\exerciseconfig{countersheet}{\Roman{sheet}}
+\exerciseconfig{countersubproblem}{\roman{subproblem})}
+\exerciseconfig{countersubproblemmax}{vii)}
+
+\exerciseconfig{insertsubprobleminfo}{%
+ \switchpoints{}{\addprobleminfo*{%
+ \hspace{-\getexerciseconfig{skipsubprobleminfo}}*}}%
+ {}{}{\getsubproblempoints{}}}
+
+\ifdefined\metaset
+\metasetterm[en]{sheet}{Exercise Sheet}
+\metasetterm[en]{sheets}{Exercise Sheets}
+\metasetterm[de]{sheet}{\"Ubungsblatt}
+\metasetterm[de]{sheets}{\"Ubungsbl\"atter}
+\else
+\exerciseconfig{termsheet}{\"Ubungsblatt}
+\exerciseconfig{termsheets}{\"Ubungsbl\"atter}
+\fi
+
+\exercisestyle{problempointsat=margin}
+\reversemarginpar
+\exerciseconfig{composepointsmargin}[1]{#1p.}
+\exerciseconfig{composepointspairmargin}[2]{%
+ \ifdim#2pt=0pt#1p.%
+ \else\ifdim#1pt=0pt+#2p.%
+ \else#1+#2p.%
+ \fi\fi}
+
+\exerciseconfig{styletitle}{\sffamily\bfseries}
+
+\exerciseconfig{skipproblembelow}{1.5cm}
+
+\exercisestyle{fracpoints}
+\exercisestyle{solutionbelow=problem}
+\exercisestyle{solutionsep}
+
+\exercisesetup{pdfdata=sheet}
+
+\ifdefined\metaset
+\metaset[sep]{subtitle}{, }
+\metaset{subtitle}{\ifsolutions\metatranslate[#1]{solutions} \fi%
+ \metaif[use]{sheettitle}
+ {\metapick[#1]{sheettitle}}
+ {\metapick[#1]{material}}}
+\metaset{author}{\exerciseifempty{\getsheetdata{author}}%
+ {\metapick[#1]{instructor}}{\metapick[#1]{sheetauthor}},
+ \metapick[#1]{institution}}
+\else
+\exerciseconfig{composemetasheet}[2]{\getexercisedata{course},
+ \ifsolutions\getexerciseconfig{termsolutions} \fi%
+ \exerciseifempty{#2}{\getexerciseconfig{termsheet} #1}{#2}}
+\exercisedata{title=%
+ {\getexercisedata{course},
+ \ifsolutions\getexercisedata{solutions} \fi%
+ \getexercisedata{material}}}
+\exercisedata{author=%
+ {\getexercisedata{instructor}, \getexercisedata{institution}}}
+\fi
+
+\ifdefined\metaset
+\metaset{institution}{Katharinen-Volksschule}
+\metaset[de]{course}{Mathematik}
+\metaset[en]{course}{Mathematics}
+\metaset{instructor}{J.\ G.\ B\"uttner}
+\metaset{period}{ca.\ 1786}
+\metaset[de]{material}{\"Ubungsaufgaben}
+\metaset[en]{material}{Exercise Problems}
+\else
+\exercisedata{institution={Katharinen-Volksschule}}
+\exercisedata{course={Mathematik}}
+\exercisedata{instructor={J.\ G.\ B\"uttner}}
+\exercisedata{period={ca.\ 1786}}
+\exercisedata{material={\"Ubungsaufgaben}}
+\fi
+
+\begin{document}
+
+\begin{sheet}[number=5,label={sheet5}]
+
+\begin{problem}[title={Sums},points=99+4]
+
+\exerciseloopstr{\getsubproblemlist{}}{c}%
+\hfill\begin{tabular}{c|\exerciseloopret|c}
+\exerciseloop{\getsubproblemlist{}}
+ {&\ref{\getexerciseconfig{labelsubproblem}{#1}}}
+&\ref{prob:\problemtag}\\\hline
+\getexerciseconfig{termpoints}
+\exerciseloop{\getsubproblemlist{}}{&\extractpoints{\getsubproblempoints{#1}}}
+&\extractpoints{\getproblempoints{}}
+\\
+extra
+\exerciseloop{\getsubproblemlist{}}{&\extractpoints*{\getsubproblempoints{#1}}}
+&\extractpoints*{\getproblempoints{}}
+\end{tabular}
+
+This problem deals with sums and series.
+
+\begin{subproblem}[points=2,difficulty=simple,label={\problemtag-simplesum}]
+Compute the sum
+\showpoints
+\begin{equation}
+1+2+3.
+\end{equation}
+
+\begin{solution}
+The result is
+\begin{equation}
+1+2+3=6.
+\end{equation}
+\end{solution}
+
+\end{subproblem}
+
+\begin{subproblem}[points=97+0.5,difficulty=lengthy]
+Compute the sum
+\begin{equation}
+1+2+3+\ldots+98+99+100.
+\end{equation}
+Keep calm and calculate!
+%%That ought to keep him occupied for a while
+\end{subproblem}
+
+\begin{solution}[author={C.\ F.\ Gau\ss}]
+We use the result $1+2+3=6$ from part \ref{\problemtag-simplesum}
+to jumpstart the calculation. The remaining sums yield
+\awardpoints*[1 for each remaining sum]{97}
+\begin{equation}
+6+4+5+\ldots+99+100=5050.
+\end{equation}
+Alternatively the summands can be grouped into pairs as follows:
+\begin{align}
+1+100&=101,\\
+2+99&=101,\\
+3+98&=101,\\
+\ldots &\nonumber\\
+50+51&=101.
+\end{align}
+These amount to 50 times the same number 101.
+Therefore the sum equals
+\begin{equation}
+1+2+\ldots+99+100=50\cdot 101=5050.
+\end{equation}
+\textit{Ligget se!} \awardpoints{97+0.5}
+\end{solution}
+
+You may give the final part a try:
+
+\begin{subproblem}[optional={optional},
+ difficulty={requires inspiration},points={+3.5}]
+Compute the series
+\showpoints
+\begin{equation}
+1+2+3+\ldots
+\end{equation}
+
+\begin{solution}
+The series is divergent, so the result is $\infty$ \awardpoints{+1}.
+\par
+However, after subtracting the divergent part,
+the result clearly is
+\begin{equation}
+\zeta(-1)=-\frac{1}{12}\,,
+\end{equation}
+where the zeta-function $\zeta(s)$ is defined by
+\begin{equation}
+\zeta(s):=\sum_{k=1}^\infty \frac{1}{k^s}\,.
+\end{equation}
+This definition holds only for $s>1$ where the sum is convergent,
+but one can continue the complex analytic function to $s<0$
+\awardpoints{+1.5}.
+\par
+Another way of understanding the result
+is to use the indefinite summation formula
+for arbitrary exponent $s$ in the summand
+(which also follows from the Euler--MacLaurin formula)
+\begin{equation}
+\sum_n n^s
+= \frac{n^{s+1}}{s+1}
+ -\sum_{j=0}^s \frac{\zeta(j-s)\,s!}{(s-j)!\,j!}\,n^j
+= \ldots - \zeta(-s)\,n^0.
+\end{equation}
+Curiously, the constant term with $j=0$ is just the desired result
+but with the wrong sign
+(in fact, the constant term of an indefinite sum is ambiguous;
+for the claim we merely set $j=0$
+in the expression which holds for others values of $j$)
+\awardpoints{+0.5}.
+In order to understand the sign,
+we propose that the above formula describes the regularised result
+for the sum with limits $+\infty$ and $n$
+\begin{equation}
+\sum_{k=+\infty}^n k^s
+\simeq \frac{n^{s+1}}{s+1}
+ -\sum_{j=0}^s \frac{\zeta(j-s)\,s!}{(s-j)!\,j!}\,n^j.
+\end{equation}
+Then we flip the summation limits of the desired sum
+to bring it into the above form
+\awardpoints{+0.5}
+\begin{equation}
+\sum_{k=1}^\infty k^s
+= -\sum_{k=\infty}^0 k^s
+\simeq \zeta(-s).
+\end{equation}
+\end{solution}
+
+\end{subproblem}
+
+\end{problem}
+
+\begin{problem}[points=1, difficulty=insane]
+Show that the equation
+\begin{equation}
+a^3+b^3=c^3
+\end{equation}
+has no positive integer solutions.
+\end{problem}
+
+\begin{solution}
+\normalmarginpar
+This is beyond the scope of this example.
+\marginpar{\footnotesize\raggedright does not fit here.\par}
+\end{solution}
+
+\ifsolutions\else
+\textbf{Grading:}\par
+\exerciseloopstr{\getproblemlist{}}{|c}
+\begin{tabular}{|c|\exerciseloopret||c|}\hline
+\getexerciseconfig{termsheet} \ref{sheet5}
+\exerciseloop{\getproblemlist{*}}
+ {&\ref{\getexerciseconfig{labelproblem}{#1}}}
+&total
+\\\hline
+value
+\exerciseloop{\getproblemlist{*}}
+ {&\extractpoints{\getproblempoints{#1}}}%
+&\extractpoints{\getsheetpoints{}}
+\\\hline
+\exerciseloop{\getproblemlist{*}}{&}
+&\\\hline
+\end{tabular}\qquad
+\exerciseloop{\getproblemlist{*}}{
+ \exerciseloopstr{\getsubproblemlist{#1}}{|c}
+ \ifnum\value{exerciseloop}>0\relax
+ \begin{tabular}{|c|\exerciseloopret||c|}\hline
+ \getexerciseconfig{termproblem} \ref{\getexerciseconfig{labelproblem}{#1}}
+ \exerciseloop{\getsubproblemlist{#1}}
+ {&\ref{\getexerciseconfig{labelsubproblem}{##1}}}
+ &total
+ \\\hline
+ value
+ \exerciseloop{\getsubproblemlist{#1}}
+ {&\extractpoints{\getsubproblempoints{##1}}}%
+ &\extractpoints{\getproblempoints{#1}}
+ \\\hline
+ \exerciseloop{\getsubproblemlist{#1}}{&}
+ &\\\hline
+ \end{tabular}\quad
+ \fi
+}
+\fi
+
+\end{sheet}
+
+\end{document}
+\endinput
+%%
+%% End of file `exfsamp.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exframe/exfser01.tex new/doc/latex/exframe/exfser01.tex
--- old/doc/latex/exframe/exfser01.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/exframe/exfser01.tex 2020-02-25 23:03:03.000000000 +0100
@@ -0,0 +1,110 @@
+%%
+%% This is file `exfser01.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% exframe.dtx (with options: `samplemultisheet1')
+%%
+%% Copyright (C) 2011-2020 Niklas Beisert
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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.
+%%
+%%\providecommand{\printsol}{n}
+\input{childdoc.def}
+\childdocof{exfserm}
+
+\begin{sheet}[due={2019-04-29}]
+
+\begin{problem}[title={Sample A}]
+
+\ifdefined\mpostuse
+\begin{mpostfig}[label={\problemtag-fig}]
+interim xu:=1.5cm;
+paths[1]:=fullcircle scaled 1xu;
+fillshape(paths[1], 0.7white) pensize(1pt);
+label(btex \figure etex, center(paths[1]));
+\end{mpostfig}
+\begin{onlysolutions}
+\begin{mpostfig}[label={\problemtag-solfig}]
+interim xu:=1.5cm;
+paths[1]:=fullcircle scaled 1xu;
+paths[2]:=((subpath (-2,2) of paths[1])--cycle) shifted (+0.5xu,0);
+paths[3]:=((subpath (2,6) of paths[1])--cycle) shifted (-0.5xu,0);
+fillshape(paths[2], 0.7white) pensize(1pt);
+fillshape(paths[3], 0.7white) pensize(1pt);
+\end{mpostfig}
+\end{onlysolutions}
+\fi
+
+\lorem
+
+\begin{subproblem}
+\lorem
+\begin{center}
+\ifdefined\mpostuse\mpostuse{\problemtag-fig}\else figure\fi
+\end{center}
+\lorem
+\end{subproblem}
+
+\begin{solution}
+\lorem
+\begin{center}
+\ifdefined\mpostuse\mpostuse{\problemtag-solfig}\else figure\fi
+\end{center}
+\lorem
+\end{solution}
+
+\begin{subproblem}
+\lorem
+\end{subproblem}
+
+\begin{solution}
+\lorem
+\end{solution}
+
+\lorem
+
+\begin{subproblem}
+\lorem
+\end{subproblem}
+
+\begin{solution}
+\lorem
+\end{solution}
+
+\end{problem}
+
+\turnover
+
+\begin{problem}[title={Sample B}]
+
+\lorem
+
+\begin{subproblem}
+\lorem
+\begin{solution}
+\lorem
+\end{solution}
+\end{subproblem}
+
+\begin{subproblem}
+\lorem
+\begin{solution}
+\lorem
+\end{solution}
+\end{subproblem}
+
+\end{problem}
+
+\end{sheet}
+
+\endinput
+%%
+%% End of file `exfser01.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exframe/exfser02.tex new/doc/latex/exframe/exfser02.tex
--- old/doc/latex/exframe/exfser02.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/exframe/exfser02.tex 2020-02-25 23:03:03.000000000 +0100
@@ -0,0 +1,108 @@
+%%
+%% This is file `exfser02.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% exframe.dtx (with options: `samplemultisheet2')
+%%
+%% Copyright (C) 2011-2020 Niklas Beisert
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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.
+%%
+%%\providecommand{\printsol}{n}
+\input{childdoc.def}
+\childdocof{exfserm}
+\begin{sheet}[due={2019-05-06}]
+\begin{problem}[title={Sample C}]
+
+\ifdefined\mpostuse
+\begin{mpostfig}[label={\problemtag-fig}]
+interim xu:=1.5cm;
+paths[1]:=fullcircle scaled 1xu;
+fillshape(paths[1], 0.7white) pensize(1pt);
+label(btex \figure etex, center(paths[1]));
+\end{mpostfig}
+\begin{onlysolutions}
+\begin{mpostfig}[label={\problemtag-solfig}]
+interim xu:=1.5cm;
+paths[1]:=fullcircle scaled 1xu;
+paths[2]:=((subpath (-2,2) of paths[1])--cycle) shifted (+0.5xu,0);
+paths[3]:=((subpath (2,6) of paths[1])--cycle) shifted (-0.5xu,0);
+fillshape(paths[2], 0.7white) pensize(1pt);
+fillshape(paths[3], 0.7white) pensize(1pt);
+\end{mpostfig}
+\end{onlysolutions}
+\fi
+
+\lorem
+
+\begin{subproblem}
+\lorem
+\begin{center}
+\ifdefined\mpostuse\mpostuse{\problemtag-fig}\else figure\fi
+\end{center}
+\lorem
+\end{subproblem}
+
+\begin{solution}
+\lorem
+\begin{center}
+\ifdefined\mpostuse\mpostuse{\problemtag-solfig}\else figure\fi
+\end{center}
+\lorem
+\end{solution}
+
+\begin{subproblem}
+\lorem
+\end{subproblem}
+
+\begin{solution}
+\lorem
+\end{solution}
+
+\lorem
+
+\begin{subproblem}
+\lorem
+\end{subproblem}
+
+\begin{solution}
+\lorem
+\end{solution}
+
+\end{problem}
+
+\turnover
+
+\begin{problem}[title={Sample D}]
+
+\lorem
+
+\begin{subproblem}
+\lorem
+\begin{solution}
+\lorem
+\end{solution}
+\end{subproblem}
+
+\begin{subproblem}
+\lorem
+\begin{solution}
+\lorem
+\end{solution}
+\end{subproblem}
+
+\end{problem}
+
+\end{sheet}
+
+\endinput
+%%
+%% End of file `exfser02.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exframe/exfser03.tex new/doc/latex/exframe/exfser03.tex
--- old/doc/latex/exframe/exfser03.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/exframe/exfser03.tex 2020-01-11 23:12:12.000000000 +0100
@@ -0,0 +1,32 @@
+%%
+%% This is file `exfser03.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% exframe.dtx (with options: `samplemultisheet3')
+%%
+%% Copyright (C) 2011-2020 Niklas Beisert
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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.
+%%
+%%\providecommand{\printsol}{n}
+\input{childdoc.def}
+\childdocof{exfserm}
+\begin{sheet}[due={2019-05-13}]
+\input{exfserpe}
+
+\turnover
+
+\input{exfserpf}
+\end{sheet}
+
+\endinput
+%%
+%% End of file `exfser03.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exframe/exfseraa.tex new/doc/latex/exframe/exfseraa.tex
--- old/doc/latex/exframe/exfseraa.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/exframe/exfseraa.tex 2020-02-25 23:03:03.000000000 +0100
@@ -0,0 +1,108 @@
+%%
+%% This is file `exfseraa.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% exframe.dtx (with options: `samplemultisheeta')
+%%
+%% Copyright (C) 2011-2020 Niklas Beisert
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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.
+%%
+%%\providecommand{\printsol}{n}
+\input{childdoc.def}
+\childdocof{exfserm}
+\begin{sheet}[title={unused problems}]
+\begin{problem}[title={Sample X}]
+
+\ifdefined\mpostuse
+\begin{mpostfig}[label={\problemtag-fig}]
+interim xu:=1.5cm;
+paths[1]:=fullcircle scaled 1xu;
+fillshape(paths[1], 0.7white) pensize(1pt);
+label(btex \figure etex, center(paths[1]));
+\end{mpostfig}
+\begin{onlysolutions}
+\begin{mpostfig}[label={\problemtag-solfig}]
+interim xu:=1.5cm;
+paths[1]:=fullcircle scaled 1xu;
+paths[2]:=((subpath (-2,2) of paths[1])--cycle) shifted (+0.5xu,0);
+paths[3]:=((subpath (2,6) of paths[1])--cycle) shifted (-0.5xu,0);
+fillshape(paths[2], 0.7white) pensize(1pt);
+fillshape(paths[3], 0.7white) pensize(1pt);
+\end{mpostfig}
+\end{onlysolutions}
+\fi
+
+\lorem
+
+\begin{subproblem}
+\lorem
+\begin{center}
+\ifdefined\mpostuse\mpostuse{\problemtag-fig}\else figure\fi
+\end{center}
+\lorem
+\end{subproblem}
+
+\begin{solution}
+\lorem
+\begin{center}
+\ifdefined\mpostuse\mpostuse{\problemtag-solfig}\else figure\fi
+\end{center}
+\lorem
+\end{solution}
+
+\begin{subproblem}
+\lorem
+\end{subproblem}
+
+\begin{solution}
+\lorem
+\end{solution}
+
+\lorem
+
+\begin{subproblem}
+\lorem
+\end{subproblem}
+
+\begin{solution}
+\lorem
+\end{solution}
+
+\end{problem}
+
+\turnover
+
+\begin{problem}[title={Sample Y}]
+
+\lorem
+
+\begin{subproblem}
+\lorem
+\begin{solution}
+\lorem
+\end{solution}
+\end{subproblem}
+
+\begin{subproblem}
+\lorem
+\begin{solution}
+\lorem
+\end{solution}
+\end{subproblem}
+
+\end{problem}
+
+\end{sheet}
+
+\endinput
+%%
+%% End of file `exfseraa.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exframe/exfserm.tex new/doc/latex/exframe/exfserm.tex
--- old/doc/latex/exframe/exfserm.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/exframe/exfserm.tex 2020-02-25 23:03:03.000000000 +0100
@@ -0,0 +1,213 @@
+%%
+%% This is file `exfserm.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% exframe.dtx (with options: `samplemultimain')
+%%
+%% Copyright (C) 2011-2020 Niklas Beisert
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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.
+%%
+\NeedsTeXFormat{LaTeX2e}[1996/12/01]
+\ProvidesFile{exfserm.tex}[2020/02/24 v3.4 multipart sample for exframe]
+\input{childdoc.def}
+\childdocmain{exfserm}
+
+\ifchilddoc
+\providecommand{\printsol}{y}
+\else
+\providecommand{\printsol}{n}
+\fi
+\providecommand{\draftver}{y}
+\newif\ifdraft\if\draftver y\drafttrue\else\draftfalse\fi
+
+\documentclass[12pt]{article}
+
+\RequirePackage{graphicx}
+
+\PassOptionsToPackage{bookmarks=\ifchilddoc false\else true\fi}{hyperref}
+\PassOptionsToPackage{bookmarksopen=true}{hyperref}
+\RequirePackage{hyperref}
+
+\ifdraft
+\PassOptionsToPackage{draft}{metastr}
+\fi
+\IfFileExists{hyperxmp.sty}{}{\PassOptionsToPackage{hyperxmp=false}{metastr}}
+\RequirePackage[course]{metastr}
+\metaset[aux]{writepdf}{}
+\metaset[rights]{writepdf}{}
+
+\RequirePackage[extdata,extstyle]{exframe}
+
+\if\printsol n
+\exercisesetup{solutions=false}
+\exercisesetup{twoside=true}
+\else
+\exercisesetup{solutions=true}
+\exercisesetup{twoside=false}
+\ifdraft
+\exercisesetup{solutionbuf=false}
+\fi
+\fi
+
+%%\if\printsol n\else\showprobleminfo{author,source,recycle}\fi
+
+\exercisesetup{autolabelproblem}
+\exercisestyle{contents,solutionsep}
+\ifchilddocmanual\else
+\exercisestyle{pagebysheet,problembysheet,equationbysheet,sheetequation}
+\fi
+\exercisestyle{solutionbelow={problem}}
+\ifchilddoc\ifchilddocmanual\else\exercisesetup{pdfdata=sheet}\fi\fi
+
+\metasetlang{en-GB}
+
+\metasetterm[en]{sheet}{sheet}
+\metasetterm[en]{sheets}{sample sheets}
+\metasetterm[en]{solution}{Solution}
+\metasetterm[en]{solutions}{solutions}
+
+\RequirePackage[a4paper,margin=2.5cm]{geometry}
+\pagestyle{plain}
+\setlength\parindent{0pt}
+\setlength\parskip{\smallskipamount}
+\setlength\overfullrule{5pt}
+\newcommand{\turnover}{\ifsolutions\else\vfill%
+ \hfill{\mathversion{bold}$\longrightarrow$}\newpage\fi}
+
+\exercisestyle{plainheader}
+\exerciseconfig{composeheaderbelowright}
+ {\sheetdataempty{editdate}{}{version: \getsheetdata{editdate}}}
+\ifchilddoc\ifsolutions\else
+ \exerciseconfig{composeheaderbelowright}
+ {\sheetdataempty{due}{}{due: \getsheetdata{due}}}
+\fi\fi
+
+\def\lorem{Lorem ipsum dolor sit amet, consectetur adipisici elit,
+ sed eiusmod tempor incidunt ut labore et dolore magna aliqua.
+ Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris
+ nisi ut aliquid ex ea commodi consequat.
+ Quis aute iure reprehenderit in voluptate velit esse
+ cillum dolore eu fugiat nulla pariatur.
+ Excepteur sint obcaecat cupiditat non proident,
+ sunt in culpa qui officia deserunt mollit anim id est laborum.\par}
+
+\IfFileExists{mpostinl.sty}{\RequirePackage{mpostinl}}{}
+\ifdefined\mpostsetup
+
+\mpostsetup{checksum}
+\ifchilddoc\ifdraft\mpostsetup{now,nowall}\fi\fi
+\ifchilddocmanual\else\mpostsetup{numberwithin={sheet}}\fi
+
+\mpostsetup{globaldef=true}
+\begin{mposttex}
+\def\figure{figure}
+\end{mposttex}
+\begin{mpostdef}
+path paths[];
+newinternal numeric xu;
+xu:=1cm;
+def pensize(expr s)=withpen pencircle scaled s enddef;
+def fillshape(expr p,c)=
+ fill p withcolor c;
+ draw p
+enddef;
+\end{mpostdef}
+\mpostsetup{globaldef=false}
+
+\fi
+
+\metaset{course}{exframe package samples}
+\metaset{instructor}{N.\ Beisert}
+\metaset{author}{Niklas Beisert, \metapick[#1]{institution}}
+\metaset{institution}{exframe academy}
+\metaset{period}{spring 2019}
+\metaset{copyrightdate}{2019--2020}
+
+\metaset{material}{\metatranslate[#1]{sheets}}
+\exerciseconfig{composetitlesheet}[2]{\exerciseifempty{#2}%
+ {\ifsolutions\metaterm{solutions}\else%
+ \metaterm{sheet}\fi\ #1}%
+ {\ifsolutions\metaterm{solutions} \fi #2}}
+
+\ifchilddoc
+\metaset{partof}{\metatranslate[#1]{sheets} \metapick[#1]{course}}
+\fi
+
+\metaset[sep]{draft}{ -- }
+\metaset[sep]{subtitle}{, }
+\metaset{subtitle}{\ifsolutions\metatranslate[#1]{solutions} \fi%
+ \metaif[use]{sheettitle}{\metapick[#1]{sheettitle}}{\metapick[#1]{material}}}
+\metaset{subject}{Lecture Series,
+ \metapick[#1]{institution}, \metapick[#1]{period}}
+
+\metaset{copyrightowner}{\metapick[#1]{author}}
+\ifchilddoc
+\metacopyright{doc}
+\else
+\metacopyright{doc-parts}
+\fi
+\metaset{licenseprovider}{of \metapick[#1]{institution}}
+\metalicense{consent}
+
+\ifsolutions\else\ifdraft\else
+\metalicensecc{by-sa}
+\fi\fi
+
+\begin{document}
+
+\def\tmp{}
+\ifchilddocmanual
+\def\tmp{\end{document}}
+\input{\childdocname}
+\fi\tmp
+
+\setcounter{section}{-1}
+\begingroup\ifchilddoc\else
+\renewcommand{\thepage}{\arabic{page}}
+
+\pdfbookmark[1]{\metaterm{title}}{title}
+\thispagestyle{empty}
+\vspace*{\fill}
+\begin{center}
+\metapick[course]{titletext}
+\end{center}
+\vspace*{\fill}\vspace*{\fill}
+\newpage
+
+\phantomsection\pdfbookmark[1]{\metaterm{copyright}}{copyright}
+\thispagestyle{empty}
+\vspace*{\fill}\vspace*{\fill}
+\begin{center}\begin{minipage}{11cm}\raggedright
+\metapick[print]{rightstext}
+\end{minipage}\end{center}
+\vspace*{\fill}\vspace*{\fill}\vspace*{\fill}
+\newpage
+
+\makeatletter\renewcommand\(a)pnumwidth{2.4em}\makeatother
+\setcounter{tocdepth}{2}
+\phantomsection\pdfbookmark[1]{\metaterm{contents}}{contents}
+{\parskip0pt\tableofcontents}
+\exercisecleardoublepage\setcounter{page}{1}
+
+\fi\endgroup
+
+\include{exfser01}
+\include{exfser02}
+\include{exfser03}
+
+\def\jobnameunused{exfseraa}
+\ifx\childdocname\jobnameunused\include{\jobnameunused}\fi
+
+\end{document}
+\endinput
+%%
+%% End of file `exfserm.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exframe/exfsermk.mak new/doc/latex/exframe/exfsermk.mak
--- old/doc/latex/exframe/exfsermk.mak 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/exframe/exfsermk.mak 2020-02-25 23:03:03.000000000 +0100
@@ -0,0 +1,49 @@
+SRCMAIN = exfserm
+SRCSEC = exfser
+SRCPRB = exfserp
+SCRIPT = exfsermk.sh
+MAKEFILE = exfsermk.mak
+TRGLIST = Problems Solutions
+SECNUM = 01 02 03 aa
+PREREQS = $(SRCMAIN).tex
+
+SRCSECFILES = $(SECNUM:%=$(SRCSEC)%.tex)
+TRGMAINFILES = $(foreach trg,$(TRGLIST),$(trg).pdf)
+TRGSECFILES = $(foreach trg,$(TRGLIST),$(trg).pdf $(SECNUM:%=$(trg)%.pdf))
+GENFILES = $(foreach trg,$(TRGLIST),$(trg).tex $(SECNUM:%=$(trg)%.tex))
+BAKFILES = $(PREREQS) $(SRCSECFILES) $(GENFILES)\
+ $(MAKEFILE) $(SCRIPT) $(SRCPRB)*
+
+default: sheets ;
+main: $(TRGMAINFILES) ;
+sheets: $(TRGSECFILES) ;
+sheet%: $(foreach trg,$(TRGLIST),$(trg)%.pdf) ;
+all: main sheets ;
+sources: $(GENFILES) ;
+
+$(TRGMAINFILES): $(SRCSECFILES) $(PREREQS)
+ bash ./$(SCRIPT) $@
+$(word 1,$(TRGLIST))%.pdf: $(SRCSEC)%.tex $(PREREQS)
+ bash ./$(SCRIPT) $@
+$(word 2,$(TRGLIST))%.pdf: $(SRCSEC)%.tex $(PREREQS)
+ bash ./$(SCRIPT) $@
+$(GENFILES):
+ bash ./$(SCRIPT) $@
+
+touch:
+ touch $(SRCMAIN).tex
+clean:
+ rm -f $(foreach ext,.aux .log,$(SECNUM:%=$(SRCSEC)%$(ext)))
+ rm -f $(foreach trg,$(TRGLIST),$(SECNUM:%=$(trg)%.log) $(trg).log)
+ rm -f $(foreach ext,.aux .log .out .toc,$(SRCMAIN)$(ext))
+ rm -f $(foreach ext,.mp .mpx -*.mps,$(SRCMAIN)$(ext))
+ rm -f $(foreach ext,-tmp.log -tmp.mp -tmp.mpx,$(SRCMAIN)$(ext))
+ rm -f mpxerr.tex mpxerr.log mpxerr.dvi texput.log
+ rm -f $(patsubst %,$(SRCPRB)*%,.aux .log .mp .mpx -*.mps)
+ rm -f $(patsubst %,$(SRCPRB)*%,-tmp.log -tmp.mp -tmp.mpx)
+clean-bak:
+ rm -f $(BAKFILES:%=%~) $(BAKFILES:%=%.bak)
+clean-all: clean
+ rm -f $(TRGSECFILES) $(TRGMAINFILES) $(GENFILES)
+ rm -f $(SECNUM:%=$(SRCSEC)%.pdf) $(SRCMAIN).pdf
+ rm -f $(SRCPRB)*.pdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exframe/exfsermk.sh new/doc/latex/exframe/exfsermk.sh
--- old/doc/latex/exframe/exfsermk.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/exframe/exfsermk.sh 2020-02-25 23:03:03.000000000 +0100
@@ -0,0 +1,104 @@
+#!/bin/bash
+
+srcmain="exfserm"
+srcsec="exfser"
+trglist=(Problems Solutions)
+trgsol=(n y)
+secnum="01 02 03 aa"
+
+if [ -z $1 ]
+then
+ echo "Usage:
+ $0 number [version]
+ number: number of sheet, 0 for combined document
+ version: 0 for problems, 1 for solutions
+ $0 filename
+ filename: target file to be compiled"
+ exit 1
+fi
+
+num="$1"
+ver="$2"
+nl=$'\n'
+secokay=""
+make=".pdf"
+
+for v in "${trglist[@]}"
+do
+ if [[ $num =~ ^$v ]]
+ then
+ ver=$v
+ num=${num#$v}
+ if [[ $num =~ ^.*\.tex$ ]]; then make=".tex"; fi
+ num=${num%%.*}
+ fi
+done
+
+if [[ $num =~ ^[0-9]$ ]]; then num="0$num"; fi
+if [[ $num == "00" ]]; then num=""; fi
+
+if [[ -z $num ]]; then secokay="okay"; fi
+for v in $secnum
+do
+ if [[ "$num" == "$v" ]]; then secokay="okay"; fi
+done
+
+if [[ -z $secokay ]]
+then
+ echo "error: unknown sheet"
+ exit 1
+fi
+
+if [[ "$make" == ".pdf" ]]; then nl=""; fi
+
+function docompile
+{
+ if [[ -z $num ]]
+ then
+ job="$srcmain"
+ fwd="\\childdocforward{$srcmain}"
+ else
+ job="$srcsec$num"
+ fwd="\\childdocforward[$srcmain]{$srcsec$num}"
+ fi
+ body="\\def\\jobname{$job}$optdef\\input{childdoc.def}$fwd"
+ for pass in first main extra
+ do
+ par="";
+ if [[ "$pass" == "first" ]]; then par="-draftmode"; fi
+ drop="This is|entering extended mode|\\write18"
+ drop="$drop|Preloading the plain mem file|mpost\.mp|plain\.mp"
+ pdflatex -shell-escape -interaction=batchmode $par \
+ -jobname "$trg" "$body" | grep -vE "$drop"
+ if [[ "$pass" != "main" ]]; then continue; fi
+ if ! (grep -E -q "may have changed|rerunfilecheck Warning" "$trg.log")
+ then break; fi
+ done
+ grep -E "^! |Warning|Error|Undefined|Overfull|Underfull" "$trg.log"
+}
+
+function writesource
+{
+ if [[ -z $num ]]
+ then
+ fwd="\\childdocforward{$srcmain}"
+ else
+ fwd="\\childdocforwardprefix[$srcmain]{$target}{$srcsec}"
+ fi
+ body="$optdef\\input{childdoc.def}$nl$fwd"
+ echo "$body" > $trg.tex
+}
+
+for i in "${!trglist[@]}"
+do
+ if [[ -z $ver || "$ver" == "${trglist[$i]}" || $ver = $i ]]
+ then
+ target="${trglist[$i]}"
+ sol="${trgsol[$i]}"
+ trg="$target$num"
+ optdef="\\def\\draftver{n}$nl\\def\\printsol{$sol}$nl"
+ if [[ "$make" == ".pdf" ]]; then docompile; else writesource; fi
+ fi
+done
+
+echo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exframe/exfserpe.tex new/doc/latex/exframe/exfserpe.tex
--- old/doc/latex/exframe/exfserpe.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/exframe/exfserpe.tex 2020-02-25 23:03:03.000000000 +0100
@@ -0,0 +1,82 @@
+%%
+%% This is file `exfserpe.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% exframe.dtx (with options: `samplemultiprobleme')
+%%
+%% Copyright (C) 2011-2020 Niklas Beisert
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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.
+%%
+%%\providecommand{\printsol}{n}
+\input{childdoc.def}
+\childdocby{exfserm}
+\begin{problem}[title={Sample E}]
+
+\ifdefined\mpostuse
+\begin{mpostfig}[label={\problemtag-fig}]
+interim xu:=1.5cm;
+paths[1]:=fullcircle scaled 1xu;
+fillshape(paths[1], 0.7white) pensize(1pt);
+label(btex \figure etex, center(paths[1]));
+\end{mpostfig}
+\begin{onlysolutions}
+\begin{mpostfig}[label={\problemtag-solfig}]
+interim xu:=1.5cm;
+paths[1]:=fullcircle scaled 1xu;
+paths[2]:=((subpath (-2,2) of paths[1])--cycle) shifted (+0.5xu,0);
+paths[3]:=((subpath (2,6) of paths[1])--cycle) shifted (-0.5xu,0);
+fillshape(paths[2], 0.7white) pensize(1pt);
+fillshape(paths[3], 0.7white) pensize(1pt);
+\end{mpostfig}
+\end{onlysolutions}
+\fi
+
+\lorem
+
+\begin{subproblem}
+\lorem
+\begin{center}
+\ifdefined\mpostuse\mpostuse{\problemtag-fig}\else figure\fi
+\end{center}
+\lorem
+\end{subproblem}
+
+\begin{solution}
+\lorem
+\begin{center}
+\ifdefined\mpostuse\mpostuse{\problemtag-solfig}\else figure\fi
+\end{center}
+\lorem
+\end{solution}
+
+\begin{subproblem}
+\lorem
+\end{subproblem}
+
+\begin{solution}
+\lorem
+\end{solution}
+
+\lorem
+
+\begin{subproblem}
+\lorem
+\end{subproblem}
+
+\begin{solution}
+\lorem
+\end{solution}
+
+\end{problem}
+\endinput
+%%
+%% End of file `exfserpe.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exframe/exfserpf.tex new/doc/latex/exframe/exfserpf.tex
--- old/doc/latex/exframe/exfserpf.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/exframe/exfserpf.tex 2020-01-11 23:12:12.000000000 +0100
@@ -0,0 +1,44 @@
+%%
+%% This is file `exfserpf.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% exframe.dtx (with options: `samplemultiproblemf')
+%%
+%% Copyright (C) 2011-2020 Niklas Beisert
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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.
+%%
+%%\providecommand{\printsol}{n}
+\input{childdoc.def}
+\childdocby{exfserm}
+\begin{problem}[title={Sample F}]
+
+\lorem
+
+\begin{subproblem}
+\lorem
+\begin{solution}
+\lorem
+\end{solution}
+\end{subproblem}
+
+\begin{subproblem}
+\lorem
+\begin{solution}
+\lorem
+\end{solution}
+\end{subproblem}
+
+\end{problem}
+
+\endinput
+%%
+%% End of file `exfserpf.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exframe/exfsmp1.tex new/doc/latex/exframe/exfsmp1.tex
--- old/doc/latex/exframe/exfsmp1.tex 2019-01-21 22:40:19.000000000 +0100
+++ new/doc/latex/exframe/exfsmp1.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,211 +0,0 @@
-%%
-%% This is file `exfsmp1.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% exframe.dtx (with options: `sample1')
-%%
-%% Copyright (C) 2011-2019 Niklas Beisert
-%%
-%% 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.
-%%
-\NeedsTeXFormat{LaTeX2e}[1996/12/01]
-\ProvidesFile{exfsmp1.tex}[2019/01/21 v3.1 sample 1 for exframe]
-\documentclass[12pt]{article}
-
-\usepackage{geometry}
-\geometry{layout=a4paper}
-\geometry{paper=a4paper}
-\geometry{margin=2.5cm}
-\parindent0pt
-\parskip0.5ex
-
-\usepackage{amsmath}
-\usepackage{hyperref}
-\usepackage[extstyle]{exframe}
-
-\exercisesetup{solutions=true}
-%%\exercisesetup{solutions=false}
-
-\exercisestyle{plainheader}
-\exerciseconfig{composeheaderbelowright}{\getsheetdata{points}}%
-
-\exerciseconfig{countersheet}{\Roman{sheet}}
-\exerciseconfig{countersubproblem}{\roman{subproblem})}
-\exerciseconfig{countersubproblemmax}{vii)}
-
-\exerciseconfig{termsheet}{\"Ubungsblatt}
-\exerciseconfig{termsheets}{\"Ubungsbl\"atter}
-
-\exercisestyle{pointsat=margin}
-\reversemarginpar
-\exerciseconfig{composepointsmargin}[1]{#1p.}
-
-\exerciseconfig{styletitle}{\sffamily\bfseries}
-
-\exerciseconfig{skipproblembelow}{1.5cm}
-
-\exercisestyle{fracpoints}
-\exercisestyle{solutionbelow=problem}
-\exercisestyle{solutionsep}
-
-\exerciseconfig{composemetasheet}[2]{\getexercisedata{course},
- \exerciseifempty{#2}{\getexerciseconfig{termsheet} #1}{#2}}
-
-\exercisesetup{pdfdata=sheet}
-\exercisedata{title=%
- {\getexercisedata{course}, \getexercisedata{material}}}
-\exercisedata{author=%
- {\getexercisedata{instructor}, \getexercisedata{institution}}}
-
-\exercisedata{institution={Katharinen-Volksschule}}
-\exercisedata{course={Mathematik}}
-\exercisedata{instructor={J.\ G.\ B\"uttner}}
-\exercisedata{period={ca.\ 1786}}
-\exercisedata{material={\"Ubungsaufgaben}}
-
-\begin{document}
-
-\begin{sheet}[number=5]
-
-\begin{problem}[title={Sums}]
-
-This problem deals with sums and series.
-
-\begin{subproblem}[points=2,difficulty=simple,label={\problemtag-simplesum}]
-Compute the sum
-\showpoints
-\begin{equation}
-1+2+3.
-\end{equation}
-
-\begin{solution}
-The result is
-\begin{equation}
-1+2+3=6.
-\end{equation}
-\end{solution}
-
-\end{subproblem}
-
-\begin{subproblem}[points=97,difficulty=lengthy]
-Compute the sum
-\begin{equation}
-1+2+3+\ldots+98+99+100.
-\end{equation}
-Keep calm and calculate!
-%%That ought to keep him occupied for a while
-\end{subproblem}
-
-\begin{solution}[author={C.\ F.\ Gau\ss}]
-We use the result $1+2+3=6$ from part \ref{\problemtag-simplesum}
-to jumpstart the calculation. The remaining sums yield
-\awardpoints[1 for each remaining sum]{97}
-\begin{equation}
-6+4+5+\ldots+99+100=5050.
-\end{equation}
-Alternatively the summands can be grouped into pairs as follows:
-\begin{align}
-1+100&=101,\\
-2+99&=101,\\
-3+98&=101,\\
-\ldots &\nonumber\\
-50+51&=101.
-\end{align}
-These amount to 50 times the same number 101.
-Therefore the sum equals
-\begin{equation}
-1+2+\ldots+99+100=50\cdot 101=5050.
-\end{equation}
-\textit{Ligget se!} \awardpoints*{97}
-\end{solution}
-
-You may give the final part a try:
-
-\begin{subproblem}[optional={optional}, difficulty={requires inspiration}]
-Compute the series
-\begin{equation}
-1+2+3+\ldots
-\end{equation}
-
-\begin{solution}
-The series is divergent, so the result is $\infty$ \awardpoints*{1}.
-\par
-However, after subtracting the divergent part,
-the result clearly is
-\begin{equation}
-\zeta(-1)=-\frac{1}{12}\,,
-\end{equation}
-where the zeta-function $\zeta(s)$ is defined by
-\begin{equation}
-\zeta(s):=\sum_{k=1}^\infty \frac{1}{k^s}\,.
-\end{equation}
-This definition holds only for $s>1$ where the sum is convergent,
-but one can continue the complex analytic function to $s<0$
-\awardpoints*{1.5}.
-\par
-Another way of understanding the result
-is to use the indefinite summation formula
-for arbitrary exponent $s$ in the summand
-(which also follows from the Euler--MacLaurin formula)
-\begin{equation}
-\sum_n n^s
-= \frac{n^{s+1}}{s+1}
- -\sum_{j=0}^s \frac{\zeta(j-s)\,s!}{(s-j)!\,j!}\,n^j
-= \ldots - \zeta(-s)\,n^0.
-\end{equation}
-Curiously, the constant term with $j=0$ is just the desired result
-but with the wrong sign
-(in fact, the constant term of an indefinite sum is ambiguous;
-for the claim we merely set $j=0$
-in the expression which holds for others values of $j$)
-\awardpoints*{0.5}.
-In order to understand the sign,
-we propose that the above formula describes the regularised result
-for the sum with limits $+\infty$ and $n$
-\begin{equation}
-\sum_{k=+\infty}^n k^s
-\simeq \frac{n^{s+1}}{s+1}
- -\sum_{j=0}^s \frac{\zeta(j-s)\,s!}{(s-j)!\,j!}\,n^j.
-\end{equation}
-Then we flip the summation limits of the desired sum
-to bring it into the above form
-\awardpoints*{0.5}
-\begin{equation}
-\sum_{k=1}^\infty k^s
-= -\sum_{k=\infty}^0 k^s
-\simeq \zeta(-s).
-\end{equation}
-\end{solution}
-
-\end{subproblem}
-
-\end{problem}
-
-\begin{problem}[points=1, difficulty=insane]
-Show that the equation
-\begin{equation}
-a^3+b^3=c^3
-\end{equation}
-has no positive integer solutions.
-\end{problem}
-
-\begin{solution}
-\normalmarginpar
-This is beyond the scope of this example.
-\marginpar{\footnotesize\raggedright does not fit here.\par}
-\end{solution}
-
-\end{sheet}
-
-\end{document}
-\endinput
-%%
-%% End of file `exfsmp1.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/exframe.doc.tlpobj new/tlpkg/tlpobj/exframe.doc.tlpobj
--- old/tlpkg/tlpobj/exframe.doc.tlpobj 2019-02-28 03:35:59.000000000 +0100
+++ new/tlpkg/tlpobj/exframe.doc.tlpobj 2020-02-26 01:54:39.000000000 +0100
@@ -1,9 +1,18 @@
name exframe.doc
category Package
-revision 49784
+revision 53911
shortdesc doc files of exframe
relocated 1
-docfiles size=88
+docfiles size=115
RELOC/doc/latex/exframe/README.txt
RELOC/doc/latex/exframe/exframe.pdf
- RELOC/doc/latex/exframe/exfsmp1.tex
+ RELOC/doc/latex/exframe/exfsamp.tex
+ RELOC/doc/latex/exframe/exfser01.tex
+ RELOC/doc/latex/exframe/exfser02.tex
+ RELOC/doc/latex/exframe/exfser03.tex
+ RELOC/doc/latex/exframe/exfseraa.tex
+ RELOC/doc/latex/exframe/exfserm.tex
+ RELOC/doc/latex/exframe/exfsermk.mak
+ RELOC/doc/latex/exframe/exfsermk.sh
+ RELOC/doc/latex/exframe/exfserpe.tex
+ RELOC/doc/latex/exframe/exfserpf.tex
++++++ exframe.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/exframe/exframe.sty new/tex/latex/exframe/exframe.sty
--- old/tex/latex/exframe/exframe.sty 2019-01-21 22:40:19.000000000 +0100
+++ new/tex/latex/exframe/exframe.sty 2020-02-25 23:03:03.000000000 +0100
@@ -6,7 +6,7 @@
%%
%% exframe.dtx (with options: `package')
%%
-%% Copyright (C) 2011-2019 Niklas Beisert
+%% Copyright (C) 2011-2020 Niklas Beisert
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}[1996/12/01]
-\ProvidesPackage{exframe}[2019/01/21 v3.1 Framework for Exercise Problems]
+\ProvidesPackage{exframe}[2020/02/24 v3.4 Framework for Exercise Problems]
\RequirePackage{verbatim}
\RequirePackage{xkeyval}
@@ -31,6 +31,7 @@
\long\def\exf@exparg#1#2{\exf@exptwo\exf@expswitch{#2}{#1}}
\def\exf@csdo#1#2{\expandafter#1\csname#2\endcsname}
\def\exf@csdotwo#1#2#3{\exf@exptwo#1#2\csname#3\endcsname}
+\def\exf@csor#1#2{\ifcsname#1\endcsname\csname#1\endcsname\else#2\fi}
\long\def\exf@append@def#1#2{\exf@exptwo\def#1\expandafter{#1#2}}
\long\def\exf@prepend@switch#1#2#3{#2{#3#1}}
@@ -39,6 +40,9 @@
\newcommand{\exf@expsetkeys}[2]{\edef\exf@tmp{#2}%
\exf@exparg{\setkeys{#1}}{\exf@tmp}}
+\newcommand{\exf@ifis}[3]%
+ {\def\exf@tmp{#2}\ifx#1\exf@tmp#3\fi}
+
\newcommand{\exf@href}[2]{%
\ifdefined#1\ifx#1\exf@empty#2\else%
\ifdefined\hyperlink\protect\hyperlink{#1}{#2}\else#2\fi\fi\else#2\fi}
@@ -49,6 +53,12 @@
\newcommand{\exf@addcontentsline}[2]{%
\ifx#1\exf@empty\else\addcontentsline{toc}{#1}{#2}\fi}
+\newcommand{\exf@notedata}[3]{\csname exf@notedata@#1\endcsname{#2}{#3}}
+\AtBeginDocument{\immediate\write\@auxout{%
+ \string\providecommand{\string\exf@notedata}[3]{}}}
+\newcommand{\exf@writedata}[3]%
+ {\immediate\write\@auxout{\string\exf@notedata{#1}{#2}{#3}}}
+
\def\exf@problemname{problem}
\def\exf@subproblemname{sub\exf@problemname}
\def\exf@solutionname{solution}
@@ -69,6 +79,8 @@
\define@boolkey{exframe.sty}[exf@]{extdata}[true]{}
\define@boolkey{exframe.sty}[exf@]{extstyle}[true]{}
+\define@boolkey{exframe.sty}[exf@]{metastr}[true]{}
+
\define@boolkey{exf@setup}[]{solutions}[true]{}
\define@choicekey{exf@setup}{pdfdata}%
{auto,manual,sheet,off}[auto]{\def\exf@metadata{#1}}
@@ -80,11 +92,27 @@
\define@boolkey{exf@setup}[exf@]{autolabelsheet}[true]{}
\define@boolkey{exf@setup}[exf@]{autolabelproblem}[true]{}
\define@boolkey{exf@setup}[exf@]{warntext}[true]{}
+\define@boolkey{exf@setup}[exf@]{solutionbuf}[true]{}
+\exf@solutionbuftrue
+\define@boolkey{exf@setup}[exf@]{problembuf}[true]{}
+\def\exf@emptytestchar{&}
+\define@key{exf@setup}{emptytestchar}{\def\exf@emptytestchar{#1}}
\ProcessOptionsX<exframe.sty,exf@setup>
\newcommand{\exercisesetup}[1]{\exf@expsetkeys{exf@setup}{#1}}
+\ifexf@metastr
+\PassOptionsToPackage{course=true}{metastr}
+\RequirePackage{metastr}
+\fi
+
+\newenvironment{onlysolutions}%
+ {\ifsolutions\else%
+ \let\endonlysolutions\endcomment%
+ \expandafter\comment\fi}%
+ {}
+
\newcommand{\exerciseconfig}[1]{%
\@ifnextchar[{\exf@configopt{#1}}{\exf@confignoopt{#1}}}
\long\def\exf@configopt#1[#2]#3{%
@@ -99,8 +127,10 @@
\newcommand{\exerciseconfigempty}[3]{\exf@csdo\ifx{exf@config@#1}\exf@empty%
#2\else#3\fi}
-\long\def\exerciseifempty#1#2#3{\if\else#3\fi}
-\long\def\exerciseifnotempty#1#2{\if&\else#2\fi}
+\long\def\exerciseifempty#1#2#3{%
+ \if\exf@emptytestchar#1\exf@emptytestchar#2\else#3\fi}
+\long\def\exerciseifnotempty#1#2{%
+ \if\exf@emptytestchar#1\exf@emptytestchar\else#2\fi}
\exerciseconfig{termsheet}{Sheet}
\exerciseconfig{termsheets}{Sheets}
@@ -120,6 +150,7 @@
\exerciseconfig{styletitlesolution}{}
\exerciseconfig{styletitlesolutionsproblem}{\small}
\exerciseconfig{styletitlesolutions}{\normalsize}
+\exerciseconfig{styletitleproblems}{\Large}
\exerciseconfig{skipproblemabove}{3.25ex plus 1ex minus 1.5ex}
\exerciseconfig{skipproblembelow}{3pt plus 1pt minus 1pt}
@@ -142,19 +173,28 @@
\exerciseconfig{skipsolutionsabove}{1.5ex plus 0.5ex minus 1ex}
\exerciseconfig{skipsolutionsbelow}{1.5ex plus 0.5ex minus 1ex}
-\exerciseconfig{skipsolutionsproblem}{1.0ex plus 0ex minus 0.5ex}
+\exerciseconfig{skipsolutionsproblemabove}{1.0ex plus 0ex minus 0.5ex}
+\exerciseconfig{skipsolutionsproblemtitle}{1.0ex plus 0ex minus 0.5ex}
+\exerciseconfig{skipsolutionsproblem}{\exf@config@skipsolutionsproblemtitle}
\exerciseconfig{skipsolutionstitle}{1.0ex plus 0ex minus 0.5ex}
+\exerciseconfig{skipproblemsabove}{1.5ex plus 0.5ex minus 1ex}
+\exerciseconfig{skipproblemsbelow}{1.5ex plus 0.5ex minus 1ex}
+\exerciseconfig{skipproblemstitle}{1.0ex plus 0ex minus 0.5ex}
+
\exerciseconfig{insertsheettitle}{\centerline{\getsheetdata{title}}}
\exerciseconfig{insertsheetclearpage}{\exercisecleardoublepage}
\exerciseconfig{insertsheetbefore}{}
\exerciseconfig{insertsheetafter}{}
\exerciseconfig{insertsolutionsbefore}{}
\exerciseconfig{insertsolutionsafter}{}
+\exerciseconfig{insertproblemsbefore}{}
+\exerciseconfig{insertproblemsafter}{}
\exerciseconfig{insertproblembefore}{}
\exerciseconfig{insertproblemafter}{}
\exerciseconfig{insertproblemsolution}{}
\exerciseconfig{insertprobleminfo}{}
+\exerciseconfig{insertproblemselect}[1]{}
\exerciseconfig{insertsubproblembefore}{}
\exerciseconfig{insertsubproblemafter}{}
\exerciseconfig{insertsubprobleminfo}{}
@@ -195,13 +235,17 @@
{\getexerciseconfig{composetocproblem}{#1}{#2}}
\exerciseconfig{composetitlesolutions}%
{\getexerciseconfig{termsolutions}}
+\exerciseconfig{composetitleproblems}%
+ {\getexerciseconfig{termproblems}}
\exerciseconfig{composetocsolutions}%
{\getexerciseconfig{composetitlesolutions}}
+\exerciseconfig{composetocproblems}%
+ {\getexerciseconfig{composetitleproblems}}
\exerciseconfig{composetitlesolutionsproblemsingle}[2]%
{\getexerciseconfig{termsolution}}
\exerciseconfig{composetitlesolutionsproblemmulti}[2]%
{\exerciseifempty{#2}{\getexerciseconfig{termproblem} #1}{#1. #2}}
-\exerciseconfig{composeitemsolution}[2]{#1#2}
+\exerciseconfig{composeitemsolutionlabel}[2]{#1#2}
\exerciseconfig{composepointsnum}[1]{#1}
\exerciseconfig{composepoints}[1]{\getexerciseconfig{composepointsnum}{#1}~%
@@ -217,10 +261,55 @@
\exerciseconfig{composepointsawardalt}[2]%
{(\getexerciseconfig{composepoints}{#1}*\exerciseifnotempty{#2}{; #2})}
+\exerciseconfig{composepointspair}[2]{%
+ \ifdim#2pt=0pt%
+ \getexerciseconfig{composepoints}{#1}%
+ \else\ifdim#1pt=0pt%
+ +\getexerciseconfig{composepoints}{#2}%
+ \else%
+ \getexerciseconfig{composepointsnum}{#1}+%
+ \getexerciseconfig{composepointsnum}{#2}~%
+ \getexerciseconfig{termpoints}%
+ \fi\fi}
+\exerciseconfig{composepointspairbody}[2]{%
+ \ifdim#2pt=0pt\getexerciseconfig{composepointsbody}{#1}\else%
+ (\getexerciseconfig{composepointspair}{#1}{#2})\fi}
+\exerciseconfig{composepointspairstart}[2]{%
+ \ifdim#2pt=0pt\getexerciseconfig{composepointsstart}{#1}\else%
+ (\getexerciseconfig{composepointspair}{#1}{#2})\fi}
+\exerciseconfig{composepointspairmargin}[2]{%
+ \ifdim#2pt=0pt\getexerciseconfig{composepointsmargin}{#1}\else%
+ \getexerciseconfig{composepointspair}{#1}{#2}\fi}
+\exerciseconfig{composepointspairsheet}[2]{%
+ \ifdim#2pt=0pt\getexerciseconfig{composepointssheet}{#1}\else%
+ \getexerciseconfig{composepointspair}{#1}{#2}\fi}
+\exerciseconfig{composepointspairaward}[3]{%
+ \ifdim#2pt=0pt\getexerciseconfig{composepointsaward}{#1}{#3}\else%
+ (\getexerciseconfig{composepointspair}{#1}{#2}%
+ \exerciseifnotempty{#3}{; #3})\fi}
+\exerciseconfig{composepointspairawardalt}[3]{%
+ \ifdim#2pt=0pt\getexerciseconfig{composepointsawardalt}{#1}{#3}\else%
+ (\getexerciseconfig{composepointspair}{#1}{#2}*%
+ \exerciseifnotempty{#3}{; #3})\fi}
+\exerciseconfig{composepointspairbodyproblem}[2]{%
+ \getexerciseconfig{composepointspairbody}{#1}{#2}}
+\exerciseconfig{composepointspairbodysubproblem}[2]{%
+ \getexerciseconfig{composepointspairbody}{#1}{#2}}
+\exerciseconfig{composepointspairbodysolution}[2]{%
+ \getexerciseconfig{composepointspairbody}{#1}{#2}}
+\exerciseconfig{composepointspairstartproblem}[2]{%
+ \getexerciseconfig{composepointspairstart}{#1}{#2}}
+\exerciseconfig{composepointspairstartsubproblem}[2]{%
+ \getexerciseconfig{composepointspairstart}{#1}{#2}}
+\exerciseconfig{composepointspairstartsolution}[2]{%
+ \getexerciseconfig{composepointspairstart}{#1}{#2}}
+
\exerciseconfig{insertpointsmargin}[1]{\marginpar{\footnotesize #1}}
\exerciseconfig{insertwarnpoints}[3]
{\textbf{points mismatch for #1 (#2 determined vs.\ #3 given)}}
+\exerciseconfig{insertwarnpointsrerun}[1]
+ {\textbf{points changed for #1 (please recompile)}}
\exerciseconfig{countersheet}{\arabic{\exf@sheetcounter}}
\exerciseconfig{counterproblem}{\arabic{\exf@problemcounter}}
@@ -231,14 +320,23 @@
\exerciseconfig{counterproblemequation}{P\arabic{equation}}
\exerciseconfig{countersolutionequation}{S\arabic{equation}}
+\exerciseconfig{tagsheet}{\arabic{\exf@sheetcounter}}
+\exerciseconfig{tagproblem}{\csname the\exf@problemcounter\endcsname}
+\exerciseconfig{tagsubproblem}{\problemtag-\arabic{\exf@subproblemcounter}}
+
\exerciseconfig{labelsheet}[1]{sheet:#1}
\exerciseconfig{labelproblem}[1]{prob:#1}
+\exerciseconfig{labelsubproblem}[1]{\getexerciseconfig{labelproblem}{#1}}
\exerciseconfig{toclevelsheet}{}
\exerciseconfig{toclevelproblem}{}
+\exerciseconfig{toclevelproblems}{}
\exerciseconfig{toclevelsolution}{}
\exerciseconfig{toclevelsolutions}{}
+\exerciseconfig{extsolutions}{.sol}
+\exerciseconfig{extproblems}{.prb}
+
\newcommand{\defexercisestylearg}[3][]{%
\def\exf@tmp{#1}\ifx\exf@tmp\exf@empty%
\define@key{exf@style}{#2}{#3}\else%
@@ -249,26 +347,31 @@
{\csname ifexf@style@#1\endcsname\csname exf@style@code@#1\endcsname\fi}}
\newcommand{\exercisestyle}[1]{\exf@expsetkeys{exf@style}{#1}}
+\define@boolkey{exf@style}[exf@]{problemmanual}[true]{}
+\exf@problemmanualfalse
\def\exf@solutionbelow{subproblem}
\define@choicekey{exf@style}{solutionbelow}%
{here,subproblem,subproblem*,problem,problem*,sheet,manual}%
- {\def\exf@solutionbelow{#1}}
-\newcommand{\exf@solbelowis}[2]%
- {\def\exf@tmp{#1}\ifx\exf@solutionbelow\exf@tmp#2\fi}
+ {\ifexf@solfile@open\else\gdef\exf@solutionbelow{#1}\fi}
\defexercisestyle{sheetequation}{}
\defexercisestyle{problemequation}{}
\defexercisestyle{solutionequation}{}
\exf@style@solutionequationtrue
\def\exf@pointsat{start}
+\define@choicekey{exf@style}{problempointsat}%
+ {start,start*,margin,end,manual,off}{\def\exf@pointsat{#1}}
\define@choicekey{exf@style}{pointsat}%
{start,start*,margin,end,manual,off}{\def\exf@pointsat{#1}}
\def\exf@subpointsat{end}
+\define@choicekey{exf@style}{subproblempointsat}%
+ {start,start*,margin,end,manual,off}{\def\exf@subpointsat{#1}}
\define@choicekey{exf@style}{subpointsat}%
{start,start*,margin,end,manual,off}{\def\exf@subpointsat{#1}}
-\newcommand{\exf@pointsatis}[2]%
- {\def\exf@tmp{#1}\ifx\exf@pointsat\exf@tmp#2\fi}
-\newcommand{\exf@subpointsatis}[2]%
- {\def\exf@tmp{#1}\ifx\exf@subpointsat\exf@tmp#2\fi}
+\def\exf@solpointsat{off}
+\define@choicekey{exf@style}{solutionpointsat}%
+ {start,start*,margin,end,manual,off}{\def\exf@solpointsat{#1}}
+\define@choicekey{exf@style}{solpointsat}%
+ {start,start*,margin,end,manual,off}{\def\exf@solpointsat{#1}}
\defexercisestylearg{problemby}{\exf@numberproblemwithin{#1}}
\defexercisestylearg{equationby}{\exf@numberequationwithin{#1}}
\defexercisestyle{pagebysheet}{%
@@ -280,7 +383,7 @@
\defexercisestyle{equationbysheet}%
{\exf@numberequationwithin{\exf@sheetcounter}}
\defexercisestyle{fracpoints}%
- {\exerciseconfig{composepointsnum}[1]{\exf@nicefrac{##1}}}
+ {\exerciseconfig{composepointsnum}[1]{\protect\showfracpoints{##1}}}
\defexercisestylearg[true]{twoside}{\exercisesetup{twoside={#1}}}
\ifexf@extstyle
@@ -295,7 +398,8 @@
\exerciseconfigappend{styletextproblem}{\color[gray]{0.2}}}
\defexercisestyle{solutionsep}{%
\exerciseconfig{insertsolutionsbefore}{\hrule\nopagebreak[3]\vspace{0.5ex}}%
- \exerciseconfig{insertsolutionsafter}{\nopagebreak[3]\vspace{1.0ex}\hrule}}
+ \exerciseconfig{insertsolutionsafter}%
+ {\removelastskip\nopagebreak[3]\vspace{1.0ex}\hrule}}
\defexercisestyle{plainheader}{%
\exerciseconfig{styleheadertitle}{\Large\bfseries}%
\exerciseconfig{styleheadercourse}{\sffamily}%
@@ -356,6 +460,7 @@
\exf@csdo\def{exf@data@sheet@#1}{}%
\define@key{exf@sheet}{#1}%
{\exf@csdo\def{exf@data@sheet@#1}{##1}}}
+\newcommand{\setsheetdata}[1]{\setkeys{exf@sheet}{#1}}
\newcommand{\getsheetdata}[1]{\csname exf@data@sheet@#1\endcsname}
\newcommand{\sheetdataempty}[3]{\exf@csdo\ifx{exf@data@sheet@#1}\exf@empty%
#2\else#3\fi}
@@ -370,14 +475,14 @@
\define@key{exf@sheet}{title}{\def\exf@data@sheet@rawtitle{#1}}
\def\exf@data@sheet@title{\exf@config@composetitlesheet%
{\csname the\exf@sheetcounter\endcsname}{\exf@data@sheet@rawtitle}}%
-\def\exf@data@sheet@rawpoints{}
-\def\exf@data@sheet@points{\exf@config@composepointssheet%
- {\exf@data@sheet@rawpoints}}%
+\def\exf@data@sheet@points{\ifdefined\exf@sheet@points%
+ \expandafter\exf@config@composepointspairsheet\exf@sheet@points\fi}%
\newcommand{\defproblemdata}[1]{%
\exf@csdo\def{exf@data@problem@#1}{}%
\define@key{exf@problem}{#1}%
{\exf@csdo\def{exf@data@problem@#1}{##1}}}
+\newcommand{\setproblemdata}[1]{\setkeys{exf@problem,exf@scanproblem}{#1}}
\newcommand{\getproblemdata}[1]{\csname exf@data@problem@#1\endcsname}
\newcommand{\problemdataempty}[3]{\exf@csdo\ifx{exf@data@problem@#1}\exf@empty%
#2\else#3\fi}
@@ -447,33 +552,23 @@
\defprobleminfo{timepresent}{\{\!\{#1\}\!\}}
\fi
-\newcommand{\exf@writemetadata}[1]{%
+\newcommand{\exf@writemetadata}{%
\ifdefined\hypersetup%
- \def\exf@tmp{#1}\ifx\exf@tmp\exf@empty%
- \ifx\exf@data@author\exf@empty\else%
- \hypersetup{pdfauthor={\exf@data@author}}\fi%
- \ifx\exf@data@title\exf@empty\else%
- \hypersetup{pdftitle={\exf@data@title}}\fi%
- \else%
- \ifx\exf@data@sheet@author\exf@empty%
- \ifx\exf@data@author\exf@empty\else%
- \hypersetup{pdfauthor={\exf@data@author}}\fi%
- \else\hypersetup{pdfauthor={\exf@data@sheet@author}}\fi%
- \hypersetup{pdftitle={\exf@config@composemetasheet%
- {\csname the\exf@sheetcounter\endcsname}{\exf@data@sheet@rawtitle}}}%
- \fi%
+ \ifx\exf@data@author\exf@empty\else%
+ \hypersetup{pdfauthor={\exf@data@author}}\fi%
+ \ifx\exf@data@title\exf@empty\else%
+ \hypersetup{pdftitle={\exf@data@title}}\fi%
\ifx\exf@data@subject\exf@empty\else%
\hypersetup{pdfsubject={\exf@data@subject}}\fi%
\ifx\exf@data@keyword\exf@empty\else%
\hypersetup{pdfkeywords={\exf@data@keyword}}\fi%
- \fi%
- \gdef\exf@metadata{off}}
+ \fi}
-\AtBeginDocument{\def\exf@tmp{auto}\ifx\exf@metadata\exf@tmp%
- \exf@writemetadata{}\fi}
+\AtBeginDocument{\exf@ifis\exf@metadata{auto}%
+ {\exf@writemetadata\gdef\exf@metadata{off}}}
-\newcommand{\writeexercisedata}{\def\exf@tmp{manual}\ifx\exf@metadata\exf@tmp%
- \exf@writemetadata{}\fi}
+\newcommand{\writeexercisedata}{\exf@ifis\exf@metadata{manual}%
+ {\exf@writemetadata\gdef\exf@metadata{off}}}
\newcounter{\exf@sheetcounter}
\newcounter{\exf@problemcounter}
@@ -497,7 +592,15 @@
\newcommand{\exf@numberproblemwithin}[1]{%
\@addtoreset{\exf@problemcounter}{#1}%
\exf@csdo\def{the\exf@problemcounter}%
- {\csname the#1\endcsname.\exf@config@counterproblem}}
+ {\csname the#1\endcsname.\exf@config@counterproblem}%
+ \edef\exf@tmp{#1}%
+ \ifx\exf@tmp\exf@sheetcounter%
+ \exerciseconfig{tagproblem}{\ifdefined\sheettag\sheettag-\fi%
+ \arabic{\exf@problemcounter}}%
+ \else%
+ \exerciseconfig{tagproblem}{\csname the#1\endcsname-%
+ \arabic{\exf@problemcounter}}%
+ \fi}
\newcommand{\exf@numberequationwithin}[1]{%
\@addtoreset{exf@sheetequation}{#1}%
@@ -516,10 +619,12 @@
\def\theHexf@solutionequation%
{\csname theH#1\endcsname.sol.\arabic{equation}}}
-\newif\ifexf@infile\exf@infilefalse
-\newwrite\exf@out
+\newif\ifexf@solfile@open\exf@solfile@openfalse
+\newif\ifexf@probfile@open\exf@probfile@openfalse
+\newwrite\exf@solfile
+\newwrite\exf@probfile
-\newcommand{\exf@writeline}[1]{\immediate\write\exf@out{#1}}
+\newcommand{\exf@writeline}[2]{\immediate\write#1{#2}}
\newcommand{\exf@linesep}%
{\@percentchar---------------------------------------}
@@ -527,46 +632,69 @@
\ifdefined\currfilename\currfilename\space\fi%
l.\the\inputlineno}
-\newcommand{\exf@startfile}[1]{%
- \ifexf@infile\else%
- \global\exf@infiletrue%
- \gdef\exf@solutionbelow{manual}%
+\newcommand{\exf@start@solfile}[1]{%
+ \ifexf@solfile@open\else%
+ \exercisestyle{solutionbelow=manual}%
+ \global\exf@solfile@opentrue%
\edef\exf@tmp{#1}%
- \immediate\openout\exf@out\exf@tmp.sol%
- \exf@writeline{\@percentchar%
+ \immediate\openout\exf@solfile\exf@tmp\exf@config@extsolutions\relax%
+ \exf@writeline\exf@solfile{\@percentchar%
generated from file `\jobname' by exframe.sty}%
- \ifexf@lineno\exf@writeline{\exf@lineno}\fi%
- \exf@writeline{}%
+ \ifexf@lineno\exf@writeline\exf@solfile{\exf@lineno}\fi%
+ \exf@writeline\exf@solfile{}%
\fi}
-\newcommand{\exf@closefile}{%
- \ifexf@infile%
- \ifexf@lineno%
- \exf@writeline{\exf@linesep}\exf@writeline{\exf@lineno}\fi%
- \exf@writeline{\@backslashchar endinput}%
- \immediate\closeout\exf@out%
- \global\exf@infilefalse%
+\newcommand{\exf@close@solfile}{%
+ \ifexf@solfile@open%
+ \ifexf@lineno\exf@writeline\exf@solfile{\exf@linesep}%
+ \exf@writeline\exf@solfile{\exf@lineno}\fi%
+ \exf@writeline\exf@solfile{\@backslashchar endinput}%
+ \immediate\closeout\exf@solfile%
+ \global\exf@solfile@openfalse%
\fi}
-\AtEndDocument{\exf@closefile}
+\newcommand{\exf@start@probfile}[1]{%
+ \ifexf@probfile@open\else%
+ \global\exf@probfile@opentrue%
+ \edef\exf@tmp{#1}%
+ \immediate\openout\exf@probfile\exf@tmp\exf@config@extproblems\relax%
+ \exf@writeline\exf@probfile{\@percentchar%
+ generated from file `\jobname' by exframe.sty}%
+ \ifexf@lineno\exf@writeline\exf@probfile{\exf@lineno}\fi%
+ \exf@writeline\exf@probfile{}%
+ \fi}
-\newtoks\exf@buf
-\newif\ifexf@bufclean\exf@bufcleantrue
+\newcommand{\exf@close@probfile}{%
+ \ifexf@probfile@open%
+ \ifexf@lineno\exf@writeline\exf@probfile{\exf@linesep}%
+ \exf@writeline\exf@probfile{\exf@lineno}\fi%
+ \exf@writeline\exf@probfile{\@backslashchar endinput}%
+ \immediate\closeout\exf@probfile%
+ \global\exf@probfile@openfalse%
+ \fi}
-\def\exf@clearbuf{\global\exf@bufcleantrue\global\exf@buf={}}
-\def\exf@append@buf#1{\global\exf@buf=\expandafter{\the\exf@buf#1}}
-\def\exf@addbufline#1{{\protected@edef\exf@tmp{#1}%
- \exf@exptwo\exf@append@buf{\exf@tmp^^J}}}
+\AtEndDocument{\exf@close@solfile\exf@close@probfile}
-\def\exf@sourcebuf{\exf@exptwo\scantokens{\the\exf@buf}}
-\def\exf@writebuf{\exf@writeline{\the\exf@buf}}
+\newtoks\exf@solbuf
+\newtoks\exf@probbuf
+\newif\ifexf@solbuf@clean\exf@solbuf@cleantrue
+\newif\ifexf@probbuf@clean\exf@probbuf@cleantrue
+\def\exf@clear@solbuf{\global\exf@solbuf@cleantrue\global\exf@solbuf={}}
+\def\exf@clear@probbuf{\global\exf@probbuf@cleantrue\global\exf@probbuf={}}
+
+\def\exf@append@buf#1#2{\global#1=\expandafter{\the#1#2}}
+\def\exf@addline#1#2{{\protected@edef\exf@tmp{#2}%
+ \exf@exparg{\exf@append@buf#1}{\exf@tmp^^J}}}
+\def\exf@source@buf#1{\exf@exptwo\scantokens{\the#1}}
+\def\exf@write@buf#1#2{\exf@writeline#1{\the#2}}
\newcommand{\exf@verbatim}{%
\begingroup%
\@bsphack%
\let\do\@makeother\dospecials%
\catcode`\^^M\active%
- \def\verbatim@processline{\exf@exptwo\exf@append@buf{\the\verbatim@line^^J}}%
+ \def\verbatim@processline{\exf@exptwo\exf@verbatim@process%
+ {\the\verbatim@line^^J}}%
\verbatim@start}
\newcommand{\exf@endverbatim}{\@esphack\endgroup}
@@ -584,78 +712,199 @@
\def\exf@scanblock@noopt#1#2{#1{}{\scantokens#2}}
\def\exf@scanblock@opt#1[#2]{#1{#2}{}}
+\newcommand{\exf@addtopoints}[3]{%
+ \ifdefined#1\else\def#1{{0}{0}}\fi%
+ \setlength\exf@tmpdim{\expandafter\@firstoftwo#1pt}%
+ \addtolength\exf@tmpdim{#2pt}%
+ \edef\exf@tmp{\strip@pt\exf@tmpdim}%
+ \setlength\exf@tmpdim{\expandafter\@secondoftwo#1pt}%
+ \addtolength\exf@tmpdim{#3pt}%
+ \xdef#1{{\exf@tmp}{\strip@pt\exf@tmpdim}}}
+\newcommand{\exf@pointsmismatch}[3]{%
+ \let\exf@tmp\@undefined%
+ \ifdim\expandafter\@firstoftwo#1pt=\expandafter\@firstoftwo#2pt\else%
+ \def\exf@tmp{}\fi%
+ \ifdim\expandafter\@secondoftwo#1pt=\expandafter\@secondoftwo#2pt\else%
+ \def\exf@tmp{}\fi%
+ \ifdefined\exf@tmp#3\fi}
+
+\def\exf@outpoints#1#2#3{\ifdefined#3%
+ \exf@exptwo\exf@outpoints@switch{#3}{#1}{#2}%
+ \global\let#3\@undefined\fi}
+\def\exf@outpoints@switch#1#2#3{#2{\protect#3#1}}
+
+\def\exf@scanpoints#1#2+#3+#4@{%
+ \edef#1{\if @#2@0\else#2\fi}%
+ \edef#1{{#1}{\if @#3@0\else#3\fi}}}
+\def\exf@formatpoints#1#2{\ifdim#2pt=0pt#1\else%
+ \ifdim#1pt=0pt+#2\else#1+#2\fi\fi}
+
+\newcommand{\extractpoints}{\@ifstar{\exf@extractpoints\@secondoftwo}%
+ {\exf@extractpoints\@firstoftwo}}
+\newcommand{\exf@extractpoints}[2]{\edef\exf@tmp{#2}%
+ \exf@exptwo\exf@scanpoints\exf@tmp\exf@tmp++@%
+ \expandafter#1\exf@tmp}
+
+\newcommand{\switchpoints}[5]{\edef\exf@tmp{#5}%
+ \exf@exptwo\exf@scanpoints\exf@tmp\exf@tmp++@%
+ \expandafter\exf@switchpoints\exf@tmp{#1}{#2}{#3}{#4}}
+\newcommand{\exf@switchpoints}[6]{%
+ \ifdim#2pt=0pt\ifdim#1pt=0pt\def\exf@tmp##1##2{#6}%
+ \else\def\exf@tmp##1##2{#3}\fi%
+ \else\ifdim#1pt=0pt\def\exf@tmp##1##2{#4}%
+ \else\def\exf@tmp##1##2{#5}\fi\fi\exf@tmp{#1}{#2}}
+
+\newcommand{\exf@makepointsmargin}[2]{%
+ \exf@config@insertpointsmargin{\exf@config@composepointspairmargin{#1}{#2}}}
+
+\newcommand{\exf@warnmismatch}[4]{%
+ \ifdefined#4\ifdefined#3\exf@pointsmismatch#3#4{%
+ \let\exf@tmp\PackageWarning%
+ \ifx#1\exf@solutionname\let\exf@tmp\PackageWarningNoLine\fi%
+ \exf@tmp{exframe}{points mismatch %
+ (\expandafter\exf@formatpoints#3 determined %
+ vs. \expandafter\exf@formatpoints#4 given) %
+ for #1 \csname the#2\endcsname}%
+ \ifexf@warntext\edef\exf@tmp{%
+ {\expandafter\exf@formatpoints#3}{\expandafter\exf@formatpoints#4}}%
+ \exf@exptwo\exf@config@insertwarnpoints#1\exf@tmp\fi}%
+ \fi\fi}
+\newcommand{\exf@warnrerun}[4]{%
+ \ifdefined#4\ifdefined#3\exf@pointsmismatch#3#4{%
+ \PackageWarning{exframe}{points changed %
+ for #1 \csname the#2\endcsname; rerun to fix}%
+ \ifexf@warntext\exf@config@insertwarnpointsrerun#1\fi}%
+ \fi\fi}
+
\def\exf@splitsign#1-#2-#3&{\def\exf@splitnum{#1#2}\def\exf@splitminus{#3}}
\def\exf@splitdecimal#1.#2.#3&{\def\exf@splitint{#1}\def\exf@splitdec{#2}}
-\newcommand{\exf@nicefrac}[1]{%
+\newcommand{\showfracpoints}[1]{%
\edef\exf@tmp{#1}%
\expandafter\exf@splitsign\exf@tmp--&%
\expandafter\exf@splitdecimal\exf@splitnum..&%
- \if&\exf@splitint&\def\exf@splitint{0}\fi%
- \if&\exf@splitdec&\def\exf@splitdec{0}\fi%
+ \if @\exf@splitint @\def\exf@splitint{0}\fi%
+ \if @\exf@splitdec @\def\exf@splitdec{0}\fi%
\def\exf@tmp{\exf@splitint.\exf@splitdec}%
\ifnum\exf@splitdec=0\def\exf@tmp{\exf@splitint}\fi%
- \ifnum\exf@splitdec=5\def\exf@tmp{\exf@intfrac{\exf@splitint}{1}{2}}\fi%
- \ifnum\exf@splitdec=25\def\exf@tmp{\exf@intfrac{\exf@splitint}{1}{4}}\fi%
- \ifnum\exf@splitdec=75\def\exf@tmp{\exf@intfrac{\exf@splitint}{3}{4}}\fi%
- \ifnum\exf@splitdec=125\def\exf@tmp{\exf@intfrac{\exf@splitint}{1}{8}}\fi%
- \ifnum\exf@splitdec=375\def\exf@tmp{\exf@intfrac{\exf@splitint}{3}{8}}\fi%
- \ifnum\exf@splitdec=625\def\exf@tmp{\exf@intfrac{\exf@splitint}{5}{8}}\fi%
- \ifnum\exf@splitdec=875\def\exf@tmp{\exf@intfrac{\exf@splitint}{7}{8}}\fi%
+ \ifnum\exf@splitdec=5\def\exf@tmp{\exf@config@frac{\exf@splitint}{1}{2}}\fi%
+ \ifnum\exf@splitdec=25\def\exf@tmp{\exf@config@frac{\exf@splitint}{1}{4}}\fi%
+ \ifnum\exf@splitdec=75\def\exf@tmp{\exf@config@frac{\exf@splitint}{3}{4}}\fi%
+ \ifnum\exf@splitdec=125\def\exf@tmp{\exf@config@frac{\exf@splitint}{1}{8}}\fi%
+ \ifnum\exf@splitdec=375\def\exf@tmp{\exf@config@frac{\exf@splitint}{3}{8}}\fi%
+ \ifnum\exf@splitdec=625\def\exf@tmp{\exf@config@frac{\exf@splitint}{5}{8}}\fi%
+ \ifnum\exf@splitdec=875\def\exf@tmp{\exf@config@frac{\exf@splitint}{7}{8}}\fi%
\ifx\exf@splitminus\exf@empty\else$\exf@splitminus$\fi\exf@tmp%
}
-\newcommand{\exf@intfrac}[3]{%
- \ifnum#1=0\else#1\fi%
- \ifnum#2=0\else$%
+\newcommand{\exf@config@frac}[3]{%
+ \ifnum#1=0\relax\else#1\fi%
+ \ifnum#2=0\relax\else$%
^{\exf@text{#2}}%
\mskip-4mu/\mskip-2mu%
_{\exf@text{#3}}$\fi}
-\newlength{\exf@sheet@points@dim}
-\newcommand{\exf@notesheetpoints}[2]{%
+\newcommand{\exf@notedata@sheetpoints}[2]{%
\exf@csdo\gdef{exf@sheetpoints@#1}{#2}}
-\AtBeginDocument{\immediate\write\@auxout{%
- \string\providecommand{\string\exf@notesheetpoints}[2]{}}}
-\newcommand{\exf@writesheetpoints}[1]%
- {\immediate\write\@auxout{\string\exf@notesheetpoints{\sheettag}{#1}}}
-\newcommand{\getsheetpoints}[1]{\ifcsname exf@sheetpoints@#1\endcsname%
- \csname exf@sheetpoints@#1\endcsname\else 0\fi}
+\newcommand{\exf@writesheetpoints}[2]%
+ {\exf@writedata{sheetpoints}{\sheettag}{\exf@formatpoints{#1}{#2}}}
+\newcommand{\getsheetpoints}[1]{\if @#1@%
+ \ifdefined\exf@sheet@points%
+ \expandafter\exf@formatpoints\exf@sheet@points\else 0\fi%
+ \else\exf@csor{exf@sheetpoints@#1}{0}\fi}
-\newlength{\exf@problem@points@dim}
-\newcommand{\exf@noteproblempoints}[2]{%
+\newcommand{\exf@notedata@problempoints}[2]{%
\exf@csdo\gdef{exf@problempoints@#1}{#2}}
-\AtBeginDocument{\immediate\write\@auxout{%
- \string\providecommand{\string\exf@noteproblempoints}[2]{}}}
-\newcommand{\exf@writeproblempoints}[1]%
- {\immediate\write\@auxout{\string\exf@noteproblempoints{\problemtag}{#1}}}
-\newcommand{\getproblempoints}[1]{\ifcsname exf@problempoints@#1\endcsname%
- \csname exf@problempoints@#1\endcsname\else 0\fi}
+\newcommand{\exf@writeproblempoints}[2]%
+ {\exf@writedata{problempoints}{\problemtag}{\exf@formatpoints{#1}{#2}}}
+\newcommand{\getproblempoints}[1]{\if @#1@%
+ \ifdefined\exf@problem@points%
+ \expandafter\exf@formatpoints\exf@problem@points\else 0\fi%
+ \else\exf@csor{exf@problempoints@#1}{0}\fi}
\newcommand{\showpoints}{%
- \ifdefined\exf@in@subproblem%
+ \ifdefined\exf@in@solution\exf@outpoints{\exf@ensuretext}%
+ {\exf@config@composepointspairbodysolution}{\exf@solution@points@show}%
+ \else\ifdefined\exf@in@subproblem\exf@outpoints{\exf@ensuretext}%
+ {\exf@config@composepointspairbodysubproblem}{\exf@subproblem@points@show}%
+ \else\ifdefined\exf@in@problem\exf@outpoints{\exf@ensuretext}%
+ {\exf@config@composepointspairbodyproblem}{\exf@problem@points@show}%
+ \fi\fi\fi}
+
+\newcommand{\exf@notedata@subproblempoints}[2]{%
+ \exf@csdo\gdef{exf@subproblempoints@#1}{#2}}
+\newcommand{\exf@writesubproblempoints}[2]%
+ {\exf@writedata{subproblempoints}%
+ {\subproblemtag}{\exf@formatpoints{#1}{#2}}}
+\newcommand{\getsubproblempoints}[1]{\if @#1@%
\ifdefined\exf@subproblem@points%
- \exf@ensuretext{\exf@config@composepointsbody{\exf@subproblem@points}}%
- \global\let\exf@subproblem@points\@undefined%
- \fi%
- \else\ifdefined\exf@in@problem%
- \ifdefined\exf@problem@pointsshow%
- \exf@ensuretext{\exf@config@composepointsbody{\exf@problem@pointsshow}}%
- \global\let\exf@problem@pointsshow\@undefined%
- \fi%
- \fi\fi}
-
-\newlength{\exf@solution@points@dim}
+ \expandafter\exf@formatpoints\exf@subproblem@points\else 0\fi%
+ \else\exf@csor{exf@subproblempoints@#1}{0}\fi}
-\newcommand{\exf@awardpointsalt}[2][]{%
- \exf@ensuretext{\exf@config@composepointsawardalt{#2}{#1}}}
-\newcommand{\exf@awardpointsreg}[2][]{%
- \global\addtolength{\exf@solution@points@dim}{#2 pt}%
- \exf@ensuretext{\exf@config@composepointsaward{#2}{#1}}}
+\newcommand{\exf@awardpointsalt}[2][]{\exf@scanpoints\exf@tmp#2++@%
+ \exf@exptwo\exf@ensuretext{%
+ \expandafter\exf@config@composepointspairawardalt\exf@tmp{#1}}}
+\newcommand{\exf@awardpointsreg}[2][]{\exf@scanpoints\exf@tmp#2++@%
+ \exf@exptwo\exf@addtopoints\exf@solution@points@total\exf@tmp%
+ \exf@scanpoints\exf@tmp#2++@%
+ \exf@exptwo\exf@ensuretext{%
+ \expandafter\exf@config@composepointspairaward\exf@tmp{#1}}}
\newcommand{\awardpoints}{\@ifstar\exf@awardpointsalt\exf@awardpointsreg}
-\define@key{exf@sheet}{points}{\def\exf@points@given{#1}}
-\define@key{exf@sheet}{number}{\setcounter{\exf@sheetcounter}{#1}}
+\newcommand{\getsolutionpoints}[1]{\if @#1@%
+ \ifdefined\exf@solution@points%
+ \expandafter\exf@formatpoints\exf@solution@points\else 0\fi%
+ \else 0\fi}
+
+\newcounter{exerciseloop}
+\newcounter{exf@loopdepth}
+
+\def\exf@listwalk#1#2{\if @#2@\def\exf@tmp{}\else%
+ \def\exf@tmp{#1{#2}\exf@listwalk#1}\fi\exf@tmp}
+
+\newcommand{\exerciseloop}[2]{\addtocounter{exf@loopdepth}{1}%
+ \setcounter{exerciseloop}{0}%
+ \exf@csdo\gdef{exf@listcallback@\roman{exf@loopdepth}}##1%
+ {\stepcounter{exerciseloop}#2}%
+ \edef\exf@tmp{#1}%
+ \exf@csdotwo\exf@exptwo\exf@listwalk%
+ {exf@listcallback@\roman{exf@loopdepth}}\exf@tmp{}%
+ \addtocounter{exf@loopdepth}{-1}}
+\newcommand{\exerciseloopstr}[3][\exerciseloopret]{%
+ \def#1{}\exerciseloop{#2}{\protected@edef#1{#1#3}}}
+
+\def\exf@sheetlist{}
+\newcommand{\exf@notedata@sheet}[2]{%
+ \xdef\exf@sheetlist{\exf@sheetlist{#1}}}
+\def\exf@problemlist{}
+\newcommand{\exf@notedata@problem}[2]{%
+ \xdef\exf@problemlist{\exf@problemlist{#1}}%
+ \if @#2@\else%
+ \ifcsname exf@problemlist@#2\endcsname\else%
+ \exf@csdo\gdef{exf@problemlist@#2}{}\fi%
+ \exf@csdo\xdef{exf@problemlist@#2}%
+ {\csname exf@problemlist@#2\endcsname{#1}}%
+ \fi}
+\newcommand{\exf@notedata@subproblem}[2]{%
+ \ifcsname exf@subproblemlist@#2\endcsname\else%
+ \exf@csdo\gdef{exf@subproblemlist@#2}{}\fi%
+ \exf@csdo\xdef{exf@subproblemlist@#2}%
+ {\csname exf@subproblemlist@#2\endcsname{#1}}}
+
+\newcommand{\getsheetlist}[1]{\exf@sheetlist}
+\newcommand{\getproblemlist}[1]{\if @#1@%
+ \ifdefined\sheettag\exf@csor{exf@problemlist@\sheettag}{}%
+ \else\exf@problemlist\fi%
+ \else%
+ \if *#1\exf@problemlist\else\exf@csor{exf@problemlist@#1}{}\fi%
+ \fi}
+\newcommand{\getsubproblemlist}[1]{\if @#1@%
+ \exf@csor{exf@subproblemlist@\problemtag}{}\else%
+ \exf@csor{exf@subproblemlist@#1}{}\fi}
+
+\define@key{exf@sheet}{points}{\exf@scanpoints\exf@sheet@points#1++@}
+\define@key{exf@sheet}{number}{\setcounter{\exf@sheetcounter}{#1}%
+ \addtocounter{\exf@sheetcounter}{-1}\refstepcounter{\exf@sheetcounter}}
\define@key{exf@sheet}{label}{\def\exf@label{#1}}
\define@key{exf@sheet}{tag}{\def\sheettag{#1}}
@@ -663,25 +912,33 @@
\exf@config@insertsheetclearpage%
\refstepcounter{\exf@sheetcounter}%
\ifexf@style@sheetequation%
- \exf@eqsav\value{equation}%
+ \exf@eqsav\value{equation}\relax%
\setcounter{equation}{\value{exf@sheetequation}}%
\let\theequation\theexf@sheetequation%
\let\theHequation\theHexf@sheetequation%
\fi%
- \let\exf@points@given\@undefined%
- \def\sheettag{\csname the\exf@sheetcounter\endcsname}%
- \setlength{\exf@sheet@points@dim}{0pt}%
+ \let\exf@sheet@points\@undefined%
+ \def\sheettag{\getexerciseconfig{tagsheet}}%
+ \let\exf@sheet@points@total\@undefined%
\let\exf@label\@undefined%
\setkeys{exf@sheet}{#1}%
\ifexf@autolabelsheet\label{\exf@config@labelsheet{\sheettag}}\fi%
\ifdefined\exf@label\label{\exf@label}\fi%
- \ifdefined\exf@points@given%
- \let\exf@data@sheet@rawpoints\exf@points@given%
- \else\ifcsname exf@sheetpoints@\sheettag\endcsname%
- \exf@csdotwo\let\exf@data@sheet@rawpoints{exf@sheetpoints@\sheettag}%
+ \exf@writedata{sheet}{\sheettag}{}%
+ \ifdefined\exf@sheet@points%
+ \let\exf@sheet@points@given\exf@empty%
+ \else%
+ \let\exf@sheet@points@given\@undefined%
+ \ifcsname exf@sheetpoints@\sheettag\endcsname%
+ \exf@csdotwo\let\exf@tmp{exf@sheetpoints@\sheettag}%
+ \exf@exptwo\exf@scanpoints\exf@sheet@points\exf@tmp++@%
\fi\fi%
- \def\exf@tmp{sheet}\ifx\exf@metadata\exf@tmp%
- \exf@writemetadata{sheet}\fi%
+ \exf@ifis\exf@metadata{sheet}{{%
+ \ifx\exf@data@sheet@author\exf@empty\else%
+ \let\exf@data@author\exf@data@sheet@author\fi%
+ \def\exf@data@title{\exf@config@composemetasheet%
+ {\csname the\exf@sheetcounter\endcsname}{\exf@data@sheet@rawtitle}}%
+ \exf@writemetadata}\gdef\exf@metadata{off}}%
\exf@config@insertsheetbefore%
\ifx\exf@config@toclevelsheet\exf@empty\else%
\ifdefined\phantomsection\phantomsection\fi\fi%
@@ -689,33 +946,18 @@
{\exf@config@composetocsheet{\csname the\exf@sheetcounter\endcsname}%
{\exf@data@sheet@rawtitle}}%
\exf@config@insertsheettitle}%
- {\ifdefined\exf@points@given%
- \ifdim\exf@sheet@points@dim=0pt\else%
- \ifdim\exf@sheet@points@dim=\exf@data@sheet@rawpoints pt\else%
- \PackageWarning{exframe}{points mismatch for %
- \exf@sheetname\space\csname the\exf@sheetcounter\endcsname}%
- \ifexf@warntext\exf@config@insertwarnpoints{\exf@sheetname}%
- {\strip@pt\exf@sheet@points@dim}{\exf@data@sheet@rawpoints}\fi%
- \fi\fi%
+ {\ifdefined\exf@sheet@points@given%
+ \exf@warnmismatch{\exf@sheetname}{\exf@sheetcounter}%
+ {\exf@sheet@points@total}{\exf@sheet@points}%
\else%
- \ifx\exf@data@sheet@rawpoints\exf@empty\else%
- \ifdim\exf@sheet@points@dim=\exf@data@sheet@rawpoints pt\else%
- \PackageWarning{exframe}{points changed for %
- \exf@sheetname\space\csname the\exf@sheetcounter\endcsname;
- rerun to fix}%
- \ifexf@warntext\exf@config@insertwarnpoints{\exf@sheetname}%
- {\strip@pt\exf@sheet@points@dim}{\exf@data@sheet@rawpoints}\fi%
- \fi\fi%
- \ifdim\exf@sheet@points@dim=0pt%
- \def\exf@data@sheet@rawpoints{}%
- \else%
- \edef\exf@data@sheet@rawpoints{\strip@pt\exf@sheet@points@dim}%
- \fi%
+ \exf@warnrerun{\exf@sheetname}{\exf@sheetcounter}%
+ {\exf@sheet@points@total}{\exf@sheet@points}%
+ \let\exf@sheet@points\exf@sheet@points@total%
\fi%
- \ifx\exf@data@sheet@rawpoints\exf@empty\else%
- \exf@writesheetpoints{\exf@data@sheet@rawpoints}%
+ \ifdefined\exf@sheet@points%
+ \expandafter\exf@writesheetpoints\exf@sheet@points%
\fi%
- \exf@solbelowis{sheet}{\insertsolutions}%
+ \exf@ifis\exf@solutionbelow{sheet}{\insertsolutions}%
\exf@config@insertsheetafter%
\exf@config@insertsheetclearpage%
\ifexf@style@sheetequation%
@@ -728,32 +970,33 @@
\clearpage\ifexf@twoside\ifodd\value{page}\else%
\thispagestyle{empty}\hbox{}\newpage\fi\fi}
-\define@key{exf@problem}{points}{\def\exf@points@given{#1}}
+\define@key{exf@problem}{points}{\exf@scanpoints\exf@problem@points#1++@}
\define@key{exf@problem}{label}{\def\exf@label{#1}}
\define@key{exf@problem}{tag}{\def\problemtag{#1}}
\define@key{exf@problem}{sollabel}{\xdef\exf@sollabel{#1}}
-\newenvironment{\exf@problemname}[1][]{%
+\newenvironment{printproblem}[1]{%
\par\exf@config@styletext\addvspace{\exf@config@skipproblemabove}%
\refstepcounter{\exf@problemcounter}%
\exf@config@insertproblembefore%
\begingroup%
\def\exf@in@problem{}%
\ifexf@style@problemequation%
- \exf@eqsav\value{equation}%
+ \exf@eqsav\value{equation}\relax%
\setcounter{equation}{\value{exf@problemequation}}%
\let\theequation\theexf@problemequation%
\let\theHequation\theHexf@problemequation%
\fi%
\exf@init@block{\exf@config@skipprobleminfo}%
- \def\problemtag{\csname the\exf@problemcounter\endcsname}%
- \let\exf@points@given\@undefined%
+ \def\problemtag{\getexerciseconfig{tagproblem}}%
+ \let\exf@problem@points\@undefined%
\let\exf@label\@undefined%
\global\let\exf@sollabel\@undefined%
- \setlength{\exf@problem@points@dim}{0pt}%
- \setkeys{exf@problem,exf@probleminfo}{#1}%
+ \let\exf@problem@points@total\@undefined%
+ \setkeys{exf@problem,exf@probleminfo,exf@scanproblem}{#1}%
\ifexf@autolabelproblem\label{\exf@config@labelproblem{\problemtag}}\fi%
\ifdefined\exf@label\label{\exf@label}\fi%
+ \exf@writedata{problem}{\problemtag}{\ifdefined\sheettag\sheettag\fi}%
\gdef\exf@problem@solnewsec{}%
\xdef\exf@prevprob{\csname the\exf@problemcounter\endcsname}%
\ifcsname theH\exf@problemcounter\endcsname%
@@ -761,33 +1004,30 @@
\csname theH\exf@problemcounter\endcsname}%
\fi%
\ifx\exf@data@problem@rawtitle\exf@empty%
- \global\let\exf@prevprobtitle\@undefined%
+ \global\let\exf@prevprobtitle\@undefined%
\else%
- \protected@xdef\exf@prevprobtitle{\exf@data@problem@rawtitle}%
+ \protected@xdef\exf@prevprobtitle{\exf@data@problem@rawtitle}%
\fi%
\global\let\exf@prevsubprob\@undefined%
\global\let\exf@prevsubprobhref\@undefined%
- \let\exf@problem@points\@undefined%
- \ifdefined\exf@points@given%
- \let\exf@problem@points\exf@points@given%
+ \ifdefined\exf@problem@points%
+ \let\exf@problem@points@given\exf@empty%
\else%
+ \let\exf@problem@points@given\@undefined%
\ifcsname exf@problempoints@\problemtag\endcsname%
- \exf@csdotwo\let\exf@problem@points{exf@problempoints@\problemtag}%
+ \exf@csdotwo\let\exf@tmp{exf@problempoints@\problemtag}%
+ \exf@exptwo\exf@scanpoints\exf@problem@points\exf@tmp++@%
\fi\fi%
\global\let\exf@prevpoints\exf@problem@points%
- \let\exf@problem@pointsshow\@undefined%
- \ifdefined\exf@problem@points\ifdim\exf@problem@points pt=0pt\else%
- \let\exf@problem@pointsshow\exf@problem@points%
- \fi\fi%
- \exf@pointsatis{off}{\let\exf@problem@pointsshow\@undefined}%
- \exf@pointsatis{start}{\ifdefined\exf@problem@pointsshow%
- \exf@exptwo\exf@append@intro{\expandafter%
- \exf@config@composepointsstart\expandafter{\exf@problem@pointsshow}}%
- \let\exf@problem@pointsshow\@undefined\fi}%
- \exf@pointsatis{start*}{\ifdefined\exf@problem@pointsshow%
- \exf@exptwo\exf@prepend@intro{\expandafter%
- \exf@config@composepointsstart\expandafter{\exf@problem@pointsshow}}%
- \let\exf@problem@pointsshow\@undefined\fi}%
+ \let\exf@problem@points@show\@undefined%
+ \ifdefined\exf@problem@points%
+ \let\exf@problem@points@show\exf@problem@points%
+ \fi%
+ \exf@ifis\exf@pointsat{off}{\let\exf@problem@points@show\@undefined}%
+ \exf@ifis\exf@pointsat{start}{\exf@outpoints{\exf@append@intro}%
+ {\exf@config@composepointspairstartproblem}{\exf@problem@points@show}}%
+ \exf@ifis\exf@pointsat{start*}{\exf@outpoints{\exf@prepend@intro}%
+ {\exf@config@composepointspairstartproblem}{\exf@problem@points@show}}%
\exf@config@insertprobleminfo%
\exf@config@styletextproblem%
\ifdim\exf@config@skipproblemitem=0pt%
@@ -814,52 +1054,33 @@
\exf@config@composetitleproblem{\exf@empty}{\exf@data@problem@rawtitle}}}%
\fi%
\fi%
- \exf@pointsatis{margin}{\ifdefined\exf@problem@pointsshow%
- \expandafter\exf@prepend@def\expandafter\exf@intro\expandafter%
- {\expandafter\protect\expandafter%
- \exf@config@insertpointsmargin\expandafter{\expandafter%
- \exf@config@composepointsmargin\expandafter{\exf@problem@pointsshow}}}%
- \let\exf@problem@pointsshow\@undefined\fi}%
+ \exf@ifis\exf@pointsat{margin}{%
+ \exf@outpoints{\exf@prepend@def\exf@introitem}%
+ {\exf@makepointsmargin}{\exf@problem@points@show}}%
\exf@open@block{\exf@config@skipproblemtitle}%
\exf@addcontentsline{\exf@config@toclevelproblem}%
{\exf@config@composetocproblem{\csname the\exf@problemcounter\endcsname}%
{\exf@data@problem@rawtitle}}%
\@afterindentfalse}%
- {\exf@pointsatis{end}{\showpoints}%
- \ifdefined\exf@points@given%
- \ifdim\exf@problem@points@dim=0pt\else%
- \ifdim\exf@problem@points@dim=\exf@problem@points pt\else%
- \PackageWarning{exframe}{points mismatch for %
- \exf@problemname\space\csname the\exf@problemcounter\endcsname}%
- \ifexf@warntext\exf@config@insertwarnpoints{\exf@problemname}%
- {\strip@pt\exf@problem@points@dim}{\exf@problem@points}\fi%
- \fi\fi%
+ {\exf@ifis\exf@pointsat{end}{\showpoints}%
+ \ifdefined\exf@problem@points@given%
+ \exf@warnmismatch{\exf@problemname}{\exf@problemcounter}%
+ {\exf@problem@points@total}{\exf@problem@points}%
\else%
- \ifdefined\exf@problem@points%
- \ifdim\exf@problem@points@dim=\exf@problem@points pt\else%
- \PackageWarning{exframe}{points changed for %
- \exf@problemname\space\csname the\exf@problemcounter\endcsname;
- rerun to fix}%
- \ifexf@warntext\exf@config@insertwarnpoints{\exf@problemname}%
- {\strip@pt\exf@problem@points@dim}{\exf@problem@points}\fi%
- \fi\fi%
- \ifdim\exf@problem@points@dim=0pt%
- \let\exf@problem@points\@undefined%
- \else%
- \edef\exf@problem@points{\strip@pt\exf@problem@points@dim}%
- \fi%
+ \exf@warnrerun{\exf@problemname}{\exf@problemcounter}%
+ {\exf@problem@points@total}{\exf@problem@points}%
+ \let\exf@problem@points\exf@problem@points@total%
\fi%
\ifdefined\exf@problem@points%
- \exf@writeproblempoints{\exf@problem@points}%
- \global\addtolength{\exf@sheet@points@dim}{\exf@problem@points pt}%
- \fi%
- \ifdefined\exf@problem@points\else\ifdim\exf@sheet@points@dim=0pt\else%
+ \expandafter\exf@writeproblempoints\exf@problem@points%
+ \exf@exptwo\exf@addtopoints\exf@sheet@points@total\exf@problem@points%
+ \else\ifdefined\exf@sheet@points@total%
\PackageWarning{exframe}{no points defined for \exf@problemname}%
\fi\fi%
\global\let\exf@prevsubprob\@undefined%
\global\let\exf@prevsubprobhref\@undefined%
\par\exf@close@block%
- \exf@solbelowis{problem}{%
+ \exf@ifis\exf@solutionbelow{problem}{%
\exf@config@insertproblemsolution%
\exf@showsolutions{\exf@config@composetitlesolutionmulti}{}}%
\ifexf@style@problemequation%
@@ -869,12 +1090,98 @@
\endgroup%
\exf@config@insertproblemafter%
\addvspace{\exf@config@skipproblembelow}%
- \exf@solbelowis{problem*}{%
+ \exf@ifis\exf@solutionbelow{problem*}{%
\exf@showsolutions{\exf@config@composetitlesolutionmulti}{}}%
\ignorespacesafterend}
-\define@key{exf@subproblem}{points}{\def\exf@subproblem@points{#1}}
+\define@boolkey{exf@scanproblem}[exf@scanproblem@]{disable}[true]{}
+
+\newenvironment{exf@problem@direct}[1][]%
+ {\printproblem{#1}}{\endprintproblem\ignorespacesafterend}
+
+\newenvironment{exf@problem@scan}%
+ {\exf@scanblock{\exf@scanproblem}}{\endexf@scanproblem}%
+\newenvironment{exf@scanproblem}[2]{%
+ \exf@scanproblem@disablefalse%
+ \setkeys*{exf@scanproblem}{#1}%
+ \exf@config@insertproblemselect{#1}%
+ \ifexf@scanproblem@disable%
+ \def\exf@verbatim@process{\@gobble}%
+ \else%
+ \ifexf@lineno\exf@addline\exf@probbuf{\exf@linesep}%
+ \exf@addline\exf@probbuf{\exf@lineno}\fi%
+ \exf@addline\exf@probbuf%
+ {\@backslashchar begin{printproblem}{#1}}%
+ \def\exf@verbatim@process{\exf@append@buf\exf@probbuf}%
+ \fi%
+ \exf@verbatim#2}%
+ {\exf@endverbatim%
+ \ifexf@scanproblem@disable\else%
+ \exf@addline\exf@probbuf{\@backslashchar end{printproblem}}%
+ \global\exf@probbuf@cleanfalse%
+ \fi%
+ \ifexf@probfile@open%
+ \exf@write@buf\exf@probfile\exf@probbuf%
+ \exf@clear@probbuf%
+ \fi%
+ \ifexf@problemmanual\else%
+ \exf@source@buf\exf@probbuf%
+ \exf@clear@probbuf%
+ \fi%
+ \ignorespacesafterend}
+
+\newenvironment{\exf@problemname}%
+ {\ifexf@problembuf\let\exf@tmp\exf@problem@scan%
+ \else\let\exf@tmp\exf@problem@direct\fi%
+ \exf@tmp}%
+ {\ifexf@problembuf\let\exf@tmp\endexf@problem@scan%
+ \else\let\exf@tmp\endexf@problem@direct\fi%
+ \exf@tmp}
+
+\newcommand{\exf@problemstitle}{%
+ \protected@edef\exf@problemstitleexp{\exf@config@composetitleproblems}%
+ \ifx\exf@problemstitleexp\exf@empty\else%
+ \exf@section{\exf@config@skipproblemstitle}%
+ {\exf@config@styletitle\exf@config@styletitleproblems%
+ \exf@problemstitleexp}%
+ \exf@addcontentsline{\exf@config@toclevelproblems}%
+ {\exf@config@composetocproblems}%
+ \fi}
+
+\newcommand{\exf@showproblemsin}{%
+ \par\exf@config@styletext\addvspace{\exf@config@skipproblemsabove}%
+ \exf@config@insertproblemsbefore}
+
+\newcommand{\exf@showproblemsout}{%
+ \exf@config@insertproblemsafter%
+ \par\exf@config@styletext\addvspace{\exf@config@skipproblemsbelow}}
+
+\newcommand{\exf@showproblems}{%
+ \ifexf@probbuf@clean\else\begingroup%
+ \exf@showproblemsin%
+ \exf@problemstitle%
+ \exf@source@buf\exf@probbuf%
+ \exf@clear@probbuf%
+ \exf@showproblemsout%
+ \endgroup\fi}
+
+\newcommand{\writeproblems}[1][\jobname]{%
+ \exf@close@probfile\exf@start@probfile{#1}}
+
+\newcommand{\closeproblems}{\exf@close@probfile}
+
+\newcommand{\readproblems}[1][\jobname]{\exf@close@probfile%
+ \begingroup%
+ \exf@config@styletext\exf@config@styletextproblem%
+ \exf@problemstitle%
+ \input{#1\exf@config@extproblems}%
+ \endgroup}
+
+\newcommand{\insertproblems}{\exf@showproblems}
+
+\define@key{exf@subproblem}{points}{\exf@scanpoints\exf@subproblem@points#1++@}
\define@key{exf@subproblem}{label}{\def\exf@label{#1}}
+\define@key{exf@subproblem}{tag}{\def\subproblemtag{#1}}
\newenvironment{\exf@subproblemname}[1][]{%
\par{\exf@config@styletext\addvspace{\exf@config@skipsubproblemabove}}%
@@ -883,32 +1190,34 @@
\begingroup%
\def\exf@in@subproblem{}%
\exf@init@block{\exf@config@skipsubprobleminfo}%
+ \def\subproblemtag{\getexerciseconfig{tagsubproblem}}%
\let\exf@subproblem@points\@undefined%
\let\exf@label\@undefined%
\setkeys{exf@subproblem,exf@probleminfo}{#1}%
+ \ifexf@autolabelproblem\label{\exf@config@labelsubproblem%
+ {\subproblemtag}}\fi%
\ifdefined\exf@label\label{\exf@label}\fi%
+ \exf@writedata{subproblem}{\subproblemtag}{\problemtag}%
\xdef\exf@prevsubprob{\csname the\exf@subproblemcounter\endcsname}%
\ifcsname theH\exf@subproblemcounter\endcsname%
\xdef\exf@prevsubprobhref{\exf@subproblemcounter.%
\csname theH\exf@subproblemcounter\endcsname}%
\fi%
+ \let\exf@subproblem@points@show\@undefined%
+ \ifdefined\exf@subproblem@points%
+ \let\exf@subproblem@points@show\exf@subproblem@points\fi%
+ \exf@ifis\exf@subpointsat{off}{\let\exf@subproblem@points@show\@undefined}%
\ifdefined\exf@subproblem@points%
\global\let\exf@prevpoints\exf@subproblem@points%
- \global\addtolength{\exf@problem@points@dim}{\exf@subproblem@points pt}%
- \else%
- \ifdim\exf@problem@points@dim=0pt\else%
- \PackageWarning{exframe}{no points defined for \exf@subproblemname}%
- \fi%
- \fi%
- \exf@subpointsatis{off}{\let\exf@subproblem@points\@undefined}%
- \exf@subpointsatis{start}{\ifdefined\exf@subproblem@points%
- \exf@exptwo\exf@append@intro{\expandafter%
- \exf@config@composepointsstart\expandafter{\exf@subproblem@points}}%
- \let\exf@subproblem@points\@undefined\fi}%
- \exf@subpointsatis{start*}{\ifdefined\exf@subproblem@points%
- \exf@exptwo\exf@prepend@intro{\expandafter%
- \exf@config@composepointsstart\expandafter{\exf@subproblem@points}}%
- \let\exf@subproblem@points\@undefined\fi}%
+ \expandafter\exf@writesubproblempoints\exf@subproblem@points%
+ \exf@exptwo\exf@addtopoints\exf@problem@points@total\exf@subproblem@points%
+ \else\ifdefined\exf@problem@points@total%
+ \PackageWarning{exframe}{no points defined for \exf@subproblemname}%
+ \fi\fi%
+ \exf@ifis\exf@subpointsat{start}{\exf@outpoints{\exf@append@intro}%
+ {\exf@config@composepointspairstartsubproblem}{\exf@subproblem@points@show}}%
+ \exf@ifis\exf@subpointsat{start*}{\exf@outpoints{\exf@prepend@intro}%
+ {\exf@config@composepointspairstartsubproblem}{\exf@subproblem@points@show}}%
\exf@config@insertsubprobleminfo%
\ifdim\exf@config@skipsubproblemitem=0pt%
\exf@prepend@intro{{%
@@ -930,23 +1239,20 @@
{\csname the\exf@subproblemcounter\endcsname}%
\exf@config@composeitemsubproblemsep}}%
\fi%
- \exf@subpointsatis{margin}{\ifdefined\exf@subproblem@points%
- \expandafter\exf@prepend@def\expandafter\exf@intro\expandafter%
- {\expandafter\protect\expandafter%
- \exf@config@insertpointsmargin\expandafter{\expandafter%
- \exf@config@composepointsmargin\expandafter{\exf@subproblem@points}}}%
- \let\exf@subproblem@points\@undefined\fi}%
+ \exf@ifis\exf@subpointsat{margin}{%
+ \exf@outpoints{\exf@prepend@def\exf@introitem}%
+ {\exf@makepointsmargin}{\exf@subproblem@points@show}}%
\exf@open@block{\exf@config@skipsubproblemtitle}%
\@afterindentfalse}%
- {\exf@subpointsatis{end}{\showpoints}%
+ {\exf@ifis\exf@subpointsat{end}{\showpoints}%
\par\exf@close@block%
- \exf@solbelowis{subproblem*}{%
+ \exf@ifis\exf@solutionbelow{subproblem*}{%
\exf@config@insertsubproblemsolution%
\exf@showsolutions{\exf@config@composetitlesolutionsingle}{}}%
\endgroup%
\exf@config@insertsubproblemafter%
{\exf@config@styletext\addvspace{\exf@config@skipsubproblembelow}}%
- \exf@solbelowis{subproblem}{%
+ \exf@ifis\exf@solutionbelow{subproblem}{%
\exf@showsolutions{\exf@config@composetitlesolutionsingle}{}}%
\ignorespacesafterend}
@@ -956,30 +1262,40 @@
\define@key{exf@solution}{sheettag}{\def\sheettag{#1}}
\define@key{exf@solution}{href}{\def\exf@solhref{#1}}
\define@key{exf@solution}{label}{\def\exf@label{#1}}
-\define@key{exf@solution}{points}{\def\exf@solution@points{#1}}
+\define@key{exf@solution}{points}{\exf@scanpoints\exf@solution@points#1++@}
\define@key{exf@solution}{probtitle}{\def\exf@solprobtitle{#1}}
\newenvironment{printsolution}[1]{%
\par{\exf@config@styletext\addvspace{\exf@config@skipsolutionabove}}%
\exf@config@insertsolutionbefore%
\ifexf@style@solutionequation%
- \exf@eqsav\value{equation}%
+ \exf@eqsav\value{equation}\relax%
\setcounter{equation}{\value{exf@solutionequation}}%
\let\theequation\theexf@solutionequation%
\let\theHequation\theHexf@solutionequation%
\fi%
\begingroup%
+ \def\exf@in@solution{}%
\def\exf@solprob{}%
\def\exf@solsubprob{}%
\let\exf@label\@undefined%
- \setlength{\exf@solution@points@dim}{0pt}%
+ \let\exf@solution@points\@undefined%
+ \let\exf@solution@points@total\@undefined%
\def\exf@solhref{}%
\exf@init@block{\exf@config@skipsolutioninfo}%
\setkeys{exf@solution,exf@probleminfo}{#1}%
\exf@csdo\def{the\exf@solutioncounter}%
- {\exf@config@composeitemsolution{\exf@solprob}{\exf@solsubprob}}%
+ {\exf@config@composeitemsolutionlabel{\exf@solprob}{\exf@solsubprob}}%
\refstepcounter{\exf@solutioncounter}%
\ifdefined\exf@label\label{\exf@label}\fi%
+ \let\exf@solution@points@show\@undefined%
+ \ifdefined\exf@solution@points%
+ \let\exf@solution@points@show\exf@solution@points\fi%
+ \exf@ifis\exf@solpointsat{off}{\let\exf@solution@points@show\@undefined}%
+ \exf@ifis\exf@solpointsat{start}{\exf@outpoints{\exf@append@intro}%
+ {\exf@config@composepointspairstartsolution}{\exf@solution@points@show}}%
+ \exf@ifis\exf@solpointsat{start*}{\exf@outpoints{\exf@prepend@intro}%
+ {\exf@config@composepointspairstartsolution}{\exf@solution@points@show}}%
\exf@config@insertsolutioninfo%
\exf@config@styletext\exf@config@styletextsolution%
\ifx\exf@solsubprob\exf@empty%
@@ -1023,14 +1339,14 @@
\else\exf@solution@item\fi%
\exf@config@composeitemproblemsep}}%
\fi%
+ \exf@ifis\exf@solpointsat{margin}{%
+ \exf@outpoints{\exf@prepend@def\exf@introitem}%
+ {\exf@makepointsmargin}{\exf@solution@points@show}}%
\exf@open@block{\exf@config@skipsolutiontitle}%
\@afterindentfalse}%
- {\ifdefined\exf@solution@points\ifdim\exf@solution@points@dim=0pt\else%
- \ifdim\exf@solution@points@dim=\exf@solution@points pt\else%
- \PackageWarning{exframe}{points mismatch in \exf@solutionname}%
- \ifexf@warntext\exf@config@insertwarnpoints{\exf@solutionname}%
- {\strip@pt\exf@solution@points@dim}{\exf@solution@points}\fi%
- \fi\fi\fi%
+ {\exf@ifis\exf@solpointsat{end}{\showpoints}%
+ \exf@warnmismatch{\exf@solutionname}{\exf@solutioncounter}%
+ {\exf@solution@points@total}{\exf@solution@points}%
\par\exf@close@block%
\ifexf@style@solutionequation%
\setcounter{exf@solutionequation}{\value{equation}}%
@@ -1049,83 +1365,112 @@
\let\exf@solhref\@undefined%
\setkeys{exf@solution}{#1}%
\let\exf@composetitle\exf@config@composetitlesolutionsproblemmulti%
- \def\exf@solutionstoc{\exf@addcontentsline{\exf@config@toclevelsolution}%
- {\exf@config@composetocsolution{\exf@solprob}{\exf@solprobtitle}}}%
- \exf@solbelowis{problem}{\let\exf@composetitle%
+ \exf@ifis\exf@solutionbelow{problem}{\let\exf@composetitle%
\exf@config@composetitlesolutionsproblemsingle}%
- \exf@solbelowis{problem*}{\let\exf@composetitle%
+ \exf@ifis\exf@solutionbelow{problem*}{\let\exf@composetitle%
\exf@config@composetitlesolutionsproblemsingle}%
+ \def\exf@solutionstoc{\exf@addcontentsline{\exf@config@toclevelsolution}%
+ {\exf@config@composetocsolution{\exf@solprob}{\exf@solprobtitle}}}%
+ \addvspace{\exf@config@skipsolutionsproblemabove}%
\exf@solutionssection{\exf@config@styletitlesolutionsproblem}%
{\exf@composetitle{\exf@solprob}{\exf@solprobtitle}}%
- {\exf@config@skipsolutionsproblem}%
+ {\exf@config@skipsolutionsproblemtitle}%
{\exf@solutionstoc}{\exf@label}{\exf@solhref}%
\endgroup}
-\newenvironment{\exf@solutionname}%
- {\exf@scanblock{\exf@scansolution}}{\endexf@scansolution}%
-
-\newenvironment{exf@scansolution}[2]{%
- \exf@solbelowis{here}{\showpoints}%
- \global\exf@bufcleanfalse%
+\newcommand{\exf@process@solnewsec}{%
\ifdefined\exf@problem@solnewsec%
\def\exf@probarg{\ifdefined\exf@prevprob prob={\exf@prevprob}\fi%
\ifdefined\exf@prevprobtitle,probtitle={\exf@prevprobtitle}\fi%
\ifdefined\exf@prevprobhref,href={\exf@prevprobhref}\fi%
\ifdefined\exf@sollabel,label={\exf@sollabel}\fi}%
- \exf@solbelowis{here}{\let\exf@probarg\@undefined}%
- \exf@solbelowis{subproblem}{\let\exf@probarg\@undefined}%
- \exf@solbelowis{subproblem*}{\let\exf@probarg\@undefined}%
+ \exf@ifis\exf@solutionbelow{here}{\let\exf@probarg\@undefined}%
+ \exf@ifis\exf@solutionbelow{subproblem}{\let\exf@probarg\@undefined}%
+ \exf@ifis\exf@solutionbelow{subproblem*}{\let\exf@probarg\@undefined}%
\ifdefined\exf@probarg%
- \ifexf@lineno\exf@addbufline{\exf@linesep}\exf@addbufline{\exf@lineno}\fi%
- \exf@addbufline{\@backslashchar solutionssection{\exf@probarg}}%
- \exf@addbufline{}%
+ \ifexf@lineno\exf@addline\exf@solbuf{\exf@linesep}%
+ \exf@addline\exf@solbuf{\exf@lineno}\fi%
+ \exf@addline\exf@solbuf{\@backslashchar solutionssection{\exf@probarg}}%
+ \exf@addline\exf@solbuf{}%
\fi%
\global\let\exf@problem@solnewsec\@undefined%
- \fi%
- \ifexf@lineno\exf@addbufline{\exf@linesep}\exf@addbufline{\exf@lineno}\fi%
- \def\exf@subprobarg{%
+ \fi}%
+
+\newcommand{\exf@generate@solprobarg}{%
+ \edef\exf@solprobarg{%
\ifdefined\exf@prevprob prob={\exf@prevprob},\fi%
- \ifdefined\exf@prevsubprob%
- subprob={\exf@prevsubprob},%
+ \ifdefined\exf@prevsubprob subprob={\exf@prevsubprob},%
\ifdefined\exf@prevsubprobhref href={\exf@prevsubprobhref},\fi%
\else%
\ifdefined\exf@prevprobhref href={\exf@prevprobhref},\fi%
\fi%
- \ifdefined\exf@prevpoints points={\exf@prevpoints},\fi%
+ \ifdefined\exf@prevpoints points=%
+ {\expandafter\exf@formatpoints\exf@prevpoints},\fi%
\ifdefined\sheettag sheettag={\sheettag},\fi%
\ifdefined\problemtag problemtag={\problemtag},\fi}%
- \exf@addbufline{\@backslashchar begin{printsolution}{\exf@subprobarg#1}}%
\global\let\exf@prevsubprob\@undefined%
\global\let\exf@prevsubprobhref\@undefined%
- \global\let\exf@prevpoints\@undefined%
+ \global\let\exf@prevpoints\@undefined}%
+
+\newenvironment{exf@solution@direct}[1][]%
+ {\showpoints%
+ \global\let\exf@problem@solnewsec\@undefined%
+ \exf@generate@solprobarg%
+ \exf@showsolutionsin%
+ \let\exf@composetitle\exf@config@composetitlesolutionsingle%
+ \exf@exptwo\printsolution{\exf@solprobarg#1}}%
+ {\endprintsolution%
+ \exf@showsolutionsout%
+ \ignorespacesafterend}%
+
+\newenvironment{exf@solution@scan}%
+ {\exf@scanblock{\exf@scansolution}}{\endexf@scansolution}%
+\newenvironment{exf@scansolution}[2]{%
+ \exf@ifis\exf@solutionbelow{here}{\showpoints}%
+ \exf@process@solnewsec%
+ \exf@generate@solprobarg%
+ \ifexf@lineno\exf@addline\exf@solbuf{\exf@linesep}%
+ \exf@addline\exf@solbuf{\exf@lineno}\fi%
+ \exf@addline\exf@solbuf%
+ {\@backslashchar begin{printsolution}{\exf@solprobarg#1}}%
+ \def\exf@verbatim@process{\exf@append@buf\exf@solbuf}%
\exf@verbatim#2}%
{\exf@endverbatim%
- \exf@addbufline{\@backslashchar end{printsolution}}%
- \ifexf@infile%
- \exf@writebuf%
- \exf@clearbuf%
+ \exf@addline\exf@solbuf{\@backslashchar end{printsolution}}%
+ \global\exf@solbuf@cleanfalse%
+ \ifexf@solfile@open%
+ \exf@write@buf\exf@solfile\exf@solbuf%
+ \exf@clear@solbuf%
\fi%
- \ifsolutions\else\exf@clearbuf\fi%
- \exf@solbelowis{here}{\exf@showsolutions%
+ \ifsolutions\else\exf@clear@solbuf\fi%
+ \exf@ifis\exf@solutionbelow{here}{\exf@showsolutions%
{\exf@config@composetitlesolutionsingle}{}}%
\ifdefined\exf@in@subproblem\else%
- \exf@solbelowis{subproblem}{%
+ \exf@ifis\exf@solutionbelow{subproblem}{%
\exf@showsolutions{\exf@config@composetitlesolutionsingle}{}}%
- \exf@solbelowis{subproblem*}{%
+ \exf@ifis\exf@solutionbelow{subproblem*}{%
\exf@showsolutions{\exf@config@composetitlesolutionsingle}{}}\fi%
\ifdefined\exf@in@problem\else%
- \exf@solbelowis{problem}{%
+ \exf@ifis\exf@solutionbelow{problem}{%
\exf@showsolutions{\exf@config@composetitlesolutionmulti}{}}%
- \exf@solbelowis{problem*}{%
+ \exf@ifis\exf@solutionbelow{problem*}{%
\exf@showsolutions{\exf@config@composetitlesolutionmulti}{}}\fi%
\ignorespacesafterend}
+\newenvironment{\exf@solutionname}%
+ {\ifexf@solutionbuf\let\exf@tmp\exf@solution@scan%
+ \else\let\exf@tmp\exf@solution@direct\fi%
+ \exf@tmp}%
+ {\ifexf@solutionbuf\let\exf@tmp\endexf@solution@scan%
+ \else\let\exf@tmp\endexf@solution@direct\fi%
+ \exf@tmp}
+
\newcommand{\exf@solutionssection}[6]{%
\protected@edef\exf@solutionstitleexp{#2}%
\ifx\exf@solutionstitleexp\exf@empty\else%
\ifdefined#5%
\exf@csdo\def{the\exf@solutioncounter}%
- {\exf@config@composeitemsolution{\exf@solprob}{\exf@solsubprob}}%
+ {\exf@config@composeitemsolutionlabel{\exf@solprob}{\exf@solsubprob}}%
\refstepcounter{\exf@solutioncounter}\label{#5}%
\fi%
\exf@section{#3}{\exf@config@styletitle\exf@config@styletitlesolution#1%
@@ -1139,35 +1484,132 @@
{\exf@addcontentsline{\exf@config@toclevelsolutions}%
{\exf@config@composetocsolutions}}{\@undefined}{\@undefined}}
+\newcommand{\exf@showsolutionsin}{%
+ \par\exf@config@styletext\addvspace{\exf@config@skipsolutionsabove}%
+ \exf@config@styletextsolution%
+ \exf@config@insertsolutionsbefore}
+
+\newcommand{\exf@showsolutionsout}{%
+ \exf@config@insertsolutionsafter%
+ \par\exf@config@styletext\addvspace{\exf@config@skipsolutionsbelow}}
+
\newcommand{\exf@showsolutions}[2]{%
- \ifexf@bufclean\else\begingroup%
- \par\exf@config@styletext\addvspace{\exf@config@skipsolutionsabove}%
- \exf@config@styletextsolution%
- \exf@config@insertsolutionsbefore%
+ \ifexf@solbuf@clean\else\begingroup%
+ \exf@showsolutionsin%
\let\exf@composetitle#1%
#2%
- \exf@sourcebuf%
- \exf@clearbuf%
- \removelastskip%
- \exf@config@insertsolutionsafter%
- \par\exf@config@styletext\addvspace{\exf@config@skipsolutionbelow}%
+ \exf@source@buf\exf@solbuf%
+ \exf@clear@solbuf%
+ \exf@showsolutionsout%
\endgroup\fi}
-\newcommand{\writesolutions}[1][\jobname]{\exf@closefile\exf@startfile{#1}}
+\newcommand{\writesolutions}[1][\jobname]{%
+ \exf@close@solfile\exf@start@solfile{#1}}
-\newcommand{\closesolutions}{\exf@closefile}
+\newcommand{\closesolutions}{\exf@close@solfile}
-\newcommand{\readsolutions}[1][\jobname]{\exf@closefile%
+\newcommand{\readsolutions}[1][\jobname]{\exf@close@solfile%
\ifsolutions\begingroup%
\exf@config@styletext\exf@config@styletextsolution%
- \let\exf@config@composetitlesolution\exf@config@composetitlesolutionmulti%
+ \let\exf@composetitle\exf@config@composetitlesolutionmulti%
\exf@solutionstitle%
- \input{#1.sol}%
+ \input{#1\exf@config@extsolutions}%
\endgroup\fi}
\newcommand{\insertsolutions}{\exf@showsolutions%
{\exf@config@composetitlesolutionmulti}{\exf@solutionstitle}}
+\ifdefined\metaset
+
+\exercisedata{author={\metapick[]{author}}}
+\exercisedata{title={\metapick[]{title}}}
+\exercisedata{subject={\metapick[]{subject}}}
+\exercisedata{keyword={\metapick[]{keyword}}}
+\exercisedata{date={\metapick[]{date}}}
+\ifdefined\mstr@def@course
+\exercisedata{course={\metapick[]{course}}}
+\exercisedata{instructor={\metapick[]{instructor}}}
+\exercisedata{institution={\metapick[]{institution}}}
+\exercisedata{period={\metapick[]{period}}}
+\exercisedata{material={\metapick[]{material}}}
+\fi
+
+\metadef{sheettitle}
+\metadef{sheetauthor}
+
+\metaunset[info]{writepdf}
+\def\exf@writemetadata{%
+ \exf@ifis\exf@metadata{sheet}{\metaset[use]{sheettitle}{}}%
+ \metawritepdfinfo%
+ \exf@ifis\exf@metadata{sheet}{\metaunset[use]{sheettitle}}}
+
+\metaset{sheetauthor}{\exerciseifempty{\getsheetdata{author}}%
+ {\metapick[#1]{instructor}}{\getsheetdata{author}}}
+\metaset{sheettitle}{\exerciseifempty{\getsheetdata{rawtitle}}%
+ {\metatranslate[#1]{sheet} \thesheet}%
+ {\getsheetdata{rawtitle}}}
+\metaset{author}{\exerciseifempty{\getsheetdata{author}}%
+ {\metapick[#1]{instructor}}{\metapick[#1]{sheetauthor}}}
+\metaset{subtitle}{%
+ \metaif[use]{sheettitle}
+ {\metapick[#1]{sheettitle}}
+ {\metapick[#1]{material}}}
+
+\exerciseconfig{termsheet}{\metaterm{sheet}}
+\exerciseconfig{termsheets}{\metaterm{sheets}}
+\exerciseconfig{termproblem}{\metaterm{problem}}
+\exerciseconfig{termproblems}{\metaterm{problems}}
+\exerciseconfig{termsolution}{\metaterm{solution}}
+\exerciseconfig{termsolutions}{\metaterm{solutions}}
+\exerciseconfig{termpoint}{\metaterm{point}}
+\exerciseconfig{termpoints}{\metaterm{points}}
+
+\ifdefined\mstr@lang@en
+\metasetterm[en]{sheet}{Sheet}
+\metasetterm[en]{sheets}{Sheets}
+\metasetterm[en]{problem}{Problem}
+\metasetterm[en]{problems}{Problems}
+\metasetterm[en]{solution}{Solution}
+\metasetterm[en]{solutions}{Solutions}
+\metasetterm[en]{point}{point}
+\metasetterm[en]{points}{points}
+\fi
+
+\ifdefined\mstr@lang@de
+\metasetterm[de]{sheet}{Blatt}
+\metasetterm[de]{sheets}{Blätter}
+\metasetterm[de]{problem}{Aufgabe}
+\metasetterm[de]{problems}{Aufgaben}
+\metasetterm[de]{solution}{L\"osung}
+\metasetterm[de]{solutions}{L\"osungen}
+\metasetterm[de]{point}{Punkt}
+\metasetterm[de]{points}{Punkte}
+\fi
+
+\ifdefined\mstr@lang@fr
+\metasetterm[fr]{sheet}{Feuille}
+\metasetterm[fr]{sheets}{Feuilles}
+\metasetterm[fr]{problem}{Probl\`eme}
+\metasetterm[fr]{problems}{Probl\`emes}
+\metasetterm[fr]{solution}{Solution}
+\metasetterm[fr]{solutions}{Solutions}
+\metasetterm[fr]{point}{point}
+\metasetterm[fr]{points}{points}
+\fi
+
+\ifdefined\mstr@lang@es
+\metasetterm[es]{sheet}{Hoja}
+\metasetterm[es]{sheets}{Hojas}
+\metasetterm[es]{problem}{Problema}
+\metasetterm[es]{problems}{Problemas}
+\metasetterm[es]{solution}{Solucion}
+\metasetterm[es]{solutions}{Soluciones}
+\metasetterm[es]{point}{punto}
+\metasetterm[es]{points}{puntos}
+\fi
+
+\fi
+
\endinput
%%
%% End of file `exframe.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/exframe.tlpobj new/tlpkg/tlpobj/exframe.tlpobj
--- old/tlpkg/tlpobj/exframe.tlpobj 2019-02-28 03:35:59.000000000 +0100
+++ new/tlpkg/tlpobj/exframe.tlpobj 2020-02-26 01:54:40.000000000 +0100
@@ -1,6 +1,6 @@
name exframe
category Package
-revision 49784
+revision 53911
shortdesc Framework for exercise problems
relocated 1
longdesc This LaTeX2e package provides a general purpose framework to
@@ -11,10 +11,9 @@
longdesc implement a consistent numbering. It also provides a very
longdesc flexible interface for configuring and customising the
longdesc formatting, layout, and representation of the exercise content.
-runfiles size=12
+runfiles size=16
RELOC/tex/latex/exframe/exframe.sty
catalogue-ctan /macros/latex/contrib/exframe
-catalogue-date 2019-01-21 18:01:45 +0100
catalogue-license lppl1.3
catalogue-topics exam exercise
-catalogue-version 3.1
+catalogue-version 3.4
++++++ exsheets.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exsheets/README new/doc/latex/exsheets/README
--- old/doc/latex/exsheets/README 2017-02-11 00:30:33.000000000 +0100
+++ new/doc/latex/exsheets/README 2019-09-30 23:50:28.000000000 +0200
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-EXSHEETS 2017/02/08 v0.21i
+EXSHEETS 2019/09/30 v0.21k
bundled packages:
the EXSHEETS package
Yet another package for the creation of exercise sheets
@@ -11,7 +11,7 @@
Web: https://bitbucket.org/cgnieder/exsheets/
E-Mail: contact(a)mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2011-2017 Clemens Niederberger
+Copyright 2011-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/exsheets/exsheets_en.pdf and new/doc/latex/exsheets/exsheets_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/exsheets/exsheets_en.tex new/doc/latex/exsheets/exsheets_en.tex
--- old/doc/latex/exsheets/exsheets_en.tex 2017-02-11 00:30:33.000000000 +0100
+++ new/doc/latex/exsheets/exsheets_en.tex 2019-09-27 23:25:12.000000000 +0200
@@ -10,10 +10,10 @@
%
% --------------------------------------------------------------------------
% Clemens Niederberger
-% Web: http://www.mychemistry.eu/forums/forum/exsheets/
+% Web: https://bitbucket.org/cgnieder/exsheets/
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/exsheets.doc.tlpobj new/tlpkg/tlpobj/exsheets.doc.tlpobj
--- old/tlpkg/tlpobj/exsheets.doc.tlpobj 2019-02-28 03:36:01.000000000 +0100
+++ new/tlpkg/tlpobj/exsheets.doc.tlpobj 2019-10-01 02:21:51.000000000 +0200
@@ -1,9 +1,9 @@
name exsheets.doc
category Package
-revision 43188
+revision 52227
shortdesc doc files of exsheets
relocated 1
-docfiles size=198
+docfiles size=196
RELOC/doc/latex/exsheets/README
RELOC/doc/latex/exsheets/exsheets_en.pdf
RELOC/doc/latex/exsheets/exsheets_en.tex
++++++ exsheets.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/exsheets/exsheets-listings.sty new/tex/latex/exsheets/exsheets-listings.sty
--- old/tex/latex/exsheets/exsheets-listings.sty 2017-02-11 00:30:33.000000000 +0100
+++ new/tex/latex/exsheets/exsheets-listings.sty 2019-09-27 23:25:12.000000000 +0200
@@ -8,7 +8,7 @@
% Web: https://bitbucket.org/cgnieder/exsheets/
% E-Mail: contact(a)mychemistry.eu
% ----------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -138,7 +138,7 @@
\NewLstQuSolPair{lstquestion}{question}{lstsolution}{solution}
-\tex_endinput:D
+\file_input_stop:
HISTORY
2013/09/18 - first draft, see http://tex.stackexchange.com/a/133969/5049
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/exsheets/exsheets.sty new/tex/latex/exsheets/exsheets.sty
--- old/tex/latex/exsheets/exsheets.sty 2017-02-11 00:30:33.000000000 +0100
+++ new/tex/latex/exsheets/exsheets.sty 2019-09-30 23:50:28.000000000 +0200
@@ -8,7 +8,7 @@
% Web: http://www.mychemistry.eu/forums/forum/exsheets
% E-Mail: contact(a)mychemistry.eu
% ----------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-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,8 +28,8 @@
\RequirePackage { expl3 , xparse }
\ExplSyntaxOn
-\tl_const:Nn \c_exsheets_date_tl {2017/02/08}
-\tl_const:Nn \c_exsheets_version_tl {0.21i}
+\tl_const:Nn \c_exsheets_date_tl {2019/09/30}
+\tl_const:Nn \c_exsheets_version_tl {0.21k}
\tl_const:Nn \c_exsheets_info_tl
{Yet~ another~ package~ for~ the~ creation~ of~ exercise~ sheets~ and~ exams.}
@@ -118,7 +118,7 @@
}
\msg_new:nnn {exsheets} {loading-configurations}
- { Loading~ custom~ configurations~ file~ `exsheets_configurations.cgf'. }
+ { Loading~ custom~ configurations~ file~ `exsheets_configurations.cfg'. }
\msg_new:nnn {exsheets} {deprecated-command}
{
@@ -2395,7 +2395,7 @@
\tl_if_eq:nnTF {#3} { - }
{
\int_zero:N \l__exsheets_tmpa_int
- \int_set_eq:NN \l__exsheets_tmpb_int \c_ten_thousand
+ \int_set:Nn \l__exsheets_tmpb_int { 10000 }
\tl_if_blank:nF {#1} { \int_set:Nn \l__exsheets_tmpa_int {#1} }
\tl_if_blank:nF {#2} { \int_set:Nn \l__exsheets_tmpb_int {#2} }
\int_do_while:nn { \l__exsheets_tmpa_int <= \l__exsheets_tmpb_int }
@@ -2444,7 +2444,7 @@
\tl_if_eq:nnTF {#3} { - }
{
\int_zero:N \l__exsheets_tmpa_int
- \int_set_eq:NN \l__exsheets_tmpb_int \c_ten_thousand
+ \int_set:Nn \l__exsheets_tmpb_int { 10000 }
\tl_if_blank:nF {#1} { \int_set:Nn \l__exsheets_tmpa_int {#1} }
\tl_if_blank:nF {#2} { \int_set:Nn \l__exsheets_tmpb_int {#2} }
\int_do_while:nn { \l__exsheets_tmpa_int <= \l__exsheets_tmpb_int }
@@ -2489,9 +2489,9 @@
=
\use:c { l__exsheets_counter_#1_int }
}
- &&
- !\int_compare_p:n
- { \use:c { l__exsheets_counter_#1_int } = 0 }
+ % &&
+ % !\int_compare_p:n
+ % { \use:c { l__exsheets_counter_#1_int } = 0 }
}
{#2}
}
@@ -2576,7 +2576,7 @@
\tl_if_in:nnTF {#1} { @@@ }
{ \__exsheets_solutions_name:nnn { } {#2} {#3} }
{ \__exsheets_solutions_name:nnn {#1} {#2} {#3} }
- \tex_penalty:D \c_ten_thousand
+ \tex_penalty:D 10000 \scan_stop:
}
\cs_generate_variant:Nn \exsheets_solutions_print_name:nnn { V , VVV }
@@ -2752,7 +2752,7 @@
{ \exsheets_write_blank:n {#1} }
{
\bool_if:NTF \l__exsheets_blank_width_bool
- { \__exsheets_blank_skip:N \l__exsheets_blank_dim }
+ { \__exsheets_blank_skip:V \l__exsheets_blank_dim }
{
\__exsheets_blank_skip:n
{ \box_wd:N \l__exsheets_blank_box }
@@ -2760,7 +2760,7 @@
}
}
-\cs_new_protected:Npn \__exsheets_blank_skip:N #1
+\cs_new_protected:Npn \__exsheets_blank_skip:n #1
{
\bool_if:NTF \l__exsheets_blank_width_bool
{ \dim_set:Nn \l__exsheets_tmpa_dim {#1} }
@@ -2791,7 +2791,7 @@
}
{ \exsheets_write_blank:n { \skip_horizontal:N \l__exsheets_tmpa_dim } }
}
-\cs_generate_variant:Nn \__exsheets_blank_skip:N { n }
+\cs_generate_variant:Nn \__exsheets_blank_skip:n { V }
% the following code from Heiko Oberdieck in d.c.t.t served as inspiration
% and basis for the \blank command:
@@ -2965,7 +2965,7 @@
}
}
-\tex_endinput:D
+\file_input_stop:
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
HISTORY:
@@ -3224,6 +3224,7 @@
2016/10/25 v0.21g - smaller steps when creating the blank lines
2016/11/28 v0.21h - bug in \exsheets@used@id fixed
2017/02/08 v0.21i - adapt to l3sort integration into l3kernel
+2019/09/27 v0.21j - fix bug #44
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% TODO:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/exsheets/exsheets_configurations.cfg new/tex/latex/exsheets/exsheets_configurations.cfg
--- old/tex/latex/exsheets/exsheets_configurations.cfg 2017-02-11 00:30:33.000000000 +0100
+++ new/tex/latex/exsheets/exsheets_configurations.cfg 2019-09-27 23:25:12.000000000 +0200
@@ -5,10 +5,10 @@
%
% ----------------------------------------------------------------------------
% Clemens Niederberger
-% Web: http://www.mychemistry.eu/forums/forum/exsheets
+% Web: https://bitbucket.org/cgnieder/exsheets/
% E-Mail: contact(a)mychemistry.eu
% ----------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/exsheets/exsheets_headings.cfg new/tex/latex/exsheets/exsheets_headings.cfg
--- old/tex/latex/exsheets/exsheets_headings.cfg 2017-02-11 00:30:33.000000000 +0100
+++ new/tex/latex/exsheets/exsheets_headings.cfg 2019-09-27 23:25:12.000000000 +0200
@@ -8,7 +8,7 @@
% Web: https://bitbucket.org/cgnieder/exsheets/
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -358,4 +358,4 @@
attach = { main[hc,vc] number[hc,vc] (0pt,0pt) }
}
-\tex_endinput:D
+\file_input_stop:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/exsheets/exsheets_headings.def new/tex/latex/exsheets/exsheets_headings.def
--- old/tex/latex/exsheets/exsheets_headings.def 2017-02-11 00:30:33.000000000 +0100
+++ new/tex/latex/exsheets/exsheets_headings.def 2019-09-27 23:25:12.000000000 +0200
@@ -8,7 +8,7 @@
% Web: https://bitbucket.org/cgnieder/exsheets/
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2011-2017 Clemens Niederberger
+% Copyright 2011-2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -471,4 +471,4 @@
}
}
-\tex_endinput:D
+\file_input_stop:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/exsheets.tlpobj new/tlpkg/tlpobj/exsheets.tlpobj
--- old/tlpkg/tlpobj/exsheets.tlpobj 2019-02-28 03:36:02.000000000 +0100
+++ new/tlpkg/tlpobj/exsheets.tlpobj 2019-10-01 02:21:52.000000000 +0200
@@ -1,6 +1,6 @@
name exsheets
category Package
-revision 43188
+revision 52227
shortdesc Create exercise sheets and exams
relocated 1
longdesc The package provides the means to create exercises or questions
@@ -26,7 +26,7 @@
catalogue-also xsim
catalogue-contact-repository https://bitbucket.org/cgnieder/exsheets/
catalogue-ctan /macros/latex/contrib/exsheets
-catalogue-date 2017-05-19 18:29:46 +0200
+catalogue-date 2019-09-30 17:42:25 +0200
catalogue-license lppl1.3
catalogue-topics exercise exam expl3
-catalogue-version 0.21i
+catalogue-version 0.21k
++++++ extarrows.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/extarrows/README new/doc/latex/extarrows/README
--- old/doc/latex/extarrows/README 2008-05-16 17:44:05.000000000 +0200
+++ new/doc/latex/extarrows/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-Package: extarrows (extensible arrows)
-
-Version:
- * 1.0b (2008/05/15)
- Thanks to Herbert Voss <Herbert.Voss(a)FU-Berlin.DE>
- * 1.0a (2004/11/05)
-
-Author: kyanh <xkyanh(a)gmail.com>
-
-License: LGPL
-
-This package provides some extensible arrows in maths. mode
- (more than \xleftarrow, \xrightarrow, ...)
-
- \xlongequal
- \xLongleftarrow
- \xLongrightarrow
- \xLongleftrightarrow
- \xLeftrightarrow
-
- \xlongleftrightarrow
- \xleftrightarrow
- \xlongleftarrow
- \xlongrightarrow
-
-Examples:
- extarrows-test.tex (source)
- extarrows-test.pdf (demonstration)
-
---
-Huynh Ky Anh
-Vietnamese TeX Users Group
-http://kyanh.net/
-http://viettug.org/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/extarrows/README.md new/doc/latex/extarrows/README.md
--- old/doc/latex/extarrows/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/extarrows/README.md 2020-03-19 22:43:06.000000000 +0100
@@ -0,0 +1,34 @@
+## Description
+
+`extarrows` (extensible arrows) provides some extensible arrows in math mode.
+
+The list of new arrow commands:
+
+* `\xlongequal`
+* `\xLongleftarrow`
+* `\xLongrightarrow`
+* `\xLongleftrightarrow`
+* `\xLeftrightarrow`
+* `\xlongleftrightarrow`
+* `\xleftrightarrow`
+* `\xlongleftarrow`
+* `\xlongrightarrow`
+
+## Examples
+
+* Source file: [extarrows-test.tex](extarrows-test.tex)
+* Sample output: [extarrows-test.pdf](extarrows-test.pdf)
+
+## History
+
+* Version 1.2.0 (2020/03/12): Documentation updates. Use https://github.com/viettug/extarrows
+* Version 1.0b (2008/05/15): Thanks to Herbert Voss <Herbert.Voss(a)FU-Berlin.DE>
+* Version 1.0a (2004/11/05): Initial version
+
+## Author:
+
+Ky-Anh Huynh <xkyanh(a)gmail.com>
+
+## License
+
+LGPL
Binary files old/doc/latex/extarrows/extarrows-test.pdf and new/doc/latex/extarrows/extarrows-test.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/extarrows/extarrows-test.tex new/doc/latex/extarrows/extarrows-test.tex
--- old/doc/latex/extarrows/extarrows-test.tex 2008-05-16 17:44:05.000000000 +0200
+++ new/doc/latex/extarrows/extarrows-test.tex 2020-03-19 22:43:06.000000000 +0100
@@ -1,9 +1,17 @@
+% Purpose : Provide some extensible arrows in math mode.
+% (Sample source file)
+% Author : Ky-Anh Huynh
+% License : LGPL
+
\documentclass[10pt, a4paper, oneside]{article}
\usepackage{extarrows}
+% Define a simple macro for testing
\def\test#1/{%
- \texttt{\textbackslash #1:}\qquad& A\csname #1\endcsname[\text{to love}]{\text{we love}}Z}
+ \texttt{\textbackslash #1:}\qquad& A\csname #1\endcsname[\text{sub-script}]{\text{super-script}}Z}
+
+% Test command without sub/super-scripts
\def\tfst #1/{%
\texttt{\textbackslash #1:}\qquad& A\csname #1\endcsname[]{}Z}
@@ -11,14 +19,12 @@
\section{Syntax}
\begin{verbatim}
+\arrowname{super-script}
\arrowname[sub-script]{super-script}
\end{verbatim}
\noindent
-\texttt{arrowname} is \texttt{xlongequal}, \texttt{xLongleftarrow}, etc.
-
-\noindent
-The parameter \verb"[sub-script]" is optional.
+\texttt{arrowname} is one of known arrow command, for example, \texttt{xlongequal}, \texttt{xLongleftarrow},\ldots
\section{Examples}
\begin{align}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/extarrows.doc.tlpobj new/tlpkg/tlpobj/extarrows.doc.tlpobj
--- old/tlpkg/tlpobj/extarrows.doc.tlpobj 2019-02-28 03:36:02.000000000 +0100
+++ new/tlpkg/tlpobj/extarrows.doc.tlpobj 2020-03-20 18:32:42.000000000 +0100
@@ -1,9 +1,9 @@
name extarrows.doc
category Package
-revision 15878
+revision 54400
shortdesc doc files of extarrows
relocated 1
-docfiles size=10
- RELOC/doc/latex/extarrows/README
+docfiles size=18
+ RELOC/doc/latex/extarrows/README.md
RELOC/doc/latex/extarrows/extarrows-test.pdf
RELOC/doc/latex/extarrows/extarrows-test.tex
++++++ extarrows.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/extarrows/extarrows.sty new/tex/latex/extarrows/extarrows.sty
--- old/tex/latex/extarrows/extarrows.sty 2008-05-16 17:44:05.000000000 +0200
+++ new/tex/latex/extarrows/extarrows.sty 2020-03-19 22:43:06.000000000 +0100
@@ -1,5 +1,9 @@
+% Purpose : Provide some extensible arrows in math mode.
+% Author : Ky-Anh Huynh
+% License : LGPL
+
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{extarrows}[2008/05/15 v1.0b Some extensible arrows]
+\ProvidesPackage{extarrows}[2020/03/12 v1.2.0 Some extensible arrows]
\RequirePackage{amsmath}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/extarrows.tlpobj new/tlpkg/tlpobj/extarrows.tlpobj
--- old/tlpkg/tlpobj/extarrows.tlpobj 2019-02-28 03:36:02.000000000 +0100
+++ new/tlpkg/tlpobj/extarrows.tlpobj 2020-03-20 18:32:42.000000000 +0100
@@ -1,6 +1,6 @@
name extarrows
category Package
-revision 15878
+revision 54400
shortdesc Extra Arrows beyond those provided in amsmath
relocated 1
longdesc Arrows are provided to supplement \xleftarrow and \xrightarrow
@@ -10,8 +10,9 @@
longdesc \xlongrightarrow.
runfiles size=1
RELOC/tex/latex/extarrows/extarrows.sty
+catalogue-contact-bugs https://github.com/viettug/extarrows/issues
+catalogue-contact-repository https://github.com/viettug/extarrows
catalogue-ctan /macros/latex/contrib/extarrows
-catalogue-date 2018-10-09 06:08:39 +0200
catalogue-license lgpl
catalogue-topics maths
-catalogue-version 1.0b
+catalogue-version 1.2.0
++++++ extract.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/extract/README new/doc/latex/extract/README
--- old/doc/latex/extract/README 2006-11-09 14:48:06.000000000 +0100
+++ new/doc/latex/extract/README 2019-09-18 23:57:16.000000000 +0200
@@ -1,5 +1,5 @@
-extract v1.8
-------------
+extract v1.9a
+-------------
This package can be used to (conditionally) extract specific
commands and environments from a source file and write them to a
@@ -44,7 +44,7 @@
License
-------
-Copyright (C) 2004-2005 Hendri Adriaens
+Copyright (C) 2004-2019 Hendri Adriaens
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/extract/extract.bib new/doc/latex/extract/extract.bib
--- old/doc/latex/extract/extract.bib 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/extract/extract.bib 2019-09-18 23:57:16.000000000 +0200
@@ -0,0 +1,139 @@
+%%
+%% This is file `extract.bib',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% extract.dtx (with options: `bib')
+%%
+%% ---------------------------------------
+%% Copyright (C) 2004-2019 Hendri Adriaens
+%% ---------------------------------------
+%%
+%% 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 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
+%%
+%% This work consists of the file extract.dtx and the derived files
+%% extract.sty, xtrex1.tex, xtrex2.tex, xtrex3.tex, xtrex4.tex,
+%% xtrex5.tex, xtrex6.tex and xtrex7.tex.
+%%
+%% The following files constitute the extract package and must be
+%% distributed as a whole: readme, extract.dtx, extract.pdf and
+%% extract.sty.
+%%
+@MISC{LaTeXbase,
+ author = {Johannes Braams and David Carlisle and Alan Jeffrey and Leslie Lamport
+ and Frank Mittelbach and Chris Rowley and Rainer Sch\"opf},
+ title = {The {\LaTeXe} Sources},
+ howpublished = {\url{CTAN:/macros/latex/base}},
+ year = 2003
+}
+
+@MISC{xkeyval,
+ author = {Hendri Adriaens},
+ title = {\pf{xkeyval} package},
+ howpublished = {\url{CTAN:/macros/latex/contrib/xkeyval}}
+}
+
+@MISC{verbatim,
+ author = {Rainer Sch\"opf},
+ title = {\pf{verbatim} package, v1.5q},
+ howpublished = {\url{CTAN:/macros/latex/required/tools}},
+ year = {2003/08/22}
+}
+
+@MISC{xcomment,
+ author = {Timothy Van Zandt},
+ title = {\pf{xcomment} package, v1.2},
+ howpublished = {\url{CTAN:/macros/latex/contrib/seminar}},
+ year = {1993/02/12}
+}
+
+@MISC{askinclude,
+ author = {{Pablo A. Straub}},
+ title = {\pf{askinclude} package, v1.2e},
+ howpublished = {\url{CTAN:/macros/latex/contrib/misc}},
+ year = {1994/11/11}
+}
+
+@MISC{excludeonly,
+ author = {Dan Luecking},
+ title = {\pf{excludeonly} package, v1.0},
+ howpublished = {\url{CTAN:/macros/latex/contrib/misc}},
+ year = {2003/03/14}
+}
+
+@MISC{comment,
+ author = {Victor Eijkhout},
+ title = {\pf{comment} package, v3.6},
+ howpublished = {\url{CTAN:/macros/latex/contrib/comment}},
+ year = {1999/10}
+}
+
+@MISC{optional,
+ author = {Donald Arseneau},
+ title = {\pf{optional} package, v2.2},
+ howpublished = {\url{CTAN:/macros/latex/contrib/misc}},
+ year = {2001/09}
+}
+
+@MISC{version,
+ author = {Stephen Bellantoni},
+ title = {\pf{version} package},
+ howpublished = {\url{CTAN:/macros/latex/contrib/misc}},
+ year = {1990}
+}
+
+@MISC{versions,
+ author = {Uwe L\"uck},
+ title = {\pf{versions} package, v0.51},
+ howpublished = {\url{CTAN:/macros/latex/contrib/versions}},
+ year = {2003/10/15}
+}
+
+@MISC{pagesel,
+ author = {Heiko Oberdiek},
+ title = {\pf{pagesel} package, v1.1},
+ howpublished = {\url{CTAN:/macros/latex/contrib/oberdiek}},
+ year = {1999/04/13}
+}
+
+@MISC{pdfpages,
+ author = {Andreas Matthias},
+ title = {\pf{pdfpages} package, v0.3e},
+ howpublished = {\url{CTAN:/macros/latex/contrib/pdfpages}},
+ year = {2004/01/31}
+}
+
+@MISC{selectp,
+ author = {Donald Arseneau},
+ title = {\pf{selectp} package, v0.9},
+ howpublished = {\url{CTAN:/macros/latex/contrib/misc}},
+ year = {1992/09/25}
+}
+
+@MISC{fancyvrb,
+ author = {Timothy Van Zandt},
+ title = {\pf{fancyvrb} package, v2.6},
+ howpublished = {\url{CTAN:/macros/latex/contrib/fancyvrb}},
+ year = {1998/07/17}
+}
+
+@MISC{listings,
+ author = {Carsten Heinz},
+ title = {\pf{listings} package, v1.3},
+ howpublished = {\url{CTAN:/macros/latex/contrib/listings}},
+ year = {2004/09/07}
+}
+\endinput
+%%
+%% End of file `extract.bib'.
Binary files old/doc/latex/extract/extract.pdf and new/doc/latex/extract/extract.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/extract/xtrex1.tex new/doc/latex/extract/xtrex1.tex
--- old/doc/latex/extract/xtrex1.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/extract/xtrex1.tex 2019-09-18 23:57:16.000000000 +0200
@@ -0,0 +1,56 @@
+%%
+%% This is file `xtrex1.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% extract.dtx (with options: `xtrex1')
+%%
+%% ---------------------------------------
+%% Copyright (C) 2004-2019 Hendri Adriaens
+%% ---------------------------------------
+%%
+%% 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 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
+%%
+%% This work consists of the file extract.dtx and the derived files
+%% extract.sty, xtrex1.tex, xtrex2.tex, xtrex3.tex, xtrex4.tex,
+%% xtrex5.tex, xtrex6.tex and xtrex7.tex.
+%%
+%% The following files constitute the extract package and must be
+%% distributed as a whole: readme, extract.dtx, extract.pdf and
+%% extract.sty.
+%%
+\documentclass[10pt]{article}
+\usepackage[
+ active,
+ generate=file,
+ copydocumentclass=false,
+ extract-env=equation
+]{extract}
+\begin{extract}
+\documentclass[11pt]{article}
+\end{extract}
+\begin{document}
+Some text.
+\begin{equation}
+a^2+b^2=c^2
+\end{equation}
+Some text.
+\begin{equation}
+x^2+y^2=z^2
+\end{equation}
+Some text.
+\end{document}
+\endinput
+%%
+%% End of file `xtrex1.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/extract/xtrex2.tex new/doc/latex/extract/xtrex2.tex
--- old/doc/latex/extract/xtrex2.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/extract/xtrex2.tex 2019-09-18 23:57:16.000000000 +0200
@@ -0,0 +1,57 @@
+%%
+%% This is file `xtrex2.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% extract.dtx (with options: `xtrex2')
+%%
+%% ---------------------------------------
+%% Copyright (C) 2004-2019 Hendri Adriaens
+%% ---------------------------------------
+%%
+%% 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 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
+%%
+%% This work consists of the file extract.dtx and the derived files
+%% extract.sty, xtrex1.tex, xtrex2.tex, xtrex3.tex, xtrex4.tex,
+%% xtrex5.tex, xtrex6.tex and xtrex7.tex.
+%%
+%% The following files constitute the extract package and must be
+%% distributed as a whole: readme, extract.dtx, extract.pdf and
+%% extract.sty.
+%%
+\documentclass{article}
+\usepackage[
+ active,
+ generate=file,
+ extract-env=exercise,
+ extract-cmd=section,
+ extract-cmdline=label
+]{extract}
+\begin{extract*}
+\newtheorem{exercise}{Exercise}
+\end{extract*}
+\begin{document}
+\section{Theory}
+\label{sec:1}
+Some text.
+\section{Exercises}
+\begin{exercise}
+Use the results from section
+\ref{sec:1} to show that\dots
+\end{exercise}
+Some text.
+\end{document}
+\endinput
+%%
+%% End of file `xtrex2.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/extract/xtrex3.tex new/doc/latex/extract/xtrex3.tex
--- old/doc/latex/extract/xtrex3.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/extract/xtrex3.tex 2019-09-18 23:57:16.000000000 +0200
@@ -0,0 +1,64 @@
+%%
+%% This is file `xtrex3.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% extract.dtx (with options: `xtrex3')
+%%
+%% ---------------------------------------
+%% Copyright (C) 2004-2019 Hendri Adriaens
+%% ---------------------------------------
+%%
+%% 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 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
+%%
+%% This work consists of the file extract.dtx and the derived files
+%% extract.sty, xtrex1.tex, xtrex2.tex, xtrex3.tex, xtrex4.tex,
+%% xtrex5.tex, xtrex6.tex and xtrex7.tex.
+%%
+%% The following files constitute the extract package and must be
+%% distributed as a whole: readme, extract.dtx, extract.pdf and
+%% extract.sty.
+%%
+\documentclass{article}
+\usepackage[
+ active,
+ generate=file,
+ extract-env=figure,
+ figure-nrs={1,3},
+ figure-labels={fig-a,fig-b}
+]{extract}
+\begin{document}
+Some text.
+\begin{figure}
+Figure 1.
+\end{figure}
+Some text.
+\extractionlabel{fig-a}
+\begin{figure}
+Figure 2.
+\end{figure}
+Some text.
+\extractionlabel{fig-b}
+\begin{figure}
+Figure 3.
+\end{figure}
+Some text.
+\extractionlabel{fig-c}
+\begin{figure}
+Figure 4.
+\end{figure}
+\end{document}
+\endinput
+%%
+%% End of file `xtrex3.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/extract/xtrex4.tex new/doc/latex/extract/xtrex4.tex
--- old/doc/latex/extract/xtrex4.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/extract/xtrex4.tex 2019-09-18 23:57:16.000000000 +0200
@@ -0,0 +1,54 @@
+%%
+%% This is file `xtrex4.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% extract.dtx (with options: `xtrex4')
+%%
+%% ---------------------------------------
+%% Copyright (C) 2004-2019 Hendri Adriaens
+%% ---------------------------------------
+%%
+%% 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 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
+%%
+%% This work consists of the file extract.dtx and the derived files
+%% extract.sty, xtrex1.tex, xtrex2.tex, xtrex3.tex, xtrex4.tex,
+%% xtrex5.tex, xtrex6.tex and xtrex7.tex.
+%%
+%% The following files constitute the extract package and must be
+%% distributed as a whole: readme, extract.dtx, extract.pdf and
+%% extract.sty.
+%%
+\documentclass{article}
+\usepackage[
+ active,
+ generate=file,
+ extract-env=equation*
+]{extract}
+\begin{extract*}
+\usepackage{amsmath}
+\end{extract*}
+\begin{document}
+Some text.
+\begin{equation*}
+x^2+y^2=z^2
+\end{equation*}
+\begin{extract}
+$x=3$, $y=4$ and $z=5$
+satisfy this equation.
+\end{extract}
+\end{document}
+\endinput
+%%
+%% End of file `xtrex4.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/extract/xtrex5.tex new/doc/latex/extract/xtrex5.tex
--- old/doc/latex/extract/xtrex5.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/extract/xtrex5.tex 2019-09-18 23:57:16.000000000 +0200
@@ -0,0 +1,59 @@
+%%
+%% This is file `xtrex5.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% extract.dtx (with options: `xtrex5')
+%%
+%% ---------------------------------------
+%% Copyright (C) 2004-2019 Hendri Adriaens
+%% ---------------------------------------
+%%
+%% 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 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
+%%
+%% This work consists of the file extract.dtx and the derived files
+%% extract.sty, xtrex1.tex, xtrex2.tex, xtrex3.tex, xtrex4.tex,
+%% xtrex5.tex, xtrex6.tex and xtrex7.tex.
+%%
+%% The following files constitute the extract package and must be
+%% distributed as a whole: readme, extract.dtx, extract.pdf and
+%% extract.sty.
+%%
+\documentclass{article}
+\usepackage[
+ active,
+ generate=file,
+ copydocumentclass=false,
+ extract-labels=type-a,
+ line-labels={type-a,type-c},
+ line-nrs=3
+]{extract}
+\begin{extract}[type-a]
+\documentclass{article}
+\end{extract}
+\begin{extract}[type-b]
+\documentclass{book}
+\end{extract}
+\begin{document}
+\parindent0pt
+\extractline[type-a]line 1\\
+\extractline*line 2\\
+\extractline line 3\\
+\extractline*[type-a]line 4\\
+\extractline*[type-c]line 5\\
+\extractline line 6\\
+\end{document}
+\endinput
+%%
+%% End of file `xtrex5.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/extract/xtrex6.tex new/doc/latex/extract/xtrex6.tex
--- old/doc/latex/extract/xtrex6.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/extract/xtrex6.tex 2019-09-18 23:57:16.000000000 +0200
@@ -0,0 +1,62 @@
+%%
+%% This is file `xtrex6.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% extract.dtx (with options: `xtrex6')
+%%
+%% ---------------------------------------
+%% Copyright (C) 2004-2019 Hendri Adriaens
+%% ---------------------------------------
+%%
+%% 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 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
+%%
+%% This work consists of the file extract.dtx and the derived files
+%% extract.sty, xtrex1.tex, xtrex2.tex, xtrex3.tex, xtrex4.tex,
+%% xtrex5.tex, xtrex6.tex and xtrex7.tex.
+%%
+%% The following files constitute the extract package and must be
+%% distributed as a whole: readme, extract.dtx, extract.pdf and
+%% extract.sty.
+%%
+\documentclass{article}
+\usepackage[
+ active,
+ generate=file,
+ extract-env=figure
+]{extract}
+\begin{document}
+\begin{figure}[!h]
+\begin{extractskip}
+\fbox{figure 1}
+\end{extractskip}
+\fbox{figure 2}
+\end{figure}
+\begin{extract*}
+\begin{itemize}
+\item 1
+\item 2
+a\begin{extractskip}b
+\item 3
+c\end{extractskip}d
+\item 4
+\begin{extractskip}
+\item 5
+\end{extractskip}
+\end{itemize}
+\end{extract*}
+\end{document}
+\endinput
+%%
+%% End of file `xtrex6.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/extract/xtrex7.tex new/doc/latex/extract/xtrex7.tex
--- old/doc/latex/extract/xtrex7.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/extract/xtrex7.tex 2019-09-18 23:57:16.000000000 +0200
@@ -0,0 +1,56 @@
+%%
+%% This is file `xtrex7.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% extract.dtx (with options: `xtrex7')
+%%
+%% ---------------------------------------
+%% Copyright (C) 2004-2019 Hendri Adriaens
+%% ---------------------------------------
+%%
+%% 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 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
+%%
+%% This work consists of the file extract.dtx and the derived files
+%% extract.sty, xtrex1.tex, xtrex2.tex, xtrex3.tex, xtrex4.tex,
+%% xtrex5.tex, xtrex6.tex and xtrex7.tex.
+%%
+%% The following files constitute the extract package and must be
+%% distributed as a whole: readme, extract.dtx, extract.pdf and
+%% extract.sty.
+%%
+\documentclass{article}
+\usepackage[
+ active,
+ generate=file,
+ extractskip-labels=skipb
+]{extract}
+\begin{document}
+\begin{extract*}
+\begin{itemize}
+\begin{extractskip}[skipa]
+\item 1
+\end{extractskip}
+\begin{extractskip}[skipb]
+\item 2
+\end{extractskip}
+\begin{extractskip}[skipc]
+\item 3
+\end{extractskip}
+\end{itemize}
+\end{extract*}
+\end{document}
+\endinput
+%%
+%% End of file `xtrex7.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/extract/xtrpream.ble new/doc/latex/extract/xtrpream.ble
--- old/doc/latex/extract/xtrpream.ble 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/extract/xtrpream.ble 2019-09-18 23:57:16.000000000 +0200
@@ -0,0 +1,165 @@
+%%
+%% This is file `xtrpream.ble',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% extract.dtx (with options: `preamble')
+%%
+%% ---------------------------------------
+%% Copyright (C) 2004-2019 Hendri Adriaens
+%% ---------------------------------------
+%%
+%% 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 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%%
+%% This Current Maintainer of this work is Hendri Adriaens.
+%%
+%% This work consists of the file extract.dtx and the derived files
+%% extract.sty, xtrex1.tex, xtrex2.tex, xtrex3.tex, xtrex4.tex,
+%% xtrex5.tex, xtrex6.tex and xtrex7.tex.
+%%
+%% The following files constitute the extract package and must be
+%% distributed as a whole: readme, extract.dtx, extract.pdf and
+%% extract.sty.
+%%
+\usepackage{url}
+\usepackage{extract}
+\usepackage{xcolor}
+\usepackage{fourier}
+\usepackage{varioref}
+\usepackage{pst-text}
+\def\reftextafter{on page~\thevpagerefnum}
+\def\reftextbefore{on page~\thevpagerefnum}
+\def\reftextfaceafter{on page~\thevpagerefnum}
+\def\reftextfacebefore{on page~\thevpagerefnum}
+\usepackage{listings}
+\lstnewenvironment{command}{%
+ \lstset{columns=flexible,frame=single,backgroundcolor=\color{blue!20},%
+ xleftmargin=\fboxsep,xrightmargin=\fboxsep,escapeinside=`',gobble=1}}{}
+\lstnewenvironment{example}{%
+ \lstset{basicstyle=\footnotesize\ttfamily,columns=flexible,frame=single,%
+ backgroundcolor=\color{yellow!20},xleftmargin=\fboxsep,%
+ xrightmargin=\fboxsep,gobble=1}}{}
+\def\mktitledecor{%
+ \rput[tl]{90}(-6.5,-22.56){%
+ \psline[linewidth=1pt](0,1.5)(\paperheight,1.5)%
+ \rput[lB](.075\paperheight,.5){\pscharpath[linecolor=blue!50,%
+ fillcolor=yellow!20,fillstyle=solid,linewidth=.5pt]%
+ {\Huge\bfseries\sffamily extract}%
+ }%
+ \rput[rB](.925\paperheight,.5){\pscharpath[linecolor=blue!50,%
+ fillcolor=yellow!20,fillstyle=solid,linewidth=.5pt]%
+ {\Huge\bfseries Documentation}%
+ }%
+ \psline[linewidth=1pt](0,0)(\paperheight,0)%
+ }%
+}
+\usepackage{float}
+\newfloat{Listing}{htb}{loe}
+\makeatletter
+\def\tableofcontents{%
+ \begin{multicols}{2}%
+ [\section*{Contents}%
+ \setlength{\columnseprule}{.4pt}%
+ \setlength{\columnsep}{18pt}]%
+ \@starttoc{toc}%
+ \end{multicols}%
+}
+\def\changes@#1#2#3{%
+ \protected@edef\@tempa{%
+ \noexpand\glossary{\textbf{#1}\hfill\emph{(#2)}%
+ \levelchar
+ \ifx\saved@macroname\@empty
+ \space\actualchar\generalname
+ \else
+ \expandafter\@gobble\saved@macroname
+ \actualchar\string\verb\quotechar*%
+ \verbatimchar\saved@macroname\verbatimchar
+ \fi
+ :\levelchar #3}%
+ }%
+ \@tempa\endgroup\@esphack
+}
+\def\DescribeMacros{\leavevmode\@bsphack
+ \begingroup\MakePrivateLetters\Describe@Macros}
+\def\Describe@Macros#1{\endgroup\strut
+ \marginpar{\raggedleft
+ \def\@tempa{#1}\count@\z@
+ \@for\@tempa:=\@tempa\do{%
+ \ifnum\count@>\z@\\\fi\advance\count@\@ne
+ \MacroFont\expandafter\string\@tempa
+ \expandafter\SpecialUsageIndex\expandafter{\@tempa}%
+ }}%
+ \@esphack\ignorespaces
+}
+\def\DescribeOption#1{\leavevmode\@bsphack
+ \marginpar{\raggedleft\PrintDescribeOption{#1}}%
+ \SpecialOptionIndex{#1}\@esphack\ignorespaces}
+\def\PrintDescribeOption#1{\strut\emph{option}\\\MacroFont #1\ }
+\def\SpecialOptionIndex#1{\@bsphack
+ \index{#1\actualchar{\protect\ttfamily#1}
+ (option)\encapchar usage}%
+ \index{options:\levelchar#1\actualchar{\protect\ttfamily#1}\encapchar
+ usage}\@esphack}
+\def\DescribeOptions#1{\leavevmode\@bsphack
+ \marginpar{\raggedleft\strut\emph{options}%
+ \@for\@tempa:=#1\do{%
+ \\\strut\MacroFont\@tempa\SpecialOptionIndex\@tempa
+ }}\@esphack\ignorespaces}
+\def\DescribeEnv#1{\leavevmode\@bsphack
+ \marginpar{\raggedleft\PrintDescribeEnv{#1}}%
+ \SpecialEnvIndex{#1}\@esphack\ignorespaces}
+\def\PrintDescribeEnv#1{\strut\emph{environment}\\\MacroFont #1\ }
+\def\SpecialEnvIndex#1{\@bsphack
+ \index{#1\actualchar{\protect\ttfamily#1}
+ (environment)\encapchar usage}%
+ \index{environments:\levelchar#1\actualchar{\protect\ttfamily#1}\encapchar
+ usage}\@esphack}
+\def\SpecialMainEnvIndex#1{\@bsphack\special@index{%
+ #1\actualchar
+ {\string\ttfamily\space#1}
+ \encapchar main}%
+ \special@index{environments:\levelchar#1\actualchar{%
+ \string\ttfamily\space#1}\encapchar
+ main}\@esphack}
+\def\DescribeEnvs#1{\leavevmode\@bsphack
+ \marginpar{\raggedleft\strut\emph{environments}%
+ \@for\@tempa:=#1\do{%
+ \\\strut\MacroFont\@tempa\SpecialEnvIndex\@tempa
+ }}\@esphack\ignorespaces}
+\renewenvironment{theglossary}{%
+ \glossary@prologue
+ \GlossaryParms \let\item\@idxitem \ignorespaces
+ }{}%
+\makeatother
+\def\PrintChangesX{%
+ \begingroup
+ \let\efill\relax
+ \PrintChanges
+ \endgroup
+}
+\def\PrintIndexX{%
+ \begingroup
+ \setcounter{IndexColumns}{2}
+ \setlength{\columnsep}{18pt}%
+ \setlength{\columnseprule}{.4pt}%
+ \PrintIndex
+ \endgroup
+}
+\def\pf#1{\textsf{#1}}
+\def\descriptionlabel{\hspace\labelsep\normalfont}
+\EnableCrossrefs
+\RecordChanges
+\GlossaryPrologue{\section*{Version history}}
+\CodelineIndex
+\endinput
+%%
+%% End of file `xtrpream.ble'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/extract.doc.tlpobj new/tlpkg/tlpobj/extract.doc.tlpobj
--- old/tlpkg/tlpobj/extract.doc.tlpobj 2019-02-28 03:36:03.000000000 +0100
+++ new/tlpkg/tlpobj/extract.doc.tlpobj 2019-09-19 01:54:00.000000000 +0200
@@ -1,8 +1,17 @@
name extract.doc
category Package
-revision 15878
+revision 52117
shortdesc doc files of extract
relocated 1
-docfiles size=51
+docfiles size=69
RELOC/doc/latex/extract/README
+ RELOC/doc/latex/extract/extract.bib
RELOC/doc/latex/extract/extract.pdf
+ RELOC/doc/latex/extract/xtrex1.tex
+ RELOC/doc/latex/extract/xtrex2.tex
+ RELOC/doc/latex/extract/xtrex3.tex
+ RELOC/doc/latex/extract/xtrex4.tex
+ RELOC/doc/latex/extract/xtrex5.tex
+ RELOC/doc/latex/extract/xtrex6.tex
+ RELOC/doc/latex/extract/xtrex7.tex
+ RELOC/doc/latex/extract/xtrpream.ble
++++++ extract.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/extract/extract.sty new/tex/latex/extract/extract.sty
--- old/tex/latex/extract/extract.sty 2006-11-09 14:48:06.000000000 +0100
+++ new/tex/latex/extract/extract.sty 2019-09-18 23:57:16.000000000 +0200
@@ -7,7 +7,7 @@
%% extract.dtx (with options: `extract')
%%
%% ---------------------------------------
-%% Copyright (C) 2004-2005 Hendri Adriaens
+%% Copyright (C) 2004-2019 Hendri Adriaens
%% ---------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -32,7 +32,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{extract}
- [2005/05/07 v1.8 extract content from document (HA)]
+ [2019/09/18 v1.9a extract content from document (HA)]
\RequirePackage{verbatim}
\RequirePackage{xkeyval}
\newwrite\XTR@out
@@ -97,25 +97,52 @@
\fi
\fi
\newcount\@envdepth\@envdepth\z@
-\def\begin#1{%
- \@ifundefined{#1}%
- {\def\reserved@a{\@latex@error{Environment #1 undefined}\@eha}}%
- {\def\reserved@a{\def\@currenvir{#1}%
- \edef\@currenvline{\on@line}%
- \csname #1\endcsname}}%
- \@ignorefalse
- \begingroup\@endpefalse
- \global\advance\@envdepth\@ne
- \global\@namedef{@afterendenvhook@\romannumeral\@envdepth}{}%
- \reserved@a}
-\def\end#1{%
- \csname end#1\endcsname\@checkend{#1}%
- \expandafter\endgroup\if@endpe\@doendpe\fi
- \expandafter\let\expandafter\reserved@a
- \csname @afterendenvhook@\romannumeral\@envdepth\endcsname
- \global\advance\@envdepth\m@ne
- \reserved@a\relax
- \if@ignore\@ignorefalse\ignorespaces\fi}
+\@ifl@t@r\fmtversion{2019/10/01}%
+{% new format
+ \@namedef{begin }#1{%
+ \@ifundefined{#1}%
+ {\def\reserved@a{\@latex@error{Environment #1 undefined}\@eha}}%
+ {\def\reserved@a{\def\@currenvir{#1}%
+ \edef\@currenvline{\on@line}%
+ \csname #1\endcsname}}%
+ \@ignorefalse
+ \begingroup\@endpefalse
+ \global\advance\@envdepth\@ne
+ \global\@namedef{@afterendenvhook@\romannumeral\@envdepth}{}%
+ \reserved@a
+ }%
+ \@namedef{end }#1{%
+ \csname end#1\endcsname\@checkend{#1}%
+ \expandafter\endgroup\if@endpe\@doendpe\fi
+ \expandafter\let\expandafter\reserved@a
+ \csname @afterendenvhook@\romannumeral\@envdepth\endcsname
+ \global\advance\@envdepth\m@ne
+ \reserved@a\relax
+ \if@ignore\@ignorefalse\ignorespaces\fi
+ }%
+}{% old format
+ \def\begin#1{%
+ \@ifundefined{#1}%
+ {\def\reserved@a{\@latex@error{Environment #1 undefined}\@eha}}%
+ {\def\reserved@a{\def\@currenvir{#1}%
+ \edef\@currenvline{\on@line}%
+ \csname #1\endcsname}}%
+ \@ignorefalse
+ \begingroup\@endpefalse
+ \global\advance\@envdepth\@ne
+ \global\@namedef{@afterendenvhook@\romannumeral\@envdepth}{}%
+ \reserved@a
+ }%
+ \def\end#1{%
+ \csname end#1\endcsname\@checkend{#1}%
+ \expandafter\endgroup\if@endpe\@doendpe\fi
+ \expandafter\let\expandafter\reserved@a
+ \csname @afterendenvhook@\romannumeral\@envdepth\endcsname
+ \global\advance\@envdepth\m@ne
+ \reserved@a\relax
+ \if@ignore\@ignorefalse\ignorespaces\fi
+ }%
+}
\def\AfterEndEnv{%
\expandafter\g@addto@macro
\csname @afterendenvhook@\romannumeral\@envdepth\endcsname
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/extract.tlpobj new/tlpkg/tlpobj/extract.tlpobj
--- old/tlpkg/tlpobj/extract.tlpobj 2019-02-28 03:36:03.000000000 +0100
+++ new/tlpkg/tlpobj/extract.tlpobj 2019-09-19 01:54:00.000000000 +0200
@@ -1,6 +1,6 @@
name extract
category Package
-revision 15878
+revision 52117
shortdesc Extract parts of a document and write to another document
relocated 1
longdesc The package provides the means to extract specific content from
@@ -17,10 +17,10 @@
longdesc from the start of the document) should be extracted and which
longdesc not. This might be useful for extracting specific slides from a
longdesc presentation and use them in a new file.
-runfiles size=4
+runfiles size=5
RELOC/tex/latex/extract/extract.sty
catalogue-ctan /macros/latex/contrib/extract
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl
+catalogue-date 2019-09-18 21:11:08 +0200
+catalogue-license lppl1.3
catalogue-topics editorial
-catalogue-version 1.8
+catalogue-version 1.9a
++++++ factura.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/README new/doc/latex/factura/README
--- old/doc/latex/factura/README 2018-03-13 22:59:20.000000000 +0100
+++ new/doc/latex/factura/README 2019-08-17 23:50:51.000000000 +0200
@@ -1,4 +1,4 @@
-<factura>
+<factura>
* Brief description in english *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-beispiel-rechnung.tex new/doc/latex/factura/factura-beispiel-rechnung.tex
--- old/doc/latex/factura/factura-beispiel-rechnung.tex 2018-08-02 22:31:55.000000000 +0200
+++ new/doc/latex/factura/factura-beispiel-rechnung.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `beispiel')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -40,7 +40,7 @@
%% Adaptado a otra legislación
%% (prefactura) Escribimos una prefactura
%% (nospanish) Sin cargar babel en castellano, ni la codificación T1 para la tipografías
-%% (\Condiciones) Con condiciones del documento
+%% (\NotaFinal) Con nota final
%%</desc>
%%
\documentclass[
@@ -86,7 +86,7 @@
\def\@@Conforme{der Kunde}
\def\@@DenomFactura{Rechnung}
\def\@@DenomCotiza{Voranschlag}
-% \LetraNumeracion{\fontsize{14}{14}\bfseries}
+
\renewcommand{\@EstiloDenom}{\@LetraDenom\@Denominacion-\ifsinnumero\else\@LetraNumeracion Nr:\space\@Num\fi}
\renewcommand{\@EstiloNumControl}{}
\makeatother
@@ -98,11 +98,11 @@
\Telefono{+58 (987) 654.32.10}
\Email{jacinto(a)ayala.sv}
-\Fecha{02-07-2019}
+\Fecha{02-07-2020}
\FondoFactura{factura-ejemplo-fondo}
-\Condiciones{Die Zahlungsbedingungen}
+\NotaFinal{Die Zahlungsbedingungen}
\Resumen{Zusammenfassung}
\begin{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-aux.tex new/doc/latex/factura/factura-ejemplo-aux.tex
--- old/doc/latex/factura/factura-ejemplo-aux.tex 2018-05-01 19:47:50.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-aux.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `aux')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -39,8 +39,8 @@
%% Archivo auxiliar; no para ser compilado sino para ser incluido en los ejemplos.
%%
\usepackage{xspace,catchfilebetweentags,regexpatch}
-\def\optcolor{\color{blue}}
-\def\macrocolor{\color{purple}}
+\def\ejemplooptcolor{\color{blue}}
+\def\ejemplomacrocolor{\color{purple}}
\makeatletter
\catcode`\%=11
\catcode`\|=14
@@ -54,8 +54,8 @@
\CatchFileBetweenDelims{\DescEjemplo}{\jobname.tex}{<desc>}{</desc>}[\catcode37=11\catcode13=14\makeatletter]|
\catcode`\%=11
\makeatletter
- \regexpatchcmd*{\DescEjemplo}{\cC.\cO[*]*}{\c{begingroup}\c{macrocolor}\c{ttfamily}\c{string}\0\c{endgroup}\c{xspace}}{}{}|
- \regexpatchcmd*{\DescEjemplo}{(\()(\cL[a-zG]*)(\))}{(\c{begingroup}\c{optcolor}\c{ttfamily}\2\c{endgroup})}{}{}|
+ \regexpatchcmd*{\DescEjemplo}{\cC.\cO[*]*}{\c{begingroup}\c{ejemplomacrocolor}\c{ttfamily}\c{string}\0\c{endgroup}\c{xspace}}{}{}|
+ \regexpatchcmd*{\DescEjemplo}{(\()(\cL[a-zG]*)(\))}{(\c{begingroup}\c{ejemplooptcolor}\c{ttfamily}\2\c{endgroup})}{}{}|
\xpatchcmd*{\DescEjemplo}{%% }{\item}{}{}|
\xpatchcmd*{\DescEjemplo}{%%}{}{}{}|
\makeatother
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-cotizacion.tex new/doc/latex/factura/factura-ejemplo-cotizacion.tex
--- old/doc/latex/factura/factura-ejemplo-cotizacion.tex 2018-08-02 22:31:55.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-cotizacion.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `cotiza')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -42,7 +42,7 @@
%% (sintotales) No totaliza, para que el cliente tenga un presupuesto por distintos ítems que luego elegirá entre ellos, es decir, una lista de precios
%% (\FondoFactura) Con el fondo de la imprenta agregado
%% (\FirmaFactura) Agregando la firma escaneada en la factura, es decir, en la cotización
-%% (\Condiciones) Con condiciones del documento
+%% (\NotaFinal) Con nota final
%% Sin resumen
%% (\Descripcion) Con descripción larga
%%</desc>
@@ -66,13 +66,13 @@
\Telefono{+58 (987) 654.32.10}
\Email{jacinto(a)ayala.sv}
-\Fecha{02-07-2019}
+\Fecha{02-07-2020}
\FondoFactura{factura-ejemplo-fondo}
\FirmaFactura{\includegraphics[width=4.5cm]{factura-ejemplo-firma}}[0pt][17pt]
% \Denom{PRESUPUESTO} % También podemos cambiar el nombre del documento.
-\Condiciones{Las condiciones del documento...}
+\NotaFinal{La nota final...}
\begin{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura01.tex new/doc/latex/factura/factura-ejemplo-factura01.tex
--- old/doc/latex/factura/factura-ejemplo-factura01.tex 2018-08-02 22:31:55.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-factura01.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `factuno')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -38,8 +38,8 @@
%% Descripción de este ejemplo:
%%<desc>
%% Escribimos una factura
-%% Todo con los valores por omisión
-%% (\Condiciones) Con condiciones del documento
+%% Hacemos una factura básica con todo en sus valores por omisión, no ajustamos nada
+%% (\NotaFinal) Con nota final
%% (\Resumen) Con resumen
%% (\Descripcion) Con descripción larga
%%</desc>
@@ -56,9 +56,9 @@
\Telefono{+58 (987) 654.32.10}
\Email{jacinto(a)ayala.sv}
-\Fecha{02-07-2019}
+\Fecha{02-07-2020}
-\Condiciones{Las condiciones del documento...}
+\NotaFinal{La nota final...}
\Resumen{El resumen opcional}
\begin{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura02.tex new/doc/latex/factura/factura-ejemplo-factura02.tex
--- old/doc/latex/factura/factura-ejemplo-factura02.tex 2018-08-02 22:31:55.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-factura02.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `factdos')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -53,7 +53,7 @@
%% (\SepDescripcion) Alterando la distancia desde el contorno hasta el texto en la descripción
%% (\SepItemsExtra) Agregando una separación extra entre los ítems en la factura
%% (\LineaDescripcion) Alterando la línea de la descripción, la curvatura en la esquina y la sombra
-%% (\Condiciones) Con condiciones del documento
+%% (\NotaFinal) Con nota final
%% (\Resumen) Con resumen
%% Con artículos gravados con todos los IVA
%% (\ItemX) Agregando un ítem sin precio
@@ -79,7 +79,7 @@
\Telefono{+58 (987) 654.32.10}
\Email{jacinto(a)ayala.sv}
-\Fecha{02-07-2019}
+\Fecha{02-07-2020}
\SepVertical{0.75cm}
\SepDatosResumen{1cm}
@@ -88,16 +88,16 @@
\SepDescripcion{16pt}
\LineaDescripcion{1pt}{20pt}{3pt}
-\Condiciones{Las condiciones del documento...}
+\NotaFinal{La nota final...}
\Resumen{El resumen opcional}
\begin{document}
\begin{factura}
- \Item{1}{ítem con IVA general, con descuento}{1000}{8}
- \ItemR{1}{ítem con IVA reducido, con descuento}{1000}{5}
- \ItemA{1}{ítem con IVA adicional, con descuento}{1000}{10}
- \ItemE{1}{ítem exento de impuesto, con descuento}{1000}
+ \Item{1}{ítem con IVA general, viene con descuento}{1000}{12}
+ \ItemR{1}{ítem con IVA reducido, viene con descuento}{1000}{5}
+ \ItemA{1}{ítem con IVA adicional, viene con descuento}{1000}{10}
+ \ItemE{1}{ítem exento de impuesto}{1000}
\ItemX{1}{línea sin precio}
\end{factura}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura03.tex new/doc/latex/factura/factura-ejemplo-factura03.tex
--- old/doc/latex/factura/factura-ejemplo-factura03.tex 2018-08-02 22:31:55.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-factura03.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `facttres')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -44,12 +44,13 @@
%% (expandecuadro) Expande el cuadro de la factura con espacio en blanco
%% (impdesc) Con el tipo de impuesto como parte de la descripción y no de los precios
%% (sinfirmas) Sin firmas
+%% Sin especificar fecha para que tome la fecha del día.
%% (\FormatoFecha) Cambiando el separador de la fecha para que salga escrita dd/mm/yyyy
%% (\DescuentoE y \DescuentoG) Con descuentos totales en porcentajes para exentos y gravables con IVA general
%% (\SepVertical) Alterando la separación mínima vertical entre los elementos
%% (\SepEncabezado) Alterando el margen interno desde el contorno hasta el texto en el encabezado
%% (\LineaEncabezado) Alterando la línea de las cajas del encabezado, la curvatura en la esquina y la sombra
-%% (\Condiciones) Con condiciones del documento
+%% (\NotaFinal) Con nota final
%% Sin resumen
%% Con artículos gravados con todos los IVA
%% Sin descripción larga
@@ -75,15 +76,15 @@
\Email{jacinto(a)ayala.sv}
\FormatoFecha{ddmmyyyy}{/}
-\Fecha{02-07-2019}
\DescuentoE{15}
\DescuentoG{20}
+
\SepVertical{0.75cm}
\SepEncabezado{16pt}
\LineaEncabezado{1pt}{20pt}{3pt}
-\Condiciones{Las condiciones del documento...}
+\NotaFinal{La nota final...}
\begin{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura04.tex new/doc/latex/factura/factura-ejemplo-factura04.tex
--- old/doc/latex/factura/factura-ejemplo-factura04.tex 2018-08-02 22:31:55.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-factura04.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `factcuatro')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -50,7 +50,7 @@
%% (\Fecha*) Suministrando la fecha según formato de datetime2 sin alterar cómo sale escrita
%% (\SepItemsExtra) Agregando una separación extra entre los ítems en la factura
%% (\Letra***) Cambiando varias de las tipografías
-%% Sin condiciones del documento
+%% Sin nota final
%% Sin resumen
%% (\NotaPrevia) Con nota previa
%% (\ItemX) Agregando un ítem sin precio
@@ -74,13 +74,13 @@
\Direccion{Av. Ayala, Galpón San Vicente, Sector Arauca, Apure, Venezuela}
\Telefono{+58 (987) 654.32.10}
-\Fecha*{2019}{07}{02}
+\Fecha*{2020}{07}{02}
\SepItemsExtra{5pt}
\LetraDescripcion{\fontsize{20}{30}}
\LetraTitEnc{\fontsize{15}{20}\bfseries}
\LetraFirmas{\fontsize{16}{20}\itshape}
-\LetraCondiciones{\fontsize{18}{28}\bfseries}
+\LetraNotaFinal{\fontsize{18}{28}\bfseries}
\NotaPrevia{\hfill LA NOTA PREVIA}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura05.tex new/doc/latex/factura/factura-ejemplo-factura05.tex
--- old/doc/latex/factura/factura-ejemplo-factura05.tex 2018-08-02 22:31:55.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-factura05.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `factcinco')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -51,7 +51,7 @@
%% (\Conforme) Especificando el nombre de quien firma la copia de la factura como recibida
%% (\FormatoFecha) Suministrando la fecha según el formato yyyymmdd pero que salga escrita dd.mm.yyyy
%% (\SepDatosResumen) Alterando la separación horizontal entre los datos del cliente y el resumen
-%% (\Condiciones) Con condiciones del documento
+%% (\NotaFinal) Con nota final
%% (\Resumen) Con resumen
%% (\ItemX) Agregando un ítem sin precio
%% (\Descripcion) Con descripción larga
@@ -80,10 +80,10 @@
\Conforme{\Contacto}
\FormatoFecha[yyyymmdd]{ddmmyyyy}{.}
-\Fecha{20190702}
+\Fecha{20200702}
\SepDatosResumen{1cm}
-\Condiciones{Las condiciones del documento...}
+\NotaFinal{La nota final...}
\Resumen{El resumen opcional}
\begin{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura06.tex new/doc/latex/factura/factura-ejemplo-factura06.tex
--- old/doc/latex/factura/factura-ejemplo-factura06.tex 2018-08-02 22:31:55.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-factura06.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `factseis')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -39,6 +39,8 @@
%%<desc>
%% Escribimos una factura
%% (numitem) Con la columna para enumerar los ítems
+%% (descuentos) Con la columna para descuentos individuales
+%% (subtotal) Con la columna extra para subtotal
%% (denom) Escribe la denominación (“FACTURA”) y el número
%% (sinlineasve) Sin líneas verticales externas
%% (sinlineashi) Sin líneas horizontales internas
@@ -49,7 +51,7 @@
%% (\FormatoFecha) Cambiando el formato para que la fecha salga escrita en el formato default de datetime2 pero cambiando el separador yyyy/mm/dd
%% (\SepEncabezado) Alterando el margen interno desde el contorno hasta el texto en el encabezado
%% (\SepDescripcion) Alterando la distancia desde el contorno hasta el texto en la descripción
-%% (\Condiciones) Con condiciones del documento
+%% (\NotaFinal) Con nota final
%% Sin resumen
%% Escribimos un ítem cuya descripción ocupa más que una línea
%% (\Descripcion) Con descripción larga
@@ -58,6 +60,8 @@
%%
\documentclass[
numitem,
+descuentos,
+subtotal,
denom,
sinlineasve,
sinlineashi,
@@ -75,18 +79,18 @@
\Conforme{Ramela San Vicente}
\FormatoFecha{default}{/}
-\Fecha{02-07-2019}
+\Fecha{02-07-2020}
\SepEncabezado{16pt}
\SepDescripcion{16pt}
-\Condiciones{Las condiciones del documento...}
+\NotaFinal{La nota final...}
\begin{document}
\begin{factura}
- \Item{2}{ítem con IVA general}{1000}[Un ítem que ofrecemos a precio de costo y que está gravado con IVA general]\label{primeritem}
- \Item{10}{otro ítem con IVA general (descripción larga para mostrar el cambio de línea)}{1000}
+ \Item{2}{ítem con IVA general, viene con descuento}{1000}{8}[Un ítem que ofrecemos a precio de costo y que está gravado con IVA general]\label{primeritem}
+ \Item{1}{ítem con IVA general, viene con descuento}{1000}{12}
\end{factura}
\Descripcion{
@@ -95,9 +99,9 @@
En el artículo número \itemref{primeritem} se facturaron \cantref{primeritem} “\descref{primeritem}”, cada uno por un valor de \Moneda~\puref{primeritem}, dando un subtotal por este elemento de \Moneda~\subtref{primeritem}; el descuento en ese artículo es del \dctoref{primeritem}\%, dando un total de \Moneda~\ptref{primeritem}, y esta gravado con IVA de \ivaref{primeritem}\%. Ampliando la descripción podemos decir que este ítem es: “\ldescref{primeritem}”.
- La base imponible total de esta factura es de \Moneda~\numprint\BIG; el IVA es de \Moneda~\numprint\AlicuotaG, el descuento presidencial en el IVA es de \Moneda~\numprint\AlicuotaGDesc, y el total final es de \Moneda~\numprint\Total.
+ La base imponible total de esta factura es de \Moneda~\numprint\BIG; el IVA es de \Moneda~\numprint\AlicuotaG, y el total final es de \Moneda~\numprint\Total.
- % Estas son todas las macros para las totalizaciones: \BIG, \BIR, \BIA, \BIE, \AlicuotaG, \AlicuotaGDesc, \AlicuotaR, \AlicuotaA, \SubtG, \SubtR, \SubtA, \SubtE, \DescG, \DescR, \DescA, \DescE.
+ % Estas son todas las macros para las totalizaciones: \BIG, \BIR, \BIA, \BIE, \AlicuotaG, \AlicuotaR, \AlicuotaA, \SubtG, \SubtR, \SubtA, \SubtE, \DescG, \DescR, \DescA, \DescE.
}
%% Este es un comando auxiliar suministrado por factura-ejemplo-aux.tex para escribir el detalle del ejemplo en la última hoja.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura07.tex new/doc/latex/factura/factura-ejemplo-factura07.tex
--- old/doc/latex/factura/factura-ejemplo-factura07.tex 2018-08-02 22:31:55.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-factura07.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `factsiete')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -38,8 +38,6 @@
%% Descripción de este ejemplo:
%%<desc>
%% Escribimos una factura
-%% (descuentos) Con la columna para descuentos individuales
-%% (subtotal) Con la columna extra para subtotal
%% (filas) Totalización en modo de filas
%% (centrado) Centrados los totales en el modo de filas
%% (denom) Escribe la denominación (“FACTURA”) y el número
@@ -54,15 +52,13 @@
%% (\LineaDescripcion) Alterando la línea de la descripción, la curvatura en la esquina y la sombra
%% (\LineaFirmas) Alterando la longitud de las líneas para firmar y su grosor
%% (\PosFecha, \PosFirmas y \PosDenom) Alterando la posición de la fecha, las firmas y de la denominación del documento
-%% (\Condiciones) Con condiciones del documento
+%% (\NotaFinal) Con nota final
%% Sin resumen
%% Escribimos un ítem cuya descripción ocupa más que una línea
%% (\Descripcion) Con descripción larga
%%</desc>
%%
\documentclass[
-descuentos,
-subtotal,
filas,
centrado,
denom,
@@ -82,7 +78,7 @@
\Telefono{+58 (987) 654.32.10}
\Email{jacinto(a)ayala.sv}
-\Fecha{02-07-2019}
+\Fecha{02-07-2020}
\makeatletter
\renewcommand{\@@Cantidad}{Cant.}
@@ -94,18 +90,18 @@
\LineaEncabezado{1pt}{20pt}{3pt}
\LineaDescripcion{1pt}{20pt}{3pt}
\LineaFirmas{6.5cm}{2pt}
-% Puede usarse \PosFecha* o \PosDenom*, \PosControl* o \PosCondiciones* para que el texto se despliegue en la posición 'Y' dada pero hacia arriba y no hacia abajo. \PosFirmas no acepta eso.
+% Puede usarse \PosFecha* o \PosDenom*, \PosControl* o \PosNotaFinal* para que el texto se despliegue en la posición 'Y' dada pero hacia arriba y no hacia abajo. \PosFirmas no acepta eso.
\PosFecha{-0cm}{-1.5cm}
\PosFirmas{1cm}{1cm}{-3cm}
\PosDenom{-0cm}{4.3cm}
-\Condiciones{Las condiciones del documento...}
+\NotaFinal{La nota final...}
\begin{document}
\begin{factura}
- \Item{1}{ítem con IVA general, con descuento}{1000}{8}
- \Item{10}{otro ítem con IVA general (descripción larga para mostrar el cambio de línea)}[otro ítem con IVA general (esta descripción es sólo para el .csv)]{1000}{20}
+ \Item{1}{ítem con IVA general}{1000}
+ \Item{10}{otro ítem con IVA general (descripción larga para mostrar el cambio de línea)}[otro ítem con IVA general (esta descripción es sólo para el .csv)]{1000}
\end{factura}
\Descripcion{La descripción larga}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura08.tex new/doc/latex/factura/factura-ejemplo-factura08.tex
--- old/doc/latex/factura/factura-ejemplo-factura08.tex 2018-08-02 22:31:55.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-factura08.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `factocho')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -43,13 +43,15 @@
%% (siniva) Sin IVA
%% (csv) Escribe un archivo CSV con la información numérica de la factura
%% Redefiniendo el formato de la fecha (redefiniendo macros \@@Fecha y \@EstiloFecha)
-%% (\Descuento*) Con descuentos totales en moneda (y no en porcentajes) aplicables por igual a todos los tipos de elementos existentes
+%% (\Descuento*) Con descuentos totales en dinero neto (y no en porcentajes) aplicables por igual a todos los tipos de elementos existentes
%% (\Letra***) Cambiando varias de las tipografías
-%% (\Condiciones) Con condiciones del documento
+%% (\NotaFinal) Con nota final
%% (\Resumen) Con resumen
%% (\NotaInterna) Con nota interna
+%% Escribimos un ítem cuya descripción ocupa más que una línea
%% (\Descripcion) Con descripción larga
-%% (\FirmaReporte) Agregando la firma escaneada en el reporte; ajustando el corrimiento en “y” de la firma respecto a la línea
+%% (\FirmaReporte) Agregando la firma escaneada en el reporte
+%% Con \FirmaReporte, ajustando el corrimiento en “y” de la firma respecto a la línea
%%</desc>
%%
\documentclass[
@@ -68,7 +70,7 @@
\Telefono{+58 (987) 654.32.10}
\Email{jacinto(a)ayala.sv}
-\Fecha{02-07-2019}
+\Fecha{02-07-2020}
\makeatletter
\renewcommand{\@@Fecha}{\slshape FECHA:}
@@ -76,6 +78,7 @@
\makeatother
\Descuento*{300}
+
\LetraItems{\fontsize{20}{30}}
\LetraNumeros{\fontsize{20}{30}}
\LetraTipoIVA{\fontsize{20}{30}\bfseries}
@@ -86,7 +89,7 @@
\LetraNumTotal{\fontsize{20}{30}\bfseries}
\tabcolsep7pt
-\Condiciones{Las condiciones del documento...}
+\NotaFinal{La nota final...}
\Resumen{El resumen opcional}
\NotaInterna{LA NOTA INTERNA}
@@ -94,7 +97,7 @@
\begin{factura}
\Item{1}{ítem con IVA general}{1000}
- \Item{10}{otro ítem con IVA general (descripción larga para mostrar el cambio de línea)}[otro ítem con IVA general (esta descripción es sólo para el .csv)]{1000}{20}
+ \Item{10}{otro ítem con IVA general (descripción larga para mostrar el cambio de línea)}[otro ítem con IVA general (esta descripción es sólo para el .csv)]{1000}
\end{factura}
\Descripcion{La descripción larga}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura09.tex new/doc/latex/factura/factura-ejemplo-factura09.tex
--- old/doc/latex/factura/factura-ejemplo-factura09.tex 2018-08-02 22:31:55.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-factura09.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `factnueve')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -41,23 +41,25 @@
%% Escribimos en el reverso de la factura
%% (sinlineahni) Sin línea horizontal interna después de la nota interna.
%% (G) Escribiendo una letra ‘G’ en los ítems gravados con IVA general así sea el único gravamen a facturar
-%% (electro) Con descuento en IVA al pagar por medios electrónicos
-%% Con nota interna automática por el descuento en pagos electrónicos.
%% (\Credito) Especificando la cantidad de días para el crédito
%% (\SepNotaPrevia) Alterando el margen interno desde el contorno hasta el texto en la nota previa
-%% (\SepCondiciones) Especificando la distancia desde el contorno hasta el texto de las condiciones, predeterminadamente sin contorno
-%% (\LineaCondiciones) Agregando el contorno para las condiciones que predeterminadamente está deshabilitado
-%% (\Condiciones) Con condiciones del documento
-%% Haciendo mención a las fechas y al crédito en las condiciones
+%% (\SepNotaFinal) Especificando la distancia desde el contorno hasta el texto de la nota final, predeterminadamente sin contorno
+%% (\LineaNotaFinal) Agregando el contorno para la nota final que predeterminadamente está deshabilitado
+%% (\PosNotaFinal) Alterando la posición de la nota final
+%% (\NotaFinal) Con nota final
+%% Haciendo mención a las fechas y al crédito en la nota final
%% (\NotaPrevia) Con nota previa
+%% (\NotaPrevia*) Con nota previa agregada al final de la nota previa anterior
+%% (\NotaInterna) Con nota interna
%% (\NotaExterna) Con nota externa
+%% (\NotaExterna**) Con nota externa agregada al principio de la nota externa anterior
%% (\Descripcion) Con descripción larga
%%</desc>
%%
\documentclass[
sinlineahni,
G,
-electro,
+% electro,
]{factura}
\input{factura-ejemplo-aux.tex}% Se incluye para efectos del ejemplo, así tendremos disponible la macro \Ejemplo.
@@ -70,16 +72,20 @@
\Telefono{+58 (987) 654.32.10}
\Email{jacinto(a)ayala.sv}
-\Fecha{02-07-2019}
-\Credito{21}
+\Fecha{02-07-2020}
+\Credito{11}
\SepNotaPrevia{16pt}
-\SepCondiciones{16pt}
-\LineaCondiciones{0.4pt}{4pt}{3pt}
+\SepNotaFinal{16pt}
+\LineaNotaFinal{0.4pt}{4pt}{3pt}
+\PosNotaFinal{.9cm}{.9cm}{-5.3cm}
-\Condiciones{La factura se emitió el \Fecha{} con crédito de \Credito{} dias, siendo su fecha de vencimiento el \FechaVencimiento.}
+\NotaFinal{La factura se emitió el \Fecha{} con crédito de \Credito{} dias, siendo su vencimiento el \FechaVencimiento.}
\NotaPrevia{\hfill LA NOTA PREVIA}
+\NotaPrevia*{- SEGUNDA PARTE DE LA NOTA PREVIA}
+\NotaInterna{LA NOTA INTERNA}
\NotaExterna{LA NOTA EXTERNA}
+\NotaExterna**{PRIMERA PARTE DE LA NOTA EXTERNA - }
\begin{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-factura10.tex new/doc/latex/factura/factura-ejemplo-factura10.tex
--- old/doc/latex/factura/factura-ejemplo-factura10.tex 2018-08-02 22:31:55.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-factura10.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `factdiez')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -39,27 +39,27 @@
%%<desc>
%% Escribimos una factura
%% Escribimos en el reverso de la factura
-%% Establecemos las opciones de la clase a través de comandos
+%% Establecemos algunas opciones de la clase a través de comandos
%% (sinlineasv) Sin líneas verticales
%% (sinlineash) Sin líneas horizontales
+%% (sinmonedatotales) No agrega el símbolo monetario en los totales
%% (vencimiento) Con fecha de vencimiento explícita así no haya crédito
-%% Sin especificar fecha para que tome la del día.
-%% Con nota interna automática con el monto en Bs.S dada la fecha de emisión de la factura antes del cambio en la moneda el dia 04-06-2018.
%% (\GeometriaReverso) Cambiando la geometría del reverso de la factura
%% (\LineaNotaPrevia) Alterando la línea de la nota previa, para desaparecerla
-%% (\Condiciones) Con condiciones del documento
+%% (\NotaFinal) Con nota final
%% (\NotaPrevia) Con nota previa
%% (\Descripcion) Con descripción larga
%%</desc>
%%
\documentclass[
filas, % luego queda sin efecto con \filasfalse en el preámbulo
-sinlineasv,
-sinlineash,
+sinmonedatotales,
+vencimiento,
csv, % luego queda sin efecto con \csvfalse en el preámbulo
]{factura}
-\vencimientotrue \filasfalse \csvfalse
+% Cambiamos por aquí como condicionales las opciones de la clase; es lo mismo que arriba en \documentclass.
+\sinlineasvtrue \sinlineashtrue \filasfalse \csvfalse
\input{factura-ejemplo-aux.tex}% Se incluye para efectos del ejemplo, así tendremos disponible la macro \Ejemplo.
\usepackage[utf8]{inputenc}
@@ -71,18 +71,18 @@
\Telefono{+58 (987) 654.32.10}
\Email{jacinto(a)ayala.sv}
-% \Fecha{02-07-2019}
+\Fecha{02-07-2020}
\GeometriaReverso{vmargin={4cm,4cm},hmargin={4cm,4cm},footskip=0pt,headsep=0pt,headheight=0pt}
\LineaNotaPrevia{0pt}
-\Condiciones{Las condiciones del documento...}
+\NotaFinal{La nota final...}
\NotaPrevia{\hfill LA NOTA PREVIA}
\begin{document}
\begin{factura}
- \Item{1}{ítem con IVA general}{2000000}
+ \Item{1}{ítem con IVA general}{1000}
\end{factura}
\Descripcion{La descripción larga}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-firma.tex new/doc/latex/factura/factura-ejemplo-firma.tex
--- old/doc/latex/factura/factura-ejemplo-firma.tex 2018-05-01 19:47:50.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-firma.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `firma')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-fondo.tex new/doc/latex/factura/factura-ejemplo-fondo.tex
--- old/doc/latex/factura/factura-ejemplo-fondo.tex 2018-05-01 19:47:50.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-fondo.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `fondo')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-membrete.tex new/doc/latex/factura/factura-ejemplo-membrete.tex
--- old/doc/latex/factura/factura-ejemplo-membrete.tex 2018-05-01 19:47:50.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-membrete.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `membrete')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
Binary files old/doc/latex/factura/factura-ejemplo-prefactura.pdf and new/doc/latex/factura/factura-ejemplo-prefactura.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-prefactura.tex new/doc/latex/factura/factura-ejemplo-prefactura.tex
--- old/doc/latex/factura/factura-ejemplo-prefactura.tex 2018-08-02 22:31:55.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-prefactura.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `prefac')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -42,7 +42,7 @@
%% (linea) Con línea para inutilizar el espacio en blanco
%% (\Descuento) Con descuentos totales en porcentaje aplicables por igual a todos los tipos de elementos existentes
%% (\FondoFactura) Con el fondo de la imprenta agregado
-%% (\Condiciones) Con condiciones del documento
+%% (\NotaFinal) Con nota final
%% Sin resumen
%% (\Descripcion) Con descripción larga
%%</desc>
@@ -68,11 +68,12 @@
\Telefono{+58 (987) 654.32.10}
\Email{jacinto(a)ayala.sv}
-\Fecha{02-07-2019}
+\Fecha{02-07-2020}
\Descuento{18}
+
\FondoFactura{factura-ejemplo-fondo}
-\Condiciones{Las condiciones del documento...}
+\NotaFinal{La nota final...}
\begin{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-reporte1.tex new/doc/latex/factura/factura-ejemplo-reporte1.tex
--- old/doc/latex/factura/factura-ejemplo-reporte1.tex 2018-08-02 22:31:55.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-reporte1.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `repuno')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -46,8 +46,8 @@
%% Sin especificar el proveedor, así toma el emisor de la factura como el nombre del proveedor
%% (\FondoReporte) Especificamos el fondo o membrete del reporte, sólo para la primera página
%% (\InicioReporte) Estableciendo un margen superior distinto para la primera página del reporte por presencia de membrete
-%% (\TituloReporte) Establecemos el título del reporte sin que salga en las cabeceras
-%% (\Condiciones) Con condiciones del documento
+%% (\TituloReporte) Establecemos el título del reporte sin que salga en las cabeceras ni pies de página
+%% (\NotaFinal) Con nota final
%% Sin resumen
%% (\Descripcion) Con descripción larga
%% (\FirmaReporte) Agregando en el reporte la línea para firmar a mano
@@ -70,7 +70,7 @@
\Email{jacinto(a)ayala.sv}
\Emisor{Lázaro de la Vega}
-\Fecha{02-07-2019}
+\Fecha{02-07-2020}
\FondoReporte{factura-ejemplo-membrete}
\InicioReporte{2.2cm}
@@ -85,7 +85,7 @@
% \EstiloPagReporte[empty]{soloarriba}
% \EstiloPagReporte{soloarriba}
-\Condiciones{Las condiciones del documento...}
+\NotaFinal{La nota final...}
\begin{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-reporte2.tex new/doc/latex/factura/factura-ejemplo-reporte2.tex
--- old/doc/latex/factura/factura-ejemplo-reporte2.tex 2018-08-02 22:31:55.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-reporte2.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `repdos')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -43,13 +43,14 @@
%% (\Proveedor) Especificando el nombre del proveedor para el encabezado del reporte
%% (\GeometriaReporte) Cambiando la geometría del papel del reporte
%% (\FondoReporte*) Especificamos el fondo o membrete del reporte para todas las páginas
-%% (\TituloReporte*) Establecemos el título del reporte para que salga en las cabeceras
-%% (\Condiciones) Con condiciones del documento
+%% (\TituloReporte*) Establecemos el título del reporte para que salga en las cabeceras o pies de página
+%% (\NotaFinal) Con nota final
%% Sin resumen
%% (\Descripcion) Con descripción larga
%% Con etiquetas y referencias
-%% (\FirmaReporte) Agregando la firma escaneada en el reporte; ajustando el corrimiento en “y” de la firma respecto a la línea
-%% Cambiando la ubicación en “x” de la línea de la firma y cambiando la longitud de la línea hacia los lados
+%% (\FirmaReporte) Agregando la firma escaneada en el reporte
+%% Con \FirmaReporte, ajustando el corrimiento en “y” de la firma respecto a la línea
+%% Con \FirmaReporte, cambiando la ubicación en “x” de la línea de la firma y cambiando la longitud de la línea hacia los lados
%%</desc>
%%
\documentclass[
@@ -68,7 +69,7 @@
\Email{jacinto(a)ayala.sv}
\Proveedor{Lázaro de la Vega y San Román}
-\Fecha{02-07-2019}
+\Fecha{02-07-2020}
\GeometriaReporte{vmargin={4.4cm,2.5cm},hmargin={3cm,2cm},footskip=1.2cm,headsep=0.777cm,headheight=1.5cm}
\FondoReporte*{factura-ejemplo-membrete}
@@ -77,12 +78,12 @@
% \EstiloPagReporte{solonumpag}
% \EstiloPagReporte{soloabajo}
-\Condiciones{Las condiciones del documento...}
+\NotaFinal{La nota final...}
\begin{document}
\begin{factura}
- \Item{2}{ítem con IVA general}{1000}[Un ítem que ofrecemos a precio de costo y que está gravado con IVA general]\label{primeritem}
+ \Item{2}{ítem con IVA general, viene con descuento}{1000}{8}[Un ítem que ofrecemos a precio de costo y que está gravado con IVA general]\label{primeritem}
\Item{4}{otro ítem con IVA general}{100}
\end{factura}
@@ -95,9 +96,9 @@
En el artículo número \itemref{primeritem} se facturaron \cantref{primeritem} “\descref{primeritem}”, cada uno por un valor de \Moneda~\puref{primeritem}, dando un subtotal por este elemento de \Moneda~\subtref{primeritem}; el descuento en ese artículo es del \dctoref{primeritem}\%, dando un total de \Moneda~\ptref{primeritem}, y esta gravado con IVA de \ivaref{primeritem}\%. Ampliando la descripción podemos decir que este ítem es: “\ldescref{primeritem}”.
- La base imponible total de esta factura es de \Moneda~\numprint\BIG; el IVA es de \Moneda~\numprint\AlicuotaG, el descuento presidencial en el IVA es de \Moneda~\numprint\AlicuotaGDesc, y el total final es de \Moneda~\numprint\Total.
+ La base imponible total de esta factura es de \Moneda~\numprint\BIG; el IVA es de \Moneda~\numprint\AlicuotaG, y el total final es de \Moneda~\numprint\Total.
- % Estas son todas las macros para las totalizaciones: \BIG, \BIR, \BIA, \BIE, \AlicuotaG, \AlicuotaGDesc, \AlicuotaR, \AlicuotaA, \SubtG, \SubtR, \SubtA, \SubtE, \DescG, \DescR, \DescA, \DescE.
+ % Estas son todas las macros para las totalizaciones: \BIG, \BIR, \BIA, \BIE, \AlicuotaG, \AlicuotaR, \AlicuotaA, \SubtG, \SubtR, \SubtA, \SubtE, \DescG, \DescR, \DescA, \DescE.
\FirmaReporte[\includegraphics[width=4.5cm]{factura-ejemplo-firma}][0pt][17pt][3cm][3cm]
\end{reporte}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/factura/factura-ejemplo-reporte3.tex new/doc/latex/factura/factura-ejemplo-reporte3.tex
--- old/doc/latex/factura/factura-ejemplo-reporte3.tex 2018-08-02 22:31:55.000000000 +0200
+++ new/doc/latex/factura/factura-ejemplo-reporte3.tex 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `reptres')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -44,13 +44,14 @@
%% Sin especificar la persona de contacto
%% (\Proveedor) Especificando el nombre del proveedor para el encabezado del reporte
%% Sin especificar fondo de reporte
-%% (\TituloReporte) Establecemos el título del reporte sin que salga en las cabeceras
+%% (\TituloReporte) Establecemos el título del reporte sin que salga en las cabeceras ni pies de página
%% (\InfoPagina) Personalizamos la información de la cabecera del reporte y mostramos el nombre del proveedor allí
%% (\EstiloPagReporte) Cambiamos el estilo de página para que la información del reporte aparezca como pie de página
%% Sin descripción larga
-%% (\FirmaReporte) Agregando la firma escaneada en el reporte; ajustando el corrimiento en “y” de la firma respecto a la línea
-%% Cambiando la ubicación en “x” de la línea de la firma y cambiando la longitud de la línea hacia los lados
-%% Cambiando el nombre de la persona que va a firmar
+%% (\FirmaReporte) Agregando la firma escaneada en el reporte
+%% Con \FirmaReporte, ajustando el corrimiento en “y” de la firma respecto a la línea
+%% Con \FirmaReporte, cambiando la ubicación en “x” de la línea de la firma y cambiando la longitud de la línea hacia los lados
+%% Con \FirmaReporte, cambiando el nombre de la persona que va a firmar
%%</desc>
%%
\documentclass[
@@ -64,7 +65,7 @@
\RazonSocial{Ayala San Vicente Usureros}
\Proveedor{Lázaro de la Vega y San Román}
-\Fecha{02-07-2019}
+\Fecha{02-07-2020}
\TituloReporte{El título del reporte}
\InfoPagina{La cabecera o pie del reporte - \Proveedor}
Binary files old/doc/latex/factura/factura.pdf and new/doc/latex/factura/factura.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/factura.doc.tlpobj new/tlpkg/tlpobj/factura.doc.tlpobj
--- old/tlpkg/tlpobj/factura.doc.tlpobj 2019-02-28 03:36:03.000000000 +0100
+++ new/tlpkg/tlpobj/factura.doc.tlpobj 2020-04-20 01:55:52.000000000 +0200
@@ -1,6 +1,6 @@
name factura.doc
category Package
-revision 48333
+revision 54803
shortdesc doc files of factura
relocated 1
docfiles size=276
++++++ factura.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/factura/factura.cls new/tex/latex/factura/factura.cls
--- old/tex/latex/factura/factura.cls 2018-08-02 22:31:55.000000000 +0200
+++ new/tex/latex/factura/factura.cls 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `class')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -37,7 +37,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{factura}
-[2018/08/02 v3.57
+[2020/04/18 v3.73
Clase para elaborar facturas legales
en la Repu'blica Bolivariana de Venezuela.
]
@@ -45,35 +45,36 @@
\RequirePackage{etoolbox}% 'etoolbox' para los condicionales binarios y para \AtEndPreamble.
%% Condicionales auxiliares que sólo pueden ser usados dentro de un grupo.
-\newbool{Electro}
+\newbool{DCU}
+\newbool{DUC}
\newbool{Descuentos}
+%% (quitado por no vigente)
+ % \newbool{Electro}
+\newbool{ExpAbajo}\booltrue{ExpAbajo}
\newbool{IVA}
-\newbool{Subtotal}
+\newbool{NumItem}
+\newbool{PrimeroDescripcion}
\newbool{SinCantidad}
-\newbool{SinLineasVertInt}
-\newbool{SinLineasVertExt}
\newbool{SinLineaHoriNI}
\newbool{SinLineaHoriTit}
\newbool{SinLineaHoriTot}
\newbool{SinLineasHoriExt}
-\newbool{DCU}
-\newbool{DUC}
-\newbool{NumItem}
-\newbool{PrimeroDescripcion}
-\newbool{ExpAbajo}\booltrue{ExpAbajo}
+\newbool{SinLineasVertExt}
+\newbool{SinLineasVertInt}
+\newbool{Subtotal}
%% Condicionales auxiliares para la posición de los objetos fijos cuando son medidos desde la derecha, o desde abajo.
-\newbool{FechaXnegativo}
-\newbool{FechaYnegativo}
-\newbool{FechaYarriba}
-\newbool{CondYnegativo}% no hay CondXnegativo.
-\newbool{CondYarriba}
-\newbool{DenomXnegativo}
-\newbool{DenomYnegativo}
-\newbool{DenomYarriba}
+\newbool{NotaFinalYarriba}
+\newbool{NotaFinalYnegativo}% no hay NotaFinalXnegativo.
\newbool{ControlXnegativo}
-\newbool{ControlYnegativo}
\newbool{ControlYarriba}
+\newbool{ControlYnegativo}
+\newbool{DenomXnegativo}
+\newbool{DenomYarriba}
+\newbool{DenomYnegativo}
+\newbool{FechaXnegativo}
+\newbool{FechaYarriba}
+\newbool{FechaYnegativo}
\newbool{FirmasYnegativo}% no hay FirmasXnegativo; hay X_inicial y X_final para las firmas.
%% Condicionales relativos a opciones de la clase.
@@ -89,7 +90,8 @@
\newif\ifdescuentos
\newif\ifdosfirmas
\newif\ifduc
-\newif\ifelectro
+%% (quitado por no vigente)
+ % \newif\ifelectro
\newif\ifexpandecuadro
\newif\iffilas
\newif\ifG
@@ -114,6 +116,7 @@
\newif\ifsinlineasve
\newif\ifsinlineasvi
\newif\ifsinmarcas
+\newif\ifsinmonedatotales
\newif\ifsinnumero
\newif\ifsinreverso
\newif\ifsintotales
@@ -169,16 +172,16 @@
\newlength{\@GrosorLineaEncabezado}
\newlength{\@GrosorLineaNotaPrevia}
\newlength{\@GrosorLineaDescripcion}
-\newlength{\@GrosorLineaCondiciones}
+\newlength{\@GrosorLineaNotaFinal}
\newlength{\@GrosorLineaInfoPag}
\newlength{\@EsquinaLineaEncabezado}
\newlength{\@EsquinaLineaNotaPrevia}
\newlength{\@EsquinaLineaDescripcion}
-\newlength{\@EsquinaLineaCondiciones}
+\newlength{\@EsquinaLineaNotaFinal}
\newlength{\@SombraEncabezado}
\newlength{\@SombraNotaPrevia}
\newlength{\@SombraDescripcion}
-\newlength{\@SombraCondiciones}
+\newlength{\@SombraNotaFinal}
\newlength{\@LineaNodoXo}
\newlength{\@LineaNodoYo}
\newlength{\@LineaNodoXf}
@@ -191,18 +194,20 @@
\newlength{\@PosFirmasXuno}
\newlength{\@PosFirmasXdos}
\newlength{\@PosFirmasY}
-\newlength{\@PosCondicionesX}
-\newlength{\@PosCondicionesY}
+\newlength{\@PosNotaFinalXuno}
+\newlength{\@PosNotaFinalXdos}
+\newlength{\@PosNotaFinalY}
\newlength{\@PosControlX}
\newlength{\@PosControlY}
\newlength{\@EspacioVacioInicial}
\newlength{\@EspacioVacioFinal}
+\newlength{\@EspacioSignoMonetario}
\newlength{\@SeparaItemsExtra}
\newlength{\@SeparaItemsExtraFinal}
\newlength{\@SeparaInternaEncabezado}
\newlength{\@SeparaInternaNotaPrevia}
\newlength{\@SeparaInternaDescripcion}
-\newlength{\@SeparaInternaCondiciones}
+\newlength{\@SeparaInternaNotaFinal}
\newlength{\@SeparaDatosResumen}
\newlength{\@SeparaVertical}
\newlength{\@SeparaMinTotales}
@@ -231,7 +236,7 @@
\newbox{\@CajaFecha}
\newbox{\@CajaDenom}
\newbox{\@CajaControl}
-\newbox{\@CajaCond}
+\newbox{\@CajaNotaFinal}
\newbox{\@CajaEspacioVacio}
\newbox{\@CajaPrueba}
\newbox{\@CajaCaracterCR}
@@ -261,7 +266,7 @@
\DeclareOption{descuentos}{\descuentostrue}% Para los descuentos individuales.
\DeclareOption{dosfirmas}{\dosfirmastrue}% Pone las dos firmas para firmar.
\DeclareOption{duc}{\ductrue}% Descripción, luego precio unitario y luego cantidad.
-\DeclareOption{electro}{\electrotrue}% Parche por el Decreto 3085 de Nikolài.
+\DeclareOption{electro}{\CLASSERROR{Ya no esta' vigente el descuento en la ali'cuota general por pagos electro'nicos}}% Parche por el Decreto 3.085 de Nikolái, ya no vigente.
\DeclareOption{expandecuadro}{\expandecuadrotrue}% Para rellenar con líneas en blanco de manera automática.
\DeclareOption{filas}{\filastrue}% Estilo de totalización en filas.
\DeclareOption{G}{\Gtrue}% Con esta opción sale la letra 'G' en los items con IVA general, y sale el porcentaje en la base imponible general.
@@ -286,6 +291,7 @@
\DeclareOption{sinlineasvi}{\sinlineasvitrue}% Estilo 'sinlineasvi'.
\DeclareOption{sinlineasv}{\sinlineasvtrue}% Estilo 'sinlineasv'.
\DeclareOption{sinmarcas}{\sinmarcastrue}% Para evitar que aparezcan los caracteres especiales cuando la descripción es larga.
+\DeclareOption{sinmonedatotales}{\sinmonedatotalestrue}% Para que no ponga el signo monetario en los totales.
\DeclareOption{sinnumero}{\sinnumerotrue}% Escribir el texto de la denominación del documento pero sin escribir el número.
\DeclareOption{sinreverso}{\sinreversotrue}% Para no imprimir el reverso de la factura.
\DeclareOption{sintotales}{\sintotalestrue}% No escribe los totales al final, por ejemplo para cotizaciones de productos similares.
@@ -339,24 +345,30 @@
\DTMfdef{ddmmyyyy}#1#2#3#4#5#6#7#8&{\DTMs{#5#6#7#8-#3#4-#1#2}}
\DTMfdef{mm-dd-yyyy}#1-#2-#3&{\DTMs{#3-#1-#2}}
-%% Macros internas para el texto de la metadata que se va a escribir con la versión de la clase.
-\def\@factura@ver{\expandafter\csname ver(a)factura.cls\endcsname}
-\StrBefore*{\@factura@ver}{ }[\@factura@fecha]
-\StrBetween*[1,2]{\@factura@ver}{ }{ }[\@factura@vernum]
-\def\@factura@version{Hecho con la clase factura-\@factura@vernum\ (\@factura@fecha)}
+%% Macros internas para el texto de la metadata que se va a escribir con el número de la versión de la clase.
+\edef\@factura@ver{\expandafter\csname ver(a)factura.cls\endcsname}
+\ExplSyntaxOn
+ \seq_set_split:NnV \l_tmpa_seq {~} {\@factura@ver}
+ \tl_set:Nx \@factura@vernum {\seq_item:Nn \l_tmpa_seq {2}}
+
+ \seq_set_split:NnV \l_tmpa_seq {~} {\@factura@ver}
+ \tl_set:Nx \@factura@fecha {\seq_item:Nn \l_tmpa_seq {1}}
+\ExplSyntaxOff
+\def\@factura@ver{Hecho con la clase factura-\@factura@vernum\ (\@factura@fecha)}
%% Escribimos la versión de la clase en la metadata del PDF.
\ifxetex
- \special{pdf: docinfo << /Subject (\@factura@version) >>}
+ \special{pdf: docinfo << /Subject (\@factura@ver) >>}
\else
- \ifluatex
- \pdfextension info{/Subject (\@factura@version)}
- \else
- \pdfinfo{/Subject (\@factura@version)}
- \fi
+ \AtEndDocument{
+ \ifluatex
+ \pdfextension info{/Subject (\@factura@ver)}
+ \else
+ \pdfinfo{/Subject (\@factura@ver)}
+ \fi}
\fi
-\AtEndPreamble{
+\def\@EstableceOpciones{%
% Establecemos los parámetros y macros relativas a la fecha.
\DTMsetstyle{\@FormatoFecha}\DTMsetup{datesep=\@FechaSeparadores}\gdef\DTMinformat{\@FormatoFechaEntrada}
@@ -478,16 +490,17 @@
\fi
\fi
- \ifelectro
- \booltrue{Electro}
- \gdef\@NotaInterna{\@TextoDescuentoPresidencial}
- \CLASSWARNING{Ya no esta' vigente el descuento en la ali'cuota general. Aplica'ndolo igual como se pidio'}
- \CLASSWARNING{Se establecio' el texto aclaratorio del descuento presidencial como 'nota interna'}
- \iffilas
- \filasfalse
- \CLASSWARNING{La opcio'n 'electro' no es compatible con la opcio'n 'filas'. Sin efecto la opcio'n 'filas'}
- \fi
- \fi
+%% (quitado por no vigente)
+ % \ifelectro
+ % \boolfalse{Electro}
+ % \electrofalse
+ % \gdef\@NotaInterna{\@TextoDescuentoPresidencial}
+ % \CLASSWARNING{Se establecio' el texto aclaratorio del descuento presidencial como 'nota interna'}
+ % \iffilas
+ % \filasfalse
+ % \CLASSWARNING{La opcio'n 'electro' no es compatible con la opcio'n 'filas'. Sin efecto la opcio'n 'filas'}
+ % \fi
+ % \fi
\iftodosiva \@BIRtrue \@BIAtrue \@Exentotrue \Gtrue \fi
\ifsiniva\AtBeginDocument{\gdef\@ImpuestoG{0}\gdef\@ImpuestoR{0}\gdef\@ImpuestoA{0}}\fi
@@ -555,7 +568,16 @@
\@twosidetrue\@mparswitchtrue
\else
\@twosidefalse\@mparswitchfalse
- \fi
+ \fi}
+
+\NewDocumentCommand{\BeforeEndPreamble}{s s +m}{
+ \IfBooleanTF{#2}
+ {\gpreto{\@BeforeEndPreamble}{#3}}
+ {\IfBooleanTF{#1}{\long\gdef\@BeforeEndPreamble{#3}}{\gappto{\@BeforeEndPreamble}{#3}}}}
+
+\AtEndPreamble{
+ \@EstableceOpciones
+ \ifx\@undefined\@BeforeEndPreamble\else\@BeforeEndPreamble\@EstableceOpciones\fi
% Escribimos en el .log las opciones cargadas:
\ifagrupado \CLASSINFO{Opcio'n cargada: agrupado}\fi
@@ -570,7 +592,8 @@
\ifdescuentos \CLASSINFO{Opcio'n cargada: descuentos}\fi
\ifdosfirmas \CLASSINFO{Opcio'n cargada: dosfirmas}\fi
\ifduc \CLASSINFO{Opcio'n cargada: duc}\fi
- \ifelectro \CLASSINFO{Opcio'n cargada: electro}\fi
+ %% (quitado por no vigente)
+ % \ifelectro \CLASSINFO{Opcio'n cargada: electro}\fi
\ifexpandecuadro \CLASSINFO{Opcio'n cargada: expandecuadro}\fi
\iffilas \CLASSINFO{Opcio'n cargada: filas}\fi
\ifG \CLASSINFO{Opcio'n cargada: G}\fi
@@ -595,6 +618,7 @@
\ifsinlineasve \CLASSINFO{Opcio'n cargada: sinlineasve}\fi
\ifsinlineasvi \CLASSINFO{Opcio'n cargada: sinlineasvi}\fi
\ifsinmarcas \CLASSINFO{Opcio'n cargada: sinmarcas}\fi
+ \ifsinmonedatotales \CLASSINFO{Opcio'n cargada: sinmonedatotales}\fi
\ifsinnumero \CLASSINFO{Opcio'n cargada: sinnumero}\fi
\ifsinreverso \CLASSINFO{Opcio'n cargada: sinreverso}\fi
\ifsintotales \CLASSINFO{Opcio'n cargada: sintotales}\fi
@@ -618,7 +642,7 @@
%% La geometría para la factura, su reverso, y el reporte.
%% Para la factura, el margen superior está definido desde el encabezado con los datos del cliente;
%% el margen inferior está definido hasta el final de la descripción (o del cuadro de la factura si no hay descripción).
-%% Hay elementos que salen fuera de estos márgenes, como las firmas, las condiciones del documento, la numeración y la fecha.
+%% Hay elementos que salen fuera de estos márgenes, como las firmas, la nota final, la numeración y la fecha.
\def\GeometriaFactura#1{\gdef\@GeometriaFactura{#1}}
\def\GeometriaReverso#1{\gdef\@GeometriaReverso{#1}}
\def\GeometriaReporte#1{\gdef\@GeometriaReporte{#1}}
@@ -637,6 +661,7 @@
\def\@DescuentoRnum{0}
\def\@DescuentoAnum{0}
\def\@DescuentoEnum{0}
+\FPset\PrecioUtempx{1}
%% \Fecha, \FormatoFecha, \Credito, \Moneda, \RazonSocial, \Nombre, \RIF, \CI, \Contacto, \Dirección, \Telefono, \Email, \Conforme, \Emisor, \Proveedor.
\NewDocumentCommand{\Fecha}{s m g g}{%
@@ -697,19 +722,33 @@
%% Información de página: cabeceras de páginas o pies de página.
\def\InfoPagina#1{\gdef\@InfoPagina{#1}}
-%% Texto que esclarece las condiciones del documento.
-\NewDocumentCommand{\Condiciones}{+m}{\gdef\@Condiciones{#1}}
+%% Advertencia para la migración de cualquier comando de condiciones a nota final.
+\def\@ClassWarningCondiciones{\CLASSWARNING{Ya no son condiciones sino nota final, debe hacerse la migración a los nuevos comandos}}
%% Resumen opcional que va a la derecha de los datos del cliente.
\NewDocumentCommand{\Resumen}{+m}{\gdef\@Resumen{#1}}
-\NewDocumentCommand{\NotaPrevia}{+m}{\gdef\@NotaPrevia{#1}}
-
-%% Nota interna al cuadro de la factura y nota externa a él (que sale antes de \Descripcion).
-\NewDocumentCommand{\NotaInterna}{+m}{%
- \ifdefvoid{\@NotaInterna}{}{\CLASSWARNING{Se sobreescribio' la nota interna previamente definida}}%
- \gdef\@NotaInterna{#1}}
-\NewDocumentCommand{\NotaExterna}{+m}{\gdef\@NotaExterna{#1}}
+%% Nota previa (al cuadro), nota interna (del cuadro), nota externa (luego del cuadro) y nota final (luego de la descripción).
+\NewDocumentCommand{\NotaPrevia}{s s +m}{%
+ \IfBooleanTF{#2}
+ {\gpreto{\@NotaPrevia}{#3}}
+ {\IfBooleanTF{#1}{\gappto{\@NotaPrevia}{#3}}{\gdef\@NotaPrevia{#3}}}}
+
+\NewDocumentCommand{\NotaInterna}{s s +m}{%
+ \IfBooleanTF{#2}
+ {\gpreto{\@NotaInterna}{#3}}
+ {\IfBooleanTF{#1}{\gappto{\@NotaInterna}{#3}}{\gdef\@NotaInterna{#3}}}}
+
+\NewDocumentCommand{\NotaExterna}{s s +m}{%
+ \IfBooleanTF{#2}
+ {\gpreto{\@NotaExterna}{#3}}
+ {\IfBooleanTF{#1}{\gappto{\@NotaExterna}{#3}}{\gdef\@NotaExterna{#3}}}}
+
+\NewDocumentCommand{\NotaFinal}{s s +m}{%
+ \IfBooleanTF{#2}
+ {\gpreto{\@NotaFinal}{#3}}
+ {\IfBooleanTF{#1}{\gappto{\@NotaFinal}{#3}}{\gdef\@NotaFinal{#3}}}}
+\NewDocumentCommand{\Condiciones}{+m}{\gdef\@NotaFinal{#1}\@ClassWarningCondiciones}
\AtBeginDocument{%
% Si no se especificó fecha, tomamos la de hoy. Además, advertimos cuando el documento se está compilando en una fecha distinta de la fecha establecida en el encabezado.
@@ -723,26 +762,27 @@
\CLASSWARNING{Fecha del documento \@Fecha\space distinta de la fecha de hoy}%
\fi
+%% (quitado por no vigente)
% Establecemos el signo monetario dependiendo de la fecha de emisión de la factura, para efectos de la Reconversión Monetaria:
- \ifx\@undefined\@Moneda
- \DTMsaveddatediff{FechaEmision}{FechaBsS}{\AuxFecha}%
- \ifnum\AuxFecha<0%
- \Moneda{\@MonedaBs}%
- \LetraNotaInterna{\fontsize{14}{18}}%
- \NotaInterna{\FPupn\TotalBsS{\Total{} 100000 div \@DigitosMoneda{} round}Según Decreto Presidencial 3.548, el total en Bolívares Soberanos es de {\bfseries \@MonedaBsS~\numprint{\TotalBsS}}}%
- \CLASSWARNING{Se establecio' el texto aclaratorio sobre el total en Boli'vares Soberanos como una nota interna}%
- \else
- \DTMsaveddatediff{FechaEmision}{FechaBs}{\AuxFecha}%
- \ifnum\AuxFecha>-1%
- \Moneda{\@MonedaBs}%
- \else
- \Moneda{\@MonedaBsS}%
- \LetraNotaInterna{\fontsize{14}{18}}%
- \NotaInterna{\FPupn\TotalBsF{\Total{} 100000 * \@DigitosMoneda{} round}El total en Bolívares Fuertes es de {\bfseries \@MonedaBsF~\numprint{\TotalBsF}}}%
- \CLASSWARNING{Se establecio' el texto aclaratorio sobre el total en Boli'vares Fuertes como una nota interna}%
- \fi
- \fi
- \fi
+ % \ifx\@undefined\@Moneda
+ % \DTMsaveddatediff{FechaEmision}{FechaBsS}{\AuxFecha}%
+ % \ifnum\AuxFecha<0%
+ % \Moneda{\@MonedaBs}%
+ % \LetraNotaInterna{\fontsize{14}{18}}%
+ % \NotaInterna{\FPupn\TotalBsS{\Total{} 100000 div \@DigitosMoneda{} round}Según Decreto Presidencial 3.548, el total en Bolívares Soberanos es de {\bfseries \@MonedaBsS~\numprint{\TotalBsS}}}%
+ % \CLASSWARNING{Se establecio' el texto aclaratorio sobre el total en Boli'vares Soberanos como una nota interna}%
+ % \else
+ % \DTMsaveddatediff{FechaEmision}{FechaBs}{\AuxFecha}%
+ % \ifnum\AuxFecha>-1%
+ % \Moneda{\@MonedaBs}%
+ % \else
+ % \Moneda{\@MonedaBsS}%
+ % \LetraNotaInterna{\fontsize{14}{18}}%
+ % \NotaInterna{\FPupn\TotalBsF{\Total{} 100000 * \@DigitosMoneda{} round}El total en Bolívares Fuertes es de {\bfseries \@MonedaBsF~\numprint{\TotalBsF}}}%
+ % \CLASSWARNING{Se establecio' el texto aclaratorio sobre el total en Boli'vares Fuertes como una nota interna}%
+ % \fi
+ % \fi
+ % \fi
% Efectuamos distintos chequeos para dar errores o advertencias si faltó algo.
\ifdefvoid{\@RazonSocial}{\CLASSERROR{Hay que definir la razo'n social}}{}%
@@ -760,7 +800,7 @@
\ifdefvoid{\@Direccion}{\CLASSERROR{Hay que definir la direccio'n fiscal}}{}%
\ifdefvoid{\@Telefono}{\CLASSWARNING{Pudiera definirse un nu'mero telefo'nico}}{}%
\ifdefvoid{\@Email}{\CLASSWARNING{Pudiera definirse una direccio'n de correo electro'nico}}{}%
- \ifdefvoid{\@Condiciones}{\CLASSWARNING{Pudieran definirse las condiciones del documento}}{}%
+ \ifdefvoid{\@NotaFinal}{\CLASSWARNING{Pudiera definirse una nota final}}{}%
\ifcotizacion
\ifdefvoid{\@FondoFactura}{\CLASSWARNING{En la opcio'n para cotizacion se recomienda agregar el fondo}}{}%
\fi
@@ -824,55 +864,49 @@
\def\Num{\@Num}%
\def\NumSerieControl{\@NumSerieControl}%
\def\NumControl{\@NumControl}%
- \def\Condiciones{\@Condiciones}%
+ \def\NotaFinal{\@NotaFinal}%
\def\Resumen{\@Resumen}%
\def\NotaPrevia{\@NotaPrevia}%
\def\NotaInterna{\@NotaInterna}%
\def\NotaExterna{\@NotaExterna}%
\def\TituloReporte{\@TituloReporte}}
-%% Posiciones (X,Y) de los objetos: i) fecha, ii) denominación, iii) condiciones, iv) número de control, v) firmas.
+%% Posiciones (X,Y) de los objetos: i) fecha, ii) denominación, iii) nota final, iv) número de control, v) firmas.
\NewDocumentCommand{\PosFecha}{s m m}{
+ \setlength{\@PosFechaX}{#2}
+ \setlength{\@PosFechaY}{#3}
\IfBooleanTF{#1}{\booltrue{FechaYarriba}}{\boolfalse{FechaYarriba}}
- \IfBeginWith{#2}{-}
- {\StrBehind{#2}{-}[\templeng]\setlength{\@PosFechaX}{-\templeng}\booltrue{FechaXnegativo}}
- {\boolfalse{FechaXnegativo}\setlength{\@PosFechaX}{#2}}
- \IfBeginWith{#3}{-}
- {\StrBehind{#3}{-}[\templeng]\setlength{\@PosFechaY}{-\templeng}\booltrue{FechaYnegativo}}
- {\boolfalse{FechaYnegativo}\setlength{\@PosFechaY}{#3}}}
+ \IfBeginWith{#2}{-}{\booltrue{FechaXnegativo}}{\boolfalse{FechaXnegativo}}
+ \IfBeginWith{#3}{-}{\booltrue{FechaYnegativo}}{\boolfalse{FechaYnegativo}}}
\NewDocumentCommand{\PosDenom}{s m m}{
+ \setlength{\@PosDenomX}{#2}
+ \setlength{\@PosDenomY}{#3}
\IfBooleanTF{#1}{\booltrue{DenomYarriba}}{\boolfalse{DenomYarriba}}
- \IfBeginWith{#2}{-}
- {\StrBehind{#2}{-}[\templeng]\setlength{\@PosDenomX}{-\templeng}\booltrue{DenomXnegativo}}
- {\boolfalse{DenomXnegativo}\setlength{\@PosDenomX}{#2}}
- \IfBeginWith{#3}{-}
- {\StrBehind{#3}{-}[\templeng]\setlength{\@PosDenomY}{-\templeng}\booltrue{DenomYnegativo}}
- {\boolfalse{DenomYnegativo}\setlength{\@PosDenomY}{#3}}}
+ \IfBeginWith{#2}{-}{\booltrue{DenomXnegativo}}{\boolfalse{DenomXnegativo}}
+ \IfBeginWith{#3}{-}{\booltrue{DenomYnegativo}}{\boolfalse{DenomYnegativo}}}
\NewDocumentCommand{\PosControl}{s m m}{
+ \setlength{\@PosControlX}{#2}
+ \setlength{\@PosControlY}{#3}
\IfBooleanTF{#1}{\booltrue{ControlYarriba}}{\boolfalse{ControlYarriba}}
- \IfBeginWith{#2}{-}
- {\StrBehind{#2}{-}[\templeng]\setlength{\@PosControlX}{-\templeng}\booltrue{ControlXnegativo}}
- {\boolfalse{ControlXnegativo}\setlength{\@PosControlX}{#2}}
- \IfBeginWith{#3}{-}
- {\StrBehind{#3}{-}[\templeng]\setlength{\@PosControlY}{-\templeng}\booltrue{ControlYnegativo}}
- {\boolfalse{ControlYnegativo}\setlength{\@PosControlY}{#3}}}
-
-\NewDocumentCommand{\PosCondiciones}{s m m}{
- \IfBooleanTF{#1}{\booltrue{CondYarriba}}{\boolfalse{CondYarriba}}
- \setlength{\@PosCondicionesX}{#2}%
- \IfBeginWith{#3}{-}
- {\StrBehind{#3}{-}[\templeng]\setlength{\@PosCondicionesY}{-\templeng}\booltrue{CondYnegativo}}
- {\boolfalse{CondYnegativo}\setlength{\@PosCondicionesY}{#3}}}
-%% 'X' no acepta valores negativos en \PosCondiciones.
+ \IfBeginWith{#2}{-}{\booltrue{ControlXnegativo}}{\boolfalse{ControlXnegativo}}
+ \IfBeginWith{#3}{-}{\booltrue{ControlYnegativo}}{\boolfalse{ControlYnegativo}}}
+
+\NewDocumentCommand{\PosNotaFinal}{s m m m}{
+ \setlength{\@PosNotaFinalXuno}{#2}
+ \setlength{\@PosNotaFinalXdos}{#3}
+ \setlength{\@PosNotaFinalY}{#4}
+ \IfBooleanTF{#1}{\booltrue{NotaFinalYarriba}}{\boolfalse{NotaFinalYarriba}}
+ \IfBeginWith{#4}{-}{\booltrue{NotaFinalYnegativo}}{\boolfalse{NotaFinalYnegativo}}}
+\let\PosCondiciones\PosNotaFinal
+%% La nota final se define con un X_inicial, un X_final y un Y_inicial (Xo,Xf,Y)
\NewDocumentCommand{\PosFirmas}{m m m}{
\setlength{\@PosFirmasXuno}{#1}
\setlength{\@PosFirmasXdos}{#2}
- \IfBeginWith{#3}{-}
- {\StrBehind{#3}{-}[\templeng]\setlength{\@PosFirmasY}{-\templeng}\booltrue{FirmasYnegativo}}
- {\boolfalse{FirmasYnegativo}\setlength{\@PosFirmasY}{#3}}}
+ \setlength{\@PosFirmasY}{#3}
+ \IfBeginWith{#3}{-}{\booltrue{FirmasYnegativo}}{\boolfalse{FirmasYnegativo}}}
%% La firma se define con un X_inicial, un X_final y un Y_inicial (Xo,Xf,Y)
%% Tamaño y grosor de la línea de las firmas.
@@ -901,7 +935,8 @@
%% Separación interna entre la línea y el texto de la descripción.
\def\SepDescripcion#1{\setlength{\@SeparaInternaDescripcion}{#1}}
-\def\SepCondiciones#1{\setlength{\@SeparaInternaCondiciones}{#1}}
+\def\SepNotaFinal#1{\setlength{\@SeparaInternaNotaFinal}{#1}}
+\let\SepCondiciones\SepNotaFinal
%% Grosor de la línea de las cajas del encabezado, curvatura de la esquina y sombra.
%% (si pedimos linea de 0pt, todo queda en cero y no se abre el ambiente TikZ).
@@ -924,12 +959,13 @@
\IfValueT{#2}{\setlength{\@EsquinaLineaDescripcion}{#2}}
\IfValueT{#3}{\setlength{\@SombraDescripcion}{#3}}}
-%% Grosor de la línea de las condiciones, curvatura de la esquina y sombra.
+%% Grosor de la línea de la nota final, curvatura de la esquina y sombra.
%% (si pedimos linea de 0pt, todo queda en cero y no se abre el ambiente TikZ).
-\NewDocumentCommand{\LineaCondiciones}{m g g}{
- \setlength{\@GrosorLineaCondiciones}{#1}
- \IfValueT{#2}{\setlength{\@EsquinaLineaCondiciones}{#2}}
- \IfValueT{#3}{\setlength{\@SombraCondiciones}{#3}}}
+\NewDocumentCommand{\LineaNotaFinal}{m g g}{
+ \setlength{\@GrosorLineaNotaFinal}{#1}
+ \IfValueT{#2}{\setlength{\@EsquinaLineaNotaFinal}{#2}}
+ \IfValueT{#3}{\setlength{\@SombraNotaFinal}{#3}}}
+\let\LineaCondiciones\LineaNotaFinal
%% El espacio vertical que hay que avanzar sólo en la primera página del reporte antes de empezar a escribir sobre él. Usable cuando la primera página tiene un membrete y las demás no, es decir, cuando se usa \FondoReporte y no \FondoReporte*.
\def\InicioReporte#1{\setlength{\@InicioReporte}{#1}}
@@ -983,8 +1019,9 @@
%% Tipo de letra para la nota previa.
\def\LetraNotaPrevia#1{\gdef\@LetraNotaPrevia{#1\selectfont}}
-%% Tipo de letra para las condiciones del documento.
-\def\LetraCondiciones#1{\gdef\@LetraCondiciones{#1\selectfont}}
+%% Tipo de letra para la nota final.
+\def\LetraNotaFinal#1{\gdef\@LetraNotaFinal{#1\selectfont}}
+\let\LetraCondiciones\LetraNotaFinal
%% Letra para la denominación del documento ('FACTURA', 'COTIZACIÓN',...).
\def\LetraDenom#1{\gdef\@LetraDenom{#1\selectfont}}
@@ -1128,8 +1165,11 @@
%% Gracias a Heiko Oberdiek y a David Carlisle (Thanks to Heiko Oberdiek and David Carlisle).
%% http://tex.stackexchange.com/questions/108565/know-the-cell-width-with-tabu…
\NewEnviron{factura}{%
- \expandafter\@FacturaAuxCmd\expandafter{\BODY}%
- \ifnum\value{page}=1\else\CLASSERROR{La factura ocupa mas que una pagina}\fi}
+ \ifx\undefined\Total
+ \expandafter\@FacturaAuxCmd\expandafter{\BODY}%
+ \ifnum\value{page}=1\else\CLASSERROR{La factura ocupa mas que una pagina}\fi
+ \else
+ \CLASSERROR{Ya se uso' un entorno de factura, ignorando}\fi}
\NewEnviron{reverso}{%
\if@factura
@@ -1271,7 +1311,8 @@
\if@BIR\@EscribeTotalColAlicuota{R}\fi
\@EscribeTotalColAlicuota{G}%
\if@BIA\@EscribeTotalColAlicuota{A}\fi
- \ifbool{Electro}{\@EscribeTotalColAlicuotaGDesc}{}%
+ %% (quitado por no vigente)
+ % \ifbool{Electro}{\@EscribeTotalColAlicuotaGDesc}{}%
\fi}
\newcommand{\@EscribeTotalColBI}[1]{%
@@ -1280,24 +1321,25 @@
\else
\ifG\ \hfill(\csname @Alicuota#1porc\endcsname\%)\else\mbox{}\fi
\fi
- & \@LetraNumTotales\numprint{\csname BI#1\endcsname} \\}
+ & \@LetraNumTotales\@SignoMonetarioAux\numprint{\csname BI#1\endcsname} \\}
\newcommand{\@EscribeTotalColAlicuota}[1]{%
{\@LetraTitTotales \csname @@Alicuota#1\endcsname\ \hfill (\csname @Alicuota#1porc\endcsname\%)}
- & \@LetraNumTotales\numprint{\csname Alicuota#1\endcsname} \\}
+ & \@LetraNumTotales\@SignoMonetarioAux\numprint{\csname Alicuota#1\endcsname} \\}
-\newcommand{\@EscribeTotalColAlicuotaGDesc}{%
- {\@LetraTitTotales \@@AlicuotaGDesc\ \hfill (\@AlicuotaGDescPorc\%)}
- & \@LetraNumTotales\numprint{\AlicuotaGDesc} \\}
+%% (quitado por no vigente)
+ % \newcommand{\@EscribeTotalColAlicuotaGDesc}{%
+ % {\@LetraTitTotales \@@AlicuotaGDesc\ \hfill (\@AlicuotaGDescPorc\%)}
+ % & \@LetraNumTotales\@SignoMonetarioAux\numprint{\AlicuotaGDesc} \\}
\newcommand{\@EscribeTotalColSubt}[1]{%
{\@LetraTitTotales \csname @@Subtotal#1\endcsname}
- & \@LetraNumTotales\numprint{\csname Subt#1\endcsname} \\}
+ & \@LetraNumTotales\@SignoMonetarioAux\numprint{\csname Subt#1\endcsname} \\}
\newcommand{\@EscribeTotalColDesc}[1]{%
{\@LetraTitTotales \csname @@Descuento#1\endcsname
\csname if@Desc#1num\endcsname \else \ \hfill (\csname @Descuento#1porc\endcsname\%)\fi}
- & \@LetraNumTotales\numprint{\csname Desc#1\endcsname} \\}
+ & \@LetraNumTotales\@SignoMonetarioAux\numprint{\csname Desc#1\endcsname} \\}
%% Presentación de los totales en modo filas.
\newcommand{\@EscribeTotalFilasBI}[1]{%
@@ -1306,14 +1348,16 @@
\newcommand{\@EscribeTotalFilasAlicuota}[1]{%
\@EscribeTotalFilasAlicuotaizq{#1}: & \@EscribeTotalFilasAlicuotader{#1}}
-\newcommand{\@EscribeTotalFilasDesc}[1]{%
- \@EscribeTotalFilasDescizq{#1}: & \@EscribeTotalFilasDescder{#1}}
+%% (no implementado)
+ % \newcommand{\@EscribeTotalFilasDesc}[1]{%
+ % \@EscribeTotalFilasDescizq{#1}: & \@EscribeTotalFilasDescder{#1}}
\newcommand{\@EscribeTotalFilasSoloBI}[1]{%
{\@LetraTitTotales\@EscribeTotalFilasBIizq{#1}:} {\@LetraNumTotales\@EscribeTotalFilasBIder{#1}}}
-\newcommand{\@EscribeTotalFilasSoloDesc}[1]{%
- {\@LetraTitTotales\@EscribeTotalFilasDescizq{#1}:} {\@LetraNumTotales\@EscribeTotalFilasDescder{#1}}}
+%% (no implementado)
+ % \newcommand{\@EscribeTotalFilasSoloDesc}[1]{%
+ % {\@LetraTitTotales\@EscribeTotalFilasDescizq{#1}:} {\@LetraNumTotales\@EscribeTotalFilasDescder{#1}}}
\newcommand{\@EscribeTotalFilasSoloAlicuota}[1]{%
{\@LetraTitTotales\@EscribeTotalFilasAlicuotaizq{#1}:} {\@LetraNumTotales\@EscribeTotalFilasAlicuotader{#1}}}
@@ -1330,24 +1374,25 @@
\fi}
\newcommand{\@EscribeTotalFilasBIder}[1]{%
- \@LetraNumTotales\numprint{\csname BI#1\endcsname}}
+ \@LetraNumTotales\@SignoMonetarioAux\numprint{\csname BI#1\endcsname}}
\newcommand{\@EscribeTotalFilasAlicuotaizq}[1]{%
\@LetraTitTotales\csname @@Alicuota#1\endcsname \ (\csname @Alicuota#1porc\endcsname\%)}
\newcommand{\@EscribeTotalFilasAlicuotader}[1]{%
- \@LetraNumTotales\numprint{\csname Alicuota#1\endcsname}}
+ \@LetraNumTotales\@SignoMonetarioAux\numprint{\csname Alicuota#1\endcsname}}
-\newcommand{\@EscribeTotalFilasDescizq}[1]{%
- \@LetraTitTotales\csname @@Descuento#1\endcsname \ (\csname @Descuento#1porc\endcsname\%)}
+%% (no implementado)
+ % \newcommand{\@EscribeTotalFilasDescizq}[1]{%
+ % \@LetraTitTotales\csname @@Descuento#1\endcsname \ (\csname @Descuento#1porc\endcsname\%)}
-\newcommand{\@EscribeTotalFilasDescder}[1]{%
- \@LetraNumTotales\numprint{\csname Desc#1\endcsname}}
+ % \newcommand{\@EscribeTotalFilasDescder}[1]{%
+ % \@LetraNumTotales\@SignoMonetarioAux\numprint{\csname Desc#1\endcsname}}
-\newcommand{\@EscribeTotalFilasAuxTotal}{\@LetraTitTotal\@@Total: & \@LetraNumTotal\numprint{\Total}}
+\newcommand{\@EscribeTotalFilasAuxTotal}{\@LetraTitTotal\@@Total: & \@LetraNumTotal\@SignoMonetarioAux\numprint{\Total}}
\newcommand{\@EscribeTotalFilas}[2][]{%
- \begin{tabular}[b]{@{}l@{\extracolsep{1ex}}r@{}}% ¡Esta tabla tiene que abrir hacia abajo para que la separación entre las filas se
+ \begin{tabular}[b]{@{}l@{\extracolsep{1ex}}r@{}}% ¡Esta tabla tiene que abrir hacia abajo para que la separación entre las filas se pueda colocar con \@SeparaFilas!
\csname @EscribeTotalFilasBI\endcsname{#2}%
\ifx#2E%
\ifx#1T%
@@ -1360,6 +1405,10 @@
\fi
\end{tabular}}
+%% Comando auxiliar para escribir el signo monetario cuando aplica
+\newcommand{\@SignoMonetarioAux}{%
+ \ifsinmonedatotales\else\@Moneda\hspace*{\@EspacioSignoMonetario}\fi}
+
\newcommand{\@GeneraCajasTotalesFilas}{%
\if@Exento
\newbox{\@CajaBIE}\newbox{\@CajaBIET}%
@@ -1438,7 +1487,8 @@
\FPset\DescA{0}\global\let\DescA\DescA
\FPset\DescX{0}\global\let\DescX\DescX
\FPset\AlicuotaG{0}\global\let\AlicuotaG\AlicuotaG
- \FPset\AlicuotaGDesc{0}\global\let\AlicuotaGDesc\AlicuotaGDesc
+ %% (quitado por no vigente)
+ % \FPset\AlicuotaGDesc{0}\global\let\AlicuotaGDesc\AlicuotaGDesc
\FPset\AlicuotaR{0}\global\let\AlicuotaR\AlicuotaR
\FPset\AlicuotaA{0}\global\let\AlicuotaA\AlicuotaA}
@@ -1448,18 +1498,20 @@
\FPifeq\SubtR{0}\else\@CalculaTotalesII{R}\fi
\FPifeq\SubtA{0}\else\@CalculaTotalesII{A}\fi
\FPifeq\SubtE{0}\else\@CalculaTotalesII{E}\fi
- \ifbool{Electro}{%
- \FPiflt\BIG\@AlicuotaGDescLimite
- \let\@AlicuotaGDesc\@AlicuotaGDescBajo
- \else
- \let\@AlicuotaGDesc\@AlicuotaGDescAlto
- \fi
- \FPupn\@AlicuotaGDescPorc{\@AlicuotaGDesc{} 100 * \@DigitosPorc{} round clip}%
- \FPupn\AlicuotaGDesc{\BIG{} \@AlicuotaGDesc{} * \@DigitosMoneda{} round}%
- \global\let\AlicuotaGDesc\AlicuotaGDesc
- \global\let\@AlicuotaGDescPorc\@AlicuotaGDescPorc
- \global\let\@AlicuotaGDesc\@AlicuotaGDesc}{}%
- \FPupn\Total{\BIE{} \BIR{} + \BIG{} + \BIA{} + \AlicuotaR{} + \AlicuotaG{} + \AlicuotaA{} + \AlicuotaGDesc{} sub \@DigitosMoneda{} round}%
+ %% (quitado por no vigente)
+ % \ifbool{Electro}{%
+ % \FPiflt\BIG\@AlicuotaGDescLimite
+ % \let\@AlicuotaGDesc\@AlicuotaGDescBajo
+ % \else
+ % \let\@AlicuotaGDesc\@AlicuotaGDescAlto
+ % \fi
+ % \FPupn\@AlicuotaGDescPorc{\@AlicuotaGDesc{} 100 * \@DigitosPorc{} round clip}%
+ % \FPupn\AlicuotaGDesc{\BIG{} \@AlicuotaGDesc{} * \@DigitosMoneda{} round}%
+ % \global\let\AlicuotaGDesc\AlicuotaGDesc
+ % \global\let\@AlicuotaGDescPorc\@AlicuotaGDescPorc
+ % \global\let\@AlicuotaGDesc\@AlicuotaGDesc}{}%
+ \FPupn\Total{\BIE{} \BIR{} + \BIG{} + \BIA{} + \AlicuotaR{} + \AlicuotaG{} + \AlicuotaA{} + \@DigitosMoneda{} round}%
+ %% (quitado por no vigente) arriba se sumaba también \AlicuotaGDesc{}.
\global\let\Total\Total}
\newcommand{\@CalculaTotalesII}[1]{%
@@ -1520,9 +1572,12 @@
%% Aquí tenemos que hacer coincidir los parámetros de \@CalculaItem con los de \@ITEM para poder hacer
%% \let\@CalculaItem\@ITEM cuando no hay factura sino solamente reporte.
\NewDocumentCommand{\@CalculaItem}{m m m o m m +o}{%
+ \gdef\@PrecioUtemp##1{\FPupn\PrecioUtemp{##1 \PrecioUtempx{} * clip}}%
\addtocounter{NumItem}{1}%
% Calculamos.
- \FPupn\PrecioU{#5 \@DigitosMoneda{} round}%
+ \@PrecioUtemp{#5}%
+ \FPupn\PrecioU{\PrecioUtemp{} \@DigitosMoneda{} round}%
+ \FPifeq\PrecioU{\PrecioUtemp}\else\CLASSWARNING{Se esta' introduciendo un precio con ma's de dos decimales: (#3 - \PrecioUtemp. Redondeado a \PrecioU)}{}\fi% Advertimos cuando el precio unitario tiene más de dos decimales.
\ifbool{Descuentos}
{\ifx\\#6\\\FPset\Dcto{0}\else\FPupn\Dcto{#6 \@DigitosPorc{} round clip}\fi}% Fijamos en 0 el descuento si no se especifica en \Item***.
{\FPset\Dcto{#6}%
@@ -1622,7 +1677,6 @@
\ifdim \ht\@CajaEspacioVacio=0pt \global\lineafalse \else \@ExpandeCuadrotrue \fi
\fi
- \ifx\undefined\Total\relax\else\CLASSERROR{Parece ya haberse usado un entorno de factura}\fi
%
% Comandos \David@SavePos, \David@XStart, \David@XEnd, \David@XPad, \David@XLeft y \David@XRight para poder manejar el salto de línea en las columnas adyacentes a la columna 'X' del tabularx (la descripción), cuando esta ocupa más que una línea.
% Gracias a David Carlisle (Thanks to David Carlisle).
@@ -1694,7 +1748,6 @@
{\@DescripcionAuxCmd{##3}{##1}}% cdu.
&
% Cuarto campo: Acá puede ir el precio unitario (cdu y dcu) o la cantidad (duc).
- \FPifeq\PrecioU{##5}\else\CLASSWARNING{Se esta' introduciendo un precio con ma's de dos decimales: (##3 - ##5. Redondeado a \PrecioU)}{}\fi% Advertimos cuando el precio unitario tiene más de dos decimales.
\ifbool{SinCantidad}{}{%
\ifduc
\David@XRight{\@CantidadAuxCmd{\mbox{}\hfill \@LetraNumeros \numprint{##2}\hfill\mbox{}}}% duc.
@@ -1859,11 +1912,12 @@
\if@Exento \@EscribeTotalCol{E}\fi
\if@BIR\@EscribeTotalCol{R}\ifsinivaexpresado\else\@EscribeTotalColAlicuota{R}\fi\fi
\@EscribeTotalCol{G}\ifsinivaexpresado\else\@EscribeTotalColAlicuota{G}\fi
- \ifbool{Electro}{\@EscribeTotalColAlicuotaGDesc}{}%
+ %% (quitado por no vigente)
+ % \ifbool{Electro}{\@EscribeTotalColAlicuotaGDesc}{}%
\if@BIA\@EscribeTotalCol{A}\ifsinivaexpresado\else\@EscribeTotalColAlicuota{A}\fi\fi
\fi
\ifsinivaexpresado\else\cline{2-2}\fi
- \hfill \@LetraTitTotal\@@Total & \@LetraNumTotal\numprint{\Total}\\
+ \hfill \@LetraTitTotal\@@Total & \@LetraNumTotal\@SignoMonetarioAux\numprint{\Total}\\
\end{tabular}\endgroup
\\
\ifdefvoid{\@NotaInterna}{}{\ifbool{SinLineaHoriNI}{}{\hline}\@ColumnasMultiColumnNotaIntAuxCmd}%
@@ -1881,7 +1935,7 @@
\ifexpandecuadro\else\vfill\fi
\@GeneraCajasTotalesFilas
\newbox{\@CajaTotal}%
- \savebox{\@CajaTotal}{{\@LetraTitTotal\@@Total}: \@LetraNumTotal\numprint{\Total}}%
+ \savebox{\@CajaTotal}{{\@LetraTitTotal\@@Total:} \@LetraNumTotal\@SignoMonetarioAux\numprint{\Total}}%
%
\ifnum \value{@IVANoGeneral}=0%
\newbox{\@CajaGET}%
@@ -2012,7 +2066,7 @@
\addtolength{\@PosFechaX}{\oddsidemargin+1in}% Le sumamos el margen izquierdo a las posiciones de las cosas; es importante que se haga en un \AfterEndPreamble antes de que empiecen a escribirse otras cosas en la página.
\addtolength{\@PosDenomX}{\oddsidemargin+1in}%
\addtolength{\@PosControlX}{\oddsidemargin+1in}%
- \addtolength{\@PosCondicionesX}{\oddsidemargin+1in}%
+ \addtolength{\@PosNotaFinalXuno}{\oddsidemargin+1in}%
\addtolength{\@PosFirmasXuno}{\oddsidemargin+1in}%
\setlength{\parindent}{0pt}%
\setlength{\lineskip}{0pt}%
@@ -2028,7 +2082,7 @@
\ifdenom\@PosicionaDenom\fi
\ifprefactura\@PosicionaNumControl\fi
\ifnum\value{@Firmas}=0\else\@PosicionaFirmas\fi
- \ifdefvoid{\@Condiciones}{}{\@PosicionaCondiciones}}
+ \ifdefvoid{\@NotaFinal}{}{\@PosicionaNotaFinal}}
\iflinea
% Para determinar las coordenadas de la línea hay que usar \AtBeginShipoutNext porque si no se hace en el 'shipout' de la página se genera un espacio en blanco extra.
\AtBeginShipoutNext{\iflinea\@DibujaLinea\fi}
@@ -2143,14 +2197,14 @@
\usebox{\@CajaFirmas}%
\end{textblock*}}
-%% Comando que coloca las condiciones del documento.
-\newcommand{\@PosicionaCondiciones}{%
- \savebox{\@CajaCond}{%
- \parbox{\textwidth+\oddsidemargin+1in-\@PosCondicionesX}{\@EscribeCondiciones}}%
- \ifbool{CondYnegativo}{\addtolength{\@PosCondicionesY}{\paperheight}}{}%
- \ifbool{CondYarriba}{\addtolength{\@PosCondicionesY}{-\ht\@CajaCond-\dp\@CajaCond}}{}% Aquí la caja abre hacia abajo, a menos de que usemos \PosCondiciones*
- \begin{textblock*}{\wd\@CajaCond}(\@PosCondicionesX,\@PosCondicionesY)%
- \usebox{\@CajaCond}%
+%% Comando que coloca la nota final.
+\newcommand{\@PosicionaNotaFinal}{%
+ \savebox{\@CajaNotaFinal}{%
+ \parbox{\textwidth+\oddsidemargin+1in-\@PosNotaFinalXuno-\@PosNotaFinalXdos}{\@EscribeNotaFinal}}%
+ \ifbool{NotaFinalYnegativo}{\addtolength{\@PosNotaFinalY}{\paperheight}}{}%
+ \ifbool{NotaFinalYarriba}{\addtolength{\@PosNotaFinalY}{-\ht\@CajaNotaFinal-\dp\@CajaNotaFinal}}{}% Aquí la caja abre hacia abajo, a menos de que usemos \PosNotaFinal*
+ \begin{textblock*}{\wd\@CajaNotaFinal}(\@PosNotaFinalXuno,\@PosNotaFinalY)%
+ \usebox{\@CajaNotaFinal}%
\end{textblock*}}
%% Comando que coloca el número de control.
@@ -2221,7 +2275,7 @@
\ifdim\@TamDatos>\@TamResumen
\setlength{\@TamFinalEncabezado}{\@TamDatos}%
\else
- \setlength{\@TamFinalEncabezadoado}{\@TamResumen}%
+ \setlength{\@TamFinalEncabezado}{\@TamResumen}%
\fi
\begin{tikzpicture}%
\expandafter\node\expandafter[\@DatosTIKZ]{%
@@ -2255,19 +2309,19 @@
\par\vspace*{\@SombraNotaPrevia}\vspace*{\@SeparaVertical}%
\ifexpandecuadro\else\vfill\fi}}}
-%% Comando que coloca la caja para las condiciones, con la posibilidad de TikZ.
-\newcommand{\@EscribeCondiciones}{%
+%% Comando que coloca la caja para la nota final, con la posibilidad de TikZ.
+\newcommand{\@EscribeNotaFinal}{%
{% Abrimos un nuevo grupo para que la redefinición del entorno 'tikzpicture' sea local.
- \ifdim\@GrosorLineaCondiciones=0pt%
- \setlength{\@SeparaInternaCondiciones}{0pt}\setlength{\@EsquinaLineaCondiciones}{0pt}\setlength{\@SombraCondiciones}{0pt}%
+ \ifdim\@GrosorLineaNotaFinal=0pt%
+ \setlength{\@SeparaInternaNotaFinal}{0pt}\setlength{\@EsquinaLineaNotaFinal}{0pt}\setlength{\@SombraNotaFinal}{0pt}%
\renewenvironment{tikzpicture}{\NewDocumentCommand{\node}{o +m}{####2}}{}%
\fi
\begin{tikzpicture}%
- \expandafter\node\expandafter[\@CondicionesTIKZ]{%
- \parbox{\textwidth-\@SombraCondiciones-2\@SeparaInternaCondiciones-\@GrosorLineaCondiciones}{\@EstiloCondiciones}}%
- \ifdim\@GrosorLineaCondiciones=0pt\else ;\fi
+ \expandafter\node\expandafter[\@NotaFinalTIKZ]{%
+ \parbox{\textwidth-\@PosNotaFinalXuno-\@PosNotaFinalXdos+\oddsidemargin+1in-\@SombraNotaFinal-2\@SeparaInternaNotaFinal-\@GrosorLineaNotaFinal}{\@EstiloNotaFinal}}%
+ \ifdim\@GrosorLineaNotaFinal=0pt\else ;\fi
\end{tikzpicture}%
- \par\vspace*{\@SombraCondiciones}}}
+ \par\vspace*{\@SombraNotaFinal}}}
%% Comandos auxiliares para los datos y el resumen.
%% En el caso de los datos, la versión \@DatosAux se ejecuta cuando no hay resumen, y la versión \@DatosAux* se ejecuta cuando hay resumen.
@@ -2355,7 +2409,8 @@
\immediate\write\csv{Totales: \@@SubtotalG: \Moneda \SubtG^^JTotales: \@@DescuentoG: \Moneda \DescG}%
\fi
\immediate\write\csv{Totales: \@@BIG: \Moneda \BIG^^JTotales: \@@AlicuotaG: \Moneda \AlicuotaG}%
- \FPifeq\AlicuotaGDesc{0}\else\immediate\write\csv{Totales: \@@AlicuotaGDesc: \Moneda \AlicuotaGDesc}\fi
+ %% (quitado por no vigente)
+ % \FPifeq\AlicuotaGDesc{0}\else\immediate\write\csv{Totales: \@@AlicuotaGDesc: \Moneda \AlicuotaGDesc}\fi
\if@BIA
\if@DescA
\immediate\write\csv{Totales: \@@SubtotalA: \Moneda \SubtA^^JTotales: \@@DescuentoA: \Moneda \DescA}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/factura/factura.def new/tex/latex/factura/factura.def
--- old/tex/latex/factura/factura.def 2018-08-02 22:31:55.000000000 +0200
+++ new/tex/latex/factura/factura.def 2020-04-20 00:16:23.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% factura.dtx (with options: `def')
%%
-%% Copyright 2018 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2020 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and factura.dtx
%% with its derived files factura.ins, factura.cls, factura.def,
@@ -36,25 +36,26 @@
%% factura-ejemplo-reporte3.tex and factura-beispiel-rechnung.tex.
%%
\ProvidesFile{factura.def}
-[2018/08/02 v3.57
+[2020/04/18 v3.73
Archivo de valores iniciales y condiciones de borde para factura.cls
]
%% La geometría para la factura, su reverso, y el reporte.
%% Para la factura, el margen superior está definido desde el encabezado con los datos del cliente;
%% el margen inferior está definido hasta el final de la descripción (o del cuadro de la factura si no hay descripción).
-%% Hay elementos que salen fuera de estos márgenes, como las firmas, las condiciones del documento, la numeración y la fecha.
+%% Hay elementos que salen fuera de estos márgenes, como las firmas, la nota final, la numeración y la fecha.
\GeometriaFactura{letterpaper,vmargin={5.2cm,5.5cm},hmargin={1cm,1cm},footskip=0pt, headsep=0pt, headheight=0pt}
\GeometriaReverso{letterpaper,vmargin={1cm,1cm}, hmargin={1cm,1cm},footskip=0cm, headsep=0pt, headheight=0pt}
\GeometriaReporte{letterpaper,vmargin={2.8cm,2.5cm},hmargin={3cm,2cm},footskip=1.2cm,headsep=0.777cm,headheight=1.5cm}
-%% Factores para los distintos IVA y el límite para el descuento:
-\def\(a)AlicuotaG{0.12}
-\def\(a)AlicuotaGDescBajo{0.03}
-\def\(a)AlicuotaGDescAlto{0.05}
-\def\@AlicuotaGDescLimite{2000000}
+%% Factores para los distintos IVA:
+\def\(a)AlicuotaG{0.16}
+%% (quitado por no vigente)
+ % \def\(a)AlicuotaGDescBajo{0.03}
+ % \def\(a)AlicuotaGDescAlto{0.05}
+ % \def\@AlicuotaGDescLimite{2000000}
\def\(a)AlicuotaR{0.08}
-\def\(a)AlicuotaA{0.27}
+\def\(a)AlicuotaA{0.31}
%% i) separador de miles, ii) separador decimal, iii) número de decimales para la moneda iv) y para los porcentajes, v) número de dígitos de la numeración de la factura, vi) formato de la fecha, vii) separadores para la fecha.
\npthousandsep{.}
@@ -67,13 +68,17 @@
\def\@FechaSeparadores{-}
%% La moneda:
-\def\(a)MonedaBs{Bs.}
-\def\(a)MonedaBsS{Bs.S}
-\def\(a)MonedaBsF{Bs.F}
+\def\(a)Moneda{Bs.}
+%% (quitado por no vigente)
+ % \def\(a)MonedaBs{Bs.}
+ % \def\(a)MonedaBsS{Bs.S}
+ % \def\(a)MonedaBsF{Bs.F}
+\setlength\(a)EspacioSignoMonetario{.666ex}
+%% (quitado por no vigente)
%% Las fechas de la entrada de la reconversión monetaria:
-\DTMsavedate{FechaBsS}{2018-08-20}
-\DTMsavedate{FechaBs}{2019-01-01}
+ % \DTMsavedate{FechaBsS}{2018-08-20}
+ % \DTMsavedate{FechaBs}{2019-02-15}
%% Al lado de cada ítem va la letra que designa el gravamen que aplica sobre él:
\def\@DenomAlicuotaG{G}
@@ -81,8 +86,9 @@
\def\@DenomAlicuotaA{A}
\def\@DenomAlicuotaE{(E)}
-%% El texto predeterminado para la nota interna por el descuento presidencial.
-\def\@TextoDescuentoPresidencial{Se aplica un descuento del \@AlicuotaGDescPorc\% al IVA General seg\'un Decreto Presidencial 3.085 en Gaceta Oficial 41.239.}
+%% (quitado por no vigente)
+%% Texto predeterminado para la nota interna por el descuento presidencial.
+ % \def\@TextoDescuentoPresidencial{Se aplica un descuento del \@AlicuotaGDescPorc\% al IVA General seg\'un Decreto Presidencial 3.085 en Gaceta Oficial 41.239.}
%% Macros que guardan textos que corresponden a nombres de campos:
\def\@@Fecha{Fecha de emisi\'on:}
@@ -115,7 +121,8 @@
\def\@@IVA{IVA}
\def\@@PrecioT{Precio T.}
\def\@@AlicuotaG{IVA G}
-\def\@@AlicuotaGDesc{Descuento IVA G}
+%% (quitado por no vigente)
+ % \def\@@AlicuotaGDesc{Descuento IVA G}
\def\@@AlicuotaR{IVA R}
\def\@@AlicuotaA{IVA A}
\def\@@BIG{BI G}
@@ -163,12 +170,12 @@
\setlength{\@FirmaReportePosX}{2cm}
\setlength{\(a)FirmaReporteExcesoLinea}{1.5cm}
-%% Posiciones (X,Y) de los objetos: i) fecha, ii) denominación, iii) condiciones, iv) número de control, v) firmas.
+%% Posiciones (X,Y) de los objetos: i) fecha, ii) denominación, iii) nota final, iv) número de control, v) firmas.
\PosFecha*{-0cm}{5cm}
\PosDenom*{0cm}{5cm}
\PosControl*{0cm}{-2.4cm}
-\PosCondiciones{0cm}{-5.3cm}
-%% 'X' no acepta valores negativos en \PosCondiciones.
+\PosNotaFinal{0cm}{0cm}{-5.3cm}
+%% La nota final se define con un X_inicial, un X_final y un Y_inicial (Xo,Xf,Y)
\PosFirmas{5cm}{1cm}{-2.4cm}
%% La firma se define con un X_inicial, un X_final y un Y_inicial (Xo,Xf,Y)
@@ -196,7 +203,7 @@
%% Separación interna entre la línea y el texto de la descripción.
\SepDescripcion{6pt}
-\SepCondiciones{5pt}
+\SepNotaFinal{5pt}
%% Grosor de la línea de las cajas del encabezado, curvatura de la esquina y sombra.
%% (si pedimos linea de 0pt, todo queda en cero y no se abre el ambiente TikZ).
@@ -210,9 +217,9 @@
%% (si pedimos linea de 0pt, todo queda en cero y no se abre el ambiente TikZ).
\LineaDescripcion{0.4pt}{0pt}{4pt}
-%% Grosor de la línea de las condiciones, curvatura de la esquina y sombra.
+%% Grosor de la línea de la nota final, curvatura de la esquina y sombra.
%% (si pedimos linea de 0pt, todo queda en cero y no se abre el ambiente TikZ).
-\LineaCondiciones{0pt}{0pt}{0pt}
+\LineaNotaFinal{0pt}{0pt}{0pt}
%% El espacio vertical que hay que avanzar sólo en la primera página del reporte antes de empezar a escribir sobre él. Usable cuando la primera página tiene un membrete y las demás no, es decir, cuando se usa \FondoReporte y no \FondoReporte*.
\InicioReporte{1.6cm}
@@ -266,8 +273,8 @@
%% Tipo de letra para la nota previa.
\LetraNotaPrevia{\fontsize{11}{12.5}}
-%% Tipo de letra para las condiciones del documento.
-\LetraCondiciones{\fontsize{12}{12}}
+%% Tipo de letra para la nota final.
+\LetraNotaFinal{\fontsize{12}{12}}
%% Letra para la denominación del documento ('FACTURA', 'COTIZACIÓN',...).
\LetraDenom{\fontsize{14}{14}\bfseries}
@@ -290,7 +297,7 @@
%% Letra para el reporte.
\LetraReporte{\fontsize{12}{20}}
-%% Diseño hecho en TikZ para los datos del cliente, el resumen, la nota previa, la descripción y las condiciones.
+%% Diseño hecho en TikZ para los datos del cliente, el resumen, la nota previa, la descripción y la nota final.
\def\@DatosTIKZ{%
draw=black, fill=white, inner sep=\@SeparaInternaEncabezado, line width=\@GrosorLineaEncabezado, rounded corners=\@EsquinaLineaEncabezado, copy shadow={top color=black, bottom color=black, shadow xshift=\@SombraEncabezado, shadow yshift=-\@SombraEncabezado}}
@@ -302,8 +309,8 @@
\def\@DescripcionTIKZ{%
draw=black, fill=white, inner sep=\@SeparaInternaDescripcion, line width=\@GrosorLineaDescripcion, rounded corners=\@EsquinaLineaDescripcion, copy shadow={top color=black, bottom color=black, shadow xshift=\@SombraDescripcion, shadow yshift=-\@SombraDescripcion}}
-\def\@CondicionesTIKZ{%
- draw=black, fill=white, inner sep=\@SeparaInternaCondiciones, line width=\@GrosorLineaCondiciones, rounded corners=\@EsquinaLineaCondiciones, copy shadow={top color=black, bottom color=black, shadow xshift=\@SombraCondiciones, shadow yshift=-\@SombraCondiciones}}
+\def\@NotaFinalTIKZ{%
+ draw=black, fill=white, inner sep=\@SeparaInternaNotaFinal, line width=\@GrosorLineaNotaFinal, rounded corners=\@EsquinaLineaNotaFinal, copy shadow={top color=black, bottom color=black, shadow xshift=\@SombraNotaFinal, shadow yshift=-\@SombraNotaFinal}}
%% El diseño de las distintas partes de la hoja.
\newcommand{\@EstiloFirmas}{
@@ -321,7 +328,7 @@
\newcommand{\@EstiloNotaPrevia}{\@LetraNotaPrevia \@NotaPrevia}
-\newcommand{\@EstiloCondiciones}{\@LetraCondiciones \@Condiciones}
+\newcommand{\@EstiloNotaFinal}{\@LetraNotaFinal \@NotaFinal}
\newcommand{\@EstiloNumControl}{%
\renewcommand{\baselinestretch}{0}\selectfont
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/factura.tlpobj new/tlpkg/tlpobj/factura.tlpobj
--- old/tlpkg/tlpobj/factura.tlpobj 2019-02-28 03:36:04.000000000 +0100
+++ new/tlpkg/tlpobj/factura.tlpobj 2020-04-20 01:55:53.000000000 +0200
@@ -1,6 +1,6 @@
name factura
category Package
-revision 48333
+revision 54803
shortdesc Typeset and calculate invoices according to Venezuelan law
relocated 1
longdesc 'factura' is the Spanish word for 'invoice', so this is a LaTeX
@@ -10,11 +10,10 @@
longdesc use is not restricted to Venezuela because all variables and
longdesc the displayed text can be redefined by invoking commands or
longdesc editing.
-runfiles size=30
+runfiles size=31
RELOC/tex/latex/factura/factura.cls
RELOC/tex/latex/factura/factura.def
catalogue-ctan /macros/latex/contrib/factura
-catalogue-date 2018-08-02 20:31:16 +0200
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
catalogue-topics invoice spanish class
-catalogue-version 3.57
+catalogue-version 3.73
++++++ fancyvrb.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fancyvrb/Changes new/doc/latex/fancyvrb/Changes
--- old/doc/latex/fancyvrb/Changes 2019-01-15 22:39:42.000000000 +0100
+++ new/doc/latex/fancyvrb/Changes 2020-01-13 22:25:56.000000000 +0100
@@ -1,4 +1,7 @@
--- fancyvrb.sty
+3.5 2020/01/13 - use \verbvisiblespace instead of \textvisiblespace (hv)
+3.4 2019/11/09 - use catcode change for space if \textvisiblespace doesn't exist (hv)
+3.3 2019/10/22 - use \textvisiblespace for showspaces (hv)
3.2a 2019/01/15 - added missing style files (hv)
3.2 2019/01/08 - remove the loading of package xcolor (hv)
3.1a 2018/11/20 - small changes to the documentation (hv)
Binary files old/doc/latex/fancyvrb/fancyvrb-doc.pdf and new/doc/latex/fancyvrb/fancyvrb-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fancyvrb/fancyvrb-doc.tex new/doc/latex/fancyvrb/fancyvrb-doc.tex
--- old/doc/latex/fancyvrb/fancyvrb-doc.tex 2019-01-15 22:39:42.000000000 +0100
+++ new/doc/latex/fancyvrb/fancyvrb-doc.tex 2020-01-13 22:25:56.000000000 +0100
@@ -1,9 +1,9 @@
\documentclass{article}
%\usepackage[T1]{fontenc}
%\usepackage[charter]{mathdesign}
-\usepackage{libertinus}
+\usepackage{libertinus-otf}
%\usepackage[scaled=0.84]{beramono}
-\setmonofont[Scale=MatchLowercase,FakeStretch=0.9]{AnonymousPro}
+\setmonofont[Scale=MatchLowercase,FakeStretch=0.9]{AnonymousPro-Regular.ttf}
\newif\ifChangeBar \ChangeBarfalse
\usepackage{fancyvrb}
@@ -63,7 +63,7 @@
{\footnotesize and}\\[-2mm]
{\footnotesize Herbert Voß\ (FU Berlin -- DE)}
}
-\date{Version 3.2a\\ \today}
+\date{Version 3.5\\ \today}
\fvset{frame=single,xrightmargin=0cm,numbers=left,numbersep=3pt,commentchar=Z}
@@ -90,8 +90,10 @@
Andreas Matthias,
Frank Mittelbach,
Rolf Niepraschk, %\url{Rolf.Niepraschk(a)gmx.de},
-Ulrich M. Schwarz,
-Thomas Siegel,% \url{siegel(a)aix520.informatik.uni-leipzig.de},
+Will Robertson,
+Ulrich M. Schwarz,
+Thomas Siegel, % \url{siegel(a)aix520.informatik.uni-leipzig.de},
+Clemens Steinke,
and
Vladimir Volovich. %\url{vvv(a)vvv.vsu.ru}.
\clearpage
@@ -727,16 +729,16 @@
(\emph{Default: false} \Dash spaces not shown).
\end{optlist}
-\begin{SideBySideExample}
- \begin{Verbatim}[showspaces=true]
+\begin{SideBySideExample}[gobble=0]
+\begin{Verbatim}[showspaces=true]
Verbatim line.
- \end{Verbatim}
+\end{Verbatim}
\end{SideBySideExample}
In practice, all verbatim environments have a~\texttt{*} variant, which
sets \texttt{showspaces=true}:
-\begin{SideBySideExample}
+\begin{SideBySideExample}[gobble=0]
\begin{Verbatim*}
Verbatim line.
\end{Verbatim*}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fancyvrb.doc.tlpobj new/tlpkg/tlpobj/fancyvrb.doc.tlpobj
--- old/tlpkg/tlpobj/fancyvrb.doc.tlpobj 2019-02-28 03:36:08.000000000 +0100
+++ new/tlpkg/tlpobj/fancyvrb.doc.tlpobj 2020-01-14 01:54:44.000000000 +0100
@@ -1,9 +1,9 @@
name fancyvrb.doc
category Package
-revision 49717
+revision 53392
shortdesc doc files of fancyvrb
relocated 1
-docfiles size=52
+docfiles size=45
RELOC/doc/latex/fancyvrb/Changes
RELOC/doc/latex/fancyvrb/README
RELOC/doc/latex/fancyvrb/fancyvrb-doc.pdf
++++++ fancyvrb.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fancyvrb/fancyvrb-ex.sty new/tex/latex/fancyvrb/fancyvrb-ex.sty
--- old/tex/latex/fancyvrb/fancyvrb-ex.sty 2018-11-01 23:10:32.000000000 +0100
+++ new/tex/latex/fancyvrb/fancyvrb-ex.sty 2019-11-09 23:02:02.000000000 +0100
@@ -1,7 +1,7 @@
%%
%% This is file `fancyvrb-ex.sty',
%%
-%% COPYRIGHT 2018-, by Herbert Voss <hvoss(a)tug.org>
+%% COPYRIGHT 2018,2019-, by Herbert Voss <hvoss(a)tug.org>
%%
%% This package may be distributed under the terms of the LaTeX Project Public
%% License, as described in lppl.txt in the base LaTeX distribution.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fancyvrb/fancyvrb.sty new/tex/latex/fancyvrb/fancyvrb.sty
--- old/tex/latex/fancyvrb/fancyvrb.sty 2019-01-15 22:39:42.000000000 +0100
+++ new/tex/latex/fancyvrb/fancyvrb.sty 2020-01-13 22:25:56.000000000 +0100
@@ -13,10 +13,10 @@
%% verbatim environments and commands and extensive documentation.
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{3.2a}
-\def\filedate{2019/01/15}
-\ProvidesPackage{fancyvrb}[\filedate]
-\message{Style option: `fancyvrb' v\fileversion \space <\filedate> (tvz)}
+\def\fileversion{3.5}
+\def\filedate{2020/01/13}
+\ProvidesPackage{fancyvrb}[2020/01/13 v3.5 verbatim text (tvz,hv)]
+%\message{Style option: `fancyvrb' v\fileversion \space <\filedate> (tvz)}
\csname fancyvrb@loaded\endcsname
\let\fancyvrb@loaded\endinput
%\ProcessOptions
@@ -529,8 +529,20 @@
\fvset{defineactive}
\define@booleankey{FV}{showspaces}%
{\def\FV@Space{{\FancyVerbSpace}}}%
- {\def\FV@Space{\ }}
-{\catcode`\ =12 \gdef\FancyVerbSpace{\tt }}
+ {\def\FV@Space{\ }}
+%
+% new definition for \verbvisiblespace 2020-01-13
+\@ifundefined{verbvisiblespace}%
+ {%
+ \@ifundefined{textvisiblespace}%
+ {\begingroup\catcode`\ =12 \gdef\FancyVerbSpace{\tt }\endgroup}
+ {\def\FancyVerbSpace{\textvisiblespace}}
+ }%
+ {\def\FancyVerbSpace{\verbvisiblespace}}
+%\@ifundefined{textvisiblespace}%
+% {\begingroup\catcode`\ =12 \gdef\FancyVerbSpace{\tt }\endgroup}
+% {\let\FancyVerbSpace\textvisiblespace}
+%
\fvset{showspaces=false}
\def\FV@Tab{\hbox to\FancyVerbTabSize\fontdimen2\font{\hss\FV@TabChar}}
\define@key{FV}{tabsize}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fancyvrb/hbaw.sty new/tex/latex/fancyvrb/hbaw.sty
--- old/tex/latex/fancyvrb/hbaw.sty 2019-01-15 22:39:42.000000000 +0100
+++ new/tex/latex/fancyvrb/hbaw.sty 2019-11-09 23:02:02.000000000 +0100
@@ -1,39 +1,14 @@
%%
%% This is file `hbaw.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% fvrb-ex.dtx (with options: `hbaw')
-%%
-%% IMPORTANT NOTICE:
-%%
-%% For the copyright see the source file.
%%
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from hbaw.sty.
-%%
-%% For distribution of the original source see the terms
-%% for copying and modification in the file fvrb-ex.dtx.
-%%
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
-%%
-%% Package `fvrb-ex' (`fvrb-ex', `hbaw' and `hcolor')
-%%
%% COPYING:
-%% The files of this package "fvrb-ex" are released under the Artistic
-%% License Version 2. A copy of that license is included in the file
-%% artistic2.txt inside the fancyvrb package. This package consists of
-%% the following files:
-%% README fvrb-ex.dtx fvrb-ex.ins
+%% This package may be distributed under the terms of the LaTeX Project Public
+%% License, as described in lppl.txt in the base LaTeX distribution.
+%% Either version 1.0 or, at your option, any later version.
%%
-%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou(a)idris.fr>
-%% March 27, 1998
+%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou(a)idris.fr> March 27, 1998
+%% packed by Herbert Voss <hvoss(a)tug.org>
%%
-%% Package `hbaw'
%%
\NeedsTeXFormat{LaTeX2e}
\def\fileversion{1.4}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fancyvrb/hcolor.sty new/tex/latex/fancyvrb/hcolor.sty
--- old/tex/latex/fancyvrb/hcolor.sty 2019-01-15 22:39:42.000000000 +0100
+++ new/tex/latex/fancyvrb/hcolor.sty 2019-11-09 23:02:02.000000000 +0100
@@ -1,39 +1,14 @@
%%
%% This is file `hcolor.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% fvrb-ex.dtx (with options: `hcolor')
-%%
-%% IMPORTANT NOTICE:
-%%
-%% For the copyright see the source file.
-%%
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from hcolor.sty.
-%%
-%% For distribution of the original source see the terms
-%% for copying and modification in the file fvrb-ex.dtx.
-%%
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
-%%
-%% Package `fvrb-ex' (`fvrb-ex', `hbaw' and `hcolor')
%%
%% COPYING:
-%% The files of this package "fvrb-ex" are released under the Artistic
-%% License Version 2. A copy of that license is included in the file
-%% artistic2.txt inside the fancyvrb package. This package consists of
-%% the following files:
-%% README fvrb-ex.dtx fvrb-ex.ins
+%% This package may be distributed under the terms of the LaTeX Project Public
+%% License, as described in lppl.txt in the base LaTeX distribution.
+%% Either version 1.0 or, at your option, any later version.
%%
-%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou(a)idris.fr>
-%% March 27, 1998
+%% Denis Girou (CNRS/IDRIS - France) <Denis.Girou(a)idris.fr> March 27, 1998
+%% packed by Herbert Voss <hvoss(a)tug.org>
%%
-%% Package `hcolor'
%%
\NeedsTeXFormat{LaTeX2e}
\def\fileversion{1.4}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fancyvrb.tlpobj new/tlpkg/tlpobj/fancyvrb.tlpobj
--- old/tlpkg/tlpobj/fancyvrb.tlpobj 2019-02-28 03:36:09.000000000 +0100
+++ new/tlpkg/tlpobj/fancyvrb.tlpobj 2020-01-14 01:54:44.000000000 +0100
@@ -1,6 +1,6 @@
name fancyvrb
category Package
-revision 49717
+revision 53392
shortdesc Sophisticated verbatim text
relocated 1
longdesc Flexible handling of verbatim text including: verbatim commands
@@ -15,7 +15,6 @@
RELOC/tex/latex/fancyvrb/hbaw.sty
RELOC/tex/latex/fancyvrb/hcolor.sty
catalogue-ctan /macros/latex/contrib/fancyvrb
-catalogue-date 2019-01-15 20:16:28 +0100
catalogue-license lppl1.3
catalogue-topics verbatim
-catalogue-version 3.2a
+catalogue-version 3.5
++++++ fascicules.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fascicules.doc.tlpobj new/tlpkg/tlpobj/fascicules.doc.tlpobj
--- old/tlpkg/tlpobj/fascicules.doc.tlpobj 2019-02-28 03:36:28.000000000 +0100
+++ new/tlpkg/tlpobj/fascicules.doc.tlpobj 2020-03-04 23:50:53.000000000 +0100
@@ -1,6 +1,6 @@
name fascicules.doc
category Package
-revision 49457
+revision 54080
shortdesc doc files of fascicules
relocated 1
docfiles size=760
++++++ fascicules.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fascicules.tlpobj new/tlpkg/tlpobj/fascicules.tlpobj
--- old/tlpkg/tlpobj/fascicules.tlpobj 2019-02-28 03:36:29.000000000 +0100
+++ new/tlpkg/tlpobj/fascicules.tlpobj 2020-03-04 23:50:54.000000000 +0100
@@ -1,6 +1,6 @@
name fascicules
category Package
-revision 49457
+revision 54080
shortdesc Create mathematical manuals for schools
relocated 1
longdesc This package enables LaTeX users to create math books for
@@ -11,9 +11,7 @@
runfiles size=5
RELOC/tex/latex/fascicules/fascicules.sty
catalogue-also schule
-catalogue-contact-home http://fascicules.serveblog.net/
catalogue-ctan /macros/latex/contrib/fascicules
-catalogue-date 2018-12-21 06:32:50 +0100
catalogue-license lppl
catalogue-topics teaching
catalogue-version 1
++++++ fbb.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fbb.doc.tlpobj new/tlpkg/tlpobj/fbb.doc.tlpobj
--- old/tlpkg/tlpobj/fbb.doc.tlpobj 2019-02-28 03:36:30.000000000 +0100
+++ new/tlpkg/tlpobj/fbb.doc.tlpobj 2020-03-24 01:57:39.000000000 +0100
@@ -1,6 +1,6 @@
name fbb.doc
category Package
-revision 45277
+revision 54512
shortdesc doc files of fbb
relocated 1
docfiles size=124
++++++ fbb.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fbb.tlpobj new/tlpkg/tlpobj/fbb.tlpobj
--- old/tlpkg/tlpobj/fbb.tlpobj 2019-02-28 03:36:30.000000000 +0100
+++ new/tlpkg/tlpobj/fbb.tlpobj 2020-03-24 01:57:39.000000000 +0100
@@ -1,6 +1,6 @@
name fbb
category Package
-revision 45277
+revision 54512
shortdesc A free Bembo-like font
relocated 1
longdesc The package provides a Bembo-like font package based on Cardo
@@ -662,7 +662,6 @@
RELOC/tex/latex/fbb/fbb.fontspec
RELOC/tex/latex/fbb/fbb.sty
catalogue-ctan /fonts/fbb
-catalogue-date 2017-09-12 08:39:22 +0200
-catalogue-license ofllppl1.3
+catalogue-license ofl lppl1.3
catalogue-topics font font-serif font-type1 font-otf font-t1enc
catalogue-version 1.14
++++++ fbox.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fbox/CHANGELOG new/doc/latex/fbox/CHANGELOG
--- old/doc/latex/fbox/CHANGELOG 2019-03-09 23:23:51.000000000 +0100
+++ new/doc/latex/fbox/CHANGELOG 2020-01-04 23:05:15.000000000 +0100
@@ -1 +1,4 @@
+0.04 2020-01-03 - added \fparbox[]{}
+0.03 2019-11-04 - added star version
+0.02 2019-03-08 - modified version for expandable \lowercase
0.01 2019-03-08 - first CTAN version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fbox/README.md new/doc/latex/fbox/README.md
--- old/doc/latex/fbox/README.md 2019-03-09 23:23:51.000000000 +0100
+++ new/doc/latex/fbox/README.md 2019-11-04 23:16:05.000000000 +0100
@@ -1,7 +1,7 @@
# fbox.sty
Redefines the macro \fbox{...} from standard
-LaTeX to \fbox[optarg]{...}
+LaTeX to \fbox*[optarg]{...}
optarg can be any combination of l, r, b, and t. For
example: \fbox[lt]{foo} or \fbox[Tlr]{...}
Binary files old/doc/latex/fbox/fbox.pdf and new/doc/latex/fbox/fbox.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fbox/fbox.tex new/doc/latex/fbox/fbox.tex
--- old/doc/latex/fbox/fbox.tex 2019-03-09 23:23:51.000000000 +0100
+++ new/doc/latex/fbox/fbox.tex 2020-01-04 23:05:15.000000000 +0100
@@ -1,4 +1,4 @@
-%% $Id: fbox.tex 946 2019-03-08 12:08:22Z herbert $
+%% $Id: fbox.tex 1128 2020-01-03 20:57:59Z herbert $
%
\listfiles\setcounter{errorcontextlines}{100}
\documentclass[paper=a4,fontsize=11pt,DIV=13,parskip=half-,
@@ -33,6 +33,10 @@
\def\Lpack#1{\texttt{#1}\index{#1 package@\texttt{#1} package}}
\def\Lprog#1{\texttt{#1}\index{#1 program@\texttt{#1} program}}
\def\Loption#1{\texttt{#1}\index{#1@\texttt{#1} package option}}
+\let\Ldim\Lcs
+
+\def\demoText{DuckDuckGo! Time to spread the word!\par
+Equipped with the talking points above, you’re ready to help anyone search and browse protected.}
%\usepackage[bibstyle=dtk]{biblatex}
%\addbibresource{\jobname.bib}
@@ -58,7 +62,7 @@
\def\setVersion#1{\setVVersion#1!!}
\def\setVVersion#1=#2!!{\def\fboxVersion{#2}}
-\setVersion{version = 0.01}%
+\setVersion{version = 0.04}%
\title{Package \texttt{fbox} \\--\\ \normalsize \fboxVersion\ (\today)}
\author{Herbert Voß\thanks{\url{hvoss(a)tug.org}\newline Thanks to Rolf Niepraschk}}
@@ -70,9 +74,22 @@
argument:
\begin{verbatim}
-\fbox[<optargs>]{<contents>}
+\fbox*[<optargs>]{<contents>}
+\fparbox*[<optargs>]{<contents>}
\end{verbatim}
+The star version does not put any horizontal space before or behind the argument
+if no optional argument \texttt{l} or \texttt{r} is given. The non star version always inserts
+\Ldim{fboxsep}.
+
+\Lcs{fparbox} uses the current \Ldim{linewidth} minus two times the box sep and boxrule width.
+It does \emph{not} a test for an existing paragraph indenting. It has do be done by the
+user, e.g.:
+
+\begin{verbatim}
+\noindent
+\fparbox ...
+\end{verbatim}
The optional argument can be of any combination of the letters
l, r, b, and t or altenatively L, R, B, and T. This l)eft, r)right, b)ottom, and t)op
@@ -95,36 +112,127 @@
\end{LTXexample}
\begin{LTXexample}
+\fbox*[rbt]{foo gar baz}
+\fbox*[brt]{foo gar baz}
+\fbox*[bRT]{foo gar baz}
+\end{LTXexample}
+
+\begin{LTXexample}
\fbox[lT]{foo gar baz}
\end{LTXexample}
\begin{LTXexample}
+\fbox*[lT]{foo gar baz}
+\end{LTXexample}
+
+\begin{LTXexample}
\fbox[bT]{foo gar baz}
\end{LTXexample}
\begin{LTXexample}
+\fbox*[bT]{foo gar baz}
+\end{LTXexample}
+
+\begin{LTXexample}
\fbox[Br]{foo gar baz}
\end{LTXexample}
\begin{LTXexample}
+\fbox*[Br]{foo gar baz}
+\end{LTXexample}
+
+\begin{LTXexample}
\setlength\fboxrule{5pt}
\fbox[bT]{foo gar baz}
\end{LTXexample}
\begin{LTXexample}
\setlength\fboxrule{5pt}
+\fbox*[bT]{foo gar baz}
+\end{LTXexample}
+
+
+\begin{LTXexample}
+\setlength\fboxrule{5pt}
\fbox[Br]{foo gar baz}
\end{LTXexample}
+\begin{LTXexample}
+\setlength\fboxrule{5pt}
+\fbox*[Br]{foo gar baz}
+\end{LTXexample}
+
+
+
+\begin{LTXexample}
+\fparbox{\demoText}
+\end{LTXexample}
+
+\begin{LTXexample}
+\fparbox[]{\demoText}
+\end{LTXexample}
+
+\begin{LTXexample}
+\fparbox[rbt]{\demoText}
+\fparbox[brt]{\demoText}
+\fparbox[bRT]{\demoText}
+\end{LTXexample}
+
+\begin{LTXexample}
+\fparbox*[rbt]{\demoText}
+\fparbox*[brt]{\demoText}
+\fparbox*[bRT]{\demoText}
+\end{LTXexample}
+
+\begin{LTXexample}
+\fparbox[lT]{\demoText}
+\end{LTXexample}
+
+\begin{LTXexample}
+\fparbox*[lT]{\demoText}
+\end{LTXexample}
+
+\begin{LTXexample}
+\fparbox[bT]{\demoText}
+\end{LTXexample}
+
+\begin{LTXexample}
+\fparbox*[bT]{\demoText}
+\end{LTXexample}
+
+\begin{LTXexample}
+\fparbox[Br]{\demoText}
+\end{LTXexample}
+
+\begin{LTXexample}
+\fparbox*[Br]{\demoText}
+\end{LTXexample}
+
+\begin{LTXexample}
+\setlength\fboxrule{5pt}
+\fparbox[bT]{\demoText}
+\end{LTXexample}
+
+\begin{LTXexample}
+\setlength\fboxrule{5pt}
+\fparbox*[bT]{\demoText}
+\end{LTXexample}
+
+
+\begin{LTXexample}
+\setlength\fboxrule{5pt}
+\fparbox[Br]{\demoText}
+\end{LTXexample}
+
+\begin{LTXexample}
+\setlength\fboxrule{5pt}
+\fparbox*[Br]{\demoText}
+\end{LTXexample}
+
-\end{document}
-folium = {
- de = {"f", "ff"},
- en = {"f", "ff"},
- fr = {"sq","sqq"},
-}
+\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fbox.doc.tlpobj new/tlpkg/tlpobj/fbox.doc.tlpobj
--- old/tlpkg/tlpobj/fbox.doc.tlpobj 2019-03-10 02:24:11.000000000 +0100
+++ new/tlpkg/tlpobj/fbox.doc.tlpobj 2020-01-05 01:55:00.000000000 +0100
@@ -1,9 +1,9 @@
name fbox.doc
category Package
-revision 50305
+revision 53320
shortdesc doc files of fbox
relocated 1
-docfiles size=12
+docfiles size=15
RELOC/doc/latex/fbox/CHANGELOG
RELOC/doc/latex/fbox/README.md
RELOC/doc/latex/fbox/fbox.pdf
++++++ fbox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fbox/fbox.sty new/tex/latex/fbox/fbox.sty
--- old/tex/latex/fbox/fbox.sty 2019-03-09 23:23:51.000000000 +0100
+++ new/tex/latex/fbox/fbox.sty 2020-01-04 23:05:15.000000000 +0100
@@ -1,6 +1,6 @@
%% This is file `fbox.sty',
%%
-%% Copyright (C) 2019
+%% Copyright (C) 2019, 2020
%% Herbert Voss <hvoss(a)tug.org>
%%
%% It may be distributed and/or modified under the
@@ -11,17 +11,32 @@
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%
-% $Id: fbox.sty 946 2019-03-08 12:08:22Z herbert $
+% $Id: fbox.sty 1128 2020-01-03 20:57:59Z herbert $
%
% -------------------------------------
-\ProvidesPackage{fbox}[2019/03/00 v. 0.01 allow parts of the frame (hv)]
+\ProvidesPackage{fbox}[2020/01/03 v. 0.04 allow parts of the frame (hv)]
%
\let\orig@fbox\fbox
-\def\fb@lowerc@se#1{\lowercase{\edef\@tempa{#1}}}
+\def\fb@lowerc@se#1{% make \lowercase expandable
+ \begingroup\edef\x{%
+ \lowercase{\endgroup\def\noexpand\@tempa{#1}}}\x
+}
%
-\long\def\fbox{\@ifnextchar[\FBox@i\orig@fbox}
+\newif\if@fbox@star
+\newif\if@fbox@space@left
+\newif\if@fbox@space@right
+
+\long\def\fbox{\@ifnextchar*{\@fbox@startrue\FBox@}{\@fbox@starfalse\FBox@*}}
+\def\FBox@*{\@ifnextchar[\FBox@i\orig@fbox}
%
\def\FBox@i[#1]{%
+ \if@fbox@star
+ \@fbox@space@leftfalse
+ \@fbox@space@rightfalse
+ \else
+ \@fbox@space@lefttrue
+ \@fbox@space@righttrue
+ \fi
\ifx\relax#1\relax
\@tempcntb=15
\else
@@ -32,13 +47,15 @@
\FBox@iii
}
\def\FBox@ii#1#2\@nil{%
- \ifx#1t\advance\@tempcntb by 8% top
+ \ifx#1t\advance\@tempcntb by 8 % top
\else
- \ifx#1l\advance\@tempcntb by 4% left
+ \ifx#1l\advance\@tempcntb by 4 % left
+ \if@fbox@star\@fbox@space@lefttrue\fi
\else
- \ifx#1r\advance\@tempcntb by 2% right
+ \ifx#1r\advance\@tempcntb by 2 % right
+ \if@fbox@star\@fbox@space@righttrue\fi
\else
- \ifx#1b\advance\@tempcntb by 1% bottom
+ \ifx#1b\advance\@tempcntb by 1 % bottom
\fi\fi\fi\fi
\if\relax#2\relax\def\next{}\else\def\next{\FBox@ii#2\@nil}\fi
\next
@@ -47,7 +64,7 @@
\leavevmode
\setbox\@tempboxa\hbox{%
\color@begingroup
- \kern\fboxsep{#1}\kern\fboxsep
+ \if@fbox@space@left\kern\fboxsep\fi{#1}\if@fbox@space@right\kern\fboxsep\fi
\color@endgroup}%
\@FrameB@x\relax}
%
@@ -79,4 +96,17 @@
}%
}
-\endinput
\ No newline at end of file
+\newsavebox\fpar@b@x
+
+\long\def\fparbox{\@ifnextchar*{\@fbox@startrue\FParBox@}{\@fbox@starfalse\FParBox@*}}
+\def\FParBox@*{\@ifnextchar[\FParBox@i\FParBox@ii}
+\long\def\FParBox@i[#1]#2{%
+ \savebox\fpar@b@x{\parbox{\dimexpr\linewidth-2\fboxsep-2\fboxrule}{#2}}%
+ \FBox@i[#1]{\usebox\fpar@b@x}}
+\long\def\FParBox@ii#1{%
+ \savebox\fpar@b@x{\parbox{\dimexpr\linewidth-2\fboxsep-2\fboxrule}{#1}}%
+ \orig@fbox{\usebox\fpar@b@x}}
+
+
+\endinput
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fbox.tlpobj new/tlpkg/tlpobj/fbox.tlpobj
--- old/tlpkg/tlpobj/fbox.tlpobj 2019-03-10 02:24:11.000000000 +0100
+++ new/tlpkg/tlpobj/fbox.tlpobj 2020-01-05 01:55:00.000000000 +0100
@@ -1,6 +1,6 @@
name fbox
category Package
-revision 50305
+revision 53320
shortdesc Extended \fbox macro from standard LaTeX
relocated 1
longdesc This package redefines \fbox to allow an optional argument for
@@ -11,7 +11,6 @@
runfiles size=1
RELOC/tex/latex/fbox/fbox.sty
catalogue-ctan /macros/latex/contrib/fbox
-catalogue-date 2019-03-09 09:25:30 +0100
catalogue-license lppl1.3c
catalogue-topics boxing
-catalogue-version 0.01
+catalogue-version 0.04
++++++ fcolumn.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fcolumn/README new/doc/latex/fcolumn/README
--- old/doc/latex/fcolumn/README 2015-09-28 23:17:02.000000000 +0200
+++ new/doc/latex/fcolumn/README 2019-05-03 00:36:42.000000000 +0200
@@ -1,4 +1,4 @@
-The LaTeX-package ``fcolumn''
+The LaTeX-package ``fcolumn'', under LPPL 1.3
In financial reports, text and currency amounts are regularly put in
one table, e.g., a year balance or a profit-and-loss overview.
@@ -31,10 +31,10 @@
The core part of this table is input as
\begin{tabular}{lflf}
-house & 20000000 & equity capital & 5000000\\
-bank account & -60323 & mortgage & 15000000\\
-savings & 2800000 \\
-cash & 14585 & profit & 2754262\\
+house & 200000 & equity capital & 50000 \\
+bank account & -603,23 & mortgage & 150000 \\
+savings & 28000 \\
+cash & 145,85 & profit & 27542,62 \\
\sumline
\end{tabular}
@@ -48,9 +48,9 @@
To install:
-----------
-Run the file fcolumn.ins through LaTeX (in a directory also
-containing fcolumn.dtx) and move the file fcolumn.sty to a place
-searched by TeX.
+Run the file fcolumn.ins through (La)TeX (in a directory also
+containing fcolumn.dtx) or type ``make install'' and move the
+file fcolumn.sty to a place searched by TeX.
To produce the documentation:
-----------------------------
Binary files old/doc/latex/fcolumn/fcolumn.pdf and new/doc/latex/fcolumn/fcolumn.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fcolumn/makefile new/doc/latex/fcolumn/makefile
--- old/doc/latex/fcolumn/makefile 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/fcolumn/makefile 2019-05-03 00:36:42.000000000 +0200
@@ -0,0 +1,40 @@
+.SUFFIXES: .pdf .glo .gls .ind .idx .dtx .sty .ins
+
+.ins.sty:
+ pdflatex $*.ins
+
+.dtx.glo:
+ pdflatex $*.dtx
+
+.dtx.idx:
+ pdflatex $*.dtx
+
+.glo.gls:
+ makeindex -s gglo.ist -o fcolumn.gls fcolumn.glo
+
+.idx.ind:
+ makeindex -s gind.ist -o fcolumn.ind fcolumn.idx
+
+.dtx.pdf:
+ pdflatex $*.dtx
+
+all: fcolumn.pdf
+
+install:
+ tex fcolumn.ins
+
+dist: fcolumn.dtx fcolumn.ins fcolumn.sty fcolumn.pdf README makefile
+ mkdir fcolumn; cp fcolumn.dtx fcolumn; cp fcolumn.ins fcolumn; \
+ cp fcolumn.sty fcolumn; cp fcolumn.pdf fcolumn; cp README fcolumn; \
+ cp makefile fcolumn; tar -czf fcolumn.tgz fcolumn; rm -r fcolumn
+
+fcolumn.pdf: fcolumn.dtx fcolumn.gls fcolumn.ind fcolumn.sty
+fcolumn.idx: fcolumn.dtx
+fcolumn.ind: fcolumn.idx
+fcolumn.glo: fcolumn.dtx
+fcolumn.gls: fcolumn.glo
+
+.PHONY: clean
+clean:
+ -rm fcolumn.pdf fcolumn.sty fcolumn.log fcolumn.glo fcolumn.gls \
+ fcolumn.ind fcolumn.idx fcolumn.aux fcolumn.ilg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fcolumn.doc.tlpobj new/tlpkg/tlpobj/fcolumn.doc.tlpobj
--- old/tlpkg/tlpobj/fcolumn.doc.tlpobj 2019-02-28 03:36:33.000000000 +0100
+++ new/tlpkg/tlpobj/fcolumn.doc.tlpobj 2019-05-03 01:38:56.000000000 +0200
@@ -1,8 +1,9 @@
name fcolumn.doc
category Package
-revision 38489
+revision 50937
shortdesc doc files of fcolumn
relocated 1
-docfiles size=62
+docfiles size=71
RELOC/doc/latex/fcolumn/README
RELOC/doc/latex/fcolumn/fcolumn.pdf
+ RELOC/doc/latex/fcolumn/makefile
++++++ fcolumn.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fcolumn/fcolumn.sty new/tex/latex/fcolumn/fcolumn.sty
--- old/tex/latex/fcolumn/fcolumn.sty 2015-09-28 23:17:02.000000000 +0200
+++ new/tex/latex/fcolumn/fcolumn.sty 2019-05-03 00:36:42.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2015 by Edgar Olthof
+%% Copyright (C) 2015--2019 by Edgar Olthof
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -19,81 +19,164 @@
%%
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 1999/12/01 or later.
-\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{fcolumn}
- [2015/09/20 v1.1.1 Automatic Currency Package (EO)]
-\RequirePackage{array}
+ [2019/04/24 v1.2 Automatic Currency Package (EHTO)]
+\NeedsTeXFormat{LaTeX2e}
+\RequirePackage{array}[v2.4k]
+\newif\ifstrict@ccounting \strict@ccountingfalse
+\DeclareOption{strict}{\strict@ccountingtrue}
+\ProcessOptions
\newcolumntype{F}[3]{>{\b@fi{#1}{#2}{#3}}r<{\e@fi}}
\newcolumntype{f}{F{.}{,}{3,2}}
-\newcount\FCsc@l \FCsc@l=0
-\newcount\FCtc@l \FCtc@l=0
+\newcount\FCsc@l \FCsc@l=0 \newcount\FCtc@l \FCtc@l=0
\newif\ifwiths@p
-\newif\ifstrictaccounting \strictaccountingfalse
\def\geldm@cro#1#2{\withs@pfalse
-\afterassignment\g@ldm@cro\count@#2\relax{#1}}
-\def\g@ldm@cro#1\relax#2{%
-\ifnum#2<0 \ifstrictaccounting(\else-\fi\count2=-#2 \else\count2=#2 \fi
-\count3=\ifx\relax#1\relax2 \else \@gobble#1\relax\fi
-\count4=\count3
-\loop
- \ifnum\count3>0 \divide\count2 by 10 \advance\count3 by \m@ne
+\afterassignment\g@ldm@cro\count@#1\relax{#2}}
+\def\g@ldm@cro#1\relax#2{\ifnum#2<0 \ifstrict@ccounting (\else -\fi
+ \count2=-#2 \else\count2=#2
+\fi
+\count4=\ifx\relax#1\relax 2 \else \@gobble#1\relax\fi
+\count3=0
+\loop\ifnum\count3<\count4
+ \divide\count2 by 10 \advance\count3 by \@ne
\repeat
\g@ldens{\the\count@}%
-\ifnum\count4>0\decim@lmark
- \ifnum#2>0 \count2=-#2\else\count2=#2 \fi
- \count3=\count4
- \loop
- \ifnum\count3>0 \divide\count2 by 10 \advance\count3 by \m@ne
- \repeat
- \loop
- \ifnum\count3<\count4 \multiply\count2 by 10 \advance\count3 by \@ne
- \repeat
- \ifnum#2>0 \advance\count2 by #2
- \else \advance\count2 by -#2
- \fi
- \zerop@d{\number\count3}{\number\count2}%
+\ifnum\count3>0\decim@lmark
+ \ifnum#2>0 \count2=-#2\else\count2=#2 \fi
+ \loop\ifnum\count3>0
+ \divide\count2 by 10 \advance\count3 by \m@ne
+ \repeat
+ \loop\ifnum\count3<\count4
+ \multiply\count2 by 10 \advance\count3 by \@ne
+ \repeat
+ \ifnum#2>0 \advance\count2 by #2
+ \else \advance\count2 by -#2
+ \fi
+ \zerop@d{\number\count3}{\number\count2}%
\fi
-\ifnum#2<0 \ifstrictaccounting\rlap{)}\fi\fi}
+\ifx\FCs@gn\m@ne \ifnum#2<0 \ifstrict@ccounting
+ \rlap{)~!}\else\rlap{~!}\fi\else\ifstrict@ccounting
+ \rlap{\phantom{)}~!}\else\rlap{~!}\fi\fi
+\else \ifnum#2<0 \ifstrict@ccounting\rlap{)}\fi\fi
+\fi}
\def\g@ldens#1{{\count3=\count2 \count0=#1
-\loop
- \ifnum\count0>0
- \divide\count2 by 10
- \advance\count0 by \m@ne
+\ifnum\count0<1 \count0=3 \fi
+\loop \ifnum\count0>0 \divide\count2 by 10 \advance\count0 by \m@ne
\repeat
\ifnum\count2>0 \g@ldens{#1}\fi
\count0=#1
-\loop
- \ifnum\count0>0
- \multiply\count2 by 10
- \advance\count0 by\m@ne
+\ifnum\count0<1 \count0=3 \fi
+\loop \ifnum\count0>0 \multiply\count2 by 10 \advance\count0 by \m@ne
\repeat
\count2=-\count2
\advance\count2 by \count3 \du@zendprint{#1}}}
-\def\du@zendprint#1{\ifwiths@p\sep@rator\zerop@d{#1}{\number\count2}%
- \else\zerop@d{1}{\number\count2}\fi \global\withs@ptrue}
+\def\du@zendprint#1{\ifwiths@p\ifnum#1>0 \sep@rator\fi
+ \zerop@d{#1}{\number\count2}%
+\else\zerop@d1{\number\count2}\fi\global\withs@ptrue}
\def\zerop@d#1#2{{\count0=1 \count1=#2
-\loop
- \divide \count1 by 10
- \ifnum\count1>0 \advance\count0 by\@ne
-\repeat
-\loop
- \ifnum\count0<#1\relax 0\advance\count0 by\@ne
+\loop \divide \count1 by 10 \ifnum\count1>0 \advance\count0 by \@ne
\repeat
-\number#2}}
-\def\zetg@ld#1#2{\global\advance\csname
-FCtot@\romannumeral\FCsc@l\endcsname by #1
+\ifnum#1>0
+ \loop \ifnum\count0<#1\relax 0\advance\count0 by \@ne
+ \repeat
+\else
+ \advance\count0 by -3
+ \loop \ifnum\count0<0 0\advance\count0 by \@ne
+ \repeat
+\fi\number#2}}
+\def\zetg@ld#1#2{\count0=#2\relax \let\FCs@gn=\@ne
+\ifnum\count0<0
+ \ifnum\csname FCtot@\romannumeral\FCsc@l\endcsname<0
+ \let\FCs@gn=\m@ne
+ \fi
+\fi
+\ifnum\count0>0
+ \ifnum\csname FCtot@\romannumeral\FCsc@l\endcsname>0
+ \let\FCs@gn=\m@ne
+ \fi
+\fi
+\global\advance\csname FCtot@\romannumeral\FCsc@l\endcsname by \count0
+\ifx\FCs@gn\m@ne
+ \ifnum\count0>0 \let\FCs@gn\@ne \fi
+ \count0=\csname FCtot@\romannumeral\FCsc@l\endcsname
+ \multiply\count0 by \FCs@gn
+ \ifnum\count0<0
+ \let\FCs@gn=\m@ne
+ \PackageError{fcolumn}{Register overflow}{Overflow occurred
+ in fcolumn \number\FCsc@l. Check your table.}%
+ \else\let\FCs@gn=\@ne
+ \fi
+\fi
\setbox0=\hbox{$\geldm@cro{#1}{#2}$}%
\ifdim\wd0>\csname FCwd@\romannumeral\FCsc@l\endcsname
\global\csname FCwd@\romannumeral\FCsc@l\endcsname=\wd0
\fi\unhbox0}
-\newcount\bedr@g
-\def\b@fi#1#2#3{\def\sep@rator{{#1}}\def\decim@lmark{{#2}}%
-\def\sp@l{#3}\let\ignorespaces=\@empty \let\unskip=\@empty
-\global\advance\FCsc@l by \@ne
-\setbox0=\hbox\bgroup\global\bedr@g=}
-\def\e@fi{ 123\relax\egroup\ifdim\wd0>\z@
- \zetg@ld{\number\bedr@g}{\sp@l}%
+\newcount\FC@l \newcount\FC@r
+\def\FC@chklist{}
+\def\setucc@de#1#2\relax{\uccode`\~=`#1 }
+\def\b@fi#1#2#3{%
+\def\sep@xt##1##2\end{\def\sep@rator{{##1}}}%
+\sep@xt#1\end\def\decim@lmark{{#2}}%
+\def\sp@l{#3}\global\advance\FCsc@l by \@ne
+\global\FC@l=0 \global\FC@r=1
+\let\FCs@gn=\@ne\relax \setbox0\hbox\bgroup$%
+\uccode`\~=`0\relax \uppercase{\def~}{\restorem@thcodes \global\FC@l=0}
+\uccode`\~=`1\relax \uppercase{\def~}{\restorem@thcodes \global\FC@l=1}
+\uccode`\~=`2\relax \uppercase{\def~}{\restorem@thcodes \global\FC@l=2}
+\uccode`\~=`3\relax \uppercase{\def~}{\restorem@thcodes \global\FC@l=3}
+\uccode`\~=`4\relax \uppercase{\def~}{\restorem@thcodes \global\FC@l=4}
+\uccode`\~=`5\relax \uppercase{\def~}{\restorem@thcodes \global\FC@l=5}
+\uccode`\~=`6\relax \uppercase{\def~}{\restorem@thcodes \global\FC@l=6}
+\uccode`\~=`7\relax \uppercase{\def~}{\restorem@thcodes \global\FC@l=7}
+\uccode`\~=`8\relax \uppercase{\def~}{\restorem@thcodes \global\FC@l=8}
+\uccode`\~=`9\relax \uppercase{\def~}{\restorem@thcodes \global\FC@l=9}
+\def\deactdecm@rk##1##2\relax{\mathcode`##1=0 }%
+\afterassignment\setucc@de\count@#3\relax
+\uppercase{\def~}{\ifnum\mathcode`\0=\mathcode`- \restorem@thcodes\fi
+\afterassignment\deactdecm@rk\count@#3\relax \global\FC@r=1}%
+\def\d@cm##1##2{\count@=\mathcode`##1 }
+\ifnum\uccode`\~=`. \uccode`\~=`,\relax\else \uccode`\~=`.\relax\fi
+\uppercase{\def~}{\ifnum\mathcode`\0=\mathcode`- \restorem@thcodes\fi
+\afterassignment\d@cm\count@#3\relax
+\ifnum\count@=\mathcode`- \expandafter\global\FC@l=\the\FC@l
+\else \expandafter\global\FC@r=\the\FC@r\fi}%
+\uccode`\~=`+\relax
+\uppercase{\def~}{\ifnum\mathcode`\0=\mathcode`-
+\restorem@thcodes\fi\global\FC@l=0}%
+\uccode`\~=`-\relax
+\uppercase{\def~}{\ifnum\mathcode`\0=\mathcode`-
+\restorem@thcodes\fi\global\let\FCs@gn\m@ne \global\FC@l=0}%
+\mathcode`-="8000 \mathcode`+=\mathcode`- \mathcode`.=\mathcode`-
+\def\actdecm(a)rk##1##2\relax{\ifx##1.\relax \mathcode`,=\mathcode`-
+\else \mathcode`##1=\mathcode`- \fi}%
+\afterassignment\actdecm@rk\count@#3\relax
+\mathcode`\0=\mathcode`- \mathcode`\1=\mathcode`-
+\mathcode`\2=\mathcode`- \mathcode`\3=\mathcode`-
+\mathcode`\4=\mathcode`- \mathcode`\5=\mathcode`-
+\mathcode`\6=\mathcode`- \mathcode`\7=\mathcode`-
+\mathcode`\8=\mathcode`- \mathcode`\9=\mathcode`- }
+\def\e@fi{\ifnum\mathcode`\0=\mathcode`- \global\FC@r=\m@ne\fi$\egroup
+\ifnum\FC@r>0
+ \ifnum\FC@r<10 \multiply\FC@r by 10 \fi
+ \def\i@ts##1##2{\count0=##2}
+ \afterassignment\i@ts\count@\sp@l
+ \loop\ifnum\count0>0 \multiply\FC@l by 10
+ \expandafter\secd@xt\number\FC@r\end \advance\count0 by \m@ne
+ \repeat
+ \ifnum\FC@r>10
+ \def\tw@l##1##2\relax{##2}
+ \PackageWarning{fcolumn}{Excess digit\ifnum\FC@r>100 s\fi\space
+ ``\expandafter\tw@l\number\FC@r\relax'' in decimal part
+ \MessageBreak ignored}
+ \fi
+ \ifx\FCs@gn\m@ne\relax \FC@l=-\FC@l \fi
+ \zetg@ld{\sp@l}{\FC@l}%
\fi}
+\def\secd@xt#1#2#3\end{\advance\FC@l by #2
+\FC@r=#1#3 \ifnum\FC@r<10 \multiply\FC@r by 10 \fi}
+\def\restorem@thcodes{\mathcode`\0=0 \mathcode`\1=0
+\mathcode`\2=0 \mathcode`\3=0 \mathcode`\4=0 \mathcode`\5=0
+\mathcode`\6=0 \mathcode`\7=0 \mathcode`\8=0 \mathcode`\9=0 }
\def\@array[#1]#2{%
\@tempdima \ht \strutbox
\advance \@tempdima by\extrarowheight
@@ -121,7 +204,7 @@
\m@th
\let\\\@arraycr \let\tabularnewline\\\let\par\@empty \@preamble}
\let\@@array=\@array
-\def\@mksumline#1{\gdef\sumline{}\@lastchclass 4 \@firstamptrue
+\def\@mksumline#1{\gdef\s@ml@ne{}\@lastchclass 4 \@firstamptrue
\global\FCsc@l=0
\let\prr@sult=\relax
\@temptokena{#1}
@@ -137,8 +220,8 @@
\or \or \@classfii \or
\or \or \or \or \or \or \or \@classfx \fi
\@lastchclass\@chclass}%
-\xdef\sumline{\sumline\noexpand\aut@check\noexpand\\}}
-\def\@addtosumline#1{\xdef\sumline{\sumline #1}}
+\xdef\s@ml@ne{\s@ml@ne\noexpand\aut@check\noexpand\\}}
+\def\@addtosumline#1{\xdef\s@ml@ne{\s@ml@ne #1}}
\def\@classfx{\if@firstamp \@firstampfalse \else \@addtosumline &\fi}
\def\@classfz{\ifnum\@chnum<\thr@@ \@classfx\fi}
\def\@classfii{\ifnum\@lastchclass=8
@@ -151,56 +234,66 @@
\expandafter\ifx\csname FCtot@\romannumeral\FCsc@l\endcsname\relax
\expandafter\newcount\csname FCtot@\romannumeral\FCsc@l\endcsname
\else
- \message{^^JWarning: FCtot@\romannumeral\FCsc@l \space is already
- defined and it may not even be a <count>. I'll proceed,
- but with fingers crossed. }
+ \PackageError{fcolumn}{Name clash for <count>}{\expandafter\csname
+ FCtot@\romannumeral\FCsc@l\endcsname is already defined and it may
+ not even be a <count>. If you're\MessageBreak sure it is a <count>,
+ you can press <enter> now and I'll proceed, but things\MessageBreak
+ will get overwritten.}%
\fi
\expandafter\ifx\csname FCwd@\romannumeral\FCsc@l\endcsname\relax
\expandafter\newdimen\csname FCwd@\romannumeral\FCsc@l\endcsname
\global\FCtc@l=\FCsc@l
\else
- \message{^^JWarning: FCwd@\romannumeral\FCsc@l \space is already
- defined and it may not even be a <dimen>. I'll proceed,
- but with fingers crossed. }
+ \PackageError{fcolumn}{Name clash for <dimen>}{\expandafter\csname
+ FCwd@\romannumeral\FCsc@l\endcsname is already defined and it may
+ not even be a <dimen>. If you're\MessageBreak sure it is a <dimen>,
+ you can press <enter> now and I'll proceed, but things\MessageBreak
+ will get overwritten.}%
\fi
\fi
\fi
\fi}
-\def\leeg#1{ 234\relax\egroup \let\e@fi=\relax \setbox0=\hbox{#1}%
-\ifdim\wd0>\csname FCwd@\romannumeral\FCsc@l\endcsname
- \global\csname FCwd@\romannumeral\FCsc@l\endcsname=\wd0
-\fi\unhbox0}
-\def\prr@sult{ 345\relax\egroup \let\e@fi=\relax
-\setbox0=\hbox{$\geldm@cro{\number\csname
-FCtot@\romannumeral\FCsc@l\endcsname}{\sp@l}$}%
+\newdimen\s@mlinesep
+\def\sumline{\@ifnextchar[\s@mline{\s@mline[2pt]}}
+\def\s@mline[#1]{\global\s@mlinesep=#1 \s@ml@ne}
+\def\prr@sult{$\egroup \let\e@fi=\relax
+\setbox0=\hbox{$\geldm@cro{\sp@l}{\number\csname
+FCtot@\romannumeral\FCsc@l\endcsname}$}%
\ifdim\wd0>\csname FCwd@\romannumeral\FCsc@l\endcsname
\global\csname FCwd@\romannumeral\FCsc@l\endcsname=\wd0
\fi
\vbox{\hrule width \csname FCwd@\romannumeral\FCsc@l\endcsname
-\vskip2pt
+\vskip\s@mlinesep
\hbox to \csname FCwd@\romannumeral\FCsc@l\endcsname{\hfil\unhbox0}}}
-\def\aut@check{\ifodd\FCsc@l\else \count0=\@ne \count1=\FCsc@l
- \divide\count1 by \tw@ \advance\count1 by \@ne
- \loop
- \ifnum\csname FCtot@\romannumeral\count0\endcsname=
- \csname FCtot@\romannumeral\count1\endcsname\else
- \message{^^JWarning: F-columns \number\count0 \space
- and \number\count1 \space do not balance! }%
- \fi
- \ifnum\count1=\FCsc@l\else
- \advance\count0 by\@ne \advance\count1 by\@ne
- \repeat
-\fi }
-\def\checkfcolumns#1#2{\noalign{\ifnum\csname FCtot@\romannumeral#1
-\endcsname=\csname FCtot@\romannumeral#2\endcsname\else
- \message{^^JWarning: F-columns #1 and #2 do not balance! }%
-\fi}}
+\def\leeg#1{$\egroup \let\e@fi=\relax #1}
\def\res@tsumline{\FCsc@l=\FCtc@l\loop\ifnum\FCsc@l>0
\global\csname FCtot@\romannumeral\FCsc@l\endcsname=0
\global\csname FCwd@\romannumeral\FCsc@l\endcsname=\z@
- \advance\FCsc@l by \m@ne
-\repeat}
+ \advance\FCsc@l by \m@ne\repeat}
\def\resetsumline{\noalign{\res@tsumline}}
+\def\aut@check{\ifx\@empty\FC@chklist\relax
+ \ifodd\FCsc@l\else
+ \count0=\@ne \count1=\FCsc@l
+ \divide\count1 by \tw@
+ \loop\ifnum\count1<\FCsc@l
+ \advance\count1 by \@ne
+ \xdef\FC@chklist{\FC@chklist\number\count0,\number\count1;}%
+ \advance\count0 by\@ne
+ \repeat
+ \fi
+\fi
+\loop
+ \ifx\FC@chklist\@empty\let\FCs@gn=\@ne\else\let\FCs@gn=\m@ne\fi
+ \ifx\FCs@gn\m@ne
+ \expandafter\fre@t\FC@chklist\end
+ \ifnum\csname FCtot@\romannumeral\count0\endcsname=
+ \csname FCtot@\romannumeral\count1\endcsname\else
+ \PackageWarningNoLine{fcolumn}{F-columns \number\count0 \space
+ and \number\count1 \space do not balance}%
+ \fi
+\repeat}
+\def\fre@t#1,#2;#3\end{\count0=#1 \count1=#2 \xdef\FC@chklist{#3}}
+\def\checkfcolumns#1#2{\noalign{\xdef\FC@chklist{\FC@chklist #1,#2;}}}
\endinput
%%
%% End of file `fcolumn.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fcolumn.tlpobj new/tlpkg/tlpobj/fcolumn.tlpobj
--- old/tlpkg/tlpobj/fcolumn.tlpobj 2019-02-28 03:36:34.000000000 +0100
+++ new/tlpkg/tlpobj/fcolumn.tlpobj 2019-05-03 01:38:56.000000000 +0200
@@ -1,6 +1,6 @@
name fcolumn
category Package
-revision 38489
+revision 50937
shortdesc Typesetting financial tables
relocated 1
longdesc In financial reports, text and currency amounts are regularly
@@ -8,10 +8,10 @@
longdesc overview. This package provides the settings for automatically
longdesc typesetting such columns, including the sum line (preceded by a
longdesc rule of the correct width) using the specifier "f".
-runfiles size=2
+runfiles size=3
RELOC/tex/latex/fcolumn/fcolumn.sty
catalogue-ctan /macros/latex/contrib/fcolumn
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-04-24 23:00:04 +0200
catalogue-license lppl1.3
catalogue-topics table
-catalogue-version 1.1.1
+catalogue-version 1.2
++++++ fei.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fei/fei-template-sublist.tex new/doc/latex/fei/fei-template-sublist.tex
--- old/doc/latex/fei/fei-template-sublist.tex 2018-10-02 03:06:26.000000000 +0200
+++ new/doc/latex/fei/fei-template-sublist.tex 2020-02-10 23:11:52.000000000 +0100
@@ -1,5 +1,14 @@
-\documentclass[rascunho,xindy,acronym,symbols,sublist]{fei}
+\begin{filecontents*}{\jobname.xmpdata}
+ \Title {Minha tese-dissertação-monografia}
+ \Author {Meu Nome\sep Nome Do Outro Integrante\sep Nome do Terceiro}
+ \Copyright {Copyright \copyright\ 2019 "Douglas De Rizzo Meneghetti"}
+ \Keywords {manual\sep latex\sep tipografia}
+ \Language {pt-BR}
+ \Subject {Resumo vai aqui em uma única linha corrida.}
+\end{filecontents*}
+
+\documentclass[acronym,symbols,sublist]{fei}
\usepackage[utf8]{inputenc}
@@ -76,7 +85,10 @@
Vivamus vel erat erat. Integer venenatis nisl velit, vel commodo lectus condimentum ac. Aliquam id magna at tellus sagittis tempus id quis ante. Maecenas bibendum ipsum nec urna condimentum mollis. In venenatis eget nunc ac adipiscing. Vivamus faucibus vel orci mattis egestas. In hac habitasse platea dictumst. Nulla faucibus neque eu fermentum luctus. Duis ipsum nunc, congue vel justo nec, faucibus iaculis erat. Integer sit amet augue nec enim blandit placerat. Sed bibendum feugiat eros.
\end{agradecimentos}
-\epigrafe{A good scientist is a person with original ideas. A good engineer is a person who makes a design that works with as few original ideas as possible. There are no prima donnas in engineering.}{Freeman Dyson \nocite{dyson_disturbing_1979}}
+\begin{epigrafe}
+ \epig{Beware of bugs in the above code; I have only proved it correct, not tried it.}{Donald E. Knuth \nocite{knuth77}}
+ \epig{Something is rotten in the state of Denmark.}{William Shakespeare \nocite{shakespeare1885tragedy}}
+\end{epigrafe}
\begin{resumo}
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean quam turpis, ullamcorper quis laoreet ac, malesuada sed mi. Quisque orci nunc, placerat quis mauris vel, luctus dictum tellus. Ut aliquam dui nunc, quis commodo justo mattis aliquam. Nam congue libero nec dui auctor pharetra. Sed sit amet justo sodales, elementum massa quis, luctus ipsum. Ut et libero mattis, rhoncus nisi vitae, facilisis sapien. Aliquam erat volutpat. Mauris eget libero egestas, ullamcorper leo quis, convallis libero. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
@@ -92,16 +104,16 @@
\end{resumo}
\begin{abstract}
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean quam turpis, ullamcorper quis laoreet ac, malesuada sed mi. Quisque orci nunc, placerat quis mauris vel, luctus dictum tellus. Ut aliquam dui nunc, quis commodo justo mattis aliquam. Nam congue libero nec dui auctor pharetra. Sed sit amet justo sodales, elementum massa quis, luctus ipsum. Ut et libero mattis, rhoncus nisi vitae, facilisis sapien. Aliquam erat volutpat. Mauris eget libero egestas, ullamcorper leo quis, convallis libero. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean quam turpis, ullamcorper quis laoreet ac, malesuada sed mi. Quisque orci nunc, placerat quis mauris vel, luctus dictum tellus. Ut aliquam dui nunc, quis commodo justo mattis aliquam. Nam congue libero nec dui auctor pharetra. Sed sit amet justo sodales, elementum massa quis, luctus ipsum. Ut et libero mattis, rhoncus nisi vitae, facilisis sapien. Aliquam erat volutpat. Mauris eget libero egestas, ullamcorper leo quis, convallis libero. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-Sed a odio porttitor, lacinia libero vel, egestas sem. Donec accumsan tellus nec enim porttitor, id rhoncus neque dignissim. Vestibulum sollicitudin turpis sed ligula tincidunt iaculis. Vestibulum condimentum libero erat, laoreet placerat elit ullamcorper a. Nam consectetur euismod risus. Duis quis ultricies velit, ut volutpat augue. Nam ligula sapien, interdum id leo vitae, porta volutpat velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vivamus sit amet libero varius, consequat ipsum ac, placerat velit.
+ Sed a odio porttitor, lacinia libero vel, egestas sem. Donec accumsan tellus nec enim porttitor, id rhoncus neque dignissim. Vestibulum sollicitudin turpis sed ligula tincidunt iaculis. Vestibulum condimentum libero erat, laoreet placerat elit ullamcorper a. Nam consectetur euismod risus. Duis quis ultricies velit, ut volutpat augue. Nam ligula sapien, interdum id leo vitae, porta volutpat velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vivamus sit amet libero varius, consequat ipsum ac, placerat velit.
-Nunc molestie nunc ac lorem dictum, sit amet placerat tellus congue. In sit amet dolor sed leo lobortis malesuada. Curabitur sit amet tristique urna. Vestibulum sollicitudin pellentesque aliquam. Sed pellentesque enim in lacus sodales laoreet. Suspendisse massa magna, fermentum at massa vitae, fermentum posuere dui. Interdum et malesuada \index{FEI}FEI fames ac ante ipsum primis in faucibus. Pellentesque porttitor mauris adipiscing dolor semper condimentum. Donec in nibh sapien. Cras vestibulum venenatis nisl ultrices feugiat. Donec a neque eu odio vehicula rutrum quis eu nisl. Curabitur mauris diam, sollicitudin egestas condimentum a, faucibus non felis. Duis scelerisque augue sed turpis lobortis accumsan.
+ Nunc molestie nunc ac lorem dictum, sit amet placerat tellus congue. In sit amet dolor sed leo lobortis malesuada. Curabitur sit amet tristique urna. Vestibulum sollicitudin pellentesque aliquam. Sed pellentesque enim in lacus sodales laoreet. Suspendisse massa magna, fermentum at massa vitae, fermentum posuere dui. Interdum et malesuada \index{FEI}FEI fames ac ante ipsum primis in faucibus. Pellentesque porttitor mauris adipiscing dolor semper condimentum. Donec in nibh sapien. Cras vestibulum venenatis nisl ultrices feugiat. Donec a neque eu odio vehicula rutrum quis eu nisl. Curabitur mauris diam, sollicitudin egestas condimentum a, faucibus non felis. Duis scelerisque augue sed turpis lobortis accumsan.
-Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Duis ut dolor erat. Fusce adipiscing interdum eros, in ultrices orci auctor at. Mauris ac ante orci. In nec mauris arcu. In pulvinar tortor a felis interdum pretium. Donec tristique laoreet sollicitudin. Proin erat metus, blandit sed cursus eget, faucibus id nunc. Donec id nisi non mauris tempor tincidunt. Fusce venenatis pulvinar enim. Fusce sit amet tortor nec magna feugiat pharetra ac nec nibh. Praesent non nisi lacus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vestibulum rutrum varius velit, id iaculis ante vestibulum quis. Aenean bibendum sit amet quam ornare mollis. Suspendisse sollicitudin fringilla felis in venenatis.
+ Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Duis ut dolor erat. Fusce adipiscing interdum eros, in ultrices orci auctor at. Mauris ac ante orci. In nec mauris arcu. In pulvinar tortor a felis interdum pretium. Donec tristique laoreet sollicitudin. Proin erat metus, blandit sed cursus eget, faucibus id nunc. Donec id nisi non mauris tempor tincidunt. Fusce venenatis pulvinar enim. Fusce sit amet tortor nec magna feugiat pharetra ac nec nibh. Praesent non nisi lacus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vestibulum rutrum varius velit, id iaculis ante vestibulum quis. Aenean bibendum sit amet quam ornare mollis. Suspendisse sollicitudin fringilla felis in venenatis.
-Vivamus vel erat erat. Integer venenatis nisl velit, vel commodo lectus condimentum ac. Aliquam id magna at tellus sagittis tempus id quis ante. Maecenas bibendum ipsum nec urna condimentum mollis. In venenatis eget nunc ac adipiscing. Vivamus faucibus vel orci mattis egestas. In hac habitasse platea dictumst. Nulla faucibus neque eu fermentum luctus. Duis ipsum nunc, congue vel justo nec, faucibus iaculis erat. Integer sit amet augue nec enim blandit placerat. Sed bibendum feugiat eros.
-\keywords{Keywords. Go. Here.}
+ Vivamus vel erat erat. Integer venenatis nisl velit, vel commodo lectus condimentum ac. Aliquam id magna at tellus sagittis tempus id quis ante. Maecenas bibendum ipsum nec urna condimentum mollis. In venenatis eget nunc ac adipiscing. Vivamus faucibus vel orci mattis egestas. In hac habitasse platea dictumst. Nulla faucibus neque eu fermentum luctus. Duis ipsum nunc, congue vel justo nec, faucibus iaculis erat. Integer sit amet augue nec enim blandit placerat. Sed bibendum feugiat eros.
+ \keywords{Keywords. Go. Here.}
\end{abstract}
\listoffigures
@@ -155,20 +167,20 @@
Sed a odio porttitor, lacinia libero vel, egestas sem. Donec accumsan tellus nec enim porttitor, id rhoncus neque dignissim. Vestibulum sollicitudin turpis sed ligula tincidunt iaculis. Vestibulum condimentum libero erat, laoreet placerat elit ullamcorper a. Nam consectetur euismod risus. Duis quis ultricies velit, ut volutpat augue. Nam ligula sapien, interdum id leo vitae, porta volutpat velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vivamus sit amet libero varius, consequat ipsum ac, placerat velit.
\begin{table}[ht!]
- \caption{Donec accumsan tellus nec enim porttitor} \label{tbl:exemplo}
- \centering
- \begin{tabular}{|c|c|c|c|}
- \hline
- & \(x_1\) & \(x_2\) & \(x_3\) \\
- \hline
- \(y_1\) & 1 & 0 & 0 \\
- \hline
- \(y_2\) & 0 & 1 & 0 \\
- \hline
- \(y_3\) & 0 & 0 & 1 \\
- \hline
- \end{tabular}
- \caption*{Fonte: Autor}
+ \caption{Donec accumsan tellus nec enim porttitor} \label{tbl:exemplo}
+ \centering
+ \begin{tabular}{|c|c|c|c|}
+ \hline
+ & \(x_1\) & \(x_2\) & \(x_3\) \\
+ \hline
+ \(y_1\) & 1 & 0 & 0 \\
+ \hline
+ \(y_2\) & 0 & 1 & 0 \\
+ \hline
+ \(y_3\) & 0 & 0 & 1 \\
+ \hline
+ \end{tabular}
+ \caption*{Fonte: Autor}
\end{table}
\section{Class aptent taciti}
@@ -176,15 +188,15 @@
Class aptent taciti sociosqu ad litora torquent per conubia nostra, per \index{latex@\LaTeX} inceptos himenaeos. Duis ut dolor erat. Fusce adipiscing interdum eros, in ultrices orci auctor at. Mauris ac ante orci. In nec mauris arcu. In pulvinar tortor a felis interdum pretium. Donec tristique laoreet sollicitudin. Proin erat metus, blandit sed cursus eget, faucibus id nunc. Donec id nisi non mauris tempor tincidunt. Fusce venenatis pulvinar enim. Fusce sit amet tortor nec magna feugiat pharetra ac nec nibh. Praesent non nisi lacus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vestibulum rutrum varius velit, id iaculis ante vestibulum quis. Aenean bibendum sit amet quam ornare mollis. Suspendisse sollicitudin fringilla felis in venenatis.
\begin{algorithm}
-\Entrada{Inteiro \(a\)}
-\Saida{Inteiro \(b\)}
+ \Entrada{Inteiro \(a\)}
+ \Saida{Inteiro \(b\)}
-\(c=\sqrt{a^2 + b^2}\)
+ \(c=\sqrt{a^2 + b^2}\)
-\Retorna \(c\)
+ \Retorna \(c\)
-\caption{Algoritmo que calcula o teorema de Pitágoras, de acordo com \textcite{heath1921history}.}
-\label{lst:alg}
+ \caption{Algoritmo que calcula o teorema de Pitágoras, de acordo com \textcite{heath1921history}.}
+ \label{lst:alg}
\end{algorithm}
\printbibliography
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fei/fei-template.tex new/doc/latex/fei/fei-template.tex
--- old/doc/latex/fei/fei-template.tex 2018-10-02 03:06:26.000000000 +0200
+++ new/doc/latex/fei/fei-template.tex 2020-02-10 23:11:52.000000000 +0100
@@ -1,5 +1,5 @@
-\documentclass[rascunho,xindy,acronym,symbols]{fei}
+\documentclass[acronym,symbols]{fei}
\usepackage[utf8]{inputenc}
@@ -17,8 +17,8 @@
%%%% -- Entradas Listas de Abreviaturas e Simbolos
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% -- Abreviaturas
-\newacronym[longplural=Computational Aided Design]{cad}{CAD}{Computational Aided Design}
-\newacronym[longplural=Centro Universitário da FEI]{fei}{FEI}{Centro Universitário da FEI}
+\newacronym[user1=Computational Aided Design]{cad}{CAD}{Desenho assistido por computador}
+\newacronym{fei}{FEI}{Centro Universitário da FEI}
%% -- Simbolos
\newglossaryentry{A}{type=symbols,name={\ensuremath{A}},sort=a,description={exchanger total heat transfer area, $m^2$}}
@@ -63,7 +63,10 @@
Vivamus vel erat erat. Integer venenatis nisl velit, vel commodo lectus condimentum ac. Aliquam id magna at tellus sagittis tempus id quis ante. Maecenas bibendum ipsum nec urna condimentum mollis. In venenatis eget nunc ac adipiscing. Vivamus faucibus vel orci mattis egestas. In hac habitasse platea dictumst. Nulla faucibus neque eu fermentum luctus. Duis ipsum nunc, congue vel justo nec, faucibus iaculis erat. Integer sit amet augue nec enim blandit placerat. Sed bibendum feugiat eros.
\end{agradecimentos}
-\epigrafe{A good scientist is a person with original ideas. A good engineer is a person who makes a design that works with as few original ideas as possible. There are no prima donnas in engineering.}{Freeman Dyson \nocite{dyson_disturbing_1979}}
+\begin{epigrafe}
+ \epig{Beware of bugs in the above code; I have only proved it correct, not tried it.}{Donald E. Knuth \nocite{knuth77}}
+ \epig{Something is rotten in the state of Denmark.}{William Shakespeare \nocite{shakespeare1885tragedy}}
+\end{epigrafe}
\begin{resumo}
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean quam turpis, ullamcorper quis laoreet ac, malesuada sed mi. Quisque orci nunc, placerat quis mauris vel, luctus dictum tellus. Ut aliquam dui nunc, quis commodo justo mattis aliquam. Nam congue libero nec dui auctor pharetra. Sed sit amet justo sodales, elementum massa quis, luctus ipsum. Ut et libero mattis, rhoncus nisi vitae, facilisis sapien. Aliquam erat volutpat. Mauris eget libero egestas, ullamcorper leo quis, convallis libero. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
@@ -79,16 +82,16 @@
\end{resumo}
\begin{abstract}
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean quam turpis, ullamcorper quis laoreet ac, malesuada sed mi. Quisque orci nunc, placerat quis mauris vel, luctus dictum tellus. Ut aliquam dui nunc, quis commodo justo mattis aliquam. Nam congue libero nec dui auctor pharetra. Sed sit amet justo sodales, elementum massa quis, luctus ipsum. Ut et libero mattis, rhoncus nisi vitae, facilisis sapien. Aliquam erat volutpat. Mauris eget libero egestas, ullamcorper leo quis, convallis libero. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean quam turpis, ullamcorper quis laoreet ac, malesuada sed mi. Quisque orci nunc, placerat quis mauris vel, luctus dictum tellus. Ut aliquam dui nunc, quis commodo justo mattis aliquam. Nam congue libero nec dui auctor pharetra. Sed sit amet justo sodales, elementum massa quis, luctus ipsum. Ut et libero mattis, rhoncus nisi vitae, facilisis sapien. Aliquam erat volutpat. Mauris eget libero egestas, ullamcorper leo quis, convallis libero. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-Sed a odio porttitor, lacinia libero vel, egestas sem. Donec accumsan tellus nec enim porttitor, id rhoncus neque dignissim. Vestibulum sollicitudin turpis sed ligula tincidunt iaculis. Vestibulum condimentum libero erat, laoreet placerat elit ullamcorper a. Nam consectetur euismod risus. Duis quis ultricies velit, ut volutpat augue. Nam ligula sapien, interdum id leo vitae, porta volutpat velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vivamus sit amet libero varius, consequat ipsum ac, placerat velit.
+ Sed a odio porttitor, lacinia libero vel, egestas sem. Donec accumsan tellus nec enim porttitor, id rhoncus neque dignissim. Vestibulum sollicitudin turpis sed ligula tincidunt iaculis. Vestibulum condimentum libero erat, laoreet placerat elit ullamcorper a. Nam consectetur euismod risus. Duis quis ultricies velit, ut volutpat augue. Nam ligula sapien, interdum id leo vitae, porta volutpat velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vivamus sit amet libero varius, consequat ipsum ac, placerat velit.
-Nunc molestie nunc ac lorem dictum, sit amet placerat tellus congue. In sit amet dolor sed leo lobortis malesuada. Curabitur sit amet tristique urna. Vestibulum sollicitudin pellentesque aliquam. Sed pellentesque enim in lacus sodales laoreet. Suspendisse massa magna, fermentum at massa vitae, fermentum posuere dui. Interdum et malesuada \index{FEI}FEI fames ac ante ipsum primis in faucibus. Pellentesque porttitor mauris adipiscing dolor semper condimentum. Donec in nibh sapien. Cras vestibulum venenatis nisl ultrices feugiat. Donec a neque eu odio vehicula rutrum quis eu nisl. Curabitur mauris diam, sollicitudin egestas condimentum a, faucibus non felis. Duis scelerisque augue sed turpis lobortis accumsan.
+ Nunc molestie nunc ac lorem dictum, sit amet placerat tellus congue. In sit amet dolor sed leo lobortis malesuada. Curabitur sit amet tristique urna. Vestibulum sollicitudin pellentesque aliquam. Sed pellentesque enim in lacus sodales laoreet. Suspendisse massa magna, fermentum at massa vitae, fermentum posuere dui. Interdum et malesuada \index{FEI}FEI fames ac ante ipsum primis in faucibus. Pellentesque porttitor mauris adipiscing dolor semper condimentum. Donec in nibh sapien. Cras vestibulum venenatis nisl ultrices feugiat. Donec a neque eu odio vehicula rutrum quis eu nisl. Curabitur mauris diam, sollicitudin egestas condimentum a, faucibus non felis. Duis scelerisque augue sed turpis lobortis accumsan.
-Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Duis ut dolor erat. Fusce adipiscing interdum eros, in ultrices orci auctor at. Mauris ac ante orci. In nec mauris arcu. In pulvinar tortor a felis interdum pretium. Donec tristique laoreet sollicitudin. Proin erat metus, blandit sed cursus eget, faucibus id nunc. Donec id nisi non mauris tempor tincidunt. Fusce venenatis pulvinar enim. Fusce sit amet tortor nec magna feugiat pharetra ac nec nibh. Praesent non nisi lacus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vestibulum rutrum varius velit, id iaculis ante vestibulum quis. Aenean bibendum sit amet quam ornare mollis. Suspendisse sollicitudin fringilla felis in venenatis.
+ Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Duis ut dolor erat. Fusce adipiscing interdum eros, in ultrices orci auctor at. Mauris ac ante orci. In nec mauris arcu. In pulvinar tortor a felis interdum pretium. Donec tristique laoreet sollicitudin. Proin erat metus, blandit sed cursus eget, faucibus id nunc. Donec id nisi non mauris tempor tincidunt. Fusce venenatis pulvinar enim. Fusce sit amet tortor nec magna feugiat pharetra ac nec nibh. Praesent non nisi lacus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vestibulum rutrum varius velit, id iaculis ante vestibulum quis. Aenean bibendum sit amet quam ornare mollis. Suspendisse sollicitudin fringilla felis in venenatis.
-Vivamus vel erat erat. Integer venenatis nisl velit, vel commodo lectus condimentum ac. Aliquam id magna at tellus sagittis tempus id quis ante. Maecenas bibendum ipsum nec urna condimentum mollis. In venenatis eget nunc ac adipiscing. Vivamus faucibus vel orci mattis egestas. In hac habitasse platea dictumst. Nulla faucibus neque eu fermentum luctus. Duis ipsum nunc, congue vel justo nec, faucibus iaculis erat. Integer sit amet augue nec enim blandit placerat. Sed bibendum feugiat eros.
-\keywords{Keywords. Go. Here.}
+ Vivamus vel erat erat. Integer venenatis nisl velit, vel commodo lectus condimentum ac. Aliquam id magna at tellus sagittis tempus id quis ante. Maecenas bibendum ipsum nec urna condimentum mollis. In venenatis eget nunc ac adipiscing. Vivamus faucibus vel orci mattis egestas. In hac habitasse platea dictumst. Nulla faucibus neque eu fermentum luctus. Duis ipsum nunc, congue vel justo nec, faucibus iaculis erat. Integer sit amet augue nec enim blandit placerat. Sed bibendum feugiat eros.
+ \keywords{Keywords. Go. Here.}
\end{abstract}
\listoffigures
@@ -142,20 +145,20 @@
Sed a odio porttitor, lacinia libero vel, egestas sem. Donec accumsan tellus nec enim porttitor, id rhoncus neque dignissim. Vestibulum sollicitudin turpis sed ligula tincidunt iaculis. Vestibulum condimentum libero erat, laoreet placerat elit ullamcorper a. Nam consectetur euismod risus. Duis quis ultricies velit, ut volutpat augue. Nam ligula sapien, interdum id leo vitae, porta volutpat velit. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vivamus sit amet libero varius, consequat ipsum ac, placerat velit.
\begin{table}[ht!]
- \caption{Donec accumsan tellus nec enim porttitor} \label{tbl:exemplo}
- \centering
- \begin{tabular}{|c|c|c|c|}
- \hline
- & \(x_1\) & \(x_2\) & \(x_3\) \\
- \hline
- \(y_1\) & 1 & 0 & 0 \\
- \hline
- \(y_2\) & 0 & 1 & 0 \\
- \hline
- \(y_3\) & 0 & 0 & 1 \\
- \hline
- \end{tabular}
- \caption*{Fonte: Autor}
+ \caption{Donec accumsan tellus nec enim porttitor} \label{tbl:exemplo}
+ \centering
+ \begin{tabular}{|c|c|c|c|}
+ \hline
+ & \(x_1\) & \(x_2\) & \(x_3\) \\
+ \hline
+ \(y_1\) & 1 & 0 & 0 \\
+ \hline
+ \(y_2\) & 0 & 1 & 0 \\
+ \hline
+ \(y_3\) & 0 & 0 & 1 \\
+ \hline
+ \end{tabular}
+ \caption*{Fonte: Autor}
\end{table}
\section{Class aptent taciti}
@@ -163,15 +166,15 @@
Class aptent taciti sociosqu ad litora torquent per conubia nostra, per \index{latex@\LaTeX} inceptos himenaeos. Duis ut dolor erat. Fusce adipiscing interdum eros, in ultrices orci auctor at. Mauris ac ante orci. In nec mauris arcu. In pulvinar tortor a felis interdum pretium. Donec tristique laoreet sollicitudin. Proin erat metus, blandit sed cursus eget, faucibus id nunc. Donec id nisi non mauris tempor tincidunt. Fusce venenatis pulvinar enim. Fusce sit amet tortor nec magna feugiat pharetra ac nec nibh. Praesent non nisi lacus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Vestibulum rutrum varius velit, id iaculis ante vestibulum quis. Aenean bibendum sit amet quam ornare mollis. Suspendisse sollicitudin fringilla felis in venenatis.
\begin{algorithm}
-\Entrada{Inteiro \(a\)}
-\Saida{Inteiro \(b\)}
+ \Entrada{Inteiro \(a\)}
+ \Saida{Inteiro \(b\)}
-\(c=\sqrt{a^2 + b^2}\)
+ \(c=\sqrt{a^2 + b^2}\)
-\Retorna \(c\)
+ \Retorna \(c\)
-\caption{Algoritmo que calcula o teorema de Pitágoras, de acordo com \textcite{heath1921history}.}
-\label{lst:alg}
+ \caption{Algoritmo que calcula o teorema de Pitágoras, de acordo com \textcite{heath1921history}.}
+ \label{lst:alg}
\end{algorithm}
\printbibliography
Binary files old/doc/latex/fei/fei.pdf and new/doc/latex/fei/fei.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fei/referencias.bib new/doc/latex/fei/referencias.bib
--- old/doc/latex/fei/referencias.bib 2018-09-13 22:59:39.000000000 +0200
+++ new/doc/latex/fei/referencias.bib 2019-10-09 23:56:12.000000000 +0200
@@ -1,3 +1,18 @@
+@Book{shakespeare1885tragedy,
+ title={Tragedy of Hamlet, prince of Denmark},
+ author={Shakespeare, William},
+ year={1885},
+ publisher={SR Winchell \& Company}
+}
+
+@Unpublished{knuth77,
+ title={Notes on the van Emde Boas construction of priority deques: an instructive use of recursion},
+ author={Knuth, Donald Ervin},
+ year={1977},
+ month=mar,
+ note={Classroom notes}
+}
+
@Book{art1,
title = {The Art of Computer Programming: Fundamental algorithms},
author = {Donald Knuth},
@@ -15,9 +30,22 @@
year = 2012,
publisher = {OR Books},
shorttitle = {Cypherpunks},
- address = {New York ; London}
+}@Book{Kernighan1988,
+ author = {Brian W. Kernighan and Dennis M. Ritchie},
+ title = {The C Programming Language},
+ year = {1988},
+ date = {1988-03-22},
+ publisher = {Microsoft Press},
+ isbn = {0131103628},
+ pagetotal = {274},
+ url = {https://www.ebook.de/de/product/3237142/brian_w_kernighan_dennis_m_ritchie_the_c_programming_language.html},
+ urldate = {2016-02-24},
+ ean = {9780131103627},
+ file = {:Kernighan1988 - The C Programming Language.pdf:},
+ groups = {Unfiled},
+ keywords = {classics,programming},
+ timestamp = {2019-01-17},
}
-
@Book{clarke19932001,
title = {2001, a Space Odyssey},
author = {Arthur Charles Clarke and Kubrick, Stanley},
@@ -125,14 +153,6 @@
publisher = {Macmillan}
}
-@Book{kernighan1988,
- title = {The {C} programming language},
- author = {Kernighan, Brian W. and Ritchie, Dennis M. and Ejeklint, Per},
- year = 1988,
- publisher = {Prentice-Hall Englewood Cliffs},
- volume = 2
-}
-
@Book{kurzweil2013,
title = {How to create a mind: the secret of human thought revealed},
author = {Kurzweil, Ray},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fei.doc.tlpobj new/tlpkg/tlpobj/fei.doc.tlpobj
--- old/tlpkg/tlpobj/fei.doc.tlpobj 2019-02-28 03:36:46.000000000 +0100
+++ new/tlpkg/tlpobj/fei.doc.tlpobj 2020-03-09 00:28:39.000000000 +0100
@@ -1,9 +1,9 @@
name fei.doc
category Package
-revision 49439
+revision 54178
shortdesc doc files of fei
relocated 1
-docfiles size=84
+docfiles size=125
RELOC/doc/latex/fei/README
RELOC/doc/latex/fei/README.txt
RELOC/doc/latex/fei/fei-template-sublist.tex
++++++ fei.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fei/fei.cls new/tex/latex/fei/fei.cls
--- old/tex/latex/fei/fei.cls 2018-12-17 22:31:12.000000000 +0100
+++ new/tex/latex/fei/fei.cls 2020-03-08 22:42:17.000000000 +0100
@@ -14,11 +14,13 @@
%% See http://www.latex-project.org/lppl.txt
%% -----------------------------------------------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{fei}[2018/12/17 4.3.1 Modelo da FEI]
+\ProvidesClass{fei}[2020/03/03 4.8 Modelo da FEI]
-\DeclareOption{xindy}{
-\PassOptionsToPackage{\CurrentOption}{imakeidx}
-\PassOptionsToPackage{\CurrentOption}{glossaries-extra}
+\DeclareOption{draft}{
+\PassOptionsToClass{\CurrentOption}{memoir}
+}
+\DeclareOption{final}{
+\PassOptionsToClass{\CurrentOption}{memoir}
}
\newif\ifglossaries
@@ -31,27 +33,39 @@
\glossariestrue
\PassOptionsToPackage{\CurrentOption}{glossaries-extra}
}
+\DeclareOption{record}{
+\glossariestrue
+\PassOptionsToPackage{\CurrentOption}{glossaries-extra}
+}
\newif\ifsublist
\sublistfalse
\DeclareOption{sublist}{\sublisttrue}
-\newif\ifrascunho
-\rascunhofalse
-\DeclareOption{rascunho}{\rascunhotrue}
+\newif\ifdeposito
+\depositofalse
+\DeclareOption{deposito}{\depositotrue}
\newif\ifarial
\DeclareOption{arial}{\arialtrue}
\DeclareOption{times}{\arialfalse}
+\newif\ifnumeric
+\numericfalse
+\DeclareOption{numeric}{\numerictrue}
+
\newif\ifoneside
\DeclareOption{oneside}{\onesidetrue}
\DeclareOption{twoside}{\onesidefalse}
\DeclareOption{algo-as-figure}{\PassOptionsToPackage{figure}{algorithm2e}}%
+\newif\ifpdfa
+\pdfatrue
+\DeclareOption{nopdfa}{\pdfafalse}
+
-\PassOptionsToClass{a4paper}{memoir}
+\PassOptionsToClass{a4paper,12pt}{memoir}
\ExecuteOptions{oneside,times}
@@ -220,6 +234,22 @@
\renewcommand*{\cftmapaaftersnum}{\hfill--\hfill}
\setfloatlocations{mapa}{hbtp} % configurando posicionamento padr^^c3^^a3o
+\newcommand{\diagramaname}{Diagrama}
+\newfloat[chapter]{diagrama}{lof}{\diagramaname}
+\newlistentry{diagrama}{lof}{0}
+\counterwithout{diagrama}{chapter}
+\renewcommand{\cftdiagramaname}{\diagramaname\space}
+\renewcommand*{\cftdiagramaaftersnum}{\hfill--\hfill}
+\setfloatlocations{diagrama}{hbtp} % configurando posicionamento padr^^c3^^a3o
+
+\newcommand{\fluxogramaname}{Fluxograma}
+\newfloat[chapter]{fluxograma}{lof}{\fluxogramaname}
+\newlistentry{fluxograma}{lof}{0}
+\counterwithout{fluxograma}{chapter}
+\renewcommand{\cftfluxogramaname}{\fluxogramaname\space}
+\renewcommand*{\cftfluxogramaaftersnum}{\hfill--\hfill}
+\setfloatlocations{fluxograma}{hbtp} % configurando posicionamento padr^^c3^^a3o
+
\newcommand{\organogramaname}{Organograma}
\newfloat[chapter]{organograma}{lof}{\organogramaname}
\newlistentry{organograma}{lof}{0}
@@ -267,10 +297,10 @@
\@startsection{part}{-1}{0pt}{\baselineskip}{\baselineskip}{\cleardoublepage\fontsize{12pt}{14.4pt}\centering\bfseries\MakeUppercase}}
\renewcommand{\chapter}{\cleardoublepage\pagestyle{plain}%
-\(a)startsection{chapter}{0}{0pt}{1pt}{1pt}{\fontsize{12pt}{14.4pt}\bfseries\MakeUppercase}}
+\@startsection{chapter}{0}{0pt}{\baselineskip}{\baselineskip}{\fontsize{12pt}{14.4pt}\bfseries}}
\renewcommand{\section}{%
-\@startsection{section}{1}{0pt}{\baselineskip}{\baselineskip}{\fontsize{12pt}{14.4pt}\MakeUppercase}}
+\@startsection{section}{1}{0pt}{\baselineskip}{\baselineskip}{\fontsize{12pt}{14.4pt}}}
\renewcommand{\subsection}{%
\@startsection{subsection}{2}{0pt}{\baselineskip}{\baselineskip}{\fontsize{12pt}{14.4pt}\bfseries}}
@@ -354,7 +384,10 @@
\textbf{\MakeUppercase{\@title}}\ifthenelse{\isundefined{\@subtitulo}}{}{: \@subtitulo}
\vfill
\begin{flushright}
-\begin{minipage}{0.55\textwidth}}{\end{minipage}{}
+\begin{minipage}{\textwidth - 8cm}
+\normalsize
+\begin{SingleSpace}
+}{\end{SingleSpace}\end{minipage}{}
\end{flushright}
\vfill
\(a)cidade\\[0.5em]
@@ -366,10 +399,10 @@
\RequirePackage{pdfpages}
\RequirePackage{ifthen}
\newcommand{\folhadeaprovacao}{
-\ifrascunho
-\thispagestyle{empty}\mbox{}\vfill\begin{center}\begin{Huge}Folha de aprova\c{c}\~{a}o\end{Huge}\vfill\end{center}\cleardoublepage
-\else
+\ifdeposito
\includepdf{ata.pdf}\cleardoublepage
+\else
+\thispagestyle{empty}\mbox{}\vfill\begin{center}\begin{Huge}Folha de aprova\c{c}\~{a}o\end{Huge}\vfill\end{center}\cleardoublepage
\fi
}
@@ -378,10 +411,10 @@
\else
\addtocounter{page}{-1}
\fi
-\ifrascunho
-\thispagestyle{empty}\mbox{}\vfill\begin{center}\begin{Huge}Ficha catalogr\'{a}fica\end{Huge}\vfill\end{center}\cleardoublepage
-\else
+\ifdeposito
\includepdf{ficha.pdf}\cleardoublepage
+\else
+\thispagestyle{empty}\mbox{}\vfill\begin{center}\begin{Huge}Ficha catalogr\'{a}fica\end{Huge}\vfill\end{center}\cleardoublepage
\fi
}
@@ -411,12 +444,12 @@
\end{flushright}
}
-\newcommand{\epigrafe}[2]{
-\cleardoublepage
-\thispagestyle{empty}
-\vspace*{\fill}
+\newenvironment{epigrafe}{\cleardoublepage\pagestyle{empty}\vspace*{\fill}}{\pagestyle{plain}}
+
+\newcommand{\epig}[2]{
+\vspace{2\baselineskip}
\begin{flushright}
-\begin{minipage}[t][0.5\textheight][c]{0.5\textwidth}
+\begin{minipage}[t]{0.5\textwidth}
``{#1}''
\begin{flushright}
#2
@@ -424,14 +457,13 @@
\end{minipage}
\end{flushright}
}
-
\newenvironment{resumo}{\part*{Resumo}\pagestyle{empty}}{\cleardoublepage\pagestyle{plain}\setlength{\parindent}{1.25cm}}
\renewenvironment{abstract}{\selectlanguage{english}\part*{Abstract}\pagestyle{empty}\setlength{\parindent}{1.25cm}}{\cleardoublepage\pagestyle{plain}\selectlanguage{brazil}}
\newenvironment{agradecimentos}{\part*{Agradecimentos}\pagestyle{empty}}{\cleardoublepage\pagestyle{plain}}
-\RequirePackage{imakeidx}
+\RequirePackage[xindy]{imakeidx}
\indexsetup{level=\part*}
\addto\captionsbrazil{%
\renewcommand{\indexname}{\'Indice}%
@@ -444,13 +476,21 @@
\oldprintindex%
}%
+\ifpdfa
+\RequirePackage[a-1b]{pdfx}
+\else
+\RequirePackage{hyperref}
+\fi
-
-\RequirePackage[pdftex,pdfborder={0 0 0},colorlinks={false}]{hyperref}
+\hypersetup{%
+pdftex,%
+pdfborder={0 0 0},%
+colorlinks={false}%
+}
\ifglossaries
\ifsublist
-\RequirePackage[nomain,nonumberlist,section=part]{glossaries-extra}
+\RequirePackage[xindy,nomain,nonumberlist,section=part]{glossaries-extra}
\setglossarystyle{alttree}
\glssetwidest[0]{}
\glssetwidest[1]{aaaaaaaaaaaa}
@@ -458,7 +498,7 @@
\renewcommand*{\glossarypreamble}{\thispagestyle{empty}\pagestyle{empty}\vspace*{-2\baselineskip}}
\else
-\RequirePackage[nomain,nonumberlist,section=part,nogroupskip]{glossaries-extra}
+\RequirePackage[xindy,nomain,nonumberlist,section=part,nogroupskip]{glossaries-extra}
\newglossarystyle{mylong}{%
\setglossarystyle{long}% base this style on the long style
@@ -522,12 +562,19 @@
}%
}%
+
+\ifnumeric
+\RequirePackage[backend=biber,
+safeinputenc=true,
+uniquelist=false,
+style=abnt-numeric]{biblatex}
+\else
\RequirePackage[backend=biber,
safeinputenc=true,
uniquelist=false,
-isbn=false,
-doi=false,
style=abnt]{biblatex}
+\fi
+
\setlength{\bibitemsep}{1.0\baselineskip}
\DefineBibliographyStrings{brazil}{%
@@ -555,21 +602,22 @@
\newcommand*{\citefloat}[1]{\textcite*{#1}}
\renewenvironment{quote}
-{\begin{SingleSpace}\list{}{%
-\fontsize{10pt}{1em}%
-\leftmargin=4cm}%
-\item\relax\ignorespaces}
-{\endlist\end{SingleSpace}}
+{\begin{flushright}
+\begin{minipage}{\textwidth - 4cm}
+\fontsize{10pt}{1em}
+\begin{SingleSpace}
+}{\end{SingleSpace}\end{minipage}{}
+\end{flushright}}
\renewenvironment{quotation}
-{\begin{SingleSpace}\list{}{%
-\fontsize{10pt}{1em}%
-\leftmargin=2cm \rightmargin=2cm%
-\listparindent .5cm \itemindent}%
-\item\relax}
-{\endlist\end{SingleSpace}}
+{\begin{center}
+\begin{minipage}{\textwidth - 4cm}
+\fontsize{10pt}{1em}
+\begin{SingleSpace}\setlength{\parindent}{1cm}
+}{\end{SingleSpace}\end{minipage}{}
+\end{center}}
%%
-%% Copyright (C) 2017 by Douglas De Rizzo Meneghetti <douglasrizzo(a)fei.edu.br>
+%% Copyright (C) 2019 by Douglas De Rizzo Meneghetti <douglasrizzo(a)fei.edu.br>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fei.tlpobj new/tlpkg/tlpobj/fei.tlpobj
--- old/tlpkg/tlpobj/fei.tlpobj 2019-02-28 03:36:46.000000000 +0100
+++ new/tlpkg/tlpobj/fei.tlpobj 2020-03-09 00:28:40.000000000 +0100
@@ -1,6 +1,6 @@
name fei
category Package
-revision 49439
+revision 54178
shortdesc Class for academic works at FEI University Center -- Brazil
relocated 1
longdesc fei is a class created by graduate students and LaTeX
@@ -22,7 +22,6 @@
catalogue-contact-repository http://github.com/douglasrizzo/Classe-Latex-FEI/
catalogue-contact-support https://groups.google.com/forum/#!forum/grupo-latex-fei
catalogue-ctan /macros/latex/contrib/fei
-catalogue-date 2018-12-17 19:50:28 +0100
catalogue-license lppl1.3c
-catalogue-topics dissertation class
-catalogue-version 4.3.1
+catalogue-topics dissertation class portuguese-br
+catalogue-version 4.8
++++++ fibeamer.doc.tar.xz ++++++
Binary files old/doc/latex/fibeamer/fibeamer.pdf and new/doc/latex/fibeamer/fibeamer.pdf differ
Binary files old/doc/latex/fibeamer/guide/mu/econ.pdf and new/doc/latex/fibeamer/guide/mu/econ.pdf differ
Binary files old/doc/latex/fibeamer/guide/mu/fi.pdf and new/doc/latex/fibeamer/guide/mu/fi.pdf differ
Binary files old/doc/latex/fibeamer/guide/mu/fsps.pdf and new/doc/latex/fibeamer/guide/mu/fsps.pdf differ
Binary files old/doc/latex/fibeamer/guide/mu/fss.pdf and new/doc/latex/fibeamer/guide/mu/fss.pdf differ
Binary files old/doc/latex/fibeamer/guide/mu/law.pdf and new/doc/latex/fibeamer/guide/mu/law.pdf differ
Binary files old/doc/latex/fibeamer/guide/mu/med.pdf and new/doc/latex/fibeamer/guide/mu/med.pdf differ
Binary files old/doc/latex/fibeamer/guide/mu/ped.pdf and new/doc/latex/fibeamer/guide/mu/ped.pdf differ
Binary files old/doc/latex/fibeamer/guide/mu/phil.pdf and new/doc/latex/fibeamer/guide/mu/phil.pdf differ
Binary files old/doc/latex/fibeamer/guide/mu/sci.pdf and new/doc/latex/fibeamer/guide/mu/sci.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fibeamer.doc.tlpobj new/tlpkg/tlpobj/fibeamer.doc.tlpobj
--- old/tlpkg/tlpobj/fibeamer.doc.tlpobj 2019-02-28 03:36:54.000000000 +0100
+++ new/tlpkg/tlpobj/fibeamer.doc.tlpobj 2019-12-17 01:54:57.000000000 +0100
@@ -1,9 +1,9 @@
name fibeamer.doc
category Package
-revision 44239
+revision 53146
shortdesc doc files of fibeamer
relocated 1
-docfiles size=806
+docfiles size=1074
RELOC/doc/latex/fibeamer/fibeamer.pdf
RELOC/doc/latex/fibeamer/guide/mu/econ.pdf
RELOC/doc/latex/fibeamer/guide/mu/fi.pdf
++++++ fibeamer.tar.xz ++++++
++++ 9127 lines of diff (skipped)
++++++ filecontents.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/filecontents/README new/doc/latex/filecontents/README
--- old/doc/latex/filecontents/README 2018-05-31 23:50:06.000000000 +0200
+++ new/doc/latex/filecontents/README 2019-09-21 23:51:43.000000000 +0200
@@ -36,7 +36,7 @@
Copyright and license
---------------------
-Copyright (C) 2018 Scott Pakin, scott+fc(a)pakin.org
+Copyright (C) 2011-2019 Scott Pakin, scott+fc(a)pakin.org
This package may be distributed and/or modified under the conditions
of the LaTeX Project Public License, either version 1.3c of this
Binary files old/doc/latex/filecontents/filecontents.pdf and new/doc/latex/filecontents/filecontents.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/filecontents.doc.tlpobj new/tlpkg/tlpobj/filecontents.doc.tlpobj
--- old/tlpkg/tlpobj/filecontents.doc.tlpobj 2019-02-28 03:36:58.000000000 +0100
+++ new/tlpkg/tlpobj/filecontents.doc.tlpobj 2019-09-22 01:55:47.000000000 +0200
@@ -1,8 +1,8 @@
name filecontents.doc
category Package
-revision 47890
+revision 52142
shortdesc doc files of filecontents
relocated 1
-docfiles size=31
+docfiles size=33
RELOC/doc/latex/filecontents/README
RELOC/doc/latex/filecontents/filecontents.pdf
++++++ filecontents.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/filecontents/filecontents.sty new/tex/latex/filecontents/filecontents.sty
--- old/tex/latex/filecontents/filecontents.sty 2018-05-31 23:50:06.000000000 +0200
+++ new/tex/latex/filecontents/filecontents.sty 2019-09-21 23:51:43.000000000 +0200
@@ -8,8 +8,8 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2018 Scott Pakin <scott+fc(a)pakin.org>
-%% -------------------------------------------------------
+%% Copyright (C) 2011-2019 Scott Pakin <scott+fc(a)pakin.org>
+%% --------------------------------------------------------
%%
%% This package may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c of this
@@ -23,13 +23,13 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{filecontents}
- [2018/05/30 v1.4 Create an external file from within a LaTeX document]
+ [2019/09/20 v1.5 Create an external file from within a LaTeX document]
\begingroup%
\catcode`\*=11 %
\catcode`\^^M\active%
\catcode`\^^L\active\let^^L\relax%
\catcode`\^^I\active%
-\gdef\filec@ntents#1{%
+\gdef\filec@ntents@old@kernel#1{%
\openin\@inputcheck#1 %
\ifeof\@inputcheck%
\@latex@warning@no@line%
@@ -90,10 +90,19 @@
\catcode`\^^M\active%
\edef^^M##1^^M{%
\noexpand\reserved@b##1\E\E\relax}}%
-\endgroup%
+\endgroup
\def\fc@no@preamblecmds#1\do\filecontents#2\do\filec@ntents#3\relax{%
\gdef\@preamblecmds{#1#3}}
-\expandafter\fc@no@preamblecmds\@preamblecmds\relax
+\@ifundefined{filec@ntents@opt}{%
+ \let\filec@ntents=\filec@ntents@old@kernel
+ \expandafter\fc@no@preamblecmds\@preamblecmds\relax
+}{%
+ \PackageWarningNoLine{filecontents}{%
+ This package is obsolete. Disabling it and\MessageBreak
+ passing control to the filecontents environment\MessageBreak
+ defined by the LaTeX kernel%
+ }%
+}
\endinput
%%
%% End of file `filecontents.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/filecontents.tlpobj new/tlpkg/tlpobj/filecontents.tlpobj
--- old/tlpkg/tlpobj/filecontents.tlpobj 2019-02-28 03:36:58.000000000 +0100
+++ new/tlpkg/tlpobj/filecontents.tlpobj 2019-09-22 01:55:47.000000000 +0200
@@ -1,7 +1,7 @@
name filecontents
category Package
-revision 47890
-shortdesc Extended filecontents and filecontents* environments
+revision 52142
+shortdesc Create an external file from within a LaTeX document
relocated 1
longdesc LaTeX2e's filecontents and filecontents* environments enable a
longdesc LaTeX source file to generate external files as it runs through
@@ -10,11 +10,18 @@
longdesc can only be used in the preamble of a document. The
longdesc filecontents package removes these limitations, letting you
longdesc overwrite existing files and letting you use
-longdesc filecontents/filecontents* anywhere.
+longdesc filecontents/filecontents* anywhere. As of September 2019 the
+longdesc author tells us: "This package is no longer necessary due to
+longdesc its functionality having moved into recent LaTeX kernels. It's
+longdesc probably better not to move the package to obsolete because
+longdesc users may need it to rebuild old documents. Version 1.5
+longdesc provides full functionality when run with an older kernel but
+longdesc issues a warning message and disables itself when run with a
+longdesc newer kernel."
runfiles size=1
RELOC/tex/latex/filecontents/filecontents.sty
catalogue-ctan /macros/latex/contrib/filecontents
-catalogue-date 2018-05-31 12:59:15 +0200
+catalogue-date 2019-09-21 10:56:20 +0200
catalogue-license lppl1.3c
catalogue-topics file-mgmt
-catalogue-version 1.4
+catalogue-version 1.5
++++++ filecontentsdef.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/filecontentsdef/INSTALL new/doc/latex/filecontentsdef/INSTALL
--- old/doc/latex/filecontentsdef/INSTALL 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/filecontentsdef/INSTALL 2019-09-29 23:13:57.000000000 +0200
@@ -0,0 +1,37 @@
+ Source: filecontentsdef.dtx (v1.5 2019/09/29)
+ Author: Jean-Francois Burnol
+ Info: filecontents + macro + verbatim
+ License: LPPL 1.3c
+ Copyright (C) 2016-2019 Jean-Francois Burnol.
+ <jfbu at free dot fr>
+
+
+
+INSTALLATION
+
+
+Use your installation manager.
+
+Else, for manual installation:
+
+- To extract the package and at the same time produce the
+ documentation, execute latex thrice on filecontentsdef.dtx then
+ dvipdfmx on the dvi file.
+
+ To customize the PDF documentation (paper size, etc...): execute
+ etex once on filecontentsdef.dtx then follow instructions given
+ inside the extracted file filecontentsdef.tex.
+
+- To extract the package but not necessarily build the documentation:
+ run etex on filecontentsdef.dtx.
+
+Files should then be moved to appropriate locations:
+
+ filecontentsdef.sty -> TDS:tex/latex/filecontentsdef/
+ filecontentsdef.dtx -> TDS:source/latex/filecontentsdef/
+ filecontentsdef.pdf -> TDS:doc/latex/filecontentsdef/
+ README.md -> TDS:doc/latex/filecontentsdef/
+ INSTALL.md -> TDS:doc/latex/filecontentsdef/
+
+You can also place filecontentsdef.sty directly within the directory of
+the project using it.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/filecontentsdef/INSTALL.md new/doc/latex/filecontentsdef/INSTALL.md
--- old/doc/latex/filecontentsdef/INSTALL.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/filecontentsdef/INSTALL.md 2019-09-29 23:13:57.000000000 +0200
@@ -0,0 +1,37 @@
+<!-- -->
+
+ Source: filecontentsdef.dtx (v1.5 2019/09/29)
+ Author: Jean-Francois Burnol
+ Info: filecontents + macro + verbatim
+ License: LPPL 1.3c
+ Copyright (C) 2016-2019 Jean-Francois Burnol.
+ <jfbu at free dot fr>
+
+INSTALLATION
+============
+
+Use your installation manager.
+
+Else, for manual installation:
+
+- To extract the package and at the same time produce the documentation,
+ execute latex thrice on `filecontentsdef.dtx` then `dvipdfmx` on the
+ `dvi` file.
+
+ To customize the PDF documentation (paper size, etc...): execute `etex`
+ once on `filecontentsdef.dtx` then follow instructions given inside the
+ extracted file `filecontentsdef.tex`.
+
+- To extract the package but not necessarily build the documentation:
+ run `etex` on `filecontentsdef.dtx`.
+
+Files should then be moved to appropriate locations:
+
+ filecontentsdef.sty -> TDS:tex/latex/filecontentsdef/
+ filecontentsdef.dtx -> TDS:source/latex/filecontentsdef/
+ filecontentsdef.pdf -> TDS:doc/latex/filecontentsdef/
+ README.md -> TDS:doc/latex/filecontentsdef/
+ INSTALL.md -> TDS:doc/latex/filecontentsdef/
+
+You can also place `filecontentsdef.sty` directly within the directory
+of the project using it.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/filecontentsdef/README.md new/doc/latex/filecontentsdef/README.md
--- old/doc/latex/filecontentsdef/README.md 2016-09-20 23:18:47.000000000 +0200
+++ new/doc/latex/filecontentsdef/README.md 2019-09-29 23:13:57.000000000 +0200
@@ -1,51 +1,84 @@
<!-- -->
- Source: filecontentsdef.dtx (v1.2 2016/09/19)
+ Source: filecontentsdef.dtx (v1.5 2019/09/29)
Author: Jean-Francois Burnol
Info: filecontents + macro + verbatim
License: LPPL 1.3c
- Copyright (C) 2016 Jean-Francois Burnol.
+ Copyright (C) 2016-2019 Jean-Francois Burnol.
<jfbu at free dot fr>
ABSTRACT
========
-This lightweight LaTeX2e package provides two environments called
-`filecontentsdef` and `filecontentshere`. They are derived from the
-LaTeX `filecontents` environment as extended by Scott Pakin's
-[filecontents] [1] package. In addition to the file creation they
-either store the (verbatim) contents in a macro (`filecontentsdef`)
-or typeset them (verbatim) on the spot (`filecontentshere`).
-
-I developed this to display TeX code verbatim in documentation and
-simultaneously produce during the LaTeX run the corresponding files
-in order to embed them in the PDF as _file attachment annotations_
-(via the services of Scott Pakin's further package [attachfile] [2].)
+This lightweight LaTeX2e package provides an environment `filecontentsdef`
+which is like the `filecontents` environment of Scott Pakin's
+[filecontents] [1] package but in addition to the file creation stores the
+(verbatim) contents into a macro given as an additional argument (either as a
+control sequence or as a name).
+
+Displaying verbatim these contents is possible via `\filecontentsprint`,
+and executing them (if they represent LaTeX code) via `\filecontentsexec`.
+
+A variant environment `filecontentsdefmacro` stores the contents into a
+macro, but skips the save-to-a-file part.
[1]: http://www.ctan.org/pkg/filecontents "filecontents package"
-[2]: http://www.ctan.org/pkg/attachfile "attachfile package"
-INSTALLATION
-============
+CHANGE LOG
+==========
+
+v1.5 \[2019/09/29\]
+-------------------
+
+- `\filecontentsexec` does not forcefully reset `\newlinechar`
+ to its LaTeX default after execution.
-To extract the package (.sty) run etex on the dtx file. To produce
-the PDF documentation, either:
+- `\FCD@` as prefix for internal non public macros.
-1. latex (twice) filecontentsdef.dtx, then dvips, then ps2pdf
-2. or pdflatex (twice),
-3. or latex (twice) then dvipdfmx
+- drop usage of the legacy LaTeX mechanism which issued a warning
+ in case of a form feed or horizontal tabulation character in the
+ parsed contents.
-This will also extract automatically the style file.
+- make handling of the tabulation and form feed characters
+ customizable.
+
+- treat especially the case when the `\end{filecontents...}`
+ is not on a line of its own.
+
+- add `filecontentsdefstarred` (et al.) as alias for
+ `filecontentsdef*` (et al.) for easying up encapsulation in
+ wrapping environments.
+
+- breaking change: `filecontentsdef` and `filecontentsdefmacro`
+ define a macro obeying the local scope. Use `filecontentsgdef`,
+ resp. `filecontentsgdefmacro` for definitions with global scope.
+
+- make the name of the environment used by `\filecontentsprint`
+ customizable (it defaults to `verbatim`) and allow to pass options
+ to it; has been tested with `fancyvrb` and `minted`.
+
+- add `\filecontentsprintviascan` which allows to use verbatim-like
+ environment such as `listings` which are incompatible with
+ `\filecontentsprint`.
+
+v1.4 \[2019/04/20\]
+-------------------
-Installation:
+- backport 2018/04/01 LaTeX release change to filecontents environment
+ (`^^L` and `^^I` definitions).
- filecontentsdef.sty -> TDS:tex/latex/filecontentsdef/filecontentsdef.sty
- filecontentsdef.dtx -> TDS:source/latex/filecontentsdef/filecontentsdef.dtx
- filecontentsdef.pdf -> TDS:doc/latex/filecontentsdef/filecontentsdef.pdf
+- add `filecontentsdefmacro` environment.
- README.md -> TDS:doc/latex/filecontentsdef/README.md
+- extend `filecontentsdef` and `filecontentsdefmacro` environments as
+ well as `\filecontentsprint` and `\filecontentsexec` macros to accept
+ indifferently either a control sequence or a name as argument.
-The other files may be discarded.
+- refactor documentation, explain how to define wrapper environments.
+
+v1.2 \[2016/09/19\]
+-------------------
+
+Initial version.
LICENSE
=======
@@ -68,13 +101,5 @@
- Jean-Francois Burnol `<jfbu at free dot fr>`
This Work consists of the main source file filecontentsdef.dtx and
-the derived files filecontentsdef.sty, filecontentsdef.ins,
-filecontentsdef.pdf, filecontentsdef.dvi, README.md.
-
-CHANGE LOG
-==========
-
-v1.2 \[2016/09/19\]
--------------------
-
-Initial version.
+its derived files filecontentsdef.sty, filecontentsdef.pdf,
+filecontentsdef.dvi, README.md, INSTALL.md, README, INSTALL.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/filecontentsdef/filecontentsdef-ex1.tex new/doc/latex/filecontentsdef/filecontentsdef-ex1.tex
--- old/doc/latex/filecontentsdef/filecontentsdef-ex1.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/filecontentsdef/filecontentsdef-ex1.tex 2019-05-03 00:39:39.000000000 +0200
@@ -0,0 +1,2 @@
+ Prove that \[x^n+y^n=z^n\] is not solvable in positive integers if $n$ is at
+ most $-3$.\par
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/filecontentsdef/filecontentsdef-ex2.tex new/doc/latex/filecontentsdef/filecontentsdef-ex2.tex
--- old/doc/latex/filecontentsdef/filecontentsdef-ex2.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/filecontentsdef/filecontentsdef-ex2.tex 2019-05-03 00:39:39.000000000 +0200
@@ -0,0 +1 @@
+ Refute the existence of black holes in less than 140 characters.\par
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/filecontentsdef/filecontentsdef-ex3.tex new/doc/latex/filecontentsdef/filecontentsdef-ex3.tex
--- old/doc/latex/filecontentsdef/filecontentsdef-ex3.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/filecontentsdef/filecontentsdef-ex3.tex 2019-05-03 00:39:39.000000000 +0200
@@ -0,0 +1,4 @@
+ \def\NSA{NSA}%
+ Prove that factorization is easily done via probabilistic algorithms and
+ advance evidence from knowledge of the names of its employees in the
+ seventies that the \NSA\ has known that for 40 years.\par
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/filecontentsdef/filecontentsdef-tab.test new/doc/latex/filecontentsdef/filecontentsdef-tab.test
--- old/doc/latex/filecontentsdef/filecontentsdef-tab.test 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/filecontentsdef/filecontentsdef-tab.test 2019-09-29 23:13:57.000000000 +0200
@@ -0,0 +1,5 @@
+%% LaTeX2e file `filecontentsdef-tab.test'
+%% generated by the `filecontentshere' environment
+%% from source `filecontentsdef' on 2019/09/29.
+%%
+Here is a tab and then three in a row .
Binary files old/doc/latex/filecontentsdef/filecontentsdef.pdf and new/doc/latex/filecontentsdef/filecontentsdef.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/filecontentsdef/filecontentsdef.test new/doc/latex/filecontentsdef/filecontentsdef.test
--- old/doc/latex/filecontentsdef/filecontentsdef.test 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/filecontentsdef/filecontentsdef.test 2019-09-29 23:13:57.000000000 +0200
@@ -0,0 +1,6 @@
+ \begin{framed}
+ \noindent
+ We have coded this in \LaTeX: both
+ $E=mc^2$ (input as \verb|$E=mc^2$|)
+ and $E=h\nu$ owe much to \textsc{Albert Einstein}.
+ \end{framed}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/filecontentsdef/filecontentsdef.tex new/doc/latex/filecontentsdef/filecontentsdef.tex
--- old/doc/latex/filecontentsdef/filecontentsdef.tex 2016-09-20 23:18:47.000000000 +0200
+++ new/doc/latex/filecontentsdef/filecontentsdef.tex 2019-09-29 23:13:57.000000000 +0200
@@ -1,8 +1,8 @@
%%
%% Package: filecontentsdef
-%% Version: 1.2 (2016/09/19)
+%% Version: 1.5 (2019/09/29)
%% License: LPPL 1.3c
-%% Copyright (C) 2016 Jean-Francois Burnol <jfbu at free dot fr>
+%% Copyright (C) 2016-2019 Jean-Francois Burnol <jfbu at free dot fr>
%%
\chardef\Withdvipdfmx 1 % replace 1 by 0 for using pdflatex
\chardef\NoSourceCode 0 % replace 0 by 1 for the doc *without* the source code
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/filecontentsdef.doc.tlpobj new/tlpkg/tlpobj/filecontentsdef.doc.tlpobj
--- old/tlpkg/tlpobj/filecontentsdef.doc.tlpobj 2019-02-28 03:36:58.000000000 +0100
+++ new/tlpkg/tlpobj/filecontentsdef.doc.tlpobj 2019-09-30 01:54:37.000000000 +0200
@@ -1,9 +1,16 @@
name filecontentsdef.doc
category Package
-revision 42107
+revision 52208
shortdesc doc files of filecontentsdef
relocated 1
-docfiles size=20
+docfiles size=41
+ RELOC/doc/latex/filecontentsdef/INSTALL
+ RELOC/doc/latex/filecontentsdef/INSTALL.md
RELOC/doc/latex/filecontentsdef/README.md
+ RELOC/doc/latex/filecontentsdef/filecontentsdef-ex1.tex
+ RELOC/doc/latex/filecontentsdef/filecontentsdef-ex2.tex
+ RELOC/doc/latex/filecontentsdef/filecontentsdef-ex3.tex
+ RELOC/doc/latex/filecontentsdef/filecontentsdef-tab.test
RELOC/doc/latex/filecontentsdef/filecontentsdef.pdf
+ RELOC/doc/latex/filecontentsdef/filecontentsdef.test
RELOC/doc/latex/filecontentsdef/filecontentsdef.tex
++++++ filecontentsdef.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/filecontentsdef/filecontentsdef.sty new/tex/latex/filecontentsdef/filecontentsdef.sty
--- old/tex/latex/filecontentsdef/filecontentsdef.sty 2016-09-20 23:18:47.000000000 +0200
+++ new/tex/latex/filecontentsdef/filecontentsdef.sty 2019-09-29 23:13:57.000000000 +0200
@@ -23,19 +23,26 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{filecontentsdef}
- [2016/09/19 v1.2 filecontents + macro + verbatim (JFB)]
+ [2019/09/29 v1.5 filecontents + macro + verbatim (JFB)]
%%
%% Package: filecontentsdef
-%% Version: 1.2 (2016/09/19)
+%% Version: 1.5 (2019/09/29)
%% License: LPPL 1.3c
-%% Copyright (C) 2016 Jean-Francois Burnol <jfbu at free dot fr>
+%% Copyright (C) 2016-2019 Jean-Francois Burnol <jfbu at free dot fr>
%%
+\let\FCD@global\global
\begingroup
\catcode`\^^M\active%
\catcode`\^^L\active\let^^L\relax%
\catcode`\^^I\active%
-\gdef\filec@ntentsdef#1#2{%
- \let#2\@empty%
+\gdef\FCD@main#1#2{%
+ \def\FCD@defmacro%
+ {\toks@\expandafter{#2}%
+ \edef\x{\endgroup\def\noexpand#2{\the\toks@}%
+ \begingroup\def\noexpand\@currenvir{\@currenvir}}%
+ \x}%
+ \FCD@global\let#2\@empty%
+ \if@filesw%
\openin\@inputcheck#1 %
\ifeof\@inputcheck%
\@latex@warning@no@line%
@@ -45,11 +52,11 @@
{Overwriting file `\@currdir#1'}%
\fi%
\closein\@inputcheck%
- \chardef\reserved@c15 %
- \ch@ck7\reserved@c\write%
- \immediate\openout\reserved@c#1\relax%
+ \chardef\FCD@reserved@c15 %
+ \ch@ck7\FCD@reserved@c\write%
+ \immediate\openout\FCD@reserved@c#1\relax%
\if@tempswa%
- \immediate\write\reserved@c{%
+ \immediate\write\FCD@reserved@c{%
\@percentchar\@percentchar\space%
\expandafter\@gobble\string\LaTeX2e file `#1'^^J%
\@percentchar\@percentchar\space generated by the %
@@ -58,6 +65,7 @@
\number\year/\two@digits\month/\two@digits\day.^^J%
\@percentchar\@percentchar}%
\fi%
+ \fi%
\let\do\@makeother\dospecials%
\count@=128\relax%
\loop%
@@ -71,24 +79,32 @@
\ifnum\count@<\@cclvi%
\repeat%
\let^^L\relax%
- \edef\E{\@backslashchar end\string{\@currenvir\string}}%
- \edef\reserved@b{\def\noexpand\reserved@b####1\E####2\E####3\relax}%
- \reserved@b{%
+ \edef\FCD@E{\@backslashchar end\string{\@currenvir\string}}%
+ \edef\FCD@reserved@b{\def\noexpand\FCD@reserved@b####1\FCD@E####2\FCD@E####3\relax}%
+ \FCD@reserved@b{%
\ifx\relax##3\relax%
- \immediate\write\reserved@c{##1}%
+ \if@filesw%
+ \let^^L\FCDformfeedtofile%
+ \let^^I\FCDtabtofile%
+ \immediate\write\FCD@reserved@c{##1}%
+ \fi%
\toks@\expandafter{#2}%
- {\def^^L{\noexpand^^M\noexpand^^M}\lowercase{\let^^I~}%
- \xdef#2{\the\toks@##1\noexpand^^M}}%
+ \let^^L\FCDformfeedtomacro%
+ \let^^I\FCDtabtomacro%
+ \FCD@global\edef#2{\the\toks@##1\noexpand^^M}%
\else%
\edef^^M{\noexpand\end{\@currenvir}}%
\ifx\relax##1\relax%
\else%
- \@latex@warning{Writing text `##1' before %
- \string\end{\@currenvir}\MessageBreak as last line of #1}%
- \immediate\write\reserved@c{##1}%
+ \if@filesw%
+ \let^^L\FCDformfeedtofile%
+ \let^^I\FCDtabtofile%
+ \immediate\write\FCD@reserved@c{##1}%
+ \fi%
\toks@\expandafter{#2}%
- {\def^^L{\noexpand^^M\noexpand^^M}\lowercase{\let^^I~}%
- \xdef#2{\the\toks@##1\noexpand^^M}}%
+ \let^^L\FCDformfeedtomacro%
+ \let^^I\FCDtabtomacro%
+ \FCD@global\edef#2{\the\toks@##1\noexpand\empty\noexpand^^M}%
\fi%
\ifx\relax##2\relax%
\else%
@@ -98,39 +114,81 @@
\fi%
^^M}%
\catcode`\^^L\active%
- \let\L\@undefined%
- \def^^L{\@ifundefined L^^J^^J^^J}%
\catcode`\^^I\active%
- \let\I\@undefined%
- \def^^I{\@ifundefined I\space\space}%
\catcode`\^^M\active%
- \edef^^M##1^^M{\noexpand\reserved@b##1\E\E\relax}%
+ \edef^^M##1^^M{\noexpand\FCD@reserved@b##1\FCD@E\FCD@E\relax}%
\catcode32\active\lccode`~32 \lowercase{\def~{\noexpand~}}%
}%
-\endgroup
+\gdef\FCDformfeedtofile{^^J^^J}%
+\gdef\FCDformfeedtomacro{\noexpand^^M\noexpand^^M}%
+\gdef\FCDtabtofile{ }%
+\catcode32\active\gdef\FCDtabtomacro{\noexpand }%
+\endgroup%
+\long\def\FCD@get@aux#1\FCD@get@aux#2{#2}%
+\def\FCD@get#1#2%
+{%
+ \def\FCD@tempa{#1}\def\FCD@tempb{{#2}}%
+ \expandafter\FCD@get@aux\@gobbletwo#2\FCD@get@aux
+ \@thirdofthree
+ \FCD@get@aux
+ {\ifcat\relax\noexpand#2\expandafter\@gobble\else\expandafter\@firstofone\fi}%
+ {\edef\FCD@tempb{{\expandafter\noexpand\csname#2\endcsname}}}%
+ \expandafter\FCD@tempa\FCD@tempb
+}%
\begingroup
\catcode`\*=11
-\gdef\filecontentsdef {\@tempswatrue\filec@ntentsdef}%
-\gdef\filecontentsdef*{\@tempswafalse\filec@ntentsdef}%
-\global\let\endfilecontentsdef \endfilecontents
-\global\let\endfilecontentsdef*\endfilecontents
-\gdef\filecontentshere #1{\@tempswatrue
- \filec@ntentsdef{#1}\filecontentsheremacro}%
-\gdef\filecontentshere*#1{\@tempswafalse
- \filec@ntentsdef{#1}\filecontentsheremacro}%
-\gdef\endfilecontentshere{\endfilecontentsdef\aftergroup\filecontents@verbatim}%
+\gdef\filecontentsdef #1{\let\FCD@global\@empty
+ \@tempswatrue\FCD@get{\FCD@main{#1}}}%
+\gdef\filecontentsdef*#1{\let\FCD@global\@empty
+ \@tempswafalse\FCD@get{\FCD@main{#1}}}%
+\global\let\filecontentsdefstarred\filecontentsdef*
+\gdef\filecontentsgdef #1{\@tempswatrue\FCD@get{\FCD@main{#1}}}%
+\gdef\filecontentsgdef*#1{\@tempswafalse\FCD@get{\FCD@main{#1}}}%
+\global\let\filecontentsgdefstarred\filecontentsgdef*
+\gdef\endfilecontentsdef{\immediate\closeout\FCD@reserved@c\FCD@defmacro}%
+\global\let\endfilecontentsdef*\endfilecontentsdef
+\global\let\endfilecontentsdefstarred\endfilecontentsdef
+\gdef\endfilecontentsgdef{\immediate\closeout\FCD@reserved@c}%
+\global\let\endfilecontentsgdef*\endfilecontentsgdef
+\global\let\endfilecontentsgdefstarred\endfilecontentsgdef
+\gdef\filecontentsdefmacro{\let\FCD@global\@empty
+ \@fileswfalse\FCD@get{\FCD@main{}}}%
+\gdef\endfilecontentsdefmacro{\FCD@defmacro}%
+\gdef\filecontentsgdefmacro{\@fileswfalse\FCD@get{\FCD@main{}}}%
+\global\let\endfilecontentsgdefmacro\relax
+\gdef\filecontentshere #1{\let\FCD@global\@empty
+ \@tempswatrue\FCD@main{#1}\filecontentsheremacro}%
+\gdef\filecontentshere*#1{\let\FCD@global\@empty
+ \@tempswafalse\FCD@main{#1}\filecontentsheremacro}%
+\global\let\filecontentsherestarred\filecontentshere*
+\gdef\endfilecontentshere{\endfilecontentsdef\aftergroup\FCD@here}%
\global\let\endfilecontentshere*\endfilecontentshere
+\global\let\endfilecontentsherestarred\endfilecontentshere
+\gdef\filecontentsprint{\FCD@get\FCD@print}%
\catcode`\^^M\active%
-\gdef\filecontentsprint #1{\let\filecontentsprint@EOL^^M\let^^M\relax%
- \begingroup\toks@\expandafter{#1}\edef\x{\endgroup%
- \noexpand\begin{verbatim}^^M%
- \the\toks@\@backslashchar end\string{verbatim\string}}\x^^M%
- \filecontentsprint@resetEOL}%
-\gdef\filecontentsprint@resetEOL{\let^^M\filecontentsprint@EOL}%
+\gdef\FCD@print #1{\let\FCD@print@EOL^^M\let^^M\relax%
+ \begingroup\toks@\expandafter{#1}%
+ \edef\x{\endgroup%
+ \noexpand\begin{\FCDprintenvname}\FCDprintenvoptions^^M%
+ \the\toks@\@backslashchar end\string{\FCDprintenvname\string}}%
+ \x^^M%
+ \FCD@print@resetEOL}%
+\gdef\FCD@print@resetEOL{\let^^M\FCD@print@EOL}%
+\gdef\filecontentsprintviascan{\FCD@get\FCD@printviascan}%
+\gdef\FCD@printviascan#1{%
+ \toks@\expandafter{#1}%
+ \edef\FCD@envwithcontents{%
+ \noexpand\begin{\FCDprintenvname}\FCDprintenvoptions\noexpand^^M%
+ \the\toks@\@backslashchar end{\FCDprintenvname}\noexpand^^M}%
+ \FCD@exec\FCD@envwithcontents}%
\endgroup
-\def\filecontents@verbatim {\filecontentsprint\filecontentsheremacro}%
-\def\filecontentsexec #1{\newlinechar13
- \scantokens\expandafter{#1}\newlinechar10\relax}%
+\def\FCDprintenvname{verbatim}%
+\let\FCDprintenvoptions\@empty
+\def\FCD@here{\FCD@print\filecontentsheremacro}%
+\def\filecontentsexec{\FCD@get\FCD@exec}%
+\def\FCD@exec #1{\edef\FCD@newlinechar{\the\newlinechar}%
+ \newlinechar13
+ \scantokens\expandafter{#1}\newlinechar\FCD@newlinechar\relax}%
\endinput
%%
%% End of file `filecontentsdef.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/filecontentsdef.tlpobj new/tlpkg/tlpobj/filecontentsdef.tlpobj
--- old/tlpkg/tlpobj/filecontentsdef.tlpobj 2019-02-28 03:36:59.000000000 +0100
+++ new/tlpkg/tlpobj/filecontentsdef.tlpobj 2019-09-30 01:54:37.000000000 +0200
@@ -1,6 +1,6 @@
name filecontentsdef
category Package
-revision 42107
+revision 52208
shortdesc filecontents + macro + verbatim
relocated 1
longdesc The package provides two environments called filecontentsdef
@@ -18,7 +18,7 @@
RELOC/tex/latex/filecontentsdef/filecontentsdef.sty
catalogue-also filecontents
catalogue-ctan /macros/latex/contrib/filecontentsdef
-catalogue-date 2016-09-23 11:17:19 +0200
+catalogue-date 2019-09-29 13:17:23 +0200
catalogue-license lppl1.3
catalogue-topics file-mgmt
-catalogue-version 1.2
+catalogue-version 1.5
++++++ filehook.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/filehook/README new/doc/latex/filehook/README
--- old/doc/latex/filehook/README 2011-09-06 01:29:01.000000000 +0200
+++ new/doc/latex/filehook/README 2020-02-03 23:31:24.000000000 +0100
@@ -1,7 +1,6 @@
LaTeX package 'filehook'
~~~~~~~~~~~~~~~~~~~~~~~~
-Copyright (c) 2010-2011 by Martin Scharrer <martin(a)scharrer-online.de>
-WWW: http://latex.scharrer-online.de/
+Copyright (c) 2010-2020 by Martin Scharrer <martin(a)scharrer-online.de>
Code repository: https://bitbucket.org/martin_scharrer/filehook
Provides several file hooks for files read by \input, \include and \InputIfFileExists.
Binary files old/doc/latex/filehook/filehook.pdf and new/doc/latex/filehook/filehook.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/filehook.doc.tlpobj new/tlpkg/tlpobj/filehook.doc.tlpobj
--- old/tlpkg/tlpobj/filehook.doc.tlpobj 2019-02-28 03:36:59.000000000 +0100
+++ new/tlpkg/tlpobj/filehook.doc.tlpobj 2020-02-04 01:55:01.000000000 +0100
@@ -1,8 +1,8 @@
name filehook.doc
category Package
-revision 24280
+revision 53655
shortdesc doc files of filehook
relocated 1
-docfiles size=65
+docfiles size=66
RELOC/doc/latex/filehook/README
RELOC/doc/latex/filehook/filehook.pdf
++++++ filehook.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/filehook/filehook-fink.sty new/tex/latex/filehook/filehook-fink.sty
--- old/tex/latex/filehook/filehook-fink.sty 2011-09-06 01:29:01.000000000 +0200
+++ new/tex/latex/filehook/filehook-fink.sty 2020-02-03 23:31:24.000000000 +0100
@@ -1,25 +1,24 @@
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin(a)scharrer-online.de>
-%% -----------------------------------------------------------------
-%%
+%% Copyright (C) 2011-2020 by Martin Scharrer <martin(a)scharrer-online.de>
+%% ----------------------------------------------------------------------
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
+%% 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.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
+%% 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 Martin Scharrer.
%%
-%% This work consists of the files filehook.dtx, filehook.ins
-%% and the derived file filehook.sty.
+%% This work consists of the files filehook.dtx and filehook.ins
+%% and the derived files filehook.sty, filehook-fink.sty,
+%% filehook-listings.sty, filehook-memoir.sty, filehook-scrlfile.sty
+%% and pgf-filehook.sty
%%
-%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
-\ProvidesPackage{filehook-fink}[2011/01/03 v0.1 filehook compatibility code for fink package]
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{filehook-fink}[011/01/03 v0.1 filehook compatibility code for fink package]
\RequirePackage{filehook}
\RequirePackage{currfile}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/filehook/filehook-listings.sty new/tex/latex/filehook/filehook-listings.sty
--- old/tex/latex/filehook/filehook-listings.sty 2011-09-06 01:29:01.000000000 +0200
+++ new/tex/latex/filehook/filehook-listings.sty 2020-02-03 23:31:24.000000000 +0100
@@ -1,24 +1,23 @@
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin(a)scharrer-online.de>
-%% -----------------------------------------------------------------
-%%
+%% Copyright (C) 2011-2020 by Martin Scharrer <martin(a)scharrer-online.de>
+%% ----------------------------------------------------------------------
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
+%% 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.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
+%% 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 Martin Scharrer.
%%
-%% This work consists of the files filehook.dtx, filehook.ins
-%% and the derived file filehook.sty.
+%% This work consists of the files filehook.dtx and filehook.ins
+%% and the derived files filehook.sty, filehook-fink.sty,
+%% filehook-listings.sty, filehook-memoir.sty, filehook-scrlfile.sty
+%% and pgf-filehook.sty
%%
-%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{filehook-listings}[2011/01/02 v0.1 Patch for listings to avoid hooks for verbatim input files]
\begingroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/filehook/filehook-memoir.sty new/tex/latex/filehook/filehook-memoir.sty
--- old/tex/latex/filehook/filehook-memoir.sty 2011-09-06 01:29:01.000000000 +0200
+++ new/tex/latex/filehook/filehook-memoir.sty 2020-02-03 23:31:24.000000000 +0100
@@ -1,51 +1,67 @@
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin(a)scharrer-online.de>
-%% -----------------------------------------------------------------
-%%
+%% Copyright (C) 2011-2020 by Martin Scharrer <martin(a)scharrer-online.de>
+%% ----------------------------------------------------------------------
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
+%% 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.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
+%% 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 Martin Scharrer.
%%
-%% This work consists of the files filehook.dtx, filehook.ins
-%% and the derived file filehook.sty.
+%% This work consists of the files filehook.dtx and filehook.ins
+%% and the derived files filehook.sty, filehook-fink.sty,
+%% filehook-listings.sty, filehook-memoir.sty, filehook-scrlfile.sty
+%% and pgf-filehook.sty
%%
-%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
-\ProvidesPackage{filehook-memoir}[2011/01/03 v0.1 filehook patch for memoir class]
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{filehook-memoir}[2020/02/02 v0.2 filehook patch for memoir class]
\RequirePackage{filehook}
\begingroup
-\long\def\memoir@InputIfFileExists#1#2{%
+\ifcsname InputIfFileExists\space\endcsname
+ \DeclareRobustCommand \memoir@InputIfFileExists[2]{%
+ \IfFileExists{#1}%
+ {%
+ \expandafter\@swaptwoargs\expandafter
+ {\@filef@und\m@matendf{#1}\killm@matf{#1}}{%
+ #2\@addtofilelist{#1}\m@matbeginf{#1}\@@input%
+ }%
+ }%
+ }
+\else
+ % Old definition
+\renewcommand{\memoir@InputIfFileExists}[2]{%
\IfFileExists{#1}%
{#2\@addtofilelist{#1}\m@matbeginf{#1}%
\@@input \@filef@und
\m@matendf{#1}%
\killm@matf{#1}}%
}
-\ifcase
- \ifx\InputIfFileExists\latex@InputIfFileExists 0\else
- \ifx\InputIfFileExists\memoir@InputIfFileExists 0\else
- 1%
- \fi\fi
-\relax
- \global\let\filehook@InputIfFileExists\filehook@default@InputIfFileExists
- \global\let\filehook@@InputIfFileExists\filehook@@default@InputIfFileExists
- \global\let\InputIfFileExists\filehook@InputIfFileExists
+\fi
+\@tempswafalse
+\filehook@cmp{InputIfFileExists}{filehook@InputIfFileExists}%
+ {\@tempswatrue}%
+ {%
+ \filehook@cmp{InputIfFileExists}{memoir@InputIfFileExists}%
+ {\@tempswatrue}%
+ {}%
+ }%
+
+\if@tempswa
+ \filehook@glet{filehook@InputIfFileExists}{filehook@default@InputIfFileExists}%
+ \filehook@glet{filehook@@InputIfFileExists}{filehook@@default@InputIfFileExists}%
+ \filehook@glet{InputIfFileExists}{filehook@InputIfFileExists}%
\filehook@appendwarg\filehook@atbegin{\m@matbeginf{#1}}%
\filehook@prefixwarg\filehook@atend{\m@matendf{#1}\killm@matf{#1}}%
\PackageInfo{filehook}{Detected 'memoir' class: the memoir hooks will be moved to the `At...OfFiles' hooks}
\else
\iffilehook@force
- \global\let\filehook@InputIfFileExists\filehook@default@InputIfFileExists
- \global\let\filehook@@InputIfFileExists\filehook@@default@InputIfFileExists
- \global\let\InputIfFileExists\filehook@InputIfFileExists
+ \filehook@glet{filehook@InputIfFileExists}{filehook@default@InputIfFileExists}%
+ \filehook@glet{filehook@@InputIfFileExists}{filehook@@default@InputIfFileExists}%
+ \filehook@glet{InputIfFileExists}{filehook@InputIfFileExists}%
\PackageWarning{filehook}{Detected 'memoir' class with unknown definition of \string\InputIfFileExists.^^J%
The 'force' option of 'filehook' is in effect. Macro is overwritten with default!}%
\else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/filehook/filehook-scrlfile.sty new/tex/latex/filehook/filehook-scrlfile.sty
--- old/tex/latex/filehook/filehook-scrlfile.sty 2011-09-06 01:29:01.000000000 +0200
+++ new/tex/latex/filehook/filehook-scrlfile.sty 2020-02-03 23:31:24.000000000 +0100
@@ -1,28 +1,30 @@
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin(a)scharrer-online.de>
-%% -----------------------------------------------------------------
-%%
+%% Copyright (C) 2011-2020 by Martin Scharrer <martin(a)scharrer-online.de>
+%% ----------------------------------------------------------------------
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
+%% 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.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
+%% 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 Martin Scharrer.
%%
-%% This work consists of the files filehook.dtx, filehook.ins
-%% and the derived file filehook.sty.
+%% This work consists of the files filehook.dtx and filehook.ins
+%% and the derived files filehook.sty, filehook-fink.sty,
+%% filehook-listings.sty, filehook-memoir.sty, filehook-scrlfile.sty
+%% and pgf-filehook.sty
%%
-%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
-\ProvidesPackage{filehook-scrlfile}[2011/01/03 v0.1 filehook patch for scrlfile package]
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesPackage{filehook-scrlfile}[2020/02/02 v0.2 filehook patch for scrlfile package]
\RequirePackage{filehook}
\begingroup
-\long\def\scrlfile@InputIfFileExists#1#2{%
+\expandafter\def\expandafter\sclrfile@InputIfFileExists\expandafter{%
+ \expandafter\protect\csname InputIfFileExists\space\endcsname
+}
+\expandafter\long\expandafter\def\csname scrlfile@InputIfFileExists\space\endcsname#1#2{%
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname #1-@alias\endcsname\relax
\expandafter\@secondoftwo
@@ -32,16 +34,13 @@
\fi
{%
\expandafter\InputIfFileExists\expandafter{\csname
- #1-@alias\endcsname}{#2}%
+#1-@alias\endcsname}{#2}%
}%
{\IfFileExists{#1}{%
- \scr@load@hook{before}{#1}%
- #2\@addtofilelist{#1}%
- \@@input \@filef@und
- \scr@load@hook{after}{#1}%
- }}%
+ \expandafter\scr@input@withhook\expandafter{\@filef@und}{#1}{#2}}%
+ }%
}
-\long\def\filehook@scrlfile@InputIfFileExists#1#2{%
+\DeclareRobustCommand\filehook@scrlfile@InputIfFileExists[2]{%
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname #1-@alias\endcsname\relax
\expandafter\@secondoftwo
@@ -66,8 +65,9 @@
\scr@load@hook{after}{#1}%
}}%
}
-\long\def\filehook@@scrlfile@InputIfFileExists#1#2{%
- \let\InputIfFileExists\filehook@InputIfFileExists
+\filehook@glet{filehook@scrlfile@InputIfFileExists}{filehook@scrlfile@InputIfFileExists}%
+\DeclareRobustCommand\filehook@@scrlfile@InputIfFileExists[2]{%
+ \filehook@let{InputIfFileExists}{filehook@InputIfFileExists}%
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname #1-@alias\endcsname\relax
\expandafter\@secondoftwo
@@ -90,21 +90,26 @@
\scr@load@hook{after}{#1}%
}}%
}
-\ifcase
- \ifx\InputIfFileExists\latex@InputIfFileExists 0\else
- \ifx\InputIfFileExists\scrlfile@InputIfFileExists 0\else
- 1%
- \fi\fi
-\relax
- \global\let\filehook@InputIfFileExists\filehook@scrlfile@InputIfFileExists
- \global\let\filehook@@InputIfFileExists\filehook@@scrlfile@InputIfFileExists
- \global\let\InputIfFileExists\filehook@InputIfFileExists
+\filehook@glet{filehook@@scrlfile@InputIfFileExists}{filehook@@scrlfile@InputIfFileExists}%
+\@tempswafalse
+\filehook@cmp{InputIfFileExists}{filehook@InputIfFileExists}%
+ {\@tempswatrue}%
+ {%
+ \filehook@cmp{InputIfFileExists}{scrlfile@InputIfFileExists}%
+ {\@tempswatrue}%
+ {}%
+ }%
+
+\if@tempswa
+ \filehook@glet{filehook@InputIfFileExists}{filehook@scrlfile@InputIfFileExists}%
+ \filehook@glet{filehook@@InputIfFileExists}{filehook@@scrlfile@InputIfFileExists}%
+ \filehook@glet{InputIfFileExists}{filehook@InputIfFileExists}%
\PackageInfo{filehook}{Package 'scrlfile' detected and compensated for}%
\else
\iffilehook@force
- \global\let\filehook@InputIfFileExists\filehook@default@InputIfFileExists
- \global\let\filehook@@InputIfFileExists\filehook@@default@InputIfFileExists
- \global\let\InputIfFileExists\filehook@InputIfFileExists
+ \filehook@glet{filehook@InputIfFileExists}{filehook@scrlfile@InputIfFileExists}%
+ \filehook@glet{filehook@@InputIfFileExists}{filehook@@scrlfile@InputIfFileExists}%
+ \filehook@glet{InputIfFileExists}{filehook@InputIfFileExists}%
\PackageWarning{filehook}{Detected 'scrlfile' package with unknown definition of \string\InputIfFileExists.^^J%
The 'force' option of 'filehook' is in effect. Macro is overwritten with default!}%
\else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/filehook/filehook.sty new/tex/latex/filehook/filehook.sty
--- old/tex/latex/filehook/filehook.sty 2011-10-14 00:43:52.000000000 +0200
+++ new/tex/latex/filehook/filehook.sty 2020-02-03 23:31:24.000000000 +0100
@@ -1,30 +1,63 @@
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin(a)scharrer-online.de>
-%% -----------------------------------------------------------------
-%%
+%% Copyright (C) 2011-2020 by Martin Scharrer <martin(a)scharrer-online.de>
+%% ----------------------------------------------------------------------
%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
+%% 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.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
+%% 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 Martin Scharrer.
%%
-%% This work consists of the files filehook.dtx, filehook.ins
-%% and the derived file filehook.sty.
+%% This work consists of the files filehook.dtx and filehook.ins
+%% and the derived files filehook.sty, filehook-fink.sty,
+%% filehook-listings.sty, filehook-memoir.sty, filehook-scrlfile.sty
+%% and pgf-filehook.sty
%%
-%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{filehook}
- [2011/10/12 v0.5d Hooks for input files]
+\ProvidesPackage{filehook}[%
+ 2020/02/03
+ v0.7
+ Hooks for input files]
\newif\iffilehook@force
\DeclareOption{force}{\filehook@forcetrue}
\ProcessOptions\relax
+\newif\iffilehook@newfmt
+\@ifl@t@r\fmtversion{2019/10/01}{\filehook@newfmttrue}{\filehook@newfmtfalse}
+\def\filehook@let#1#2{%
+ \expandafter\ifx\csname #2\space\endcsname\relax
+ \expandafter\let\csname #1\expandafter\endcsname\csname #2\endcsname
+ \else
+ \expandafter\def\csname #1\expandafter\endcsname\expandafter{\expandafter\protect\csname #1\space\endcsname}%
+ \expandafter\let\csname #1\space\expandafter\endcsname\csname #2\space\endcsname
+ \fi
+}
+\def\filehook@glet#1#2{%
+ \expandafter\ifx\csname #2\space\endcsname\relax
+ \expandafter\global\expandafter\let\csname #1\expandafter\endcsname\csname #2\endcsname
+ \else
+ \expandafter\global\expandafter\def\csname #1\expandafter\endcsname\expandafter{\expandafter\protect\csname #1\space\endcsname}%
+ \expandafter\global\expandafter\let\csname #1\space\expandafter\endcsname\csname #2\space\endcsname
+ \fi
+}
+\def\filehook@cmp#1#2{%
+ \expandafter\ifx\csname #2\space\endcsname\relax
+ \expandafter\ifx\csname #1\expandafter\endcsname\csname #2\endcsname
+ \expandafter\expandafter\expandafter\@firstoftwo
+ \else
+ \expandafter\expandafter\expandafter\@secondoftwo
+ \fi
+ \else
+ \expandafter\ifx\csname #1\space\expandafter\endcsname\csname #2\space\endcsname
+ \expandafter\expandafter\expandafter\@firstoftwo
+ \else
+ \expandafter\expandafter\expandafter\@secondoftwo
+ \fi
+ \fi
+}
\begingroup
\gdef\filehook@csuse#1{\ifcsname #1\endcsname\csname #1\expandafter\endcsname\fi}
\expandafter\ifx\csname csuse\endcsname\relax
@@ -36,7 +69,7 @@
\fi
\endgroup
\def\filehook@include@atbegin#1{%
- \let\InputIfFileExists\filehook@@InputIfFileExists
+ \filehook@let{InputIfFileExists}{filehook@@InputIfFileExists}%
\filehook@csuse{\filehook@include@atbegin@#1}%
\filehook@include@@atbegin
}
@@ -52,7 +85,7 @@
}
\def\filehook@include@@after{}
\def\filehook@input@atbegin#1{%
- \let\InputIfFileExists\filehook@@InputIfFileExists
+ \filehook@let{InputIfFileExists}{filehook@@InputIfFileExists}%
\filehook@csuse{\filehook@input@atbegin@\filehook@ensureext{#1}}%
\filehook@input@@atbegin
}
@@ -245,13 +278,24 @@
\expandafter\filehook@@ensuretex#1\empty.tex\empty\empty
}
\def\filehook@@ensuretex#1.tex\empty#2\empty{#1.tex}
+\iffilehook@newfmt
+\expandafter\def\expandafter\latex@InputIfFileExists\expandafter{%
+ \expandafter\protect\csname InputIfFileExists\space\endcsname
+}
+\expandafter\long\expandafter\def\csname latex@InputIfFileExists\space\endcsname#1#2{%
+ \IfFileExists{#1}%
+ {%
+ \expandafter\@swaptwoargs\expandafter
+ {\@filef@und}{#2\@addtofilelist{#1}\@@input}}}
+\else
\long\def\latex@InputIfFileExists#1#2{%
\IfFileExists{#1}%
{#2\@addtofilelist{#1}%
\@@input\@filef@und
}%
}
-\long\gdef\filehook@default@InputIfFileExists#1#2{%
+\fi
+\DeclareRobustCommand\filehook@default@InputIfFileExists[2]{%
\IfFileExists{#1}%
{\expandafter\filehook@swap
\expandafter{\@filef@und}%
@@ -263,8 +307,9 @@
\filehook@every@atend{#1}%
}%
}
-\long\gdef\filehook@@default@InputIfFileExists#1#2{%
- \let\InputIfFileExists\filehook@InputIfFileExists
+\filehook@glet{filehook@default@InputIfFileExists}{filehook@default@InputIfFileExists}%
+\DeclareRobustCommand\filehook@@default@InputIfFileExists[2]{%
+ \filehook@let{InputIfFileExists}{filehook@InputIfFileExists}%
\IfFileExists{#1}%
{\expandafter\filehook@swap
\expandafter{\@filef@und}%
@@ -274,76 +319,9 @@
\filehook@atend{#1}%
}%
}
-\long\def\scrlfile@InputIfFileExists#1#2{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname #1-@alias\endcsname\relax
- \expandafter\@secondoftwo
- \else
- \scr@replacefile@msg{\csname #1-@alias\endcsname}{#1}%
- \expandafter\@firstoftwo
- \fi
- {%
- \expandafter\InputIfFileExists\expandafter{\csname
- #1-@alias\endcsname}{#2}%
- }%
- {\IfFileExists{#1}{%
- \scr@load@hook{before}{#1}%
- #2\@addtofilelist{#1}%
- \@@input \@filef@und
- \scr@load@hook{after}{#1}%
- }}%
-}
-\long\def\filehook@scrlfile@InputIfFileExists#1#2{%
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname #1-@alias\endcsname\relax
- \expandafter\@secondoftwo
- \else
- \scr@replacefile@msg{\csname #1-@alias\endcsname}{#1}%
- \expandafter\@firstoftwo
- \fi
- {%
- \expandafter\InputIfFileExists\expandafter{\csname
- #1-@alias\endcsname}{#2}%
- }%
- {\IfFileExists{#1}{%
- \expandafter\filehook@swap
- \expandafter{\@filef@und}%
- {\scr@load@hook{before}{#1}%
- #2\@addtofilelist{#1}%
- \filehook@every@atbegin{#1}%
- \filehook@atbegin{#1}%
- \@@input}%
- \filehook@atend{#1}%
- \filehook@every@atend{#1}%
- \scr@load@hook{after}{#1}%
- }}%
-}
-\long\def\filehook@@scrlfile@InputIfFileExists#1#2{%
- \let\InputIfFileExists\filehook@InputIfFileExists
- \begingroup\expandafter\expandafter\expandafter\endgroup
- \expandafter\ifx\csname #1-@alias\endcsname\relax
- \expandafter\@secondoftwo
- \else
- \scr@replacefile@msg{\csname #1-@alias\endcsname}{#1}%
- \expandafter\@firstoftwo
- \fi
- {%
- \expandafter\InputIfFileExists\expandafter{\csname
- #1-@alias\endcsname}{#2}%
- }%
- {\IfFileExists{#1}{%
- \expandafter\filehook@swap
- \expandafter{\@filef@und}%
- {\scr@load@hook{before}{#1}%
- #2\@addtofilelist{#1}%
- \filehook@atbegin{#1}%
- \@@input}%
- \filehook@atend{#1}%
- \scr@load@hook{after}{#1}%
- }}%
-}
-\AtBeginOfPackageFile*{scrlfile}{%
- \let\InputIfFileExists\latex@InputIfFileExists
+\filehook@glet{filehook@@default@InputIfFileExists}{filehook@@default@InputIfFileExists}%
+\AtBeginOfPackageFile{scrlfile}{%
+ \filehook@glet{InputIfFileExists}{latex@InputIfFileExists}%
}%
\AtEndOfPackageFile*{scrlfile}{%
\RequirePackage{filehook-scrlfile}%
@@ -351,46 +329,50 @@
\AtBeginOfPackageFile*{fink}{%
\RequirePackage{kvoptions}%
\begingroup
- \let\InputIfFileExists\latex@InputIfFileExists
+ \filehook@let{InputIfFileExists}{latex@InputIfFileExists}%
}%
\AtEndOfPackageFile*{fink}{%
\edef\@tempa{\noexpand\PassOptionsToPackage{mainext=\fnk@mainext,maindir=\fnk@maindir}{currfile}}%
\expandafter\endgroup\@tempa
\RequirePackage{filehook-fink}%
}%
-\AtBeginOfClassFile*{memoir}{%
- \let\filehook@@InputIfFileExists\latex@InputIfFileExists
- \let\InputIfFileExists\latex@InputIfFileExists
+\AtBeginOfClassFile{memoir}{%
+ \filehook@let{InputIfFileExists}{latex@InputIfFileExists}%
\let\@iinput\filehook@orig@@iinput
}%
\AtEndOfClassFile*{memoir}{%
\let\@iinput\filehook@@iinput
\RequirePackage{filehook-memoir}%
}%
-\ifcase
- \ifx\InputIfFileExists\filehook@InputIfFileExists 0\else
- \ifx\InputIfFileExists\latex@InputIfFileExists 1\else
- \iffilehook@force 1\else
- 9%
- \fi\fi\fi
-\relax% 0
-\or% 1
- \let\filehook@InputIfFileExists\filehook@default@InputIfFileExists
- \let\filehook@@InputIfFileExists\filehook@@default@InputIfFileExists
- \let\InputIfFileExists\filehook@InputIfFileExists
- \iffilehook@force
- \PackageWarning{filehook}{Detected unknown definition of \string\InputIfFileExists.^^J%
- The 'force' option of 'filehook' is in effect. Macro is overwritten with default!}%
- \fi
-\else
- \PackageError{filehook}{Detected unknown definition of \string\InputIfFileExists.^^J%
- Use the 'force' option of 'filehook' to overwrite it.}{}%
-\fi
+\filehook@cmp{InputIfFileExists}{filehook@InputIfFileExists}%
+ {}% already set up
+ {%
+ \filehook@cmp{InputIfFileExists}{latex@InputIfFileExists}%
+ {%
+ \filehook@let{filehook@InputIfFileExists}{filehook@default@InputIfFileExists}%
+ \filehook@let{filehook@@InputIfFileExists}{filehook@@default@InputIfFileExists}%
+ \filehook@let{InputIfFileExists}{filehook@InputIfFileExists}%
+ }%
+ {%
+ \iffilehook@force
+ \filehook@let{filehook@InputIfFileExists}{filehook@default@InputIfFileExists}%
+ \filehook@let{filehook@@InputIfFileExists}{filehook@@default@InputIfFileExists}%
+ \filehook@let{InputIfFileExists}{filehook@InputIfFileExists}%
+ \PackageWarning{filehook}{Detected unknown definition of \string\InputIfFileExists.^^J%
+ The 'force' option of 'filehook' is in effect. Macro is overwritten with default!}%
+ \else
+ \PackageError{filehook}{Detected unknown definition of \string\InputIfFileExists.^^J%
+ Use the 'force' option of 'filehook' to overwrite it.}{}%
+ \fi
+ }%
+ }%
\AtBeginDocument{%
- \ifx\InputIfFileExists\filehook@InputIfFileExists\else
+ % Check if definition got changed again. For the new LaTeX format we check again \InputIfFileExists<space>,
+ % for the old format to \InputIfFileExists directly.
+ \filehook@cmp{InputIfFileExists}{filehook@InputIfFileExists}{}{%
\PackageWarning{filehook}{Macro \string\InputIfFileExists\space got redefined after 'filehook' was loaded.^^J%
- Certain file hooks might now be dysfunctional!}
- \fi
+ Certain file hooks might now be dysfunctional!}%
+ }%
}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/filehook/pgf-filehook.sty new/tex/latex/filehook/pgf-filehook.sty
--- old/tex/latex/filehook/pgf-filehook.sty 2011-09-06 01:29:01.000000000 +0200
+++ new/tex/latex/filehook/pgf-filehook.sty 2019-08-19 22:57:51.000000000 +0200
@@ -1,24 +1,3 @@
-%% Copyright (c) 2010-2011 by Martin Scharrer <martin(a)scharrer-online.de>
-%% -----------------------------------------------------------------
-%%
-%% 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 2008/05/04 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%%
-%% The Current Maintainer of this work is Martin Scharrer.
-%%
-%% This work consists of the files filehook.dtx, filehook.ins
-%% and the derived file filehook.sty.
-%%
-%% $Id: filehook.dtx 2504 2011-07-18 17:22:50Z martin $
\ProvidesPackage{pgf-filehook}[2010/01/07 v1.0 PGF keys for the filehook package]
\RequirePackage{filehook}
\RequirePackage{pgfkeys}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/filehook.tlpobj new/tlpkg/tlpobj/filehook.tlpobj
--- old/tlpkg/tlpobj/filehook.tlpobj 2019-02-28 03:36:59.000000000 +0100
+++ new/tlpkg/tlpobj/filehook.tlpobj 2020-02-04 01:55:01.000000000 +0100
@@ -1,23 +1,23 @@
name filehook
category Package
-revision 24280
+revision 53655
shortdesc Hooks for input files
relocated 1
longdesc The package provides several file hooks (AtBegin, AtEnd, ...)
longdesc for files read by \input, \include and \InputIfFileExists.
-longdesc General hooks for all such files (e.g. all \include'd ones) and
+longdesc General hooks for all such files (e.g. all \included ones) and
longdesc file specific hooks only used for named files are provided; two
longdesc hooks are provided for the end of \included files -- one
longdesc before, and one after the final \clearpage.
-runfiles size=9
+runfiles size=10
RELOC/tex/latex/filehook/filehook-fink.sty
RELOC/tex/latex/filehook/filehook-listings.sty
RELOC/tex/latex/filehook/filehook-memoir.sty
RELOC/tex/latex/filehook/filehook-scrlfile.sty
RELOC/tex/latex/filehook/filehook.sty
RELOC/tex/latex/filehook/pgf-filehook.sty
+catalogue-contact-bugs https://bitbucket.org/martin_scharrer/filehook/issues
catalogue-ctan /macros/latex/contrib/filehook
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics macro-supp
-catalogue-version 0.5d
+catalogue-version 0.7
++++++ fira.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fira/README new/doc/fonts/fira/README
--- old/doc/fonts/fira/README 2019-04-05 23:02:17.000000000 +0200
+++ new/doc/fonts/fira/README 2019-10-11 23:13:56.000000000 +0200
@@ -1,16 +1,16 @@
-This is the README for the fira package, version 4.3-2019-04-04.
+This is the README for the fira package, version 4.3-2019-10-10.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
support for the Fira Sans family of fonts (version 4.3)
-and the Fira Mono family (version 3.2),
-designed by Erik Spiekermann and Ralph du Carrois of
-Carrois Type Design. Fira Sans is available in seventeen
-weights, but six of these are considered "experimental"; the
-remaining eleven weights (with corresponding italics) are
-supported with this package: Thin, UltraLight, ExtraLight,
-Light, Book, Regular, Medium, SemiBold, Bold, ExtraBold,
-Heavy. Fira Mono is available in three weights (regular, medium, bold);
-there are no italics.
+and the Fira Mono family (version 3.2), designed by Erik
+Spiekermann and Ralph du Carrois of Carrois Type Design.
+Fira Sans is available in seventeen weights, but six of
+these are considered "experimental"; the remaining eleven
+weights (with corresponding italics) are supported with
+this package: Thin, UltraLight, ExtraLight, Light, Book,
+Regular, Medium, SemiBold, Bold, ExtraBold, Heavy. Fira
+Mono is available in three weights (regular, medium, bold);
+artificially slanted oblique varints have been generated.
To install this package on a TDS-compliant TeX system
download the file "tex-archive"/install/fonts/fira.tds.zip
Binary files old/doc/fonts/fira/fira-samples.pdf and new/doc/fonts/fira/fira-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/fira/fira-samples.tex new/doc/fonts/fira/fira-samples.tex
--- old/doc/fonts/fira/fira-samples.tex 2018-05-24 23:29:44.000000000 +0200
+++ new/doc/fonts/fira/fira-samples.tex 2019-06-04 23:14:17.000000000 +0200
@@ -10,6 +10,7 @@
\subsection*{Regular}
\lipsum[1]
+
\textit{\lipsum[2]}
\subsection*{Bold}
@@ -124,14 +125,24 @@
\lipsum[1]
+\subsection*{Oblique}
+
+\textsl{\lipsum[1]}
+
\subsection*{Bold}
-\ttfamily
\textbf{\lipsum[3]}
+\subsection*{Bold Oblique}
+
+\textbf{\textsl{\lipsum[3]}}
+
\subsection*{Medium}
{\firamonomedium\lipsum[8]}
+\subsection*{Medium Oblique}
+{\firamonomedium\textsl{\lipsum[8]}}
+
\subsection*{Default Numbers}
1234567890
@@ -155,4 +166,8 @@
A B G D E Z H J I K L M N X O P R S T U F Q Y W
}
+\subsection*{Mono Non-Ligatures}
+
+Officially broken off. Often offline, find me flowerless.
+
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fira.doc.tlpobj new/tlpkg/tlpobj/fira.doc.tlpobj
--- old/tlpkg/tlpobj/fira.doc.tlpobj 2019-04-06 23:32:41.000000000 +0200
+++ new/tlpkg/tlpobj/fira.doc.tlpobj 2020-03-24 01:57:40.000000000 +0100
@@ -1,9 +1,9 @@
name fira.doc
category Package
-revision 50781
+revision 54512
shortdesc doc files of fira
relocated 1
-docfiles size=323
+docfiles size=328
RELOC/doc/fonts/fira/Fira_4_3_Change_Log.pdf
RELOC/doc/fonts/fira/LICENSE
RELOC/doc/fonts/fira/README
++++++ fira.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-i/fira.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-i.new.3606/fira.tar.xz differ: char 26, line 1
++++++ firamath.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/firamath/README.md new/doc/fonts/firamath/README.md
--- old/doc/fonts/firamath/README.md 2018-10-26 22:47:42.000000000 +0200
+++ new/doc/fonts/firamath/README.md 2020-01-13 22:24:30.000000000 +0100
@@ -39,4 +39,4 @@
-----
-Copyright (C) 2018 by Xiangdong Zeng <xdzeng96(a)gmail.com>.
+Copyright (C) 2018–2020 by Xiangdong Zeng <xdzeng96(a)gmail.com>.
Binary files old/doc/fonts/firamath/firamath-demo.pdf and new/doc/fonts/firamath/firamath-demo.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/firamath/firamath-demo.tex new/doc/fonts/firamath/firamath-demo.tex
--- old/doc/fonts/firamath/firamath-demo.tex 2018-10-26 22:47:42.000000000 +0200
+++ new/doc/fonts/firamath/firamath-demo.tex 2020-01-13 22:24:30.000000000 +0100
@@ -1,5 +1,5 @@
\documentclass[aspectratio=169]{beamer}
-\usepackage{amsmath,unicode-math,physics,tensor}
+\usepackage{amsmath,unicode-math,physics,tensor,xeCJK,bookmark}
\useoutertheme{metropolis}
\useinnertheme{metropolis}
\usecolortheme{metropolis}
@@ -10,21 +10,35 @@
\setbeamerfont{date}{size=\small}
\setbeamertemplate{footline}{\vspace*{0.3cm}}
+\makeatletter
+% https://tex.stackexchange.com/q/66519
+\apptocmd{\beamer@@frametitle}{\only<1>{\bookmark[page=\the\c@page,level=3]{#1}}}{}{}
+
\unimathsetup{math-style=ISO, bold-style=ISO, mathrm=sym}
\setsansfont{FiraGO}[BoldFont=* SemiBold, Numbers=Monospaced]
-\setmathfont{Fira Math Regular}
+ { \setmathfont { FiraMath-##1.otf } [ version = ##1 ] }
+\cs_new:Npn \MultipleWeights #1
+ {
+ \seq_map_inline:Nn \c_@@_weight_seq
+ { \group_begin: \mathversion {##1} #1 \group_end: }
+ }
+\ExplSyntaxOff
+\makeatother
+
+\def\ii{\symrm{i}}
+\def\pp{\symrm{\pi}}
\title{Fira Math}
\subtitle{Sans-serif font with Unicode math support}
\author{Xiangdong Zeng}
-\date{2018/10/26\quad v0.3.1}
+\date{2020/01/13\quad v0.3.3}
\begin{document}
\maketitle
-\begin{frame}[noframenumbering]{General relativity}
+\begin{frame}{Basic examples (I)}
\begin{itemize}
\item Covariant derivative:
\[
@@ -34,8 +48,6 @@
\]
\item Einstein's field equations:
\[ G_{\mu\nu} \equiv R_{\mu\nu} - \frac{1}{2} R g_{\mu\nu} = \frac{8\pi G}{c^4} T_{\mu\nu} \]
- %\item Conservation of energy and momentum:
- % \[ \nabla_\beta T^{\alpha\beta} = \tensor{T}{^{\alpha\beta}_{;\,\beta}} = 0 \]
\item Schwarzschild metric:
\[
c^2 \dd{\tau}^2 = \qty(1-\frac{r_{\mathrm{s}}}{r}) \, c^2 \dd{t}^2
@@ -47,4 +59,66 @@
\end{itemize}
\end{frame}
+\begin{frame}{Basic examples (II)}
+\begin{itemize}
+ \item Case $n=1$
+ \small
+ \[
+ \int_0^{\frac{\pp}{2}}
+ \frac{\sqrt{\frac12 \sqrt{\frac{\ln^2\cos\theta}{\theta^2+\ln^2\cos\theta}} + \frac12}}%
+ {\fourthroot{\theta^2 + \ln^2\cos\theta}} \dd{\theta}
+ = \frac{\pp}{2\sqrt{\ln 2}}
+ \]
+ \item Generalization:
+ \small\vspace{1ex}
+ \[
+ \begin{cases}
+ \smash[t]{\displaystyle
+ R_n^- = \frac{2}{\pp} \int_0^{\pp/2} \qty(\theta^2+\ln^2\cos\theta)^{-2^{-n-1}}
+ \sqrt{\frac12+\frac12\sqrt{\frac12+\cdots+\frac12\sqrt{
+ \frac{\ln^2\cos\theta}{\theta^2+\ln^2\cos\theta}}}} \dd{\theta}
+ = (\ln 2)^{-2^{-n}}} \\[3ex]
+ \smash[b]{\displaystyle
+ R_n^+ = \frac{2}{\pp} \int_0^{\pp/2} \qty(\theta^2+\ln^2\cos\theta)^{2^{-n-1}}
+ \sqrt{\frac12+\frac12\sqrt{\frac12+\cdots+\frac12\sqrt{
+ \frac{\ln^2\cos\theta}{\theta^2+\ln^2\cos\theta}}}} \dd{\theta}
+ = (\ln 2)^{2^{-n}}}
+ \end{cases}
+ \]
+\end{itemize}
+\end{frame}
+
+\begin{frame}{Using with CJK fonts}
+\begin{itemize}
+ \item {\fontzhhans 【留数定理】全纯函数 $f$ 在若尔当曲线 $\gamma$ 上的积分为:}
+ \[
+ \oint_\gamma f(z) \dd{z}
+ = 2\pp\ii \sum_{k=1}^n \Res_{z=a_k} f(z).
+ \]
+ \item {\fontzhhant 【留數定理】全純函數 $f$ 在若爾當曲線 $\gamma$ 上的積分為:}
+ \[
+ \oint_\gamma f(z) \dd{z}
+ = 2\pp\ii \sum_{k=1}^n \Res_{z=a_k} f(z).
+ \]
+ \item {\fontja 【留数定理】ジョルダン曲線 $\gamma$ に沿う正則関数 $f$ の積分は、}
+ \[
+ \oint_\gamma f(z) \dd{z}
+ = 2\pp\ii \sum_{k=1}^n \Res_{z=a_k} f(z).
+ \]
+\end{itemize}
+\end{frame}
+
+\begin{frame}{Multiple weights (preview)}
+\centering
+\everymath{\displaystyle}
+\begin{tabular}{p{5cm}l}
+ \mathversion{Thin} $ \pdv{\alpha} \sin\alpha = \cos \alpha $ & \mathversion{Medium} $ \int \sin x \dd{x} = -\cos x + C_1 $ \\[12pt]
+ \mathversion{UltraLight} $ \pdv{\beta } \cos\beta = -\sin \beta $ & \mathversion{SemiBold} $ \int \cos y \dd{y} = \sin y + C_2 $ \\[12pt]
+ \mathversion{ExtraLight} $ \pdv{\gamma} \tan\gamma = \sec^2\gamma $ & \mathversion{Bold} $ \int \tan z \dd{z} = -\ln|\cos z \, | + C_3 $ \\[12pt]
+ \mathversion{Light} $ \pdv{\theta} \cot\theta = -\csc^2\theta $ & \mathversion{ExtraBold} $ \int \cot p \dd{p} = \ln|\sin p \, | + C_4 $ \\[12pt]
+ \mathversion{Book} $ \pdv{\phi } \sec\phi = \tan\phi \sec\phi $ & \mathversion{Heavy} $ \int \sec q \dd{q} = \ln|\sec q + \tan q \, | + C_5 $ \\[12pt]
+ \mathversion{Regular} $ \pdv{\zeta } \csc\zeta = -\cot\zeta\csc\zeta $ & \mathversion{Ultra} $ \int \csc r \dd{r} = -\ln|\csc r + \cot r \, | + C_6 $
+\end{tabular}
+\end{frame}
+
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/firamath/firamath-glyph-list.tex new/doc/fonts/firamath/firamath-glyph-list.tex
--- old/doc/fonts/firamath/firamath-glyph-list.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/firamath/firamath-glyph-list.tex 2020-01-13 22:24:30.000000000 +0100
@@ -0,0 +1,19 @@
+% Generated by ./scripts/glyph_list.py
+\seq_const_from_clist:Nn \c_@@_glyph_unicode_seq
+ {"0020,"0021,"0022,"0023,"0024,"0025,"0026,"0027,"0028,"0029,"002A,"002B,"002C,"002D,"002E,"002F,"0030,"0031,"0032,"0033,"0034,"0035,"0036,"0037,"0038,"0039,"003A,"003B,"003C,"003D,"003E,"003F,"0040,"0041,"0042,"0043,"0044,"0045,"0046,"0047,"0048,"0049,"004A,"004B,"004C,"004D,"004E,"004F,"0050,"0051,"0052,"0053,"0054,"0055,"0056,"0057,"0058,"0059,"005A,"005B,"005C,"005D,"005E,"005F,"0060,"0061,"0062,"0063,"0064,"0065,"0066,"0067,"0068,"0069,"006A,"006B,"006C,"006D,"006E,"006F,"0070,"0071,"0072,"0073,"0074,"0075,"0076,"0077,"0078,"0079,"007A,"007B,"007C,"007D,"007E,"00A0,"00A1,"00A2,"00A3,"00A4,"00A5,"00A6,"00A7,"00A8,"00A9,"00AA,"00AB,"00AC,"00AD,"00AE,"00AF,"00B0,"00B1,"00B2,"00B3,"00B4,"00B5,"00B6,"00B7,"00B8,"00B9,"00BA,"00BB,"00BC,"00BD,"00BE,"00BF,"00C0,"00C1,"00C2,"00C3,"00C4,"00C5,"00C6,"00C7,"00C8,"00C9,"00CA,"00CB,"00CC,"00CD,"00CE,"00CF,"00D0,"00D1,"00D2,"00D3,"00D4,"00D5,"00D6,"00D7,"00D8,"00D9,"00DA,"00DB,"00DC,"00DD,"00DE,"00DF,"00E0,"00E1,"00E2,"00E3,"00E4,"00E5,"00E6,"00E7,"00E8,"00E9,"00EA,"00EB,"00EC,"00ED,"00EE,"00EF,"00F0,"00F1,"00F2,"00F3,"00F4,"00F5,"00F6,"00F7,"00F8,"00F9,"00FA,"00FB,"00FC,"00FD,"00FE,"00FF,"0100,"0101,"0102,"0103,"0104,"0105,"0106,"0107,"010C,"010D,"010E,"010F,"0110,"0111,"0112,"0113,"0116,"0117,"0118,"0119,"011A,"011B,"011E,"011F,"0122,"0123,"012A,"012B,"012E,"012F,"0130,"0131,"0136,"0137,"0139,"013A,"013B,"013C,"013D,"013E,"0141,"0142,"0143,"0144,"0145,"0146,"0147,"0148,"014C,"014D,"0150,"0151,"0152,"0153,"0154,"0155,"0156,"0157,"0158,"0159,"015A,"015B,"015E,"015F,"0160,"0161,"0162,"0163,"0164,"0165,"016A,"016B,"016E,"016F,"0170,"0171,"0172,"0173,"0178,"0179,"017A,"017B,"017C,"017D,"017E,"0192,"0218,"0219,"021A,"021B,"0237,"0300,"0301,"0302,"0303,"0304,"0305,"0306,"0307,"0308,"0309,"030A,"030B,"030C,"030D,"030F,"0311,"0312,"0313,"0316,"0317,"0318,"0319,"031A,"031B,"031C,"031D,"031E,"031F,"0320,"0321,"0323,"0324,"0325,"0326,"0327,"0328,"0329,"032A,"032B,"032C,"032D,"032F,"0330,"0331,"0332,"0334,"0335,"0336,"0337,"0338,"0339,"033A,"033B,"033C,"033D,"0342,"0345,"035C,"0361,"037E,"0384,"0385,"0386,"0387,"0388,"0389,"038A,"038C,"038E,"038F,"0390,"0391,"0392,"0393,"0394,"0395,"0396,"0397,"0398,"0399,"039A,"039B,"039C,"039D,"039E,"039F,"03A0,"03A1,"03A3,"03A4,"03A5,"03A6,"03A7,"03A8,"03A9,"03AA,"03AB,"03AC,"03AD,"03AE,"03AF,"03B0,"03B1,"03B2,"03B3,"03B4,"03B5,"03B6,"03B7,"03B8,"03B9,"03BA,"03BB,"03BC,"03BD,"03BE,"03BF,"03C0,"03C1,"03C2,"03C3,"03C4,"03C5,"03C6,"03C7,"03C8,"03C9,"03CA,"03CB,"03CC,"03CD,"03CE,"03D0,"03D1,"03D2,"03D5,"03D6,"03D7,"03F0,"03F1,"03F2,"03F4,"03F5,"03F6,"0400,"0401,"0402,"0403,"0404,"0405,"0406,"0407,"0408,"0409,"040A,"040B,"040C,"040D,"040E,"040F,"0410,"0411,"0412,"0413,"0414,"0415,"0416,"0417,"0418,"0419,"041A,"041B,"041C,"041D,"041E,"041F,"0420,"0421,"0422,"0423,"0424,"0425,"0426,"0427,"0428,"0429,"042A,"042B,"042C,"042D,"042E,"042F,"0430,"0431,"0432,"0433,"0434,"0435,"0436,"0437,"0438,"0439,"043A,"043B,"043C,"043D,"043E,"043F,"0440,"0441,"0442,"0443,"0444,"0445,"0446,"0447,"0448,"0449,"044A,"044B,"044C,"044D,"044E,"044F,"0450,"0451,"0452,"0453,"0454,"0455,"0456,"0457,"0458,"0459,"045A,"045B,"045C,"045D,"045E,"045F,"0462,"0463,"0472,"0473,"0474,"0475,"0490,"0491,"2007,"2008,"200B,"200C,"200D,"200E,"200F,"2010,"2011,"2012,"2013,"2014,"2015,"2016,"2018,"2019,"201A,"201C,"201D,"201E,"2020,"2021,"2022,"2026,"2030,"2032,"2033,"2034,"2035,"2036,"2037,"2039,"203A,"203F,"2044,"2057,"20AC,"20B4,"20BA,"20BD,"20D0,"20D1,"20D2,"20D3,"20D6,"20D7,"20DB,"20DC,"20E1,"20E7,"20E8,"20E9,"20EC,"20ED,"20EE,"20EF,"20F0,"2102,"210A,"210D,"210E,"210F,"2113,"2115,"2116,"2119,"211A,"211D,"2122,"2124,"2126,"2127,"212A,"212B,"212E,"2135,"2136,"2137,"2138,"2140,"2153,"2154,"2155,"2156,"2157,"2158,"2159,"215A,"215B,"215C,"215D,"215E,"215F,"2190,"2191,"2192,"2193,"2194,"2195,"2196,"2197,"2198,"2199,"219A,"219B,"219C,"219D,"219E,"219F,"21A0,"21A1,"21A2,"21A3,"21A4,"21A5,"21A6,"21A7,"21A8,"21A9,"21AA,"21AB,"21AC,"21AD,"21AE,"21AF,"21B0,"21B1,"21B2,"21B3,"21B4,"21B5,"21B6,"21B7,"21B8,"21B9,"21BA,"21BB,"21BC,"21BD,"21BE,"21BF,"21C0,"21C1,"21C2,"21C3,"21C4,"21C5,"21C6,"21C7,"21C8,"21C9,"21CA,"21CB,"21CC,"21CD,"21CE,"21CF,"21D0,"21D1,"21D2,"21D3,"21D4,"21D5,"21D6,"21D7,"21D8,"21D9,"21DA,"21DB,"21DC,"21DD,"21DE,"21DF,"21E0,"21E1,"21E2,"21E3,"21E4,"21E5,"21E6,"21E7,"21E8,"21E9,"21EA,"21EB,"21EC,"21ED,"21EE,"21EF,"21F0,"21F1,"21F2,"21F3,"21F4,"21F5,"21F6,"21F7,"21F8,"21F9,"21FA,"21FB,"21FC,"21FD,"21FE,"21FF,"2200,"2201,"2202,"2203,"2204,"2205,"2206,"2207,"2208,"2209,"220A,"220B,"220C,"220D,"220E,"220F,"2210,"2211,"2212,"2213,"2214,"2215,"2217,"2218,"2219,"221A,"221B,"221C,"221D,"221E,"221F,"2220,"2221,"2222,"2223,"2224,"2225,"2226,"2227,"2228,"2229,"222A,"222B,"222C,"222D,"222E,"222F,"2230,"2234,"2235,"2236,"2237,"2238,"2239,"223A,"223B,"223C,"223D,"2240,"2241,"2242,"2243,"2244,"2245,"2246,"2247,"2248,"2249,"224A,"224B,"224C,"2250,"2251,"2252,"2253,"2254,"2255,"2260,"2261,"2262,"2263,"2264,"2265,"2266,"2267,"2268,"2269,"226A,"226B,"226E,"226F,"2270,"2271,"2272,"2273,"2274,"2275,"2276,"2277,"2278,"2279,"227A,"227B,"227C,"227D,"227E,"227F,"2280,"2281,"2282,"2283,"2284,"2285,"2286,"2287,"2288,"2289,"228A,"228B,"228C,"228D,"228E,"228F,"2290,"2291,"2292,"2293,"2294,"2295,"2296,"2297,"2298,"2299,"22C5,"22CD,"22CE,"22CF,"22D6,"22D7,"22D8,"22D9,"22DA,"22DB,"22DC,"22DD,"22DE,"22DF,"22E0,"22E1,"22E2,"22E3,"22E4,"22E5,"22E6,"22E7,"22E8,"22E9,"22EF,"2302,"2308,"2309,"230A,"230B,"2310,"239B,"239C,"239D,"239E,"239F,"23A0,"23A1,"23A2,"23A3,"23A4,"23A5,"23A6,"23A7,"23A8,"23A9,"23AA,"23AB,"23AC,"23AD,"23B4,"23B5,"23DC,"23DD,"23DE,"23DF,"2580,"2581,"2582,"2583,"2584,"2585,"2586,"2587,"2588,"2589,"258A,"258B,"258C,"258D,"258E,"258F,"2590,"2594,"2595,"2596,"2597,"2598,"2599,"259A,"259B,"259C,"259D,"259E,"259F,"25A0,"25A1,"25A2,"25A3,"25AA,"25AB,"25AC,"25AD,"25AE,"25AF,"25B2,"25B6,"25BA,"25BC,"25C0,"25C4,"25C6,"25C7,"25C9,"25CA,"25CB,"25CE,"25CF,"25D0,"25D1,"25D2,"25D3,"25D5,"25D6,"25D7,"25D9,"25DA,"25DB,"25DC,"25DD,"25DE,"25DF,"25E0,"25E1,"25E2,"25E3,"25E4,"25E5,"25E6,"25E7,"25E8,"25E9,"25EA,"25EB,"25EF,"25F0,"25F1,"25F2,"25F3,"25F4,"25F5,"25F6,"25F7,"2620,"2639,"263A,"263B,"263C,"2640,"2642,"2660,"2663,"2665,"2666,"266A,"266B,"26AA,"26AB,"26AC,"27C2,"27E8,"27E9,"27EA,"27EB,"27EE,"27EF,"27F0,"27F1,"27F2,"27F3,"27F4,"27F5,"27F6,"27F7,"27F8,"27F9,"27FA,"27FB,"27FC,"27FD,"27FE,"27FF,"2900,"2901,"2902,"2903,"2904,"2905,"2906,"2907,"2908,"2909,"290A,"290B,"2912,"2913,"2914,"2915,"2916,"2917,"2918,"2919,"291A,"291B,"291C,"2921,"2922,"2927,"2928,"2929,"292A,"292B,"292C,"292D,"292E,"292F,"2930,"2931,"2932,"294A,"294B,"294C,"294D,"294E,"294F,"2950,"2951,"2952,"2953,"2954,"2955,"2956,"2957,"2958,"2959,"295A,"295B,"295C,"295D,"295E,"295F,"2960,"2961,"2962,"2963,"2964,"2965,"2966,"2967,"2968,"2969,"296A,"296B,"296C,"296D,"296E,"296F,"2980,"2981,"299F,"29A0,"29A1,"29A2,"29A3,"29A6,"29A7,"29B0,"2A0C,"2A7D,"2A7E,"2B24,"2B30,"2B31,"2B32,"2B33,"2B34,"2B35,"2B36,"2B39,"2B3A,"2B3B,"2B3C,"2B3D,"2B45,"2B46,"2BFE,"FB00,"FB01,"FB02,"FB03,"FB04,"1D400,"1D401,"1D402,"1D403,"1D404,"1D405,"1D406,"1D407,"1D408,"1D409,"1D40A,"1D40B,"1D40C,"1D40D,"1D40E,"1D40F,"1D410,"1D411,"1D412,"1D413,"1D414,"1D415,"1D416,"1D417,"1D418,"1D419,"1D41A,"1D41B,"1D41C,"1D41D,"1D41E,"1D41F,"1D420,"1D421,"1D422,"1D423,"1D424,"1D425,"1D426,"1D427,"1D428,"1D429,"1D42A,"1D42B,"1D42C,"1D42D,"1D42E,"1D42F,"1D430,"1D431,"1D432,"1D433,"1D434,"1D435,"1D436,"1D437,"1D438,"1D439,"1D43A,"1D43B,"1D43C,"1D43D,"1D43E,"1D43F,"1D440,"1D441,"1D442,"1D443,"1D444,"1D445,"1D446,"1D447,"1D448,"1D449,"1D44A,"1D44B,"1D44C,"1D44D,"1D44E,"1D44F,"1D450,"1D451,"1D452,"1D453,"1D454,"1D456,"1D457,"1D458,"1D459,"1D45A,"1D45B,"1D45C,"1D45D,"1D45E,"1D45F,"1D460,"1D461,"1D462,"1D463,"1D464,"1D465,"1D466,"1D467,"1D468,"1D469,"1D46A,"1D46B,"1D46C,"1D46D,"1D46E,"1D46F,"1D470,"1D471,"1D472,"1D473,"1D474,"1D475,"1D476,"1D477,"1D478,"1D479,"1D47A,"1D47B,"1D47C,"1D47D,"1D47E,"1D47F,"1D480,"1D481,"1D482,"1D483,"1D484,"1D485,"1D486,"1D487,"1D488,"1D489,"1D48A,"1D48B,"1D48C,"1D48D,"1D48E,"1D48F,"1D490,"1D491,"1D492,"1D493,"1D494,"1D495,"1D496,"1D497,"1D498,"1D499,"1D49A,"1D49B,"1D538,"1D539,"1D53B,"1D53C,"1D53D,"1D53E,"1D540,"1D541,"1D542,"1D543,"1D544,"1D546,"1D54A,"1D54B,"1D54C,"1D54D,"1D54E,"1D54F,"1D550,"1D552,"1D553,"1D554,"1D555,"1D556,"1D557,"1D558,"1D559,"1D55A,"1D55B,"1D55C,"1D55D,"1D55E,"1D55F,"1D560,"1D561,"1D562,"1D563,"1D564,"1D565,"1D566,"1D567,"1D568,"1D569,"1D56A,"1D56B,"1D670,"1D671,"1D672,"1D673,"1D674,"1D675,"1D676,"1D677,"1D678,"1D679,"1D67A,"1D67B,"1D67C,"1D67D,"1D67E,"1D67F,"1D680,"1D681,"1D682,"1D683,"1D684,"1D685,"1D686,"1D687,"1D688,"1D689,"1D68A,"1D68B,"1D68C,"1D68D,"1D68E,"1D68F,"1D690,"1D691,"1D692,"1D693,"1D694,"1D695,"1D696,"1D697,"1D698,"1D699,"1D69A,"1D69B,"1D69C,"1D69D,"1D69E,"1D69F,"1D6A0,"1D6A1,"1D6A2,"1D6A3,"1D6A4,"1D6A5,"1D6A8,"1D6A9,"1D6AA,"1D6AB,"1D6AC,"1D6AD,"1D6AE,"1D6AF,"1D6B0,"1D6B1,"1D6B2,"1D6B3,"1D6B4,"1D6B5,"1D6B6,"1D6B7,"1D6B8,"1D6B9,"1D6BA,"1D6BB,"1D6BC,"1D6BD,"1D6BE,"1D6BF,"1D6C0,"1D6C1,"1D6C2,"1D6C3,"1D6C4,"1D6C5,"1D6C6,"1D6C7,"1D6C8,"1D6C9,"1D6CA,"1D6CB,"1D6CC,"1D6CD,"1D6CE,"1D6CF,"1D6D0,"1D6D1,"1D6D2,"1D6D3,"1D6D4,"1D6D5,"1D6D6,"1D6D7,"1D6D8,"1D6D9,"1D6DA,"1D6DB,"1D6DC,"1D6DD,"1D6DE,"1D6DF,"1D6E0,"1D6E1,"1D6E2,"1D6E3,"1D6E4,"1D6E5,"1D6E6,"1D6E7,"1D6E8,"1D6E9,"1D6EA,"1D6EB,"1D6EC,"1D6ED,"1D6EE,"1D6EF,"1D6F0,"1D6F1,"1D6F2,"1D6F3,"1D6F4,"1D6F5,"1D6F6,"1D6F7,"1D6F8,"1D6F9,"1D6FA,"1D6FB,"1D6FC,"1D6FD,"1D6FE,"1D6FF,"1D700,"1D701,"1D702,"1D703,"1D704,"1D705,"1D706,"1D707,"1D708,"1D709,"1D70A,"1D70B,"1D70C,"1D70D,"1D70E,"1D70F,"1D710,"1D711,"1D712,"1D713,"1D714,"1D715,"1D716,"1D717,"1D718,"1D719,"1D71A,"1D71B,"1D71C,"1D71D,"1D71E,"1D71F,"1D720,"1D721,"1D722,"1D723,"1D724,"1D725,"1D726,"1D727,"1D728,"1D729,"1D72A,"1D72B,"1D72C,"1D72D,"1D72E,"1D72F,"1D730,"1D731,"1D732,"1D733,"1D734,"1D735,"1D736,"1D737,"1D738,"1D739,"1D73A,"1D73B,"1D73C,"1D73D,"1D73E,"1D73F,"1D740,"1D741,"1D742,"1D743,"1D744,"1D745,"1D746,"1D747,"1D748,"1D749,"1D74A,"1D74B,"1D74C,"1D74D,"1D74E,"1D74F,"1D750,"1D751,"1D752,"1D753,"1D754,"1D755,"1D7CA,"1D7CB,"1D7CE,"1D7CF,"1D7D0,"1D7D1,"1D7D2,"1D7D3,"1D7D4,"1D7D5,"1D7D6,"1D7D7,"1F784}
+\seq_const_from_clist:Nn \c_@@_glyph_non_unicode_seq
+ {.notdef,uni2032.ssty1,uni2033.ssty1,uni2034.ssty1,uni2057.ssty1,uni2035.ssty1,uni2036.ssty1,uni2037.ssty1,uni2032.ssty2,uni2033.ssty2,uni2034.ssty2,uni2057.ssty2,uni2035.ssty2,uni2036.ssty2,uni2037.ssty2,uni2140.display,uni220F.display,uni2210.display,uni2211.display,uni222B.display,uni222C.display,uni222D.display,uni2A0C.display,uni222E.display,uni222F.display,uni2230.display,uni221A.size1,uni221A.size2,uni221A.size3,uni221A.size4,uni221A.size5,uni221A.size6,uni221A.size7,uni221A.size8,uni221A.size9,uni221A.size10,uni221A.size11,uni221A.size12,uni221A.size13,uni221A.size14,uni221A.size15,uni221B.size1,uni221B.size2,uni221B.size3,uni221B.size4,uni221B.size5,uni221B.size6,uni221B.size7,uni221B.size8,uni221B.size9,uni221B.size10,uni221B.size11,uni221B.size12,uni221B.size13,uni221B.size14,uni221B.size15,uni221C.size1,uni221C.size2,uni221C.size3,uni221C.size4,uni221C.size5,uni221C.size6,uni221C.size7,uni221C.size8,uni221C.size9,uni221C.size10,uni221C.size11,uni221C.size12,uni221C.size13,uni221C.size14,uni221C.size15,uni0028.size1,uni0028.size2,uni0028.size3,uni0028.size4,uni0028.size5,uni0028.size6,uni0028.size7,uni0028.size8,uni0028.size9,uni0028.size10,uni0028.size11,uni0028.size12,uni0028.size13,uni0028.size14,uni0028.size15,uni0029.size1,uni0029.size2,uni0029.size3,uni0029.size4,uni0029.size5,uni0029.size6,uni0029.size7,uni0029.size8,uni0029.size9,uni0029.size10,uni0029.size11,uni0029.size12,uni0029.size13,uni0029.size14,uni0029.size15,uni005B.size1,uni005B.size2,uni005B.size3,uni005B.size4,uni005B.size5,uni005B.size6,uni005B.size7,uni005B.size8,uni005B.size9,uni005B.size10,uni005B.size11,uni005B.size12,uni005B.size13,uni005B.size14,uni005B.size15,uni005D.size1,uni005D.size2,uni005D.size3,uni005D.size4,uni005D.size5,uni005D.size6,uni005D.size7,uni005D.size8,uni005D.size9,uni005D.size10,uni005D.size11,uni005D.size12,uni005D.size13,uni005D.size14,uni005D.size15,uni007B.size1,uni007B.size2,uni007B.size3,uni007B.size4,uni007B.size5,uni007B.size6,uni007B.size7,uni007B.size8,uni007B.size9,uni007B.size10,uni007B.size11,uni007B.size12,uni007B.size13,uni007B.size14,uni007B.size15,uni007D.size1,uni007D.size2,uni007D.size3,uni007D.size4,uni007D.size5,uni007D.size6,uni007D.size7,uni007D.size8,uni007D.size9,uni007D.size10,uni007D.size11,uni007D.size12,uni007D.size13,uni007D.size14,uni007D.size15,uni2308.size1,uni2308.size2,uni2308.size3,uni2308.size4,uni2308.size5,uni2308.size6,uni2308.size7,uni2308.size8,uni2308.size9,uni2308.size10,uni2308.size11,uni2308.size12,uni2308.size13,uni2308.size14,uni2308.size15,uni2309.size1,uni2309.size2,uni2309.size3,uni2309.size4,uni2309.size5,uni2309.size6,uni2309.size7,uni2309.size8,uni2309.size9,uni2309.size10,uni2309.size11,uni2309.size12,uni2309.size13,uni2309.size14,uni2309.size15,uni230A.size1,uni230A.size2,uni230A.size3,uni230A.size4,uni230A.size5,uni230A.size6,uni230A.size7,uni230A.size8,uni230A.size9,uni230A.size10,uni230A.size11,uni230A.size12,uni230A.size13,uni230A.size14,uni230A.size15,uni230B.size1,uni230B.size2,uni230B.size3,uni230B.size4,uni230B.size5,uni230B.size6,uni230B.size7,uni230B.size8,uni230B.size9,uni230B.size10,uni230B.size11,uni230B.size12,uni230B.size13,uni230B.size14,uni230B.size15,uni27E8.size1,uni27E8.size2,uni27E8.size3,uni27E8.size4,uni27E8.size5,uni27E8.size6,uni27E8.size7,uni27E8.size8,uni27E8.size9,uni27E8.size10,uni27E8.size11,uni27E8.size12,uni27E8.size13,uni27E8.size14,uni27E8.size15,uni27E9.size1,uni27E9.size2,uni27E9.size3,uni27E9.size4,uni27E9.size5,uni27E9.size6,uni27E9.size7,uni27E9.size8,uni27E9.size9,uni27E9.size10,uni27E9.size11,uni27E9.size12,uni27E9.size13,uni27E9.size14,uni27E9.size15,uni27EA.size1,uni27EA.size2,uni27EA.size3,uni27EA.size4,uni27EA.size5,uni27EA.size6,uni27EA.size7,uni27EA.size8,uni27EA.size9,uni27EA.size10,uni27EA.size11,uni27EA.size12,uni27EA.size13,uni27EA.size14,uni27EA.size15,uni27EB.size1,uni27EB.size2,uni27EB.size3,uni27EB.size4,uni27EB.size5,uni27EB.size6,uni27EB.size7,uni27EB.size8,uni27EB.size9,uni27EB.size10,uni27EB.size11,uni27EB.size12,uni27EB.size13,uni27EB.size14,uni27EB.size15,uni27EE.size1,uni27EE.size2,uni27EE.size3,uni27EE.size4,uni27EE.size5,uni27EE.size6,uni27EE.size7,uni27EE.size8,uni27EE.size9,uni27EE.size10,uni27EE.size11,uni27EE.size12,uni27EE.size13,uni27EE.size14,uni27EE.size15,uni27EF.size1,uni27EF.size2,uni27EF.size3,uni27EF.size4,uni27EF.size5,uni27EF.size6,uni27EF.size7,uni27EF.size8,uni27EF.size9,uni27EF.size10,uni27EF.size11,uni27EF.size12,uni27EF.size13,uni27EF.size14,uni27EF.size15,uni007C.size1,uni007C.size2,uni007C.size3,uni007C.size4,uni007C.size5,uni007C.size6,uni007C.size7,uni007C.size8,uni007C.size9,uni007C.size10,uni007C.size11,uni007C.size12,uni007C.size13,uni007C.size14,uni007C.size15,uni2016.size1,uni2016.size2,uni2016.size3,uni2016.size4,uni2016.size5,uni2016.size6,uni2016.size7,uni2016.size8,uni2016.size9,uni2016.size10,uni2016.size11,uni2016.size12,uni2016.size13,uni2016.size14,uni2016.size15,uni2980.size1,uni2980.size2,uni2980.size3,uni2980.size4,uni2980.size5,uni2980.size6,uni2980.size7,uni2980.size8,uni2980.size9,uni2980.size10,uni2980.size11,uni2980.size12,uni2980.size13,uni2980.size14,uni2980.size15,uni221A.top,uni221A.ext,uni221A.bot,uni221B.top,uni221B.ext,uni221B.bot,uni221C.top,uni221C.ext,uni221C.bot,uni2308.top,uni2308.ext,uni2309.top,uni2309.ext,uni230A.ext,uni230A.bot,uni230B.ext,uni230B.bot,uni27EE.top,uni27EE.ext,uni27EE.bot,uni27EF.top,uni27EF.ext,uni27EF.bot,uni007C.ext,uni2016.ext,uni2980.ext,uni23DC.size1,uni23DC.size2,uni23DC.size3,uni23DC.size4,uni23DC.size5,uni23DC.size6,uni23DC.size7,uni23DC.size8,uni23DC.size9,uni23DC.size10,uni23DC.size11,uni23DC.size12,uni23DC.size13,uni23DC.size14,uni23DC.size15,uni23DD.size1,uni23DD.size2,uni23DD.size3,uni23DD.size4,uni23DD.size5,uni23DD.size6,uni23DD.size7,uni23DD.size8,uni23DD.size9,uni23DD.size10,uni23DD.size11,uni23DD.size12,uni23DD.size13,uni23DD.size14,uni23DD.size15,uni23B4.size1,uni23B4.size2,uni23B4.size3,uni23B4.size4,uni23B4.size5,uni23B4.size6,uni23B4.size7,uni23B4.size8,uni23B4.size9,uni23B4.size10,uni23B4.size11,uni23B4.size12,uni23B4.size13,uni23B4.size14,uni23B4.size15,uni23B5.size1,uni23B5.size2,uni23B5.size3,uni23B5.size4,uni23B5.size5,uni23B5.size6,uni23B5.size7,uni23B5.size8,uni23B5.size9,uni23B5.size10,uni23B5.size11,uni23B5.size12,uni23B5.size13,uni23B5.size14,uni23B5.size15,uni23DE.size1,uni23DE.size2,uni23DE.size3,uni23DE.size4,uni23DE.size5,uni23DE.size6,uni23DE.size7,uni23DE.size8,uni23DE.size9,uni23DE.size10,uni23DE.size11,uni23DE.size12,uni23DE.size13,uni23DE.size14,uni23DE.size15,uni23DF.size1,uni23DF.size2,uni23DF.size3,uni23DF.size4,uni23DF.size5,uni23DF.size6,uni23DF.size7,uni23DF.size8,uni23DF.size9,uni23DF.size10,uni23DF.size11,uni23DF.size12,uni23DF.size13,uni23DF.size14,uni23DF.size15,uni23DC.left,uni23DC.ext,uni23DC.right,uni23DD.left,uni23DD.ext,uni23DD.right,uni23B4.left,uni23B4.ext,uni23B4.right,uni23B5.left,uni23B5.ext,uni23B5.right,uni23DE.left,uni23DE.ext,uni23DE.mid,uni23DE.right,uni23DF.left,uni23DF.ext,uni23DF.mid,uni23DF.right,uni0030.pnum,uni0031.pnum,uni0032.pnum,uni0033.pnum,uni0034.pnum,uni0035.pnum,uni0036.pnum,uni0037.pnum,uni0038.pnum,uni0039.pnum,u1D7CE.pnum,u1D7CF.pnum,u1D7D0.pnum,u1D7D1.pnum,u1D7D2.pnum,u1D7D3.pnum,u1D7D4.pnum,u1D7D5.pnum,u1D7D6.pnum,u1D7D7.pnum,uni222B.up,uni222C.up,uni222D.up,uni2A0C.up,uni222E.up,uni222F.up,uni2230.up,uni222B.display.up,uni222C.display.up,uni222D.display.up,uni2A0C.display.up,uni222E.display.up,uni222F.display.up,uni2230.display.up,uni210F.ss02,uni2201.ss03}
+\seq_const_from_clist:Nn \c_@@_glyph_non_unicode_with_type_seq
+ {
+ {Special} {.notdef},
+ {Math~Script~Style~Alternates} {uni2032.ssty1,uni2033.ssty1,uni2034.ssty1,uni2057.ssty1,uni2035.ssty1,uni2036.ssty1,uni2037.ssty1,uni2032.ssty2,uni2033.ssty2,uni2034.ssty2,uni2057.ssty2,uni2035.ssty2,uni2036.ssty2,uni2037.ssty2},
+ {Display~Math~Operators} {uni2140.display,uni220F.display,uni2210.display,uni2211.display,uni222B.display,uni222C.display,uni222D.display,uni2A0C.display,uni222E.display,uni222F.display,uni2230.display},
+ {Large~Delimiters} {uni221A.size1,uni221A.size2,uni221A.size3,uni221A.size4,uni221A.size5,uni221A.size6,uni221A.size7,uni221A.size8,uni221A.size9,uni221A.size10,uni221A.size11,uni221A.size12,uni221A.size13,uni221A.size14,uni221A.size15,uni221B.size1,uni221B.size2,uni221B.size3,uni221B.size4,uni221B.size5,uni221B.size6,uni221B.size7,uni221B.size8,uni221B.size9,uni221B.size10,uni221B.size11,uni221B.size12,uni221B.size13,uni221B.size14,uni221B.size15,uni221C.size1,uni221C.size2,uni221C.size3,uni221C.size4,uni221C.size5,uni221C.size6,uni221C.size7,uni221C.size8,uni221C.size9,uni221C.size10,uni221C.size11,uni221C.size12,uni221C.size13,uni221C.size14,uni221C.size15,uni0028.size1,uni0028.size2,uni0028.size3,uni0028.size4,uni0028.size5,uni0028.size6,uni0028.size7,uni0028.size8,uni0028.size9,uni0028.size10,uni0028.size11,uni0028.size12,uni0028.size13,uni0028.size14,uni0028.size15,uni0029.size1,uni0029.size2,uni0029.size3,uni0029.size4,uni0029.size5,uni0029.size6,uni0029.size7,uni0029.size8,uni0029.size9,uni0029.size10,uni0029.size11,uni0029.size12,uni0029.size13,uni0029.size14,uni0029.size15,uni005B.size1,uni005B.size2,uni005B.size3,uni005B.size4,uni005B.size5,uni005B.size6,uni005B.size7,uni005B.size8,uni005B.size9,uni005B.size10,uni005B.size11,uni005B.size12,uni005B.size13,uni005B.size14,uni005B.size15,uni005D.size1,uni005D.size2,uni005D.size3,uni005D.size4,uni005D.size5,uni005D.size6,uni005D.size7,uni005D.size8,uni005D.size9,uni005D.size10,uni005D.size11,uni005D.size12,uni005D.size13,uni005D.size14,uni005D.size15,uni007B.size1,uni007B.size2,uni007B.size3,uni007B.size4,uni007B.size5,uni007B.size6,uni007B.size7,uni007B.size8,uni007B.size9,uni007B.size10,uni007B.size11,uni007B.size12,uni007B.size13,uni007B.size14,uni007B.size15,uni007D.size1,uni007D.size2,uni007D.size3,uni007D.size4,uni007D.size5,uni007D.size6,uni007D.size7,uni007D.size8,uni007D.size9,uni007D.size10,uni007D.size11,uni007D.size12,uni007D.size13,uni007D.size14,uni007D.size15,uni2308.size1,uni2308.size2,uni2308.size3,uni2308.size4,uni2308.size5,uni2308.size6,uni2308.size7,uni2308.size8,uni2308.size9,uni2308.size10,uni2308.size11,uni2308.size12,uni2308.size13,uni2308.size14,uni2308.size15,uni2309.size1,uni2309.size2,uni2309.size3,uni2309.size4,uni2309.size5,uni2309.size6,uni2309.size7,uni2309.size8,uni2309.size9,uni2309.size10,uni2309.size11,uni2309.size12,uni2309.size13,uni2309.size14,uni2309.size15,uni230A.size1,uni230A.size2,uni230A.size3,uni230A.size4,uni230A.size5,uni230A.size6,uni230A.size7,uni230A.size8,uni230A.size9,uni230A.size10,uni230A.size11,uni230A.size12,uni230A.size13,uni230A.size14,uni230A.size15,uni230B.size1,uni230B.size2,uni230B.size3,uni230B.size4,uni230B.size5,uni230B.size6,uni230B.size7,uni230B.size8,uni230B.size9,uni230B.size10,uni230B.size11,uni230B.size12,uni230B.size13,uni230B.size14,uni230B.size15,uni27E8.size1,uni27E8.size2,uni27E8.size3,uni27E8.size4,uni27E8.size5,uni27E8.size6,uni27E8.size7,uni27E8.size8,uni27E8.size9,uni27E8.size10,uni27E8.size11,uni27E8.size12,uni27E8.size13,uni27E8.size14,uni27E8.size15,uni27E9.size1,uni27E9.size2,uni27E9.size3,uni27E9.size4,uni27E9.size5,uni27E9.size6,uni27E9.size7,uni27E9.size8,uni27E9.size9,uni27E9.size10,uni27E9.size11,uni27E9.size12,uni27E9.size13,uni27E9.size14,uni27E9.size15,uni27EA.size1,uni27EA.size2,uni27EA.size3,uni27EA.size4,uni27EA.size5,uni27EA.size6,uni27EA.size7,uni27EA.size8,uni27EA.size9,uni27EA.size10,uni27EA.size11,uni27EA.size12,uni27EA.size13,uni27EA.size14,uni27EA.size15,uni27EB.size1,uni27EB.size2,uni27EB.size3,uni27EB.size4,uni27EB.size5,uni27EB.size6,uni27EB.size7,uni27EB.size8,uni27EB.size9,uni27EB.size10,uni27EB.size11,uni27EB.size12,uni27EB.size13,uni27EB.size14,uni27EB.size15,uni27EE.size1,uni27EE.size2,uni27EE.size3,uni27EE.size4,uni27EE.size5,uni27EE.size6,uni27EE.size7,uni27EE.size8,uni27EE.size9,uni27EE.size10,uni27EE.size11,uni27EE.size12,uni27EE.size13,uni27EE.size14,uni27EE.size15,uni27EF.size1,uni27EF.size2,uni27EF.size3,uni27EF.size4,uni27EF.size5,uni27EF.size6,uni27EF.size7,uni27EF.size8,uni27EF.size9,uni27EF.size10,uni27EF.size11,uni27EF.size12,uni27EF.size13,uni27EF.size14,uni27EF.size15,uni007C.size1,uni007C.size2,uni007C.size3,uni007C.size4,uni007C.size5,uni007C.size6,uni007C.size7,uni007C.size8,uni007C.size9,uni007C.size10,uni007C.size11,uni007C.size12,uni007C.size13,uni007C.size14,uni007C.size15,uni2016.size1,uni2016.size2,uni2016.size3,uni2016.size4,uni2016.size5,uni2016.size6,uni2016.size7,uni2016.size8,uni2016.size9,uni2016.size10,uni2016.size11,uni2016.size12,uni2016.size13,uni2016.size14,uni2016.size15,uni2980.size1,uni2980.size2,uni2980.size3,uni2980.size4,uni2980.size5,uni2980.size6,uni2980.size7,uni2980.size8,uni2980.size9,uni2980.size10,uni2980.size11,uni2980.size12,uni2980.size13,uni2980.size14,uni2980.size15},
+ {Extensible~Delimiters} {uni221A.top,uni221A.ext,uni221A.bot,uni221B.top,uni221B.ext,uni221B.bot,uni221C.top,uni221C.ext,uni221C.bot,uni2308.top,uni2308.ext,uni2309.top,uni2309.ext,uni230A.ext,uni230A.bot,uni230B.ext,uni230B.bot,uni27EE.top,uni27EE.ext,uni27EE.bot,uni27EF.top,uni27EF.ext,uni27EF.bot,uni007C.ext,uni2016.ext,uni2980.ext},
+ {Large~Over/Under~Symbols} {uni23DC.size1,uni23DC.size2,uni23DC.size3,uni23DC.size4,uni23DC.size5,uni23DC.size6,uni23DC.size7,uni23DC.size8,uni23DC.size9,uni23DC.size10,uni23DC.size11,uni23DC.size12,uni23DC.size13,uni23DC.size14,uni23DC.size15,uni23DD.size1,uni23DD.size2,uni23DD.size3,uni23DD.size4,uni23DD.size5,uni23DD.size6,uni23DD.size7,uni23DD.size8,uni23DD.size9,uni23DD.size10,uni23DD.size11,uni23DD.size12,uni23DD.size13,uni23DD.size14,uni23DD.size15,uni23B4.size1,uni23B4.size2,uni23B4.size3,uni23B4.size4,uni23B4.size5,uni23B4.size6,uni23B4.size7,uni23B4.size8,uni23B4.size9,uni23B4.size10,uni23B4.size11,uni23B4.size12,uni23B4.size13,uni23B4.size14,uni23B4.size15,uni23B5.size1,uni23B5.size2,uni23B5.size3,uni23B5.size4,uni23B5.size5,uni23B5.size6,uni23B5.size7,uni23B5.size8,uni23B5.size9,uni23B5.size10,uni23B5.size11,uni23B5.size12,uni23B5.size13,uni23B5.size14,uni23B5.size15,uni23DE.size1,uni23DE.size2,uni23DE.size3,uni23DE.size4,uni23DE.size5,uni23DE.size6,uni23DE.size7,uni23DE.size8,uni23DE.size9,uni23DE.size10,uni23DE.size11,uni23DE.size12,uni23DE.size13,uni23DE.size14,uni23DE.size15,uni23DF.size1,uni23DF.size2,uni23DF.size3,uni23DF.size4,uni23DF.size5,uni23DF.size6,uni23DF.size7,uni23DF.size8,uni23DF.size9,uni23DF.size10,uni23DF.size11,uni23DF.size12,uni23DF.size13,uni23DF.size14,uni23DF.size15},
+ {Extensible~Over/Under~Symbols} {uni23DC.left,uni23DC.ext,uni23DC.right,uni23DD.left,uni23DD.ext,uni23DD.right,uni23B4.left,uni23B4.ext,uni23B4.right,uni23B5.left,uni23B5.ext,uni23B5.right,uni23DE.left,uni23DE.ext,uni23DE.mid,uni23DE.right,uni23DF.left,uni23DF.ext,uni23DF.mid,uni23DF.right},
+ {Proportional~Figures} {uni0030.pnum,uni0031.pnum,uni0032.pnum,uni0033.pnum,uni0034.pnum,uni0035.pnum,uni0036.pnum,uni0037.pnum,uni0038.pnum,uni0039.pnum,u1D7CE.pnum,u1D7CF.pnum,u1D7D0.pnum,u1D7D1.pnum,u1D7D2.pnum,u1D7D3.pnum,u1D7D4.pnum,u1D7D5.pnum,u1D7D6.pnum,u1D7D7.pnum},
+ {Stylistic~Set~1:~Upright~Integrals} {uni222B.up,uni222C.up,uni222D.up,uni2A0C.up,uni222E.up,uni222F.up,uni2230.up,uni222B.display.up,uni222C.display.up,uni222D.display.up,uni2A0C.display.up,uni222E.display.up,uni222F.display.up,uni2230.display.up},
+ {Stylistic~Set~2:~Planck~Constant~with~Bar} {uni210F.ss02},
+ {Stylistic~Set~3:~Complement~Alternates} {uni2201.ss03},
+ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/firamath/firamath-non-unicode.txt new/doc/fonts/firamath/firamath-non-unicode.txt
--- old/doc/fonts/firamath/firamath-non-unicode.txt 2018-10-26 22:47:42.000000000 +0200
+++ new/doc/fonts/firamath/firamath-non-unicode.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,527 +0,0 @@
-; Special
-.notdef
-; Math Script Style Alternates
-uni2032.ssty1
-uni2033.ssty1
-uni2034.ssty1
-; Display Math Operators
-uni220F.display
-uni2210.display
-uni2211.display
-uni222B.display
-uni222C.display
-uni222D.display
-uni2A0C.display
-uni222E.display
-uni222F.display
-uni2230.display
-; Large Delimiters
-uni221A.size1
-uni221A.size2
-uni221A.size3
-uni221A.size4
-uni221A.size5
-uni221A.size6
-uni221A.size7
-uni221A.size8
-uni221A.size9
-uni221A.size10
-uni221A.size11
-uni221A.size12
-uni221A.size13
-uni221A.size14
-uni221A.size15
-uni221B.size1
-uni221B.size2
-uni221B.size3
-uni221B.size4
-uni221B.size5
-uni221B.size6
-uni221B.size7
-uni221B.size8
-uni221B.size9
-uni221B.size10
-uni221B.size11
-uni221B.size12
-uni221B.size13
-uni221B.size14
-uni221B.size15
-uni221C.size1
-uni221C.size2
-uni221C.size3
-uni221C.size4
-uni221C.size5
-uni221C.size6
-uni221C.size7
-uni221C.size8
-uni221C.size9
-uni221C.size10
-uni221C.size11
-uni221C.size12
-uni221C.size13
-uni221C.size14
-uni221C.size15
-uni0028.size1
-uni0028.size2
-uni0028.size3
-uni0028.size4
-uni0028.size5
-uni0028.size6
-uni0028.size7
-uni0028.size8
-uni0028.size9
-uni0028.size10
-uni0028.size11
-uni0028.size12
-uni0028.size13
-uni0028.size14
-uni0028.size15
-uni0029.size1
-uni0029.size2
-uni0029.size3
-uni0029.size4
-uni0029.size5
-uni0029.size6
-uni0029.size7
-uni0029.size8
-uni0029.size9
-uni0029.size10
-uni0029.size11
-uni0029.size12
-uni0029.size13
-uni0029.size14
-uni0029.size15
-uni005B.size1
-uni005B.size2
-uni005B.size3
-uni005B.size4
-uni005B.size5
-uni005B.size6
-uni005B.size7
-uni005B.size8
-uni005B.size9
-uni005B.size10
-uni005B.size11
-uni005B.size12
-uni005B.size13
-uni005B.size14
-uni005B.size15
-uni005D.size1
-uni005D.size2
-uni005D.size3
-uni005D.size4
-uni005D.size5
-uni005D.size6
-uni005D.size7
-uni005D.size8
-uni005D.size9
-uni005D.size10
-uni005D.size11
-uni005D.size12
-uni005D.size13
-uni005D.size14
-uni005D.size15
-uni007B.size1
-uni007B.size2
-uni007B.size3
-uni007B.size4
-uni007B.size5
-uni007B.size6
-uni007B.size7
-uni007B.size8
-uni007B.size9
-uni007B.size10
-uni007B.size11
-uni007B.size12
-uni007B.size13
-uni007B.size14
-uni007B.size15
-uni007D.size1
-uni007D.size2
-uni007D.size3
-uni007D.size4
-uni007D.size5
-uni007D.size6
-uni007D.size7
-uni007D.size8
-uni007D.size9
-uni007D.size10
-uni007D.size11
-uni007D.size12
-uni007D.size13
-uni007D.size14
-uni007D.size15
-uni27EE.size1
-uni27EE.size2
-uni27EE.size3
-uni27EE.size4
-uni27EE.size5
-uni27EE.size6
-uni27EE.size7
-uni27EE.size8
-uni27EE.size9
-uni27EE.size10
-uni27EE.size11
-uni27EE.size12
-uni27EE.size13
-uni27EE.size14
-uni27EE.size15
-uni27EF.size1
-uni27EF.size2
-uni27EF.size3
-uni27EF.size4
-uni27EF.size5
-uni27EF.size6
-uni27EF.size7
-uni27EF.size8
-uni27EF.size9
-uni27EF.size10
-uni27EF.size11
-uni27EF.size12
-uni27EF.size13
-uni27EF.size14
-uni27EF.size15
-uni27E8.size1
-uni27E8.size2
-uni27E8.size3
-uni27E8.size4
-uni27E8.size5
-uni27E8.size6
-uni27E8.size7
-uni27E8.size8
-uni27E8.size9
-uni27E8.size10
-uni27E8.size11
-uni27E8.size12
-uni27E8.size13
-uni27E8.size14
-uni27E8.size15
-uni27E9.size1
-uni27E9.size2
-uni27E9.size3
-uni27E9.size4
-uni27E9.size5
-uni27E9.size6
-uni27E9.size7
-uni27E9.size8
-uni27E9.size9
-uni27E9.size10
-uni27E9.size11
-uni27E9.size12
-uni27E9.size13
-uni27E9.size14
-uni27E9.size15
-uni27EA.size1
-uni27EA.size2
-uni27EA.size3
-uni27EA.size4
-uni27EA.size5
-uni27EA.size6
-uni27EA.size7
-uni27EA.size8
-uni27EA.size9
-uni27EA.size10
-uni27EA.size11
-uni27EA.size12
-uni27EA.size13
-uni27EA.size14
-uni27EA.size15
-uni27EB.size1
-uni27EB.size2
-uni27EB.size3
-uni27EB.size4
-uni27EB.size5
-uni27EB.size6
-uni27EB.size7
-uni27EB.size8
-uni27EB.size9
-uni27EB.size10
-uni27EB.size11
-uni27EB.size12
-uni27EB.size13
-uni27EB.size14
-uni27EB.size15
-uni007C.size1
-uni007C.size2
-uni007C.size3
-uni007C.size4
-uni007C.size5
-uni007C.size6
-uni007C.size7
-uni007C.size8
-uni007C.size9
-uni007C.size10
-uni007C.size11
-uni007C.size12
-uni007C.size13
-uni007C.size14
-uni007C.size15
-uni2016.size1
-uni2016.size2
-uni2016.size3
-uni2016.size4
-uni2016.size5
-uni2016.size6
-uni2016.size7
-uni2016.size8
-uni2016.size9
-uni2016.size10
-uni2016.size11
-uni2016.size12
-uni2016.size13
-uni2016.size14
-uni2016.size15
-uni2980.size1
-uni2980.size2
-uni2980.size3
-uni2980.size4
-uni2980.size5
-uni2980.size6
-uni2980.size7
-uni2980.size8
-uni2980.size9
-uni2980.size10
-uni2980.size11
-uni2980.size12
-uni2980.size13
-uni2980.size14
-uni2980.size15
-uni2308.size1
-uni2308.size2
-uni2308.size3
-uni2308.size4
-uni2308.size5
-uni2308.size6
-uni2308.size7
-uni2308.size8
-uni2308.size9
-uni2308.size10
-uni2308.size11
-uni2308.size12
-uni2308.size13
-uni2308.size14
-uni2308.size15
-uni2309.size1
-uni2309.size2
-uni2309.size3
-uni2309.size4
-uni2309.size5
-uni2309.size6
-uni2309.size7
-uni2309.size8
-uni2309.size9
-uni2309.size10
-uni2309.size11
-uni2309.size12
-uni2309.size13
-uni2309.size14
-uni2309.size15
-uni230A.size1
-uni230A.size2
-uni230A.size3
-uni230A.size4
-uni230A.size5
-uni230A.size6
-uni230A.size7
-uni230A.size8
-uni230A.size9
-uni230A.size10
-uni230A.size11
-uni230A.size12
-uni230A.size13
-uni230A.size14
-uni230A.size15
-uni230B.size1
-uni230B.size2
-uni230B.size3
-uni230B.size4
-uni230B.size5
-uni230B.size6
-uni230B.size7
-uni230B.size8
-uni230B.size9
-uni230B.size10
-uni230B.size11
-uni230B.size12
-uni230B.size13
-uni230B.size14
-uni230B.size15
-; Extensible Delimiters
-uni221A.top
-uni221A.ext
-uni221A.bot
-uni221B.top
-uni221B.ext
-uni221B.bot
-uni221C.top
-uni221C.ext
-uni221C.bot
-uni007C.ext
-uni2016.ext
-uni2980.ext
-uni2308.top
-uni2308.ext
-uni2309.top
-uni2309.ext
-uni230A.ext
-uni230A.bot
-uni230B.ext
-uni230B.bot
-uni27EE.top
-uni27EE.ext
-uni27EE.bot
-uni27EF.top
-uni27EF.ext
-uni27EF.bot
-; Large Over/Under Symbols
-uni23DC.size1
-uni23DC.size2
-uni23DC.size3
-uni23DC.size4
-uni23DC.size5
-uni23DC.size6
-uni23DC.size7
-uni23DC.size8
-uni23DC.size9
-uni23DC.size10
-uni23DC.size11
-uni23DC.size12
-uni23DC.size13
-uni23DC.size14
-uni23DC.size15
-uni23DD.size1
-uni23DD.size2
-uni23DD.size3
-uni23DD.size4
-uni23DD.size5
-uni23DD.size6
-uni23DD.size7
-uni23DD.size8
-uni23DD.size9
-uni23DD.size10
-uni23DD.size11
-uni23DD.size12
-uni23DD.size13
-uni23DD.size14
-uni23DD.size15
-uni23B4.size1
-uni23B4.size2
-uni23B4.size3
-uni23B4.size4
-uni23B4.size5
-uni23B4.size6
-uni23B4.size7
-uni23B4.size8
-uni23B4.size9
-uni23B4.size10
-uni23B4.size11
-uni23B4.size12
-uni23B4.size13
-uni23B4.size14
-uni23B4.size15
-uni23B5.size1
-uni23B5.size2
-uni23B5.size3
-uni23B5.size4
-uni23B5.size5
-uni23B5.size6
-uni23B5.size7
-uni23B5.size8
-uni23B5.size9
-uni23B5.size10
-uni23B5.size11
-uni23B5.size12
-uni23B5.size13
-uni23B5.size14
-uni23B5.size15
-uni23DE.size1
-uni23DE.size2
-uni23DE.size3
-uni23DE.size4
-uni23DE.size5
-uni23DE.size6
-uni23DE.size7
-uni23DE.size8
-uni23DE.size9
-uni23DE.size10
-uni23DE.size11
-uni23DE.size12
-uni23DE.size13
-uni23DE.size14
-uni23DE.size15
-uni23DF.size1
-uni23DF.size2
-uni23DF.size3
-uni23DF.size4
-uni23DF.size5
-uni23DF.size6
-uni23DF.size7
-uni23DF.size8
-uni23DF.size9
-uni23DF.size10
-uni23DF.size11
-uni23DF.size12
-uni23DF.size13
-uni23DF.size14
-uni23DF.size15
-; Extensible Over/Under Symbols
-uni23DC.left
-uni23DC.ext
-uni23DC.right
-uni23DD.left
-uni23DD.ext
-uni23DD.right
-uni23B4.left
-uni23B4.ext
-uni23B4.right
-uni23B5.left
-uni23B5.ext
-uni23B5.right
-uni23DE.left
-uni23DE.ext
-uni23DE.mid
-uni23DE.right
-uni23DF.left
-uni23DF.ext
-uni23DF.mid
-uni23DF.right
-; Proportional Figures
-uni0030.pnum
-uni0031.pnum
-uni0032.pnum
-uni0033.pnum
-uni0034.pnum
-uni0035.pnum
-uni0036.pnum
-uni0037.pnum
-uni0038.pnum
-uni0039.pnum
-u1D7CE.pnum
-u1D7CF.pnum
-u1D7D0.pnum
-u1D7D1.pnum
-u1D7D2.pnum
-u1D7D3.pnum
-u1D7D4.pnum
-u1D7D5.pnum
-u1D7D6.pnum
-u1D7D7.pnum
-; Stylistic Set 1: Upright Integrals
-uni222B.up
-uni222C.up
-uni222D.up
-uni2A0C.up
-uni222E.up
-uni222F.up
-uni2230.up
-uni222B.display.up
-uni222C.display.up
-uni222D.display.up
-uni2A0C.display.up
-uni222E.display.up
-uni222F.display.up
-uni2230.display.up
-; Stylistic Set 2: Planck Constant with Bar
-uni210F.ss02
-; Stylistic Set 3: Complement Alternates
-uni2201.ss03
Binary files old/doc/fonts/firamath/firamath-specimen.pdf and new/doc/fonts/firamath/firamath-specimen.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/firamath/firamath-specimen.tex new/doc/fonts/firamath/firamath-specimen.tex
--- old/doc/fonts/firamath/firamath-specimen.tex 2018-10-26 22:47:42.000000000 +0200
+++ new/doc/fonts/firamath/firamath-specimen.tex 2020-01-13 22:24:30.000000000 +0100
@@ -13,7 +13,7 @@
\makeatletter\ExplSyntaxOn
-\clist_const:Nn \c__xfonttable_unicode_reserved_clist
+\seq_const_from_clist:Nn \c_@@_unicode_reserved_seq
{
% Greek and Coptic
378, 379, 380, 381, 382, 383, 38B, 38D, 3A2,
@@ -50,7 +50,7 @@
1D4BC, 1D4C4, 1D506, 1D50B, 1D50C, 1D515, 1D51D, 1D53A, 1D53F, 1D545,
1D547, 1D548, 1D549, 1D551, 1D6A6, 1D6A7, 1D7CC, 1D7CD
}
-\clist_const:Nn \c__xfonttable_unicode_control_clist
+\seq_const_from_clist:Nn \c_@@_unicode_control_seq
{
% C0 Controls and Basic Latin
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, A, B, C, D, E, F,
@@ -61,36 +61,24 @@
90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 9A, 9B, 9C, 9D, 9E, 9F
}
+% Require `\c_@@_glyph_non_unicode_with_type_seq`
+\file_input:n { firamath-glyph-list.tex }
+
% #1 = symbol index
-\cs_new_protected:Npn \xfonttable_symbol:n #1
+\cs_new_protected:Npn \@@_symbol:n #1
{ \tex_char:D \int_eval:n {#1} \scan_stop: }
-\prg_new_protected_conditional:Npnn \xfonttable_if_char_exist:n #1 { T, F, TF }
+\prg_new_protected_conditional:Npnn \@@_if_char_exist:n #1 { T, F, TF }
{
- \etex_iffontchar:D \tex_font:D \int_eval:n {#1} \scan_stop:
+ \tex_iffontchar:D \tex_font:D \int_eval:n {#1} \scan_stop:
\prg_return_true:
\else:
\prg_return_false:
\fi:
}
% #1 = glyph name
-\sys_if_engine_xetex:TF
- {
- \cs_new_protected:Npn \xfonttable_glyph_from_name:n #1
- { \xetex_glyph:D \xetex_glyphindex:D "#1" \scan_stop: }
- }
- {
- \sys_if_engine_luatex:TF
- {
- \cs_new_protected:Npn \xfonttable_glyph_from_name:n #1
- { \tex_char:D \luatex_glyph_index:w #1 \scan_stop: }
- \cs_new_protected:Npn \luatex_glyph_index:w
- {
- \lua_now:n
- { tex.sprint(0, font.getfont(font.current()).resources.unicodes[token.scan_string()]) }
- }
- }
- { \BOOM }
- }
+% See https://tex.stackexchange.com/q/420167
+\cs_new_protected:Npn \@@_glyph_from_name:n #1
+ { \tex_XeTeXglyph:D \tex_XeTeXglyphindex:D "#1" \scan_stop: }
% Centering with fixed width
\newcolumntype {C} [1] { > { \centering \arraybackslash } m {#1} }
@@ -105,63 +93,63 @@
\cs_set:Npn \NumberStyle { \ttfamily \footnotesize }
\cs_set:Npn \GlyphStyle { \SymbolFont \Large }
\cs_set:Npn \EncodingStyle
- { \ttfamily \fontsize {4} {5} \selectfont \cellcolor { encoding@bg } }
+ { \ttfamily \fontsize { 4 } { 5 } \selectfont \cellcolor { encoding@bg } }
-\cs_set:Npn \GlyphStrut { \xfonttable_set_arstrut:nn { 20 pt } { 10 pt } }
-\cs_set:Npn \NonUnicodeGlyphStrut { \xfonttable_set_arstrut:nn { 32 pt } { 20 pt } }
-\cs_set:Npn \NonUnicodeHighGlyphStrut { \xfonttable_set_arstrut:nn { 64 pt } { 40 pt } }
-\cs_set:Npn \EncodingStrut { \xfonttable_set_arstrut:nn { 4.5 pt } { 1 pt } }
-
-\dim_const:Nn \c__xfonttable_cell_wd_dim { 30 pt }
-\dim_const:Nn \c__xfonttable_column_sep_dim { 0 pt }
-\dim_const:Nn \c__xfonttable_row_number_ht_dim { 20 pt }
-\dim_const:Nn \c__xfonttable_row_number_sep_dim { 6 pt }
-\dim_const:Nn \c__xfonttable_nuni_wd_dim { 87 pt }
+\cs_set:Npn \GlyphStrut { \@@_set_arstrut:nn { 20 pt } { 10 pt } }
+\cs_set:Npn \NonUnicodeGlyphStrut { \@@_set_arstrut:nn { 32 pt } { 20 pt } }
+\cs_set:Npn \NonUnicodeHighGlyphStrut { \@@_set_arstrut:nn { 64 pt } { 40 pt } }
+\cs_set:Npn \EncodingStrut { \@@_set_arstrut:nn { 4.5 pt } { 1 pt } }
+
+\dim_const:Nn \c_@@_cell_wd_dim { 30 pt }
+\dim_const:Nn \c_@@_column_sep_dim { 0 pt }
+\dim_const:Nn \c_@@_row_number_ht_dim { 20 pt }
+\dim_const:Nn \c_@@_row_number_sep_dim { 6 pt }
+\dim_const:Nn \c_@@_non_unicode_wd_dim { 87 pt }
% The total number of glyphs.
\newcounter { glyph }
\setcounter { glyph } { -1 }
% The main function.
-\NewDocumentCommand \fonttable { s m m }
+\NewDocumentCommand \fonttable { s m g }
{
\IfBooleanTF {#1}
- { \xfonttable_non_unicode:nn {#2} {#3} }
- { \xfonttable_unicode:nn {#2} {#3} }
+ { \@@_non_unicode:nn {#2} }
+ { \@@_unicode:nn {#2} {#3} }
\clearpage
}
% #1 = section name
% #2 = begin/end encoding
-\cs_new_protected:Npn \xfonttable_unicode:nn #1#2
+\cs_new_protected:Npn \@@_unicode:nn #1#2
{
- \tl_set:Nn \l__xfonttable_glyph_count_tl
+ \tl_set:Nn \l_@@_glyph_count_tl
{ \ref* { count: glyph @ #1 } / \ref* { count: codepoint @ #1 } }
- \section { #1 ~ (\tl_use:N \l__xfonttable_glyph_count_tl) }
- \cs_set_eq:NN \xfonttable_left_foot: \xfonttable_left_foot_unicode:
- \xfonttable_parse_encoding:n {#2}
- \int_gzero:N \g__xfonttable_glyph_int
- \int_gzero:N \g__xfonttable_code_point_int
- \xfonttable_make_table:
+ \section { #1 ~ (\tl_use:N \l_@@_glyph_count_tl) }
+ \cs_set_eq:NN \@@_left_foot: \@@_left_foot_unicode:
+ \@@_parse_encoding:n {#2}
+ \int_gzero:N \g_@@_glyph_int
+ \int_gzero:N \g_@@_code_point_int
+ \@@_make_table:
\newcounter { glyph @ #1 }
\newcounter { codepoint @ #1 }
- \int_set:cn { c @ glyph @ #1 } { \g__xfonttable_glyph_int - 1 }
- \int_set:cn { c @ codepoint @ #1 } { \g__xfonttable_code_point_int - 1 }
+ \int_set:cn { c @ glyph @ #1 } { \g_@@_glyph_int - 1 }
+ \int_set:cn { c @ codepoint @ #1 } { \g_@@_code_point_int - 1 }
\refstepcounter { glyph @ #1 } \label { count: glyph @ #1 }
\refstepcounter { codepoint @ #1 } \label { count: codepoint @ #1 }
}
-\tl_new:N \l__xfonttable_glyph_count_tl
-\int_new:N \g__xfonttable_glyph_int
-\int_new:N \g__xfonttable_code_point_int
+\tl_new:N \l_@@_glyph_count_tl
+\int_new:N \g_@@_glyph_int
+\int_new:N \g_@@_code_point_int
-\cs_new_protected:Npn \xfonttable_left_foot_unicode:
+\cs_new_protected:Npn \@@_left_foot_unicode:
{
\mode_leave_vertical:
\footnotesize
- \xfonttable_color_box:nn { reserved @ bg } Reserved~ Code~ Points, \quad
- \xfonttable_color_box:nn { control @ bg } Control~ Codes.
+ \@@_color_box:nn { reserved @ bg } Reserved~ Code~ Points, \quad
+ \@@_color_box:nn { control @ bg } Control~ Codes.
}
-\cs_new_protected:Npn \xfonttable_color_box:nn #1#2
+\cs_new_protected:Npn \@@_color_box:nn #1#2
{
\group_begin:
\color {#1} \rule [ -2 pt ] { 10 pt } { 10 pt }
@@ -170,114 +158,112 @@
}
% #1 = `begin` - `end`
-\cs_new_protected:Npn \xfonttable_parse_encoding:n #1
+\cs_new_protected:Npn \@@_parse_encoding:n #1
{
\seq_set_split:Nnn \l_tmpa_seq { - } {#1}
- \int_set:Nn \l__xfonttable_begin_int
- { \seq_item:Nn \l_tmpa_seq { 1 } }
- \int_set:Nn \l__xfonttable_end_int
- { \seq_item:Nn \l_tmpa_seq { 2 } }
- }
-\int_new:N \l__xfonttable_begin_int
-\int_new:N \l__xfonttable_end_int
-
-\cs_new_protected:Npn \xfonttable_make_table:
- {
- \longtable { r | * {16} { C { \c__xfonttable_cell_wd_dim } | } }
- \xfonttable_long_table_head:
- \xfonttable_multi_row:nn
- { \int_use:N \l__xfonttable_begin_int }
- { \int_use:N \l__xfonttable_end_int }
+ \int_set:Nn \l_@@_begin_int { \seq_item:Nn \l_tmpa_seq { 1 } }
+ \int_set:Nn \l_@@_end_int { \seq_item:Nn \l_tmpa_seq { 2 } }
+ }
+\int_new:N \l_@@_begin_int
+\int_new:N \l_@@_end_int
+
+\cs_new_protected:Npn \@@_make_table:
+ {
+ \longtable { r | * { 16 } { C { \c_@@_cell_wd_dim } | } }
+ \@@_long_table_head:
+ \@@_multi_row:nn
+ { \int_use:N \l_@@_begin_int }
+ { \int_use:N \l_@@_end_int }
\endlongtable
}
-\dim_set_eq:NN \tabcolsep \c__xfonttable_column_sep_dim
+\dim_set_eq:NN \tabcolsep \c_@@_column_sep_dim
% These functions must be expandable:
-% \xfonttable_long_table_head:, \xfonttable_first_row:,
-% \xfonttable_multi_row:nn, \xfonttable_row:n, \__xfonttable_div_sixteen:n,
-% \xfonttable_hline:, \xfonttable_set_arstrut:nn, \xfonttable_restore_arstrut:, etc.,
+% \@@_long_table_head:, \@@_first_row:,
+% \@@_multi_row:nn, \@@_row:n, \@@_div_sixteen:n,
+% \@@_hline:, \@@_set_arstrut:nn, \@@_restore_arstrut:, etc.,
% so that `noalign` can work properly.
% Hence we use `\cs_new:Npn` and `\int_step_function:nnnN` here.
-\cs_new:Npn \xfonttable_long_table_head:
+\cs_new:Npn \@@_long_table_head:
{
% It's very hackable here!
% The dimension is measured by hand. Not universal at all.
- \xfonttable_set_arstrut:nn { 0 pt } { 0 pt }
+ \@@_set_arstrut:nn { 0 pt } { 0 pt }
\multicolumn { 17 } { c } { \rule { 0 pt } { 1.29 cm } } \\
- \xfonttable_first_row:
+ \@@_first_row:
\endhead
- \xfonttable_first_row:
+ \@@_first_row:
\endfirsthead
}
-\cs_new:Npn \xfonttable_first_row:
+\cs_new:Npn \@@_first_row:
{
- \multicolumn {17} { r }
+ \multicolumn { 17 } { r }
{
\tabular
{
% Skip row number
r |
- * {15} { C { \c__xfonttable_cell_wd_dim } E }
- C { \c__xfonttable_cell_wd_dim } |
+ * { 15 } { C { \c_@@_cell_wd_dim } E }
+ C { \c_@@_cell_wd_dim } |
}
% I don't know why there are so many `#`.
- \int_step_inline:nnnn { 0 } { 1 } { 15 }
- { & \xfonttable_first_row_cell:n {####1} }
+ \int_step_inline:nnn { 0 } { 15 }
+ { & \@@_first_row_cell:n {####1} }
\endtabular
}
\\*
- \xfonttable_hline:
+ \@@_hline:
}
-\cs_new_protected:Npn \xfonttable_first_row_cell:n #1
+\cs_new_protected:Npn \@@_first_row_cell:n #1
{ \NumberStyle \int_to_Hex:n {#1} }
-\cs_new:Npn \xfonttable_multi_row:nn #1#2
+\cs_new:Npn \@@_multi_row:nn #1#2
{
\int_step_function:nnnN
- { \__xfonttable_div_sixteen:n {#1} * 16 }
+ { \@@_div_sixteen:n {#1} * 16 }
{ 16 }
- { (\__xfonttable_div_sixteen:n {#2} + 1) * 16 - 1 }
- \xfonttable_row:n
+ { (\@@_div_sixteen:n {#2} + 1) * 16 - 1 }
+ \@@_row:n
}
-\cs_new:Npn \__xfonttable_div_sixteen:n #1
+\cs_new:Npn \@@_div_sixteen:n #1
{ \int_div_truncate:nn {#1} { 16 } }
-\cs_new:Npn \xfonttable_row:n #1
+\cs_new:Npn \@@_row:n #1
{
% Glyph row
\GlyphStrut
% Row number
- \multirow { 2 } * { \xfonttable_row_nummber:n {#1} }
- \int_step_inline:nnnn {#1} { 1 } { #1 + 15 }
- { & \xfonttable_glyph:n {##1} }
+ \multirow { 2 } * { \@@_row_nummber:n {#1} }
+ \int_step_inline:nnn {#1} { #1 + 15 }
+ { & \@@_glyph:n {##1} }
\\*
- \xfonttable_restore_arstrut:
+ \@@_restore_arstrut:
% Encoding row
- \xfonttable_hline:
+ \@@_hline:
\EncodingStrut
- \int_step_inline:nnnn {#1} { 1 } { #1 + 15 }
- { & \xfonttable_encoding:n {##1} }
+ \int_step_inline:nnn {#1} { #1 + 15 }
+ { & \@@_encoding:n {##1} }
\\
- \xfonttable_hline:
+ \@@_hline:
}
% To skip the first column (i.e. row index).
% LaTeX3 syntax makes `~` to equal space, so we need to change its catcode temporarily.
\group_begin:
\char_set_catcode_active:N \~
- \cs_new:Npn \xfonttable_hline:
- { \hhline { ~ | *{16}{-} } }
+ \cs_new:Npn \@@_hline:
+ { \hhline { ~ | * { 16 } { - } } }
\group_end:
-\cs_new:Npn \xfonttable_set_arstrut:nn #1#2
+\cs_new:Npn \@@_set_arstrut:nn #1#2
{
\tex_noalign:D
{
\group_begin:
% Store the old strutbox
- \box_gset_eq:NN \l__xfonttable_old_arstrut_box \@arstrutbox
+ \box_gset_eq:NN \l_@@_old_arstrut_box \@arstrutbox
% Change the dimensions of \@arstrutbox
\hbox_set_to_wd:Nnn \l_tmpa_box { \c_zero_dim } { }
\box_set_ht:Nn \l_tmpa_box {#1}
@@ -286,16 +272,16 @@
\group_end:
}
}
-\cs_new:Npn \xfonttable_restore_arstrut:
+\cs_new:Npn \@@_restore_arstrut:
{
\tex_noalign:D
- { \box_gset_eq:NN \@arstrutbox \l__xfonttable_old_arstrut_box }
+ { \box_gset_eq:NN \@arstrutbox \l_@@_old_arstrut_box }
}
-\box_new:N \l__xfonttable_old_arstrut_box
+\box_new:N \l_@@_old_arstrut_box
-\cs_new_protected:Npn \xfonttable_row_nummber:n #1
+\cs_new_protected:Npn \@@_row_nummber:n #1
{
- \raisebox { \dim_use:N \c__xfonttable_row_number_ht_dim }
+ \raisebox { \dim_use:N \c_@@_row_number_ht_dim }
{
\NumberStyle
\int_set:Nn \l_tmpa_int { #1 / 16 }
@@ -306,39 +292,39 @@
{ 0 }
}
\int_to_Hex:n { \l_tmpa_int }
- \skip_horizontal:N \c__xfonttable_row_number_sep_dim
+ \skip_horizontal:N \c_@@_row_number_sep_dim
}
}
-\cs_new_protected:Npn \xfonttable_glyph:n #1
+\cs_new_protected:Npn \@@_glyph:n #1
{
\tl_set:Nx \l_tmpa_tl { \int_to_Hex:n {#1} }
- \clist_if_in:NVTF \c__xfonttable_unicode_reserved_clist \l_tmpa_tl
+ \seq_if_in:NVTF \c_@@_unicode_reserved_seq \l_tmpa_tl
{ \cellcolor { reserved@bg } }
{
- \clist_if_in:NVTF \c__xfonttable_unicode_control_clist \l_tmpa_tl
+ \seq_if_in:NVTF \c_@@_unicode_control_seq \l_tmpa_tl
{ \cellcolor { control@bg } }
{
- % It must be outside `\xfonttable_if_char_exist`
+ % It must be outside `\@@_if_char_exist`
\GlyphStyle
- \xfonttable_if_char_exist:nTF {#1}
+ \@@_if_char_exist:nTF {#1}
{
- \xfonttable_symbol:n {#1}
+ \@@_symbol:n {#1}
\refstepcounter { glyph }
- \int_gincr:N \g__xfonttable_glyph_int
+ \int_gincr:N \g_@@_glyph_int
}
{
\normalfont
\int_compare:nNnTF {#1} < { "10000 }
{ \BMPFallbackFont } { \SMPFallbackFont }
- \textcolor { nochar@text } { \xfonttable_symbol:n {#1} }
+ \textcolor { nochar@text } { \@@_symbol:n {#1} }
}
- \int_gincr:N \g__xfonttable_code_point_int
+ \int_gincr:N \g_@@_code_point_int
}
}
}
-\cs_new_protected:Npn \xfonttable_encoding:n #1
+\cs_new_protected:Npn \@@_encoding:n #1
{
\group_begin:
\EncodingStyle
@@ -358,113 +344,54 @@
% #1 = section name
% #2 = non-unicode data file
-\cs_new_protected:Npn \xfonttable_non_unicode:nn #1#2
+\cs_new_protected:Npn \@@_non_unicode:nn #1#2
{
- \tl_set:Nn \l__xfonttable_glyph_count_tl { \ref* { count: glyph @ nuni } }
- \section { #1 ~ (\tl_use:N \l__xfonttable_glyph_count_tl) }
- \cs_set_eq:NN \xfonttable_left_foot: \prg_do_nothing:
- \int_gzero:N \g__xfonttable_nuni_glyph_int
- \xfonttable_nuni_import:n {#2}
- \xfonttable_nuni_parse:
- \xfonttable_nuni_print:
- \newcounter { glyph @ nuni }
- \int_set:cn { c @ glyph @ nuni } { \g__xfonttable_nuni_glyph_int - 1 }
- \refstepcounter { glyph @ nuni } \label { count: glyph @ nuni }
- \refstepcounter { glyph } \label { count: glyph }
- }
-\int_new:N \g__xfonttable_nuni_glyph_int
-
-% #1 = file name (non-unicode.txt)
-\cs_new_protected:Npn \xfonttable_nuni_import:n #1
- {
- \ior_open:Nn \g__xfonttable_nuni_ior {#1}
- \ior_map_inline:Nn \g__xfonttable_nuni_ior
- { \seq_put_right:Nn \l__xfonttable_nuni_data_seq {##1} }
- \ior_close:N \g__xfonttable_nuni_ior
- }
-\ior_new:N \g__xfonttable_nuni_ior
-\seq_new:N \l__xfonttable_nuni_data_seq
-
-% `;` indicates a comment, for the glyph class.
-% Each entry (glyph name) after the comment should be put into the class.
-\cs_new_protected:Npn \xfonttable_nuni_parse:
- {
- \bool_until_do:nn { \seq_if_empty_p:N \l__xfonttable_nuni_data_seq }
- {
- \seq_pop_left:NN \l__xfonttable_nuni_data_seq \l_tmpa_tl
- \tl_if_in:NnTF \l_tmpa_tl { ; }
- {
- \tl_remove_once:Nn \l_tmpa_tl { ; }
- \tl_trim_spaces:N \l_tmpa_tl
- \seq_put_right:NV \l__xfonttable_nuni_class_seq \l_tmpa_tl
- \clist_if_empty:NF \l_tmpa_clist
- {
- \seq_put_right:NV \l__xfonttable_nuni_name_seq \l_tmpa_clist
- \clist_clear:N \l_tmpa_clist
- }
- }
- { \clist_put_right:NV \l_tmpa_clist \l_tmpa_tl }
- }
- % The last class
- \clist_if_empty:NF \l_tmpa_clist
- { \seq_put_right:NV \l__xfonttable_nuni_name_seq \l_tmpa_clist }
+ \tl_set:Nn \l_@@_glyph_count_tl { \ref* { count: glyph @ non-unicode } }
+ \section { #1 ~ (\tl_use:N \l_@@_glyph_count_tl) }
+ \cs_set_eq:NN \@@_left_foot: \prg_do_nothing:
+ \int_gzero:N \g_@@_non_unicode_glyph_int
+ \@@_non_unicode_print:
+ \newcounter { glyph @ non-unicode }
+ \int_set:cn { c @ glyph @ non-unicode } { \g_@@_non_unicode_glyph_int - 1 }
+ \refstepcounter { glyph @ non-unicode } \label { count: glyph @ non-unicode }
+ \refstepcounter { glyph } \label { count: glyph }
}
-\seq_new:N \l__xfonttable_nuni_class_seq
-\seq_new:N \l__xfonttable_nuni_name_seq
+\int_new:N \g_@@_non_unicode_glyph_int
-\cs_new_protected:Npn \xfonttable_nuni_print:
+\cs_new_protected:Npn \@@_non_unicode_print:
{
- \bool_until_do:nn { \seq_if_empty_p:N \l__xfonttable_nuni_class_seq }
- {
- \seq_pop_left:NN \l__xfonttable_nuni_class_seq \l_tmpa_tl
- \seq_pop_left:NN \l__xfonttable_nuni_name_seq \l_tmpa_clist
- \xfonttable_nuni_print_class:VV \l_tmpa_tl \l_tmpa_clist
- }
+ \seq_map_inline:Nn \c_@@_glyph_non_unicode_with_type_seq
+ { \@@_non_unicode_print_class:nn ##1 }
}
% #1 = class
% #2 = clist of glyph names
-\cs_new_protected:Npn \xfonttable_nuni_print_class:nn #1#2
+\cs_new_protected:Npn \@@_non_unicode_print_class:nn #1#2
{
\subsection { #1 ~ (\clist_count:n {#2}) }
\clist_map_inline:nn {#2}
{
- \xfonttable_nuni_cell:n {##1}
+ \@@_non_unicode_cell:n {##1}
\refstepcounter { glyph }
- \int_gincr:N \g__xfonttable_nuni_glyph_int
+ \int_gincr:N \g_@@_non_unicode_glyph_int
}
}
-\cs_generate_variant:Nn \xfonttable_nuni_print_class:nn { VV }
-\cs_new_protected:Npn \xfonttable_nuni_cell:n #1
+\cs_new_protected:Npn \@@_non_unicode_cell:n #1
{
- \tabular { | C { \c__xfonttable_nuni_wd_dim } | }
+ \tabular { | C { \c_@@_non_unicode_wd_dim } | }
% Glyph
\hline
-
-% \hbox_set:Nn \l_tmpa_box { \GlyphStyle \xfonttable_glyph_from_name:n {#1} }
-% \box_ht:N \l_tmpa_box
-% \dim_compare:nNnTF
-
\NonUnicodeGlyphStrut \GlyphStyle
-
-
-% \hbox_set:Nn \l_tmpa_box { \xfonttable_glyph_from_name:n {#1} }
-% \box_show:N \l_tmpa_box
-% \dim_show:n { \box_dp:N \l_tmpa_box }
-% \dim_show:n { \box_ht:N \l_tmpa_box }
-% \dim_show:n { \box_wd:N \l_tmpa_box }
-
-
- \xfonttable_glyph_from_name:n {#1}
+ \@@_glyph_from_name:n {#1}
\\
- \xfonttable_restore_arstrut:
+ \@@_restore_arstrut:
% Encoding (glyph name)
\hline
\EncodingStrut \EncodingStyle
#1
\\
- \xfonttable_restore_arstrut:
+ \@@_restore_arstrut:
\hline
\endtabular
% A space allowing line break
@@ -478,16 +405,16 @@
{
\footnotesize
\int_compare:nNnTF { \int_use:c { c@page } } = { \ztotpages }
- { \xfonttable_left_foot_last_page: } { \xfonttable_left_foot: }
+ { \@@_left_foot_last_page: } { \@@_left_foot: }
}
\fancyfoot [ R ]
{
\footnotesize \itshape
- Copyright~ \copyright{}~ 2018~ by~ Xiangdong~ Zeng
+ Copyright~ \copyright{}~ 2018--2020~ by~ Xiangdong~ Zeng
}
% `\headrulewidth` is not a dim variable.
\cs_set:Npn \headrulewidth { 0 pt }
-\cs_new_protected:Npn \xfonttable_left_foot_last_page:
+\cs_new_protected:Npn \@@_left_foot_last_page:
{
\itshape
Other~ fonts~ used~ in~ this~ document:~
@@ -505,14 +432,14 @@
\setmainfont{FiraGO}[BoldFont=* SemiBold, Numbers=Monospaced]
\setmonofont{Fira Code}[UprightFont=* Light, BoldFont=* Regular]
-\newfontface\SymbolFont{Fira Math Regular}
\newfontface\BMPFallbackFont{Unifont}
\newfontface\SMPFallbackFont{Unifont Upper}
+\newfontface\SymbolFont{Fira Math Regular}
\title{\bfseries\huge Fira Math\\
\itshape\Large Sans-serif font with Unicode math support}
\author{Xiangdong Zeng}
-\date{2018/10/26\quad v0.3.1}
+\date{2020/01/13\quad v0.3.3}
\begin{document}
@@ -546,12 +473,10 @@
\fonttable{C1 Controls and Latin-1 Supplement}{"80-"FF}
\fonttable{Latin Extended-A}{"100-"17F}
\fonttable{Latin Extended-B}{"180-"24F}
-%\fonttable{IPA Extensions}{"250-"2AF}
-%\fonttable{Spacing Modifier Letters}{"2B0-"2FF}
\fonttable{Combining Diacritical Marks}{"300-"36F}
\fonttable{Greek and Coptic}{"370-"3FF}
+\fonttable{Cyrillic}{"400-"4FF}
\fonttable{General Punctuation}{"2000-"206F}
-%\fonttable{Superscripts and Subscripts}{"2070-"209F}
\fonttable{Currency Symbols}{"20A0-"20CF}
\fonttable{Combining Diacritical Marks for Symbols}{"20D0-"20FF}
\fonttable{Letterlike Symbols}{"2100-"214F}
@@ -559,25 +484,18 @@
\fonttable{Arrows}{"2190-"21FF}
\fonttable{Mathematical Operators}{"2200-"22FF}
\fonttable{Miscellaneous Technical}{"2300-"23FF}
-%\fonttable{Control Pictures}{"2400-"243F}
-%\fonttable{Optical Character Recognition}{"2440-"245F}
-%\fonttable{Enclosed Alphanumerics}{"2460-"24FF}
-%\fonttable{Box Drawing}{"2500-"257F}
\fonttable{Block Elements}{"2580-"259F}
\fonttable{Geometric Shapes}{"25A0-"25FF}
\fonttable{Miscellaneous Symbols}{"2600-"26FF}
-%\fonttable{Dingbats}{"2700-"27BF}
\fonttable{Miscellaneous Mathematical Symbols-A}{"27C0-"27EF}
\fonttable{Supplemental Arrows-A}{"27F0-"27FF}
-%\fonttable{Braille Patterns}{"2800-"28FF}
\fonttable{Supplemental Arrows-B}{"2900-"297F}
\fonttable{Miscellaneous Mathematical Symbols-B}{"2980-"29FF}
\fonttable{Supplemental Mathematical Operators}{"2A00-"2AFF}
\fonttable{Miscellaneous Symbols and Arrows}{"2B00-"2BFF}
\fonttable{Alphabetic Presentation Forms}{"FB00-"FB4F}
-\fonttable{Arabic Presentation Forms-B}{"FE70-"FEFF}
\fonttable{Mathematical Alphanumeric Symbols}{"1D400-"1D7FF}
-
-\fonttable*{Non-Unicode Glyphs}{non-unicode.txt}
+\fonttable{Geometric Shapes Extended}{"1F780-"1F7FF}
+\fonttable*{Non-Unicode Glyphs}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/firamath.doc.tlpobj new/tlpkg/tlpobj/firamath.doc.tlpobj
--- old/tlpkg/tlpobj/firamath.doc.tlpobj 2019-02-28 03:37:28.000000000 +0100
+++ new/tlpkg/tlpobj/firamath.doc.tlpobj 2020-01-14 01:54:44.000000000 +0100
@@ -1,12 +1,12 @@
name firamath.doc
category Package
-revision 48995
+revision 53388
shortdesc doc files of firamath
relocated 1
-docfiles size=140
+docfiles size=155
RELOC/doc/fonts/firamath/README.md
RELOC/doc/fonts/firamath/firamath-demo.pdf
RELOC/doc/fonts/firamath/firamath-demo.tex
- RELOC/doc/fonts/firamath/firamath-non-unicode.txt
+ RELOC/doc/fonts/firamath/firamath-glyph-list.tex
RELOC/doc/fonts/firamath/firamath-specimen.pdf
RELOC/doc/fonts/firamath/firamath-specimen.tex
++++++ firamath.tar.xz ++++++
Binary files old/fonts/opentype/public/firamath/FiraMath-Regular.otf and new/fonts/opentype/public/firamath/FiraMath-Regular.otf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/firamath.tlpobj new/tlpkg/tlpobj/firamath.tlpobj
--- old/tlpkg/tlpobj/firamath.tlpobj 2019-02-28 03:37:28.000000000 +0100
+++ new/tlpkg/tlpobj/firamath.tlpobj 2020-01-14 01:54:44.000000000 +0100
@@ -1,6 +1,6 @@
name firamath
category Package
-revision 48995
+revision 53388
shortdesc Fira sans serif font with Unicode math support
relocated 1
longdesc Fira Math is a sans-serif font with Unicode math support. The
@@ -8,14 +8,13 @@
longdesc is distributed in OpenType format and can be used with the
longdesc unicode-math package under XeLaTeX or LuaLaTeX. More support is
longdesc offered by the firamath-otf package.
-runfiles size=46
+runfiles size=38
RELOC/fonts/opentype/public/firamath/FiraMath-Regular.otf
catalogue-also fira firamath-otf gfsneohellenicmath
catalogue-contact-bugs https://github.com/firamath/firamath/issues
catalogue-contact-home https://firamath.github.io/
catalogue-contact-repository https://github.com/firamath/firamath
catalogue-ctan /fonts/firamath
-catalogue-date 2018-10-28 09:23:50 +0100
catalogue-license ofl
catalogue-topics font font-otf font-sans font-maths
-catalogue-version 0.3.1
+catalogue-version 0.3.3
++++++ fithesis.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fithesis/README.md new/doc/latex/fithesis/README.md
--- old/doc/latex/fithesis/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/fithesis/README.md 2020-03-22 21:49:26.000000000 +0100
@@ -0,0 +1,97 @@
+# About #
+
+`Fithesis3` is a document class for the typesetting of theses at
+the Masaryk University (Brno, Czech Republic). The class has been
+designed for easy extensibility by style and locale files of other
+academic institutions.
+
+# Requirements #
+
+To install the package, you are going to need a POSIX.2-compliant
+environment as well as the following tools:
+
+ * GNU `make`
+ * `epstopdf`
+
+Aside from these tools, the installation requires a correctly
+configured TeX distribution containing the pdfTeX, XeTeX and LuaTeX
+engines as well as the LaTeX packages required for the typesetting
+of the technical documentation within the `fithesis.dtx` file and
+the guide files within the `guide/` subdirectory.
+
+For running the test suite using the `make tests` command, the
+following tools are also required:
+
+ * `faketime`
+ * `comparepdf`
+ * `pdftk`
+
+# Installation #
+
+To install the package, execute the following command from within
+the current directory:
+
+ make base
+ make install-base to=[[TDS]] nohash=true
+
+where `[[TDS]]` is a path in the TeX directory structure to which
+you are going to install the package (such as `/usr/share/texmf`).
+
+After successfully running the commands, update the file name
+database of your TeX distribution, if necessary:
+
+ * In MiKTeX:
+ - Using the GUI: In the Start Menu go to the MiKTeX entry and
+ open either the settings or the admin settings depending on
+ whether you are installing the package into a single-user
+ private directory tree or into a shared directory tree on a
+ multi-user system, respectively. The "MiKTeX Options" window
+ will open. Switch to the "General" tab and click the "Refresh
+ FNDB" button.
+ - Using the command prompt: Execute either `initexmf -u` or
+ `initexmf -u --admin` depending on whether you are installing
+ the package into a single-user private directory tree or into
+ a shared shared directory tree on a multi-user system.
+ * In TeX Live and MacTeX:
+ - Execute `texhash` with superuser privileges (`sudo texhash`).
+
+You may now also wish to typeset and install the user and technical
+documentation of the package. You can do that by running:
+
+ make docs
+ make install-docs to=[[TDS]] nohash=true
+
+where `[[TDS]]` is again a path in the TeX directory structure to
+which you are going to install the documentation and will likely be
+the same as before.
+
+After successfully running the commands, update the file name
+database of your TeX distribution, if necessary.
+
+# Uninstallation #
+
+To uninstall the package, execute the following command from within
+the current directory:
+
+ make uninstall from=[[TDS]]
+
+where `[[TDS]]` is a path in the TeX directory structure to which
+you are going to install the package (such as `/usr/share/texmf`).
+
+After successfully running the commands, update the file name
+database of your TeX distribution, if necessary:
+
+ * In MiKTeX:
+ - Using the GUI: In the Start Menu go to the MiKTeX entry and
+ open either the settings or the admin settings depending on
+ whether you are installing the package into a single-user
+ private directory tree or into a shared directory tree on a
+ multi-user system, respectively. The "MiKTeX Options" window
+ will open. Switch to the "General" tab and click the "Refresh
+ FNDB" button.
+ - Using the command prompt: Execute either `initexmf -u` or
+ `initexmf -u --admin` depending on whether you are installing
+ the package into a single-user private directory tree or into
+ a shared shared directory tree on a multi-user system.
+ * In TeX Live and MacTeX:
+ - Execute `texhash` with superuser privileges (`sudo texhash`).
Binary files old/doc/latex/fithesis/fithesis.pdf and new/doc/latex/fithesis/fithesis.pdf differ
Binary files old/doc/latex/fithesis/guide/mu/econ.pdf and new/doc/latex/fithesis/guide/mu/econ.pdf differ
Binary files old/doc/latex/fithesis/guide/mu/fi.pdf and new/doc/latex/fithesis/guide/mu/fi.pdf differ
Binary files old/doc/latex/fithesis/guide/mu/fsps.pdf and new/doc/latex/fithesis/guide/mu/fsps.pdf differ
Binary files old/doc/latex/fithesis/guide/mu/fss.pdf and new/doc/latex/fithesis/guide/mu/fss.pdf differ
Binary files old/doc/latex/fithesis/guide/mu/law.pdf and new/doc/latex/fithesis/guide/mu/law.pdf differ
Binary files old/doc/latex/fithesis/guide/mu/med.pdf and new/doc/latex/fithesis/guide/mu/med.pdf differ
Binary files old/doc/latex/fithesis/guide/mu/ped.pdf and new/doc/latex/fithesis/guide/mu/ped.pdf differ
Binary files old/doc/latex/fithesis/guide/mu/phil.pdf and new/doc/latex/fithesis/guide/mu/phil.pdf differ
Binary files old/doc/latex/fithesis/guide/mu/sci.pdf and new/doc/latex/fithesis/guide/mu/sci.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fithesis.doc.tlpobj new/tlpkg/tlpobj/fithesis.doc.tlpobj
--- old/tlpkg/tlpobj/fithesis.doc.tlpobj 2019-02-28 03:37:30.000000000 +0100
+++ new/tlpkg/tlpobj/fithesis.doc.tlpobj 2020-03-23 01:56:07.000000000 +0100
@@ -1,9 +1,10 @@
name fithesis.doc
category Package
-revision 47409
+revision 54483
shortdesc doc files of fithesis
relocated 1
-docfiles size=1003
+docfiles size=1306
+ RELOC/doc/latex/fithesis/README.md
RELOC/doc/latex/fithesis/fithesis.pdf
RELOC/doc/latex/fithesis/guide/mu/econ.pdf
RELOC/doc/latex/fithesis/guide/mu/fi.pdf
++++++ fithesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fithesis/fithesis3.cls new/tex/latex/fithesis/fithesis3.cls
--- old/tex/latex/fithesis/fithesis3.cls 2018-04-09 23:17:50.000000000 +0200
+++ new/tex/latex/fithesis/fithesis3.cls 2020-03-22 21:49:26.000000000 +0100
@@ -54,7 +54,7 @@
\gdef\thesis@version@number{#1}
\gdef\thesis@version@date{#2}
\gdef\thesis@version{#2 #1 fithesis3 MU thesis class}}
-\thesis(a)versiondef{v0.3.50}{2018/03/25}}
+\thesis(a)versiondef{v0.3.51}{2020/03/09}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ProvidesClass{fithesis3}[\thesis@version]
@@ -538,16 +538,10 @@
\def\thesis@@#1{\thesis@{\thesis@locale @#1}}
\def\thesis@lower#1{{%
\let\ea\expandafter
- \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\lowercase\ea\ea\ea
- \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea{\ea\ea\ea\ea\ea\ea\ea\ea\ea
- \ea\ea\ea\ea\ea\ea\@gobble\ea\ea\ea\string\ea\csname\csname the%
- sis@#1\endcsname\endcsname}}}
+ \ea\MakeLowercase\ea{\csname thesis@#1\endcsname}}}
\def\thesis@upper#1{{%
\let\ea\expandafter
- \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\uppercase\ea\ea\ea
- \ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea\ea{\ea\ea\ea\ea\ea\ea\ea\ea\ea
- \ea\ea\ea\ea\ea\ea\@gobble\ea\ea\ea\string\ea\csname\csname the%
- sis@#1\endcsname\endcsname}}}
+ \ea\MakeUppercase\ea{\csname thesis@#1\endcsname}}}
\def\thesis@@lower#1{\thesis@lower{\thesis@locale @#1}}
\def\thesis@@upper#1{\thesis@upper{\thesis@locale @#1}}
\def\thesis@head#1 #2{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fithesis/locale/fithesis-czech.def new/tex/latex/fithesis/locale/fithesis-czech.def
--- old/tex/latex/fithesis/locale/fithesis-czech.def 2018-02-12 23:56:35.000000000 +0100
+++ new/tex/latex/fithesis/locale/fithesis-czech.def 2020-03-22 21:49:26.000000000 +0100
@@ -100,7 +100,8 @@
\fi\fi\fi\fi\fi\fi
\thesis@year}}
-\gdef\thesis@czech@authorSignature{Podpis autora}
+\gdef\thesis@czech@authorSignature{%
+ Podpis autor\ifthesis@woman ky\else a\fi}
\gdef\thesis@czech@fieldTitle{Obor}
\gdef\thesis@czech@advisorTitle{Vedoucí práce}
\gdef\thesis@czech@authorTitle{Autor}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fithesis/locale/fithesis-slovak.def new/tex/latex/fithesis/locale/fithesis-slovak.def
--- old/tex/latex/fithesis/locale/fithesis-slovak.def 2018-02-12 23:56:35.000000000 +0100
+++ new/tex/latex/fithesis/locale/fithesis-slovak.def 2020-03-22 21:49:26.000000000 +0100
@@ -100,7 +100,8 @@
\fi\fi\fi\fi\fi\fi
\thesis@year}}
-\gdef\thesis@slovak@authorSignature{Podpis autora}
+\gdef\thesis@slovak@authorSignature{%
+ Podpis autor\ifthesis@woman ky\else a\fi}
\gdef\thesis@slovak@fieldTitle{Odbor}
\gdef\thesis@slovak@advisorTitle{Vedúci práce}
\gdef\thesis@slovak@authorTitle{Autor}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def new/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def
--- old/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def 2018-02-12 23:56:35.000000000 +0100
+++ new/tex/latex/fithesis/locale/mu/econ/fithesis-slovak.def 2020-03-22 21:49:26.000000000 +0100
@@ -65,7 +65,7 @@
\thesis@extra@advisorSkGenitiv\
a~uved\ifthesis@woman la\else iol\fi\ v~nej všetky
odborné zdroje v~súlade s~právnymi predpismi, vnútornými
- předpismi Masarykovej univerzity a~vnútornými aktmi riadenia
+ predpismi Masarykovej univerzity a~vnútornými aktmi riadenia
Masarykovej univerzity a~Ekonomicko-správnej fakulty MU.}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fithesis/locale/mu/fi/fithesis-czech.def new/tex/latex/fithesis/locale/mu/fi/fithesis-czech.def
--- old/tex/latex/fithesis/locale/mu/fi/fithesis-czech.def 2018-02-12 23:56:35.000000000 +0100
+++ new/tex/latex/fithesis/locale/mu/fi/fithesis-czech.def 2020-03-22 21:49:26.000000000 +0100
@@ -55,10 +55,10 @@
\gdef\thesis@czech@assignment{%
\ifthesis@digital@
Na tomto místě se v~tištěné práci nachází oficiální podepsané
- zadání práce a prohlášení autora školního díla.
+ zadání práce a~prohlášení autora školního díla.
\else
Místo tohoto listu vložte kopie oficiálního podepsaného zadání
- práce a prohlášení autora školního díla.
+ práce a~prohlášení autora školního díla.
\fi}
\gdef\thesis@czech@declaration{%
Prohlašuji, že tato \thesis@lower{czech@typeName} je mým
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fithesis/locale/mu/ped/fithesis-czech.def new/tex/latex/fithesis/locale/mu/ped/fithesis-czech.def
--- old/tex/latex/fithesis/locale/mu/ped/fithesis-czech.def 2018-02-12 23:56:35.000000000 +0100
+++ new/tex/latex/fithesis/locale/mu/ped/fithesis-czech.def 2020-03-22 21:49:26.000000000 +0100
@@ -56,10 +56,10 @@
\gdef\thesis@czech@declaration{%
Prohlašuji, že jsem \thesis@lower{czech@typeName@%
akuzativ} vypracoval\thesis@czech@gender@koncovka\ samostatně,
- s~využitím pouze citovaných pramenů, dalších informací a zdrojů
+ s~využitím pouze citovaných pramenů, dalších informací a~zdrojů
v~souladu s~Disciplinárním řádem pro studenty Pedagogické fakulty
- Masarykovy univerzity a se zákonem č.\ 121/2000 Sb., o~právu
- autorském, o~právech souvisejících s~právem autorským a o~změně
+ Masarykovy univerzity a~se zákonem č.\ 121/2000 Sb., o~právu
+ autorském, o~právech souvisejících s~právem autorským a~o~změně
některých zákonů (autorský zákon), ve znění pozdějších předpisů.}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fithesis/locale/mu/phil/fithesis-slovak.def new/tex/latex/fithesis/locale/mu/phil/fithesis-slovak.def
--- old/tex/latex/fithesis/locale/mu/phil/fithesis-slovak.def 2018-02-12 23:56:35.000000000 +0100
+++ new/tex/latex/fithesis/locale/mu/phil/fithesis-slovak.def 2020-03-22 21:49:26.000000000 +0100
@@ -59,7 +59,7 @@
\else
<<Neznáme oddělenie (\thesis@department)>>%
\fi}
-\gdef\thesis@czech@declaration{%
+\gdef\thesis@slovak@declaration{%
\ifx\thesis@department\thesis@departments@kisk
Vyhlasujem, že som predkladanú prácu spracoval%
\thesis@slovak@gender@koncovka\ samostatne~a použil%
Binary files old/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf and new/tex/latex/fithesis/logo/mu/fithesis-base-color.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-base.pdf and new/tex/latex/fithesis/logo/mu/fithesis-base.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf and new/tex/latex/fithesis/logo/mu/fithesis-econ-color.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-econ.pdf and new/tex/latex/fithesis/logo/mu/fithesis-econ.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf and new/tex/latex/fithesis/logo/mu/fithesis-fi-color.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-fi.pdf and new/tex/latex/fithesis/logo/mu/fithesis-fi.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf and new/tex/latex/fithesis/logo/mu/fithesis-fsps-color.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf and new/tex/latex/fithesis/logo/mu/fithesis-fsps.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf and new/tex/latex/fithesis/logo/mu/fithesis-fss-color.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-fss.pdf and new/tex/latex/fithesis/logo/mu/fithesis-fss.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf and new/tex/latex/fithesis/logo/mu/fithesis-law-color.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-law.pdf and new/tex/latex/fithesis/logo/mu/fithesis-law.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf and new/tex/latex/fithesis/logo/mu/fithesis-med-color.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-med.pdf and new/tex/latex/fithesis/logo/mu/fithesis-med.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf and new/tex/latex/fithesis/logo/mu/fithesis-ped-color.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-ped.pdf and new/tex/latex/fithesis/logo/mu/fithesis-ped.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf and new/tex/latex/fithesis/logo/mu/fithesis-phil-color.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-phil.pdf and new/tex/latex/fithesis/logo/mu/fithesis-phil.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf and new/tex/latex/fithesis/logo/mu/fithesis-sci-color.pdf differ
Binary files old/tex/latex/fithesis/logo/mu/fithesis-sci.pdf and new/tex/latex/fithesis/logo/mu/fithesis-sci.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fithesis/style/mu/fithesis-base.sty new/tex/latex/fithesis/style/mu/fithesis-base.sty
--- old/tex/latex/fithesis/style/mu/fithesis-base.sty 2018-02-12 23:56:35.000000000 +0100
+++ new/tex/latex/fithesis/style/mu/fithesis-base.sty 2020-03-22 21:49:26.000000000 +0100
@@ -49,7 +49,7 @@
%%
%% The names of the source files used are shown above.
%%
-\ProvidesPackage{fithesis/style/mu/fithesis-base}[2017/06/02]
+\ProvidesPackage{fithesis/style/mu/fithesis-base}[2018/12/25]
\NeedsTeXFormat{LaTeX2e}
\DeclareOption{10pt}{\def\thesis@ptsize{0}}
\DeclareOption{11pt}{\def\thesis@ptsize{1}}
@@ -179,6 +179,12 @@
\ifx\thesis@bibliography@sorting\undefined
\def\thesis@bibliography@sorting{#1}%
\fi}
+\thesis@def@extra[]{bibliography}
+\ifx\thesis@extra@bibliography
+ \thesis@placeholder@extra@bibliography\else
+ \expandafter\thesis@bibliography@setup\expandafter{%
+ \thesis@extra@bibliography}%
+\fi
\newif\ifthesis@bibliography@loaded@
\thesis@bibliography@loaded@false
\newif\ifthesis@bibliography@included@
@@ -215,7 +221,11 @@
\fi
\fi}
\thesis@require{hyperref}
-\hypersetup{pdfborderstyle={/S/U/W 1}} % Less obtrusive borders
+\ifthesis@digital@
+ \hypersetup{pdfborderstyle={/S/U/W 1}}
+\else
+ \hypersetup{hidelinks}
+\fi
\widowpenalty 10000
\clubpenalty 10000
\def\thesis@color@setup#1{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fithesis/style/mu/fithesis-econ.sty new/tex/latex/fithesis/style/mu/fithesis-econ.sty
--- old/tex/latex/fithesis/style/mu/fithesis-econ.sty 2018-02-12 23:56:35.000000000 +0100
+++ new/tex/latex/fithesis/style/mu/fithesis-econ.sty 2020-03-22 21:49:26.000000000 +0100
@@ -50,7 +50,7 @@
%% The names of the source files used are shown above.
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2018/02/11]
+\ProvidesPackage{fithesis/style/mu/fithesis-econ}[2018/06/11]
\thesis@color@setup{
links={HTML}{F27995},
tableEmph={HTML}{E8B88B},
@@ -108,21 +108,17 @@
\end{minipage}}\\[4em]\thesis@place, \thesis@year}}
\def\thesis@blocks@frontMatter{%
\thesis@blocks@clear
- % In case of double-sided typesetting, change the geometry
- \ifthesis@twoside@
- \newgeometry{top=25mm,bottom=20mm,left=35mm,
- right=15mm, includeheadfoot}
- \fi\pagestyle{empty}
+ \newgeometry{top=25mm,bottom=20mm,left=35mm,
+ right=15mm, includeheadfoot}
+ \pagestyle{empty}
\parindent 1.5em
\setcounter{page}{1}
\pagenumbering{arabic}}
\def\thesis@blocks@mainMatter{%
\thesis@blocks@clear
- % In case of double-sided typesetting, change the geometry
- \ifthesis@twoside@
- \newgeometry{top=25mm,bottom=20mm,left=35mm,
- right=15mm, includeheadfoot}
- \fi\pagestyle{thesisheadings}
+ \newgeometry{top=25mm,bottom=20mm,left=35mm,
+ right=15mm, includeheadfoot}
+ \pagestyle{thesisheadings}
\parindent 1.5em\relax}
\def\thesis@blocks@tables{%
\thesis@blocks@lot
@@ -196,16 +192,33 @@
\fi}
\def\thesis@blocks@bibEntry{%
\thesis@blocks@clear
- \noindent\begin{thesis@newtable@old}{@{}>{\bfseries}ll@{}}
- \thesis@@{bib@author}: & \thesis@author \\
- \thesis@@{bib@thesisTitle}: & \thesis@title \\
- \ifthesis@english\else
- \thesis@@{bib@thesisTitleEn}: & \thesis@titleEn \\
- \fi
- \thesis@@{bib@department}: & \thesis@department \\
- \thesis@@{bib@advisor}: & \thesis@advisor \\
- \thesis@@{bib@year}: & \thesis@year \\
- \end{thesis@newtable@old}}
+ {\let\@A\relax\newlength{\@A}
+ \settowidth{\@A}{{\bf\thesis@@{bib@author}}}
+ \@B=\@A
+ \settowidth{\@A}{{\bf\thesis@@{bib@thesisTitle}}}
+ \ifdim\@A>\@B\@B=\@A\fi
+ \ifthesis@english\else
+ \settowidth{\@A}{{\bf\thesis@@{bib@thesisTitleEn}}}
+ \ifdim\@A>\@B\@B=\@A\fi
+ \fi
+ \settowidth{\@A}{{\bf\thesis@@{bib@department}}}
+ \ifdim\@A>\@B\@B=\@A\fi
+ \settowidth{\@A}{{\bf\thesis@@{bib@advisor}}}
+ \ifdim\@A>\@B\@B=\@A\fi
+ \settowidth{\@A}{{\bf\thesis@@{bib@year}}}
+ \ifdim\@A>\@B\@B=\@A\fi
+ \noindent\begin{thesis@newtable@old}{@{}>{\bfseries}%
+ p{\dimexpr(\@B + \tabcolsep)}%
+ p{\dimexpr(\textwidth - \@B - 2\tabcolsep)}@{}}
+ \thesis@@{bib@author}: & \thesis@author \\
+ \thesis@@{bib@thesisTitle}: & \thesis@title \\
+ \ifthesis@english\else
+ \thesis@@{bib@thesisTitleEn}: & \thesis@titleEn \\
+ \fi
+ \thesis@@{bib@department}: & \thesis@department \\
+ \thesis@@{bib@advisor}: & \thesis@advisor \\
+ \thesis@@{bib@year}: & \thesis@year \\
+ \end{thesis@newtable@old}}}
\def\thesis@blocks@preamble{%
\thesis@blocks@coverMatter
\thesis@blocks@cover
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fithesis/style/mu/fithesis-law.sty new/tex/latex/fithesis/style/mu/fithesis-law.sty
--- old/tex/latex/fithesis/style/mu/fithesis-law.sty 2018-02-12 23:56:35.000000000 +0100
+++ new/tex/latex/fithesis/style/mu/fithesis-law.sty 2020-03-22 21:49:26.000000000 +0100
@@ -60,6 +60,8 @@
style=iso-authoryear,
sorting=nyt}
\thesis@bibliography@load
+\thesis@require{chngcntr}
+\counterwithout{footnote}{chapter}
\def\thesis@blocks@cover@header{%
{\sc\thesis@titlePage@Large\thesis@@{facultyLongName}\\%
\thesis@titlePage@large\thesis@department@name\\\vskip 2em}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fithesis/style/mu/fithesis-med.sty new/tex/latex/fithesis/style/mu/fithesis-med.sty
--- old/tex/latex/fithesis/style/mu/fithesis-med.sty 2018-02-12 23:56:35.000000000 +0100
+++ new/tex/latex/fithesis/style/mu/fithesis-med.sty 2020-03-22 21:49:26.000000000 +0100
@@ -50,7 +50,7 @@
%% The names of the source files used are shown above.
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{fithesis/style/mu/fithesis-med}[2018/02/11]
+\ProvidesPackage{fithesis/style/mu/fithesis-med}[2018/06/11]
\thesis@color@setup{
links={HTML}{F58E76},
tableEmph={HTML}{FF9D85},
@@ -108,21 +108,17 @@
\end{minipage}}\\[4em]\thesis@place, \thesis@@{semester}}}
\def\thesis@blocks@frontMatter{%
\thesis@blocks@clear
- % In case of double-sided typesetting, change the geometry
- \ifthesis@twoside@
- \newgeometry{top=25mm,bottom=20mm,left=35mm,
- right=15mm, includeheadfoot}
- \fi\pagestyle{empty}
+ \newgeometry{top=25mm,bottom=20mm,left=35mm,
+ right=15mm, includeheadfoot}
+ \pagestyle{empty}
\parindent 1.5em
\setcounter{page}{1}
\pagenumbering{roman}}
\def\thesis@blocks@mainMatter{%
\thesis@blocks@clear
- % In case of double-sided typesetting, change the geometry
- \ifthesis@twoside@
- \newgeometry{top=25mm,bottom=20mm,left=35mm,
- right=15mm, includeheadfoot}
- \fi\setcounter{page}{1}
+ \newgeometry{top=25mm,bottom=20mm,left=35mm,
+ right=15mm, includeheadfoot}
+ \setcounter{page}{1}
\pagenumbering{arabic}
\pagestyle{thesisheadings}
\parindent 1.5em
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fithesis/style/mu/fithesis-phil.sty new/tex/latex/fithesis/style/mu/fithesis-phil.sty
--- old/tex/latex/fithesis/style/mu/fithesis-phil.sty 2018-02-12 23:56:35.000000000 +0100
+++ new/tex/latex/fithesis/style/mu/fithesis-phil.sty 2020-03-22 21:49:26.000000000 +0100
@@ -57,7 +57,7 @@
tableOdd={HTML}{EBF6FA},
tableEven={HTML}{D0EBF5}}
\thesis@bibliography@setup{
- style=iso-numeric,
+ style=iso-authoryear,
sorting=nty}
\thesis@bibliography@load
\thesis@blocks@titlePage@department@true
@@ -67,18 +67,12 @@
\def\thesis@department@name{\thesis@@{departmentName}}
\def\thesis@departmentEn@name{\thesis@english@departmentName}
\fi
-\ifx\thesis@department\thesis@departments@kisk
- \def\thesis@blocks@titlePage@content{%
- {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in
- {\thesis@titlePage@large\sc\thesis@@{typeName}\\[0.3in]}
- {\thesis@titlePage@Large\bf\thesis@author}
- % If this is a KISK thesis, typeset the name of the thesis
- % advisor.
- \ifx\thesis@department\thesis@departments@kisk
- {\thesis@titlePage@large\\[0.3in]
- {\bf\thesis@@{advisorTitle}:} \thesis@advisor}
- \fi}%
-\fi
+\def\thesis@blocks@titlePage@content{%
+ {\thesis@titlePage@Huge\bf\thesis@TeXtitle\par\vfil}\vskip 0.8in
+ {\thesis@titlePage@large\sc\thesis@@{typeName}\\[0.3in]}
+ {\thesis@titlePage@Large\bf\thesis@author}
+ {\thesis@titlePage@large\\[0.3in]
+ {\bf\thesis@@{advisorTitle}:} \thesis@advisor}}
\def\thesis@blocks@preamble{%
\thesis@blocks@coverMatter
\thesis@blocks@cover
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fithesis.tlpobj new/tlpkg/tlpobj/fithesis.tlpobj
--- old/tlpkg/tlpobj/fithesis.tlpobj 2019-02-28 03:37:31.000000000 +0100
+++ new/tlpkg/tlpobj/fithesis.tlpobj 2020-03-23 01:56:08.000000000 +0100
@@ -1,13 +1,13 @@
name fithesis
category Package
-revision 47409
+revision 54483
shortdesc Thesis class and template for Masaryk University (Brno, Czech Republic)
relocated 1
longdesc A document class for the typesetting of theses at the Masaryk
longdesc University (Brno, Czech Republic). The class has been designed
longdesc for easy extensibility by style and locale files of other
longdesc academic institutions.
-runfiles size=596
+runfiles size=597
RELOC/tex/latex/fithesis/fithesis.cls
RELOC/tex/latex/fithesis/fithesis2.cls
RELOC/tex/latex/fithesis/fithesis3.cls
@@ -106,7 +106,6 @@
catalogue-contact-home https://www.fi.muni.cz/lemma/projekty/fithesis3/#fithesis
catalogue-contact-repository https://github.com/Witiko/fithesis3
catalogue-ctan /macros/latex/contrib/fithesis
-catalogue-date 2018-04-09 00:17:56 +0200
catalogue-license lppl1.3
catalogue-topics dissertation class
-catalogue-version 0.3.50
+catalogue-version 0.3.51
++++++ fixcmex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fixcmex/README new/doc/latex/fixcmex/README
--- old/doc/latex/fixcmex/README 2015-11-10 23:21:04.000000000 +0100
+++ new/doc/latex/fixcmex/README 2019-08-05 23:07:15.000000000 +0200
@@ -1,9 +1,9 @@
The fixcmex package provides fully scalable
Computer Modern Math Extensions font.
-This is version 1.0 of the package
+This is version 1.1 of the package
- Copyright 2015 Enrico Gregorio
+ Copyright 2019 Enrico Gregorio
This program is provided under the terms of the
LaTeX Project Public License distributed from CTAN
@@ -32,5 +32,5 @@
it (the FAQ on CTAN in /help/uktug-FAQ gives more
information about this magic place
-2015/11/10
+2019/08/05
Enrico Gregorio
Binary files old/doc/latex/fixcmex/fixcmex.pdf and new/doc/latex/fixcmex/fixcmex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fixcmex.doc.tlpobj new/tlpkg/tlpobj/fixcmex.doc.tlpobj
--- old/tlpkg/tlpobj/fixcmex.doc.tlpobj 2019-02-28 03:37:34.000000000 +0100
+++ new/tlpkg/tlpobj/fixcmex.doc.tlpobj 2019-08-06 01:53:04.000000000 +0200
@@ -1,8 +1,8 @@
name fixcmex.doc
category Package
-revision 38816
+revision 51825
shortdesc doc files of fixcmex
relocated 1
-docfiles size=50
+docfiles size=51
RELOC/doc/latex/fixcmex/README
RELOC/doc/latex/fixcmex/fixcmex.pdf
++++++ fixcmex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/fixcmex/fixcmex.sty new/tex/latex/fixcmex/fixcmex.sty
--- old/tex/latex/fixcmex/fixcmex.sty 2015-11-10 23:21:04.000000000 +0100
+++ new/tex/latex/fixcmex/fixcmex.sty 2019-08-05 23:07:15.000000000 +0200
@@ -8,29 +8,30 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2015 by Enrico Gregorio <Enrico dot Gregorio (at) univr dot it>
+%% Copyright (C) 2015-2019 by Enrico Gregorio <Enrico dot Gregorio (at) univr dot it>
%%
%% This file may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, either version 1.2 of this license
+%% 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.2 or later is part of all distributions of LaTeX version
-%% 1999/12/01 or later.
+%% and version 1.3c or later is part of all distributions of LaTeX
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{fixcmex}
- [2015/11/10 v1.0 Scalable math extensions font (Enrico Gregorio)]
+ [2019/08/05 v1.1 Scalable math extensions font (Enrico Gregorio)]
\def\fixcmex@fix{%
\DeclareFontShape{OMX}{cmex}{m}{n}{%
<-7.5> cmex7
<7.5-8.5> cmex8
<8.5-9.5> cmex9
<9.5-> cmex10
- }{}
- \DeclareSymbolFont{largesymbols}{OMX}{cmex}{m}{n}
+ }{}%
+ \SetSymbolFont{largesymbols}{normal}{OMX}{cmex}{m}{n}%
+ \SetSymbolFont{largesymbols}{bold}{OMX}{cmex}{m}{n}%
+ \mathversion{\math@version}%
}
\@onlypreamble\fixcmex@fix
\AtBeginDocument{%
@@ -46,8 +47,7 @@
\ifx\f@family
\fixcmex@lmex\aftergroup\fixcmex@fix
\else
- \PackageWarningNoLine{fixcmex}
- {No change in the math extension font}%
+ \PackageWarningNoLine{fixcmex}{No change in the math extension font}%
\fi
\fi
\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fixcmex.tlpobj new/tlpkg/tlpobj/fixcmex.tlpobj
--- old/tlpkg/tlpobj/fixcmex.tlpobj 2019-02-28 03:37:34.000000000 +0100
+++ new/tlpkg/tlpobj/fixcmex.tlpobj 2019-08-06 01:53:04.000000000 +0200
@@ -1,6 +1,6 @@
name fixcmex
category Package
-revision 38816
+revision 51825
shortdesc Fully scalable version of Computer Modern Math Extension font
relocated 1
longdesc This package provides a fully scalable version of the Computer
@@ -14,7 +14,7 @@
runfiles size=1
RELOC/tex/latex/fixcmex/fixcmex.sty
catalogue-ctan /macros/latex/contrib/fixcmex
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl1.3
+catalogue-date 2019-08-05 17:04:19 +0200
+catalogue-license lppl1.3c
catalogue-topics font-supp-maths
-catalogue-version 1.0
+catalogue-version 1.1
++++++ fiziko.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fiziko.doc.tlpobj new/tlpkg/tlpobj/fiziko.doc.tlpobj
--- old/tlpkg/tlpobj/fiziko.doc.tlpobj 2019-03-09 02:24:26.000000000 +0100
+++ new/tlpkg/tlpobj/fiziko.doc.tlpobj 2020-03-24 01:58:03.000000000 +0100
@@ -1,6 +1,6 @@
name fiziko.doc
category Package
-revision 50293
+revision 54512
shortdesc doc files of fiziko
relocated 1
docfiles size=1123
++++++ fiziko.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fiziko.tlpobj new/tlpkg/tlpobj/fiziko.tlpobj
--- old/tlpkg/tlpobj/fiziko.tlpobj 2019-03-09 02:24:28.000000000 +0100
+++ new/tlpkg/tlpobj/fiziko.tlpobj 2020-03-24 01:58:04.000000000 +0100
@@ -1,6 +1,6 @@
name fiziko
category Package
-revision 50293
+revision 54512
shortdesc A MetaPost library for physics textbook illustrations
relocated 1
longdesc This MetaPost library was initially written to automate some
@@ -15,7 +15,6 @@
catalogue-contact-bugs https://github.com/jemmybutton/fiziko/issues
catalogue-contact-repository https://github.com/jemmybutton/fiziko
catalogue-ctan /graphics/metapost/contrib/macros/fiziko
-catalogue-date 2019-03-08 16:31:18 +0100
-catalogue-license gpl3+cc-by-sa-4
+catalogue-license gpl3+ cc-by-sa-4
catalogue-topics physics graphics graphics-mpost
catalogue-version 0.1.3
++++++ fjodor.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fjodor/Changes.txt new/doc/latex/fjodor/Changes.txt
--- old/doc/latex/fjodor/Changes.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/fjodor/Changes.txt 2019-12-22 22:54:47.000000000 +0100
@@ -0,0 +1,4 @@
+
+Changes 2019/12/22
+
+Small changes in documentation file make Mark Rudolph.
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fjodor/README new/doc/latex/fjodor/README
--- old/doc/latex/fjodor/README 2010-09-09 20:21:23.000000000 +0200
+++ new/doc/latex/fjodor/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-
-This is the README file
-
-This package provide nice layout and typeout for a
-small books.
-
-This package is publisher under GNU GENERAL PUBLIC LICENCE.
-You can redistribute it and/or modify it under the terms
-og he GNU General Public Licence as published by the
-Free Software Foundation; either version 2 od the Licence,
-or (at your options) any later version.
-See www.gnu.org for details.
-
-Zoran T. Filipovic
-Jurija Gagarina 263/6
-11070 Novi Beograd
-Srbija
-zoran dot filipovic at yahoo dot com
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fjodor/README.txt new/doc/latex/fjodor/README.txt
--- old/doc/latex/fjodor/README.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/fjodor/README.txt 2019-12-22 22:54:47.000000000 +0100
@@ -0,0 +1,20 @@
+
+This is the README file
+
+ Copyright (C) 2019 Zoran Filipovi\'{c}
+
+This package provide nice layout and typeout for a
+small books.
+
+This package is publisher under GNU GENERAL PUBLIC LICENCE.
+You can redistribute it and/or modify it under the terms
+og he GNU General Public Licence as published by the
+Free Software Foundation; either version 2 od the Licence,
+or (at your options) any later version.
+See www.gnu.org for details.
+
+Zoran T. Filipovic
+Jurija Gagarina 263/6
+11070 Novi Beograd
+Srbija
+zoran dot filipovic at yahoo dot com
Binary files old/doc/latex/fjodor/fjodor.pdf and new/doc/latex/fjodor/fjodor.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/fjodor/fjodor.tex new/doc/latex/fjodor/fjodor.tex
--- old/doc/latex/fjodor/fjodor.tex 2010-10-27 01:31:49.000000000 +0200
+++ new/doc/latex/fjodor/fjodor.tex 2019-12-22 22:54:47.000000000 +0100
@@ -1,79 +1,60 @@
\documentclass[a4paper,12pt]{article}
\usepackage[T1]{fontenc}
-\usepackage[latin1]{inputenc}
+%\usepackage[latin1]{inputenc}
\usepackage{lmodern}
+\usepackage{microtype}
-\title{The \textsf{fjodor} package\protect\footnote{This package
-is dedicated of the glory work of russian writers Fjodor Mihajlovi\v{c} Dostojevski.}}
+\title{The \textsf{fjodor} package\protect\footnote{This package is dedicated to the glorious works of the Russian writer Fjodor Mihajlovi\v{c} Dostojevski.}}
\author{Zoran T. Filipovi\'{c} \\
Jurija Gagarina 263/6 \\
- 11070 Novi Beograd, Srbija}
+ 11070 Novi Beograd, Serbia}
-\usepackage[english,serbian]{babel}
+\usepackage[serbian,english]{babel}
\def\dateserbian{%
- \def\today{\number\day .~\ifcase\month\or
- januar\or februar\or mart\or april\or maj\or
- jun\or jul\or avgust\or septembar\or oktobar\or
- novembar\or decembar\fi \space \number\year.}}
+ \def\today{\number\day~\ifcase\month\or
+ January\or February\or March\or April\or May\or
+ June\or July\or August\or September\or October\or
+ November\or December\fi \space \number\year}}
\begin{document}
-\frenchspacing
+%\frenchspacing
\maketitle
\selectlanguage{english}
\begin{abstract}
-This package produce a very nice layout and typeout for a small books. Working
-under a \verb|memoir| documentclass. Package contains several options and name
-of options is same name of writers of this books.
+This package produces a very nice layout and typeblock for small book, working under the \verb|memoir| document class. The package contains several options and the names of the options are the same names as the writers of those books.
\end{abstract}
-\section{Put it!}
+\section{Use It!}
-If you want to yous this package just put it the following line in your preambula:
-\verb|\usepackage[options]{fjodor}| and push your machine.
+If you want to use this package just put the following line in your preamble: \verb|\usepackage[options]{fjodor}|.
-\subsection{Options}
-
-This package contains several options which is describle this.
+This package contains several options.
\begin{description}
-\item[fjodor] which i dadicated in Fjodor Mihailovi\v{c} Dostojevski produce layout in \verb|\pagemlargecrownvo| typeout in 9.5$\times$15.5\,cm whith 1.5\,cm spine margins
-and 2.5\,cm upper margins. Usefull for 10pt font size.
-\item[katajev] which i dadicated in Pavel Valentinovi\v{c} Katajev produce layout in
-17.5$\times$11.7\,cm, typeout in 9.1$\times$14.3\,cm whidth 1.3\,cm spine and upper margin.
-Total number of text lines is 34.
-\item[hese] which i dadicated to Hermann Hesse produce layout in 19.8$\times$14\,cm
-typeout in 9.8$\times$14.3\,cm whidth 1.75\,cm spine margin and 2.1\,cm upper margin.
-Total number of text lines is 34.
-\item[puskin] which i dadicated to Pu\v{s}kin produce layout in 19.8$\times$14\,cm
-typeout in 9.9$\times$15.2\,cm whidth 2\,cm spine margin and 2.5\,cm uper margin.
-\item[ernest] which i dadicated to Ernest Hemingway produce layout in 19$\times$12\,cm
-typeout in 9$\times$14.5\,cm whidth 1.3\,cm spine margin and 1.7\,cm upper margin.
-Total number of text lines is 35.
-\item[viktor] which i dadicated to Viktor Jorofejev produce layout in 19$\times$12\,cm
-typeout in 9.4$\times$15.04\,cm whidth 1\,cm spine margin and 1.4\,cm upper margin.
-Total number of text lines is 36.
-\item[remark] which i dadicated to Erich Maria Remarque produce layout in 19.5$\times$13.5\,cm
-typeout in 9.9$\times$15.4\,cm whidth 1.3\,cm spine margin and 1.5\,cm upper margin.
-Total number of text lines is 37.
-\item[tehnicar] which i dadicated to small technical book, which was printing on Mechanical Faculity of Belgrade, produce layout in 20$\times$14\,cm
-typeout in 10$\times$16\,cm whidth 1.5\,cm spine margin and 1.7\,cm upper margin.
-Total number of text lines is 46. Usefull for small tehnical book in 9pt font size.
-\item[ulro] which i dadicated in \v{C}eslav Milo\v{s}, book ZEMLJA ULRO,
-produce layout in 20$\times$14\,cm typeout in 9.8$\times$15.2\,cm whidth 2\,cm spine
-margin and 2\,cm upper margin. Total number of text lines is 37. Usefull for book in 10pt
-font size.
-\item[aristotel] which i dadicated to greek philosophist Aristotel, book FIZIKA,
-produce layout in 20.8$\times$13.7\,cm typeout in 8.1$\times$16.7\,cm whidth 2.7\,cm spine
-margin and 2\,cm upper margin. Total number of text lines is 40. Usefull for book in 10pt
-font size.
-\item[jaeger] which i dadicated to Charles Jaeger, book Th\'{e}orie G\'{e}n\'{e}rale du Coup
-De B\'{e}lier, produce layout in 24.1$\times$15.6\,cm typeout in 10.4$\times$16.9\,cm
-whidth 2.3\,cm spine margin and 3\,cm upper margin. Total number of text lines is 41 for 10pt
-font size.
-\item[tesla] which i dadicated to Nikola Tesla, book Colorado Springs Notes 1899---1900,
-produce layout in 27.7$\times$20.5\,cm typeout in 13.5$\times$21\,cm whidth 2.6\,cm spine
-margin and 2.6\,cm upper margin. Total number of text lines is 41 for 11pt font size.
+ \item[fjodor] which I have dedicated to Fjodor Mihailovi\v{c} Dostojevski, produces a layout of a \verb|\pagemlargecrownvo|, a textblock of $9.5 \times15.5$~cm, a $1.5$~cm spine, and a $2.5$~cm upper margin, particularly useful for a 10pt font size.
+
+ \item[katajev] which I have dedicated to Pavel Valentinovi\v{c} Katajev, produces a layout of $17.5 \times 11.7$~cm, a $9.1 \times 14.3$~cm typeblock, and a $1.3$~cm spine and upper margin. The total number of text lines is $34$.
+
+ \item[hese] which I have dedicated to Hermann Hesse, produces a layout of a $19.8 \times 14$~cm, a textblock of $9.8 \times 14.3$~cm, a $1.75$~cm spine and a $2.1$~cm upper margin. The total number of text lines is $34$.
+
+ \item[puskin] which I have dedicated to Alexander Sergeyevich Pu\v{s}kin, produces layout of $19.8 \times 14$~cm, a textblock of $9.9 \times 15.2$~cm, a $2$~cm spine, and a $2.5$~cm upper margin.
+
+ \item[ernest] which I have dedicated to Ernest Hemingway, produces a layout of $19 \times 12$~cm, a $9 \times 14.5$~cm typeblock, $1.3$~cm spine, and a $1.7$~cm upper margin. The total number of text lines is $35$.
+
+ \item[viktor] which I have dedicated to Viktor Vladimirovich Yerofeyev, produces a layout of $19 \times 12$~cm, a textblock of $9.4 \times 15.04$~cm, a $1$~cm spine, and a $1.4$~cm upper margin. The total number of text lines is $36$.
+
+ \item[remark] which I have dedicated to Erich Maria Remarque, produces a layout of $19.5 \times 13.5$~cm, a textblock of $9.9 \times 15.4$~cm, a $1.3$~cm spine, and a $1.5$~cm upper margin. The total number of text lines is 37.
+
+ \item[tehnicar] which I have dedicated to a small technical book printed by the Mechanical Faculty of Belgrade, produces a layout of $20 \times 14$~cm, a textblock of $10 \times 16$~cm, a $1.5$~cm spine, and a $1.7$~cm upper margin. The total number of text lines is $46$. This is useful for small technical books in a 9pt font size.
+
+ \item[ulro] which I have dedicated to Czes\l{}aw Mi\l{}osz's book ``Zemlja Ulro'', produces a layout of $20 \times 14$~cm, a textblock of $9.8 \times 15.2$~cm, a $2$~cm spine and a $2$~cm upper margin. The total number of text lines is $37$, useful for books in a 10pt font size.
+
+ \item[aristotel] which I have dedicated to the Greek philosopher Aristotle's book ``Physics'', produces a layout of $20.8 \times 13.7$~cm, a typeblock of $8.1 \times 16.7$~cm, a $2.7$~cm spine, and a $2$~cm upper margin. The total number of text lines is $40$ and is useful for books set in a 10pt font size.
+
+ \item[jaeger] which I have dedicated to Charles Jaeger's ``Th\'{e}orie G\'{e}n\'{e}rale Du Coup De B\'{e}lier'', produces a layout of $24.1 \times 15.6$~cm, a textblock of $10.4 \times 16.9$~cm, a $2.3$~cm spine, and a $3$~cm upper margin. The total number of text lines is $41$ for a 10pt font size.
+
+ \item[tesla] which I have dedicated to Nikola Tesla's book ``Colorado Springs Notes, 1899--1900'', produces a layout of $27.7 \times 20.5$~cm, a textblock of $13.5 \times 21$~cm, a $2.6$~cm spine, and a $2.6$~cm upper margin. The total number of text lines is $41$ for an 11pt font size.
\end{description}
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fjodor.doc.tlpobj new/tlpkg/tlpobj/fjodor.doc.tlpobj
--- old/tlpkg/tlpobj/fjodor.doc.tlpobj 2019-02-28 03:37:35.000000000 +0100
+++ new/tlpkg/tlpobj/fjodor.doc.tlpobj 2019-12-23 01:54:50.000000000 +0100
@@ -1,10 +1,11 @@
name fjodor.doc
category Package
-revision 20220
+revision 53207
shortdesc doc files of fjodor
relocated 1
-docfiles size=125
- RELOC/doc/latex/fjodor/README
+docfiles size=126
+ RELOC/doc/latex/fjodor/Changes.txt
+ RELOC/doc/latex/fjodor/README.txt
RELOC/doc/latex/fjodor/dostojevski.pdf
RELOC/doc/latex/fjodor/dostojevski.tex
RELOC/doc/latex/fjodor/fjodor.pdf
++++++ fjodor.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/fjodor.tlpobj new/tlpkg/tlpobj/fjodor.tlpobj
--- old/tlpkg/tlpobj/fjodor.tlpobj 2019-02-28 03:37:36.000000000 +0100
+++ new/tlpkg/tlpobj/fjodor.tlpobj 2019-12-23 01:54:50.000000000 +0100
@@ -1,6 +1,6 @@
name fjodor
category Package
-revision 20220
+revision 53207
shortdesc A selection of layout styles
relocated 1
longdesc The package provides several page layouts, selectable by
@@ -8,6 +8,5 @@
runfiles size=2
RELOC/tex/latex/fjodor/fjodor.sty
catalogue-ctan /macros/latex/contrib/fjodor
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics geometry
1
0
Hello community,
here is the log from the commit of package texlive-specs-h for openSUSE:Factory checked in at 2020-05-29 21:17:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-h (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-h.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-h"
Fri May 29 21:17:26 2020 rev:39 rq:806891 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-h/texlive-specs-h.changes 2019-11-07 23:10:28.732132790 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-h.new.3606/texlive-specs-h.changes 2020-05-29 21:25:55.940604530 +0200
@@ -1,0 +2,60 @@
+Mon May 18 08:47:10 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Wed May 6 11:27:35 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Scan *.def files as well for RequirePackage
+
+-------------------------------------------------------------------
+Tue May 5 13:55:07 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- Update to TeXLive 2020
+ * Port patches
+ kpathsea_cnf.dif
+ latexpand_perl.dif
+ luaotfload_varfonts.dif
+ luatex_cnf.dif
+ musixtex_various.dif
+ * Delete patches not needed anymore as files have moved
+ tetex_scripts.dif
+ * Delete patche updmap-map_roboto.dif as fixed upstream
+ * Add new patches to catch moved files
+ texlive-scripts-extra_scripts.dif
+ texlive-scripts_scripts.dif
+ * Add new patch xetex_conf.dif to fit FHS location
+ * Remove TeXLive installer files breaking rpm database
+ texlive-scripts.removes
+
+-------------------------------------------------------------------
New:
----
ehhline.doc.tar.xz
ehhline.tar.xz
embedfile.doc.tar.xz
embedfile.tar.xz
emoji.doc.tar.xz
emoji.tar.xz
emojicite.doc.tar.xz
emojicite.tar.xz
endnotes-hy.doc.tar.xz
endnotes-hy.tar.xz
epstopdf-pkg.doc.tar.xz
epstopdf-pkg.tar.xz
erewhon-math.doc.tar.xz
erewhon-math.tar.xz
esindex.doc.tar.xz
esindex.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-h.spec ++++++
++++ 13645 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-h/texlive-specs-h.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-h.new.3606/texlive-specs-h.spec
++++++ dviasm.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/dviasm/README new/texmf-dist/doc/latex/dviasm/README
--- old/texmf-dist/doc/latex/dviasm/README 2014-07-24 00:07:21.000000000 +0200
+++ new/texmf-dist/doc/latex/dviasm/README 2019-11-27 23:03:14.000000000 +0100
@@ -1,4 +1,4 @@
-DVIasm is a TeX utility program written by Jin-Hwan Cho, that is
+DVIasm is a TeX utility program originally written by Jin-Hwan Cho, that is
designed for editing DeVice-Independent (DVI) files directly.
It consists of a single Python program, dviasm.py, in a human readable
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dviasm.doc.tlpobj new/tlpkg/tlpobj/dviasm.doc.tlpobj
--- old/tlpkg/tlpobj/dviasm.doc.tlpobj 2019-02-28 03:33:06.000000000 +0100
+++ new/tlpkg/tlpobj/dviasm.doc.tlpobj 2019-11-28 01:56:44.000000000 +0100
@@ -1,6 +1,6 @@
name dviasm.doc
category Package
-revision 49945
+revision 52941
shortdesc doc files of dviasm
docfiles size=1
texmf-dist/doc/latex/dviasm/README
++++++ dviasm.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/dviasm/dviasm.py new/texmf-dist/scripts/dviasm/dviasm.py
--- old/texmf-dist/scripts/dviasm/dviasm.py 2019-02-05 22:53:56.000000000 +0100
+++ new/texmf-dist/scripts/dviasm/dviasm.py 2019-11-27 23:03:14.000000000 +0100
@@ -1,10 +1,12 @@
-#! /usr/bin/env python2.7
+#! /usr/bin/env python3
# -*- coding: utf-8 -*-
#
# This is DVIasm, a DVI utility for editing DVI files directly.
#
# Copyright (C) 2007-2008 by Jin-Hwan Cho <chofchof(a)ktug.or.kr>
# Copyright (C) 2011-2017 by Khaled Hosny <khaledhosny(a)eglug.org>
+# Copyright (C) 2019 by Arthur Reutenauer <arthur(a)reutenauer.eu>
+# Copyright (C) 2019 by Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
#
# 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
@@ -78,7 +80,7 @@
return True
def BadDVI(msg):
- raise AttributeError, 'Bad DVI file: %s!' % msg
+ raise AttributeError('Bad DVI file: %s!' % msg)
def GetByte(fp): # { returns the next byte, unsigned }
try: return ord(fp.read(1))
@@ -91,40 +93,40 @@
else: return b - 256
def Get2Bytes(fp): # { returns the next two bytes, unsigned }
- try: a, b = map(ord, fp.read(2))
+ try: a, b = fp.read(2)
except: BadDVI('Failed to Get2Bytes()')
return (a << 8) + b
def SignedPair(fp): # {returns the next two bytes, signed }
- try: a, b = map(ord, fp.read(2))
+ try: a, b = fp.read(2)
except: BadDVI('Failed to SignedPair()')
if a < 128: return (a << 8) + b
else: return ((a - 256) << 8) + b
def Get3Bytes(fp): # { returns the next three bytes, unsigned }
- try: a, b, c = map(ord, fp.read(3))
+ try: a, b, c = fp.read(3)
except: BadDVI('Failed to Get3Bytes()')
return (((a << 8) + b) << 8) + c
def SignedTrio(fp): # { returns the next three bytes, signed }
- try: a, b, c = map(ord, fp.read(3))
+ try: a, b, c = fp.read(3)
except: BadDVI('Failed to SignedTrio()')
if a < 128: return (((a << 8) + b) << 8) + c
else: return ((((a - 256) << 8) + b) << 8) + c
def Get4Bytes(fp): # { returns the next four bytes, unsigned }
- try: a, b, c, d = map(ord, fp.read(4))
+ try: a, b, c, d = fp.read(4)
except: BadDVI('Failed to Get4Bytes()')
return (((((a << 8) + b) << 8) + c) << 8) + d
def SignedQuad(fp): # { returns the next four bytes, signed }
- try: a, b, c, d = map(ord, fp.read(4))
+ try: a, b, c, d = fp.read(4)
except: BadDVI('Failed to get SignedQuad()')
if a < 128: return (((((a << 8) + b) << 8) + c) << 8) + d
else: return ((((((a - 256) << 8) + b) << 8) + c) << 8) + d
def PutByte(q):
- return chr(q & 0xff)
+ return bytes.fromhex('%02x' % (q & 0xff))
def Put2Bytes(q):
return PutByte(q>>8) + PutByte(q)
@@ -161,7 +163,7 @@
for glyph in glyphs:
s.append(Put2Bytes(glyph["id"]))
- return ''.join(s)
+ return b''.join(s)
def PutTextGlyphs(text, width, glyphs):
s = []
@@ -171,7 +173,7 @@
s.append(Put2Bytes(ch))
s.append(PutGlyphs(width, glyphs))
- return ''.join(s)
+ return b''.join(s)
def GetInt(s):
try: return int(s)
@@ -184,11 +186,11 @@
def UCS2toJIS(c):
s = c.encode('iso2022-jp')
if len(s) == 1: return ord(s)
- else: return (ord(s[3]) << 8) + ord(s[4])
+ else: return (s[3] << 8) + s[4]
def GetStrUTF8(s): # used in Parse()
if len(s) > 1 and ((s[0] == "'" and s[-1] == "'") or (s[0] == '"' and s[-1] == '"')):
- t = s[1:-1].decode('string_escape').decode('utf8')
+ t = s[1:-1]
if is_ptex: return [UCS2toJIS(c) for c in t]
else: return [ord(c) for c in t]
else: return ''
@@ -215,19 +217,26 @@
warning('Not support characters > 65535; may skip %d.\n' % o)
return "'%s'" % s
+def DecodeISO2022JP(c):
+ try:
+ s = bytes.fromhex("1b 24 42 %02x %02x" % (c//256, c%256)).decode('iso2022-jp')
+ except UnicodeDecodeError:
+ s = ''
+ return s
+
def PutStrUTF8(t): # unsed in Dump()
s = ''
if is_subfont:
for o in t:
- s += unichr((subfont_idx << 8) + o).encode('utf8')
+ s += chr((subfont_idx << 8) + o).encode('utf8')
else: # not the case of subfont
for o in t:
if o == 92: s += '\\\\'
elif 32 <= o < 127: s += chr(o)
elif o < 128: s += ('\\x%02x' % o)
elif is_ptex:
- s += ''.join(['\x1b$B', chr(o/256), chr(o%256)]).decode('iso2022-jp').encode('utf8')
- else: s += unichr(o).encode('utf8')
+ s += DecodeISO2022JP(o)
+ else: s += chr(o)
return "'%s'" % s
def PutStrSJIS(t): # unsed in Dump()
@@ -237,7 +246,7 @@
elif 32 <= o < 127: s += chr(o)
elif o < 128: s += ('\\x%02x' % o)
else:
- s += ''.join(['\x1b$B', chr(o/256), chr(o%256)]).decode('iso2022-jp').encode('sjis')
+ s += DecodeISO2022JP(o).encode('sjis')
return "'%s'" % s
def IsFontChanged(f, z):
@@ -287,7 +296,7 @@
# Load: DVI -> Internal Format
##########################################################
def Load(self, fn):
- fp = file(fn, 'rb')
+ fp = open(fn, 'rb')
self.LoadFromFile(fp)
fp.close()
@@ -301,7 +310,7 @@
while loc >= 0:
fp.seek(loc)
if GetByte(fp) != BOP: BadDVI('byte %d is not bop' % fp.tell())
- cnt = [SignedQuad(fp) for i in xrange(10)]
+ cnt = [SignedQuad(fp) for i in range(10)]
loc = SignedQuad(fp)
page = self.ProcessPage(fp)
self.pages.insert(0, {'count':cnt, 'content':page})
@@ -329,7 +338,7 @@
warning('magnification is %d; use the default 1000!' % mag)
else:
self.mag = mag
- self.comment = fp.read(GetByte(fp))
+ self.comment = fp.read(GetByte(fp)).decode('utf8')
self.ComputeConversionFactors()
def ProcessPostamble(self, fp):
@@ -378,19 +387,22 @@
m = GetByte(fp)
if not ValidID(m):
warning('identification in byte %d should be one of: %s!' % (fp.tell() - 1, DVI_IDS))
+ if not self.id == m:
+ if not (self.id == 2 and m == 3): # pTeX/upTeX with dir allowed
+ warning('ID byte mismatch: preamble %d vs postamble %d!' % (self.id, m))
def DefineFont(self, e, fp):
c = SignedQuad(fp) # font_check_sum
q = SignedQuad(fp) # font_scaled_size
d = SignedQuad(fp) # font_design_size
- n = fp.read(GetByte(fp) + GetByte(fp))
+ n = fp.read(GetByte(fp) + GetByte(fp)).decode('utf8')
try:
f = self.font_def[e]
except KeyError:
self.font_def[e] = {'name':n, 'checksum':c, 'scaled_size':q, 'design_size':d}
- if q <= 0 or q >= 01000000000:
+ if q <= 0 or q >= 0o1000000000:
warning("%s---not loaded, bad scale (%d)!" % (n, q))
- elif d <= 0 or d >= 01000000000:
+ elif d <= 0 or d >= 0o1000000000:
warning("%s---not loaded, bad design size (%d)!" % (n, d))
else:
if f['checksum'] != c:
@@ -406,7 +418,7 @@
size = Get4Bytes(fp) # scaled size
flags = Get2Bytes(fp)
l = GetByte(fp) # name length
- fnt_name = fp.read(l)
+ fnt_name = fp.read(l).decode('utf8')
index = Get4Bytes(fp) # face index
ext = []
embolden = 0
@@ -486,7 +498,7 @@
elif o < FNT_NUM_0 + 64 or o in (FNT1, FNT2, FNT3, FNT4):
s.append([FNT1, p])
elif o in (XXX1, XXX2, XXX3, XXX4):
- q = fp.read(p)
+ q = fp.read(p).decode('utf8')
s.append([XXX1, q])
elif o in (FNT_DEF1, FNT_DEF2, FNT_DEF3, FNT_DEF4):
self.DefineFont(p, fp)
@@ -590,41 +602,41 @@
# Save: Internal Format -> DVI
##########################################################
def Save(self, fn):
- fp = file(fn, 'wb')
+ fp = open(fn, 'wb')
self.SaveToFile(fp)
fp.close()
def SaveToFile(self, fp):
# WritePreamble
- fp.write(''.join([chr(PRE), PutByte(self.id), PutSignedQuad(self.numerator), PutSignedQuad(self.denominator), PutSignedQuad(self.mag), PutByte(len(self.comment)), self.comment]))
+ fp.write(b''.join([bytes.fromhex('%02x' % PRE), PutByte(self.id), PutSignedQuad(self.numerator), PutSignedQuad(self.denominator), PutSignedQuad(self.mag), PutByte(len(self.comment)), self.comment.encode('utf8')]))
# WriteFontDefinitions
self.WriteFontDefinitions(fp)
# WritePages
stackdepth = 0; loc = -1
for page in self.pages:
w = x = y = z = 0; stack = []
- s = [chr(BOP)]
+ s = [bytes.fromhex('%02x' % BOP)]
s.extend([PutSignedQuad(c) for c in page['count']])
s.append(PutSignedQuad(loc))
for cmd in page['content']:
if cmd[0] == SET1:
for o in cmd[1]:
- if o < 128: s.append(chr(SET_CHAR_0 + o))
+ if o < 128: s.append(bytes.fromhex('%02x' % (SET_CHAR_0 + o)))
else: s.append(self.CmdPair([SET1, o]))
elif cmd[0] in (SET_RULE, PUT_RULE):
- s.append(chr(cmd[0]) + PutSignedQuad(cmd[1][0]) + PutSignedQuad(cmd[1][1]))
+ s.append(bytes.fromhex('%02x' % cmd[0]) + PutSignedQuad(cmd[1][0]) + PutSignedQuad(cmd[1][1]))
elif cmd[0] == PUT1:
s.append(self.CmdPair([PUT1, cmd[1][0]]))
elif cmd[0] in (RIGHT1, DOWN1):
s.append(self.CmdPair(cmd))
elif cmd[0] in (W0, X0, Y0, Z0):
- s.append(chr(cmd[0]))
+ s.append(bytes.fromhex('%02x' % cmd[0]))
elif cmd[0] == PUSH:
- s.append(chr(PUSH))
+ s.append(bytes.fromhex('%02x' % PUSH))
stack.append((w, x, y, z))
if len(stack) > stackdepth: stackdepth = len(stack)
elif cmd[0] == POP:
- s.append(chr(POP))
+ s.append(bytes.fromhex('%02x' % POP))
w, x, y, z = stack.pop()
elif cmd[0] == W1:
w = cmd[1]; s.append(self.CmdPair(cmd))
@@ -635,18 +647,19 @@
elif cmd[0] == Z1:
z = cmd[1]; s.append(self.CmdPair(cmd))
elif cmd[0] == FNT1:
- if cmd[1] < 64: s.append(chr(FNT_NUM_0 + cmd[1]))
+ if cmd[1] < 64: s.append(bytes.fromhex('%02x' % (FNT_NUM_0 + cmd[1])))
else: s.append(self.CmdPair(cmd))
elif cmd[0] == XXX1:
+ cmd1 = cmd[1].encode('utf8')
l = len(cmd[1])
- if l < 256: s.append(chr(XXX1) + chr(l) + cmd[1])
- else: s.append(chr(XXX4) + PutSignedQuad(l) + cmd[1])
+ if l < 256: s.append(bytes.fromhex('%02x' % XXX1) + bytes.fromhex('%02x' % l) + cmd1)
+ else: s.append(bytes.fromhex('%02x' % XXX4) + PutSignedQuad(l) + cmd1)
elif cmd[0] == DIR:
- s.append(chr(DIR) + chr(cmd[1]))
+ s.append(bytes.fromhex('%02x' % DIR) + bytes.fromhex('%02x' % cmd[1]))
elif cmd[0] == BEGIN_REFLECT:
- s.append(chr(BEGIN_REFLECT))
+ s.append(bytes.fromhex('%02x' % BEGIN_REFLECT))
elif cmd[0] == END_REFLECT:
- s.append(chr(END_REFLECT))
+ s.append(bytes.fromhex('%02x' % END_REFLECT))
elif cmd[0] == GLYPHS:
s.append(PutByte(GLYPHS))
s.append(PutGlyphs(cmd[1], cmd[2]))
@@ -655,19 +668,19 @@
s.append(PutTextGlyphs(cmd[1], cmd[2], cmd[3]))
else:
warning('invalid command %s!' % cmd[0])
- s.append(chr(EOP))
+ s.append(bytes.fromhex('%02x' % EOP))
loc = fp.tell()
- fp.write(''.join(s))
+ fp.write(b''.join(s))
# WritePostamble
post_loc = fp.tell()
- fp.write(''.join([chr(POST), PutSignedQuad(loc), PutSignedQuad(self.numerator), PutSignedQuad(self.denominator), PutSignedQuad(self.mag), PutSignedQuad(self.max_v), PutSignedQuad(self.max_h), Put2Bytes(stackdepth+1), Put2Bytes(len(self.pages))]))
+ fp.write(b''.join([bytes.fromhex('%02x' % POST), PutSignedQuad(loc), PutSignedQuad(self.numerator), PutSignedQuad(self.denominator), PutSignedQuad(self.mag), PutSignedQuad(self.max_v), PutSignedQuad(self.max_h), Put2Bytes(stackdepth+1), Put2Bytes(len(self.pages))]))
# WriteFontDefinitions
self.WriteFontDefinitions(fp)
# WritePostPostamble
- fp.write(''.join([chr(POST_POST), PutSignedQuad(post_loc), PutByte(self.id), '\xdf\xdf\xdf\xdf']))
+ fp.write(b''.join([bytes.fromhex('%02x' % POST_POST), PutSignedQuad(post_loc), PutByte(self.id_post), b'\xdf\xdf\xdf\xdf']))
loc = fp.tell()
while (loc % 4) != 0:
- fp.write('\xdf'); loc += 1
+ fp.write(b'\xdf'); loc += 1
def WriteFontDefinitions(self, fp):
s = []
@@ -679,9 +692,8 @@
s.append(PutSignedQuad(self.font_def[e]['scaled_size']))
s.append(Put2Bytes(flags))
s.append(PutByte(len(self.font_def[e]['name'])))
- s.append(self.font_def[e]['name'])
+ s.append(self.font_def[e]['name'].encode('utf8'))
s.append(PutSignedQuad(self.font_def[e]['index']))
- print >> sys.stderr, self.font_def[e]['name'], self.font_def[e]['index']
if flags & XDV_FLAG_COLORED: s.append(PutSignedQuad(self.font_def[e]['color']))
if flags & XDV_FLAG_EXTEND: s.append(PutSignedQuad(self.font_def[e]['extend']))
if flags & XDV_FLAG_SLANT: s.append(PutSignedQuad(self.font_def[e]['slant']))
@@ -693,20 +705,20 @@
s.append(PutSignedQuad(self.font_def[e]['checksum']))
s.append(PutSignedQuad(self.font_def[e]['scaled_size']))
s.append(PutSignedQuad(self.font_def[e]['design_size']))
- s.append('\x00')
+ s.append(b'\x00')
s.append(PutByte(len(self.font_def[e]['name'])))
- s.append(self.font_def[e]['name'])
- fp.write(''.join(s))
+ s.append(self.font_def[e]['name'].encode('utf8'))
+ fp.write(b''.join(s))
def CmdPair(self, cmd):
l, q = PutSigned(cmd[1])
- return chr(cmd[0] + l) + q
+ return bytes.fromhex('%02x' % (cmd[0] + l)) + q
##########################################################
# Parse: Text -> Internal Format
##########################################################
def Parse(self, fn, encoding=''):
- fp = file(fn, 'r')
+ fp = open(fn, 'r')
s = fp.read()
fp.close()
self.ParseFromString(s, encoding=encoding)
@@ -717,6 +729,7 @@
else: GetStr = GetStrUTF8
self.Initialize()
self.fnt_num = 0
+ dir_used = 0
for l in s.split('\n'):
l = l.strip()
if not l or l[0] == '%': continue
@@ -818,7 +831,7 @@
else:
is_subfont = False
try:
- e = self.font_def.keys()[self.font_def.values().index(f)]
+ e = list(self.font_def.keys())[list(self.font_def.values()).index(f)]
except:
e = self.fnt_num
self.font_def[self.fnt_num] = f
@@ -850,6 +863,7 @@
self.cur_page.append([Z0])
elif key == 'dir':
self.cur_page.append([DIR, GetInt(val)])
+ dir_used = 1
elif key == 'begin_reflect':
self.cur_page.append([BEGIN_REFLECT])
elif key == 'end_reflect':
@@ -862,11 +876,15 @@
self.cur_page.append([TEXT_GLYPHS, text, w, glyphs])
else:
warning('invalid command %s!' % key)
+ if self.id == 2 and dir_used == 1: # standard DVI with dir -> force pTeX/upTeX spec
+ self.id_post = 3
+ else:
+ self.id_post = self.id
def AppendFNT1(self):
f = {'name':cur_font+"%02x"%subfont_idx, 'design_size':cur_dsize, 'scaled_size':cur_ssize, 'checksum':0}
try:
- e = self.font_def.keys()[self.font_def.values().index(f)]
+ e = list(self.font_def.keys())[list(self.font_def.values()).index(f)]
except:
e = self.fnt_num
self.font_def[e] = f
@@ -877,7 +895,7 @@
# Dump: Internal Format -> Text
##########################################################
def Dump(self, fn, tabsize=2, encoding=''):
- fp = file(fn, 'w')
+ fp = open(fn, 'w')
self.DumpToFile(fp, tabsize=tabsize, encoding=encoding)
fp.close()
@@ -1130,10 +1148,12 @@
http://tug.org/TUGboat/Articles/tb28-2/tb89cho.pdf
http://ajt.ktug.kr/assets/2008/5/1/0201cho.pdf"""
- version = """This is %prog-20190202 by Jin-Hwan Cho (Korean TeX Society)
+ version = """This is %prog-20191126
Copyright (C) 2007-2008 by Jin-Hwan Cho <chofchof(a)ktug.or.kr>
Copyright (C) 2011-2017 by Khaled Hosny <khaledhosny(a)eglug.org>
+Copyright (C) 2019 by Arthur Reutenauer <arthur(a)reutenauer.eu>
+Copyright (C) 2019 by Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
This is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1159,7 +1179,7 @@
help="tab size for push/pop [default=%default]")
parser.add_option("-p", "--ptex",
action="store_true", dest="ptex", default=False,
- help="extended DVI for Japanese pTeX")
+ help="ISO-2022-JP-encoded DVI for Japanese pTeX")
parser.add_option("-s", "--subfont",
action="append", type="string", dest="subfont",
metavar="STR",
@@ -1191,7 +1211,7 @@
from os.path import splitext
if splitext(fname)[1] not in ('.dvi', '.xdv'): return False
try:
- fp = file(fname, 'rb')
+ fp = open(fname, 'rb')
fp.seek(0)
if GetByte(fp) != PRE: return False
fp.seek(-4, 2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dviasm.tlpobj new/tlpkg/tlpobj/dviasm.tlpobj
--- old/tlpkg/tlpobj/dviasm.tlpobj 2019-02-28 03:33:06.000000000 +0100
+++ new/tlpkg/tlpobj/dviasm.tlpobj 2019-11-28 01:56:44.000000000 +0100
@@ -1,6 +1,6 @@
name dviasm
category Package
-revision 49945
+revision 52941
shortdesc A utility for editing DVI files
longdesc A Python script to support changing or creating DVI files via
longdesc disassembling into text, editing, and then reassembling into
@@ -14,6 +14,6 @@
catalogue-contact-development https://github.com/khaledhosny/dviasm
catalogue-contact-repository https://github.com/khaledhosny/dviasm
catalogue-ctan /dviware/dviasm
-catalogue-date 2019-02-05 14:03:53 +0100
+catalogue-date 2019-11-26 22:08:14 +0100
catalogue-license gpl3
catalogue-topics dvi-struc
++++++ dvicopy.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/dvicopy.1 new/texmf-dist/doc/man/man1/dvicopy.1
--- old/texmf-dist/doc/man/man1/dvicopy.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/dvicopy.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH DVICOPY 1 TeX "24 January 1999" "Web2C 2019"
+.TH DVICOPY 1 TeX "24 January 1999" "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/dvicopy.man1.pdf and new/texmf-dist/doc/man/man1/dvicopy.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dvicopy.doc.tlpobj new/tlpkg/tlpobj/dvicopy.doc.tlpobj
--- old/tlpkg/tlpobj/dvicopy.doc.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/dvicopy.doc.tlpobj 2020-03-04 23:50:36.000000000 +0100
@@ -1,6 +1,6 @@
name dvicopy.doc
category TLCore
-revision 50602
+revision 54070
shortdesc doc files of dvicopy
docfiles size=7
texmf-dist/doc/man/man1/dvicopy.1
++++++ dvidvi.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/dvidvi.man1.pdf and new/texmf-dist/doc/man/man1/dvidvi.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dvidvi.doc.tlpobj new/tlpkg/tlpobj/dvidvi.doc.tlpobj
--- old/tlpkg/tlpobj/dvidvi.doc.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/dvidvi.doc.tlpobj 2019-11-19 01:55:40.000000000 +0100
@@ -1,6 +1,6 @@
name dvidvi.doc
category TLCore
-revision 50602
+revision 52851
shortdesc doc files of dvidvi
docfiles size=7
texmf-dist/doc/man/man1/dvidvi.1
++++++ dviljk.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/dvihp.man1.pdf and new/texmf-dist/doc/man/man1/dvihp.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/dvilj.man1.pdf and new/texmf-dist/doc/man/man1/dvilj.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/dvilj2p.man1.pdf and new/texmf-dist/doc/man/man1/dvilj2p.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/dvilj4.man1.pdf and new/texmf-dist/doc/man/man1/dvilj4.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/dvilj4l.man1.pdf and new/texmf-dist/doc/man/man1/dvilj4l.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/dvilj6.man1.pdf and new/texmf-dist/doc/man/man1/dvilj6.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dviljk.doc.tlpobj new/tlpkg/tlpobj/dviljk.doc.tlpobj
--- old/tlpkg/tlpobj/dviljk.doc.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/dviljk.doc.tlpobj 2019-11-19 01:55:40.000000000 +0100
@@ -1,6 +1,6 @@
name dviljk.doc
category TLCore
-revision 50602
+revision 52851
shortdesc doc files of dviljk
docfiles size=92
texmf-dist/doc/man/man1/dvihp.1
++++++ dviout-util.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/chkdvifont.man1.pdf and new/texmf-dist/doc/man/man1/chkdvifont.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/dvispc.man1.pdf and new/texmf-dist/doc/man/man1/dvispc.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dviout-util.doc.tlpobj new/tlpkg/tlpobj/dviout-util.doc.tlpobj
--- old/tlpkg/tlpobj/dviout-util.doc.tlpobj 2019-03-27 02:24:05.000000000 +0100
+++ new/tlpkg/tlpobj/dviout-util.doc.tlpobj 2019-11-19 01:55:40.000000000 +0100
@@ -1,6 +1,6 @@
name dviout-util.doc
category Package
-revision 50602
+revision 52851
shortdesc doc files of dviout-util
docfiles size=14
texmf-dist/doc/man/man1/chkdvifont.1
++++++ dvipdfmx.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/dvipdfm.man1.pdf and new/texmf-dist/doc/man/man1/dvipdfm.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/dvipdfmx.man1.pdf and new/texmf-dist/doc/man/man1/dvipdfmx.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/dvipdft.man1.pdf and new/texmf-dist/doc/man/man1/dvipdft.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/ebb.man1.pdf and new/texmf-dist/doc/man/man1/ebb.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/extractbb.man1.pdf and new/texmf-dist/doc/man/man1/extractbb.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/xdvipdfmx.man1.pdf and new/texmf-dist/doc/man/man1/xdvipdfmx.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dvipdfmx.doc.tlpobj new/tlpkg/tlpobj/dvipdfmx.doc.tlpobj
--- old/tlpkg/tlpobj/dvipdfmx.doc.tlpobj 2019-03-27 02:24:05.000000000 +0100
+++ new/tlpkg/tlpobj/dvipdfmx.doc.tlpobj 2019-11-19 01:55:40.000000000 +0100
@@ -1,6 +1,6 @@
name dvipdfmx.doc
category TLCore
-revision 50602
+revision 52851
shortdesc doc files of dvipdfmx
docfiles size=992
texmf-dist/doc/dvipdfm/Makefile
++++++ dvipdfmx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/dvipdfmx/dvipdfmx.cfg new/texmf-dist/dvipdfmx/dvipdfmx.cfg
--- old/texmf-dist/dvipdfmx/dvipdfmx.cfg 2015-11-05 01:08:47.000000000 +0100
+++ new/texmf-dist/dvipdfmx/dvipdfmx.cfg 2019-11-13 00:50:35.000000000 +0100
@@ -156,7 +156,7 @@
%% kpsewhich -progname=dvipdfmx -format='other text files' dvipdfmx.cfg
%% and control which one is found by setting DVIPDFMXINPUTS.
%%
-D "rungs -q -dNOPAUSE -dBATCH -dEPSCrop -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dAutoRotatePages=/None -sOutputFile='%o' '%i' -c quit"
+D "rungs -q -dDELAYSAFER -dNOPAUSE -dBATCH -dEPSCrop -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dAutoRotatePages=/None -sOutputFile='%o' '%i' -c quit"
% other random ps converters people have experimented with.
%D "/usr/local/bin/ps2pdf -dEPSCrop '%i' '%o'"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dvipdfmx.tlpobj new/tlpkg/tlpobj/dvipdfmx.tlpobj
--- old/tlpkg/tlpobj/dvipdfmx.tlpobj 2019-03-27 02:24:06.000000000 +0100
+++ new/tlpkg/tlpobj/dvipdfmx.tlpobj 2019-11-19 01:55:41.000000000 +0100
@@ -1,6 +1,6 @@
name dvipdfmx
category TLCore
-revision 50602
+revision 52851
shortdesc An extended version of dvipdfm
longdesc Dvipdfmx (formerly dvipdfm-cjk) is a development of dvipdfm
longdesc created to support multi-byte character encodings and large
@@ -25,10 +25,10 @@
texmf-dist/fonts/map/dvipdfmx/ckx.map
tlpkg/tlpostcode/dvipdfmx.pl
catalogue-alias xdvipdfmx
-catalogue-contact-bugs http://lists.tug.org/tex-k
+catalogue-contact-bugs https://lists.tug.org/dvipdfmx
catalogue-contact-home http://project.ktug.or.kr/dvipdfmx/
catalogue-contact-repository https://tug.org/svn/texlive/trunk/Build/source/texk/dvipdfm-x/
-catalogue-contact-support http://lists.tug.org/tex-k
-catalogue-date 2019-02-03 12:23:27 +0100
+catalogue-contact-support https://lists.tug.org/dvipdfmx
+catalogue-date 2019-07-31 13:16:15 +0200
catalogue-license gpl
catalogue-topics dvi-pdf
++++++ dvipng.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/dvipng/dvipng.html new/texmf-dist/doc/dvipng/dvipng.html
--- old/texmf-dist/doc/dvipng/dvipng.html 2019-04-08 18:55:06.000000000 +0200
+++ new/texmf-dist/doc/dvipng/dvipng.html 2020-03-13 18:38:53.000000000 +0100
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<!-- Created by GNU Texinfo 6.6, http://www.gnu.org/software/texinfo/ -->
+<!-- Created by GNU Texinfo 6.7, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>A DVI-to-PNG translator</title>
@@ -84,7 +84,7 @@
</ul></li>
<li><a id="toc-Credits-1" href="#Credits">8 Credits</a></li>
<li><a id="toc-Copying-1" href="#Copying">9 Copying</a></li>
- <li><a id="toc-Index-1" href="#Index">Index</a></li>
+ <li><a id="toc-Index-1" href="#Index" rel="index">Index</a></li>
</ul>
</div>
@@ -98,7 +98,7 @@
<p>This manual documents dvipng, a program to translate a DVI (DeVice
Independent) file into PNG (Portable Network Graphics).
</p>
-<p>This file documents dvipng version 1.16
+<p>This file documents dvipng version 1.17
</p>
<p>Corrections or perhaps rewrites of sections are <em>very welcome</em>.
</p>
@@ -124,7 +124,7 @@
</td></tr>
<tr><td align="left" valign="top">• <a href="#Copying" accesskey="9">Copying</a></td><td> </td><td align="left" valign="top">GNU Lesser General Public License
</td></tr>
-<tr><td align="left" valign="top">• <a href="#Index">Index</a></td><td> </td><td align="left" valign="top">General index
+<tr><td align="left" valign="top">• <a href="#Index" rel="index">Index</a></td><td> </td><td align="left" valign="top">General index
</td></tr>
</table>
@@ -472,7 +472,7 @@
dvipng with no arguments or with the standard ‘<samp>--help</samp>’ option.
</p>
<div class="example">
-<pre class="example">This is ./dvipng 1.16 Copyright 2002-2015, 2019 Jan-Ake Larsson
+<pre class="example">This is ./dvipng 1.17 Copyright 2002-2015, 2019 Jan-Ake Larsson
Usage: ./dvipng [OPTION]... FILENAME[.dvi]
Options are chosen to be similar to dvips' options where possible:
@@ -1285,7 +1285,7 @@
R. Shemanske, Stephen Gibson, Christian Ridderström, Ezra Peisach,
William H Wheeler, Thomas Klausner, Harald Koenig, Adrian Bunk, Kevin
Smith, Jason Riedy, Wolfram Krause, Reinhard Kotucha, Takeshi Abe,
-Waldeck Schutzer, and Andy Nguyen.
+Waldeck Schutzer, Ahzo, and Andy Nguyen.
</p>
<hr>
Binary files old/texmf-dist/doc/dvipng/dvipng.pdf and new/texmf-dist/doc/dvipng/dvipng.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/info/dvipng.info new/texmf-dist/doc/info/dvipng.info
--- old/texmf-dist/doc/info/dvipng.info 2019-04-08 18:55:06.000000000 +0200
+++ new/texmf-dist/doc/info/dvipng.info 2020-03-13 18:38:53.000000000 +0100
@@ -1,4 +1,4 @@
-This is dvipng.info, produced by makeinfo version 6.6 from dvipng.texi.
+This is dvipng.info, produced by makeinfo version 5.1 from dvipng.texi.
INFO-DIR-SECTION TeX
START-INFO-DIR-ENTRY
@@ -15,7 +15,7 @@
This manual documents dvipng, a program to translate a DVI (DeVice
Independent) file into PNG (Portable Network Graphics).
- This file documents dvipng version 1.16
+ This file documents dvipng version 1.17
Corrections or perhaps rewrites of sections are _very welcome_.
@@ -315,7 +315,7 @@
Here is a handy summary of the options; it is printed out when you run
dvipng with no arguments or with the standard '--help' option.
- This is ./dvipng 1.16 Copyright 2002-2015, 2019 Jan-Ake Larsson
+ This is ./dvipng 1.17 Copyright 2002-2015, 2019 Jan-Ake Larsson
Usage: ./dvipng [OPTION]... FILENAME[.dvi]
Options are chosen to be similar to dvips' options where possible:
@@ -358,7 +358,6 @@
# = number f = file s = string * = suffix, '0' to turn off
c = comma-separated dimension pair (e.g., 3.2in,-32.1cm)
-
File: dvipng.info, Node: Option details, Prev: Option summary, Up: Command-line options
@@ -962,7 +961,7 @@
Smith, Samuel Hathaway, Thomas R. Shemanske, Stephen Gibson, Christian
Ridderstro"m, Ezra Peisach, William H Wheeler, Thomas Klausner, Harald
Koenig, Adrian Bunk, Kevin Smith, Jason Riedy, Wolfram Krause, Reinhard
-Kotucha, Takeshi Abe, Waldeck Schutzer, and Andy Nguyen.
+Kotucha, Takeshi Abe, Waldeck Schutzer, Ahzo, and Andy Nguyen.
File: dvipng.info, Node: Copying, Next: Index, Prev: Credits, Up: Top
@@ -998,8 +997,8 @@
* Menu:
* -dSAFER: Option details. (line 167)
-* absolute page number, and -l: Option details. (line 141)
-* absolute page number, and -p: Option details. (line 194)
+* absolute page number, and '-l': Option details. (line 141)
+* absolute page number, and '-p': Option details. (line 194)
* antialiasing levels, number of: Option details. (line 247)
* background color (option): Option details. (line 40)
* base resolution, setting: Option details. (line 33)
@@ -1049,8 +1048,8 @@
* page range: Option details. (line 225)
* page, first printed: Option details. (line 194)
* page, last printed: Option details. (line 141)
-* physical page number, and -l: Option details. (line 141)
-* physical page number, and -p: Option details. (line 194)
+* physical page number, and '-l': Option details. (line 141)
+* physical page number, and '-p': Option details. (line 194)
* PNG image format: Option details. (line 221)
* PostScript inclusion problems: Encapsulated PostScript.
(line 21)
@@ -1084,19 +1083,19 @@
Node: Basic usage10058
Node: Command-line options11202
Node: Option summary11625
-Node: Option details13994
-Node: Graphics29168
-Node: Encapsulated PostScript29923
-Node: Bitmapped graphics31273
-Node: Raw PostScript32501
-Node: Color34754
-Node: Color specifications35143
-Node: Color specials36246
-Node: Diagnosing problems37663
-Node: Contact information38147
-Node: Debug options38875
-Node: Credits39864
-Node: Copying41083
-Node: Index41870
+Node: Option details13993
+Node: Graphics29167
+Node: Encapsulated PostScript29922
+Node: Bitmapped graphics31272
+Node: Raw PostScript32500
+Node: Color34753
+Node: Color specifications35142
+Node: Color specials36245
+Node: Diagnosing problems37662
+Node: Contact information38146
+Node: Debug options38874
+Node: Credits39863
+Node: Copying41088
+Node: Index41875
End Tag Table
Binary files old/texmf-dist/doc/man/man1/dvigif.man1.pdf and new/texmf-dist/doc/man/man1/dvigif.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/dvipng.1 new/texmf-dist/doc/man/man1/dvipng.1
--- old/texmf-dist/doc/man/man1/dvipng.1 2019-04-08 18:55:06.000000000 +0200
+++ new/texmf-dist/doc/man/man1/dvipng.1 2020-03-04 17:04:42.000000000 +0100
@@ -129,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "DVIPNG 1"
-.TH DVIPNG 1 "2019-04-07" "dvipng 1.16" "User commands"
+.TH DVIPNG 1 "2020-01-05" "dvipng 1.17" "User commands"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Binary files old/texmf-dist/doc/man/man1/dvipng.man1.pdf and new/texmf-dist/doc/man/man1/dvipng.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dvipng.doc.tlpobj new/tlpkg/tlpobj/dvipng.doc.tlpobj
--- old/tlpkg/tlpobj/dvipng.doc.tlpobj 2019-04-09 01:38:21.000000000 +0200
+++ new/tlpkg/tlpobj/dvipng.doc.tlpobj 2020-03-14 01:42:07.000000000 +0100
@@ -1,6 +1,6 @@
name dvipng.doc
category TLCore
-revision 50863
+revision 54279
shortdesc doc files of dvipng
docfiles size=119
texmf-dist/doc/dvipng/dvipng.html
++++++ dvipos.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/dvipos.man1.pdf and new/texmf-dist/doc/man/man1/dvipos.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dvipos.doc.tlpobj new/tlpkg/tlpobj/dvipos.doc.tlpobj
--- old/tlpkg/tlpobj/dvipos.doc.tlpobj 2019-03-27 02:24:06.000000000 +0100
+++ new/tlpkg/tlpobj/dvipos.doc.tlpobj 2019-11-19 01:55:41.000000000 +0100
@@ -1,6 +1,6 @@
name dvipos.doc
category TLCore
-revision 50602
+revision 52851
shortdesc doc files of dvipos
docfiles size=9
texmf-dist/doc/man/man1/dvipos.1
++++++ dvips.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/dvips/dvips.html new/texmf-dist/doc/dvips/dvips.html
--- old/texmf-dist/doc/dvips/dvips.html 2019-02-28 20:14:13.000000000 +0100
+++ new/texmf-dist/doc/dvips/dvips.html 2020-03-13 18:38:53.000000000 +0100
@@ -1,9 +1,9 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
-<!-- This manual documents Dvips version 5.999
-(February 2019), a program to translate a DVI file into
+<!-- This manual documents Dvips version 2020.1
+(January 2020), a program to translate a DVI file into
PostScript. You may freely use, modify and/or distribute this file. -->
-<!-- Created by GNU Texinfo 6.6, http://www.gnu.org/software/texinfo/ -->
+<!-- Created by GNU Texinfo 6.7, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Dvips: A DVI-to-PostScript translator</title>
@@ -60,7 +60,7 @@
<li><a id="stoc-Interaction-with-PostScript-1" href="#toc-Interaction-with-PostScript-1">5 Interaction with PostScript</a></li>
<li><a id="stoc-PostScript-fonts-1" href="#toc-PostScript-fonts-1">6 PostScript fonts</a></li>
<li><a id="stoc-Color-1" href="#toc-Color-1">7 Color</a></li>
-<li><a id="stoc-Index-1" href="#toc-Index-1">Index</a></li>
+<li><a id="stoc-Index-1" href="#toc-Index-1" rel="index">Index</a></li>
</ul>
</div>
@@ -150,7 +150,8 @@
<li><a id="toc-Glyph-files-1" href="#Glyph-files">6.1.2 Glyph files</a></li>
<li><a id="toc-Virtual-fonts-1" href="#Virtual-fonts">6.1.3 Virtual fonts</a></li>
<li><a id="toc-Encodings-1" href="#Encodings">6.1.4 Encodings</a></li>
- <li><a id="toc-How-PostScript-typesets-a-character" href="#PostScript-typesetting">6.1.5 How PostScript typesets a character</a></li>
+ <li><a id="toc-Bitmap-font-encodings-1" href="#Bitmap-font-encodings">6.1.5 Bitmap font encodings</a></li>
+ <li><a id="toc-How-PostScript-typesets-a-character" href="#PostScript-typesetting">6.1.6 How PostScript typesets a character</a></li>
</ul></li>
<li><a id="toc-Making-a-PostScript-font-available" href="#Making-a-font-available">6.2 Making a PostScript font available</a></li>
<li><a id="toc-Invoking-Afm2tfm" href="#Invoking-afm2tfm">6.3 Invoking Afm2tfm</a>
@@ -181,7 +182,7 @@
<li><a id="toc-Color-specials-1" href="#Color-specials">7.6.2 Color specials</a></li>
</ul></li>
</ul></li>
- <li><a id="toc-Index-1" href="#Index">Index</a></li>
+ <li><a id="toc-Index-1" href="#Index" rel="index">Index</a></li>
</ul>
</div>
@@ -192,8 +193,8 @@
</div>
<span id="Dvips"></span><h1 class="top">Dvips</h1>
-<p>This manual documents Dvips version 5.999
-(February 2019), a program to translate a DVI file into
+<p>This manual documents Dvips version 2020.1
+(January 2020), a program to translate a DVI file into
PostScript. You may freely use, modify and/or distribute this file.
</p>
<table class="menu" border="0" cellspacing="0">
@@ -211,7 +212,7 @@
</td></tr>
<tr><td align="left" valign="top">• <a href="#Color" accesskey="7">Color</a></td><td> </td><td align="left" valign="top">Using color with Dvips.
</td></tr>
-<tr><td align="left" valign="top">• <a href="#Index" accesskey="8">Index</a></td><td> </td><td align="left" valign="top">General index.
+<tr><td align="left" valign="top">• <a href="#Index" rel="index" accesskey="8">Index</a></td><td> </td><td align="left" valign="top">General index.
</td></tr>
</table>
@@ -927,6 +928,14 @@
physical page numbers.
</p>
</dd>
+<dt>‘<samp>-bitmapfontenc <var>option</var></samp>’</dt>
+<dd><span id="index-_002dbitmapfontenc-option"></span>
+<span id="index-bitmap-font-encoding"></span>
+<p>Turns bitmap font encoding to ‘<samp>off</samp>’, ‘<samp>on</samp>’ (no warnings
+for missing bitmap font encodings), or ‘<samp>strict</samp>’ (with warnings
+for missing bitmap font encodings).
+</p>
+</dd>
<dt>‘<samp>-c <var>num</var></samp>’</dt>
<dd><span id="index-_002dc-num"></span>
<span id="index-_002f_0023copies-1"></span>
@@ -1757,6 +1766,13 @@
<p>Multiple copies. Same as ‘<samp>-b</samp>’, see <a href="#Option-details">Option details</a>.
</p>
</dd>
+<dt>‘<samp>bitmapfontenc <var>option</var></samp>’</dt>
+<dd><span id="index-bitmapfontenc-config-command-_0028bitmap-font-encoding_0029"></span>
+<p>Turns bitmap font encoding to ‘<samp>off</samp>’, ‘<samp>on</samp>’ (no warnings
+for missing bitmap font encodings), or ‘<samp>strict</samp>’ (with warnings
+for missing bitmap font encodings).
+</p>
+</dd>
<dt>‘<samp>c <var>filename</var></samp>’</dt>
<dd><span id="index-c-config-command-_0028include-another-config-file_0029"></span>
<p>Include <var>filename</var> as an additional configuration file, read
@@ -3683,7 +3699,9 @@
</td></tr>
<tr><td align="left" valign="top">• <a href="#Encodings" accesskey="4">Encodings</a></td><td> </td><td align="left" valign="top">Character codes and character names.
</td></tr>
-<tr><td align="left" valign="top">• <a href="#PostScript-typesetting" accesskey="5">PostScript typesetting</a></td><td> </td><td align="left" valign="top">How PostScript typesets a character.
+<tr><td align="left" valign="top">• <a href="#Bitmap-font-encodings" accesskey="5">Bitmap font encodings</a></td><td> </td><td align="left" valign="top">Encodings for bitmapped fonts.
+</td></tr>
+<tr><td align="left" valign="top">• <a href="#PostScript-typesetting" accesskey="6">PostScript typesetting</a></td><td> </td><td align="left" valign="top">How PostScript typesets a character.
</td></tr>
</table>
@@ -3882,7 +3900,7 @@
<hr>
<span id="Encodings"></span><div class="header">
<p>
-Next: <a href="#PostScript-typesetting" accesskey="n" rel="next">PostScript typesetting</a>, Previous: <a href="#Virtual-fonts" accesskey="p" rel="prev">Virtual fonts</a>, Up: <a href="#Font-concepts" accesskey="u" rel="up">Font concepts</a> [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Index" title="Index" rel="index">Index</a>]</p>
+Next: <a href="#Bitmap-font-encodings" accesskey="n" rel="next">Bitmap font encodings</a>, Previous: <a href="#Virtual-fonts" accesskey="p" rel="prev">Virtual fonts</a>, Up: <a href="#Font-concepts" accesskey="u" rel="up">Font concepts</a> [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Index" title="Index" rel="index">Index</a>]</p>
</div>
<span id="Encodings-1"></span><h4 class="subsection">6.1.4 Encodings</h4>
@@ -3941,11 +3959,69 @@
</p>
<hr>
+<span id="Bitmap-font-encodings"></span><div class="header">
+<p>
+Next: <a href="#PostScript-typesetting" accesskey="n" rel="next">PostScript typesetting</a>, Previous: <a href="#Encodings" accesskey="p" rel="prev">Encodings</a>, Up: <a href="#Font-concepts" accesskey="u" rel="up">Font concepts</a> [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Index" title="Index" rel="index">Index</a>]</p>
+</div>
+<span id="Bitmap-font-encodings-1"></span><h4 class="subsection">6.1.5 Bitmap font encodings</h4>
+
+<span id="index-bitmap-font-encodings"></span>
+<span id="index-font-encodings_002c-bitmap"></span>
+<span id="index-encodings_002c-for-bitmap-fonts"></span>
+
+<p>To dvips, bitmapped fonts do not have any notion of linguistics; they
+are simply a vector of glyphs. By comparison, PostScript fonts are
+required to contain an encoding vector that at least provides
+glyph names; these names can permit PostScript and PDF viewers to
+extract legible text from Postscript and PDF output.
+</p>
+<p>Unlike previous versions, dvips versions 2020 and later add glyph
+naming information to Type 3 bitmapped fonts (if they can locate such
+information) as an Encoding vector. This provides some support for
+search, for copy and paste, and even some limited support for
+accessibility. The ‘<samp>bitmapfontenc</samp>’ command line option
+(see <a href="#Option-details">Option details</a> and <code>bitmapfontenc</code> configuration option
+(see <a href="#Configuration-file-commands">Configuration file commands</a>) enable and disable this
+functionality; by default it is set to enabled, without warnings.
+</p>
+<span id="index-dvips_002dall_002eenc"></span>
+<p>To do this, dvips must find encoding information for the bitmapped
+fonts. It does this by first searching for a font-specific encoding
+file; for instance, for cmr10, it will search for <samp>dvips-cmr10.enc</samp>
+in the standard encoding path. If it does not find such a file, it
+will search for a <samp>dvips-all.enc</samp> file which contains a base set of
+encodings for many fonts.
+</p>
+<p>The specific syntax of an encoding file is unspecified, except that it
+must be a PostScript fragment that leaves exactly one object on the
+operand stack. (This is different from the encoding files used to
+define encodings for PostScript fonts, described earlier). Normally
+that object is just an array of 256 names; in this case, that array is
+used as the encoding vector for the font. Alternatively, the object
+can be a procedure that, when executed, leaves a legal encoding vector
+on the stack. This second option is made available to support future
+enhancements that may add additional constructs to the font dictionary
+to enhance the interpretation of font characters.
+</p>
+<p>The <samp>dvips-all.enc</samp> file contains encodings for many fonts, and
+it is loaded by dvips at most once. The format is just a sequence of
+font names, one per line, each terminated by a colon, followed by the
+encoding to use for those files.
+</p>
+<span id="index-bounding-box_002c-for-bitmap-fonts"></span>
+<span id="index-coordinate-system_002c-for-bitmap-fonts"></span>
+<p>As part of its operation, to enable heuristics in PostScript and
+PDF viewers to properly identify word breaks and column gutters,
+dvips also generates a modified font bounding box and a modified
+font coordinate system.
+</p>
+
+<hr>
<span id="PostScript-typesetting"></span><div class="header">
<p>
-Previous: <a href="#Encodings" accesskey="p" rel="prev">Encodings</a>, Up: <a href="#Font-concepts" accesskey="u" rel="up">Font concepts</a> [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Index" title="Index" rel="index">Index</a>]</p>
+Previous: <a href="#Bitmap-font-encodings" accesskey="p" rel="prev">Bitmap font encodings</a>, Up: <a href="#Font-concepts" accesskey="u" rel="up">Font concepts</a> [<a href="#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="#Index" title="Index" rel="index">Index</a>]</p>
</div>
-<span id="How-PostScript-typesets-a-character"></span><h4 class="subsection">6.1.5 How PostScript typesets a character</h4>
+<span id="How-PostScript-typesets-a-character"></span><h4 class="subsection">6.1.6 How PostScript typesets a character</h4>
<span id="index-typesetting-in-PostScript"></span>
<span id="index-character-lookup-procedure-in-PostScript"></span>
@@ -5427,6 +5503,7 @@
<tr><td></td><td valign="top"><a href="#index-_002da-1"><code>-a</code></a>:</td><td> </td><td valign="top"><a href="#Afm2tfm-options">Afm2tfm options</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-_002dB"><code>-B</code></a>:</td><td> </td><td valign="top"><a href="#Option-details">Option details</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-_002db-num"><code>-b <var>num</var></code></a>:</td><td> </td><td valign="top"><a href="#Option-details">Option details</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-_002dbitmapfontenc-option"><code>-bitmapfontenc <var>option</var></code></a>:</td><td> </td><td valign="top"><a href="#Option-details">Option details</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-_002dc-num"><code>-c <var>num</var></code></a>:</td><td> </td><td valign="top"><a href="#Option-details">Option details</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-_002dC-num"><code>-C <var>num</var></code></a>:</td><td> </td><td valign="top"><a href="#Option-details">Option details</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-_002dc-ratio"><code>-c <var>ratio</var></code></a>:</td><td> </td><td valign="top"><a href="#Afm2tfm-options">Afm2tfm options</a></td></tr>
@@ -5586,7 +5663,10 @@
<tr><td></td><td valign="top"><a href="#index-Bhattacharya_002c-Tanmoy">Bhattacharya, Tanmoy</a>:</td><td> </td><td valign="top"><a href="#Hypertext">Hypertext</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-big-points">big points</a>:</td><td> </td><td valign="top"><a href="#Bounding-box">Bounding box</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-binary-files_002c-not-supported">binary files, not supported</a>:</td><td> </td><td valign="top"><a href="#Including-graphics-fails">Including graphics fails</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-bitmap-font-encoding">bitmap font encoding</a>:</td><td> </td><td valign="top"><a href="#Option-details">Option details</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-bitmap-font-encodings">bitmap font encodings</a>:</td><td> </td><td valign="top"><a href="#Bitmap-font-encodings">Bitmap font encodings</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-bitmap-fonts">bitmap fonts</a>:</td><td> </td><td valign="top"><a href="#Glyph-files">Glyph files</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-bitmapfontenc-config-command-_0028bitmap-font-encoding_0029"><code>bitmapfontenc <span class="roman">config command (bitmap font encoding)</span></code></a>:</td><td> </td><td valign="top"><a href="#Configuration-file-commands">Configuration file commands</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-bop-undefined-error"><tt>bop undefined</tt> error</a>:</td><td> </td><td valign="top"><a href="#Printer-errors">Printer errors</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-bop_002dhook"><code>bop-hook</code></a>:</td><td> </td><td valign="top"><a href="#Paper-trays">Paper trays</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-bop_002dhook-1"><code>bop-hook</code></a>:</td><td> </td><td valign="top"><a href="#EPSF-scaling">EPSF scaling</a></td></tr>
@@ -5597,6 +5677,7 @@
<tr><td></td><td valign="top"><a href="#index-bounding-box_002c-defined">bounding box, defined</a>:</td><td> </td><td valign="top"><a href="#Bounding-box">Bounding box</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-bounding-box_002c-determining">bounding box, determining</a>:</td><td> </td><td valign="top"><a href="#Bounding-box">Bounding box</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-bounding-box_002c-finding-tight">bounding box, finding tight</a>:</td><td> </td><td valign="top"><a href="#Option-details">Option details</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-bounding-box_002c-for-bitmap-fonts">bounding box, for bitmap fonts</a>:</td><td> </td><td valign="top"><a href="#Bitmap-font-encodings">Bitmap font encodings</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-bounding-box_002c-inaccurate">bounding box, inaccurate</a>:</td><td> </td><td valign="top"><a href="#EPSF-clipping">EPSF clipping</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-bounding-box_002c-supplying-to-TeX">bounding box, supplying to TeX</a>:</td><td> </td><td valign="top"><a href="#g_t_005cincludegraphics">\includegraphics</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-bounding-box_002c-supplying-to-TeX-1">bounding box, supplying to TeX</a>:</td><td> </td><td valign="top"><a href="#EPSF-macros">EPSF macros</a></td></tr>
@@ -5648,6 +5729,7 @@
<tr><td></td><td valign="top"><a href="#index-configuration_002c-of-Dvips">configuration, of Dvips</a>:</td><td> </td><td valign="top"><a href="#Installation">Installation</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-continuation-lines_002c-not-supported">continuation lines, not supported</a>:</td><td> </td><td valign="top"><a href="#Configuration-file-commands">Configuration file commands</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-control_002dD">control-D</a>:</td><td> </td><td valign="top"><a href="#Option-details">Option details</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-coordinate-system_002c-for-bitmap-fonts">coordinate system, for bitmap fonts</a>:</td><td> </td><td valign="top"><a href="#Bitmap-font-encodings">Bitmap font encodings</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-copies_002c-collated">copies, collated</a>:</td><td> </td><td valign="top"><a href="#Option-details">Option details</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-copies_002c-duplicated-page-bodies">copies, duplicated page bodies</a>:</td><td> </td><td valign="top"><a href="#Option-details">Option details</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-copies_002c-uncollated">copies, uncollated</a>:</td><td> </td><td valign="top"><a href="#Option-details">Option details</a></td></tr>
@@ -5684,6 +5766,7 @@
<tr><td></td><td valign="top"><a href="#index-DVI-magnification">DVI magnification</a>:</td><td> </td><td valign="top"><a href="#EPSF-scaling">EPSF scaling</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-dvihps_002c-hyperdvi-to-PostScript"><code>dvihps<span class="roman">, hyperdvi to PostScript</span></code></a>:</td><td> </td><td valign="top"><a href="#Hypertext">Hypertext</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-Dvips-configuration-file-options">Dvips configuration file options</a>:</td><td> </td><td valign="top"><a href="#Configuration-file-commands">Configuration file commands</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-dvips_002dall_002eenc"><code>dvips-all.enc</code></a>:</td><td> </td><td valign="top"><a href="#Bitmap-font-encodings">Bitmap font encodings</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-dvips_002eenc"><code>dvips.enc</code></a>:</td><td> </td><td valign="top"><a href="#Encodings">Encodings</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-DVIPSDEBUG"><code>DVIPSDEBUG</code></a>:</td><td> </td><td valign="top"><a href="#Environment-variables">Environment variables</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-DVIPSFONTS"><code>DVIPSFONTS</code></a>:</td><td> </td><td valign="top"><a href="#Environment-variables">Environment variables</a></td></tr>
@@ -5708,6 +5791,7 @@
<tr><td></td><td valign="top"><a href="#index-encoding-vectors_002c-defined">encoding vectors, defined</a>:</td><td> </td><td valign="top"><a href="#Encodings">Encodings</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-encoding-vectors_002c-in-Type-1-fonts">encoding vectors, in Type 1 fonts</a>:</td><td> </td><td valign="top"><a href="#PostScript-typesetting">PostScript typesetting</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-encodings">encodings</a>:</td><td> </td><td valign="top"><a href="#Encodings">Encodings</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-encodings_002c-for-bitmap-fonts">encodings, for bitmap fonts</a>:</td><td> </td><td valign="top"><a href="#Bitmap-font-encodings">Bitmap font encodings</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-end_002dhook"><code>end-hook</code></a>:</td><td> </td><td valign="top"><a href="#PostScript-hooks">PostScript hooks</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-environment-variables">environment variables</a>:</td><td> </td><td valign="top"><a href="#Environment-variables">Environment variables</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-EOF">EOF</a>:</td><td> </td><td valign="top"><a href="#Option-details">Option details</a></td></tr>
@@ -5743,6 +5827,7 @@
<tr><td></td><td valign="top"><a href="#index-filter_002c-running-as-a">filter, running as a</a>:</td><td> </td><td valign="top"><a href="#Option-details">Option details</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-first-page-printed">first page printed</a>:</td><td> </td><td valign="top"><a href="#Option-details">Option details</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-font-concepts">font concepts</a>:</td><td> </td><td valign="top"><a href="#Font-concepts">Font concepts</a></td></tr>
+<tr><td></td><td valign="top"><a href="#index-font-encodings_002c-bitmap">font encodings, bitmap</a>:</td><td> </td><td valign="top"><a href="#Bitmap-font-encodings">Bitmap font encodings</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-font-generation_002c-avoiding">font generation, avoiding</a>:</td><td> </td><td valign="top"><a href="#Option-details">Option details</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-fontinst"><code>fontinst</code></a>:</td><td> </td><td valign="top"><a href="#Invoking-afm2tfm">Invoking afm2tfm</a></td></tr>
<tr><td></td><td valign="top"><a href="#index-fonts_002c-as-header-files">fonts, as header files</a>:</td><td> </td><td valign="top"><a href="#Including-headers-from-TeX">Including headers from TeX</a></td></tr>
Binary files old/texmf-dist/doc/dvips/dvips.pdf and new/texmf-dist/doc/dvips/dvips.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/info/dvips.info new/texmf-dist/doc/info/dvips.info
--- old/texmf-dist/doc/info/dvips.info 2019-02-28 20:14:13.000000000 +0100
+++ new/texmf-dist/doc/info/dvips.info 2020-03-13 18:38:53.000000000 +0100
@@ -1,6 +1,6 @@
-This is dvips.info, produced by makeinfo version 6.5 from dvips.texi.
+This is dvips.info, produced by makeinfo version 6.7 from dvips.texi.
-This manual documents Dvips version 5.999 (February 2019), a program to
+This manual documents Dvips version 2020.1 (January 2020), a program to
translate a DVI file into PostScript. You may freely use, modify and/or
distribute this file.
INFO-DIR-SECTION TeX
@@ -16,7 +16,7 @@
Dvips
*****
-This manual documents Dvips version 5.999 (February 2019), a program to
+This manual documents Dvips version 2020.1 (January 2020), a program to
translate a DVI file into PostScript. You may freely use, modify and/or
distribute this file.
@@ -559,6 +559,11 @@
Print only the even pages. This option uses TeX page numbers, not
physical page numbers.
+'-bitmapfontenc OPTION'
+ Turns bitmap font encoding to 'off', 'on' (no warnings for missing
+ bitmap font encodings), or 'strict' (with warnings for missing
+ bitmap font encodings).
+
'-c NUM'
Generate NUM consecutive copies of every page, i.e., the output is
uncollated. This merely sets the builtin PostScript variable
@@ -1119,6 +1124,11 @@
'b #COPIES'
Multiple copies. Same as '-b', *note Option details::.
+'bitmapfontenc OPTION'
+ Turns bitmap font encoding to 'off', 'on' (no warnings for missing
+ bitmap font encodings), or 'strict' (with warnings for missing
+ bitmap font encodings).
+
'c FILENAME'
Include FILENAME as an additional configuration file, read
immediately.
@@ -2495,6 +2505,7 @@
* Glyph files:: Character shapes.
* Virtual fonts:: Constructing one font from others.
* Encodings:: Character codes and character names.
+* Bitmap font encodings:: Encodings for bitmapped fonts.
* PostScript typesetting:: How PostScript typesets a character.
@@ -2639,7 +2650,7 @@
DVI translator that doesn't understand vf's itself.
-File: dvips.info, Node: Encodings, Next: PostScript typesetting, Prev: Virtual fonts, Up: Font concepts
+File: dvips.info, Node: Encodings, Next: Bitmap font encodings, Prev: Virtual fonts, Up: Font concepts
6.1.4 Encodings
---------------
@@ -2684,9 +2695,58 @@
math italics, and 'texmsym.enc' for math symbols.
-File: dvips.info, Node: PostScript typesetting, Prev: Encodings, Up: Font concepts
+File: dvips.info, Node: Bitmap font encodings, Next: PostScript typesetting, Prev: Encodings, Up: Font concepts
+
+6.1.5 Bitmap font encodings
+---------------------------
+
+To dvips, bitmapped fonts do not have any notion of linguistics; they
+are simply a vector of glyphs. By comparison, PostScript fonts are
+required to contain an encoding vector that at least provides glyph
+names; these names can permit PostScript and PDF viewers to extract
+legible text from Postscript and PDF output.
+
+ Unlike previous versions, dvips versions 2020 and later add glyph
+naming information to Type 3 bitmapped fonts (if they can locate such
+information) as an Encoding vector. This provides some support for
+search, for copy and paste, and even some limited support for
+accessibility. The 'bitmapfontenc' command line option (*note Option
+details:: and 'bitmapfontenc' configuration option (*note Configuration
+file commands::) enable and disable this functionality; by default it is
+set to enabled, without warnings.
+
+ To do this, dvips must find encoding information for the bitmapped
+fonts. It does this by first searching for a font-specific encoding
+file; for instance, for cmr10, it will search for 'dvips-cmr10.enc' in
+the standard encoding path. If it does not find such a file, it will
+search for a 'dvips-all.enc' file which contains a base set of encodings
+for many fonts.
+
+ The specific syntax of an encoding file is unspecified, except that
+it must be a PostScript fragment that leaves exactly one object on the
+operand stack. (This is different from the encoding files used to
+define encodings for PostScript fonts, described earlier). Normally
+that object is just an array of 256 names; in this case, that array is
+used as the encoding vector for the font. Alternatively, the object can
+be a procedure that, when executed, leaves a legal encoding vector on
+the stack. This second option is made available to support future
+enhancements that may add additional constructs to the font dictionary
+to enhance the interpretation of font characters.
+
+ The 'dvips-all.enc' file contains encodings for many fonts, and it is
+loaded by dvips at most once. The format is just a sequence of font
+names, one per line, each terminated by a colon, followed by the
+encoding to use for those files.
+
+ As part of its operation, to enable heuristics in PostScript and PDF
+viewers to properly identify word breaks and column gutters, dvips also
+generates a modified font bounding box and a modified font coordinate
+system.
+
+
+File: dvips.info, Node: PostScript typesetting, Prev: Bitmap font encodings, Up: Font concepts
-6.1.5 How PostScript typesets a character
+6.1.6 How PostScript typesets a character
-----------------------------------------
The output of Dvips is a program in the PostScript language that
@@ -3710,12 +3770,12 @@
* Menu:
* ! special (literal PS header): Literal headers. (line 6)
-* ! starting output filename: Option details. (line 242)
+* ! starting output filename: Option details. (line 247)
* " special (literal PostScript): " special. (line 6)
* %%BoundingBox: Bounding box. (line 17)
* %%Page, and multi-page information: PostScript hooks. (line 37)
-* %%Page, not generating: Option details. (line 207)
-* %%Page, removing: Option details. (line 160)
+* %%Page, not generating: Option details. (line 212)
+* %%Page, removing: Option details. (line 165)
* %%Page, required by Ghostview: Ghostscript installation.
(line 12)
* %%VMusage: Headers and memory usage.
@@ -3723,9 +3783,9 @@
* %*Font: Fonts in figures. (line 6)
* (atend), bounding box specification: Bounding box. (line 28)
* +PSMAPFILE: Configuration file commands.
- (line 121)
+ (line 126)
* -: Option details. (line 11)
-* - as output filename: Option details. (line 242)
+* - as output filename: Option details. (line 247)
* --help: Option summary. (line 7)
* --help <1>: Option details. (line 15)
* --version: Option details. (line 18)
@@ -3734,72 +3794,73 @@
* -a <1>: Afm2tfm options. (line 33)
* -B: Option details. (line 37)
* -b NUM: Option details. (line 31)
-* -c NUM: Option details. (line 41)
-* -C NUM: Option details. (line 46)
+* -bitmapfontenc OPTION: Option details. (line 41)
+* -c NUM: Option details. (line 46)
+* -C NUM: Option details. (line 51)
* -c RATIO: Afm2tfm options. (line 43)
-* -d NUM: Option details. (line 52)
-* -D NUM: Option details. (line 58)
-* -E: Option details. (line 82)
-* -e NUM: Option details. (line 71)
+* -d NUM: Option details. (line 57)
+* -D NUM: Option details. (line 63)
+* -E: Option details. (line 87)
+* -e NUM: Option details. (line 76)
* -e RATIO: Afm2tfm options. (line 47)
-* -f: Option details. (line 98)
-* -F: Option details. (line 110)
-* -G: Option details. (line 117)
-* -h NAME: Option details. (line 122)
-* -i: Option details. (line 127)
-* -j for partial font downloading: Option details. (line 146)
-* -K: Option details. (line 160)
-* -k for cropmarks: Option details. (line 152)
-* -L: Option details. (line 178)
-* -l [=]NUM: Option details. (line 169)
-* -m: Option details. (line 182)
-* -M: Option details. (line 194)
-* -mode: Option details. (line 185)
-* -mode MODE: Option details. (line 185)
-* -N: Option details. (line 207)
-* -n NUM: Option details. (line 204)
-* -noomega: Option details. (line 215)
-* -noptex: Option details. (line 221)
+* -f: Option details. (line 103)
+* -F: Option details. (line 115)
+* -G: Option details. (line 122)
+* -h NAME: Option details. (line 127)
+* -i: Option details. (line 132)
+* -j for partial font downloading: Option details. (line 151)
+* -K: Option details. (line 165)
+* -k for cropmarks: Option details. (line 157)
+* -L: Option details. (line 183)
+* -l [=]NUM: Option details. (line 174)
+* -m: Option details. (line 187)
+* -M: Option details. (line 199)
+* -mode: Option details. (line 190)
+* -mode MODE: Option details. (line 190)
+* -N: Option details. (line 212)
+* -n NUM: Option details. (line 209)
+* -noomega: Option details. (line 220)
+* -noptex: Option details. (line 226)
* -O: Afm2tfm options. (line 51)
-* -o NAME: Option details. (line 237)
-* -O X-OFFSET,Y-OFFSET: Option details. (line 254)
-* -P PRINTER: Option details. (line 286)
+* -o NAME: Option details. (line 242)
+* -O X-OFFSET,Y-OFFSET: Option details. (line 259)
+* -P PRINTER: Option details. (line 291)
* -p PS-ENC: Changing PostScript encodings.
(line 6)
* -p PS-ENC <1>: Afm2tfm options. (line 56)
-* -p [=]NUM: Option details. (line 272)
-* -pp FIRST-LAST: Option details. (line 281)
-* -pp RANGE: Option details. (line 281)
+* -p [=]NUM: Option details. (line 277)
+* -pp FIRST-LAST: Option details. (line 286)
+* -pp RANGE: Option details. (line 286)
* -PPRINTER, and config file searching: Configuration file searching.
(line 27)
-* -q: Option details. (line 305)
-* -r: Option details. (line 309)
-* -R: Option details. (line 312)
-* -s: Option details. (line 320)
-* -S NUM: Option details. (line 327)
+* -q: Option details. (line 310)
+* -r: Option details. (line 314)
+* -R: Option details. (line 317)
+* -s: Option details. (line 325)
+* -S NUM: Option details. (line 332)
* -s SLANT: Afm2tfm options. (line 61)
* -T ENC-FILE: Changing both encodings.
(line 6)
-* -T HSIZE,VSIZE: Option details. (line 352)
-* -t PAPERTYPE: Option details. (line 332)
+* -T HSIZE,VSIZE: Option details. (line 357)
+* -t PAPERTYPE: Option details. (line 337)
* -T PS-TEX-ENC: Afm2tfm options. (line 71)
* -t TEX-ENC: Changing TeX encodings.
(line 6)
* -t TEX-ENC <1>: Afm2tfm options. (line 66)
-* -U: Option details. (line 367)
+* -U: Option details. (line 372)
* -u: Afm2tfm options. (line 75)
-* -u PSMAPFILE: Option details. (line 359)
-* -v: Option details. (line 375)
-* -V: Option details. (line 378)
+* -u PSMAPFILE: Option details. (line 364)
+* -v: Option details. (line 380)
+* -V: Option details. (line 383)
* -v VPL-FILE: Afm2tfm options. (line 81)
* -V VPL-FILE: Afm2tfm options. (line 84)
-* -x NUM: Option details. (line 387)
-* -X NUM: Option details. (line 395)
-* -Y NUM: Option details. (line 402)
+* -x NUM: Option details. (line 392)
+* -X NUM: Option details. (line 400)
+* -Y NUM: Option details. (line 407)
* -z: Hypertext. (line 6)
-* -Z for compressing bitmap fonts: Option details. (line 411)
-* -z for recognizing hyperdvi: Option details. (line 405)
-* ..-relative filenames: Option details. (line 312)
+* -Z for compressing bitmap fonts: Option details. (line 416)
+* -z for recognizing hyperdvi: Option details. (line 410)
+* ..-relative filenames: Option details. (line 317)
* .afm Adobe metric files: Metric files. (line 26)
* .dvipsrc, searched for: Configuration file searching.
(line 14)
@@ -3818,7 +3879,7 @@
* .pro prologue files: Header files. (line 12)
* .tfm TeX font metric files: Metric files. (line 31)
* /#copies: Option details. (line 31)
-* /#copies <1>: Option details. (line 41)
+* /#copies <1>: Option details. (line 46)
* /magscale: EPSF scaling. (line 66)
* 612 792 bounding box size: Bounding box. (line 43)
* 8r encoding, and extra characters: Changing PostScript encodings.
@@ -3851,25 +3912,25 @@
* \magnification: EPSF scaling. (line 62)
* \rotninety: Literal examples. (line 27)
* \textCOLORNAME: Color macro files. (line 45)
-* | starting output filename: Option details. (line 242)
+* | starting output filename: Option details. (line 247)
* a config command (conserve memory): Configuration file commands.
(line 21)
* A ring, Scandinavian letter: Reencoding with Afm2tfm.
(line 32)
-* a3 papertype: Option details. (line 332)
+* a3 papertype: Option details. (line 337)
* a4 paper size: Config file paper sizes.
(line 82)
-* a4 papertype: Option details. (line 332)
+* a4 papertype: Option details. (line 337)
* A4size paper size: Config file paper sizes.
(line 90)
-* absolute filenames, disabling: Option details. (line 312)
-* absolute page number, and -l: Option details. (line 169)
-* absolute page number, and -p: Option details. (line 272)
+* absolute filenames, disabling: Option details. (line 317)
+* absolute page number, and -l: Option details. (line 174)
+* absolute page number, and -p: Option details. (line 277)
* accent height adjustment, omitting: Afm2tfm options. (line 33)
* accents, in wrong position: Reencoding with Afm2tfm.
(line 32)
* accents, wrong: Afm2tfm options. (line 17)
-* accuracy in positioning: Option details. (line 71)
+* accuracy in positioning: Option details. (line 76)
* afm files: Metric files. (line 26)
* afm2tfm: Making a font available.
(line 46)
@@ -3897,23 +3958,30 @@
* big points: Bounding box. (line 11)
* binary files, not supported: Including graphics fails.
(line 23)
+* bitmap font encoding: Option details. (line 41)
+* bitmap font encodings: Bitmap font encodings.
+ (line 6)
* bitmap fonts: Glyph files. (line 30)
+* bitmapfontenc config command (bitmap font encoding): Configuration file commands.
+ (line 27)
* bop undefined error: Printer errors. (line 6)
* bop-hook: Paper trays. (line 6)
* bop-hook <1>: EPSF scaling. (line 74)
* bop-hook <2>: PostScript hooks. (line 11)
-* bop-hook, and offset pages: Option details. (line 267)
+* bop-hook, and offset pages: Option details. (line 272)
* boundary character: Encoding file format.
(line 41)
* bounding box, comment for: Bounding box. (line 6)
* bounding box, defined: Bounding box. (line 11)
* bounding box, determining: Bounding box. (line 37)
-* bounding box, finding tight: Option details. (line 82)
+* bounding box, finding tight: Option details. (line 87)
+* bounding box, for bitmap fonts: Bitmap font encodings.
+ (line 44)
* bounding box, inaccurate: EPSF clipping. (line 6)
* bounding box, supplying to TeX: \includegraphics. (line 36)
* bounding box, supplying to TeX <1>: EPSF macros. (line 26)
* c config command (include another config file): Configuration file commands.
- (line 27)
+ (line 32)
* changing PostScript encodings: Changing PostScript encodings.
(line 6)
* changing TeX encodings: Changing TeX encodings.
@@ -3928,7 +3996,7 @@
* clipping of EPSF: EPSF clipping. (line 6)
* CODINGSCHEME: Reencoding with Afm2tfm.
(line 51)
-* collated copies: Option details. (line 46)
+* collated copies: Option details. (line 51)
* color: Color. (line 6)
* color configuration: Color device configuration.
(line 6)
@@ -3948,17 +4016,17 @@
(line 13)
* comments, in encoding files: Encoding file format.
(line 20)
-* comments, removing included: Option details. (line 160)
+* comments, removing included: Option details. (line 165)
* compilation: Installation. (line 6)
* compressed PostScript: Dynamic creation of graphics.
(line 6)
-* compressing bitmap fonts: Option details. (line 411)
+* compressing bitmap fonts: Option details. (line 416)
* Computer Modern in PostScript: Hypertext caveats. (line 6)
* Computer Modern, encoding of: Encodings. (line 15)
* condensed fonts: Afm2tfm options. (line 47)
* config.proto: config.ps installation.
(line 14)
-* config.ps: Option details. (line 286)
+* config.ps: Option details. (line 291)
* config.ps installation: config.ps installation.
(line 6)
* config.ps paper sizes: Config file paper sizes.
@@ -3983,38 +4051,40 @@
* configuration, of Dvips: Installation. (line 6)
* continuation lines, not supported: Configuration file commands.
(line 13)
-* control-D: Option details. (line 110)
-* copies, collated: Option details. (line 46)
+* control-D: Option details. (line 115)
+* coordinate system, for bitmap fonts: Bitmap font encodings.
+ (line 44)
+* copies, collated: Option details. (line 51)
* copies, duplicated page bodies: Option details. (line 31)
-* copies, uncollated: Option details. (line 41)
+* copies, uncollated: Option details. (line 46)
* Crayola crayon box: Color macro files. (line 16)
-* crop.pro: Option details. (line 152)
-* cropmarks: Option details. (line 152)
+* crop.pro: Option details. (line 157)
+* cropmarks: Option details. (line 157)
* current font, in PostScript: PostScript typesetting.
(line 35)
* D config command (dpi): Configuration file commands.
- (line 31)
+ (line 36)
* dated output: PostScript hooks. (line 16)
* datestamp, in output: Configuration file commands.
- (line 37)
+ (line 42)
* debugging: Diagnosing problems. (line 6)
-* debugging <1>: Option details. (line 52)
+* debugging <1>: Option details. (line 57)
* debugging options: Debug options. (line 6)
* default resolutions: Configuration file commands.
- (line 142)
+ (line 147)
* default_texsizes Make variable: Configuration file commands.
- (line 158)
+ (line 163)
* Deutsch, Peter: Ghostscript installation.
(line 6)
* device dependency, and virtual fonts: Configuration file commands.
- (line 181)
+ (line 186)
* dictionary, CharStrings: PostScript typesetting.
(line 51)
* dictionary, PostScript language: PostScript typesetting.
(line 35)
* dictionary, SDict: Literal headers. (line 6)
* dictionary, userdict: Header files. (line 21)
-* distillation, and -z: Option details. (line 405)
+* distillation, and -z: Option details. (line 410)
* distiller, for PDF files: Hypertext. (line 11)
* dot accent: Reencoding with Afm2tfm.
(line 32)
@@ -4030,6 +4100,8 @@
* dvihps, hyperdvi to PostScript: Hypertext. (line 21)
* Dvips configuration file options: Configuration file commands.
(line 6)
+* dvips-all.enc: Bitmap font encodings.
+ (line 21)
* dvips.enc: Encodings. (line 35)
* DVIPSDEBUG: Environment variables.
(line 17)
@@ -4038,7 +4110,7 @@
* DVIPSHEADERS: Environment variables.
(line 31)
* DVIPSHEADERS, overrides H: Configuration file commands.
- (line 55)
+ (line 60)
* DVIPSMAKEPK: Environment variables.
(line 35)
* DVIPSRC: Environment variables.
@@ -4046,13 +4118,13 @@
* DVIPSSIZES: Environment variables.
(line 46)
* DVIPSSIZES, overrides R: Configuration file commands.
- (line 155)
+ (line 160)
* dynamic creation of graphics: Dynamic creation of graphics.
(line 6)
* e config command (maxdrift): Configuration file commands.
- (line 34)
+ (line 39)
* E config command (shell escape): Configuration file commands.
- (line 37)
+ (line 42)
* efficiency, and fonts: Making a font available.
(line 104)
* ehandler.ps: No output. (line 12)
@@ -4068,15 +4140,17 @@
* encoding vectors, in Type 1 fonts: PostScript typesetting.
(line 43)
* encodings: Encodings. (line 6)
+* encodings, for bitmap fonts: Bitmap font encodings.
+ (line 6)
* end-hook: PostScript hooks. (line 11)
* environment variables: Environment variables.
(line 6)
-* EOF: Option details. (line 110)
+* EOF: Option details. (line 115)
* eop-hook: PostScript hooks. (line 11)
* EPS, and Ghostview: Ghostscript installation.
(line 12)
* EPSF macros: EPSF macros. (line 6)
-* EPSF, generating: Option details. (line 82)
+* EPSF, generating: Option details. (line 87)
* epsf.sty: EPSF macros. (line 15)
* epsf.tex: EPSF macros. (line 13)
* Epson printers: Ghostscript installation.
@@ -4095,23 +4169,25 @@
* extra characters, accessing: Changing PostScript encodings.
(line 18)
* f config command (filter): Configuration file commands.
- (line 45)
+ (line 50)
* F config command (filter): Configuration file commands.
- (line 45)
+ (line 50)
* failure, and printer errors: Printer errors. (line 6)
* failure, of long documents: Long documents fail. (line 6)
* failure, to include graphics: Including graphics fails.
(line 6)
* failure, to print at all: No output. (line 6)
* fallback resolutions: Configuration file commands.
- (line 142)
+ (line 147)
* figures and fonts: Fonts in figures. (line 6)
* figures, natural size: EPSF macros. (line 38)
* figures, scaling: EPSF scaling. (line 6)
-* filter, running as a: Option details. (line 98)
-* first page printed: Option details. (line 272)
+* filter, running as a: Option details. (line 103)
+* first page printed: Option details. (line 277)
* font concepts: Font concepts. (line 6)
-* font generation, avoiding: Option details. (line 194)
+* font encodings, bitmap: Bitmap font encodings.
+ (line 6)
+* font generation, avoiding: Option details. (line 199)
* fontinst: Invoking afm2tfm. (line 13)
* fonts, as header files: Including headers from TeX.
(line 13)
@@ -4134,7 +4210,7 @@
* fonts, system PostScript: PostScript font installation.
(line 11)
* G config command (character shifting): Configuration file commands.
- (line 48)
+ (line 53)
* gf files: Glyph files. (line 41)
* gftopk: Glyph files. (line 41)
* Ghostscript installation: Ghostscript installation.
@@ -4145,7 +4221,7 @@
(line 12)
* glyph files: Glyph files. (line 6)
* GLYPHFONTS, overrides P: Configuration file commands.
- (line 130)
+ (line 135)
* gnuplot: Dynamic creation of graphics.
(line 25)
* graphics inclusion fails: Including graphics fails.
@@ -4153,16 +4229,16 @@
* gs installation: Ghostscript installation.
(line 6)
* gsave/grestore, and literal PS: Literal examples. (line 27)
-* gsftopk: Option details. (line 379)
+* gsftopk: Option details. (line 384)
* h config command (download additional header): Configuration file commands.
- (line 52)
+ (line 57)
* H config command (PostScript header path): Configuration file commands.
- (line 55)
+ (line 60)
* Hafner, Jim: Color. (line 6)
-* header file, downloading: Option details. (line 122)
+* header file, downloading: Option details. (line 127)
* header files, defined: Header files. (line 6)
* header path, defining: Configuration file commands.
- (line 55)
+ (line 60)
* header=FILE \special: Including headers from TeX.
(line 6)
* headers and memory usage: Headers and memory usage.
@@ -4179,19 +4255,19 @@
* hscale (psfile special option): psfile special. (line 30)
* hsize (psfile special option): psfile special. (line 24)
* html specials: Hypertext. (line 6)
-* html specials, and -z: Option details. (line 405)
+* html specials, and -z: Option details. (line 410)
* http://www.win.tue.nl/~dickie/idvi: Hypertext. (line 21)
* http://xxx.lanl.gov/hypertex: Hypertext. (line 21)
* Hungarian umlaut: Reencoding with Afm2tfm.
(line 32)
-* hyperdvi extensions, enabling: Option details. (line 405)
+* hyperdvi extensions, enabling: Option details. (line 410)
* hypertext and bitmap fonts: Hypertext caveats. (line 6)
* hypertext caveats: Hypertext caveats. (line 6)
* hypertext caveats <1>: Hypertext caveats. (line 6)
* hypertext specials: Hypertext specials. (line 6)
* hypertext support: Hypertext. (line 6)
* i config command (pages/section): Configuration file commands.
- (line 59)
+ (line 64)
* idvi Java DVI reader: Hypertext. (line 21)
* Illustrator, workaround for: Including graphics fails.
(line 10)
@@ -4214,30 +4290,30 @@
* inverted output: Small or inverted. (line 6)
* invoking Dvips: Invoking Dvips. (line 6)
* j config command (partial font downloading): Configuration file commands.
- (line 63)
+ (line 68)
* Java DVI reader: Hypertext. (line 21)
* Jeffrey, Alan: Invoking afm2tfm. (line 13)
* K config command (comment removal): Configuration file commands.
- (line 67)
+ (line 72)
* kerning, defined: Metric files. (line 15)
* KPATHSEA_DEBUG: Environment variables.
(line 18)
* L config command (last paper size wins): Configuration file commands.
- (line 71)
+ (line 76)
* landscape orientation, defined: Paper size and landscape.
(line 11)
-* landscape papertype: Option details. (line 332)
+* landscape papertype: Option details. (line 337)
* landscape, as \special: papersize special. (line 16)
-* last page printed: Option details. (line 169)
+* last page printed: Option details. (line 174)
* last-resort font scaling, with DVIPSSIZES: Environment variables.
(line 47)
* last-resort scaling, with R: Configuration file commands.
- (line 142)
-* ledger papertype: Option details. (line 332)
-* legal papertype: Option details. (line 332)
+ (line 147)
+* ledger papertype: Option details. (line 337)
+* legal papertype: Option details. (line 337)
* letter paper size: Config file paper sizes.
(line 82)
-* letter papertype: Option details. (line 332)
+* letter papertype: Option details. (line 337)
* letterhead tray: Paper trays. (line 10)
* letterSize paper size: Config file paper sizes.
(line 90)
@@ -4254,25 +4330,25 @@
* llx (psfile special option): psfile special. (line 42)
* lly (psfile special option): psfile special. (line 42)
* long documents not printing: Long documents fail. (line 6)
-* low characters, shifting: Option details. (line 117)
-* lpr spooler, MS-DOS emulation: Option details. (line 242)
+* low characters, shifting: Option details. (line 122)
+* lpr spooler, MS-DOS emulation: Option details. (line 247)
* m config command (available memory): Configuration file commands.
- (line 75)
+ (line 80)
* M config command (mf mode): Configuration file commands.
- (line 102)
+ (line 107)
* macros for color: Color macro files. (line 6)
* macros for epsf inclusion: \includegraphics. (line 6)
* macros for epsf inclusion <1>: EPSF macros. (line 6)
* magnification, DVI: EPSF scaling. (line 62)
-* magnification, overriding DVI: Option details. (line 387)
-* magnification, vertical: Option details. (line 398)
+* magnification, overriding DVI: Option details. (line 392)
+* magnification, vertical: Option details. (line 403)
* mailcap and hypertext: Hypertext specials. (line 53)
-* manual feed: Option details. (line 182)
-* maxdrift: Option details. (line 71)
-* maximum pages printed: Option details. (line 204)
-* media: Option details. (line 332)
+* manual feed: Option details. (line 187)
+* maxdrift: Option details. (line 76)
+* maximum pages printed: Option details. (line 209)
+* media: Option details. (line 337)
* memory available: Configuration file commands.
- (line 75)
+ (line 80)
* memory of printer exhausted: Printer errors. (line 14)
* memory usage, and headers: Headers and memory usage.
(line 6)
@@ -4281,43 +4357,43 @@
(line 104)
* Metafont ligature operations: Encoding file format.
(line 54)
-* Metafont mode, specifying: Option details. (line 185)
+* Metafont mode, specifying: Option details. (line 190)
* Metafont source files: Glyph files. (line 30)
* metric files: Metric files. (line 6)
* Minion typeface family: psfonts.map. (line 60)
-* missfont.log: Option details. (line 194)
-* MISSFONT_LOG: Option details. (line 197)
+* missfont.log: Option details. (line 199)
+* MISSFONT_LOG: Option details. (line 202)
* Mitsubishi Shinko CHC-S446i printer: No output. (line 14)
* mkdvipspapers: Config file paper sizes.
(line 79)
-* mktexpk, avoiding: Option details. (line 194)
+* mktexpk, avoiding: Option details. (line 199)
* mktexpk, changing name: Environment variables.
(line 36)
-* mode name, specifying: Option details. (line 185)
-* mtpk: Option details. (line 379)
+* mode name, specifying: Option details. (line 190)
+* mtpk: Option details. (line 384)
* multiple master fonts: psfonts.map. (line 60)
-* multiple output files: Option details. (line 127)
+* multiple output files: Option details. (line 132)
* multiple paper trays: Paper trays. (line 6)
* Murphy, Tim: Hypertext specials. (line 20)
* N config command (disable EPS): Configuration file commands.
- (line 105)
+ (line 110)
* name: Hypertext specials. (line 41)
* narrow fonts: psfonts.map. (line 19)
* no output at all: No output. (line 6)
-* non-printing characters, shifting: Option details. (line 117)
+* non-printing characters, shifting: Option details. (line 122)
* non-resident fonts: psfonts.map. (line 6)
* nopaper, paper format for -t: Config file paper sizes.
(line 74)
* o config command (output destination): Configuration file commands.
- (line 110)
+ (line 115)
* O config command (page offsets): Configuration file commands.
- (line 118)
+ (line 123)
* oblique fonts: Special font effects.
(line 6)
* octal character codes: Afm2tfm options. (line 51)
* odd pages only: Option details. (line 27)
-* offset pages: Option details. (line 254)
-* Omega extensions: Option details. (line 215)
+* offset pages: Option details. (line 259)
+* Omega extensions: Option details. (line 220)
* option, details of: Option details. (line 6)
* options, debugging: Debug options. (line 6)
* options, Dvips: Invoking Dvips. (line 6)
@@ -4330,20 +4406,20 @@
* output file, sectioning of: Headers and memory usage.
(line 6)
* output file, setting: Configuration file commands.
- (line 110)
-* output files, multiple: Option details. (line 127)
+ (line 115)
+* output files, multiple: Option details. (line 132)
* output, inverted: Small or inverted. (line 6)
* output, none: No output. (line 6)
-* output, redirecting: Option details. (line 237)
+* output, redirecting: Option details. (line 242)
* output, too small: Small or inverted. (line 6)
* p config command (font aliases): Configuration file commands.
- (line 121)
+ (line 126)
* P config command (PK path): Configuration file commands.
- (line 130)
-* page range: Option details. (line 281)
-* page, first printed: Option details. (line 272)
-* page, last printed: Option details. (line 169)
-* pages, maximum printed: Option details. (line 204)
+ (line 135)
+* page range: Option details. (line 286)
+* page, first printed: Option details. (line 277)
+* page, last printed: Option details. (line 174)
+* pages, maximum printed: Option details. (line 209)
* PaintType: Special font effects.
(line 50)
* Pantone colors: Color macro files. (line 16)
@@ -4354,16 +4430,16 @@
* paper size, general: Paper size and landscape.
(line 6)
* paper trays: Paper trays. (line 6)
-* paper type: Option details. (line 332)
+* paper type: Option details. (line 337)
* papersize special: papersize special. (line 6)
-* papersize special, and no -t: Option details. (line 332)
-* papersize special, first vs. last: Option details. (line 178)
+* papersize special, and no -t: Option details. (line 337)
+* papersize special, first vs. last: Option details. (line 183)
* partial font downloading: psfonts.map. (line 55)
* PDF files, font quality: Hypertext caveats. (line 6)
* PDF files, making: Ghostscript installation.
(line 6)
* PDF files, making <1>: Hypertext. (line 11)
-* PDF files, option for: Option details. (line 405)
+* PDF files, option for: Option details. (line 410)
* pdfmark: Hypertext. (line 6)
* pfa files: Glyph files. (line 25)
* pfb files: Glyph files. (line 25)
@@ -4371,28 +4447,28 @@
* pfm files: Metric files. (line 48)
* Phaser printer, used for color calibration: Color device configuration.
(line 18)
-* physical page number, and -l: Option details. (line 169)
-* physical page number, and -p: Option details. (line 272)
+* physical page number, and -l: Option details. (line 174)
+* physical page number, and -p: Option details. (line 277)
* physical page number, and bop-hook: PostScript hooks. (line 26)
-* pipes, not readable: Option details. (line 98)
+* pipes, not readable: Option details. (line 103)
* pk files: Glyph files. (line 35)
* PKFONTS, overrides P: Configuration file commands.
- (line 130)
+ (line 135)
* plotfile, ps subspecial: ps special. (line 29)
* pltotf: Metric files. (line 39)
-* popen for output: Option details. (line 242)
+* popen for output: Option details. (line 247)
* portrait orientation, defined: Paper size and landscape.
(line 11)
-* positioning accuracy: Option details. (line 71)
+* positioning accuracy: Option details. (line 76)
* post code after headers: Including headers from TeX.
(line 28)
* PostScript code, literal: Literal PS. (line 6)
* PostScript encoding: Encodings. (line 27)
* PostScript encoding, changing: Changing PostScript encodings.
(line 6)
-* PostScript font alias file: Option details. (line 359)
+* PostScript font alias file: Option details. (line 364)
* PostScript font alias file <1>: Configuration file commands.
- (line 121)
+ (line 126)
* PostScript fonts: PostScript fonts. (line 6)
* PostScript fonts, installing: PostScript font installation.
(line 6)
@@ -4418,13 +4494,13 @@
(line 14)
* printer errors: Printer errors. (line 6)
* printer memory: Configuration file commands.
- (line 75)
+ (line 80)
* printer memory exhausted: Printer errors. (line 14)
-* printer offset: Option details. (line 254)
+* printer offset: Option details. (line 259)
* PRINTER, and config file searching: Configuration file searching.
(line 36)
-* PRINTER, avoided with -f: Option details. (line 98)
-* printer, driving directly: Option details. (line 110)
+* PRINTER, avoided with -f: Option details. (line 103)
+* printer, driving directly: Option details. (line 115)
* problems: Diagnosing problems. (line 6)
* property list files: Metric files. (line 39)
* prototype printer configuration file: config.ps installation.
@@ -4438,18 +4514,18 @@
* psfonts.map <2>: psfonts.map. (line 6)
* psheaderdir: Header files. (line 12)
* psi character missing: Hypertext caveats. (line 54)
-* pstopk: Option details. (line 379)
-* pTeX extensions: Option details. (line 215)
-* pTeX extensions <1>: Option details. (line 221)
+* pstopk: Option details. (line 384)
+* pTeX extensions: Option details. (line 220)
+* pTeX extensions <1>: Option details. (line 226)
* q config command (quiet): Configuration file commands.
- (line 136)
+ (line 141)
* Q config command (quiet): Configuration file commands.
- (line 136)
-* quiet operation: Option details. (line 305)
+ (line 141)
+* quiet operation: Option details. (line 310)
* R config command (fallback resolution): Configuration file commands.
- (line 142)
+ (line 147)
* r config command (page reversal): Configuration file commands.
- (line 139)
+ (line 144)
* raw tfm files: Afm2tfm options. (line 17)
* reencode/*.enc: Encodings. (line 35)
* reencoding: Reencoding with Afm2tfm.
@@ -4460,25 +4536,25 @@
* remapping: Reencoding with Afm2tfm.
(line 6)
* resident fonts, different in different printers: Option details.
- (line 359)
+ (line 364)
* resident fonts, different in different printers <1>: Configuration file commands.
- (line 121)
-* resolution: Option details. (line 395)
-* resolution <1>: Option details. (line 402)
-* resolution, setting: Option details. (line 58)
-* reverse pagination: Option details. (line 309)
+ (line 126)
+* resolution: Option details. (line 400)
+* resolution <1>: Option details. (line 407)
+* resolution, setting: Option details. (line 63)
+* reverse pagination: Option details. (line 314)
* rhi (psfile special option): psfile special. (line 46)
* Rokicki, Tomas: Why Dvips. (line 60)
* rotate.tex: ps special. (line 33)
* rwi (psfile special option): psfile special. (line 46)
* s config command (global save/restore): Configuration file commands.
- (line 164)
+ (line 169)
* S config command (pict path): Configuration file commands.
- (line 167)
+ (line 172)
* save/restore, and inverted output: Small or inverted. (line 6)
* save/restore, and literal PS: Literal examples. (line 27)
* save/restore, and specials: ps special. (line 6)
-* save/restore, generating global: Option details. (line 320)
+* save/restore, generating global: Option details. (line 325)
* scaleunit: psfile special. (line 66)
* scaling of figures: EPSF scaling. (line 6)
* scaling small caps: Afm2tfm options. (line 43)
@@ -4492,15 +4568,15 @@
(line 6)
* sections of output file, and memory: Headers and memory usage.
(line 6)
-* sections output, in separate files: Option details. (line 127)
-* security: Option details. (line 312)
-* shell command execution, disabling: Option details. (line 312)
+* sections output, in separate files: Option details. (line 132)
+* security: Option details. (line 317)
+* shell command execution, disabling: Option details. (line 317)
* shell escape, in config file: Configuration file commands.
- (line 37)
+ (line 42)
* Shinko CHC-S446i printer: No output. (line 14)
* show PostScript operator: PostScript typesetting.
(line 23)
-* silent operation: Option details. (line 305)
+* silent operation: Option details. (line 310)
* simplex mode on duplex printers: Including headers from the command line.
(line 13)
* slanted fonts: Special font effects.
@@ -4514,22 +4590,22 @@
* spaces, dropped trailing: Hypertext caveats. (line 54)
* specials, hypertext: Hypertext specials. (line 6)
* splines: Glyph files. (line 17)
-* spooler, lacking: Option details. (line 110)
-* spooling to lpr on MS-DOS: Option details. (line 242)
-* standard I/O: Option details. (line 98)
+* spooler, lacking: Option details. (line 115)
+* spooling to lpr on MS-DOS: Option details. (line 247)
+* standard I/O: Option details. (line 103)
* standard input, reading options from: Option details. (line 11)
-* standard output, output to: Option details. (line 237)
+* standard output, output to: Option details. (line 242)
* standard PostScript, required by Ghostview: Ghostscript installation.
(line 12)
* start-hook: PostScript hooks. (line 11)
-* structured comments: Option details. (line 207)
+* structured comments: Option details. (line 212)
* system in config file: Configuration file commands.
- (line 37)
+ (line 42)
* T config command (TFM path): Configuration file commands.
- (line 172)
+ (line 177)
* Tektronix Phaser printer, used for color calibration: Color device configuration.
(line 18)
-* testpage.tex: Option details. (line 261)
+* testpage.tex: Option details. (line 266)
* TeX encoding, changing: Changing TeX encodings.
(line 6)
* TeX, including headers in: Including headers from TeX.
@@ -4537,13 +4613,13 @@
* TEXCONFIG: Environment variables.
(line 55)
* TEXFONTS, overrides P: Configuration file commands.
- (line 130)
+ (line 135)
* TEXFONTS, overrides T: Configuration file commands.
- (line 172)
+ (line 177)
* TEXINPUTS, overrides S: Configuration file commands.
- (line 167)
+ (line 172)
* texmext.enc: Encodings. (line 35)
-* TEXMFOUTPUT: Option details. (line 197)
+* TEXMFOUTPUT: Option details. (line 202)
* texmital.enc: Encodings. (line 35)
* texmsym.enc: Encodings. (line 35)
* texmsym.enc <1>: Changing TeX encodings.
@@ -4551,32 +4627,32 @@
* TEXPICTS: Environment variables.
(line 62)
* TEXPICTS, overrides S: Configuration file commands.
- (line 167)
+ (line 172)
* TEXPKS, overrides P: Configuration file commands.
- (line 130)
+ (line 135)
* TEXSIZES, overrides R: Configuration file commands.
- (line 155)
+ (line 160)
* text in figures, chopped off: EPSF clipping. (line 6)
* tfm files: Metric files. (line 31)
* TFMFONTS, overrides T: Configuration file commands.
- (line 172)
+ (line 177)
* tftopl: Metric files. (line 39)
* Theisen, Tim: Ghostscript installation.
(line 12)
-* tight bounding box, finding: Option details. (line 82)
+* tight bounding box, finding: Option details. (line 87)
* too-small output: Small or inverted. (line 6)
* trademark character, accessing: Changing PostScript encodings.
(line 18)
* trailing spaces, dropped: Hypertext caveats. (line 54)
-* TranScript: Option details. (line 207)
+* TranScript: Option details. (line 212)
* transforming downloaded fonts: psfonts.map. (line 19)
* trouble: Diagnosing problems. (line 6)
* Type 1 fonts: Glyph files. (line 25)
* typesetting in PostScript: PostScript typesetting.
(line 6)
* U config command (Xerox 4045): Configuration file commands.
- (line 177)
-* uncollated copies: Option details. (line 41)
+ (line 182)
+* uncollated copies: Option details. (line 46)
* uncompressing PostScript: Dynamic creation of graphics.
(line 6)
* uniform resource locator: Hypertext specials. (line 20)
@@ -4591,14 +4667,14 @@
* user-definable colors: User-definable colors.
(line 6)
* userdict, and dictionary files: Header files. (line 21)
-* userdict, used for header files: Option details. (line 122)
+* userdict, used for header files: Option details. (line 127)
* V config command (vf path): Configuration file commands.
- (line 181)
+ (line 186)
* verbose EPSF processing: EPSF macros. (line 46)
* vf files: Virtual fonts. (line 16)
* virtual font expansion: Virtual fonts. (line 33)
* virtual font path: Configuration file commands.
- (line 181)
+ (line 186)
* virtual fonts: Virtual fonts. (line 6)
* virtual fonts, creating: Invoking afm2tfm. (line 13)
* VM exhausted: Printer errors. (line 14)
@@ -4611,21 +4687,21 @@
* vscale (psfile special option): psfile special. (line 33)
* vsize (psfile special option): psfile special. (line 27)
* W config command (emit warning): Configuration file commands.
- (line 186)
+ (line 191)
* warning messages, defining: Configuration file commands.
- (line 186)
-* warnings, suppressing: Option details. (line 305)
+ (line 191)
+* warnings, suppressing: Option details. (line 310)
* whole font downloading: psfonts.map. (line 60)
* wide fonts: psfonts.map. (line 19)
* X config command (horizontal resolution): Configuration file commands.
- (line 193)
-* Xerox 4045: Option details. (line 367)
+ (line 198)
+* Xerox 4045: Option details. (line 372)
* Y config command (vertical resolution): Configuration file commands.
- (line 196)
+ (line 201)
* Z config command (compress fonts): Configuration file commands.
- (line 199)
+ (line 204)
* z config command (secure mode): Configuration file commands.
- (line 202)
+ (line 207)
@@ -4648,64 +4724,70 @@
Node: Command-line options18539
Node: Option summary18987
Node: Option details21236
-Node: Environment variables41008
-Node: Config files43869
-Node: Configuration file searching44539
-Node: Configuration file commands47736
-Node: Paper size and landscape55517
-Node: papersize special57142
-Node: Config file paper sizes58850
-Node: Paper trays63006
-Node: Interaction with PostScript64340
-Node: PostScript figures64993
-Node: Bounding box65719
-Node: \includegraphics69091
-Node: EPSF macros71384
-Node: EPSF scaling73353
-Node: EPSF clipping75923
-Node: psfile special76565
-Node: Dynamic creation of graphics78957
-Node: Fonts in figures80275
-Node: Header files81925
-Node: Including headers from TeX83131
-Node: Including headers from the command line85169
-Node: Headers and memory usage86268
-Node: Literal PS87479
-Node: " special88061
-Node: ps special88802
-Node: Literal headers90300
-Node: PostScript hooks91009
-Node: Literal examples93105
-Node: Hypertext94559
-Node: Hypertext caveats95788
-Node: Hypertext specials100176
-Node: PostScript fonts102810
-Node: Font concepts103927
-Node: Metric files105094
-Node: Glyph files107874
-Node: Virtual fonts110233
-Node: Encodings112059
-Node: PostScript typesetting114462
-Node: Making a font available117547
-Node: Invoking afm2tfm122581
-Node: Changing font encodings123598
-Node: Changing TeX encodings124389
-Node: Changing PostScript encodings125491
-Node: Changing both encodings126835
-Node: Reencoding with Afm2tfm127509
-Node: Encoding file format130612
-Node: Special font effects134816
-Node: Afm2tfm options137076
-Node: psfonts.map140601
-Node: Color145331
-Node: Color macro files146375
-Node: User-definable colors149568
-Node: Color subtleties150844
-Node: Ted Turner152496
-Node: Color device configuration153721
-Node: Color support details156165
-Node: Color specifications156543
-Node: Color specials157947
-Node: Index160076
+Node: Environment variables41202
+Node: Config files44063
+Node: Configuration file searching44733
+Node: Configuration file commands47930
+Node: Paper size and landscape55904
+Node: papersize special57529
+Node: Config file paper sizes59237
+Node: Paper trays63393
+Node: Interaction with PostScript64727
+Node: PostScript figures65380
+Node: Bounding box66106
+Node: \includegraphics69478
+Node: EPSF macros71771
+Node: EPSF scaling73740
+Node: EPSF clipping76310
+Node: psfile special76952
+Node: Dynamic creation of graphics79344
+Node: Fonts in figures80662
+Node: Header files82312
+Node: Including headers from TeX83518
+Node: Including headers from the command line85556
+Node: Headers and memory usage86655
+Node: Literal PS87866
+Node: " special88448
+Node: ps special89189
+Node: Literal headers90687
+Node: PostScript hooks91396
+Node: Literal examples93492
+Node: Hypertext94946
+Node: Hypertext caveats96175
+Node: Hypertext specials100563
+Node: PostScript fonts103197
+Node: Font concepts104314
+Node: Metric files105544
+Node: Glyph files108324
+Node: Virtual fonts110683
+Node: Encodings112509
+Node: Bitmap font encodings114911
+Node: PostScript typesetting117441
+Node: Making a font available120538
+Node: Invoking afm2tfm125572
+Node: Changing font encodings126589
+Node: Changing TeX encodings127380
+Node: Changing PostScript encodings128482
+Node: Changing both encodings129826
+Node: Reencoding with Afm2tfm130500
+Node: Encoding file format133603
+Node: Special font effects137807
+Node: Afm2tfm options140067
+Node: psfonts.map143592
+Node: Color148322
+Node: Color macro files149366
+Node: User-definable colors152559
+Node: Color subtleties153835
+Node: Ted Turner155487
+Node: Color device configuration156712
+Node: Color support details159156
+Node: Color specifications159534
+Node: Color specials160938
+Node: Index163067
End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
Binary files old/texmf-dist/doc/man/man1/afm2tfm.man1.pdf and new/texmf-dist/doc/man/man1/afm2tfm.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/dvips.man1.pdf and new/texmf-dist/doc/man/man1/dvips.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dvips.doc.tlpobj new/tlpkg/tlpobj/dvips.doc.tlpobj
--- old/tlpkg/tlpobj/dvips.doc.tlpobj 2019-03-27 02:24:06.000000000 +0100
+++ new/tlpkg/tlpobj/dvips.doc.tlpobj 2020-03-14 01:42:08.000000000 +0100
@@ -1,8 +1,8 @@
name dvips.doc
category TLCore
-revision 50602
+revision 54279
shortdesc doc files of dvips
-docfiles size=285
+docfiles size=289
texmf-dist/doc/dvips/NEWS
texmf-dist/doc/dvips/README
texmf-dist/doc/dvips/dvips.html
++++++ dvips.tar.xz ++++++
++++ 5166 lines of diff (skipped)
++++++ dvisvgm.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/dvisvgm.1 new/texmf-dist/doc/man/man1/dvisvgm.1
--- old/texmf-dist/doc/man/man1/dvisvgm.1 2019-03-15 23:42:48.000000000 +0100
+++ new/texmf-dist/doc/man/man1/dvisvgm.1 2020-03-21 23:09:24.000000000 +0100
@@ -2,12 +2,12 @@
.\" Title: dvisvgm
.\" Author: Martin Gieseking <martin.gieseking(a)uos.de>
.\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
-.\" Date: 03/09/2019
+.\" Date: 2020-03-19
.\" Manual: dvisvgm Manual
-.\" Source: dvisvgm 2.6.3
+.\" Source: dvisvgm 2.9.1
.\" Language: English
.\"
-.TH "DVISVGM" "1" "03/09/2019" "dvisvgm 2\&.6\&.3" "dvisvgm Manual"
+.TH "DVISVGM" "1" "2020\-03\-19" "dvisvgm 2\&.9\&.1" "dvisvgm Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -46,10 +46,12 @@
.sp
However, TeX\(cqs main source for font descriptions is Metafont, which produces bitmap output (GF files)\&. That\(cqs why not all obtainable TeX fonts are available in a scalable format\&. In these cases, dvisvgm tries to vectorize Metafont\(cqs output by tracing the glyph bitmaps\&. The results are not as perfect as most (manually optimized) PFB or OTF counterparts, but are nonetheless really nice in most cases\&.
.sp
-When running dvisvgm without option \fB\-\-no\-fonts\fR, it creates \fIfont\fR elements (\fB<font>\fR\&...\fB</font>\fR) to embed the font data into the SVG files\&. Unfortunately, only few SVG renderers support these elements yet\&. Most web browsers and vector graphics applications don\(cqt evaluate them properly so that the text components of the resulting graphics might look strange\&. In order to create more compatible SVG files, command\-line option \fB\-\-no\-fonts\fR can be given to replace the font elements by plain graphics paths\&.
+When running dvisvgm without option \fB\-\-no\-fonts\fR, it creates \fIfont\fR elements (\fB<font>\fR\&...\fB</font>\fR) to embed the font data into the SVG files\&. Unfortunately, only few SVG renderers support these elements yet\&. Most web browsers and vector graphics applications don\(cqt evaluate them properly so that the text components of the resulting graphics might look strange\&. In order to create more compatible SVG files, command\-line option \fB\-\-no\-fonts\fR can be given to replace the font elements by plain graphics paths\&. Most web browsers (but only few external SVG renderers) also suppport WOFF and WOFF2 fonts that can be used instead of the default SVG fonts\&. Option \fB\-\-font\-format\fR offers the functionality to change the format applied to the fonts being embedded\&.
.SH "OPTIONS"
.sp
dvisvgm provides a POSIX\-compliant command\-line interface with short and long option names\&. They may be given before and/or after the name of the file to be converted\&. Also, the order of specifying the options is not significant, i\&.e\&. you can add them in any order without changing dvisvgm\(cqs behavior\&. Certain options accept or require additional parameters which are directly appended to or separated by whitespace from a short option (e\&.g\&. \fB\-v0\fR or \fB\-v 0\fR)\&. Long options require an additional equals sign (\fB=\fR) between option name and argument but without any surrounding whitespace (e\&.g\&. \fB\-\-verbosity=0\fR)\&. Multiple short options that don\(cqt expect a further parameter can be combined after a single dash (e\&.g\&. \fB\-ejs\fR rather than \fB\-e \-j \-s\fR)\&.
+.sp
+Long option names may also be shortened by omitting trailing characters\&. As long as the shortened name is unambiguous, it\(cqs recognized and applied\&. For example, option \fB\-\-exact\-bbox\fR can be shortened to \fB\-\-exact\fR, \fB\-\-exa\fR, or \fB\-\-ex\fR\&. In case of an ambiguous abbreviation, dvisvgm prints an error message together with all matching option names\&.
.PP
\fB\-b, \-\-bbox\fR=\fIfmt\fR
.RS 4
@@ -161,10 +163,94 @@
.RE
.RE
.PP
+\fB\-B, \-\-bitmap\-format\fR=\fIfmt\fR
+.RS 4
+This option sets the image format used to embed bitmaps extracted from PostScript or PDF data\&. By default, dvisvgm embeds all bitmaps as JPEG images because it\(cqs the most compact of the two formats supported by SVG\&. To select the alternative lossless PNG format,
+\fB\-\-bitmap\-format=png\fR
+can be used\&. There are some more format variants dvisvgm currently supports even though
+\fBjpeg\fR
+and
+\fBpng\fR
+should be sufficient in most cases\&. The following list gives an overview of the known format names which correspond to names of Ghostscript output devices\&.
+.TS
+tab(:);
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt
+lt lt.
+T{
+\fBnone\fR
+T}:T{
+disable processing of bitmap images
+T}
+T{
+\fBjpeg\fR
+T}:T{
+color JPEG format
+T}
+T{
+\fBjpeggray\fR
+T}:T{
+grayscale JPEG format
+T}
+T{
+\fBpng\fR
+T}:T{
+grayscale or 24\-bit color PNG format depending on current color space
+T}
+T{
+\fBpnggray\fR
+T}:T{
+grayscale PNG format
+T}
+T{
+\fBpngmono\fR
+T}:T{
+black\-and\-white PNG format
+T}
+T{
+\fBpngmonod\fR
+T}:T{
+dithered black\-and\-white PNG format
+T}
+T{
+\fBpng16\fR
+T}:T{
+4\-bit color PNG format
+T}
+T{
+\fBpng256\fR
+T}:T{
+8\-bit color PNG format
+T}
+T{
+\fBpng16m\fR
+T}:T{
+24\-bit color PNG format
+T}
+.TE
+.sp 1
+Since the collection of supported output devices can vary among local Ghostscript installations, not all formats may be available in some environments\&. dvisvgm quits with a PostScript error message if the selected output format requires a locally unsupported output device\&.
+.sp
+The two JPEG format specifiers accept an optional parameter to set the IJG quality level which must directly follow the format specifier separated by a colon, e\&.g\&.
+\fB\-\-bitmap\-format=jpeg:50\fR\&. The quality value is an integer between 0 and 100\&. Higher values result in better image quality but lower compression rates and therefore larger files\&. The default quality level is 75 which is applied if no quality parameter is given or if it\(cqs set to 0\&.
+.RE
+.PP
\fB\-C, \-\-cache\fR[=\fIdir\fR]
.RS 4
To speed up the conversion process of bitmap fonts, dvisvgm saves intermediate conversion information in cache files\&. By default, these files are stored in
-\fB$HOME/\&.dvisvgm/cache\fR\&. If you prefer a different location, use option
+\fB$XDG_CACHE_HOME/dvisvgm/\fR
+or
+\fB$HOME/\&.cache/dvisvgm\fR
+if
+\fBXDG_CACHE_HOME\fR
+is not set\&. If you prefer a different location, use option
\fB\-\-cache\fR
to overwrite the default\&. Furthermore, it is also possible to disable the font caching mechanism completely with option
\fB\-\-cache=none\fR\&. If argument
@@ -196,12 +282,13 @@
or
\fI#RGB\fR
to represent colors in the SVG file\&. The latter is a short form for colors whose RGB components each consist of two identical hex digits, e\&.g\&.
-\fI#123\fR
+\fB#123\fR
equals
-\fI#112233\fR\&. According to the SVG standard, it\(cqs also possible to use color names (like
+\fB#112233\fR\&. According to the SVG standard, it\(cqs also possible to use color names (like
\fBblack\fR
and
-\fBdarkblue\fR) for a limited number of predefined colors\&. In order to apply these color names rather than their RGB values, call dvisvgm with option
+\fBdarkblue\fR) for a limited number of
+predefined colors (\m[blue]https://www.w3.org/TR/SVG11/types.html#ColorKeywords\m[])\&. In order to apply these color names rather than their RGB values, call dvisvgm with option
\fB\-\-colornames\fR\&. All colors without an SVG color name will still be represented by RGB values\&.
.RE
.PP
@@ -219,10 +306,10 @@
for further information\&.
.RE
.PP
-\fB\-e, \-\-exact\fR
+\fB\-e, \-\-exact\-bbox\fR
.RS 4
This option tells dvisvgm to compute the precise bounding box of each character\&. By default, the values stored in a font\(cqs TFM file are used to determine a glyph\(cqs extent\&. As these values are intended to implement optimal character placements and are not designed to represent the exact dimensions, they don\(cqt necessarily correspond with the bounds of the visual glyphs\&. Thus, width and/or height of some glyphs may be larger (or smaller) than the respective TFM values\&. As a result, this can lead to clipped characters at the bounds of the SVG graphics\&. With option
-\fB\-\-exact\fR
+\fB\-\-exact\-bbox\fR
given, dvisvgm analyzes the actual shape of each character and derives a usually tight bounding box\&.
.RE
.PP
@@ -242,7 +329,7 @@
to the font format, e\&.g\&.
\fB\-\-font\-format=woff,autohint\fR
or
-\fB\-\-font\-format=woff,ah\fR\&.
+\fB\-\-fwoff,ah\fR\&.
.sp
Option
\fB\-\-font\-format\fR
@@ -258,7 +345,9 @@
\fIpdftex\&.map\fR,
\fIdvipdfm\&.map\fR, and
\fIpsfonts\&.map\fR
-(in this order)\&. Otherwise, the files as option arguments are evaluated in the given order\&. Multiple filenames must be separated by commas without leading and/or trailing whitespace\&. By default, redefined mappings do not replace previous ones\&. However, each filename can be preceded by an optional mode specifier (\fB+\fR,
+(in this order)\&. Otherwise, the files given as option arguments are evaluated in the given order\&. Multiple filenames must be separated by commas without leading and/or trailing whitespace\&.
+.sp
+By default, redefined mappings do not replace previous ones\&. However, each filename can be preceded by an optional mode specifier (\fB+\fR,
\fB\-\fR, or
\fB=\fR) to change this behavior:
.PP
@@ -298,7 +387,10 @@
\fImyfile2\&.map\fR
are removed from the font map tree\&.
.sp
-For further information about the map file formats and the mode specifiers, see the manuals of dvips and dvipdfm\&.
+For further information about the map file formats and the mode specifiers, see the manuals of
+dvips (\m[blue]https://tug.org/texinfohtml/dvips.html\m[])
+and
+dvipdfm (\m[blue]https://ctan.org/tex-archive/dviware/dvipdfm\m[])\&.
.RE
.RE
.PP
@@ -306,7 +398,7 @@
.RS 4
Tells dvisvgm to create overlapping grid segments when approximating color gradient fills (also see option
\fB\-\-grad\-segments\fR
-below)\&. By default, adjacent segments don\(cqt overlap but only touch each other like separate tiles\&. However, this alignment can lead to visible gaps between the segments because the background color usually influences the color at the boundary of the segments if the SVG renderer uses anti\-aliasing to create smooth contours\&. One way to avoid this and to create seamlessly touching color regions is to enlarge the segments so that they extent into the area of their right and bottom neighbors\&. Since the latter are drawn on top of the overlapping parts, the visible size of all segments keeps unchanged\&. Just the former gaps disappear as the background is now completely covered by the correct colors\&. Currently, dvisvgm computes the overlapping segments separately for each patch of the mesh (a patch mesh may consist of multiple patches of the same type)\&. Therefore, there still might be visible gaps at the seam of two adjacent patches\&.
+below)\&. By default, adjacent segments don\(cqt overlap but only touch each other like separate tiles\&. However, this alignment can lead to visible gaps between the segments because the background color usually influences the color at the boundary of the segments if the SVG renderer uses anti\-aliasing to create smooth contours\&. One way to avoid this and to create seamlessly touching color regions is to enlarge the segments so that they extend into the area of their right and bottom neighbors\&. Since the latter are drawn on top of the overlapping parts, the visible size of all segments keeps unchanged\&. Just the former gaps disappear as the background is now completely covered by the correct colors\&. Currently, dvisvgm computes the overlapping segments separately for each patch of the mesh (a patch mesh may consist of multiple patches of the same type)\&. Therefore, there still might be visible gaps at the seam of two adjacent patches\&.
.RE
.PP
\fB\-\-grad\-segments\fR=\fInumber\fR
@@ -330,6 +422,15 @@
Prints a short summary of all available command\-line options\&. The optional
\fImode\fR
parameter is an integer value between 0 and 2\&. It selects the display variant of the help text\&. Mode 0 lists all options divided into categories with section headers\&. This is also the default if dvisvgm is called without parameters\&. Mode 1 lists all options ordered by the short option names, while mode 2 sorts the lines by the long option names\&.
+.sp
+A values in brackets after the description text indicate the default parameter of the option\&. They are applied if an option with a mandatory parameter is not used or if an optional parameter is omitted\&. For example, option
+\fB\-\-bbox\fR
+requires a size parameter which defaults to
+\fBmin\fR
+if
+\fB\-\-bbox\fR
+is not used\&. Option
+\fB\-\-zip\fR, which isn\(cqt applied by default, accepts an optional compression level parameter\&. If it\(cqs omitted, the stated default value 9 is used\&.
.RE
.PP
\fB\-\-keep\fR
@@ -337,7 +438,7 @@
Disables the removal of temporary files as created by Metafont (usually \&.gf, \&.tfm, and \&.log files) or the TrueType/WOFF module\&.
.RE
.PP
-\fB\-\-libgs\fR=\fIfilename\fR
+\fB\-\-libgs\fR=\fIpath\fR
.RS 4
This option is only available if the Ghostscript library is not directly linked to dvisvgm and if PostScript support was not completely disabled during compilation\&. In this case, dvisvgm tries to load the shared GS library dynamically during runtime\&. By default, it expects the library\(cqs name to be
\fBlibgs\&.so\&.X\fR
@@ -345,10 +446,20 @@
\fBX\fR
is the ABI version of the library) or
\fBgsdll32\&.dll\fR/\fBgsdll64\&.dll\fR
-(Windows)\&. Option
+(Windows)\&. If dvisvgm doesn\(cqt find the library, option
\fB\-\-libgs\fR
-can be used to give a different name\&. Alternatively, it\(cqs also possible to set the GS library name by the environment variable
-\fBLIBGS\fR\&. The latter has less precedence than the command\-line option, i\&.e\&. dvisvgm ignores variable
+can be used to specify the correct path and filename, e\&.g\&.
+\fB\-\-libgs=/usr/local/lib/libgs\&.so\&.9\fR
+or
+\fB\-\-libgs=\egs\egs9\&.25\ebin\egsdll64\&.dll\fR\&.
+.sp
+Alternatively, it\(cqs also possible to assign the path to environment variable
+\fBLIBGS\fR, e\&.g\&.
+\fBexport LIBGS=/usr/local/lib/libgs\&.so\&.9\fR
+or
+\fBset LIBGS=\egs\egs9\&.25\ebin\egsdll63\&.dll\fR\&.
+\fBLIBGS\fR
+has less precedence than the command\-line option, i\&.e\&. dvisvgm ignores variable
\fBLIBGS\fR
if
\fB\-\-libgs\fR
@@ -432,7 +543,7 @@
\fIfont\fR
elements but uses
\fIpaths\fR
-instead\&. The resulting SVG files tend to be larger but they are concurrently more compatible with most applications that don\(cqt support SVG fonts yet\&. The optional argument
+instead\&. The resulting SVG files tend to be larger but are concurrently more compatible with most applications that don\(cqt support SVG fonts\&. The optional argument
\fIvariant\fR
selects the method how to substitute fonts by paths\&. Variant 0 creates
\fIpath\fR
@@ -469,6 +580,82 @@
\fB\-\-no\-styles\fR\&.
.RE
.PP
+\fB\-O, \-\-optimize\fR[=\fImodules\fR]
+.RS 4
+Applies several optimizations on the generated SVG tree to reduce the file size\&. The optimizations are performed by running separate optimizer modules specified by optional argument
+\fImodules\fR\&. It may consist of a single module name or a comma\-separated list of several module names\&. The corresponding modules are executed one by one in the given order and thus transform the XML tree gradually\&.
+.sp
+The following list describes the currently available optimizer modules\&.
+.PP
+\fBlist\fR
+.RS 4
+Lists all available optimizer modules and exits\&.
+.RE
+.PP
+\fBnone\fR
+.RS 4
+If this argument is given, dvisvgm doesn\(cqt apply any optimization\&.
+\fBnone\fR
+can\(cqt be combined with other module names\&.
+.RE
+.PP
+\fBall\fR
+.RS 4
+Performs all optimizations listed below\&. This is also the default if option
+\fB\-\-optimize\fR
+is used without argument\&. The modules are executed in a predefined order that usually leads to the best results\&.
+\fBall\fR
+can\(cqt be combined with other module names\&.
+.RE
+.PP
+\fBcollapse\-groups\fR
+.RS 4
+Combines nested group elements (\fB<g>\fR\&...\fB</g>\fR) that contain only a single group each\&. If possible, the group attributes are moved to the outermost element of the processed subtree\&. This module also unwraps group elements that have no attributes at all\&.
+.RE
+.PP
+\fBgroup\-attributes\fR
+.RS 4
+Creates groups (\fB<g>\fR\&...\fB</g>\fR) for common attributes around adjacent elements\&. Each attribute is moved to a separate group so that multiple common attributes lead to nested groups\&. They can be combined by applying optimizer module
+\fIcollapse\-groups\fR
+afterwards\&. The algorithm only takes inheritable properties, such as
+\fBfill\fR
+or
+\fBstroke\-width\fR, into account and only removes them from an element if none of the other attributes, like
+\fBid\fR, prevents this\&.
+.RE
+.PP
+\fBremove\-clippath\fR
+.RS 4
+Removes all redundant
+\fIclipPath\fR
+elements\&. This optimization was already present in former versions of dvisvgm and was always applied by default\&. This behavior is retained, i\&.e\&. dvisvgm executes this module even if option
+\fB\-\-optimize\fR
+is not given\&. You can use argument
+\fInone\fR
+to prevent that\&.
+.RE
+.PP
+\fBsimplify\-text\fR
+.RS 4
+If a
+\fBtext\fR
+element only contains whitespace nodes and
+\fBtspan\fR
+elements, all common inheritable attributes of the latter are moved to the enclosing text element\&. All
+\fBtspan\fR
+elements without further attributes are unwrapped\&.
+.RE
+.PP
+\fBsimplify\-transform\fR
+.RS 4
+Tries to shorten all
+\fItransform\fR
+attributes\&. This module combines the transformation commands of each attribute and decomposes the resulting transformation matrix into a sequence of basic transformations, i\&.e\&. translation, scaling, rotation, and skewing\&. If this sequence is shorter than the equivalent
+\fImatrix\fR
+expression, it\(cqs assigned to the attribute\&. Otherwise, the matrix expression is used\&.
+.RE
+.RE
+.PP
\fB\-o, \-\-output\fR=\fIpattern\fR
.RS 4
Sets the pattern specifying the names of the generated SVG files\&. Parameter
@@ -578,17 +765,20 @@
Since the page number isn\(cqt part of the file name by default, different DVI pages with identical contents get the same file name\&. Therefore, only the first one is converted while the others are skipped\&. To create separate files for each page, you can add the page number to the output pattern, e\&.g\&.
\fB\-\-output="%f\-%p\-%hc"\fR\&.
.sp
-By default, dvisvgm uses the XXH64 hash algorithm to compute the values provided through
+By default, dvisvgm uses the fast XXH64 hash algorithm to compute the values provided through
\fB%hd\fR
and
-\fB%hc\fR\&. It\(cqs extremely fast, and a 64\-bit hash should be sufficient for most documents with an average size of pages\&. Alternatively, XXH32 and MD5 can be used as well\&. The desired algorithm is specified by argument
+\fB%hc\fR\&. 64\-bit hashes should be sufficient for most documents with an average size of pages\&. Alternatively, XXH32 and MD5 can be used as well\&. The desired algorithm is specified by argument
\fIparams\fR
of option
\fB\-\-page\-hashes\fR\&. It takes one of the strings
\fBMD5\fR,
\fBXXH32\fR, and
\fBXXH64\fR, where the names can be given in lower case too, like
-\fB\-\-page\-hashes=md5\fR\&.
+\fB\-\-page\-hashes=md5\fR\&. Since version 0\&.7\&.1, xxHash provides an experimental 128\-bit hash function, whose algorithm may still change with the next versions of the library\&. If the corresponding API is available, dvisvgm supports the new hash function and option
+\fB\-\-page\-hashes\fR
+additionally accepts the algorithm specifier
+\fBXXH128\fR\&.
.sp
Finally, option
\fB\-\-page\-hashes\fR
@@ -986,25 +1176,37 @@
.PP
\fBdvisvgm:raw\fR \fItext\fR
.RS 4
-Adds an arbitrary sequence of characters to the page section of the SVG document\&. dvisvgm does not perform any validation here, thus the user has to ensure that the resulting SVG is still valid\&. Parameter
+Adds an arbitrary sequence of XML nodes to the page section of the SVG document\&. dvisvgm checks syntax and proper nesting of the inserted elements but does not perform any validation, thus the user has to ensure that the resulting SVG is still valid\&. Opening and closing tags may be distributed among different
+\fIraw\fR
+specials\&. The tags themselves can also be split but must be continued with the immediately following
+\fIraw\fR
+special\&. Both syntactically incorrect and wrongly nested tags lead to error messages\&. Parameter
\fItext\fR
-may contain the expressions
+may also contain the expressions
\fB{?x}\fR,
-\fB{?y}\fR, and
-\fB{?color}\fR
+\fB{?y}\fR,
+\fB{?color}\fR, and
+\fB{?matrix}\fR
that expand to the current
\fIx\fR
or
\fIy\fR
-coordinate and the current color, respectively\&. Furthermore,
+coordinate, the current color, and current transformation matrix, respectively\&. Character sequence
\fB{?nl}\fR
-expands to a newline character\&.
+expands to a newline character\&. Finally, constructions of the form
+\fB{?(\fR\fB\fIexpr\fR\fR\fB)}\fR
+enable the evaluation of mathematical expressions which may consist of basic arithmetic operations including modulo\&. Like above, the variables
+\fIx\fR
+and
+\fIy\fR
+represent the current coordinates\&. Example:
+\fB{?(\-10*(x+2y)\-5)}\fR\&.
.RE
.PP
\fBdvisvgm:rawdef\fR \fItext\fR
.RS 4
This command is similar to
-\fBdvisvgm:raw\fR, but puts the raw text into the <defs> section of the SVG document currently being generated\&.
+\fBdvisvgm:raw\fR, but puts the XML nodes into the <defs> section of the SVG document currently being generated\&.
.RE
.PP
\fBdvisvgm:rawset\fR \fIname\fR \&... \fBdvisvgm:endrawset\fR
@@ -1017,7 +1219,7 @@
\fBdvisvgm:rawset\fR
and
\fBdvisvgm:endrawset\fR
-are not evaluated immediately but jointly stored under the given
+are not evaluated immediately but stored together under the given
\fIname\fR
for later use\&. Once defined, the named fragment can be referenced throughout the DVI file by
\fBdvisvgm:rawput\fR
@@ -1065,6 +1267,16 @@
\fB\-\-bbox\fR) or as plain floating point numbers\&. In the latter case, TeX point units are assumed (1in = 72\&.27pt)\&.
.RE
.PP
+\fBdvisvgm:bbox\fR lock
+.RS 4
+Locks the bounding box of the current page and prevents it from further updating, i\&.e\&. graphics elements added after calling this special are not taken into account in determining the extent of the bounding box\&.
+.RE
+.PP
+\fBdvisvgm:bbox\fR unlock
+.RS 4
+Unlocks the previously locked bounding box of the current page so that it gets updated again when adding graphics elements to the page\&.
+.RE
+.PP
\fBdvisvgm:bbox\fR n[ew] \fIname\fR
.RS 4
Defines or resets a local bounding box called
@@ -1082,7 +1294,7 @@
wasn\(cqt previously defined, all four values equal to zero\&.
.RE
.PP
-\fBdvisvgm:bbox\fR \fIwidth\fR \fIheight\fR [\fIdepth\fR]
+\fBdvisvgm:bbox\fR \fIwidth\fR \fIheight\fR [\fIdepth\fR] [\fBtransform\fR]
.RS 4
Updates the bounding box of the current page by embedding a virtual rectangle (\fIx\fR,
\fIy\fR,
@@ -1098,17 +1310,23 @@
can be given together with a unit specifier (see option
\fB\-\-bbox\fR) or as plain floating point numbers\&. In the latter case, TeX point units are assumed (1in = 72\&.27pt)\&. Depending on size and position of the virtual rectangle, this command either enlarges the overall bounding box or leaves it as is\&. It\(cqs not possible to reduce its extent\&. This special should be used together with
\fBdvisvgm:raw\fR
-in order to update the viewport of the page properly\&.
+in order to update the viewport of the page properly\&. By default, the box extents are assigned unchanged and, in particular, are not altered by transformation commands\&. In order to apply the current transformation matrix, the optional modifier
+\fBtransform\fR
+can be added at the end of the special statement\&.
.RE
.PP
-\fBdvisvgm:bbox\fR a[bs] \fIx1\fR \fIy1\fR \fIx2\fR \fIy2\fR
+\fBdvisvgm:bbox\fR a[bs] \fIx1\fR \fIy1\fR \fIx2\fR \fIy2\fR [\fBtransform\fR]
.RS 4
-This variant of the bbox special updates the bounding box by embedding a virtual rectangle (\fIx1\fR,\fIy1\fR,\fIx2\fR,\fIy2\fR)\&. The points (\fIx1\fR,\fIy1\fR) and (\fIx2\fR,\fIy2\fR) denote the absolute coordinates of two diagonal corners of the rectangle\&.
+This variant of the bbox special updates the bounding box by embedding a virtual rectangle (\fIx1\fR,\fIy1\fR,\fIx2\fR,\fIy2\fR)\&. The points (\fIx1\fR,\fIy1\fR) and (\fIx2\fR,\fIy2\fR) denote the absolute coordinates of two diagonal corners of the rectangle\&. As with the relative special variant described above, the optional modifier
+\fBtransform\fR
+allows for applying the current transformation matrix to the bounding box\&.
.RE
.PP
-\fBdvisvgm:bbox\fR f[ix] \fIx1\fR \fIy1\fR \fIx2\fR \fIy2\fR
+\fBdvisvgm:bbox\fR f[ix] \fIx1\fR \fIy1\fR \fIx2\fR \fIy2\fR [\fBtransform\fR]
.RS 4
-This variant of the bbox special assigns an absolute (final) bounding box to the resulting SVG\&. After executing this command, dvisvgm doesn\(cqt further alter the bounding box coordinates, except this special is called again later\&. The points (\fIx1\fR,\fIy1\fR) and (\fIx2\fR,\fIy2\fR) denote the absolute coordinates of two diagonal corners of the rectangle\&.
+This variant of the bbox special assigns an absolute (final) bounding box to the resulting SVG\&. After executing this command, dvisvgm doesn\(cqt further alter the bounding box coordinates, except this special is called again later\&. The points (\fIx1\fR,\fIy1\fR) and (\fIx2\fR,\fIy2\fR) denote the absolute coordinates of two diagonal corners of the rectangle\&. As with the relative special variant described above, the optional modifier
+\fBtransform\fR
+allows for applying the current transformation matrix to the bounding box\&.
.sp
The following TeX snippet adds two raw SVG elements to the output and updates the bounding box accordingly:
.sp
@@ -1117,11 +1335,11 @@
.\}
.nf
\especial{dvisvgm:raw <circle cx=\*(Aq{?x}\*(Aq cy=\*(Aq{?y}\*(Aq r=\*(Aq10\*(Aq stroke=\*(Aqblack\*(Aq fill=\*(Aqred\*(Aq/>}%
-\especial{dvisvgm:bbox 10bp 10bp 10bp}%
-\especial{dvisvgm:bbox \-10bp 10bp 10bp}
+\especial{dvisvgm:bbox 10bp 10bp 10bp transform}%
+\especial{dvisvgm:bbox \-10bp 10bp 10bp transform}
-\especial{dvisvgm:raw <path d=\*(AqM50 200 L10 250 H100 Z\*(Aq stroke=\*(Aqblack\*(Aq fill=\*(Aqblue\*(Aq/>}
-\especial{dvisvgm:bbox abs 10bp 200bp 100bp 250bp}
+\especial{dvisvgm:raw <path d=\*(AqM50 200 L10 250 H100 Z\*(Aq stroke=\*(Aqblack\*(Aq fill=\*(Aqblue\*(Aq/>}%
+\especial{dvisvgm:bbox abs 10bp 200bp 100bp 250bp transform}
.fi
.if n \{\
.RE
@@ -1181,8 +1399,8 @@
\fBps\fR
.RS 4
The famous DVI driver
-\fIdvips\fR
-introduced its own set of specials in order to embed PostScript code into DVI files, which greatly improves the capabilities of DVI documents\&. One aim of dvisvgm is to completely evaluate all PostScript snippets and to convert as many of them as possible to SVG\&. In contrast to dvips, dvisvgm uses floating point arithmetics to compute the precise position of each graphic element, i\&.e\&. it doesn\(cqt round the coordinates\&. Therefore, the relative locations of the graphic elements may slightly differ from those computed by dvips\&.
+\fIdvips\fR (\m[blue]https://www.tug.org/texinfohtml/dvips.html\m[])
+introduced its own set of specials in order to embed PostScript code into DVI files, which greatly improves the capabilities of DVI documents\&. One aim of dvisvgm is to completely evaluate all PostScript fragments and to convert as many of them as possible to SVG\&. In contrast to dvips, dvisvgm uses floating point arithmetics to compute the precise position of each graphic element, i\&.e\&. it doesn\(cqt round the coordinates\&. Therefore, the relative locations of the graphic elements may slightly differ from those computed by dvips\&.
.sp
Since PostScript is a rather complex language, dvisvgm does not implement its own PostScript interpreter but relies on
Ghostscript (\m[blue]https://ghostscript.com\m[])
@@ -1219,66 +1437,75 @@
The TPIC special set defines instructions for drawing simple geometric objects\&. Some LaTeX packages, like eepic and tplot, use these specials to describe graphics\&.
.RE
.SH "EXAMPLES"
-.sp
-.if n \{\
+.PP
+\fBdvisvgm file\fR
.RS 4
-.\}
-.nf
-dvisvgm file
-.fi
-.if n \{\
+Converts the first page of
+\fIfile\&.dvi\fR
+to
+\fIfile\&.svg\fR\&.
.RE
-.\}
-.sp
-Converts the first page of \fIfile\&.dvi\fR to \fIfile\&.svg\fR\&.
-.sp
-.if n \{\
+.PP
+\fBdvisvgm \-p1\-5 file\fR
.RS 4
-.\}
-.nf
-dvisvgm \- < file\&.dvi
-.fi
-.if n \{\
+Converts the first five pages of
+\fIfile\&.dvi\fR
+to
+\fIfile\-1\&.svg\fR,\&...,\fIfile\-5\&.svg\fR\&.
.RE
-.\}
-.sp
-Converts the first page of \fIfile\&.dvi\fR to \fIstdin\&.svg\fR where the contents of \fIfile\&.dvi\fR is read from \fBstdin\fR\&.
-.sp
-.if n \{\
+.PP
+\fBdvisvgm \-p1\- file\fR
.RS 4
-.\}
-.nf
-dvisvgm \-z file
-.fi
-.if n \{\
+Converts all pages of
+\fIfile\&.dvi\fR
+to separate SVG files\&.
.RE
-.\}
-.sp
-Converts the first page of \fIfile\&.dvi\fR to \fIfile\&.svgz\fR with default compression level 9\&.
-.sp
-.if n \{\
+.PP
+\fBdvisvgm \-p1,3 \-O file\fR
.RS 4
-.\}
-.nf
-dvisvgm \-p5 \-z3 \-ba4\-l \-onewfile file
-.fi
-.if n \{\
+Converts the first and third page of
+\fIfile\&.dvi\fR
+to optimized SVG files\&.
.RE
-.\}
-.sp
-Converts the fifth page of \fIfile\&.dvi\fR to \fInewfile\&.svgz\fR with compression level 3\&. The bounding box is set to DIN/ISO A4 in landscape format\&.
-.sp
-.if n \{\
+.PP
+\fBdvisvgm \- < file\&.dvi\fR
.RS 4
-.\}
-.nf
-dvisvgm \-\-transform="R20,w/3,2h/5 T1cm,1cm S2,3" file
-.fi
-.if n \{\
+Converts the first page of
+\fIfile\&.dvi\fR
+to
+\fIstdin\&.svg\fR
+where the contents of
+\fIfile\&.dvi\fR
+is read from
+\fBstdin\fR\&.
+.RE
+.PP
+\fBdvisvgm \-z file\fR
+.RS 4
+Converts the first page of
+\fIfile\&.dvi\fR
+to
+\fIfile\&.svgz\fR
+with default compression level 9\&.
+.RE
+.PP
+\fBdvisvgm \-p5 \-z3 \-ba4\-l \-o newfile file\fR
+.RS 4
+Converts the fifth page of
+\fIfile\&.dvi\fR
+to
+\fInewfile\&.svgz\fR
+with compression level 3\&. The bounding box is set to DIN/ISO A4 in landscape format\&.
+.RE
+.PP
+\fBdvisvgm \-\-transform="R20,w/3,2h/5 T1cm,1cm S2,3" file\fR
+.RS 4
+Converts the first page of
+\fIfile\&.dvi\fR
+to
+\fIfile\&.svg\fR
+where three transformations are applied\&.
.RE
-.\}
-.sp
-Converts the first page of \fIfile\&.dvi\fR to \fIfile\&.svg\fR where three transformations are applied\&.
.SH "ENVIRONMENT"
.sp
dvisvgm uses the \fBkpathsea\fR library for locating the files that it opens\&. Hence, the environment variables described in the library\(cqs documentation influence the converter\&.
@@ -1461,4 +1688,4 @@
Written by Martin Gieseking <\m[blue]\fBmartin\&.gieseking(a)uos\&.de\fR\m[]>
.SH "COPYING"
.sp
-Copyright \(co 2005\-2019 Martin Gieseking\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 3 or, (at your option) any later version\&.
+Copyright \(co 2005\-2020 Martin Gieseking\&. Free use of this software is granted under the terms of the GNU General Public License (GPL) version 3 or, (at your option) any later version\&.
Binary files old/texmf-dist/doc/man/man1/dvisvgm.man1.pdf and new/texmf-dist/doc/man/man1/dvisvgm.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dvisvgm.doc.tlpobj new/tlpkg/tlpobj/dvisvgm.doc.tlpobj
--- old/tlpkg/tlpobj/dvisvgm.doc.tlpobj 2019-03-27 02:24:07.000000000 +0100
+++ new/tlpkg/tlpobj/dvisvgm.doc.tlpobj 2020-03-22 01:54:55.000000000 +0100
@@ -1,7 +1,7 @@
name dvisvgm.doc
category TLCore
-revision 50602
+revision 54457
shortdesc doc files of dvisvgm
-docfiles size=37
+docfiles size=40
texmf-dist/doc/man/man1/dvisvgm.1
texmf-dist/doc/man/man1/dvisvgm.man1.pdf
++++++ dynkin-diagrams.doc.tar.xz ++++++
++++ 2659 lines of diff (skipped)
++++++ dynkin-diagrams.tar.xz ++++++
++++ 5700 lines of diff (skipped)
++++++ e-french.doc.tar.xz ++++++
Binary files old/doc/generic/e-french/Probl_Msg.pdf and new/doc/generic/e-french/Probl_Msg.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/e-french/Probl_Msg.txt new/doc/generic/e-french/Probl_Msg.txt
--- old/doc/generic/e-french/Probl_Msg.txt 2017-08-21 22:59:38.000000000 +0200
+++ new/doc/generic/e-french/Probl_Msg.txt 2019-06-04 23:23:36.000000000 +0200
@@ -11,7 +11,7 @@
This would be the cas by older or other environnements.
In any case, these files can be found on the internet.
One possibility is CTAN, for exemple to get from
-<http://mirror.ctan.org/tex-archive/macros/latex/contrib/msg/>
+<http://mirror.ctan.org/macros/latex/contrib/msg/>
at least the files msg.ins, msg.dtx and msgfiles.dtx.
and to download them in a work directory
Then with the command
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/e-french/README new/doc/generic/e-french/README
--- old/doc/generic/e-french/README 2019-03-08 23:21:13.000000000 +0100
+++ new/doc/generic/e-french/README 2019-09-04 23:47:43.000000000 +0200
@@ -1,6 +1,6 @@
eFrench - French typography for LaTeX
- Version 6.1 2019-03-08
+ Version 6.11 2019-09-06
e-French, FRENCHLE and FRENCH.
-------------------
@@ -24,7 +24,7 @@
order to maintain the whole work in the future.
The project is maintained by a small group started by Laurent Bloch and hosted
-by Tux Family: http://projects.tuxfamily.org/group.pl?name=efrench,
+by Tux Family: https://svn.tuxfamily.org/viewvc.cgi/efrench_efrenchsources/trunk/,
email: efrench(a)lists.tuxfamily.org.
@@ -33,7 +33,7 @@
LICENCE
-Copyright 2010 eFrench Group
+Copyright 2019 eFrench Group
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
@@ -97,11 +97,8 @@
- Within it, please desactivate the things with french
guillemets (chevrons), if they were active.
-DEVELOPMENTS FOR A BETTER COMPATIBILITY WITH XELATEX / BIBLATEX
-
-The version 6.1 takes in account the the interchartoks used by
-BibLaTeX with XeLaTeX. See the manual efrench.pdf under the
-corresponding indexes.
+NEW in Vers. 6.1: Interchartoks for XeLaTeX-BibLaTeX compatibility.
+NEW in Vers. 6.11: more choices by non breakable (fine) spaces.
Enjoy. Raymond Juillerat for the e-french group
raymond(at)juil(dot)ch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/e-french/install/MiniDoc_Unx.txt new/doc/generic/e-french/install/MiniDoc_Unx.txt
--- old/doc/generic/e-french/install/MiniDoc_Unx.txt 2017-08-21 22:59:38.000000000 +0200
+++ new/doc/generic/e-french/install/MiniDoc_Unx.txt 2019-09-04 23:47:43.000000000 +0200
@@ -43,6 +43,6 @@
is now a part of e-french.
-- rayj for the eFrench group, all questions to be sent to
-Laurent Bloch <http://www.laurentbloch.org/MySpip3/spip.php?article166>
+Laurent Bloch <https://www.laurentbloch.net/MySpip3/e-french-desormais-dans-les-depots-TeX…>
(/usr/share/texmf-texlive/tex/latex/frenchle/frenchle.cfg)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/e-french/install/MiniDoc_Win.txt new/doc/generic/e-french/install/MiniDoc_Win.txt
--- old/doc/generic/e-french/install/MiniDoc_Win.txt 2017-08-21 22:59:38.000000000 +0200
+++ new/doc/generic/e-french/install/MiniDoc_Win.txt 2019-09-04 23:47:43.000000000 +0200
@@ -42,4 +42,4 @@
is now a part of e-french.
-- rayj for the eFrench group, all questions to be sent to
-Laurent Bloch <http://www.laurentbloch.org/MySpip3/spip.php?article166>
+Laurent Bloch <https://www.laurentbloch.net/MySpip3/e-french-desormais-dans-les-depots-TeX…>
Binary files old/doc/generic/e-french/install/Probl_Msg.pdf and new/doc/generic/e-french/install/Probl_Msg.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/e-french/install/Probl_Msg.txt new/doc/generic/e-french/install/Probl_Msg.txt
--- old/doc/generic/e-french/install/Probl_Msg.txt 2017-08-21 22:59:38.000000000 +0200
+++ new/doc/generic/e-french/install/Probl_Msg.txt 2019-06-04 23:23:36.000000000 +0200
@@ -11,9 +11,9 @@
This would be the cas by older or other environnements.
In any case, these files can be found on the internet.
One possibility is CTAN, for exemple to get from
-<http://mirror.ctan.org/tex-archive/macros/latex/contrib/msg/>
+<http://mirror.ctan.org/macros/latex/contrib/msg/>
or from
-<http://mirror.ctan.org/tex-archive/macros/latex/contrib/msg.zip>
+<http://mirror.ctan.org/macros/latex/contrib/msg.zip>
at least the files msg.ins, msg.dtx and msgfiles.dtx.
and to download them in a work directory
Then with the command
Binary files old/doc/generic/e-french/manuels/efrench.pdf and new/doc/generic/e-french/manuels/efrench.pdf differ
Binary files old/doc/generic/e-french/manuels/faq.pdf and new/doc/generic/e-french/manuels/faq.pdf differ
Binary files old/doc/generic/e-french/manuels/french_doc.pdf and new/doc/generic/e-french/manuels/french_doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/e-french/src/Probl_Msg.tex new/doc/generic/e-french/src/Probl_Msg.tex
--- old/doc/generic/e-french/src/Probl_Msg.tex 2019-01-14 23:05:08.000000000 +0100
+++ new/doc/generic/e-french/src/Probl_Msg.tex 2019-06-04 23:23:36.000000000 +0200
@@ -24,10 +24,10 @@
Pour ce faire vous téléchargez de
-\href{http://mirror.ctan.org/tex-archive/macros/latex/contrib/msg}
-{http://mirror.ctan.org/tex-archive/macros/latex/contrib/msg/}\\
-ou de \href{http://mirror.ctan.org/tex-archive/macros/latex/contrib/msg.zip}
-{http://mirror.ctan.org/tex-archive/macros/latex/contrib/msg.zip}\\
+\href{http://mirror.ctan.org/macros/latex/contrib/msg}
+{http://mirror.ctan.org/macros/latex/contrib/msg/}\\
+ou de \href{http://mirror.ctan.org/macros/latex/contrib/msg.zip}
+{http://mirror.ctan.org/macros/latex/contrib/msg.zip}\\
au minimum les fichiers msg.ins, msg.dtx et msgfiles.dtx pour les
déposer dans un dossier de travail. Avec la commande
\textit{latex msg.ins}, vous aurez les fichiers cherchés
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/e-french/src/efrench.tex new/doc/generic/e-french/src/efrench.tex
--- old/doc/generic/e-french/src/efrench.tex 2019-03-08 23:21:13.000000000 +0100
+++ new/doc/generic/e-french/src/efrench.tex 2019-09-04 23:47:43.000000000 +0200
@@ -68,8 +68,8 @@
\makeindex
\begin{document}
% \labelsinmargin
-\def\raccouXe{X
-\raisebox{1.2ex}{\hspace{-1ex}\rotatebox{180}{E}}\hspace{-0.3ex}}%
+\usualmessages
+\def\raccouXe{X\raisebox{1.2ex}{\hspace{-0.05ex}\rotatebox{180}{E}}\hspace{-0.3ex}}%
\title{\fboxsep=2ex%
\shadowbox{\Huge Guide de l'utilisateur \textsl{eFrench}}\\%
@@ -86,13 +86,13 @@
l'extension \textsl{eFrench}, son style \texttt{french}
et ses diverses propres extensions. Le paquetage
\textsl{eFrench} a été créé pour imprimer des documents typographiquement
- plus conformes à l'usage français que ce que produit \LaTeX{} par défaut.
+ plus conformes à l'usage français que ce que produit \LaTeX{} par défaut.
Un grand nombre de commandes peuvent être utilisées mais
l'emploi courant de cette extension ne nécessite
{\em a priori\/} aucune connaissance particuliÚre
ni une utilisation forcenée de commandes spécifiques. Toutefois cet
emploi n'est pas toujours {\em transparent}.
- Une version allégée est fournie (style \texttt{frenchle}).
+% Une version allégée est fournie (style \texttt{frenchle}).
Une version appauvrie (\texttt{pmfrench})
est aussi utilisable sur tous les sites et dans toutes les
configurations. D'autres extensions accompagnent le style \texttt{french}
@@ -300,7 +300,8 @@
le fichier \verb|french.sty| mais dans %]
\linkandfootnote{codefrench}{\texttt{french\_{}doc.pdf}}%
{http://efrench.org/doc/french_doc.pdf}%
- (dont la mise à jour accuse un certain retard.\textbf{]}
+% (dont la mise à jour accuse un certain retard
+.\textbf{]}
\index{fichier!french_doc.pdf(a)\texttt{french\string_doc.pdf}}%
\subsection{Pour commencer}\label{Pour commencer}\index{pour commencer}%
@@ -349,9 +350,9 @@
a été bien défini pour \LaTeX{} ou sinon : \verb|<<| et \verb|>>| ; toute
autre sorte de guillemets est à prohiber en français
(\verb|` " '| \`{ } \'{ } `` ,, '') ;
-\item {\em french.sty} a été étendu pour accepter aussi les guillemets \MAJ
+\item {\em french.sty} a été étendu pour accepter aussi les guillemets
{\em utf8} sous \raccouXe\LaTeX ceci pour autant que {\em efrenchu.tex}
-soit accessible ;\endMAJ
+soit accessible ;
\item on marque les intervalles avec un simple tiret
(\verb|-|) comme dans << la guerre de 1939-45 >> ou << voir explication
p. 169-173 >> ;
@@ -1270,7 +1271,7 @@
%===============
%\input{frenchlet} % activer dÚs l'instant où lettre.cls, version 3 est sur CTAN
-\subsection{La classe \emph{lettre} } \label{lettre}
+\subsubsection{La classe \emph{lettre} de l'Observatoire de GenÚve } \label{lettre}
La classe \texttt{lettre}
de l'Observatoire de GenÚve peut aussi être utilisée
par {\eFrench}.
@@ -1278,12 +1279,105 @@
S'il est vrai que la classe \texttt{lettre} a été conçue et développée d'abord pour être utilisée avec \textsl{babel},
sa version 3.000 devrait être compatible avec \textsl{e-french}.
Les versions précédentes sortaient dans certaines configurations (sous Windows avec Mik\TeX) une page blanche avant chaque lettre.
-\subsubsection{Exemples complets d'utilisation}
+\paragraph*{Exemples complets d'utilisation}
On ne peut pas appliquer tels quels les exemples donnés dans la documentation
de la classe \texttt{lettre} sous \textsl{babel}. C'est pourquoi il existe une documentation spéciale et
des exemples d'utilisation avec {\eFrench} sous
\url{http://efrench.org/doc/eflettre.zip}
+\MAJ
+\subsection{Espaces insécables, ponctuation et guillemets}
+\index{espaces non sécables}%
+Cette section précise certains éléments apportés à partir de la version 6,1 d'eFrench
+concernant la mise en Åuvre des espaces insécables..
+La version 6,11 tient compte désormais des tendances actuelles de la typographie
+en donnant le choix à l'utilisateur entre les rÚgles de l'Imprimerie Nationale Française,
+celles du Guide du Typographe\cite{romand} (autrefois guide Romand du Typographe\cite{romand5})
+et celles des versions antérieures d'eFrench (reprises de FrenchPro).
+\subsubsection{ Trois rÚgles et leurs différences}
+Ces différences ne touchent que l'espace insécable précédant les deux-points et le guillemet fermant
+et celui suivant le guillemets ouvrant. Les avis semblent unanimes concernant les espaces précédant
+le point d'exclamation, le point d'interrogation et le point-virgule. C'est alors une espace fine insécable.
+
+\begin{enumerate}
+\item {\bf Imprimerie Nationale Française} : espaces insécables entiÚres pour deux-points et guillemets ;
+\index{espaces non sécables!NobrkSpacesINFr@\texttt{\backslash NobrkSpacesINFr}}%
+\item{\bf Guide du typographe} : espaces fines insécables partout ;
+\index{espaces non sécables!NobrkSpacesINFr@\texttt{\backslash NobrkSpacesFine}}%
+\item{\bf FrenchPro} espace fine insécable pour les deux-points, espaces insécables entiÚres pour les guillemets.
+\index{espaces non sécables!NobrkSpacesINFr@\texttt{\backslash NobrkSpacesFpro}}%
+\end{enumerate}
+Ainsi Bernard Gaulle s'était inspiré des deux modÚles. Maintenant l'utilisateur a le choix, qu'il peut préciser soit
+dans le préambule aprÚs appel de french.sty (\verb|\usepackage{efrench}|),
+soit dans le fichier de configuration {\em french.cfg}, soit tout au début
+du document. Voici les trois commandes disponibles :
+\begin{enumerate}
+\item \verb|\NobrkSpacesINFr| pour suivre les recommandations de l'Imprimerie Nationale Française ;
+\item \verb|\NobrkSpacesFine| pour suivre les recommandations du Guide du Typographe ;
+\item \verb|\NobrkSpacesFpro| pour revenir au comportement par défaut (si l'une des autres commandes
+a été mise en Åuvre dans {\em french.cfg}).
+\end{enumerate}
+
+\paragraph*{Comportement des guillemets dans le choix d'espaces fines}
+Dans ce choix, l'espace fine est toujours présente, même si dans le fichier-source les guillemets sont collés au texte.
+\subsubsection{ \protect \raccouXe\LaTeX, Bib\LaTeX{} et InterCharToks}\label{interchartoks}\index{interchartoks}%
+\index{BibLaTeX@{Bib\LaTeX}}
+
+Au sein de Bib\LaTeX{}
+avec le moteur \raccouXe\LaTeX\index{XeLaTeX@{\raccouXe\LaTeX}},
+ il est nécessaire
+ d'utiliser {\em InterCharToks} pour définir le comportement
+des ponctuation hautes ( ! ; : et ?). Dans la précédente version d'eFrench,
+une espace insécable (fine) était toujours insérée entre le texte
+et la ponctuation, qu'il y ait ou non d'espace inséré.
+Ce défaut est corrigé et les espaces de la ponctuation nâapparaissent
+que si l'on a une espace dans le source comme
+c'est le cas en utilisation habituelle.
+
+Les rÚgles décrites précédemment concernant les choix entre espace entiÚre et espace fine
+sont aussi actives sous {\em InterCharToks}.
+Mais {\em InterCharToks} a sa propre définitions des espaces insécables.
+à ce niveau, seuls les guillemets échappent à cette emprise et réagissent dans Bib\LaTeX{}
+comme dans le texte principal en ce qui concerne les espaces insécables.
+
+La compatibilité {\em InterCharToks}\index{interchartoks}
+ permet donc une utilisation correcte de BibLaTeX.
+Dans le programme demandant la bibliographie, on donnera l'ordre \verb|\intercharpunct|
+avant de placer la bibliographie. Au sein des fichiers sources de \texttt{Biber (*.bib)}, il ne faut plus
+entourer chaque texte non-français contenant une ponctuation haute entre
+\verb|\nointercharpunct| et \verb|\intercharpunct| afin que la ponctuation étrangÚre
+ne réagisse pas comme la ponctuation française. Il suffit de la coller au texte. On écrira par exemple :\\
+{\small\verb|TITLE="Alan Turing: the Enigma (Alan Turing : l'Ãnigme de|...}
+\index{BibLaTeX@{Bib\LaTeX}} qui devient\\
+{\em Alan Turing: the Enigma (Alan Turing : l'Ãnigme de ...}
+
+AprÚs Bib\LaTeX{}, s'il y a encore du texte, il faut retourner à l'état
+\raccouXe\LaTeX normal en utilisant \verb|\nointercharpunct|.
+
+Exemple :
+
+\noindent
+\verb|\intercharpunct % | {\em pour la bibliographie, activation de la ponctuation interchartoks}
+\\
+\verb|\printbibliography|\\
+\verb|\nointercharpunct % | {\em pour la suite, retour à la ponctuation habituelle}
+
+\subsubsection{Choix d'une espace fine personnelle}
+Normalement, l'espace fine a la longueur d'une demi-espace normale et n'est pas élastique.
+C'est aussi le cas avec {\em InterCharToks} où ce comportement n'est pas modifiable,
+les guillemets faisant exception.
+Pour le document principal, on peut appeler une commande \verb|\MonEspaceFine|.
+Le comportement normal de l'espace fine correspond à la commande
+\verb|\MonEspaceFine{0.5}{0}{0}.| Le premier paramÚtre indique que c'est la moitié
+de l'espace normale, le second qu'il n'y a pas d'extension, le troisiÚme qu'il n'y a pas de compression.
+Une commande \verb|\MonEspaceFine{0.5}{0.3}{0.2}| ajoute une certaine d'élasticité,
+peu en extension, encore moins en compression.
+Les paramÚtres sont relatifs à ceux du comportement de l'espace entiÚre que l'on
+pourrait copier en définissant \verb|\MonEspaceFine{1}{1}{1}|.
+Le comportement final dépend fortement de la fonte en cours dans le texte.
+
+\endMAJ
+
\subsection{Environnements}\label{Environnements}\index{environnements}%
\subsubsection{Les messages à la console}\label{messages}
@@ -1293,6 +1387,7 @@
en 7-bits ce qui est la seule solution pour éviter les mélanges
entre 8-bits et unicode. Autre possibilité pour l'utilisateur :
supprimer {\em french\_french-msg.tex} afin d'avoir les messages en anglais.
+C'est ainsi, par l'anglais, que french pour babel a résolu le problÚme.
\endMAJ
\subsubsection{à propos de césure\label{cesure}}
@@ -1327,7 +1422,7 @@
séquence \verb|\-| est ici, avec {\eFrench}, équivalente
à un espace) ; pour plus de détails se reporter Ã
\verb|\frenchhyphenation| page \pageref{frenchhyphenation} et
-\verb|\moretolerance| page \pageref{moretolerance} ; \maj
+\verb|\moretolerance| page \pageref{moretolerance} ;% \maj
%Par défaut, le fichier \vers|frhyphex.tex| contenant
%quelques exceptions françaises est introduit dans \TeX{} Ã
%la création du {\em format}%
@@ -1628,7 +1723,7 @@
arriver effectivement que \LaTeX{} ne les place pas dans l'ordre de leur
numérotation).
-\subsection{Extension utiles}\label{Extension utiles}\index{extension utiles}%
+\subsection{Extensions utiles}\label{Extension utiles}\index{extension utiles}%
\subsubsection{Petits outils supplémentaires}\label{outils}
Il ne s'agit pas ici d'outils typiquement français mais
@@ -1708,14 +1803,6 @@
plus sympathique et plus définitive. L'extension {\eFrench}
propose donc la séquence \verb|\AllTeX| qui imprime \AllTeX.
-\subsubsection{Compatibilité interchartoks}
-
-La compatibilité avec tous les moteurs \LaTeX{} a été étendue Ã
-\raccouXe\LaTeX{} pour une typographie correcte dans le cas où
-certains modules utilisent interchartoks\index{interchartoks}.
-Cette extension permet entre autres une utilisation correcte de BibLaTeX
-\index{BibLaTeX@\texttt{Bib\LaTeX}}.
-
\subsubsection{Personnalisation}
Nous avons parlé jusqu'ici d'une utilisation normale, standard,
de l'extension {\eFrench}. Mais il est toujours possible de
@@ -1819,7 +1906,7 @@
avec MacOs X ;
la version du format \LaTeX\ doit dater au moins de 2003
(\texttt{2003/12/01}) pour bénéficier du codage \texttt{utf8}.
-C'est le codage par défaut de \raccouXe\LaTeX{}.\maj
+C'est le codage par défaut de \raccouXe\LaTeX{}.
%(avec
%l'extension \emph{inputenc} Ã laquelle fait appel \eFrench\ pour
%gérer ce cas spécifique) ;
@@ -2841,8 +2928,8 @@
La bibliographie d'un document est réalisée en deux étapes :
tout d'abord la sélection et le tri des entrées bibliographiques (en général
reprises d'une base bibliographique BiB\TeX{} ou BiB\LaTeX) avec le programme
-\index{bibtex8@\texttt{bibtex8}}%
-\index{BibLaTeX@\texttt{Bib\LaTeX}}%
+\index{bibtex8@{bibtex8}}%
+\index{BibLaTeX@{Bib\LaTeX}}%
\texttt{bibtex}
\footnote{Utiliser de préférence \texttt{bibtex8} pour le traitement
correct des caractÚres accentués. Mais avec XeLaTex, c'est une
@@ -2860,7 +2947,7 @@
\emph{biblatex} est aussi fonctionnel}%
\index{extension!jurabib@\emph{jurabib}}%
\index{extension!fracm@\emph{fracm}}%
-\index{BibLaTeX@\texttt{Bib\LaTeX}}%
+\index{BibLaTeX@{Bib\LaTeX}}%
. Par défaut, il traduit les libellés utilisés
le plus fréquemment, comme nous allons le voir dans ce qui suit.
@@ -2950,7 +3037,7 @@
\index{abreviations@abréviations!\texttt{\backslash abbreviations}}%
\index{noabreviations@\texttt{\backslash noabbreviations}}%
d'abréviations par la commande : \verb|\abbreviations[fichier]|.
-\paragraph*{Abbréviations pour sources en UTF8} Le fichier d'abbréviations \MAJ
+\paragraph*{Abbréviations pour sources en UTF8} Le fichier d'abbréviations
ouvert par défaut (\vers|frab|\-\vers|brev.tex|) est codé en latin9.
\index{codage!utf8@\texttt{utf8}}
Maintenant existe aussi le même en utf8 nommé \vers|frab|\-\vers|brev-u8.tex|.
@@ -2958,7 +3045,7 @@
par la commande\\ \verb|\abbreviations[fichier]|
celui qui convient au code source, par exemple\\
\verb|\abbreviations[frabbrev-u8.tex]|.
-\endMAJ
+
Rappelons qu'en \TeX{} le caractÚre \verb|"| est
normalement le début d'une valeur
@@ -2984,8 +3071,8 @@
doublée. La portée de cet ordre doit donc être limitée par des
accolades \{\ \} ou tout autre moyen sûr. L'aspect négatif de cet
ordre concerne l'extension de l'espace inter-mots qui ne manquera
-pas de se produire car \TeX\ aura alors tendance à rajouter de la
-\emph{glue} plutÃŽt que de produire des coupures de mots en bout
+pas de se produire car \TeX\ aura alors tendance à rajouter de
+l'élasticité plutÎt que de produire des coupures de mots en bout
de ligne, les deux étant toutefois possibles :
\begin{figurette}
\Large
@@ -3557,33 +3644,11 @@
\index{T1@\texttt{T1} (codage)}%
\item \texttt{-25- (pm)french.sty affiche ici ses messages en 7-bits}\\
- \texttt{\phantom{-25-} }\verb|(\`|\texttt{a la TeX).}\\
- Le format \LaTeX{} qui a été créé ne supporte pas le 8-bits en
- sortie. Cela peut effectivement venir du moteur \TeX\ car tous
-\index{moteur!tex@\TeX}%
- ne disposent pas de cette facilité. Si ce n'est pas le cas,
- probablement que le format a été créé sans utiliser
- le configurateur de clavier \texttt{kbconfig}
-%%%%%%%%%%%%%%%%%%%%%
-\ifnoDOCinstall\else%
-%%%%%%%%%%%%%%%%%%%%%
-(cf. \ref{kbconfig} page \pageref{kbconfig})
-\fi%
-.\\
- Dans d'autres cas, les messages ne peuvent même pas être
- émis << à la \TeX\ >> ; les ordres d'accentuation
- sont alors totalement éliminés.\\
- Si vous souhaitez
- toutefois afficher les messages en 8-bits, forcez l'option
- \verb|\usualmessages|.
-\index{usualmessages@\texttt{\backslash usualmessages}}%
+Ceci est le cas généralement et c'est nouveau parce que le choix
+Ã faire entre tous les formats (ansii, utf8, etc) est souvent impossible.
\texttt{-25- (pm)french.sty affiche ici ses messages en 8-bits.}\\
- Ceci est l'option normale si le moteur \TeX{} est capable de produire
-\index{moteur!tex@\TeX}%
- du 8-bits en sortie, à la place des caractÚres héxadécimaux sous
- la forme \verb|^^xx|. Cette option peut avoir été forcée par la
- commande \verb|\usualmessages|.
+Ce message ne devrait plus être affiché.
\item\texttt{-26a- Erreur détectée dans (pm)french.sty.}\\
\texttt{-26b- (voir p.ex. le fichier language.dat)}\\
@@ -4058,6 +4123,30 @@
Le dispositif permettant de disposer de fichiers \texttt{*.kbc} en
\index{fichier!*.kbc(a)\texttt{*.kbc} avec Plain \TeX}%
fonction du langage utilisé n'est pas disponible avec Plain TeX.
+\item \texttt{-81- ATTENTION : extension "msg" non trouv\'ee ; \\%
+\phantom{-81-} on continue sans le texte des messages}\\
+Les fichiers de messages manquent ou ne sont pas accessibles
+
+\item \texttt{-85- Attention : l'option fixlanguage
+ n'a pas \'et\'e fournie \`a l'appel de babelbib}\\
+Ceci ne devrait pas arriver car babelbib ne devrait pas être utilisé
+avec e-french
+
+\item \texttt{-87- ERREUR : \\%
+ babelbib s'utilise uniquement avec babel}\\
+Ceci ne devrait pas arriver car efrench ne devrait pas être utilisé
+avec babel
+
+\MAJ
+\item \texttt{-94- Le changement de ponctuation (NobrkSpaces...)} \\
+\phantom{-94-} n'est plus permis apr\`es une utilisation de ponctuation active\\
+\phantom{-94-} (\string! \string? \string; \string: \string<\string< \string>\string>).\\
+Veillez appeler la commande dans french.cfg ou
+avant {\em \backslash begin\{document\}} ou tout au début de ce dernier,
+en tous cas avant l'emploi d'espace insécable\endMAJ
+
+\msgheader{-**-\space}
+
\end{itemize}
@@ -4330,8 +4419,14 @@
{\em The \LaTeX{} companion}, Addison-Wesley,
second edition, 2004.
-\bibitem{romand} {\em Guide du typographe romand}, Association suisse
- des compositeurs à la machine, 6\ieme édition, 2000.
+%\bibitem{romand4} {\em Guide du typographe romand}, Association suisse
+ %des compositeurs {\`a} la machine, 4\ieme {\'e}dition, 1982
+
+\bibitem{romand5} {\em Guide du typographe romand}, Association suisse
+ des compositeurs à la machine, 5\ieme édition, 1993.
+
+\bibitem{romand} {\em Guide du typographe}, Association suisse
+ des typographes (AST), groupe de Lausanne, 7\ieme édition, 2015.
\bibitem{latexbook}L. {\sc Lamport}, {\em \LaTeX, A
document preparation system}, Addison-Wesley, 1994.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/e-french/src/faq.tex new/doc/generic/e-french/src/faq.tex
--- old/doc/generic/e-french/src/faq.tex 2015-10-30 23:11:00.000000000 +0100
+++ new/doc/generic/e-french/src/faq.tex 2019-09-04 23:47:43.000000000 +0200
@@ -1441,7 +1441,7 @@
\begin{thebibliography}{9}
\bibitem{lblochefr}{L. Bloch}
\textit{\linkandfootnote{rlblochefr}{Lancement du projet \textit{eFrench}}%
-{http://www.laurentbloch.org/MySpip3/spip.php?article166}}%http://www.laurentbloch.org/BlogLB/
+{https://www.laurentbloch.net/MySpip3/e-french-desormais-dans-les-depots-TeXLive-et-MiKTeX}}
\bibitem{cesures} D. Flipo, B. Gaulle et K. Vancauwenberghe,\textit{
\linkandfootnote{ rcesures}{Motifs de césure français}{http://cahiers.gutenberg.eu.org/cg-bin/article/CG_1994___18_35_0…,
{\it in} Les Cahiers GUTenberg No 18, 1994.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/e-french/src/french_doc.txt new/doc/generic/e-french/src/french_doc.txt
--- old/doc/generic/e-french/src/french_doc.txt 2019-03-08 23:21:13.000000000 +0100
+++ new/doc/generic/e-french/src/french_doc.txt 2019-09-04 23:47:43.000000000 +0200
@@ -30,11 +30,11 @@
\ifx\@unexpandable@protect\undefined\let\protect\empty%
\else\let\protect\@unexpandable@protect%
\fi%
- \xdef\FSfd{8 mars 2019}% eFrench
- \xdef\FSfv{V6,1}%
+ \xdef\FSfd{6 septembre 2019}% eFrench
+ \xdef\FSfv{V6,11}%
\xdef\frenchstyleid{\FSfv\space-- \FSfd\space --}%
}}%
- \edef\FSfd{2019/03/08}%
+ \edef\FSfd{2019/09/06}%
%
% History as given by Bernard Gaulle:
% I started this job years ago (in 1989) firstly
@@ -188,7 +188,17 @@
% V6,1
% Changes made necessary because of BibLaTeX and Interchartoks
% Changes made by Raymond Juillerat 2019/03/08
-%
+% V6,101
+% Two minor corrections by interchartoks
+% Changes made by Raymond Juillerat 2019/05/30
+% V6,11
+% Possibility of choice for non-breakable spaces:
+% - as made by Bernard Gaulle (fine spaces except for guillemets)
+% - as required by the Imprimerie Nationale de France
+% (fine spaces only for ; ! ? full for : << and >>)
+% - only fine spaces like in Guide du Typographe
+% and choice of the fine space defined by the user
+% Changes made by Raymond Juillerat 2019/09/06
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% Object: DOCUMENT CLASS OPTION for printing French texts with TeX or LaTeX
@@ -727,9 +737,51 @@
%\@txt@msg{WARNING:}%
%\@txt@msg{the French language is undefined in your format.}%
}%
+ \fi%
\fi%
%
-\fi%
+% more posibilities by high-punctuation and guillemets
+% three commands for the user
+% - with \NobrkSpacesINFr punctuation as asked by the Imprimerie Nationnale
+% - with \NobrkSpacesFine only fine spaces as in theGuide du Typographe
+% - with \NobrkSpacesFpro punctuation as it was till version 6.101
+%
+%\newif\ifeFrfisp@v@ria
+\newif\ifeFr@DPtfine% semicolon fine or not
+\newif\ifeFr@Guifine% guillemets fine or not
+\newif\ifUSP@GuiFinSpa % for OG space made unbreakable or unused
+\newif\ifPonctu@ctived % no more changes in definitions after having used
+ % some non-breaking spaces
+\def\nbsp@ce{\penalty\@M\space}
+\def\fispce@rigide{\,}%
+\def\eFrFinSp@ce{\penalty\@M%
+ \hskip 0.5\fontdimen2\font}%
+% a possibility for the user to define an own fine non breakable space
+\def\MonEspaceFine#1#2#3{\def\eFrFinSp@ce{\penalty\@M%
+ \hskip #1\fontdimen2\font%
+ plus #2\fontdimen3\font%
+ minus #3\fontdimen4\font}
+}%
+% by guillemets, if fine space, it is always present
+\def\eFr@OGsp@cSpl{\ifeFr@Guifine\eFrFinSp@ce
+ \else\nbsp@ce\fi\ignorespaces}
+% for the user: fine, Imprimerie Nationale-France or Frenchpro
+\def\NobrkSpacesFine{\ifPonctu@ctived
+% don't redefine punctuation behavior
+ \f@issue\@fw{-94-}[NobrkSpacesFine]
+ \else\eFr@DPtfinetrue\eFr@Guifinetrue % espaces fines
+ \fi}
+\def\NobrkSpacesFpro{\ifPonctu@ctived
+% don't redefine punctuation behavior
+ \f@issue\@fw{-94-}[NobrkSpacesFpro]
+ \else\eFr@DPtfinetrue\eFr@Guifinefalse% comme Frenchpro
+ \fi}
+\def\NobrkSpacesINFr{\ifPonctu@ctived
+% don't redefine punctuation behavior
+ \f@issue\@fw{-94-}[NobrkSpacesINFr]
+ \else\eFr@DPtfinefalse\eFr@Guifinefalse %
+% [Imprimerie Nationale de France
+ \fi}
\fontencoding{\encodingdefault}\selectfont%
\def\@temp@{OT1}\ifx\@temp@\f@encoding%
\def\@temp@{\global\ECMfalse}%
@@ -2196,6 +2248,8 @@
%%% %\@txt@msg{configuration de \frenchpack}%
%%% }}{}%
%%% so we now call \IfFileExists ... \@finput
+% by default, the nobreak punctuation set like by Bernard Gaulle
+ \NobrkSpacesFpro%
\IfFileExists{\frenchname.cfg}{% -load site config file.
\f@issue%
\@fw{-48- %\@txt@msg{Lecture du fichier de }%
@@ -3255,19 +3309,19 @@
% Necessary :
% Add a thin space before punctuation ; : and ! in place of a space
\def\intercharpunct{%
- \lccode\lccode8217=8217
+% \lccode\lccode8217=8217
\XeTeXinterchartokenstate=1
\XeTeXcharclass `\! \french@punctthin
\XeTeXcharclass `\? \french@punctthin
\XeTeXcharclass `\; \french@punctthin
- \XeTeXcharclass `\: \french@punctthick
- \XeTeXinterchartoks \z@ \french@punctthin = {\nobreak\thinspace}%
- \XeTeXinterchartoks \z@ \french@punctthick = {\nobreakspace}%
+ \XeTeXcharclass `\: \french@semicolon
+ \XeTeXinterchartoks \z@ \french@punctthin = {\ifUSP\nobreak\thinspace\fi}%
+ \XeTeXinterchartoks \z@ \french@semicolon = {\ifUSP\ifeFr@DPtfine\nobreak\thinspace\else\nobreakspace\fi\fi}%
\XeTeXinterchartoks 4095 \french@punctthin = {\efr@unskip\nobreak\thinspace}%
- \XeTeXinterchartoks 4095 \french@punctthick = {\efr@unskip\nobreakspace}%
+ \XeTeXinterchartoks 4095 \french@semicolon = {\efr@unskip\ifeFr@DPtfine\nobreak\thinspace\else\nobreakspace\fi}%
}
\def\nointercharpunct{%
- \lccode8217=\z@
+% \lccode8217=\z@
\XeTeXcharclass `\! \z@
\XeTeXcharclass `\? \z@
\XeTeXcharclass `\; \z@
@@ -3288,9 +3342,10 @@
% ceci ou largeur fixe ? % insecable : space : \char160 fine : \char8239
\ifeF@xetex@punct
\newXeTeXintercharclass\french@punctthin % ! ? ; et autres
- \newXeTeXintercharclass\french@punctthick % :
+ \newXeTeXintercharclass\french@semicolon % : deux points - Dpt
%
\def\efr@unskip{\ifhmode\ifdim\lastskip>\z@\unskip\fi\fi}
+% \def\eFresp@dpt{\ifeFr@DPtfine\nobreak\thinspace\else\nobreakspace\fi}
\def\xpg@nospace#1{#1}
%
\ifeFr@Typo\protect\intercharpunct\else\nointercharpunct\fi
@@ -3311,8 +3366,10 @@
\def\@tempd{\@tempa{\string;}}%
\ifx;\undefined\def\@tempd{}\fi\@tempd\@tempc%
\def\@PV{\relax\ifmmode\string;\else%
+% don't redefine punctuation behavior
+ \Ponctu@ctivedtrue
\ifhmode\ifUSP\unskip\space\fi%
- \ifdim\lastskip>\z@\unskip\penalty\@M\,\fi%
+ \ifdim\lastskip>\z@\unskip\eFrFinSp@ce\fi%
\fi\string;\fi}%
\def\@tempc{%
\def:{\ifFTY\protect\@DP%{}% -............................................... ":"
@@ -3322,8 +3379,12 @@
\ifx:\undefined\def\@tempd{}\fi\@tempd\@tempc%
\@ifundefined{@beginparpenalty}{\def\@beginparpenalty=#1{\penalty#1}}{}%
\def\@DP{\relax\ifmmode\string:\else%
+% don't redefine punctuation behavior
+\Ponctu@ctivedtrue
+\ifeFr@DPtfine\let\eFresp@dpt=\eFrFinSp@ce
+ \else\let\eFresp@dpt=\nbsp@ce\fi
\ifhmode\ifUSP\unskip\space\fi%
- \ifdim\lastskip>\z@\unskip\penalty\@M\,\fi%
+ \ifdim\lastskip>\z@\unskip\eFresp@dpt\fi%
\fi%
\string:%
\@beginparpenalty=\@M\relax%
@@ -3349,8 +3410,10 @@
\def\@tempd{\@tempa{\string!}}%
\ifx!\undefined\def\@tempd{}\fi\@tempd\@tempc%
\def\@PE{\ifmmode\string!\else%
+% don't redefine punctuation behavior
+ \Ponctu@ctivedtrue
\ifhmode\ifUSP\unskip\space\fi%
- \ifdim\lastskip>\z@\unskip\penalty\@M\,\fi%
+ \ifdim\lastskip>\z@\unskip\eFrFinSp@ce\fi%
\fi%
\string!\fi}%
\def\@tempc{%
@@ -3360,9 +3423,10 @@
\def\@tempd{\@tempa{\string?}}%
\ifx?\undefined\def\@tempd{}\fi\@tempd\@tempc%
\def\@PI{\relax\ifmmode\string?\else%
+% don't redefine punctuation behavior
+ \Ponctu@ctivedtrue
\ifhmode\ifUSP\unskip\space\fi%
- \ifdim\lastskip>\z@\unskip\penalty\@M%
- \hskip +0.09em plus 0.07667em% -max glue accepted
+ \ifdim\lastskip>\z@\unskip\eFrFinSp@ce%
\fi%
\fi%
\string?\fi}%
@@ -3464,16 +3528,17 @@
\advance\@FrDimen by -\leftmargin\advance\@FrDimen by -\rightmargin%
\advance\@FrDimen by -\listparindent\hsize=\@FrDimen}%
\@qquotes\fi\fi\fi%
+ \sp@inogfalse%
\@oguills%
\ifFLA\ifEPG\bgroup\def\@currenvir{guillemets}% -simulate an environment
\let\@CGroup\egroup\fi\fi% -for error processing
\ifCG\ifFLA\ifEPG% -save the current \everypar and apply it first
\xdef\@epORI{{\the\TeXeverypar}}%
\TeXeverypar={\@epORI% -Original \everypar.
- \ifEPGR\else% -If not allready done,
+ \ifEPGR\else\@AG% -guide du typographe
+ \sp@inogtrue%
\@oguills% -insert guillemets and
\@ifundefined{@OuvOpen}{% -then according
- \,% -kerning just after.
}{}%
\fi}%
\fi\fi%
@@ -3481,17 +3546,39 @@
\ifFLA\ifEPG\else\def\@qqguill{\@oguills}\@staring\fi\fi\fi%
%%% \protect\@CGfalse%
\global\let\ifCG\iffalse%
- \ifUSP\kern+0.13em\penalty\@M\ignorespaces%
- \else\kern-0.19em\relax\penalty\@M\fi}% -likely as \ignorespaces\fi
+ \ifeFr@Guifine\USP@GuiFinSpatrue% OG full space not used
+ \let\eFresp@gui=\eFrFinSp@ce% OG fine unbreakable space
+ \else\USP@GuiFinSpafalse% OG full space possible
+ \let\eFresp@gui=\nbsp@ce% OG full unbreakable space
+ \fi%
+%% don't redefine punctuation behavior
+ \Ponctu@ctivedtrue
+ \ifUSP\USP@GuiFinSpatrue\fi% OG full space not used
+ \ifUSP@GuiFinSpa\eFr@OGsp@cSpl%
+ \else\relax\penalty\@M\fi}%
+% \ifUSP\kern+0.13em\penalty\@M\ignorespaces% - >> V6,1 BG
\def\@AG{\ifAG\let\@LP\@RP\let\@gotl\@gotr%
\fi}% -Apply ancient guillemets if required
\def\f@guillemets{<<}%
+% do not repeat the non breakable space
+\newif\ifsp@inog
\def\@oguills{%
+ \ifeFr@Guifine%
+ \let\eFresp@gui=\eFrFinSp@ce%
+ \else\let\eFresp@gui=\nbsp@ce% no space to be made unbreakable
+ \fi%
+% don't redefine punctuation behavior
+ \Ponctu@ctivedtrue
\bgroup\@ifundefined{@OuvOpen}{\def\@OuvOpen{}% -avoid duplicate <<
\@ifundefined{ly}{\@og}%
{\leavevmode\ifECM\hbox{{\ifGIAF\else\@gfnt\fi%
\ifx\@gotl\undefined\char\rq\@LP%
- \else\(a)gotl\fi\kern+0.20em}}%
+% \else\(a)gotl\fi\kern+0.20em}}% - >> V6,1 BG
+ \else\@gotl\fi%
+ \ifeFr@Guifine%
+ \let\eFresp@gui=\eFrFinSp@ce%
+ \else\let\eFresp@gui=\nbsp@ce\fi%
+ \ifsp@inog\eFresp@gui\fi}}% V6,11 RJ
\else\hbox{{\ly\@LP\kern-0.20em\@LP\kern+0.20em}}\fi%
\nobreak}}{}\egroup}%
%\def>{\ifnum\catcode`> =\active% look at \normalbrackets................. ">>"
@@ -3523,17 +3610,21 @@
\else\let\@grORI\grammar\def\grammar{\nofrenchguillemets\@grORI}%
\fi%
+\newif\ifsp@infg
\def\@@FG{\ifCG\f@issue%
\@fw{-14- %\@txt@msg{fermeture de guillemets non ouverts}%
}\fi%
- \ifUSP\unskip\kern+0.13em\else%
- \ifdim\lastskip>\z@\unskip% -skip previous space
- \penalty\@M% -don't break here
- \space% -better than \kern
- \penalty\@M%
+% don't redefine punctuation behavior
+ \Ponctu@ctivedtrue
+ \ifeFr@Guifine%
+ \USP@GuiFinSpatrue%
\fi%
- \kern-0.19em%
+ \ifUSP\USP@GuiFinSpatrue\fi% FG full space not used
+ \ifUSP@GuiFinSpa\unskip\eFrFinSp@ce%
+ \else
+ \ifdim\lastskip>\z@\unskip\nbsp@ce\fi%
\fi%
+ \sp@infgfalse
\xdef\@tempd{\@currenvir}\def\@tempe{guillemets}%
\ifx\@tempd\@tempe%
\@CGroup\@fguills% -end group if any and put closing guillemets
@@ -3566,7 +3657,16 @@
\else\@staring\@stared\egroup\fi\fi%
\global\let\ifCG\iftrue\let\@CGroup\relax}%
\def\@fguills{\@ifundefined{ly}{\@cg}% -ECM
- {\nobreak\leavevmode\ifECM\hbox{{\ifGIAF\else\(a)gfnt\fi\kern+0.20em%
+ {\nobreak\leavevmode\ifECM\hbox{{\ifGIAF\else\@gfnt\fi%
+%\kern+0.20em% bg
+% don't redefine punctuation behavior
+ \Ponctu@ctivedtrue
+ \ifsp@infg
+ \ifeFr@Guifine\let\eFresp@gui=\eFrFinSp@ce%
+ \else\let\eFresp@gui=\nbsp@ce\fi%
+ \ifUSP\unskip\space\fi
+ \ifdim\lastskip>\z@\unskip\eFresp@gui\fi
+ \fi
\ifx\@gotr\undefined\char\rq\@RP%
\else\@gotr\fi}}%
\else\hbox{{\ly\kern+0.20em\@RP\kern-0.20em\@RP}}\fi}%
@@ -4168,7 +4268,7 @@
\ifFMA\@oguills% -<< char...\leftguillemets
\else<<\fi}%
\def\rightguillemets{\@noBDfr%
- \ifFMA\@fguills% ->> char..\rightguillemets
+ \ifFMA\sp@infgtrue\@fguills% ->> char..\rightguillemets
\else>>\fi}%
\def\fup{\@noBDfr\ifFTY% -.............................................. \fup
\expandafter\@fup\fi}\MakeRobustCommand{fup}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/e-french.doc.tlpobj new/tlpkg/tlpobj/e-french.doc.tlpobj
--- old/tlpkg/tlpobj/e-french.doc.tlpobj 2019-03-09 02:24:24.000000000 +0100
+++ new/tlpkg/tlpobj/e-french.doc.tlpobj 2019-09-05 01:53:56.000000000 +0200
@@ -1,9 +1,9 @@
name e-french.doc
category Package
-revision 50292
+revision 52027
shortdesc doc files of e-french
relocated 1
-docfiles size=1215
+docfiles size=1225
RELOC/doc/generic/e-french/Probl_Msg.pdf
RELOC/doc/generic/e-french/Probl_Msg.txt
RELOC/doc/generic/e-french/README
++++++ e-french.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/e-french/french-msg.tex new/tex/generic/e-french/french-msg.tex
--- old/tex/generic/e-french/french-msg.tex 2015-08-18 00:40:41.000000000 +0200
+++ new/tex/generic/e-french/french-msg.tex 2019-09-04 23:47:43.000000000 +0200
@@ -196,6 +196,9 @@
\msg*{93}{You are using two French options for Babel, %
\MessageBreak %
please choose only one.}{}
+\msg{94}{A modification of ponctuation rules (#1) \MessageBreak%
+ is no more allowed after having used an active punctuation\MessageBreak %
+ (\string! \string? \string; \string: \string<\string< or \string>\string>).}{}
\msgheader{-**-\space}
\msg*{**a}{\frenchpack\space serial number is *\(a)FrVal*.}{}
\msg*{**b}{\@FrVal\space of \frenchpack.}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/e-french/french.sty new/tex/generic/e-french/french.sty
--- old/tex/generic/e-french/french.sty 2019-03-08 23:21:13.000000000 +0100
+++ new/tex/generic/e-french/french.sty 2019-09-04 23:47:43.000000000 +0200
@@ -10,11 +10,11 @@
\ifx\@unexpandable@protect\undefined\let\protect\empty%
\else\let\protect\@unexpandable@protect%
\fi%
- \xdef\FSfd{8 mars 2019}% eFrench
- \xdef\FSfv{V6,1}%
+ \xdef\FSfd{6 septembre 2019}% eFrench
+ \xdef\FSfv{V6,11}%
\xdef\frenchstyleid{\FSfv\space-- \FSfd\space --}%
}}%
- \edef\FSfd{2019/03/08}%
+ \edef\FSfd{2019/09/06}%
\NeedsTeXFormat{LaTeX2e}[1996/12/01]%
% > utf8 and NoEncode specialities
\newif\ifeF@NoEnc %No encoding (XeTex, LuaLaTex)
@@ -29,6 +29,7 @@
\else
\eF@LuaTeXtrue \eF@NoEnctrue
\fi
+% in order to follow by interchartoks
\newif\ifeFr@Typo\eFr@Typotrue
% In order having no encoding by messages declare this :
\let\kbencoding\@gobble
@@ -115,6 +116,37 @@
}%
\fi%
\fi%
+%
+\newif\ifeFr@DPtfine
+\newif\ifeFr@Guifine
+\newif\ifUSP@GuiFinSpa % for OG
+\newif\ifPonctu@ctived %
+\def\nbsp@ce{\penalty\@M\space}
+\def\fispce@rigide{\,}%
+\def\eFrFinSp@ce{\penalty\@M%
+ \hskip 0.5\fontdimen2\font}%
+\def\MonEspaceFine#1#2#3{\def\eFrFinSp@ce{\penalty\@M%
+ \hskip #1\fontdimen2\font%
+ plus #2\fontdimen3\font%
+ minus #3\fontdimen4\font}
+}%
+\def\eFr@OGsp@cSpl{\ifeFr@Guifine\eFrFinSp@ce
+ \else\nbsp@ce\fi\ignorespaces}
+% for the user: fine, France or Frenchpro
+\def\NobrkSpacesFine{\ifPonctu@ctived
+ \f@issue\@fw{-94-}[NobrkSpacesFine]
+ \else\eFr@DPtfinetrue\eFr@Guifinetrue % espaces fines
+ \fi}
+\def\NobrkSpacesFpro{\ifPonctu@ctived
+ \f@issue\@fw{-94-}[NobrkSpacesFpro]
+ \else\eFr@DPtfinetrue\eFr@Guifinefalse% comme Frenchpro
+ \fi}
+\def\NobrkSpacesINFr{\ifPonctu@ctived
+ \f@issue\@fw{-94-}[NobrkSpacesINFr]
+ \else\eFr@DPtfinefalse\eFr@Guifinefalse %
+% [Imprimerie Nationale de France
+ \fi}
+%that was for adaptations high-punct and guillem
\fontencoding{\encodingdefault}\selectfont%
\def\@temp@{OT1}\ifx\@temp@\f@encoding%
\def\@temp@{\global\ECMfalse}%
@@ -1392,6 +1424,7 @@
\batchmode\@@end%
\fi%
\let\@Ffnt\ErrFrench\let\ErrFrench\undefined%
+ \NobrkSpacesFpro%
\IfFileExists{\frenchname.cfg}{%
\f@issue%
\@fw{-48- %
@@ -2328,22 +2361,23 @@
\def\@WTS{\relax\ifmmode\else\ifhmode%
\ifdim\lastskip>\z@\unskip\fi%
\fi\fi}%
+%
% > for XeLaTex ******
-% de gloss-french
+% inspired from gloss-french
\def\intercharpunct{%
- \lccode\lccode8217=8217
+% \lccode\lccode8217=8217
\XeTeXinterchartokenstate=1
\XeTeXcharclass `\! \french@punctthin
\XeTeXcharclass `\? \french@punctthin
\XeTeXcharclass `\; \french@punctthin
- \XeTeXcharclass `\: \french@punctthick
- \XeTeXinterchartoks \z@ \french@punctthin = {\nobreak\thinspace}%
- \XeTeXinterchartoks \z@ \french@punctthick = {\nobreakspace}%
+ \XeTeXcharclass `\: \french@semicolon
+ \XeTeXinterchartoks \z@ \french@punctthin = {\ifUSP\nobreak\thinspace\fi}%
+ \XeTeXinterchartoks \z@ \french@semicolon = {\ifUSP\ifeFr@DPtfine\nobreak\thinspace\else\nobreakspace\fi\fi}%
\XeTeXinterchartoks 4095 \french@punctthin = {\efr@unskip\nobreak\thinspace}%
- \XeTeXinterchartoks 4095 \french@punctthick = {\efr@unskip\nobreakspace}%
+ \XeTeXinterchartoks 4095 \french@semicolon = {\efr@unskip\ifeFr@DPtfine\nobreak\thinspace\else\nobreakspace\fi}%
}
\def\nointercharpunct{%
- \lccode8217=\z@
+% \lccode8217=\z@
\XeTeXcharclass `\! \z@
\XeTeXcharclass `\? \z@
\XeTeXcharclass `\; \z@
@@ -2363,7 +2397,7 @@
\fi
\ifeF@xetex@punct
\newXeTeXintercharclass\french@punctthin % ! ? ; et autres
- \newXeTeXintercharclass\french@punctthick % :
+ \newXeTeXintercharclass\french@semicolon % :
%
\def\efr@unskip{\ifhmode\ifdim\lastskip>\z@\unskip\fi\fi}
\def\xpg@nospace#1{#1}
@@ -2384,9 +2418,10 @@
\def\@tempd{\@tempa{\string;}}%
\ifx;\undefined\def\@tempd{}\fi\@tempd\@tempc%
\def\@PV{\relax\ifmmode\string;\else%
- \ifhmode\ifUSP\unskip\space\fi%
- \ifdim\lastskip>\z@\unskip\penalty\@M\,\fi%
- \fi\string;\fi}%
+ \Ponctu@ctivedtrue
+ \ifhmode\ifUSP\unskip\space\fi%
+ \ifdim\lastskip>\z@\unskip\eFrFinSp@ce\fi%
+ \fi\string;\fi}%
\def\@tempc{%
\def:{\ifFTY\protect\@DP%
\else\ifWTS\@WTS\fi\string:\fi}%
@@ -2395,10 +2430,13 @@
\ifx:\undefined\def\@tempd{}\fi\@tempd\@tempc%
\@ifundefined{@beginparpenalty}{\def\@beginparpenalty=#1{\penalty#1}}{}%
\def\@DP{\relax\ifmmode\string:\else%
- \ifhmode\ifUSP\unskip\space\fi%
- \ifdim\lastskip>\z@\unskip\penalty\@M\,\fi%
- \fi%
- \string:%
+\Ponctu@ctivedtrue
+\ifeFr@DPtfine\let\eFresp@dpt=\eFrFinSp@ce
+ \else\let\eFresp@dpt=\nbsp@ce\fi
+ \ifhmode\ifUSP\unskip\space\fi%
+ \ifdim\lastskip>\z@\unskip\eFresp@dpt\fi%
+ \fi%
+ \string:%
\@beginparpenalty=\@M\relax%
\fi}%
\def\@wu#1{\@@wu#1,\void}%
@@ -2418,10 +2456,11 @@
\def\@tempd{\@tempa{\string!}}%
\ifx!\undefined\def\@tempd{}\fi\@tempd\@tempc%
\def\@PE{\ifmmode\string!\else%
- \ifhmode\ifUSP\unskip\space\fi%
- \ifdim\lastskip>\z@\unskip\penalty\@M\,\fi%
- \fi%
- \string!\fi}%
+ \Ponctu@ctivedtrue
+ \ifhmode\ifUSP\unskip\space\fi%
+ \ifdim\lastskip>\z@\unskip\eFrFinSp@ce\fi%
+ \fi%
+ \string!\fi}%
\def\@tempc{%
\def?{\ifFTY\protect\@PI%
\else\ifWTS\@WTS\fi\string?\fi}%
@@ -2429,12 +2468,12 @@
\def\@tempd{\@tempa{\string?}}%
\ifx?\undefined\def\@tempd{}\fi\@tempd\@tempc%
\def\@PI{\relax\ifmmode\string?\else%
- \ifhmode\ifUSP\unskip\space\fi%
- \ifdim\lastskip>\z@\unskip\penalty\@M%
- \hskip +0.09em plus 0.07667em%
- \fi%
- \fi%
- \string?\fi}%
+ \Ponctu@ctivedtrue
+ \ifhmode\ifUSP\unskip\space\fi%
+ \ifdim\lastskip>\z@\unskip\eFrFinSp@ce%
+ \fi%
+ \fi%
+ \string?\fi}%
\ifx\@tempb\next\let\AFPdp\empty\f@issue%
\@fw{-13b- %
\@txt@msg{la double ponctuation est alors d\'esactiv\'ee}}\fi%
@@ -2518,35 +2557,55 @@
\advance\@FrDimen by -\leftmargin\advance\@FrDimen by -\rightmargin%
\advance\@FrDimen by -\listparindent\hsize=\@FrDimen}%
\@qquotes\fi\fi\fi%
+ \sp@inogfalse%
\@oguills%
\ifFLA\ifEPG\bgroup\def\@currenvir{guillemets}%
\let\@CGroup\egroup\fi\fi%
\ifCG\ifFLA\ifEPG%
\xdef\@epORI{{\the\TeXeverypar}}%
\TeXeverypar={\@epORI%
- \ifEPGR\else%
- \@oguills%
+ \ifEPGR\else\@AG% -guide du typographe
+ \sp@inogtrue%
+ \@oguills% begin of paragraph
\@ifundefined{@OuvOpen}{%
- \,%
+ %\,% space in @oguil
}{}%
\fi}%
\fi\fi%
- \else\@SifDOGon\@AG%
+ \else\@SifDOGon\@AG% in a citation
\ifFLA\ifEPG\else\def\@qqguill{\@oguills}\@staring\fi\fi\fi%
\global\let\ifCG\iffalse%
- \ifUSP\kern+0.13em\penalty\@M\ignorespaces%
- \else\kern-0.19em\relax\penalty\@M\fi}%
+ \ifeFr@Guifine\USP@GuiFinSpatrue% OG full space not used
+ \let\eFresp@gui=\eFrFinSp@ce% OG fine unbreakable space
+ \else\USP@GuiFinSpafalse% OG full space possible
+ \let\eFresp@gui=\nbsp@ce% OG full unbreakable space
+ \fi%
+ \Ponctu@ctivedtrue
+ \ifUSP\USP@GuiFinSpatrue\fi% OG full space not used
+ \ifUSP@GuiFinSpa\eFr@OGsp@cSpl%
+ \else\relax\penalty\@M\fi}%
+% \relax\ifeFr@Guifine\/\fi\penalty\@M}% space is following
\def\@AG{\ifAG\let\@LP\@RP\let\@gotl\@gotr%
\fi}%
\def\f@guillemets{<<}%
-\def\@oguills{%
+\newif\ifsp@inog
+\def\@oguills{%
+ \ifeFr@Guifine%
+ \let\eFresp@gui=\eFrFinSp@ce%
+ \else\let\eFresp@gui=\nbsp@ce% no space to be made unbreakable
+ \fi%
+ \Ponctu@ctivedtrue
\bgroup\@ifundefined{@OuvOpen}{\def\@OuvOpen{}%
\@ifundefined{ly}{\@og}%
{\leavevmode\ifECM\hbox{{\ifGIAF\else\@gfnt\fi%
- \ifx\@gotl\undefined\char\rq\@LP%
- \else\(a)gotl\fi\kern+0.20em}}%
- \else\hbox{{\ly\@LP\kern-0.20em\@LP\kern+0.20em}}\fi%
- \nobreak}}{}\egroup}%
+ \ifx\@gotl\undefined\char\rq\@LP%
+ \else\@gotl\fi%
+ \ifeFr@Guifine%
+ \let\eFresp@gui=\eFrFinSp@ce%
+ \else\let\eFresp@gui=\nbsp@ce\fi%
+ \ifsp@inog\eFresp@gui\fi}}% V6,11 RJ
+ \else\hbox{{\ly\@LP\kern-0.20em\@LP\kern+0.20em}}\fi%
+ \nobreak}}{}\egroup}%
\def\@@RFG{\ifFTY\ifmmode\protect\@RSG\else%
\ifIEB\@SFC\else\@RSG\fi%
\fi%
@@ -2572,17 +2631,20 @@
\else\let\@grORI\grammar\def\grammar{\nofrenchguillemets\@grORI}%
\fi%
+\newif\ifsp@infg
\def\@@FG{\ifCG\f@issue%
\@fw{-14- %
}\fi%
- \ifUSP\unskip\kern+0.13em\else%
- \ifdim\lastskip>\z@\unskip%
- \penalty\@M%
- \space%
- \penalty\@M%
- \fi%
- \kern-0.19em%
- \fi%
+ \Ponctu@ctivedtrue
+ \ifeFr@Guifine%
+ \USP@GuiFinSpatrue%
+ \fi%
+ \ifUSP\USP@GuiFinSpatrue\fi% FG full space not used
+ \ifUSP@GuiFinSpa\unskip\eFrFinSp@ce%
+ \else
+ \ifdim\lastskip>\z@\unskip\nbsp@ce\fi%
+ \fi
+ \sp@infgfalse
\xdef\@tempd{\@currenvir}\def\@tempe{guillemets}%
\ifx\@tempd\@tempe%
\@CGroup\@fguills%
@@ -2612,10 +2674,17 @@
\else\@staring\@stared\egroup\fi\fi%
\global\let\ifCG\iftrue\let\@CGroup\relax}%
\def\@fguills{\@ifundefined{ly}{\@cg}%
- {\nobreak\leavevmode\ifECM\hbox{{\ifGIAF\else\(a)gfnt\fi\kern+0.20em%
- \ifx\@gotr\undefined\char\rq\@RP%
- \else\@gotr\fi}}%
- \else\hbox{{\ly\kern+0.20em\@RP\kern-0.20em\@RP}}\fi}%
+ {\nobreak\leavevmode\ifECM\hbox{{\ifGIAF\else\@gfnt\fi%
+ \Ponctu@ctivedtrue
+ \ifsp@infg
+ \ifeFr@Guifine\let\eFresp@gui=\eFrFinSp@ce%
+ \else\let\eFresp@gui=\nbsp@ce\fi%
+ \ifUSP\unskip\space\fi
+ \ifdim\lastskip>\z@\unskip\eFresp@gui\fi
+ \fi
+ \ifx\@gotr\undefined\char\rq\@RP%
+ \else\@gotr\fi}}%
+ \else\hbox{{\ly\kern+0.20em\@RP\kern-0.20em\@RP}}\fi}%
\ifGIAF\else\ifdim\fontdimen\@ne\font>\z@\/\fi\fi%
}%
\def\@normalrq{\relax\ifmmode^\prime\else\@frq\fi}%
@@ -3142,8 +3211,8 @@
\ifFMA\@oguills%
\else<<\fi}%
\def\rightguillemets{\@noBDfr%
- \ifFMA\@fguills%
- \else>>\fi}%
+ \ifFMA\sp@infgtrue\@fguills%
+ \else>>\fi}%
\def\fup{\@noBDfr\ifFTY%
\expandafter\@fup\fi}\MakeRobustCommand{fup}%
\def\@fup{\@ifstar{\csname\string\!\endcsname\@@fup}{\@@fup}}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/e-french/french_french-msg.tex new/tex/generic/e-french/french_french-msg.tex
--- old/tex/generic/e-french/french_french-msg.tex 2019-01-14 23:05:08.000000000 +0100
+++ new/tex/generic/e-french/french_french-msg.tex 2019-09-04 23:47:43.000000000 +0200
@@ -203,6 +203,9 @@
\msg*{93}{Vous utilisez deux options de francisation avec Babel, %
\MessageBreak %
merci d'en choisir une seule.}{}
+\msg{94}{Le changement de ponctuation (#1) \MessageBreak%
+ n'est plus permis apr\`es une utilisation de ponctuation active\MessageBreak %
+ (\string! \string? \string; \string: \string<\string< \string>\string>).}{}
\msgheader{-**-\space}
\msg*{**a}{Le num\'ero de s\'erie de \frenchpack\space est *\(a)FrVal*.}{}
\msg*{**b}{\@FrVal\space of \frenchpack.}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/e-french.tlpobj new/tlpkg/tlpobj/e-french.tlpobj
--- old/tlpkg/tlpobj/e-french.tlpobj 2019-03-09 02:24:26.000000000 +0100
+++ new/tlpkg/tlpobj/e-french.tlpobj 2019-09-05 01:53:58.000000000 +0200
@@ -1,13 +1,13 @@
name e-french
category Package
-revision 50292
+revision 52027
shortdesc Comprehensive LaTeX support for French-language typesetting
relocated 1
longdesc E-french is a distribution that keeps alive the work of Bernard
longdesc Gaulle (now deceased), under a free licence. It replaces the
longdesc old "full" frenchpro (the "professional" distribution) and the
longdesc light-weight frenchle packages.
-runfiles size=102
+runfiles size=103
RELOC/makeindex/e-french/fridx1.ist
RELOC/makeindex/e-french/fridx2.ist
RELOC/makeindex/e-french/fridx3.ist
@@ -48,7 +48,7 @@
catalogue-contact-home http://www.efrench.org/
catalogue-contact-repository https://svn.tuxfamily.org/viewvc.cgi/efrench_efrenchsources/trunk/
catalogue-ctan /language/french/e-french
-catalogue-date 2019-03-08 11:23:56 +0100
+catalogue-date 2019-09-04 19:27:35 +0200
catalogue-license lppl1.3
catalogue-topics french
-catalogue-version 6.1
+catalogue-version 6.11
++++++ ebgaramond-maths.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/ebgaramond-maths/README new/doc/fonts/ebgaramond-maths/README
--- old/doc/fonts/ebgaramond-maths/README 2014-11-30 23:27:58.000000000 +0100
+++ new/doc/fonts/ebgaramond-maths/README 2019-09-24 22:05:26.000000000 +0200
@@ -1,4 +1,4 @@
-%% Copyright 2014 Clea F. Rees
+%% Copyright 2019 Clea F. Rees
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -14,18 +14,20 @@
%
% This work consists of all files listed in manifest.txt.
-This package provides some LaTeX support for the use of EBGaramond12 in
+This package provides some LaTeX support for the use of EBGaramond in
mathematics. It is based on, and requires, ebgaramond. It was created in
response to a question at http://tex.stackexchange.com/q/152038/ and tested in
the form of an answer at http://tex.stackexchange.com/a/152347/. It is
published as a package at the request of the question author in the hope that
it may be useful but scarcely the expectation.
+Version 1.2 is updated to use the 2019-05-04 version of ebgaramond.
+
To the best of the author's knowledge, no hedgehogs were harmed in the
production of this package.
Clea F. Rees
ReesC21 <at> cardiff <dot> ac <dot> uk
-2014/11/30
+2019/09/24
vim: set nospell:
Binary files old/doc/fonts/ebgaramond-maths/ebgaramond-maths.pdf and new/doc/fonts/ebgaramond-maths/ebgaramond-maths.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/ebgaramond-maths/ebgaramond-maths.tex new/doc/fonts/ebgaramond-maths/ebgaramond-maths.tex
--- old/doc/fonts/ebgaramond-maths/ebgaramond-maths.tex 2014-11-30 23:27:58.000000000 +0100
+++ new/doc/fonts/ebgaramond-maths/ebgaramond-maths.tex 2019-09-24 22:05:26.000000000 +0200
@@ -1,4 +1,4 @@
-%% Copyright 2014 Clea F. Rees
+%% Copyright 2019 Clea F. Rees
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -37,9 +37,9 @@
\usepackage{microtype}
\usepackage[headheight=15pt]{geometry}
-\title{ebgaramond-maths\thanks{Version 1.1 2014--11--30.}}
+\title{ebgaramond-maths\thanks{Version 1.2 2019--09--24.}}
\author{Clea F.\ Rees\footnote{\liningfam ReesC21 <at> cardiff <dot> ac <dot> uk}}
-\newcommand*{\dyddiad}{30\textsu{th} November, 2014}
+\newcommand*{\dyddiad}{24\textsu{th} September, 2019}
\date{\dyddiad}
\pagestyle{fancy}
\fancyhf[lh]{\itshape ebgaramond-maths}
@@ -65,7 +65,7 @@
/Author (Clea F.\ Rees)
/Title (ebgaramond-maths)
/Subject (TeX)
- /Keywords (TeX, LaTeX, font, fonts, tex, latex, ebgaramond-maths, EBGaramond, ebgaramond, EBGaramond12, maths, mathematics, Clea, Rees)}
+ /Keywords (TeX, LaTeX, font, fonts, tex, latex, ebgaramond-maths, EBGaramond, ebgaramond, EBGaramond, maths, mathematics, Clea, Rees)}
\pdfcatalog{%
/URL ()
/PageMode /UseOutlines}
@@ -74,8 +74,8 @@
\begin{abstract}
\liningfam
- \noindent\lpack{ebgaramond-maths} provides some \LaTeX\ support for the use of EBGaramond12 in mathematics.
- It requires \lpack{ebgaramond} and uses the postscript fonts provided by that package\footnote{This version corresponds to the 2014--07--07 version of \lpack{ebgaramond}.}.
+ \noindent\lpack{ebgaramond-maths} provides some \LaTeX\ support for the use of EBGaramond in mathematics.
+ It requires \lpack{ebgaramond} and uses the postscript fonts provided by that package\footnote{This version corresponds to the 2019--05--04 version of \lpack{ebgaramond}.}.
The package essentially consists of the files generated by an answer to a question at \url{http://tex.stackexchange.com/q/152038/} and is a response to a follow-up request by the author of that question.
\end{abstract}
@@ -89,7 +89,7 @@
\usepackage{ebgaramond-maths}
\end{verbatim}
\end{quote}
-Note that this will also load \lpack{ebgaramond} which will set your default serif font to \liningnums{EBGaramond12}.
+Note that this will also load \lpack{ebgaramond} which will set your default serif font to \liningnums{EBGaramond}.
If for any reason you do not want this, note two things.
First, your document will be a typographic abomination.
Second, you can easily create the abomination of your choice by changing the default serif family \emph{after} loading \lpack{ebgaramond-maths}.
@@ -99,7 +99,7 @@
% BEGIN sec:manylion
The package includes \verb|.tfm| and \verb|.map| files which define EBGaramond-Maths, a new \TeX\ font for \LaTeX.
-This font uses \liningnums{EBGaramond12-Italic} with an OML encoding.
+This font uses \liningnums{EBGaramond-Italic} with an OML encoding.
However, not all characters in this encoding are available (see \fref{tab:dim}).
Note that this is a limitation of the font itself and not of this package.
@@ -113,7 +113,7 @@
\string\rightharpoondown & \string\partial & & \string\t\\
\bottomrule
\end{tabular}
- \caption{Symbols missing from EBGaramond12}\label{tab:dim}
+ \caption{Symbols missing from EBGaramond}\label{tab:dim}
\end{table}
@@ -125,7 +125,7 @@
\item \verb|\mathrm|, \verb|\mathbf| and \verb|\mathit| should work as expected and use EBGaramond-LF (medium weight, upright or italic shape as appropriate).
\end{itemize}
-Note that \liningnums{EBGaramond12} does not include a bold weight by design.
+Note that \liningnums{EBGaramond} does not include a bold weight by design.
Following the designer's intentions, this package, like \lpack{ebgaramond}, substitutes the medium weight for bold where required.
% END sec:manylion
@@ -158,7 +158,7 @@
\begin{verbatim}
ln -s ${texmain}/texmf-dist/tex/fontinst/mathetx/oml.etx \
${texmain}/texmf-dist/fonts/opentype/public/ebgaramond/\
- EBGaramond12-Italic.otf ./
+ EBGaramond-Italic.otf ./
\end{verbatim}
\end{quote}
% END subsec:amgylchedd
@@ -198,7 +198,7 @@
\begin{quote}
\begin{verbatim}
-otftotfm -e oml-ebgaramond.enc EBGaramond12-Italic.otf \
+otftotfm -e oml-ebgaramond.enc EBGaramond-Italic.otf \
> EBGaramond-Maths.map
\end{verbatim}
\end{quote}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/ebgaramond-maths/manifest.txt new/doc/fonts/ebgaramond-maths/manifest.txt
--- old/doc/fonts/ebgaramond-maths/manifest.txt 2014-09-03 00:45:00.000000000 +0200
+++ new/doc/fonts/ebgaramond-maths/manifest.txt 2019-09-24 22:05:26.000000000 +0200
@@ -1,5 +1,5 @@
manifest.txt
-Copyright 2014 Clea F. Rees
+Copyright 2019 Clea F. Rees
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -16,8 +16,8 @@
This work consists of all files listed in manifest.txt.
All TeX Font Metric files (suffix .tfm in subdirectory fonts/tfm)
-are derived from the relevant EBGaramond12 fonts, supplied as part of the
-ebgaramond package released 2014-07-07 (version 0.16) by Bob Tennent and
+are derived from the relevant EBGaramond fonts, supplied as part of the
+ebgaramond package released 2019-05-04 (version 0.16) by Bob Tennent and
available from ttp://ctan.org/pkg/ebgaramond. The TeX Font Metric (suffix
.tfm) files are derived specifically from the opentype fonts (suffix
.otf) using otftotfm as explained in the package documentation.
@@ -34,7 +34,7 @@
Derived files:
EBGaramond-Maths.map
-EBGaramond12-Italic--oml-ebgaramond.tfm
+EBGaramond-Italic--oml-ebgaramond.tfm
a_42pejf.enc
ebgaramond-maths.pdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebgaramond-maths.doc.tlpobj new/tlpkg/tlpobj/ebgaramond-maths.doc.tlpobj
--- old/tlpkg/tlpobj/ebgaramond-maths.doc.tlpobj 2019-02-28 03:34:46.000000000 +0100
+++ new/tlpkg/tlpobj/ebgaramond-maths.doc.tlpobj 2019-09-25 01:53:50.000000000 +0200
@@ -1,9 +1,9 @@
name ebgaramond-maths.doc
category Package
-revision 35701
+revision 52168
shortdesc doc files of ebgaramond-maths
relocated 1
-docfiles size=52
+docfiles size=95
RELOC/doc/fonts/ebgaramond-maths/README
RELOC/doc/fonts/ebgaramond-maths/ebgaramond-maths.pdf
RELOC/doc/fonts/ebgaramond-maths/ebgaramond-maths.tex
++++++ ebgaramond-maths.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/ebgaramond-maths/a_42pejf.enc new/fonts/enc/dvips/ebgaramond-maths/a_42pejf.enc
--- old/fonts/enc/dvips/ebgaramond-maths/a_42pejf.enc 2014-09-03 00:45:00.000000000 +0200
+++ new/fonts/enc/dvips/ebgaramond-maths/a_42pejf.enc 1970-01-01 01:00:00.000000000 +0100
@@ -1,56 +0,0 @@
-% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
-
-%%AutoEnc_42pejfj2l27x56mpqr5s2btolh
-% Encoding created by otftotfm on Mon Sep 1 23:37:15 2014
-% Command line follows encoding
-/AutoEnc_42pejfj2l27x56mpqr5s2btolh [
-%00
- /Gamma /Delta /Theta /Lambda /Xi /Pi /Sigma /Upsilon
- /Phi /Psi /Omega /alpha /beta /gamma /delta /.notdef
-%10
- /zeta /eta /theta /iota /kappa /lambda /mu /nu
- /xi /pi /rho /sigma /tau /upsilon /phi1 /chi
-%20
- /psi /omega /epsilon /theta1 /omega1 /uni03F1 /sigma1 /phi
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%30
- /zero /one /two /three /four /five /six /seven
- /eight /nine /period /comma /less /slash /greater /.notdef
-%40
- /.notdef /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /.notdef /.notdef /.notdef /.notdef /.notdef
-%60
- /uni2113 /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /dotlessi /uni0237 /.notdef /.notdef /.notdef
-%80
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%90
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%A0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm -e oml-ebgaramond.enc EBGaramond12-Italic.otf'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/ebgaramond-maths/a_w5zv5t.enc new/fonts/enc/dvips/ebgaramond-maths/a_w5zv5t.enc
--- old/fonts/enc/dvips/ebgaramond-maths/a_w5zv5t.enc 1970-01-01 01:00:00.000000000 +0100
+++ new/fonts/enc/dvips/ebgaramond-maths/a_w5zv5t.enc 2019-09-24 22:05:26.000000000 +0200
@@ -0,0 +1,56 @@
+% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
+
+%%AutoEnc_w5zv5t7y6g6ulqwj56m5gyefkh
+% Encoding created by otftotfm on Mon Sep 23 23:55:44 2019
+% Command line follows encoding
+/AutoEnc_w5zv5t7y6g6ulqwj56m5gyefkh [
+%00
+ /Gamma /uni2206 /Theta /Lambda /Xi /Pi /Sigma /Upsilon
+ /Phi /Psi /uni2126 /alpha /beta /gamma /delta /.notdef
+%10
+ /zeta /eta /theta /iota /kappa /lambda /uni00B5 /nu
+ /xi /pi /rho /sigma /tau /upsilon /uni03D5 /chi
+%20
+ /psi /omega /epsilon /uni03D1 /uni03D6 /uni03F1 /uni03C2 /phi
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /uni25B7 /uni25C1
+%30
+ /zero /one /two /three /four /five /six /seven
+ /eight /nine /period /comma /less /slash /greater /.notdef
+%40
+ /partialdiff /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /.notdef /.notdef /.notdef /.notdef /.notdef
+%60
+ /uni2113 /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /dotlessi /uni0237 /.notdef /.notdef /.notdef
+%80
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%90
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%A0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm -e oml-ebgaramond.enc EBGaramond-Italic.otf'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/ebgaramond-maths/EBGaramond-Maths.map new/fonts/map/dvips/ebgaramond-maths/EBGaramond-Maths.map
--- old/fonts/map/dvips/ebgaramond-maths/EBGaramond-Maths.map 2014-09-03 00:45:00.000000000 +0200
+++ new/fonts/map/dvips/ebgaramond-maths/EBGaramond-Maths.map 2019-09-24 22:05:26.000000000 +0200
@@ -1 +1 @@
-EBGaramond12-Italic--oml-ebgaramond EBGaramond12-Italic "AutoEnc_42pejfj2l27x56mpqr5s2btolh ReEncodeFont" <[a_42pejf.enc <EBGaramond12-Italic.pfb
+EBGaramond-Italic--oml-ebgaramond EBGaramond-Italic "AutoEnc_w5zv5t7y6g6ulqwj56m5gyefkh ReEncodeFont" <[a_w5zv5t.enc <EBGaramond-Italic.pfb
Binary files old/fonts/tfm/public/ebgaramond-maths/EBGaramond-Italic--oml-ebgaramond.tfm and new/fonts/tfm/public/ebgaramond-maths/EBGaramond-Italic--oml-ebgaramond.tfm differ
Binary files old/fonts/tfm/public/ebgaramond-maths/EBGaramond12-Italic--oml-ebgaramond.tfm and new/fonts/tfm/public/ebgaramond-maths/EBGaramond12-Italic--oml-ebgaramond.tfm differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ebgaramond-maths/OMLEBGaramond-Maths.fd new/tex/latex/ebgaramond-maths/OMLEBGaramond-Maths.fd
--- old/tex/latex/ebgaramond-maths/OMLEBGaramond-Maths.fd 2014-09-03 00:45:00.000000000 +0200
+++ new/tex/latex/ebgaramond-maths/OMLEBGaramond-Maths.fd 2019-09-24 22:05:26.000000000 +0200
@@ -1,4 +1,4 @@
-%% Copyright 2014 Clea F. Rees
+%% Copyright 2019 Clea F. Rees
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,12 +20,12 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{OMLEBGaramond-Maths.fd}
- [2014/09/01 font definitions for OML/EBGaramond-Maths.]
+ [2019/09/24 font definitions for OML/EBGaramond-Maths.]
\DeclareFontFamily{OML}{EBGaramond-Maths}{}
\DeclareFontShape{OML}{EBGaramond-Maths}{m}{it}{
- <-> EBGaramond12-Italic--oml-ebgaramond
+ <-> EBGaramond-Italic--oml-ebgaramond
}{}
\DeclareFontShape{OML}{EBGaramond-Maths}{b}{it}{<->ssub * EBGaramond-Maths/m/it}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ebgaramond-maths/ebgaramond-maths.sty new/tex/latex/ebgaramond-maths/ebgaramond-maths.sty
--- old/tex/latex/ebgaramond-maths/ebgaramond-maths.sty 2014-11-30 23:27:58.000000000 +0100
+++ new/tex/latex/ebgaramond-maths/ebgaramond-maths.sty 2019-09-24 22:05:26.000000000 +0200
@@ -1,4 +1,4 @@
-%% Copyright 2014 Clea F. Rees
+%% Copyright 2019 Clea F. Rees
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -15,7 +15,7 @@
% This work consists of all files listed in manifest.txt.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ebgaramond-maths}[2014/11/30 v1.1 ebgaramond-maths for use with EBGaramond]
+\ProvidesPackage{ebgaramond-maths}[2019/09/24 v1.2 ebgaramond-maths for use with EBGaramond]
\RequirePackage{ebgaramond}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebgaramond-maths.tlpobj new/tlpkg/tlpobj/ebgaramond-maths.tlpobj
--- old/tlpkg/tlpobj/ebgaramond-maths.tlpobj 2019-02-28 03:34:46.000000000 +0100
+++ new/tlpkg/tlpobj/ebgaramond-maths.tlpobj 2019-09-25 01:53:50.000000000 +0200
@@ -1,6 +1,6 @@
name ebgaramond-maths
category Package
-revision 35701
+revision 52168
shortdesc LaTeX support for EBGaramond fonts in mathematics
relocated 1
longdesc This package provides some LaTeX support for the use of
@@ -10,14 +10,14 @@
longdesc the same forum.
execute addMap EBGaramond-Maths.map
runfiles size=5
- RELOC/fonts/enc/dvips/ebgaramond-maths/a_42pejf.enc
+ RELOC/fonts/enc/dvips/ebgaramond-maths/a_w5zv5t.enc
RELOC/fonts/map/dvips/ebgaramond-maths/EBGaramond-Maths.map
- RELOC/fonts/tfm/public/ebgaramond-maths/EBGaramond12-Italic--oml-ebgaramond.tfm
+ RELOC/fonts/tfm/public/ebgaramond-maths/EBGaramond-Italic--oml-ebgaramond.tfm
RELOC/tex/latex/ebgaramond-maths/OMLEBGaramond-Maths.fd
RELOC/tex/latex/ebgaramond-maths/ebgaramond-maths.sty
catalogue-also ebgaramond
catalogue-ctan /fonts/ebgaramond-maths
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-09-24 10:38:08 +0200
catalogue-license lppl1.3
catalogue-topics font font-maths font-virtual
-catalogue-version 1.1
+catalogue-version 1.2
++++++ ebgaramond.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/ebgaramond/README new/doc/fonts/ebgaramond/README
--- old/doc/fonts/ebgaramond/README 2019-04-08 22:08:10.000000000 +0200
+++ new/doc/fonts/ebgaramond/README 2020-04-13 23:33:39.000000000 +0200
@@ -1,5 +1,5 @@
This is the README for the ebgaramond package, version
-2019-04-07.
+2020-04-12.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
support for the EB Garamond family of fonts, designed by
@@ -52,7 +52,7 @@
Slanted variants are not supported; the italic variants will
be automatically substituted. Font encodings supported are
-OT1, T1, LY1 and TS1.
+OT1, T1, TS1, LY! and LGR.
Options scaled=<number> or scale=<number> may be used to
adjust fontsizes. The type1 option may be used by xelatex
@@ -75,6 +75,9 @@
only the following glyphs are available: A, D, F, G, L, N,
O, Q, T and X.
+Command \ebgaramondlgr activates the LGR encoding of type1
+fonts.
+
The original fonts are available from
https://github.com/octaviopardo/EBGaramond12/tree/master/fonts/otf
and are licensed under the SIL Open Font License, (version
Binary files old/doc/fonts/ebgaramond/ebgaramond-samples.pdf and new/doc/fonts/ebgaramond/ebgaramond-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/ebgaramond/ebgaramond-samples.tex new/doc/fonts/ebgaramond/ebgaramond-samples.tex
--- old/doc/fonts/ebgaramond/ebgaramond-samples.tex 2018-12-06 00:48:02.000000000 +0100
+++ new/doc/fonts/ebgaramond/ebgaramond-samples.tex 2020-02-28 23:25:54.000000000 +0100
@@ -1,6 +1,6 @@
\documentclass{article}
-\usepackage[T1]{fontenc}
-\usepackage[m]{ebgaramond}
+\usepackage[LGR,T1]{fontenc}
+\usepackage{ebgaramond}
\usepackage{microtype}
\newcommand{\Section}[1]{\section*{\scshape#1}}
\renewcommand{\,}{\kern0.2ex}
@@ -10,7 +10,7 @@
\begin{center}\huge
\textsc{e\,g\,e\,n\,o\,l\,f\,f\,-\,b\,e\,r\,n\,e\,r\ \ g\,a\,r\,a\,m\,o\,n\,d}\\[0.5ex]
-\swshape\Large
+\Large\swshape
by Georg Duffner and Octavio Pardo
\end{center}
@@ -69,7 +69,14 @@
X\textinf{1234567890}
-\clearpage
+\Section{LGR}
+
+
+{\ebgaramondlgr\noindent
+ a b g d e z h j i k l m n x o p r s t u f q y w\\
+ A B G D E Z H J I K L M N X O P R S T U F Q Y W\\
+}
+
\Section{Initials}\Large
\sloppy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebgaramond.doc.tlpobj new/tlpkg/tlpobj/ebgaramond.doc.tlpobj
--- old/tlpkg/tlpobj/ebgaramond.doc.tlpobj 2019-04-09 01:38:23.000000000 +0200
+++ new/tlpkg/tlpobj/ebgaramond.doc.tlpobj 2020-04-15 01:54:41.000000000 +0200
@@ -1,9 +1,9 @@
name ebgaramond.doc
category Package
-revision 50876
+revision 54721
shortdesc doc files of ebgaramond
relocated 1
-docfiles size=143
+docfiles size=241
RELOC/doc/fonts/ebgaramond/AUTHORS.txt
RELOC/doc/fonts/ebgaramond/CONTRIBUTORS.txt
RELOC/doc/fonts/ebgaramond/EBGaramond-Initials-Glyphs.pdf
++++++ ebgaramond.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-h/ebgaramond.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-h.new.3606/ebgaramond.tar.xz differ: char 25, line 1
++++++ econ-bst.doc.tar.xz ++++++
++++ 26568 lines of diff (skipped)
++++++ econ-bst.tar.xz ++++++
++++ 39892 lines of diff (skipped)
++++++ einfuehrung.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/einfuehrung.doc.tlpobj new/tlpkg/tlpobj/einfuehrung.doc.tlpobj
--- old/tlpkg/tlpobj/einfuehrung.doc.tlpobj 2019-02-28 03:34:58.000000000 +0100
+++ new/tlpkg/tlpobj/einfuehrung.doc.tlpobj 2020-03-04 23:50:47.000000000 +0100
@@ -1,6 +1,6 @@
name einfuehrung.doc
category Package
-revision 29349
+revision 54080
shortdesc doc files of einfuehrung
relocated 1
docfiles size=1167
++++++ einfuehrung2.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/einfuehrung2.doc.tlpobj new/tlpkg/tlpobj/einfuehrung2.doc.tlpobj
--- old/tlpkg/tlpobj/einfuehrung2.doc.tlpobj 2019-02-28 03:35:02.000000000 +0100
+++ new/tlpkg/tlpobj/einfuehrung2.doc.tlpobj 2020-03-04 23:50:48.000000000 +0100
@@ -1,6 +1,6 @@
name einfuehrung2.doc
category Package
-revision 39153
+revision 54080
shortdesc doc files of einfuehrung2
relocated 1
docfiles size=1369
++++++ elegantbook.doc.tar.xz ++++++
++++ 2348 lines of diff (skipped)
++++++ elegantbook.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/elegantbook/elegantbook.cls new/tex/latex/elegantbook/elegantbook.cls
--- old/tex/latex/elegantbook/elegantbook.cls 2019-02-24 23:53:38.000000000 +0100
+++ new/tex/latex/elegantbook/elegantbook.cls 2020-04-12 23:26:06.000000000 +0200
@@ -1,15 +1,14 @@
%%%%%%%%%%%%%%%%%%%%%%
%% start of file `elegantbook.cls'.
-%% Copyright 2013-2019 ElegantLaTeX (elegantlatex2e(a)gmail.com)
+%% Copyright 2013-2020 ElegantLaTeX (elegantlatex2e(a)gmail.com)
%%
%% This work may be distributed and/or modified freely
%% available at https://github.com/ElegantLaTeX/ElegantBook
-% %
-%% Last Modification 2019-02-25
+%
%%%%%%%%%%%%%%%%%%%%%
% % !Mode:: "TeX:UTF-8"
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{elegantbook}[2019/02/24 v3.06 ElegantBook document class]
+\ProvidesClass{elegantbook}[2020/04/12 v3.11 ElegantBook document class]
\RequirePackage{kvoptions}
\RequirePackage{etoolbox}
@@ -17,494 +16,872 @@
\newcommand{\ekv}[1]{\kvsetkeys{ELEGANT}{#1}}
% ----- Colors -----
-\DeclareStringOption[green]{color}
+\DeclareStringOption[blue]{color}
\DeclareStringOption[en]{lang}
+\DeclareStringOption[answer]{result}
+\DeclareStringOption[fancy]{mode}
+\DeclareStringOption[normal]{device}
+\DeclareStringOption[cm]{math}
+\DeclareStringOption[marginfalse]{marginpar}
+\DeclareStringOption[onecol]{toc}
+\DeclareStringOption{scheme}
% ----- backward compatibility
-\DeclareVoidOption{green}{\ekv{color = green}}
-\DeclareVoidOption{cyan}{\ekv{color = cyan}}
-\DeclareVoidOption{blue}{\ekv{color = blue}}
-\DeclareVoidOption{plain}{\ekv{color = plain}}
-\DeclareVoidOption{nocolor}{\ekv{color = none}}
+\DeclareVoidOption{green}{\ekv{color=green}}
+\DeclareVoidOption{cyan}{\ekv{color=cyan}}
+\DeclareVoidOption{blue}{\ekv{color=blue}}
+\DeclareVoidOption{gray}{\ekv{color=gray}}
+\DeclareVoidOption{black}{\ekv{color=black}}
+\DeclareVoidOption{nocolor}{\ekv{color=none}}
+\DeclareStringOption[ctexfont]{chinesefont}
+
+\DeclareVoidOption{chinese}{\ekv{scheme=chinese}}
+
+\DeclareVoidOption{ctexfont}{\ekv{chinesefont=ctexfont}}
+\DeclareVoidOption{founder}{\ekv{chinesefont=founder}}
+\DeclareVoidOption{nofont}{\ekv{chinesefont=nofont}}
+
\DeclareVoidOption{en}{\ekv{lang=en}}
\DeclareVoidOption{cn}{\ekv{lang=cn}}
+\DeclareVoidOption{it}{\ekv{lang=it}}
+
+\DeclareVoidOption{fancy}{\ekv{mode=fancy}}
+\DeclareVoidOption{simple}{\ekv{mode=simple}}
+
+\DeclareVoidOption{answer}{\ekv{result=answer}}
+\DeclareVoidOption{noanswer}{\ekv{result=noanswer}}
+
+\DeclareVoidOption{normal}{\ekv{device=normal}}
+\DeclareVoidOption{pad}{\ekv{device=pad}}
+
+\DeclareStringOption[numbers]{cite}
+\DeclareVoidOption{numbers}{\ekv{cite=numbers}}
+\DeclareVoidOption{authoryear}{\ekv{cite=authoryear}}
+\DeclareVoidOption{super}{\ekv{cite=super}}
+
+\DeclareStringOption[apalike]{bibstyle}
+
+\DeclareVoidOption{newtx}{\ekv{math=newtx}}
+\DeclareVoidOption{mtpro2}{\ekv{math=mtpro2}}
+\DeclareVoidOption{cm}{\ekv{math=cm}}
+
+\DeclareVoidOption{margintrue}{\ekv{marginpar=margintrue}}
+\DeclareVoidOption{marginfalse}{\ekv{marginpar=marginfalse}}
+
+\DeclareVoidOption{onecol}{\ekv{toc=onecol}}
+\DeclareVoidOption{twocol}{\ekv{toc=twocol}}
+
% ----- Math option -----
\newcommand\mailto[1]{\href{mailto:#1}{\nolinkurl{#1}}}
% ----- Title Style -----
\DeclareStringOption[hang]{titlestyle}[hang]
% ----- backward compatibility
-\DeclareVoidOption{hang}{\ekv{titlestyle = hang}}
-\DeclareVoidOption{display}{\ekv{titlestyle = display}}
+\DeclareVoidOption{hang}{\ekv{titlestyle=hang}}
+\DeclareVoidOption{display}{\ekv{titlestyle=display}}
% ----- Default Options -----
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{book}}
\ProcessKeyvalOptions*\relax
% \ProcessOptions*\relax
-\LoadClass[12pt,a4paper,oneside,openany]{book}
+\LoadClass[a4paper,oneside]{book}
-\RequirePackage{indentfirst}
-\setlength\parindent{2em}
+\RequirePackage{setspace}
+\RequirePackage{hyperref}
+\hypersetup{
+ breaklinks,
+ unicode,
+ linktoc=all,
+ bookmarksnumbered=true,
+ bookmarksopen=true,
+ pdfkeywords={ElegantBook},
+ colorlinks,
+ linkcolor=winered,
+ citecolor=winered,
+ urlcolor=winered,
+ plainpages=false,
+ pdfstartview=FitH,
+ pdfborder={0 0 0},
+ linktocpage
+}
+%% device settings
+\RequirePackage{geometry}
+\ifdefstring{\ELEGANT@device}{normal}{
+ \geometry{
+ a4paper,
+ top=25.4mm, bottom=25.4mm,
+ headheight=2.17cm,
+ headsep=4mm,
+ footskip=12mm
+ }
+ \ifdefstring{\ELEGANT@marginpar}{margintrue}{
+ \geometry{
+ marginparwidth=5cm, marginparsep=5mm,
+ left=2cm,right=7cm}}{\relax}}{
+ \relax}
+
+\ifdefstring{\ELEGANT@device}{pad}{
+\geometry{
+ paperwidth=7.5in,
+ paperheight=10in,
+ margin=16mm,
+ headheight=2.17cm,
+ footskip=4mm
+}}{\relax}
+
+\RequirePackage{indentfirst,comment}
% fontsetting
-\RequirePackage{ifxetex}
-\ifxetex
- \RequirePackage{fontenc}
- \RequirePackage[no-math]{fontspec}
- \setmainfont{Times New Roman}[NFSSFamily=ntxtlf]
- \setsansfont{Arial}
- %\setmonofont[Scale=0.9]{Courier New}
- \RequirePackage{xeCJK}
- \RequirePackage{xunicode}
- \setCJKmainfont[BoldFont={SimHei},ItalicFont={KaiTi}]{SimSun}
- \setCJKsansfont[BoldFont={SimHei},ItalicFont={KaiTi}]{KaiTi}
- \setCJKmonofont[BoldFont={SimHei},ItalicFont={KaiTi},Scale=0.7]{Microsoft YaHei}
- \XeTeXlinebreaklocale "zh"
- \XeTeXlinebreakskip = 0pt plus 1pt minus 0.1pt
- \RequirePackage{newtxmath}
- %\DeclareSymbolFont{operators}{OT1}{ntxtlf}{m}{n}
- %\SetSymbolFont{operators}{bold}{OT1}{ntxtlf}{b}{n}
- \setCJKfamilyfont{zhsong}{SimSun}
- \setCJKfamilyfont{zhhei}{SimHei}
- \setCJKfamilyfont{zhkai}{KaiTi}
- \setCJKfamilyfont{zhfs}{FangSong}
- \newcommand*{\songti}{\CJKfamily{zhsong}}
- \newcommand*{\heiti}{\CJKfamily{zhhei}}
- \newcommand*{\kaishu}{\CJKfamily{zhkai}}
- \newcommand*{\fangsong}{\CJKfamily{zhfs}}
+\ifdefstring{\ELEGANT@math}{mtpro2}{
+ \let\Bbbk\relax
+ \RequirePackage[lite]{mtpro2}
+}{\relax}
+
+\setcounter{tocdepth}{1}
+
+\PassOptionsToPackage{no-math}{fontspec}
+\RequirePackage{iftex}
+\ifdefstring{\ELEGANT@lang}{cn}{
+ \ifXeTeX
+ \ifdefstring{\ELEGANT@chinesefont}{founder}{
+ \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}
+ \setCJKmainfont[BoldFont={FZHei-B01},ItalicFont={FZKai-Z03}]{FZShuSong-Z01}
+ \setCJKsansfont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZHei-B01}
+ \setCJKmonofont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZFangSong-Z02}
+ \setCJKfamilyfont{zhsong}{FZShuSong-Z01}
+ \setCJKfamilyfont{zhhei}{FZHei-B01}
+ \setCJKfamilyfont{zhkai}{FZKai-Z03}
+ \setCJKfamilyfont{zhfs}{FZFangSong-Z02}
+ \newcommand*{\songti}{\CJKfamily{zhsong}}
+ \newcommand*{\heiti}{\CJKfamily{zhhei}}
+ \newcommand*{\kaishu}{\CJKfamily{zhkai}}
+ \newcommand*{\fangsong}{\CJKfamily{zhfs}}}{\relax}
+
+ \ifdefstring{\ELEGANT@chinesefont}{nofont}{
+ \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}}{\relax}
+
+ \ifdefstring{\ELEGANT@chinesefont}{ctexfont}{
+ \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
+ \else
+ \ifdefstring{\ELEGANT@chinesefont}{ctexfont}{
+ \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
+ \fi
+ \AfterEndPreamble{
+ % \renewcommand{\itshape}{\kaishu}
+ \setlength\parindent{2\ccwd}}}{\relax}
+
+\ifcsname kaishu\endcsname
+ \newcommand{\citshape}{\kaishu}
\else
- \RequirePackage{fontenc}
- \RequirePackage{newtxtext}
- \RequirePackage{newtxmath}
- \RequirePackage[UTF8, scheme=plain]{ctex}
+ \newcommand{\citshape}{\itshape}
+\fi
+\ifcsname kaishu\endcsname
+ \newcommand{\cnormal}{\kaishu}
+\else
+ \newcommand{\cnormal}{\normalfont}
\fi
-\RequirePackage[scale=0.7]{FiraMono}
-%
-
-% font setting for text and math
-% \RequirePackage[T1]{fontenc}
-% \RequirePackage{newtxtext}
-% \RequirePackage{newtxmath}
-% \RequirePackage[scale=0.85]{newtxtt}
-\RequirePackage{anyfontsize}
-\DeclareSymbolFont{cmlargesymbols}{OMX}{cmex}{m}{n}
-\DeclareMathSymbol{\intop}{\mathop}{cmlargesymbols}{"5A}
- \def\int{\intop\nolimits}
-\DeclareMathSymbol{\ointop}{\mathop}{cmlargesymbols}{"49}
- \def\oint{\ointop\nolimits}
-\DeclareMathSymbol{\sumop}{\mathop}{cmlargesymbols}{"58}
- \let\sum\sumop
-\DeclareMathSymbol{\prodop}{\mathop}{cmlargesymbols}{"59}
- \let\prod\prodop
+\ifcsname fangsong\endcsname
+ \newcommand{\cfs}{\fangsong}
+\else
+ \newcommand{\cfs}{\normalfont}
+\fi
+\RequirePackage{newtxtext}
+\RequirePackage{anyfontsize}
+\ifdefstring{\ELEGANT@math}{newtx}{
+ \RequirePackage{newtxmath}
+ \let\Bbbk\relax
+ \RequirePackage{esint}
+ %%% use yhmath pkg, uncomment following code
+ % \let\oldwidering\widering
+ % \let\widering\undefined
+ % \RequirePackage{yhmath}
+ % \let\widering\oldwidering
+
+ %%% use esvect pkg, uncomment following code
+ % \RequirePackage{esvect}
+
+ \DeclareSymbolFont{CMlargesymbols}{OMX}{cmex}{m}{n}
+ \let\sumop\relax\let\prodop\relax
+ \DeclareMathSymbol{\sumop}{\mathop}{CMlargesymbols}{"50}
+ \DeclareMathSymbol{\prodop}{\mathop}{CMlargesymbols}{"51}
+}{\relax}
% ----- Handle Colors -----
%% ç« è以å页èåŸåœ¢
\RequirePackage{xcolor}
\ifdefstring{\ELEGANT@color}{green}{
- \definecolor{main}{RGB}{0,120,2}%
- \definecolor{second}{RGB}{230,90,7}%
- \definecolor{third}{RGB}{0,160,152}%
+ \definecolor{structurecolor}{RGB}{0,120,2}%
+ \definecolor{main}{RGB}{0,120,2}%
+ \definecolor{second}{RGB}{230,90,7}%
+ \definecolor{third}{RGB}{0,160,152}%
}{\relax}
-
\ifdefstring{\ELEGANT@color}{cyan}{
- \definecolor{main}{RGB}{0,175,152}%
- \definecolor{second}{RGB}{239,126,30}%
- \definecolor{third}{RGB}{120,8,13}%
+ \definecolor{structurecolor}{RGB}{31,186,190}%
+ \definecolor{main}{RGB}{59,180,5}%
+ \definecolor{second}{RGB}{175,153,8}%
+ \definecolor{third}{RGB}{244,105,102}%
}{\relax}
\ifdefstring{\ELEGANT@color}{blue}{
- \definecolor{main}{RGB}{20,50,104}%
- \definecolor{second}{RGB}{180,50,131}%
- \definecolor{third}{RGB}{7,127,128}%
-}{\relax}
-\ifdefstring{\ELEGANT@color}{plain}{
- \definecolor{main}{RGB}{50,50,50}%
- \definecolor{second}{RGB}{50,50,50}%
- \definecolor{third}{RGB}{50,50,50}%
+ \definecolor{structurecolor}{RGB}{60,113,183}
+ \definecolor{main}{RGB}{0,166,82}%
+ \definecolor{second}{RGB}{255,134,24}%
+ \definecolor{third}{RGB}{0,174,247}%
+}{\relax}
+\ifdefstring{\ELEGANT@color}{gray}{
+ \definecolor{structurecolor}{RGB}{150,150,150}
+ \definecolor{main}{RGB}{150,150,150}%
+ \definecolor{second}{RGB}{150,150,150}%
+ \definecolor{third}{RGB}{150,150,150}%
+}{\relax}
+\ifdefstring{\ELEGANT@color}{black}{
+ \definecolor{structurecolor}{RGB}{0,0,0}
+ \definecolor{main}{RGB}{0,0,0}%
+ \definecolor{second}{RGB}{0,0,0}%
+ \definecolor{third}{RGB}{0,0,0}%
}{\relax}
%green color
-\definecolor{main1}{RGB}{0,120,2}
-\definecolor{second1}{RGB}{230,90,7}
-\definecolor{third1}{RGB}{0,160,152}
+\definecolor{structure1}{RGB}{0,120,2}%
+\definecolor{main1}{RGB}{0,120,2}%
+\definecolor{second1}{RGB}{230,90,7}%
+\definecolor{third1}{RGB}{0,160,152}%
%cyan color
-\definecolor{main2}{RGB}{0,175,152}
-\definecolor{second2}{RGB}{239,126,30}
-\definecolor{third2}{RGB}{120,8,13}
+\definecolor{structure2}{RGB}{31,186,190}%
+\definecolor{main2}{RGB}{59,180,5}%
+\definecolor{second2}{RGB}{175,153,8}%
+\definecolor{third2}{RGB}{244,105,102}%
%blue color
-\definecolor{main3}{RGB}{20,50,104}
-\definecolor{second3}{RGB}{180,50,131}
-\definecolor{third3}{RGB}{7,127,128}
-
+\definecolor{structure3}{RGB}{60,113,183}
+\definecolor{main3}{RGB}{0,166,82}%
+\definecolor{second3}{RGB}{255,134,24}%
+\definecolor{third3}{RGB}{0,174,247}%
+% gray color
+\definecolor{structure4}{RGB}{150,150,150}
+\definecolor{main4}{RGB}{150,150,150}%
+\definecolor{second4}{RGB}{150,150,150}%
+\definecolor{third4}{RGB}{150,150,150}%
+% black color
+\definecolor{structure5}{RGB}{0,0,0}
+\definecolor{main5}{RGB}{0,0,0}%
+\definecolor{second5}{RGB}{0,0,0}%
+\definecolor{third5}{RGB}{0,0,0}%
% corlor definition
\definecolor{winered}{rgb}{0.5,0,0}
\definecolor{bule}{RGB}{18,29,57}
-
-\newcommand{\base}[2]{%
- \nointerlineskip \vspace{0.1\baselineskip}\hspace{\fill}
- {\color{#1}
- \resizebox{0.3\linewidth}{1.5ex}
- {{%
- {\begin{tikzpicture}
- \node (C) at (0,0) {};
- \node (D) at (4,0) {};
- \path (C) to [ornament=#2] (D);
- \end{tikzpicture}}}}}%
- \hspace{\fill}
- \par\nointerlineskip \vspace{0.1\baselineskip}
-}
-
% ----- Title Style -----
\ifdefstring{\ELEGANT@titlestyle}{hang}{\def\style{hang}}{\relax}
\ifdefstring{\ELEGANT@titlestyle}{display}{\def\style{display}}{\relax}
+% reference:
+% https://tex.stackexchange.com/questions/58506/how-to-make-a-new-command-sim…
+% https://pastebin.com/C8W4axzV
+\newcommand\email[1]{\href{mailto:#1}{\nolinkurl{#1}}}
+
+\global\let\@title\@empty
+\global\let\@author\@empty
+\global\let\@date\@empty
+\newcommand{\subtitle}[1]{\gdef\@subtitle{#1}}
+\newcommand{\institute}[1]{\gdef\@institute{#1}}
+\newcommand{\version}[1]{\gdef\@version{#1}}
+\newcommand{\extrainfo}[1]{\gdef\@extrainfo{#1}}
+
+\RequirePackage{mwe}
+\newcommand{\logo}[1]{\gdef\@logo{#1}}
+\newcommand{\cover}[1]{\gdef\@cover{#1}}
-\newtoks\email
-\newtoks\version
-\newtoks\institute
-\newtoks\subtitle
+\newcommand{\question}[1]{{\par\citshape #1}\\[0.2ex]}
+\ifdefstring{\ELEGANT@lang}{cn}{\relax}{
+ \RequirePackage[\ELEGANT@cite,sort&compress]{natbib}}
\RequirePackage{enumerate}
% list/itemize/enumerate setting
-\RequirePackage[shortlabels]{enumitem}
+\RequirePackage[shortlabels,inline]{enumitem}
\setlist{nolistsep}
-% caption settings
-\RequirePackage{caption}
-\captionsetup{labelfont = bf}
-\RequirePackage[font=small,labelfont={bf,color=main}]{caption}
+\RequirePackage[font=small,labelfont={bf,color=structurecolor}]{caption}
\captionsetup[table]{skip=3pt}
\captionsetup[figure]{skip=3pt}
+\AtBeginDocument{
+ \setlength{\abovedisplayskip}{3pt}
+ \setlength{\belowdisplayskip}{3pt}
+ \RequirePackage[flushmargin,stable]{footmisc}
+ \setlength{\footnotesep}{12pt}
+}
+
+\ifdefstring{\ELEGANT@toc}{twocol}{
+\renewcommand{\tableofcontents}{%
+\setlength{\columnsep}{2em}
+%\setlength{\columnseprule}{.8pt}
+\begin{multicols}{2}[\chapter*{\contentsname}]%
+ \@starttoc{toc}%
+\end{multicols}}
+}{\relax}
+
+
%% åžžçšå®å
\linespread{1.3}
-\RequirePackage{microtype}
+
\RequirePackage{graphicx}
%\RequirePackage{enumerate}
-\RequirePackage{amsmath,mathrsfs,amsfonts}
+\RequirePackage{amsmath,mathrsfs,amsfonts,amssymb}
+% \providecommand\qed{}
+% \renewcommand{\qed}{\hfill\ensuremath{\square}}
\RequirePackage{booktabs}
-\RequirePackage{multicol}
+\RequirePackage{multicol,multirow}
\RequirePackage{xcolor}
\RequirePackage{fancyvrb}
-\RequirePackage{makecell,lipsum,texnames,setspace}
-
-
+\RequirePackage{makecell,lipsum,hologo}
%%äžæç»æåå
+\ifdefstring{\ELEGANT@lang}{cn}{
+ \renewcommand{\contentsname}{ç®åœ}
+ \renewcommand{\figurename}{åŸ}
+ \renewcommand{\tablename}{è¡š}
+ \renewcommand{\partname}{\color{structurecolor}}
+ \renewcommand{\thepart}{第\zhnumber{\arabic{part}}éšå}
+ \renewcommand{\listfigurename}{æåŸç®åœ}
+ \renewcommand{\listtablename}{è¡šæ Œç®åœ}
+ \renewcommand{\bibname}{åèæç®}
+ \renewcommand{\appendixname}{éåœ~\thechapter}
+ \renewcommand{\indexname}{玢\hspace{2em}åŒ}
+ \newcommand\figref[1]{\textbf{åŸ}~\ref{#1}}
+ \newcommand\tabref[1]{\textbf{è¡š}~\ref{#1}}
+ \ifdefstring{\ELEGANT@scheme}{chinese}{
+ \renewcommand{\chaptername}{第~\zhnumber{\arabic{chapter}}~ç« }}{
+ \renewcommand{\chaptername}{第~\thechapter{}~ç« }}
+ \newcommand{\authorname}{\citshape äœè
ïŒ}
+ \newcommand{\institutename}{\citshape ç»ç»ïŒ}
+ \newcommand{\datename}{\citshape æ¶éŽïŒ}
+ \newcommand{\versionname}{\citshape çæ¬ïŒ}
+ \RequirePackage{gbt7714}
+ \ifdefstring{\ELEGANT@cite}{authoryear}{
+ \bibliographystyle{gbt7714-author-year}}{
+ \bibliographystyle{gbt7714-numerical}}
+ \ifdefstring{\ELEGANT@cite}{numbers}{
+ \citestyle{numbers}}{\relax}
+ \newcommand{\notename}{ç¬è®°}
+ \renewcommand*{\proofname}{è¯æ}
+ \newcommand{\problemname}{äŸé¢}
+ \newcommand{\definitionname}{å®ä¹}
+ \newcommand{\theoremname}{å®ç}
+ \newcommand{\axiomname}{å
}
+ \newcommand{\postulatename}{å
¬è®Ÿ}
+ \newcommand{\lemmaname}{åŒç}
+ \newcommand{\propositionname}{åœé¢}
+ \newcommand{\corollaryname}{æšè®º}
+ \newcommand{\examplename}{äŸ}
+ \newcommand{\exercisename}{ç»ä¹ }
+ \newcommand{\remarkname}{泚}
+ \newcommand{\assumptionname}{å讟}
+ \newcommand{\conclusionname}{ç»è®º}
+ \newcommand{\solutionname}{解}
+ \newcommand{\propertyname}{æ§èŽš}
+ \newcommand{\introductionname}{å
容æèŠ}
+ \newcommand{\problemsetname}{ä¹ é¢}
+ \newcommand\bioinfo[2]{\gdef\@bioinfo{{\citshape #1}ïŒ#2}}
+ \newcommand{\updatename}{æŽæ°ïŒ}
+ \newcommand{\historyname}{çæ¬æŽæ°åå²}}{\relax}
\ifdefstring{\ELEGANT@lang}{en}{
-\newcommand\figref[1]{\textbf{Figure}~\ref{#1}}
-\newcommand\tabref[1]{\textbf{Table}~\ref{#1}}
-\renewcommand{\chaptername}{Chapter \thechapter}
+ \setlength\parindent{2em}
+ \newcommand\figref[1]{\textbf{Figure}~\ref{#1}}
+ \newcommand\tabref[1]{\textbf{Table}~\ref{#1}}
+ \renewcommand{\chaptername}{Chapter \thechapter}
+ \newcommand{\authorname}{\textbf{Author: }}
+ \newcommand{\institutename}{\textbf{Institute: }}
+ \newcommand{\datename}{\textbf{Date: }}
+ \newcommand{\versionname}{\textbf{Version: }}
+ \bibliographystyle{\ELEGANT@bibstyle}
+ \newcommand{\notename}{Note}
+ \newcommand{\proofname}{Proof}
+ \newcommand{\problemname}{Problem}
+ \newcommand{\definitionname}{Definition}
+ \newcommand{\theoremname}{Theorem}
+ \newcommand{\axiomname}{Axiom}
+ \newcommand{\postulatename}{Postulate}
+ \newcommand{\lemmaname}{Lemma}
+ \newcommand{\propositionname}{Proposition}
+ \newcommand{\corollaryname}{Corollary}
+ \newcommand{\examplename}{Example}
+ \newcommand{\exercisename}{Exercise}
+ \newcommand{\remarkname}{Remark}
+ \newcommand{\assumptionname}{Assumption}
+ \newcommand{\conclusionname}{Conclusion}
+ \newcommand{\solutionname}{Solution}
+ \newcommand{\propertyname}{Property}
+ \newcommand{\introductionname}{Introduction}
+ \newcommand{\problemsetname}{Exercise}
+ \newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}}
+ \newcommand{\updatename}{Updates:}
+ \newcommand{\historyname}{Version History}
}{\relax}
-\ifdefstring{\ELEGANT@lang}{cn}{
-\renewcommand{\contentsname}{ç®åœ}
-\renewcommand{\figurename}{åŸ}
-\renewcommand{\tablename}{è¡š}
-\renewcommand{\partname}{第 \thepart\; éšå}
-\renewcommand{\listfigurename}{æåŸç®åœ}
-\renewcommand{\listtablename}{è¡šæ Œç®åœ}
-\renewcommand{\bibname}{åèæç®}
-\renewcommand{\appendixname}{éåœ}
-\renewcommand{\indexname}{玢åŒ}
-\newcommand\figref[1]{\textbf{åŸ}~\ref{#1}}
-\newcommand\tabref[1]{\textbf{è¡š}~\ref{#1}}
-\renewcommand{\chaptername}{第 \thechapter\;ç« }
+
+\ifdefstring{\ELEGANT@lang}{it}{
+ \RequirePackage[italian]{babel}
+ \setlength\parindent{2em}
+ \newcommand\figref[1]{\textbf{Figura}~\ref{#1}}
+ \newcommand\tabref[1]{\textbf{Tabella}~\ref{#1}}
+ \renewcommand{\chaptername}{Capitolo \thechapter}
+ \newcommand{\authorname}{\textbf{Autore: }}
+ \newcommand{\institutename}{\textbf{Istituto: }}
+ \newcommand{\datename}{\textbf{Data: }}
+ \newcommand{\versionname}{\textbf{Versione: }}
+ \bibliographystyle{\ELEGANT@bibstyle}
+ \newcommand{\notename}{Nota}
+ \newcommand{\proofname}{Dimostrazione}
+ \newcommand{\problemname}{Problema}
+ \newcommand{\definitionname}{Definizione}
+ \newcommand{\theoremname}{Teorema}
+ \newcommand{\axiomname}{Assioma}
+ \newcommand{\postulatename}{Postulato}
+ \newcommand{\lemmaname}{Lemma}
+ \newcommand{\propositionname}{Proposizione}
+ \newcommand{\corollaryname}{Corollario}
+ \newcommand{\examplename}{Esempio}
+ \newcommand{\exercisename}{Esercizio}
+ \newcommand{\remarkname}{Commento}
+ \newcommand{\assumptionname}{Assunto}
+ \newcommand{\conclusionname}{Conclusione}
+ \newcommand{\solutionname}{Soluzione}
+ \newcommand{\propertyname}{Proprietà }
+ \newcommand{\introductionname}{Introduzione}
+ \newcommand{\problemsetname}{Esercizio}
+ \newcommand\bioinfo[2]{\gdef\@bioinfo{\textbf{#1}: #2}}
+ \newcommand{\updatename}{Aggiornamenti:}
+ \newcommand{\historyname}{Cronologia delle versioni}
}{\relax}
+\setlength{\bibsep}{0.0pt}
+\def\bibfont{\footnotesize}
+\RequirePackage{xpatch}
+\xpatchcmd{\part}{
+ \thispagestyle{plain}}{
+ \thispagestyle{plain}}{}{}
+\xpatchcmd{\@endpart}{
+ \vfil\newpage}{
+ \vfil\newpage}{}{}
\graphicspath{{./figure/}{./figures/}{./image/}{./images/}{./graphics/}{./graphic/}{./pictures/}{./picture/}}
-\RequirePackage{tikz}
+\usepackage{tikz} %% load tikz without tikz
\usetikzlibrary{backgrounds,calc,shadows}
-\usepackage[object=vectorian]{pgfornament} %%
-
-\newcommand*{\eitemi}{\tikz \draw [baseline, ball color=main, draw=main] circle (2pt);}
-\newcommand*{\eitemii}{\tikz \draw [baseline, fill=main,draw=main,circular drop shadow] circle (2pt);}
-\newcommand*{\eitemiii}{\tikz \draw [baseline, fill=main,draw=main] circle (2pt);}
-\setlist[enumerate,1]{label=\color{main}\arabic*.}
-\setlist[enumerate,2]{label=\color{main}(\alph*).}
-\setlist[enumerate,3]{label=\color{main}\Roman*.}
-\setlist[enumerate,4]{label=\color{main}\Alph*.}
+\newcommand*\circled[1]{\tikz[baseline=(char.base)]{
+ \node[shape=circle,draw,inner sep=1pt] (char) {#1};}}
+% https://tex.stackexchange.com/questions/7032/good-way-to-make-textcircled-n…
+
+\newcommand*{\eitemi}{\tikz \draw [baseline, ball color=structurecolor,draw=none] circle (2pt);}
+\newcommand*{\eitemii}{\tikz \draw [baseline, fill=structurecolor,draw=none,circular drop shadow] circle (2pt);}
+\newcommand*{\eitemiii}{\tikz \draw [baseline, fill=structurecolor,draw=none] circle (2pt);}
+\setlist[enumerate,1]{label=\color{structurecolor}\arabic*.}
+\setlist[enumerate,2]{label=\color{structurecolor}(\alph*).}
+\setlist[enumerate,3]{label=\color{structurecolor}\Roman*.}
+\setlist[enumerate,4]{label=\color{structurecolor}\Alph*.}
\setlist[itemize,1]{label={\eitemi}}
\setlist[itemize,2]{label={\eitemii}}
\setlist[itemize,3]{label={\eitemiii}}
-\RequirePackage{natbib}
-\setlength{\bibsep}{0.0pt}
-\def\bibfont{\footnotesize}
-
-
-%% 页é¢è®Ÿçœ®
-\RequirePackage{geometry}
-\geometry{
- a4paper,
-% left=27mm, %% or inner=23mm
-% right=27mm, %% or outer=18mm
- top=25.4mm, bottom=25.4mm,
- headheight=2.17cm,
- headsep=4mm,
- footskip=12mm
-}
-
-\RequirePackage{hyperref}
-\hypersetup{
- breaklinks,
- unicode,
- linktoc=all,
- bookmarksnumbered=true,
- bookmarksopen=true,
- pdfkeywords={ElegantBook},
- colorlinks,
- linkcolor=winered,
- citecolor=winered,
- urlcolor = winered,
- plainpages=false,
- pdfstartview=FitH,
- pdfborder={0 0 0},
- linktocpage
-}
-
%% ç« è讟眮
\RequirePackage[center,pagestyles]{titlesec}
\RequirePackage{apptools}
-\RequirePackage[toc,page]{appendix}
+\RequirePackage[toc,page,title,titletoc]{appendix}
+\setcounter{secnumdepth}{5}
\titleformat{\chapter}[\style]{\bfseries}
-{\filcenter\LARGE\enspace\bfseries{\color{main}\IfAppendix{\appendixname}{\chaptername}\enspace}}{1pt}{\bfseries\color{main}\LARGE\filcenter}[\filcenter\base{main}{88}]
+{\filcenter\LARGE\enspace\bfseries{\color{structurecolor}\IfAppendix{\appendixname}{\chaptername}\enspace}}{1pt}{\bfseries\color{structurecolor}\LARGE\filcenter}[]
-\titleformat{\section}[hang]{\bfseries}
-{\hspace{-2.45em}\Large\bfseries{\color{main}\thesection}\enspace}{1pt}{\color{main}\Large\bfseries\filright}
+\titleformat{\section}[hang]{\bfseries}{
+ \Large\bfseries{\color{structurecolor}\thesection}\enspace}{1pt}{%
+ \color{structurecolor}\Large\bfseries\filright}
+\titleformat{\subsection}[hang]{\bfseries}{
+ \large\bfseries\color{structurecolor}\thesubsection\enspace}{1pt}{%
+ \color{structurecolor}\large\bfseries\filright}
+\titleformat{\subsubsection}[hang]{\bfseries}{
+ \large\bfseries\color{structurecolor}\thesubsubsection\enspace}{1pt}{%
+ \color{structurecolor}\large\bfseries\filright}
-\titleformat{\subsection}[hang]{\bfseries}
-{\hspace{-2.45em}\large\bfseries\color{main}\thesubsection\enspace}{1pt}{\color{main}\large\bfseries\filright}
-\titleformat{\subsubsection}[hang]{\bfseries}
-{\hspace{-2.45em}\large\bfseries\color{main}\thesubsection\enspace}{1pt}{\color{main}\large\bfseries\filright}
-
-
-\titlespacing{\chapter}{0pt}{0pt}{1.5\baselineskip}
+\titlespacing{\chapter}{0pt}{-20pt}{1.3\baselineskip}
%\titlespacing{\subsection}{0pt}{0.5\baselineskip}{-\baselineskip}
+%%define the note and proof environment
+\RequirePackage{pifont,manfnt,bbding}
+\RequirePackage[many]{tcolorbox}
-
-% list/itemize/enumerate setting
-\RequirePackage[shortlabels]{enumitem}
-\setlist{nolistsep}
-
-\RequirePackage[most]{tcolorbox}
-
-\tcbset{
+% \newlength{\normalparindent}
+% \setlength{\normalparindent}{\parindent}
+\ifdefstring{\ELEGANT@mode}{fancy}{
+ \tcbset{
common/.style={
- fontupper=\itshape,
- lower separated=false,
- coltitle=white,
- colback=gray!10,
- fonttitle=\bfseries,
- enhanced,
- breakable,
- top=8pt,
- before skip=8pt,
- attach boxed title to top left={yshift=-0.11in,xshift=0.15in},
- boxed title style={boxrule=0pt,colframe=white,arc=0pt,outer arc=0pt},
- % separator sign={:},
- },
+ fontupper=\citshape,
+ lower separated=false,
+ % before upper={\setlength{\parindent}{\normalparindent}},
+ coltitle=white,
+ colback=gray!5,
+ boxrule=0.5pt,
+ fonttitle=\bfseries,
+ enhanced,
+ breakable,
+ top=8pt,
+ before skip=8pt,
+ attach boxed title to top left={
+ yshift=-0.11in,
+ xshift=0.15in},
+ boxed title style={
+ boxrule=0pt,
+ colframe=white,
+ arc=0pt,
+ outer arc=0pt},
+ separator sign={.},},
defstyle/.style={
- common,
- colframe=main,
- colbacktitle=main,
- overlay unbroken and last={\node[anchor=south east, outer sep=6pt] at (\textwidth-width,0) {\textcolor{main}{$\clubsuit$}}; }
- },
+ common,
+ colframe=main,
+ colback=main!5,
+ colbacktitle=main,
+ overlay unbroken and last={
+ \node[anchor=south east, outer sep=0pt] at (\linewidth-width,0) {
+ \textcolor{main}{$\clubsuit$}};}},
thmstyle/.style={
- common,
- colframe=second,
- colbacktitle=second,
- overlay unbroken and last={\node[anchor=south east, outer sep=6pt] at (\textwidth-width,0) {\textcolor{second}{$\heartsuit$}}; }
- },
+ common,
+ colframe=second,
+ colback=second!5,
+ colbacktitle=second,
+ overlay unbroken and last={
+ \node[anchor=south east, outer sep=0pt] at (\linewidth-width,0) {
+ \textcolor{second}{$\heartsuit$}};}},
propstyle/.style={
- common,
- colframe=third,
- colbacktitle=third,
- overlay unbroken and last={\node[anchor=south east, outer sep=6pt] at (\textwidth-width,0) {\textcolor{third}{$\spadesuit$}}; }
- },
-}
+ common,
+ colframe=third,
+ colback=third!5,
+ colbacktitle=third,
+ overlay unbroken and last={
+ \node[anchor=south east, outer sep=0pt] at (\linewidth-width,0) {
+ \textcolor{third}{$\spadesuit$}};}},}
+
+ \newtcbtheorem[auto counter,number within=chapter]{definition}{\definitionname}{defstyle}{def}
+ \newtcbtheorem[auto counter,number within=chapter]{theorem}{\theoremname}{thmstyle}{thm}
+ \newtcbtheorem[auto counter,number within=chapter]{postulate}{\postulatename}{thmstyle}{pos}
+ \newtcbtheorem[auto counter,number within=chapter]{axiom}{\axiomname}{thmstyle}{axi}
+ \newtcbtheorem[auto counter,number within=chapter]{proposition}{\propositionname}{propstyle}{pro}
+ \newtcbtheorem[auto counter,number within=chapter]{corollary}{\corollaryname}{thmstyle}{cor}
+ \newtcbtheorem[auto counter,number within=chapter]{lemma}{\lemmaname}{thmstyle}{lem}
+}{\relax}
-\newtcbtheorem[auto counter,number within=chapter]{definition}{
- \ifdefstring{\ELEGANT@lang}{en}{Definition}{å®ä¹}
-}{defstyle}{def}
-
-\newtcbtheorem[auto counter,number within=chapter]{theorem}{
- \ifdefstring{\ELEGANT@lang}{en}{Theorem}{å®ç}
-}{thmstyle}{thm}
-
-\newtcbtheorem[auto counter,number within=chapter]{proposition}{
- \ifdefstring{\ELEGANT@lang}{en}{Proposition}{åœé¢}
-}{propstyle}{pro}
-
-\newtcbtheorem[auto counter,number within=chapter]{corollary}{
- \ifdefstring{\ELEGANT@lang}{en}{Corollary}{æšè®º}
-}{thmstyle}{cor}
-
-\newtcbtheorem[auto counter,number within=chapter]{lemma}{
- \ifdefstring{\ELEGANT@lang}{en}{Lemma}{åŒç}
-}{thmstyle}{lem}
+\ifdefstring{\ELEGANT@mode}{simple}{
+ \let\openbox\relax
+ \RequirePackage{amsthm}
+ \let\proof\relax
+ % \let\proofname\relax
+ \let\endproof\relax
+
+ % declare a new theorem style
+ \newtheoremstyle{edefstyle}{3pt}{3pt}{\citshape}{-3pt}{
+ \bfseries\color{main}}{}{0.5em}{\thmname{#1} \thmnumber{#2} \thmnote{(#3)}}
+ \newtheoremstyle{ethmstyle}{3pt}{3pt}{\citshape}{-3pt}{
+ \bfseries\color{second}}{}{0.5em}{\thmname{#1} \thmnumber{#2} \thmnote{(#3)}}
+ \newtheoremstyle{eprostyle}{3pt}{3pt}{\citshape}{-3pt}{
+ \bfseries\color{third}}{}{0.5em}{\thmname{#1} \thmnumber{#2} \thmnote{(#3)}}
+
+
+ \theoremstyle{edefstyle} % definition style
+
+ \newtheorem{edefinition}{\definitionname}[chapter]
+ \newenvironment{definition}[2]{
+ \ifstrempty{#1}{\edefinition}{\edefinition[#1]}\ifstrempty{#2}{}{\label{def:#2}}}{
+ \endedefinition}
+
+
+ \theoremstyle{ethmstyle} %theorem style
+
+ \newtheorem{etheorem}{\theoremname}[chapter]
+ \newenvironment{theorem}[2]{
+ \ignorespaces\ifstrempty{#1}{\etheorem}{\etheorem[#1]}\ifstrempty{#2}{}{\label{thm:#2}}}{
+ \endetheorem}
+
+ \newtheorem{elemma}{\lemmaname}[chapter]
+ \newenvironment{lemma}[2]{
+ \ignorespaces\ifstrempty{#1}{\elemma}{\elemma[#1]}\ifstrempty{#2}{}{\label{lem:#2}}}{
+ \endelemma}
+
+ \newtheorem{ecorollary}{\corollaryname}[chapter]
+ \newenvironment{corollary}[2]{
+ \ignorespaces\ifstrempty{#1}{\ecorollary}{\ecorollary[#1]}\ifstrempty{#2}{}{\label{cor:#2}}}{
+ \endecorollary}
+
+ \newtheorem{epostulate}{\postulatename}[chapter]
+ \newenvironment{postulate}[2]{
+ \ifstrempty{#1}{\epostulate}{\epostulate[#1]}\ifstrempty{#2}{}{\label{pos:#2}}}{
+ \endepostulate}
+
+ \newtheorem{eaxiom}{\axiomname}[chapter]
+ \newenvironment{axiom}[2]{
+ \ifstrempty{#1}{\eaxiom}{\eaxiom[#1]}\ifstrempty{#2}{}{\label{axi:#2}}}{
+ \endaxiom}
+
+ \theoremstyle{eprostyle}
+ \newtheorem{eproposition}{\propositionname}[chapter]
+ \newenvironment{proposition}[2]{
+ \ifstrempty{#1}{\eproposition}{\eproposition[#1]}\ifstrempty{#2}{}{\label{pro:#2}}}{
+ \endeproposition}
+}{\relax}
+% mainïŒgreen-def): example exercise problem solution
+% secondïŒorange-thmïŒ: proof note remark
+% thirdïŒblue-prop): assumptions property conclusion custom
%% Example with counter
\newcounter{exam}[chapter]
\setcounter{exam}{0}
\renewcommand{\theexam}{\thechapter.\arabic{exam}}
\newenvironment{example}[1][]{
- \refstepcounter{exam}\par\medskip\noindent \textbf{\color{main}{
- \ifdefstring{\ELEGANT@lang}{en}{Example}{äŸ}
- }~\theexam #1: }\rmfamily %
- }{
- \par\medskip\ignorespacesafterend %
- }
+ \refstepcounter{exam}
+ \par\noindent\textbf{\color{main}{\examplename} \theexam #1 }\rmfamily}{
+ \par\ignorespacesafterend}
%% Exercise with counter
\newcounter{exer}[chapter]
\setcounter{exer}{0}
\renewcommand{\theexer}{\thechapter.\arabic{exer}}
\newenvironment{exercise}[1][]{
- \refstepcounter{exer}\par\medskip\noindent \textbf{\color{main}{
- \ifdefstring{\ELEGANT@lang}{en}{Exercise}{ç»ä¹ }
- }~\theexer #1: }\rmfamily %
- }{
- \par\medskip\ignorespacesafterend %
- }
+ \refstepcounter{exer}
+ \par\noindent\makebox[-3pt][r]{
+ \scriptsize\color{red!90}\HandPencilLeft\quad}
+ \textbf{\color{main}{\exercisename} \theexer #1 }\rmfamily}{
+ \par\ignorespacesafterend}
-%% Exercise with counter
+%% Problem with counter
\newcounter{prob}[chapter]
\setcounter{prob}{0}
\renewcommand{\theprob}{\thechapter.\arabic{prob}}
\newenvironment{problem}[1][]{
- \refstepcounter{prob}\par\medskip\noindent \textbf{\color{main}{
- \ifdefstring{\ELEGANT@lang}{en}{Problem}{äŸé¢}
- }~\theprob #1: }\rmfamily %
- }{
- \par\medskip\ignorespacesafterend %
- }
-
-%%define the note and proof environment
-\RequirePackage{pifont,manfnt}
+ \refstepcounter{prob}
+ \par\noindent\textbf{\color{main}{\problemname} \theprob #1 }\rmfamily}{
+ \par\ignorespacesafterend}
+
+\newenvironment{note}{
+ \par\noindent\makebox[-3pt][r]{
+ \scriptsize\color{red!90}\textdbend\quad}
+ \textbf{\color{second}\notename} \citshape}{\par}
+
+\newenvironment{proof}{
+ \par\noindent\textbf{\color{second}\proofname\;}
+ \color{black!90}\cfs}{
+ % \hfill$\Box$\quad
+ \par}
+
+\newenvironment{solution}{\par\noindent\textbf{\color{main}\solutionname} \citshape}{\par}
+\newenvironment{remark}{\noindent\textbf{\color{second}\remarkname}}{\par}
+\newenvironment{assumption}{\par\noindent\textbf{\color{third}\assumptionname} \citshape}{\par}
+\newenvironment{conclusion}{\par\noindent\textbf{\color{third}\conclusionname} \citshape}{\par}
+\newenvironment{property}{\par\noindent\textbf{\color{third}\propertyname} \citshape}{\par}
+\newenvironment{custom}[1]{\par\noindent\textbf{\color{third} #1} \citshape}{\par}
-\newenvironment{note}{\par\noindent{\makebox[0pt][r]{\scriptsize\color{red!90}\textdbend\quad}\textbf{\color{main}
- \ifdefstring{\ELEGANT@lang}{en}{Note:}{泚æïŒ}
-}}\itshape}{\par}
-
-\newenvironment{proof}{\par\noindent\textbf{\color{main}
- \ifdefstring{\ELEGANT@lang}{en}{Proof:}{è¯æïŒ}
-}\color{black!90}\small}{\hfill$\Box$\quad\par}
-\newenvironment{remark}{\noindent\textbf{\color{main}
- \ifdefstring{\ELEGANT@lang}{en}{Remark:}{泚ïŒ}
-}}{\par}
-\newenvironment{assumption}{\par\noindent\textbf{\color{main}
- \ifdefstring{\ELEGANT@lang}{en}{Assumption:}{å讟ïŒ}
-}}{\par}
-\newenvironment{conclusion}{\par\noindent\textbf{\color{main}
- \ifdefstring{\ELEGANT@lang}{en}{Conclusion:}{ç»è®ºïŒ}
-}}{\par}
-\newenvironment{solution}{\par\noindent\textbf{\color{main}
- \ifdefstring{\ELEGANT@lang}{en}{Solution:}{解ïŒ}
-}}{\par}
-\newenvironment{property}{\par\noindent\textbf{\color{main}
- \ifdefstring{\ELEGANT@lang}{en}{Property:}{æ§èŽšïŒ}
-}}{\par}
+\RequirePackage{multicol}
+\tcbset{
+ introductionsty/.style={
+ enhanced,
+ breakable,
+ colback=structurecolor!10,
+ colframe=structurecolor,
+ fonttitle=\bfseries,
+ colbacktitle=structurecolor,
+ fontupper=\citshape,
+ attach boxed title to top center={yshift=-3mm,yshifttext=-1mm},
+ boxrule=0pt,
+ toprule=0.5pt,
+ bottomrule=0.5pt,
+ top=8pt,
+ before skip=8pt,
+ sharp corners
+ },
+}
+\newenvironment{introduction}[1][\introductionname]{
+ \begin{tcolorbox}[introductionsty,title={#1}]
+ \begin{multicols}{2}
+ \begin{itemize}[label=\textcolor{structurecolor}{\upshape\scriptsize\SquareShadowBottomRight}]}{
+ \end{itemize}
+ \end{multicols}
+ \end{tcolorbox}}
+
+\RequirePackage{adforn}
+\newenvironment{problemset}[1][\chaptername~\problemsetname]{
+ \begin{center}
+ \phantomsection\addcontentsline{toc}{section}{\texorpdfstring{\chaptername\;\problemsetname}{\problemsetname}}
+ \textcolor{structurecolor}{\Large\bfseries\adftripleflourishleft~#1~\adftripleflourishright}
+ \end{center}
+ \begin{enumerate}}{
+ \end{enumerate}}
+
+\def\relsec{\endgroup start}
+\def\endrelsec{end\begingroup\def \@currenvir {relsec}}
+
+\ifdefstring{\ELEGANT@result}{noanswer}{
+ \AtBeginDocument{
+ \excludecomment{solution}
+ \excludecomment{proof}
+ \excludecomment{inline}
+ }
+}{\relax}
%页ç页è
\RequirePackage{fancyhdr}
-\RequirePackage{lastpage}
\fancyhf{}
-\fancyhead[EL,OR]{\color{main}--\thepage/\pageref*{LastPage}--}
-\fancyhead[ER]{\color{main}\em\nouppercase\leftmark{}}
-\fancyhead[OL]{\color{main}\em\nouppercase\rightmark}
-\fancyfoot[c]{\base{main}{88}}
-\renewcommand{\headrule}{\color{main}\hrule width\textwidth}
-\pagestyle{fancy}
-\fancypagestyle{plain}{\renewcommand{\headrulewidth}{0pt}\fancyhf{}\renewcommand{\headrule}{}}
-\renewcommand{\sectionmark}[1]{\markright{\thesection\; #1}{} }
-\renewcommand{\chaptermark}[1]{\markboth{\chaptername \; #1\;}{}}
-%%å°é¢
-\newcommand*{\equote}[1]{\def\@equote{#1}}
+\fancyfoot[c]{\color{structurecolor}\scriptsize\thepage}
+\if@twoside
+ \fancyhead[ER]{\color{structurecolor}\cnormal\leftmark}
+ \fancyhead[OL]{\color{structurecolor}\cnormal\rightmark}
+\else
+ \fancyhead[R]{\color{structurecolor}\cnormal\rightmark}
+\fi
-\newcommand*{\logo}[1]{
- \def\(a)logo{\includegraphics[width=0.3\textwidth]{#1}
- }
-}
-\newcommand*{\cover}[1]{
- \def\(a)logo{\includegraphics[width=\linewidth]{cover.jpg}
- }
-}
+\renewcommand{\headrule}{\color{structurecolor}\hrule width\textwidth}
+\pagestyle{fancy}
+\renewcommand{\headrulewidth}{1pt}
+% \renewcommand{\headrule}{}
+\fancypagestyle{plain}{\renewcommand{\headrulewidth}{0pt}\fancyhf{}\renewcommand{\headrule}{}}
+\renewcommand{\sectionmark}[1]{\markright{\thesection\, #1}{} }
+\renewcommand{\chaptermark}[1]{\markboth{\chaptername \, #1\,}{}}
+
+\renewcommand{\baselinestretch}{1.35}
\renewcommand*{\maketitle}{%
\hypersetup{pageanchor=false}
+\pagenumbering{Alph}
\begin{titlepage}
- \newpage
- \newgeometry{margin = 0in}
- \parindent=0pt
- \renewcommand\baselinestretch{2.5}
- \includegraphics[width=\linewidth]{cover.jpg}
- \setlength{\fboxsep}{0pt}
- \colorbox{second}{\makebox[\linewidth][c]{\shortstack[c]{\vspace{0.5in}}}}
- \vfill
- \hfill
- \hspace{2em}
- \begin{minipage}[c]{0.68\linewidth}
- {\bfseries\Huge \@title\\}
- {\color{darkgray}\bfseries\Large \the\subtitle\\[2ex]}
- \color{gray}\kaishu\normalsize
- {\renewcommand{\arraystretch}{0.618}
- \begin{tabular}{l}
- \ifdefstring{\ELEGANT@lang}{en}{\textbf{Author: }}{\textbf{äœè
ïŒ}}\@author \\
- \ifdefstring{\ELEGANT@lang}{en}{\textbf{Institute: }}{\textbf{ç»ç»ïŒ}}\the\institute\\
- \ifdefstring{\ELEGANT@lang}{en}{\textbf{Update: }}{\textbf{æŽæ°ïŒ}}\@date\\
- \ifdefstring{\ELEGANT@lang}{en}{\textbf{Version: }}{\textbf{çæ¬ïŒ}}\the\version \\
- \end{tabular}}
- \end{minipage}
- \begin{minipage}[c]{0.27\linewidth}
- \begin{tikzpicture}[remember picture,overlay]
- \begin{pgfonlayer}{background}
- \node[opacity=0.8,anchor=south east,outer sep=0pt,inner sep=0pt] at ($(current page.south east) +(-0.8in,1.5in)$) {\includegraphics[width=0.7\textwidth]{logo.png}};
- \end{pgfonlayer}
- \end{tikzpicture}
- \end{minipage}
- \vfill
- \centerline{\itshape \@equote}
- \vfill
- \restoregeometry
+ \newgeometry{margin = 0in}
+ \parindent=0pt
+ \ifdefstring{\ELEGANT@device}{normal}{
+ \ifcsname @cover\endcsname
+ \includegraphics[width=\linewidth]{\@cover}
+ \else
+ \includegraphics[width=\linewidth]{example-image}
+ \fi
+ }{\relax}
+ \ifdefstring{\ELEGANT@device}{pad}{
+ \ifcsname @cover\endcsname
+ \includegraphics[trim=0 26bp 0 26bp,clip=true, width=\linewidth]{\@cover}
+ \else
+ \includegraphics[trim=0 26bp 0 26bp,clip=true, width=\linewidth]{example-image}
+ \fi
+ }{\relax}
+ \setlength{\fboxsep}{0pt}
+ \colorbox{second}{\makebox[\linewidth][c]{\shortstack[c]{\vspace{0.5in}}}}
+ \vfill
+ \vskip-2ex
+ \hspace{2em}
+ \parbox{0.8\textwidth}{
+ \bfseries\Huge
+ \ifcsname @title\endcsname \@title \fi
+ \par}
+ \vfill
+ \vspace{-1.0cm}
+ \setstretch{2.5}
+ \hspace{2.5em}
+ \begin{minipage}[c]{0.67\linewidth}
+ {\color{darkgray}\bfseries\Large
+ \ifcsname @subtitle\endcsname\@subtitle\\[2ex]\fi}
+ \color{gray}\normalsize
+ {\renewcommand{\arraystretch}{0.618}
+ \begin{tabular}{l}
+ % \ifcsname @author\endcsname \authorname \@author\\\fi
+ \ifx\@author\empty\else\authorname\cnormal\@author\\ \fi
+ \ifcsname @institute\endcsname \institutename \cnormal\@institute\\ \fi
+ % \ifcsname @date\endcsname \@date\\\fi
+ \ifx\@date\empty\else\datename\cnormal\@date \\ \fi
+ \ifcsname @version\endcsname \cnormal\versionname\@version\\ \fi
+ \ifcsname @bioinfo\endcsname \cnormal\@bioinfo\\ \fi
+ \end{tabular}}
+ \end{minipage}
+ \begin{minipage}[c]{0.27\linewidth}
+ \begin{tikzpicture}[remember picture,overlay]
+ \begin{pgfonlayer}{background}
+ \node[opacity=0.8,
+ anchor=south east,
+ outer sep=0pt,
+ inner sep=0pt] at ($(current page.south east) +(-0.8in,1.5in)$) {
+ \ifcsname @logo\endcsname\includegraphics[width=4.2cm]{\@logo}\fi};
+ \end{pgfonlayer}
+ \end{tikzpicture}
+ \end{minipage}
+ \vfill
+ \begin{center}
+ \setstretch{1.3}
+ \parbox[t]{0.7\textwidth}{\centering \citshape
+ \ifcsname @extrainfo\endcsname\@extrainfo\fi}
+ \end{center}
+ \vfill
\end{titlepage}
-\thispagestyle{empty}
+\restoregeometry
+\thispagestyle{empty}}
+
+
+
+\RequirePackage{listings}
+\renewcommand{\ttdefault}{cmtt}
+\lstdefinestyle{mystyle}{
+ basicstyle=%
+ \ttfamily
+ \lst@ifdisplaystyle\small\fi
}
-\RequirePackage{listings}
+\lstset{basicstyle=\ttfamily,style=mystyle,breaklines=true}
+
\definecolor{lightgrey}{rgb}{0.9,0.9,0.9}
\definecolor{frenchplum}{RGB}{190,20,83}
\lstset{language=[LaTeX]TeX,
- texcsstyle=*\bf\color{winered}\ttfamily,
- basicstyle=\ttfamily,
- numbers=none,
- breaklines=true,
- keywordstyle=\bf\color{winered}\ttfamily,
- commentstyle=\color{gray},
- emph={elegantpaper,fontenc,fontspec,xeCJK,FiraMono,xunicode,newtxmath,figure,fig,image,img,table,itemize,enumerate,newtxtext,newtxtt,ctex,microtype,description,times,newtx,booktabs,tabular,PDFLaTeX,XeLaTeX,type1cm,BibTeX,device,color,mode,lang,amsthm,tcolorbox,titlestyle},
- emphstyle={\color{frenchplum}},
- morekeywords={DeclareSymbolFont,SetSymbolFont,toprule,midrule,bottomrule,institute,version,includegraphics,setmainfont,setsansfont,setmonofont ,setCJKmainfont,setCJKsansfont,setCJKmonofont,RequirePackage,figref,tabref,email,maketitle,keywords,definecolor,equote,logo,cover,subtitle,appendix,chapter,hypersetup,mainmatter,tableofcontents},
- frame=none,
- tabsize=2,
- rulecolor=\color{main},
+ texcsstyle=*\color{winered},
+ numbers=none,
+ mathescape,
+ breaklines=true,
+ keywordstyle=\color{winered},
+ commentstyle=\color{gray},
+ emph={elegantpaper,fontenc,fontspec,xeCJK,FiraMono,xunicode,newtxmath,figure,fig,image,img,table,itemize,enumerate,newtxtext,newtxtt,ctex,microtype,description,times,booktabs,tabular,PDFLaTeX,XeLaTeX,type1cm,BibTeX,device,color,mode,lang,amsthm,tcolorbox,titlestyle,cite,ctex,listings,base,math,scheme,toc,esint,chinesefont,amsmath,bibstyle,natbib,pgfornament},
+ emphstyle={\color{frenchplum}},
+ morekeywords={DeclareSymbolFont,SetSymbolFont,toprule,midrule,bottomrule,institute,version,includegraphics,setmainfont,setsansfont,setmonofont ,setCJKmainfont,setCJKsansfont,setCJKmonofont,RequirePackage,figref,tabref,email,maketitle,keywords,definecolor,extrainfo,logo,cover,subtitle,appendix,chapter,hypersetup,mainmatter,frontmatter,tableofcontents,elegantpar,heiti,kaishu,lstset,pagecolor,zhnumber,marginpar,part,equote,marginnote,bioinfo,datechange,listofchange,lvert,lastpage,songti,heiti,fangsong,setCJKfamilyfont,textbf},
+ frame=single,
+ tabsize=2,
+ rulecolor=\color{structurecolor},
+ framerule=0.2pt,
+ columns=flexible,
+ % backgroundcolor=\color{lightgrey}
}
-\bibliographystyle{aer}
-
+\newcommand\bmmax{0}
+\RequirePackage{bm}
+% add the list of change history
+\newcommand{\dateinfoline}[2]{
+ \noindent\makebox[0pt][r]{%
+ \makebox[-5em][r]{%
+ \textbf{\textcolor{structurecolor}{#1}}}\quad}%
+ {\citshape\updatename\ignorespaces#2}}
+
+\newcommand{\datechange}[2]{%
+ \noindent{\makebox[\textwidth][r]{\color{structurecolor}\rule{1.15\textwidth}{.4pt}}}
+ \dateinfoline{#1}{#2}
+ \addcontentsline{dates}{section}{#1 -- #2}}
+
+\newcommand{\listofchanges}{%
+ \begingroup
+ \renewcommand{\contentsname}{\historyname}
+ \let\old@starttoc\@starttoc
+ \def\@starttoc##1{
+ \old@starttoc{dates}}
+ \tableofcontents%
+ \endgroup}
+% https://tex.stackexchange.com/questions/472931/list-of-all-dates-in-a-docum…
+
+\newenvironment{change}{
+ \begin{enumerate}[label=\small\protect\circled{\arabic*}]}{
+ \end{enumerate}}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elegantbook.tlpobj new/tlpkg/tlpobj/elegantbook.tlpobj
--- old/tlpkg/tlpobj/elegantbook.tlpobj 2019-02-28 03:35:11.000000000 +0100
+++ new/tlpkg/tlpobj/elegantbook.tlpobj 2020-04-16 01:56:57.000000000 +0200
@@ -1,20 +1,19 @@
name elegantbook
category Package
-revision 50117
+revision 54758
shortdesc An Elegant LaTeX Template for Books
relocated 1
longdesc ElegantBook is designed for writing Books. This template is
longdesc based on the standard LaTeX book class. The goal of this
longdesc template is to make the writing process more elegant. Just
longdesc enjoy it!
-runfiles size=4
+runfiles size=8
RELOC/tex/latex/elegantbook/elegantbook.cls
catalogue-contact-announce https://elegantlatex.org/
catalogue-contact-home https://elegantlatex.org/
catalogue-contact-repository https://github.com/ElegantLaTeX/ElegantBook
catalogue-contact-support https://github.com/ElegantLaTeX/ElegantBook/issues
catalogue-ctan /macros/latex/contrib/elegantbook
-catalogue-date 2019-02-26 05:14:40 +0100
catalogue-license lppl1.3c
catalogue-topics class chinese book-pub
-catalogue-version 3.06
+catalogue-version 3.11
++++++ elegantnote.doc.tar.xz ++++++
++++ 4967 lines of diff (skipped)
++++++ elegantnote.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/elegantnote/elegantnote.cls new/tex/latex/elegantnote/elegantnote.cls
--- old/tex/latex/elegantnote/elegantnote.cls 2019-02-03 23:48:08.000000000 +0100
+++ new/tex/latex/elegantnote/elegantnote.cls 2020-04-12 23:31:25.000000000 +0200
@@ -1,163 +1,240 @@
+% Author: Dongsheng Deng
+% Homepage: https://ddswhu.me/
+% Email: elegantlatex2e(a)gmail.com
+% Lastest Version: https://github.com/ElegantLaTeX/ElegantNote
+
+% --- Class structure: identification part
+\ProvidesClass{elegantnote}[2020/04/12 ElegantNote v2.30 class]
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{elegantnote}[2018/01/06 ElegantNote v2.00 class]
-\LoadClass[12pt,final]{article}
\RequirePackage{kvoptions}
-\RequirePackage{ifthen}
-\RequirePackage{ifxetex}
\RequirePackage{etoolbox}
\RequirePackage{calc}
-\AtEndOfClass{\RequirePackage{microtype}}
-
-\SetupKeyvalOptions{family=ELEGANT, prefix=ELEGANT@, setkeys=\kvsetkeys}
+\SetupKeyvalOptions{family=ELEGANT,prefix=ELEGANT@,setkeys=\kvsetkeys}
\newcommand{\ekv}[1]{\kvsetkeys{ELEGANT}{#1}}
-% ----- Colors -----
-\DeclareStringOption[green]{color}
+\DeclareStringOption[blue]{color}
+\DeclareVoidOption{green}{\ekv{color=green}}
+\DeclareVoidOption{cyan}{\ekv{color=cyan}}
+\DeclareVoidOption{blue}{\ekv{color=blue}}
+\DeclareVoidOption{sakura}{\ekv{color=sakura}}
+\DeclareVoidOption{black}{\ekv{color=black}}
+
\DeclareStringOption[pad]{device}
+\DeclareVoidOption{pc}{\ekv{device=pc}}
+\DeclareVoidOption{pad}{\ekv{device=pad}}
+\DeclareVoidOption{kindle}{\ekv{device=kindle}}
+\DeclareVoidOption{normal}{\ekv{device=normal}}
+\DeclareVoidOption{screen}{\ekv{device=screen}}
+
\DeclareStringOption[cn]{lang}
+\DeclareVoidOption{cn}{\ekv{lang=cn}}
+\DeclareVoidOption{en}{\ekv{lang=en}}
+
\DeclareStringOption{mode}
-% ----- backward compatibility
-\DeclareVoidOption{green}{\ekv{color = green}}
-\DeclareVoidOption{cyan}{\ekv{color = cyan}}
-\DeclareVoidOption{blue}{\ekv{color = blue}}
-\DeclareVoidOption{sakura}{\ekv{color = sakura}}
-\DeclareVoidOption{black}{\ekv{color = black}}
-
-\DeclareVoidOption{pc}{\ekv{device = pc}}
-\DeclareVoidOption{pad}{\ekv{device = pad}}
-\DeclareVoidOption{kindle}{\ekv{device = kindle}}
-\DeclareVoidOption{normal}{\ekv{device = normal}}
+\DeclareVoidOption{geye}{\ekv{mode=geye}}
+\DeclareVoidOption{hazy}{\ekv{mode=hazy}}
-\DeclareVoidOption{cn}{\ekv{lang = cn}}
-\DeclareVoidOption{en}{\ekv{lang = en}}
+\DeclareStringOption[ctexfont]{chinesefont}
+\DeclareVoidOption{ctexfont}{\ekv{chinesefont=ctexfont}}
+\DeclareVoidOption{founder}{\ekv{chinesefont=founder}}
+\DeclareVoidOption{nofont}{\ekv{chinesefont=nofont}}
+
+\DeclareStringOption[numbers]{cite}
+\DeclareVoidOption{numbers}{\ekv{cite=numbers}}
+\DeclareVoidOption{authoryear}{\ekv{cite=authoryear}}
+\DeclareVoidOption{super}{\ekv{cite=super}}
+
+\DeclareStringOption[apalike]{bibstyle}
+
+\DeclareStringOption[11pt]{fontsize}
+\DeclareVoidOption{10pt}{\ekv{fontsize=10pt}}
+\DeclareVoidOption{11pt}{\ekv{fontsize=11pt}}
+\DeclareVoidOption{12pt}{\ekv{fontsize=12pt}}
+
+\DeclareStringOption[cm]{math}
+\DeclareVoidOption{newtx}{\ekv{math=newtx}}
+\DeclareVoidOption{mtpro2}{\ekv{math=mtpro2}}
+\DeclareVoidOption{cm}{\ekv{math=cm}}
+
+\DeclareDefaultOption{
+ \PassOptionsToClass{\CurrentOption}{article}
+ }
+\ProcessKeyvalOptions*\relax
-\DeclareVoidOption{geye}{\ekv{mode = geye}}
+\LoadClass{article}
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
-%\ExecuteOptions{12pt}
-\ProcessKeyvalOptions*\relax
-\ProcessOptions*
+\PassOptionsToPackage{no-math}{fontspec}
+\RequirePackage{amsmath,amsthm}
+\RequirePackage{iftex}
+\ifdefstring{\ELEGANT@lang}{cn}{%
+\ifXeTeX
+ \ifdefstring{\ELEGANT@chinesefont}{founder}{
+ \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}
+ \setCJKmainfont[BoldFont={FZHei-B01},ItalicFont={FZKai-Z03}]{FZShuSong-Z01}
+ \setCJKsansfont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZHei-B01}
+ \setCJKmonofont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZFangSong-Z02}
+ \setCJKfamilyfont{zhsong}{FZShuSong-Z01}
+ \setCJKfamilyfont{zhhei}{FZHei-B01}
+ \setCJKfamilyfont{zhkai}{FZKai-Z03}
+ \setCJKfamilyfont{zhfs}{FZFangSong-Z02}
+ \newcommand*{\songti}{\CJKfamily{zhsong}}
+ \newcommand*{\heiti}{\CJKfamily{zhhei}}
+ \newcommand*{\kaishu}{\CJKfamily{zhkai}}
+ \newcommand*{\fangsong}{\CJKfamily{zhfs}}}{\relax}
+
+ \ifdefstring{\ELEGANT@chinesefont}{nofont}{
+ \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}}{\relax}
+
+ \ifdefstring{\ELEGANT@chinesefont}{ctexfont}{
+ \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
+ \else
+ \ifdefstring{\ELEGANT@chinesefont}{ctexfont}{
+ \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
+ \fi
+ \AfterEndPreamble{
+ % \renewcommand{\itshape}{\kaishu}
+ \setlength\parindent{2\ccwd}}
+ }{\relax}
-% fontsetting
-\RequirePackage{ifxetex}
-\ifxetex
- \RequirePackage{fontenc}
- \RequirePackage[no-math]{fontspec}
- \setmainfont{Times New Roman}[NFSSFamily=ntxtlf]
- \setsansfont{Arial}
- %\setmonofont[Scale=0.9]{Courier New}
- \RequirePackage{xeCJK}
- \RequirePackage{xunicode}
- \setCJKmainfont[BoldFont={SimHei},ItalicFont={KaiTi}]{SimSun}
- \setCJKsansfont[BoldFont={SimHei},ItalicFont={KaiTi}]{KaiTi}
- \setCJKmonofont[BoldFont={SimHei},ItalicFont={KaiTi},Scale=0.9]{Microsoft YaHei}
- \XeTeXlinebreaklocale "zh"
- \XeTeXlinebreakskip = 0pt plus 1pt minus 0.1pt
- \RequirePackage{newtxmath}
- %\DeclareSymbolFont{operators}{OT1}{ntxtlf}{m}{n}
- %\SetSymbolFont{operators}{bold}{OT1}{ntxtlf}{b}{n}
- \setCJKfamilyfont{zhsong}{SimSun}
- \setCJKfamilyfont{zhhei}{SimHei}
- \setCJKfamilyfont{zhkai}{KaiTi}
- \setCJKfamilyfont{zhfs}{FangSong}
- \newcommand*{\songti}{\CJKfamily{zhsong}}
- \newcommand*{\heiti}{\CJKfamily{zhhei}}
- \newcommand*{\kaishu}{\CJKfamily{zhkai}}
- \newcommand*{\fangsong}{\CJKfamily{zhfs}}
+
+\ifcsname kaishu\endcsname
+ \newcommand{\citshape}{\kaishu}
+\else
+ \newcommand{\citshape}{\itshape}
+\fi
+\ifcsname kaishu\endcsname
+ \newcommand{\cnormal}{\kaishu}
+\else
+ \newcommand{\cnormal}{\normalfont}
+\fi
+\ifcsname fangsong\endcsname
+ \newcommand{\cfs}{\fangsong}
\else
- \RequirePackage{fontenc}
- \RequirePackage{newtxtext}
- \RequirePackage{newtxmath}
- \RequirePackage[UTF8, scheme=plain]{ctex}
+ \newcommand{\cfs}{\normalfont}
\fi
-\RequirePackage[scale=0.8]{FiraMono}
-% åžžçšå®å
+
+\RequirePackage{newtxtext}
+\ifdefstring{\ELEGANT@math}{newtx}{
+ \RequirePackage{newtxmath}
+ \let\Bbbk\relax
+ \RequirePackage{esint}
+ %%% use yhmath pkg, uncomment following code
+ % \let\oldwidering\widering
+ % \let\widering\undefined
+ % \RequirePackage{yhmath}
+ % \let\widering\oldwidering
+
+ %%% use esvect pkg, uncomment following code
+ % \RequirePackage{esvect}
+
+ \DeclareSymbolFont{CMlargesymbols}{OMX}{cmex}{m}{n}
+ \let\sumop\relax\let\prodop\relax
+ \DeclareMathSymbol{\sumop}{\mathop}{CMlargesymbols}{"50}
+ \DeclareMathSymbol{\prodop}{\mathop}{CMlargesymbols}{"51}
+}{\relax}
+
+
\RequirePackage{indentfirst}
\RequirePackage{anyfontsize}
-\RequirePackage{amsmath}
+
\RequirePackage{graphicx}
\RequirePackage{booktabs}
\let\openbox\relax
-\RequirePackage{amsthm}
+
\RequirePackage{xcolor}
-\RequirePackage{hyperref}
-\RequirePackage{xpatch}
\definecolor{winered}{rgb}{0.5,0,0}
+\definecolor{epubblue}{RGB}{1,126,218}
+\RequirePackage{hyperref}
+\RequirePackage{xpatch}
\hypersetup{%
- pdfborder = {0 0 0},
- colorlinks,
- citecolor=ecolor,
- filecolor=ecolor,
- linkcolor=ecolor,
- urlcolor=ecolor
+ pdfborder={0 0 0},
+ colorlinks,
+ citecolor=ecolor,
+ filecolor=ecolor,
+ linkcolor=ecolor,
+ urlcolor=ecolor
}
+
+\RequirePackage{hologo}
+
% è¡è·è®Ÿçœ®
\linespread{1.3}
\setlength{\parskip}{3mm}
\setlength{\parindent}{2em}
-% å®ä¹æ€çŒæš¡åŒ geye = true
+% å®ä¹æ€çŒæš¡åŒ geye=true
\RequirePackage{xcolor}
+\RequirePackage{silence}
% good for eye color
\ifdefstring{\ELEGANT@mode}{geye}{
\definecolor{geyecolor}{RGB}{199,237,204}%
\pagecolor{geyecolor}
}{\relax}
+\ifdefstring{\ELEGANT@mode}{hazy}{
+ \definecolor{geyecolor}{RGB}{251,250,248}%
+ \pagecolor{geyecolor}
+}{\relax}
+
% graphics path
-\graphicspath{{./figure/}{./figures/}{./image/}{./images/}{./graphics/}{./graphic/}{./pictures/}{./picture/}}
+\graphicspath{
+ {./figure/}
+ {./figures/}
+ {./image/}
+ {./images/}
+ {./graphics/}
+ {./graphic/}
+ {./pictures/}
+ {./picture/}
+}
\let\openbox\relax
-\newtheoremstyle{plain}{3pt}{3pt}{\itshape}{}{\color{ecolor}\bfseries}{}{0.5em}{\thmname{#1}\thmnumber{ #2}\thmnote{ (#3)}}
-\newtheoremstyle{definition}{3pt}{3pt}{\itshape}{}{\color{ecolor}\bfseries}{}{0.5em}{}
-\newtheoremstyle{remark}{3pt}{3pt}{\itshape}{}{\color{ecolor}\bfseries}{}{0.5em}{}
-
+\newtheoremstyle{plain}{\topsep}{\topsep}{\citshape}{}{%
+ \color{ecolor}\bfseries}{}{%
+ 0.5em}{%
+ \thmname{#1}\thmnumber{ #2}\thmnote{ (#3)}}
+
+\newtheoremstyle{definition}{\topsep}{\topsep}{\citshape}{}{%
+ \color{ecolor}\bfseries}{}{%
+ 0.5em}{}
+
+\newtheoremstyle{remark}{\topsep}{\topsep}{\cnormal}{}{
+ \color{ecolor}\bfseries}{}{
+ 0.5em}{}
% caption settings
-\RequirePackage[font=small,labelfont={bf,color=ecolor}]{caption}
+\RequirePackage{caption}
+\captionsetup{
+ labelfont={bf,color=ecolor}}
\captionsetup[table]{skip=3pt}
\captionsetup[figure]{skip=3pt}
% list/itemize/enumerate setting
-\RequirePackage[shortlabels]{enumitem}
+\RequirePackage[shortlabels,inline]{enumitem}
\setlist{nolistsep}
+\RequirePackage[flushmargin,stable]{footmisc}
+\setlength{\footnotesep}{12pt}
-% headings
-\RequirePackage{fancyhdr}
-\fancyhf{}
-\pagestyle{fancy}
-\cfoot{\footnotesize\textcolor{gray}{\thepage}}
-\renewcommand{\headrulewidth}{0pt}
-\renewcommand{\footrulewidth}{0pt}
-
-\fancypagestyle{plain}{%
- \renewcommand{\headrulewidth}{0pt}%
- \fancyhf{}%
- \fancyfoot[C]{\footnotesize \textcolor{gray}{\thepage}}%
-}
-
-% bib-settings
-\RequirePackage{natbib}
-\setlength{\bibsep}{0.0pt}
-\def\bibfont{\footnotesize}
-
-\RequirePackage{sectsty}
+\RequirePackage{titlesec}
+\titleformat*{\section}{\normalfont\Large\bfseries\color{ecolor}}
+\titleformat*{\subsection}{\normalfont\large\bfseries\color{ecolor}}
+\titleformat*{\subsubsection}{\normalfont\normalsize\bfseries\color{ecolor}}
\ifdefstring{\ELEGANT@color}{green}{
- \definecolor{ecolor}{RGB}{0,120,2}%
+ \definecolor{ecolor}{RGB}{0,120,2}%
}{\relax}
\ifdefstring{\ELEGANT@color}{cyan}{
- \definecolor{ecolor}{RGB}{0,175,152}%
+ \definecolor{ecolor}{RGB}{31,186,190}%
}{\relax}
\ifdefstring{\ELEGANT@color}{blue}{
- \definecolor{ecolor}{RGB}{20,50,104}%
+ \definecolor{ecolor}{RGB}{1,126,218}%
}{\relax}
\ifdefstring{\ELEGANT@color}{sakura}{
\definecolor{ecolor}{RGB}{255,183,197}%
@@ -170,83 +247,146 @@
\definecolor{ecyan}{RGB}{0,175,152}
\definecolor{eblue}{RGB}{20,50,104}
\definecolor{sakura}{RGB}{255,183,197}
-% \definecolor{black}{RGB}{255,183,197}
%% device settings
-%% default = pad
+%% default=pad
+
+\RequirePackage{geometry}
+\WarningsOff
+\RequirePackage[\ELEGANT@fontsize]{extsizes}
+\WarningsOn
+
+\ifdefstring{\ELEGANT@device}{pad}{%
+ \geometry{
+ paperwidth=6in,
+ paperheight=8in,
+ includefoot,
+ margin=8mm}}{%
+ \relax}
+
\ifdefstring{\ELEGANT@device}{pc}{
- \RequirePackage[margin=8mm, paperwidth=6.2in, paperheight=6in,includefoot]{geometry}
-}{\relax}
-\ifdefstring{\ELEGANT@device}{pad}{
- \RequirePackage[margin=8mm, paperwidth=6in, paperheight=8in,includefoot]{geometry}
- %197mm*148mm
-}{\relax}
-\ifdefstring{\ELEGANT@device}{kindle}{
- \RequirePackage[margin=8mm, paperwidth=3.68in, paperheight=4.92in]{geometry}
- % 160mm*115mm
-}{\relax}
-\ifdefstring{\ELEGANT@device}{normal}{
- \RequirePackage[margin=1in, a4paper]{geometry}
-}{\relax}
+ \geometry{%
+ margin=8mm,
+ paperwidth=6.2in,
+ paperheight=6in,
+ includefoot}}{%
+ \relax}
+
+\ifdefstring{\ELEGANT@device}{kindle}{%
+ \geometry{
+ margin=8mm,
+ paperwidth=3.68in,
+ paperheight=4.92in}}{%
+ \relax}
+
+\ifdefstring{\ELEGANT@device}{normal}{%
+ \geometry{
+ margin=1in,
+ a4paper}}{%
+ \relax}
+
+\ifdefstring{\ELEGANT@device}{screen}{%
+ \geometry{
+ screen,
+ paperwidth=25.4cm,
+ paperheight=19.05cm,
+ margin=1.6cm,
+ headheight=2.17cm,
+ footskip=0.6cm}}{%
+ \relax}
-\allsectionsfont{\color{ecolor}}
-%\sectionfont{\color{ecolor}}
-%\subsectionfont{\color{ecolor}}
+% headings
+\RequirePackage{fancyhdr}
+\renewcommand{\headrulewidth}{0pt}
+\renewcommand{\footrulewidth}{0pt}
+
+\fancypagestyle{fancy-note}{
+ \fancyhf{} % clear header/footer settings
+ \fancyfoot[C]{\footnotesize\textcolor{gray}{\thepage}}
+}
-\ifdefstring{\ELEGANT@lang}{cn}{
+\fancypagestyle{plain}{%
+ \fancyhf{}
+ \fancyfoot[R]{\footnotesize\textcolor{gray}{\thepage}}}
+
+\pagestyle{fancy-note}
+
+
+\ifdefstring{\ELEGANT@lang}{cn}{%
\theoremstyle{plain}% default
- \newtheorem{theorem}{å®ç}[section] %
- \newtheorem{lemma}[theorem]{åŒç} %
- \newtheorem{proposition}[theorem]{æ§èŽš} %
- \newtheorem*{corollary}{æšè®º} %
- \theoremstyle{definition} %
- \newtheorem{definition}{å®ä¹}[section] %
- \newtheorem{conjecture}{çæ³}[section] %
- \newtheorem{example}{äŸ}[section] %
- \theoremstyle{remark} %
- \newtheorem*{remark}{\normalfont\bfseries è¯è®º} %
- \newtheorem*{note}{\normalfont\bfseries 泚} %
- \newtheorem{case}{\normalfont\bfseries æ¡äŸ} %
- \renewcommand*{\proofname}{\normalfont\bfseries\color{ecolor}è¯æ} %
- \renewcommand\contentsname{\color{ecolor}ç®åœ}
- \renewcommand\refname{\color{ecolor}åèæç®} %
- \renewcommand\figurename{åŸ} %
- \renewcommand\tablename{è¡š}
- \newcommand\versiontext{çæ¬ïŒ}%
- \newcommand\updatetext{æŽæ°ïŒ}%
- \setlength{\parindent}{2em}
- \newcommand{\keywords}[1]{\vskip2ex\par\noindent\normalfont{\bfseries å
³é®è¯: } #1}
-
-}{\relax}
+ \newtheorem{theorem}{å®ç}[section] %
+ \newtheorem{lemma}[theorem]{åŒç} %
+ \newtheorem{proposition}[theorem]{åœé¢} %
+ \newtheorem*{corollary}{æšè®º} %
+ \theoremstyle{definition} %
+ \newtheorem{definition}{å®ä¹}[section] %
+ \newtheorem{conjecture}{çæ³}[section] %
+ \newtheorem{example}{äŸ}[section] %
+ \theoremstyle{remark} %
+ \newtheorem*{remark}{\normalfont\bfseries è¯è®º} %
+ \newtheorem*{note}{\normalfont\bfseries 泚} %
+ \newtheorem{case}{\normalfont\bfseries æ¡äŸ} %
+ \renewcommand*{\proofname}{\normalfont\bfseries\color{ecolor}è¯æ} %
+ \renewcommand\contentsname{\color{ecolor}ç®åœ}
+ \renewcommand\refname{\color{ecolor}åèæç®} %
+ \renewcommand\figurename{åŸ} %
+ \renewcommand\tablename{è¡š}
+ \newcommand\versiontext{çæ¬ïŒ}%
+ \newcommand\updatetext{æŽæ°ïŒ}%
+ \setlength{\parindent}{2em}
+ \newcommand{\keywords}[1]{%
+ \vskip2ex\par\noindent\normalfont{\bfseries å
³é®è¯: } #1}
+ \RequirePackage{gbt7714}
+ \ifdefstring{\ELEGANT@cite}{authoryear}{
+ \bibliographystyle{gbt7714-author-year}}{
+ \bibliographystyle{gbt7714-numerical}}
+ \ifdefstring{\ELEGANT@cite}{numbers}{
+ \citestyle{numbers}}{\relax}
+ }{\relax}
+
\ifdefstring{\ELEGANT@lang}{en}{
\theoremstyle{plain}% default
- \newtheorem{theorem}{Theorem}[section] %
- \newtheorem{lemma}[theorem]{Lemma} %
- \newtheorem{proposition}[theorem]{Proposition} %
- \newtheorem*{corollary}{Corollary} %
- \theoremstyle{definition} %
- \newtheorem{definition}{Definition}[section] %
- \newtheorem{conjecture}{Conjecture}[section] %
- \newtheorem{example}{Example}[section] %
- \theoremstyle{remark} %
- \newtheorem*{remark}{Remark} %
- \newtheorem*{note}{Note} %
- \newtheorem{case}{Case}
- \renewcommand*{\proofname}{\normalfont\bfseries\color{ecolor}Proof}
- \newcommand\versiontext{Version: }%
- \newcommand\updatetext{Update: }%
-}{\relax}
+ \newtheorem{theorem}{Theorem}[section] %
+ \newtheorem{lemma}[theorem]{Lemma} %
+ \newtheorem{proposition}[theorem]{Proposition} %
+ \newtheorem*{corollary}{Corollary} %
+ \theoremstyle{definition} %
+ \newtheorem{definition}{Definition}[section] %
+ \newtheorem{conjecture}{Conjecture}[section] %
+ \newtheorem{example}{Example}[section] %
+ \theoremstyle{remark} %
+ \newtheorem*{remark}{Remark} %
+ \newtheorem*{note}{Note} %
+ \newtheorem{case}{Case}
+ \renewcommand*{\proofname}{%
+ \normalfont\bfseries\color{ecolor} Proof}
+ \newcommand\versiontext{Version: }%
+ \newcommand\updatetext{Update: }%
+ \RequirePackage[\ELEGANT@cite,sort&compress]{natbib}
+ \bibliographystyle{\ELEGANT@bibstyle}}{%
+ \relax}
+
+\setlength{\bibsep}{0.0pt}
+\def\bibfont{\footnotesize}
+
+\def\IfEmpty#1{%
+ \edef\1{\the#1}
+ \ifx\1\empty}
\newtoks\version
\newtoks\institute
+\def \ifempty#1{
+ \def\temp{#1}
+ \ifx\temp\empty}
+
\renewcommand\maketitle{\par
\begingroup
\renewcommand\thefootnote{\@fnsymbol\c@footnote}%
\def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
\long\def\@makefntext##1{\parindent 1em\noindent
- \hb@xt@1.8em{%
- \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
+ \hb@xt@1.8em{%
+ \hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
\if@twocolumn
\ifnum \col@number=\@ne
\@maketitle
@@ -255,10 +395,10 @@
\fi
\else
\newpage
- \global\@topnum\z@ % Prevents figures from going at top of page.
+ \global\@topnum\z@ % Prevents figures from going at top of page.
\@maketitle
\fi
- \thispagestyle{plain}\@thanks
+ \thispagestyle{empty}\@thanks
\endgroup
\setcounter{footnote}{0}%
\global\let\thanks\relax
@@ -266,75 +406,145 @@
\global\let\@maketitle\relax
\global\let\@thanks\@empty
\global\let\@author\@empty
+ \global\let\@ELEGANT@version\@empty
\global\let\@date\@empty
\global\let\@title\@empty
\global\let\title\relax
\global\let\author\relax
\global\let\date\relax
\global\let\and\relax
-}
+ \global\let\ELEGANT@version\relax}
+
\def\@maketitle{%
- \newpage
\color{ecolor}
\null
\vskip 2em%
\begin{center}%
- \let \footnote \thanks
- {\LARGE\bfseries \@title \par}%
- \vskip 1.5em%
- {\large
+ \let \footnote \thanks{%
+ \LARGE\bfseries \@title \par}%
+ \vskip 1.5em {%
+ \large
\lineskip .5em%
\begin{tabular}[t]{c}%
- \kaishu \@author\\
+ \@author\\
\the\institute
\end{tabular}\par}%
- \vskip 1.5em%
- {\small\itshape \versiontext \the\version}%
- \vskip -.5em%
- {\small\itshape \updatetext \@date}%
+
+ \IfEmpty\version
+ \else
+ {\normalfont\citshape\versiontext\the\version \\}
+ \fi
+ \ifx\@date\empty
+ \else
+ {\normalfont\citshape\updatetext\@date}%
+ \fi
\end{center}%
- \par
- \vskip 1.5em}
-
+ \par}
+
\RequirePackage{tikz}
\usetikzlibrary{shadows}
-\newcommand*{\eBall}{\tikz \draw [baseline, ball color=ecolor, draw=ecolor] circle (2pt);}
-\newcommand*{\eShadow}{\tikz \draw [baseline, fill=ecolor,draw=ecolor,circular drop shadow] circle (2pt);}
-\setlist[enumerate,1]{label=\color{ecolor}(\arabic*).}
-\setlist[enumerate,2]{label=\color{ecolor}(\Roman*).}
-\setlist[enumerate,3]{label=\color{ecolor}(\Alph*).}
-\setlist[enumerate,4]{label=\color{ecolor}(\roman*).}
-\setlist[itemize,1]{label={\eBall}}
-\setlist[itemize,2]{label={\eShadow}}
-%source1: https://tex.stackexchange.com/questions/41408/a-five-level-deep-list
-%source2: https://tex.stackexchange.com/questions/318199/change-color-of-itemize-bull…
-
-\DeclareSymbolFont{cmlargesymbols}{OMX}{cmex}{m}{n}
-\DeclareMathSymbol{\intop}{\mathop}{cmlargesymbols}{"5A}
- \def\int{\intop\nolimits}
-\DeclareMathSymbol{\ointop}{\mathop}{cmlargesymbols}{"49}
- \def\oint{\ointop\nolimits}
-\DeclareMathSymbol{\sumop}{\mathop}{cmlargesymbols}{"58}
- \let\sum\sumop
-\DeclareMathSymbol{\prodop}{\mathop}{cmlargesymbols}{"59}
- \let\prod\prodop
+\newcommand*{\eitemi}{
+ \tikz\draw[baseline, ball color=ecolor, draw=none] circle (2pt);}
+\newcommand*{\eitemii}{
+ \tikz\draw[baseline, fill=ecolor,draw=none,circular drop shadow] circle (2pt);}
+\newcommand*{\eitemiii}{%
+ \tikz\draw[baseline,fill=ecolor,draw=none] circle (2pt);}
+
+\setlist[enumerate,1]{label=\color{ecolor}\arabic*.}
+\setlist[enumerate,2]{label=\color{ecolor}(\alph*).}
+\setlist[enumerate,3]{label=\color{ecolor}\Roman*.}
+\setlist[enumerate,4]{label=\color{ecolor}\Alph*.}
+\setlist[itemize,1]{label={\eitemi}}
+\setlist[itemize,2]{label={\eitemii}}
+\setlist[itemize,3]{label={\eitemiii}}
+% source1: https://tex.stackexchange.com/questions/41408/a-five-level-deep-list
+% source2: https://tex.stackexchange.com/questions/318199/change-color-of-itemize-bull…
+
+
+\RequirePackage{listings,lstautogobble}
+\renewcommand{\ttdefault}{cmtt}
+
+\lstdefinestyle{estyle}{
+ basicstyle=%
+ \ttfamily
+ \lst@ifdisplaystyle\small\fi}
+
+% \lstset{
+% basicstyle=\scriptsize\ttfamily,
+% style=estyle}
-
-\RequirePackage{listings}
\definecolor{lightgrey}{rgb}{0.9,0.9,0.9}
\definecolor{frenchplum}{RGB}{190,20,83}
\lstset{language=[LaTeX]TeX,
- texcsstyle=*\bf\color{winered}\ttfamily,
- basicstyle=\footnotesize\ttfamily,
- numbers=none,
- breaklines=true,
- keywordstyle=\bf\color{winered}\ttfamily,
- commentstyle=\color{gray},
- emph={elegantpaper,fontenc,fontspec,xeCJK,FiraMono,xunicode,newtxmath,figure,fig,image,img,table,itemize,enumerate,newtxtext,newtxtt,ctex,microtype,description,times,newtx,booktabs,tabular,PDFLaTeX,XeLaTeX,type1cm,BibTeX,device,color,mode,lang,amsthm},
- emphstyle={\color{frenchplum}},
- morekeywords={DeclareSymbolFont,SetSymbolFont,toprule,midrule,bottomrule,institute,version,includegraphics,setmainfont,setsansfont,setmonofont ,setCJKmainfont,setCJKsansfont,setCJKmonofont,RequirePackage,figref,tabref,email,maketitle,keywords},
- frame=none,
- tabsize=2,
- rulecolor=\color{ecolor},
-}
+ style=estyle,
+ autogobble=true,
+ texcsstyle=*\color{winered},
+ numbers=none,
+ breaklines=true,
+ keywordstyle=\color{winered},
+ commentstyle=\color{gray},
+ emph={%
+ elegantpaper,
+ fontenc,
+ fontspec,
+ xeCJK,
+ FiraMono,
+ xunicode,
+ newtxmath,
+ figure,
+ fig,
+ image,
+ img,
+ table,
+ itemize,
+ enumerate,
+ newtxtext,
+ newtxtt,
+ ctex,
+ microtype,
+ description,
+ times,
+ newtx,
+ booktabs,
+ tabular,
+ PDFLaTeX,
+ XeLaTeX,
+ type1cm,
+ BibTeX,
+ device,
+ color,
+ mode,
+ chinesefont,
+ cite,
+ bibstyle,
+ math,
+ lang,
+ amsthm},
+ emphstyle={\color{frenchplum}},
+ morekeywords={%
+ DeclareSymbolFont,
+ setCJKfamilyfont,
+ SetSymbolFont,
+ toprule,
+ midrule,
+ bottomrule,
+ institute,
+ version,
+ includegraphics,
+ setmainfont,
+ setsansfont,
+ setmonofont ,
+ setCJKmainfont,
+ setCJKsansfont,
+ setCJKmonofont,
+ RequirePackage,
+ figref,
+ pagecolor,
+ definecolor,
+ tabref,
+ email,
+ maketitle,
+ keywords},
+ frame=none,
+ tabsize=2}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elegantnote.tlpobj new/tlpkg/tlpobj/elegantnote.tlpobj
--- old/tlpkg/tlpobj/elegantnote.tlpobj 2019-02-28 03:35:12.000000000 +0100
+++ new/tlpkg/tlpobj/elegantnote.tlpobj 2020-04-16 01:56:57.000000000 +0200
@@ -1,20 +1,19 @@
name elegantnote
category Package
-revision 49926
+revision 54758
shortdesc Elegant LaTeX Template for Notes
relocated 1
longdesc ElegantNote is designed for writing working papers, especially
longdesc for economics students. This template is based on the standard
longdesc LaTeX article class. The goal of this template is to make the
longdesc writing process easier and more comfortable.
-runfiles size=3
+runfiles size=4
RELOC/tex/latex/elegantnote/elegantnote.cls
catalogue-contact-announce https://elegantlatex.org/
catalogue-contact-home https://elegantlatex.org/
catalogue-contact-repository https://github.com/ElegantLaTeX/ElegantNote
catalogue-contact-support https://github.com/ElegantLaTeX/ElegantNote/issues
catalogue-ctan /macros/latex/contrib/elegantnote
-catalogue-date 2019-02-05 05:26:48 +0100
catalogue-license lppl1.3c
catalogue-topics class
-catalogue-version 2.10
+catalogue-version 2.30
++++++ elegantpaper.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/elegantpaper/README.md new/doc/latex/elegantpaper/README.md
--- old/doc/latex/elegantpaper/README.md 2019-02-25 23:21:53.000000000 +0100
+++ new/doc/latex/elegantpaper/README.md 2019-10-17 22:48:24.000000000 +0200
@@ -10,13 +10,18 @@
![Github Version](https://img.shields.io/github/release/ElegantLaTeX/ElegantPaper.svg)
![Repo Size](https://img.shields.io/github/repo-size/ElegantLaTeX/ElegantPaper.svg)
-ElegantPaper is designed for writing a working paper, especially for economics students. This template is based on the standard LaTeX article class. The goal of this template is to make the writing process easier and more comfortable. You can get rid of all the worries about the format. Just enjoy it! If you have any questions, suggestions or bug reports, you can create issues, pull requests or email us at elegantlatex2e(a)gmail.com.
-æ€æš¡æ¿åºäº LaTeX ç article ç±»ïŒäžäžºå·¥äœè®ºæåäœè讟计ã讟计è¿äžªæš¡æ¿çåè¡·æ¯è®©äœè
äžçšå
³å¿å·¥äœè®ºæçæ ŒåŒïŒäžå¿åäœïŒä»èææŽå èéïŒç®äŸ¿çåäœäœéªãåŠæäœ æå
¶ä»é®é¢ã建议æè
æ¥å bugïŒå¯ä»¥æ亀 issues æè
ç»æ们åé®ä»¶ïŒelegantlatex2e@gmail.comã
+ElegantPaper is designed for writing a working paper, especially for economics students. This template is based on the standard LaTeX article class. The goal of this template is to make the writing process easier and more comfortable. You can get rid of all the worries about the format. Just enjoy it! If you have any questions, suggestions or bug reports, you can create issues or email us at elegantlatex2e(a)gmail.com.
-# License
+æ€æš¡æ¿åºäº LaTeX ç article ç±»ïŒäžäžºå·¥äœè®ºæåäœè讟计ã讟计è¿äžªæš¡æ¿çåè¡·æ¯è®©äœè
äžçšå
³å¿å·¥äœè®ºæçæ ŒåŒïŒäžå¿åäœïŒä»èææŽå èéïŒç®äŸ¿çåäœäœéªãåŠæäœ æå
¶ä»é®é¢ã建议æè
æ¥å bugïŒå¯ä»¥æ亀 issues æè
ç»æ们åé®ä»¶ïŒelegantlatex2e@gmail.comãçšæ· QQ 亀æµçŸ€ïŒQ 矀ïŒ692108391ïŒïŒæ¬¢è¿å å
¥ã
+
+The official user guide is [here](https://github.com/ElegantLaTeX/ElegantPaper/releases), or you can refer to the [wiki](https://github.com/ElegantLaTeX/ElegantPaper/wiki).
+
+æš¡æ¿äœ¿çšè¯Žæ请åè§[æš¡æ¿ææ¡£](https://github.com/ElegantLaTeX/ElegantPaper/releases)ïŒæè
[wiki](https://github.com/ElegantLaTeX/ElegantPaper/wiki)ã
+
+## License
This work is released under the LaTeX Project Public License, v1.3c or later.
-æ¬æš¡æ¿ååžéµåŸª LaTeX 项ç®å
Œ
±è®žå¯è¯ 1.3 c ææŽé«çæ¬ã
+æ¬æš¡æ¿ååžéµåŸª LaTeX 项ç®å
Œ
±è®žå¯è¯ 1.3c ææŽé«çæ¬ã
Binary files old/doc/latex/elegantpaper/elegantpaper-cn.pdf and new/doc/latex/elegantpaper/elegantpaper-cn.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/elegantpaper/elegantpaper-cn.tex new/doc/latex/elegantpaper/elegantpaper-cn.tex
--- old/doc/latex/elegantpaper/elegantpaper-cn.tex 2019-03-31 23:54:30.000000000 +0200
+++ new/doc/latex/elegantpaper/elegantpaper-cn.tex 2020-04-12 23:31:37.000000000 +0200
@@ -1,213 +1,270 @@
%!TEX program = xelatex
-% å®æŽçŒè¯æ¹æ³ 1 pdflatex -> bibtex -> pdflatex -> pdflatex
-% å®æŽçŒè¯æ¹æ³ 2: xelatex -> bibtex -> xelatex -> xelatex
-\documentclass[lang=cn,11pt]{elegantpaper}
+% å®æŽçŒè¯: xelatex -> bibtex -> xelatex -> xelatex
+\documentclass[lang=cn,11pt,a4paper,cite=authoryear]{elegantpaper}
\title{ElegantPaper: äžäžªäŒçŸç \LaTeX{} å·¥äœè®ºææš¡æ¿}
-\author{\href{https://ddswhu.me/}{é äž å}}
-
+\author{Ethan DENG \\ Fudan University \and Dongsheng DENG \\ PA Technology}
\institute{\href{https://elegantlatex.org/}{Elegant\LaTeX{} 项ç®ç»}}
-% äžéèŠçæ¬ä¿¡æ¯ïŒçŽæ¥æ³šéå³å¯
-\version{0.07}
-% äžéèŠæ¶éŽä¿¡æ¯çè¯ïŒéèŠæ \today å é€ã
-\date{\today}
+\version{0.09}
+\date{\zhtoday}
-% åŠææ³ä¿®æ¹åèæç®æ ·åŒïŒè¯·æè¿è¡æ³šéæ
-\usepackage[authoryear]{gbt7714} % åœæ
+% æ¬ææ¡£åœä»€
+\usepackage{array}
+\newcommand{\ccr}[1]{\makecell{{\color{#1}\rule{1cm}{1cm}}}}
\begin{document}
\maketitle
\begin{abstract}
-\noindent æ¬æ䞺 \href{https://github.com/ElegantLaTeX/ElegantPaper/}{ElegantPaper} ç诎æææ¡£ïŒäžæïŒãæ€æš¡æ¿åºäº \LaTeX{} ç article ç±»ïŒäžäžºå·¥äœè®ºæåäœè讟计ã讟计è¿äžªæš¡æ¿çåè¡·æ¯è®©äœè
äžçšå
³å¿å·¥äœè®ºæçæ ŒåŒïŒäžå¿åäœïŒä»èææŽå èéïŒç®äŸ¿çåäœäœéªãåŠæäœ æå
¶ä»é®é¢ã建议æè
æ¥å bugïŒå¯ä»¥åš \href{https://github.com/ElegantLaTeX/ElegantPaper/issues}{ElegantPaper/issues} çèšãåŠæäœ æ³äºè§£æŽå€ç± Elegant\LaTeX{} 项ç®ç»è®Ÿè®¡çæš¡æ¿ïŒè¯·è®¿é® \href{https://github.com/ElegantLaTeX/}{https://github.com/ElegantLaTeX/}ã
+æ¬æ䞺 \href{https://github.com/ElegantLaTeX/ElegantPaper/}{ElegantPaper} ç诎æææ¡£ãæ€æš¡æ¿åºäº \LaTeX{} ç article ç±»ïŒäžäžºå·¥äœè®ºæåäœè讟计ã讟计è¿äžªæš¡æ¿çåè¡·æ¯è®©äœè
äžçšå
³å¿å·¥äœè®ºæçæ ŒåŒïŒäžå¿åäœïŒä»èææŽå èå¿çåäœäœéªãåŠæäœ æå
¶ä»é®é¢ã建议æè
æ¥å bugïŒå¯ä»¥åš \href{https://github.com/ElegantLaTeX/ElegantPaper/issues}{GitHub::ElegantPaper/issues} çèšãåŠæäœ æ³äºè§£æŽå€ Elegant\LaTeX{} 项ç®ç»è®Ÿè®¡çæš¡æ¿ïŒè¯·è®¿é® \href{https://github.com/ElegantLaTeX/}{GitHub::ElegantLaTeX}ã
\keywords{Elegant\LaTeX{}ïŒå·¥äœè®ºæïŒæš¡æ¿}
\end{abstract}
-\section{æš¡æ¿ä»ç»}
-æ€æš¡æ¿æ¯åºäº \LaTeX{} çæ åæç±» article讟计ïŒä¹å³æå³çäœ å¯ä»¥æ article æç±»çéé¡¹äŒ éç»æ¬æš¡æ¿ïŒæ¯åŠ \lstinline{a4paper, 10pt} ççïŒæšèäœ¿çš \lstinline{11pt}ïŒãæ¬æš¡æ¿æ¯æ \lstinline{PDFLaTeX} å \lstinline{XeLaTeX}\footnote{äžæåäœåäœ¿çš \lstinline{ctex} å
讟眮ã} 䞀ç§çŒè¯æ¹åŒã
+\section{æš¡æ¿äœ¿çšé¡»ç¥}
-æ°åŠåäœçææåŠäžïŒ
+\subsection{æš¡æ¿ä»ç»}
-\begin{equation}
-(a+3b)^{n} = \sum_{k=0}^{n} C_{n}^{k} a^{n-k} (3b)^k\label{eq:binom}
-\end{equation}
-
-\subsection{å
šå±é项}
-æåšè¿äžªæš¡æ¿äžå®ä¹äºäžäžªè¯èšé项 \lstinline{lang}ïŒå¯ä»¥éæ©è±ææš¡åŒ \lstinline{lang=en}ïŒé»è®€ïŒæè
äžææš¡åŒ \lstinline{lang=cn}ãåœéæ©äžææš¡åŒæ¶ïŒåŸè¡šçæ é¢åŒå¯Œè¯ä»¥ååèæç®ïŒå®çåŒå¯Œè¯çä¿¡æ¯äŒåæäžæãäœ å¯ä»¥éè¿äžé¢äž€ç§æ¹åŒæ¥éæ©è¯èšæš¡åŒïŒ
+æ€æš¡æ¿åºäº \LaTeX{} çæ åæç±» article 讟计ïŒæ以 article æç±»çé项ä¹èœäŒ éç»æ¬æš¡æ¿ïŒæ¯åŠ \lstinline{a4paper, 11pt} ççãæ¬æš¡æ¿æ¯æ \hologo{pdfLaTeX} å \hologo{XeLaTeX} çŒè¯ã
\begin{lstlisting}
+\documentclass[a4paper,11pt]{elegantpaper}
+\end{lstlisting}
+
+\textbf{泚æ}ïŒElegant\LaTeX{} ç³»åæš¡æ¿å·²ç»å
šéšäžäŒ è³ \href{https://www.overleaf.com/latex/templates/elegantpaper-template/yzghrqjhmmmr}{Overleaf} äžïŒçšæ·å¯ä»¥åšçº¿äœ¿çšãåŠå€ïŒäžºäºæ¹äŸ¿åœå
çšæ·ïŒæš¡æ¿ä¹å·²ç»äŒ è³\href{https://gitee.com/ElegantLaTeX/ElegantPaper}{ç äº}ã
+
+
+\subsection{å
šå±é项}
+æ€æš¡æ¿å®ä¹äºäžäžªè¯èšé项 \lstinline{lang}ïŒå¯ä»¥éæ©è±ææš¡åŒ \lstinline{lang=en}ïŒé»è®€ïŒæè
äžææš¡åŒ \lstinline{lang=cn}ãåœéæ©äžææš¡åŒæ¶ïŒåŸè¡šçæ é¢åŒå¯Œè¯ä»¥ååèæç®ïŒå®çåŒå¯Œè¯çä¿¡æ¯äŒåæäžæãäœ å¯ä»¥éè¿äžé¢äž€ç§æ¹åŒæ¥éæ©è¯èšæš¡åŒïŒ
+\begin{lstlisting}
\documentclass[lang=cn]{elegantpaper} % or
\documentclass{cn}{elegantpaper}
\end{lstlisting}
+\textbf{泚æïŒ} è±ææš¡åŒäžïŒç±äºæ²¡ææ·»å äžæå®å
ïŒæ æ³èŸå
¥äžæãåŠæéèŠèŸå
¥äžæïŒå¯ä»¥éè¿åšå¯ŒèšåºåŒå
¥äžæå®å
\lstinline{ctex} æè
å å
¥ \lstinline{xeCJK} å®å
åèªè¡è®Ÿçœ®åäœã
+\begin{lstlisting}
+\usepackage[UTF8,scheme=plain]{ctex}
+\end{lstlisting}
-\subsection{èªå®ä¹åœä»€}
-åšæ€æš¡æ¿äžïŒå¹¶æ²¡æä¿®æ¹ä»»äœé»è®€çåœä»€æè
ç¯å¢ïŒæ以ïŒäœ å¯ä»¥åšæ€æš¡æ¿äœ¿çšåæ¥çåœä»€åç¯å¢ãåŠå€ïŒæèªå®ä¹äº 3 䞪åœä»€ïŒ
+\subsection{æ°åŠåäœé项}
+
+æ¬æš¡æ¿å®ä¹äºäžäžªæ°åŠåäœé项ïŒ\lstinline{math}ïŒïŒå¯é项æäžäžªïŒ
+\begin{enumerate}
+ \item \lstinline{math=cm}ïŒé»è®€ïŒïŒäœ¿çš \LaTeX{} é»è®€æ°åŠåäœïŒæšèïŒæ é声æïŒïŒ
+ \item \lstinline{math=newtx}ïŒäœ¿çš \lstinline{newtxmath} 讟眮æ°åŠåäœïŒæœåšé®é¢æ¯èŸå€ïŒã
+ \item \lstinline{math=mtpro2}ïŒäœ¿çš \lstinline{mtpro2} å®å
讟眮æ°åŠåäœïŒèŠæ±çšæ·å·²ç»æåå®è£
æ€å®å
ã
+\end{enumerate}
+\subsection{äžæåäœé项}
+æš¡æ¿æäŸäžæåäœé项 \lstinline{chinesefont}ïŒå¯é项æ
\begin{enumerate}
- \item \lstinline{\email}ïŒå建é®ç®±å°åçéŸæ¥ïŒ
- \item \lstinline{\figref}ïŒçšæ³å \lstinline{\ref} 类䌌ïŒäœæ¯äŒåšæåŸçæ é¢åæ·»å <\textbf{åŸ n}> ïŒ
- \item \lstinline{\tabref}ïŒçšæ³å \lstinline{\ref} 类䌌ïŒäœæ¯äŒåšè¡šæ Œçæ é¢åæ·»å <\textbf{è¡š n}>ïŒ
- \item \lstinline{\keywords}ïŒäžºæèŠç¯å¢æ·»å å
³é®è¯ã
+\item \lstinline{ctexfont}ïŒé»è®€é项ïŒäœ¿çš \lstinline{ctex} å®å
æ ¹æ®ç³»ç»èªè¡éæ©åäœïŒå¯èœååšåäœçŒºå€±çé®é¢ïŒæŽå€å
容åè \lstinline{ctex} å®å
\href{https://ctan.org/pkg/ctex}{å®æ¹ææ¡£}\footnote{å¯ä»¥äœ¿çšåœä»€æ瀺笊ïŒèŸå
¥ \lstinline{texdoc ctex} è°åºæ¬å° \lstinline{ctex} å®å
ææ¡£}ã
+\item \lstinline{founder}ïŒæ¹æ£åäœé项ïŒè°çš \lstinline{ctex} å®å
并äžäœ¿çš \lstinline{fontset=none} é项ïŒç¶å讟眮åäœäžºæ¹æ£å欟å
莹åäœïŒæ¹æ£åäœäžèœœæ³šæäºé¡¹è§åæã
+\item \lstinline{nofont}ïŒè°çš \lstinline{ctex} å®å
并äžäœ¿çš \lstinline{fontset=none} é项ïŒäžè®Ÿå®äžæåäœïŒçšæ·å¯ä»¥èªè¡è®Ÿçœ®äžæåäœïŒå
·äœè§åæã
\end{enumerate}
+\noindent \textbf{泚æïŒ} äœ¿çš \lstinline{founder} é项æè
\lstinline{nofont} æ¶ïŒå¿
é¡»äœ¿çš \hologo{XeLaTeX} è¿è¡çŒè¯ã
+\subsubsection{æ¹æ£åäœé项}
+ç±äºäœ¿çš \lstinline{ctex} å®å
é»è®€è°çšç³»ç»å·²æçåäœïŒéšåç³»ç»åäœçŒºå€±äž¥éïŒå æ€ïŒçšæ·åžæèœå€äœ¿çšå
¶å®åäœïŒæ们æšè䜿çšæ¹æ£åäœãæ¹æ£ç{\songti æ¹æ£ä¹Šå®}ã{\heiti æ¹æ£é»äœ}ã{\kaishu æ¹æ£æ¥·äœ}ã{\fangsong æ¹æ£ä»¿å®}å欟åäœåå¯å
莹è¯çšïŒäžå¯çšäºåäžçšéãçšæ·å¯ä»¥èªè¡ä»\href{http://www.foundertype.com/}{æ¹æ£åäœå®çœ}äžèœœæ€å欟åäœïŒåšäžèœœçæ¶å请\textbf{å¡å¿
}泚æéæ© GBK å笊éïŒä¹å¯ä»¥äœ¿çš \href{https://www.latexstudio.net/}{\LaTeX{} å·¥äœå®€}æäŸç\href{https://pan.baidu.com/s/1BgbQM7LoinY7m8yeP25Y7Q}{æ… äžºïŒnjy9} è¿è¡å®è£
ãå®è£
æ¶ïŒ{\kaishu Win 10 çšæ·è¯·å³é®éæ©äžºå
šéšçšæ·å®è£
ïŒåŠåäŒæŸäžå°åäœã}
-\subsection{åè¡šç¯å¢}
-äœ å¯ä»¥äœ¿çšåè¡šç¯å¢ïŒ\lstinline{itemize}ã\lstinline{enumerate}ã\lstinline{description}ïŒïŒç€ºäŸåŠäžïŒ\\[2ex]
-\begin{minipage}[c]{0.59\linewidth}
+\begin{figure}[!htb]
+\centering
+\includegraphics[width=0.9\textwidth]{founder.png}
+\end{figure}
+
+\subsubsection{å
¶ä»äžæåäœ}
+åŠæäœ æ³å®å
šèªå®ä¹åäœ\footnote{è¿éä»ç¶ä»¥æ¹æ£åäœäžºäŸã}ïŒäœ å¯ä»¥éæ© \lstinline{chinesefont=nofont}ïŒç¶ååšå¯Œèšåºè®Ÿçœ®
\begin{lstlisting}
-\begin{itemize}
- \item Routing and resource discovery;
- \item Resilient and scalable networks;
- \item Distributed storage and search.
-\end{itemize}
+\setCJKmainfont[BoldFont={FZHei-B01},ItalicFont={FZKai-Z03}]{FZShuSong-Z01}
+\setCJKsansfont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZHei-B01}
+\setCJKmonofont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZFangSong-Z02}
+\setCJKfamilyfont{zhsong}{FZShuSong-Z01}
+\setCJKfamilyfont{zhhei}{FZHei-B01}
+\setCJKfamilyfont{zhkai}{FZKai-Z03}
+\setCJKfamilyfont{zhfs}{FZFangSong-Z02}
+\newcommand*{\songti}{\CJKfamily{zhsong}}
+\newcommand*{\heiti}{\CJKfamily{zhhei}}
+\newcommand*{\kaishu}{\CJKfamily{zhkai}}
+\newcommand*{\fangsong}{\CJKfamily{zhfs}}
\end{lstlisting}
-\end{minipage}
-\begin{minipage}[c]{0.4\linewidth}
-\begin{itemize}
- \item Routing and resource discovery;
- \item Resilient and scalable networks;
- \item Distributed storage and search.
-\end{itemize}
-\end{minipage}
-
+\subsection{èªå®ä¹åœä»€}
+æ€æš¡æ¿å¹¶æ²¡æä¿®æ¹ä»»äœé»è®€ç \LaTeX{} åœä»€æè
ç¯å¢\footnote{ç®çæ¯ä¿è¯ä»£ç çå¯å€çšæ§ïŒè¯·çšæ·å
³æ³šå
容ïŒäžèŠå€ªåšææ ŒåŒïŒè¿ææ¯æ¬å·¥äœè®ºææš¡æ¿çæä¹ã}ãåŠå€ïŒæèªå®ä¹äº 4 䞪åœä»€ïŒ
+\begin{enumerate}
+ \item \lstinline{\email}ïŒå建é®ç®±å°åçéŸæ¥ïŒæ¯åŠ \email{ddswhu@outlook.com}ïŒ
+ \item \lstinline{\figref}ïŒçšæ³å \lstinline{\ref} 类䌌ïŒäœæ¯äŒåšæåŸçæ é¢åæ·»å <\textbf{åŸ n}> ïŒ
+ \item \lstinline{\tabref}ïŒçšæ³å \lstinline{\ref} 类䌌ïŒäœæ¯äŒåšè¡šæ Œçæ é¢åæ·»å <\textbf{è¡š n}>ïŒ
+ \item \lstinline{\keywords}ïŒäžºæèŠç¯å¢æ·»å å
³é®è¯ã
+\end{enumerate}
-\subsection{æåŸ}
-æåŸçåœä»€å以åäžæ ·ïŒä¹æ¯äœ¿çš \lstinline{figure} ç¯å¢ã\figref{fig:scatter} æŸç€ºäºæåŸçææãäœ å¯ä»¥æäœ çåŸæŸå°åœåå·¥äœç®åœçåŠäžåç®åœäž (\lstinline{./image/}, \lstinline{./img/}, \lstinline{./figure/}, \lstinline{./fig/})ã
+\subsection{åèæç®}
+æ€æš¡æ¿äœ¿çš \hologo{BibTeX} æ¥çæåèæç®ïŒäžææš¡åŒäžé»è®€äœ¿çšçæç®æ ·åŒïŒbib styleïŒæ¯ \lstinline{GB/T 7714-2015}\footnote{éè¿è°çš \href{https://ctan.org/pkg/gbt7714}{\lstinline{gbt7714}} å®å
}ãåèæç®ç€ºäŸïŒ~\cite{en3} 䜿çšäºäžåœäžäžªå€§åç P2P å¹³å°ïŒäººäººèŽ·ïŒçæ°æ®æ¥æ£éªç·æ§æèµè
å女æ§æèµè
åšæèµè¡šç°äžæ¯åŠææŸèå·®åŒã
+äœ å¯ä»¥åšè°·æåŠæ¯ïŒMendeleyïŒEndnote äžè·åŸæç®æ¡ç®ïŒbib itemïŒïŒç¶åæå®ä»¬æ·»å å° \lstinline{wpref.bib} äžãåšæäžåŒçšçæ¶åïŒåŒçšå®ä»¬çé®åŒïŒbib keyïŒå³å¯ã泚æéèŠåšçŒè¯çè¿çšäžæ·»å \hologo{BibTeX} çŒè¯ã
+æ¬æš¡æ¿è¿æ·»å äº \lstinline{cite=numbers} ã\lstinline{cite=super} å \lstinline{cite=authoryear} äžäžªåèæç®é项ïŒçšäºè®Ÿçœ®åèæç®æ ŒåŒç讟眮ïŒé»è®€äžº \lstinline{numbers}ãçå·¥ç§ç±»äžè¬äœ¿çšæ°ååœ¢åŒ \lstinline{numbers} æè
äžæ åœ¢åŒ \lstinline{super}ïŒèæç§ç±»å€äœ¿çšäœè
-幎仜 \lstinline{authoryear} æ¯èŸå€ãåŠæéèŠæ¹äžº \lstinline{cite=numbers} æè
\lstinline{authoryear} ïŒå¯ä»¥äœ¿çš
\begin{lstlisting}
+\documentclass[cite=super]{elegantpaper} % super style ref style
+\documentclass[super]{elegantpaper}
+
+\documentclass[cite=authoryear]{elegantpaper} % author-year ref style
+\documentclass[authoryear]{elegantpaper}
+\end{lstlisting}
+
+
+\section{åäœäººåæå}
+æå Elegant\LaTeX{} çåäœäººåïŒæ²¡æå·¥èµãå·¥äœå
容ïŒç¿»è¯ Elegant\LaTeX{} ç³»åæš¡æ¿çžå
³çæçš¿ïŒäžç¿»è±ïŒïŒç»Žæ€æš¡æ¿ç wikiïŒäž»èŠæ¶å MarkdownïŒïŒåŠææå
¬äŒå·æçš¿åäœç»åçè¯ïŒä¹å¯ä»¥åž®å¿å埮信皿ãæ¬å
¬åé¿æææã
+
+ç®å ElegantLaTeX å
±æ 4 ååäœäººåïŒåå«æ¯
+\begin{itemize}
+ \item å®æ¹æ档翻è¯: \href{https://github.com/peggy2006xzyz}{YPY};
+ \item GitHub 绎åºç»Žæ€: \href{https://github.com/izinngo}{Ingo Zinngo}ã\href{https://github.com/xiaohao890809}{远寻åé£æ¯};
+ \item QQ 矀管çå: \href{https://github.com/sikouhjw}{Sikouhjw}.
+\end{itemize}
+
+åšæ€æè°¢ä»ä»¬æ ç§çå¥ç®ïŒ
+
+
+\section{èŽè°¢}
+æªæ¢å° 2020 幎 04 æ 12 æ¥ïŒElegantPaper v0.09 çæ¬ååžïŒElegantPaper æš¡æ¿åš GitHub äžçæ¶èæ°ïŒstarïŒèŸŸå°äº 277ãåšæ€ç¹å«æè°¢ China\TeX{} 以å \href{http://www.latexstudio.net/}{\LaTeX{} å·¥äœå®€}对äºæ¬ç³»åæš¡æ¿ç倧åå®£äŒ äžæšå¹¿ãåŠæäœ å欢æ们çæš¡æ¿ïŒäœ å¯ä»¥åš GitHub äžæ¶èïŒStarïŒæ们çæš¡æ¿ã
\begin{figure}[htbp]
- \centering
- \includegraphics[width=0.6\textwidth]{scatter.pdf}
- \caption{Scatter Plot Example \label{fig:scatter}}
+ \centering
+ \includegraphics[width=\textwidth]{star.png}
+ \caption{äžé®äžè¿æ±èµ}
\end{figure}
-\end{lstlisting}
+
+\section{æèµ }
+åŠææšéåžžåç±æ们çæš¡æ¿ïŒäœ è¿å¯ä»¥éæ©æèµ ä»¥è¡šèŸŸæšå¯¹æ们暡æ¿åæçæ¯æïŒ
+
\begin{figure}[htbp]
- \centering
- \includegraphics[width=0.6\textwidth]{scatter.pdf}
- \caption{Scatter Plot Example \label{fig:scatter}}
+ \centering
+ \includegraphics[width=0.5\textwidth]{donate.jpg}
\end{figure}
-\subsection{è¡šæ Œ}
-æ区çå»ºè®®äœ äœ¿çš \lstinline{booktabs} å®å
ïŒè¿äžªå®å
æäžäžªåœä»€ \lstinline{\toprule}ã\lstinline{\midrule} å \lstinline{\bottomrule} èœæ¹äŸ¿äœ å¶äœäžçº¿è¡šã\tabref{tab:reg} æ¯äžäžªç€ºäŸïŒ
+\textbf{èµèµèŽ¹çšç䜿çšè§£éæåœ Elegant\LaTeX{} ææïŒå¹¶äžäžæ¥åçç£ïŒè¯·èªæ¿çæ§æèµ}ã10 å
以äžçèµèµïŒæ们å°åå
¥æèµ æŠïŒè°¢è°¢åäœéäž»ïŒ
-\begin{lstlisting}
-\begin{table}[htbp]
- \small
+
+\begin{table}[!htb]
\centering
- \caption{Auto MPG and Price \label{tab:reg}}
- \begin{tabular}{lcc}
- \toprule
- & (1) & (2) \\
- \midrule
- mpg & -238.90*** & -49.51 \\
- & (53.08) & (86.16) \\
- weight & & 1.75*** \\
- & & (0.641) \\
- constant & 11,253*** & 1,946 \\
- & (1,171) & (3,597) \\
- obs & 74 & 74 \\
- $R^2$ & 0.220 & 0.293 \\
- \bottomrule
- \multicolumn{3}{l}{\scriptsize Standard errors in parentheses} \\
- \multicolumn{3}{l}{\scriptsize *** p<0.01, ** p<0.05, * p<0.1} \\
+ \caption{Elegant\LaTeX{} ç³»åæš¡æ¿æèµ æŠ}
+ \begin{tabular}{*{4}{>{\scriptsize}c}|*{4}{>{\scriptsize}c}}
+ \hline
+ \textbf{æèµ è
} & \textbf{éé¢} & \textbf{æ¶éŽ} & \textbf{æž é} & \textbf{æèµ è
} & \textbf{éé¢} & \textbf{æ¶éŽ} & \textbf{æž é} \\
+ \hline
+ Lerh & 10 RMB & 2019/05/15 & 埮信 & è¶è¿å°å¹³çº¿ & 10 RMB & 2019/05/15 & 埮信 \\
+ é¶æ¡ & 20 RMB & 2019/05/27 & 埮信 & *空 & 10 RMB & 2019/05/30 & 埮信 \\
+ latexstudio.net & 666 RMB & 2019/06/05 & æ¯ä»å® & A*n & 40 RMB & 2019/06/15 & 埮信 \\
+ * å€ & 22 RMB & 2019/06/15 & 埮信 & * å© & 21 RMB & 2019/06/15 & 埮信 \\
+ Cassis & 11 RMB & 2019/06/30 & 埮信 & *å & 10 RMB & 2019/07/23 & 埮信 \\
+ P*u & 50 RMB & 2019/07/30 & 埮信 & *è & 19 RMB & 2019/08/28 & 埮信 \\
+ æ²è±è± & 10 RMB & 2019/08/28 & 埮信 & æå & 100 RMB & 2019/10/06 & 埮信 \\
+ Njustsll & 10 RMB & 2019/10/11 & 埮信 & åå¿é & 99.99 RMB & 2019/10/15 & æ¯ä»å® \\
+ * é¬ & 16 RMB & 2019/10/17 & 埮信 & èµ€é & 12 RMB & 2019/10/17 & æ¯ä»å® \\
+ 远寻åé£æ¯ & 10 RMB & 2019/10/28 & 埮信 & éåŸ·è¯ & 88 RMB & 2019/11/03 & 埮信 \\
+ èªåŒºäžæ¯ & 20 RMB & 2019/11/04 & æ¯ä»å® & 读乊ä¹è« & 20 RMB & 2019/11/18 & 埮信 \\
+ *ç & 10 RMB & 2019/11/18 & 埮信 & *å² & 20 RMB & 2019/11/18 & 埮信 \\
+ äœå & 10 RMB & 2019/11/24 & 埮信 & Jiye Qian & 66 RMB & 2019/12/04 & 埮信 \\
+ * é³ & 20 RMB & 2019/12/05 & 埮信 & Catcher & 11 RMB & 2019/12/08 & æ¯ä»å® \\
+ åžå°æ³¢ç¹éšåŸ & 10 RMB & 2019/12/09 & æ¯ä»å® & * äŒ & 10 RMB & 2019/12/09 & 埮信 \\
+ Simon & 20 RMB & 2019/12/11 & æ¯ä»å® & æµæ®äž¶æµ
å¿ & 66.60 RMB & 2019/12/18 & æ¯ä»å® \\
+ 矜 & 10 RMB & 2019/12/20 & æ¯ä»å® & * ç & 15 RMB & 2019/12/20 & 埮信 \\
+ éé£ & 20 RMB & 2019/12/27 & æ¯ä»å® & Ws & 23.30 RMB & 2019/12/28 & 埮信 \\
+ åå
« & 100 RMB & 2020/01/02 & æ¯ä»å® & p*e & 20 RMB & 2020/01/03 & 埮信 \\
+ Shunmx & 100 RMB & 2020/01/03 & 埮信 & hj & 10 RMB & 2020/01/03 & 埮信 \\
+ F*5 & 10 RMB & 2020/01/03 & 埮信 & S*m & 20.20 RMB & 2020/01/03 & 埮信 \\
+ äºä»£éé & 13 RMB & 2020/01/14 & æ¯ä»å® & *? & 66 RMB & 2020/01/15 & 埮信 \\
+ Mr. Xiong & 20 RMB & 2020/01/17 & 埮信 & *å & 15 RMB & 2020/01/18 & 埮信 \\
+ * è
& 10 RMB & 2020/02/02 & 埮信 & Jackie & 88.80 RMB & 2020/02/09 & 埮信 \\
+ Henry\_Sunã & 50 RMB & 2020/02/14 & æ¯ä»å® & * æ¡¥ & 50 RMB & 2020/02/21 & 埮信 \\
+ æç & 10 RMB & 2020/03/02 & æ¯ä»å® & S*y & 10 RMB & 2020/03/15 & 埮信 \\
+ * å¥ & 66.66 RMB & 2020/03/17 & 埮信 & K*e & 30 RMB & 2020/03/30 & 埮信\\
+ * é³ & 20 RMB & 2020/04/02 & 埮信 & 士*n & 30 RMB & 2020/04/11 & 埮信 \\
+ \hline
\end{tabular}%
+ \label{tab:donation}%
\end{table}%
+
+\section{åžžè§é®é¢ FAQ}
+
+\begin{enumerate}[label=\arabic*).]
+ \item \textit{åŠäœå é€çæ¬ä¿¡æ¯ïŒ}\\
+ 富èšåºäžå \lstinline|\version{x.xx}| å³å¯ã
+ \item \textit{åŠäœå é€æ¥æïŒ}\\
+ éèŠæ³šæçæ¯ïŒäžçæ¬ \lstinline{\version} äžåçæ¯ïŒå¯Œèšåºäžåæ泚é \lstinline{\date} çè¯ïŒä»ç¶äŒæå°åºåœæ¥æ¥æïŒåå æ¯ \lstinline{\date} æé»è®€åæ°ãåŠæäžéèŠæ¥æçè¯ïŒæ¥æå¯ä»¥ç空å³å¯ïŒä¹å³ \lstinline|\date{}|ã
+ \item \textit{åŠäœè·åŸäžææ¥æïŒ}\\
+ 䞺äºè·åŸäžææ¥æïŒå¿
é¡»åšäžææš¡åŒäž\footnote{è±ææš¡åŒäžïŒç±äºæªå 蜜äžæå®å
ïŒæ æ³èŸå
¥äžæã}ïŒäœ¿çš \lstinline|\date{\zhdate{2019/10/11}}|ïŒåŠæéèŠåœå€©çæ±åæ¥æïŒå¯ä»¥äœ¿çš \lstinline|\date{\zhtoday}|ïŒè¿äž€äžªåœä»€éœæ¥æºäº \href{https://ctan.org/pkg/zhnumber}{\lstinline{zhnumber}} å®å
ã
+ \item \textit{åŠäœæ·»å å€äžªäœè
ïŒ}\\
+ åš \lstinline{\author} éé¢äœ¿çš \lstinline{\and}ïŒäœè
åäœå¯ä»¥çš \lstinline{\\} æ¢è¡ã\begin{lstlisting}
+\author{author 1\\ org. 1 \and author 2 \\ org. 2 }
\end{lstlisting}
-\begin{table}[htbp]
- \small
- \centering
- \caption{Auto MPG and Price \label{tab:reg}}
- \begin{tabular}{lcc}
- \toprule
- & (1) & (2) \\
- \midrule
- mpg & -238.90*** & -49.51 \\
- & (53.08) & (86.16) \\
- weight & & 1.75*** \\
- & & (0.641) \\
- constant & 11,253*** & 1,946 \\
- & (1,171) & (3,597) \\
- obs & 74 & 74 \\
- $R^2$ & 0.220 & 0.293 \\
- \bottomrule
- \multicolumn{3}{l}{\scriptsize Standard errors in parentheses} \\
- \multicolumn{3}{l}{\scriptsize *** p<0.01, ** p<0.05, * p<0.1} \\
- \end{tabular}%
-\end{table}%
+ \item \textit{åŠäœæ·»å äžè±ææèŠïŒ}\\
+ 请åè \href{https://github.com/ElegantLaTeX/ElegantPaper/issues/5}{GitHub::ElegantPaper/issues/5}
+\end{enumerate}
+\section{瀺äŸ}
+䞺äºè®©å€§å®¶æŽå æž
æ¥æç»ç论æææïŒåŠäžç»åºäž€ç¯äœ¿çš ElegantPaper æš¡æ¿æççå·¥äœè®ºæ瀺äŸïŒä¹æ¬¢è¿å€§å®¶âæçš¿âïŒ
-\subsection{åèæç®}
-æ€æš¡æ¿äœ¿çšäº Bib\TeX{} æ¥çæåèæç®ïŒé»è®€äœ¿çšçæç®æ ·åŒïŒbib styleïŒæ¯ \lstinline{GB/T 7714-2015}\footnote{éè¿è°çš \href{https://ctan.org/pkg/gbt7714}{\lstinline{gbt7714}} å®å
}ãåèæç®ç€ºäŸïŒ~\cite{en3} 䜿çšäºäžåœäžäžªå€§åç P2P å¹³å°ïŒäººäººèŽ·ïŒçæ°æ®æ¥æ£éªç·æ§æèµè
å女æ§æèµè
åšæèµè¡šç°äžæ¯åŠææŸèå·®åŒã
+\begin{enumerate}
+ \item \href{https://github.com/EthanDeng/bank-custody}{é¶è¡å管ãæèµè
å³çäž P2P çœç»å获è§èåå±}ïŒ
+ \item \href{https://github.com/EthanDeng/risk-awareness}{äºèçœéèé£é©äžæèµè
é£é©æè¯ ââ æ¥èªçœèŽ·å¹³å°äº€ææ°æ®çè¯æ®}ã
+\end{enumerate}
-äœ å¯ä»¥åšè°·æåŠæ¯ïŒMendeleyïŒEndnote äžè·åŸæç®æ¡ç®ïŒbib itemïŒïŒç¶åæå®ä»¬æ·»å å° \lstinline{wpref.bib} äžãåšæäžåŒçšçæ¶åïŒåŒçšå®ä»¬çé®åŒïŒbib keyïŒå³å¯ã泚æéèŠåšçŒè¯çè¿çšäžæ·»å Bib\TeX{} çŒè¯ãåŠæäœ æ³åšåèæç®äžæ·»å æªåŒçšçæç®ïŒéšåæè
å
šéšïŒïŒå¯ä»¥äœ¿çš
-\begin{lstlisting}
-\nocite{EINAV2010, Havrylchyk2018} % add the two reference.
-\nocite{*} % add all the reference in the bib file.
-\end{lstlisting}
+\nocite{*}
+\bibliography{wpref}
-åŠæäœ æ³ä¿®æ¹åèæç®çæ ·åŒïŒæ¯åŠæ¹äžº \lstinline{aer}ïŒïŒäœ å¯ä»¥åšå¯Œèšåºå°äžé¢ä»£ç 泚éæã
-\begin{lstlisting}
-\usepackage[authoryear]{gbt7714}
-\end{lstlisting}
+\appendix
+%\appendixpage
+\addappheadtotoc
+\section{äœ¿çš newtx ç³»ååäœ}
-并äžææ¡£æ«å°Ÿæ·»å
+åŠæéèŠäœ¿çšåå
çæ¬ç \lstinline{newtx} ç³»ååäœïŒå¯ä»¥éè¿æŸç€ºå£°ææ°åŠåäœïŒ
\begin{lstlisting}
-\bibliographystyle{aer}
+\documentclass[math=newtx]{elegantbook}
\end{lstlisting}
-\section{瀺äŸ}
-åšè¿éšåïŒææäŸäžäžªç€ºäŸææ¡£ïŒ
-
+\subsection{è¿å笊}
+åŠæäœ¿çš \lstinline{newtx} ç³»ååäœå®å
ïŒéèŠæ³šæäžè¿å笊çé®é¢ã
+\begin{equation}
+ \int_{R^q} f(x,y) dy.\emph{of\kern0pt f}
+\end{equation}
+ç代ç 䞺
\begin{lstlisting}
-\documentclass[lang=cn]{elegantpaper}
-
-% title information
-\title{A Working Paper Example}
-\author{ddswhu}
-\institute{Elegant\LaTeX{} Group}
-\version{1.00}
-\date{\today}
-
-\begin{document}
+\begin{equation}
+ \int_{R^q} f(x,y) dy.\emph{of \kern0pt f}
+\end{equation}
+\end{lstlisting}
-\maketitle
+\subsection{å®å
å²çª}
-\begin{abstract}
-Your abstract goes here.
-\keywords{keyword1, keyword2}
-\end{abstract}
+åŠå€åš ElegantBook æš¡æ¿äžïŒæçšæ·åéŠæš¡æ¿åšäœ¿çš \lstinline{yhmath} 以å \lstinline{esvect} çå®å
æ¶äŒæ¥éïŒ
+\begin{lstlisting}
+LaTeX Error:
+ Too many symbol fonts declared.
+\end{lstlisting}
-\section{Introduction}
-The content of introduction section.
+åå æ¯åšäœ¿çš \lstinline{newtxmath} å®å
æ¶ïŒéæ°å®ä¹äºæ°åŠåäœçšäºå€§åæäœç¬ŠïŒèŸŸå°äº {\heiti æå€ 16 䞪æ°åŠåäœ} çäžéïŒåšè°çšå
¶ä»å®å
çæ¶åïŒæ æ³æ°å¢æ°åŠåäœã䞺äºåå°è°çšéåžžçšå®å
ïŒåšæ€ç»åºåŠäœè°çš \lstinline{yhmath} 以å \lstinline{esvect} å®å
çæ¹æ³ã
-\section{Conclusion}
-The content of conclusion section.
+è¯·åš \lstinline{elegantpaper.cls} å
æ玢 \lstinline{yhmath} æè
\lstinline{esvect}ïŒå°äœ æéèŠçå®å
å 蜜è¯å¥\textit{åæ¶æ³šé}å³å¯ã
+\begin{lstlisting}
+%%% use yhmath pkg, uncomment following code
+% \let\oldwidering\widering
+% \let\widering\undefined
+% \RequirePackage{yhmath}
+% \let\widering\oldwidering
-% include the noncited reference
-\nocite{ref1, ref2}
-\bibliographystyle{aer}
-\bibliography{wpref}
-\end{document}
+%%% use esvect pkg, uncomment following code
+% \RequirePackage{esvect}
\end{lstlisting}
-\nocite{*}
-
-% åŠææ³ä¿®æ¹åèæç®æ ·åŒïŒéåœæ ïŒïŒè¯·æäžè¡åæ¶æ³šéïŒå¹¶æ¢æåéçæ ·åŒïŒæ¯åŠ unsrtïŒplain æ ·åŒïŒã
-%\bibliographystyle{aer}
-\bibliography{wpref}
\end{document}
Binary files old/doc/latex/elegantpaper/elegantpaper-en.pdf and new/doc/latex/elegantpaper/elegantpaper-en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/elegantpaper/elegantpaper-en.tex new/doc/latex/elegantpaper/elegantpaper-en.tex
--- old/doc/latex/elegantpaper/elegantpaper-en.tex 2019-03-31 23:54:30.000000000 +0200
+++ new/doc/latex/elegantpaper/elegantpaper-en.tex 2020-04-12 23:31:37.000000000 +0200
@@ -1,192 +1,219 @@
%!TEX program = pdflatex
% Full chain: pdflatex -> bibtex -> pdflatex -> pdflatex
-\documentclass[11pt]{elegantpaper}
+\documentclass[11pt,en,cite=authoryear]{elegantpaper}
\title{ElegantPaper: An Elegant \LaTeX{} Template for Working Papers}
-\author{\href{https://ddswhu.me/}{Dongsheng Deng}}
+\author{Ethan DENG \\ Fudan University \and Dongsheng DENG \\ PA Technology}
\institute{\href{https://github.com/ElegantLaTeX}{Elegant\LaTeX{} Program}}
-\version{0.07}
+
+\version{0.09}
\date{\today}
+% cmd for this doc
+\usepackage{array}
+\newcommand{\ccr}[1]{\makecell{{\color{#1}\rule{1cm}{1cm}}}}
\begin{document}
\maketitle
\begin{abstract}
-\noindent This paper illustrates the usage of the \href{https://github.com/ElegantLaTeX/ElegantPaper}{ElegantPaper} template, which is designed for writing a working paper. This template is based on the standard \LaTeX{} article class. The goal of this template is to make the writing process easier and more comfortable. You can get rid of all the worries about the format. Just enjoy it! If you have any questions, suggestions or bug reports, you can visit \href{https://github.com/ElegantLaTeX/ElegantPaper/issues}{ElegantPaper/issues}. Looking for other templates designed by Elegant\LaTeX{} Group? Please visit: \href{https://github.com/ElegantLaTeX}{https://github.com/ElegantLaTeX}.\par
+This documentation illustrates the usage of the \href{https://github.com/ElegantLaTeX/ElegantPaper}{ElegantPaper} template. This template is based on the standard \LaTeX{} article class, which is designed for working paper writing. With this template, you can get rid of all the worries about the format and merely focus on writing. For any question, please leave a message on \href{https://github.com/ElegantLaTeX/ElegantPaper/issues}{GitHub::ElegantPaper/issues}. Want to know more about Elegant\LaTeX{} Templates? Please visit: \href{https://github.com/ElegantLaTeX}{https://github.com/ElegantLaTeX}.\par
\keywords{Elegant\LaTeX{}, Working Paper, Template}
\end{abstract}
\section{Introduction}
-This template is based on the standard \LaTeX{} article class, which means you can pass the arguments of article class to it (\lstinline{a4paper}, \lstinline{10pt} and etc.)( \lstinline{11pt} is recommended). It supports different engines, You can choose either \lstinline{PDFLaTeX} or \lstinline{XeLaTeX}\footnote{with \lstinline{ctex} package for Chinese fonts settings.}.
+This template is based on the standard \LaTeX{} article class, hence the arguments of article class are acceptable (\lstinline{a4paper}, \lstinline{10pt} and etc.). Alternative engines are \hologo{pdfLaTeX} and \hologo{XeLaTeX}.
-The effect of math fonts is as follow:
-\begin{equation}
-(a+3b)^{n} = \sum_{k=0}^{n} C_{n}^{k} a^{n-k} (3b)^k \label{eq:binom}
-\end{equation}
+\begin{lstlisting}
+\documentclass[a4paper,11pt]{elegantpaper}
+\end{lstlisting}
+\textbf{Note:} ElegantPaper is available on \href{https://www.overleaf.com/latex/templates/elegantpaper-template/yzghrqjhmmmr}{Overleaf} and \href{https://gitee.com/ElegantLaTeX/ElegantPaper}{gitee}.
\subsection{Global Options}
-I defined one option named \lstinline{lang}, this option has two alternative values, \lstinline{lang=en} (default) or \lstinline{lang=cn}. \lstinline{lang=cn} will make the caption of figure/table, abstract name, refname etc. Chinese, while \lstinline{lang=en} will keep all these stuff English, as the default article class sets. You can use this option as
-
+Language mode option \lstinline{lang} allows two alternative inputs, \lstinline{lang=en} (default) for English or \lstinline{lang=cn} for Chinese. \lstinline{lang=cn} will make the caption of figure/table, abstract name, refname etc. Chinese. You can use this option as
+\begin{lstlisting}
+\documentclass[lang=cn]{elegantpaper} % or
+\documentclass{cn}{elegantpaper}
+\end{lstlisting}
+\textbf{Note:} Under the English mode \lstinline{lang=en}, Chinese characters are not allowed. To type in Chinese, please load \lstinline{ctex} or \lstinline{xeCJK} package at the preamble as:
\begin{lstlisting}
-\documentclass[lang=en]{elegantpaper}
-\documentclass{en}{elegantpaper} % both ok
+\usepackage[UTF8,scheme=plain]{ctex}
\end{lstlisting}
-\subsection{Custom Commands}
+\subsection{Math Fonts}
+
+This template defines a new option (\lstinline{math}), with three options:
-I don't change any default command or environment, which means you can use all the basic \LaTeX{} commands and environments as before. Besides, I define 3 commands
\begin{enumerate}
- \item \lstinline{\email}: create the hyperlink to email address.
- \item \lstinline{\figref}: same usage as \lstinline{\ref}, but start with label text <\textbf{Figure n}>.
- \item \lstinline{\tabref}: same usage as \lstinline{\ref}, but start with label text <\textbf{Table n}>.
- \item \lstinline{\keywords}: create the keywords in the abstract section.
-\end{enumerate}{}
-
-\subsection{List Environments}
-You can use \lstinline{itemize}, \lstinline{enumerate}, or \lstinline{description} environment as below\\
-\begin{minipage}[c]{0.51\linewidth}
-\begin{lstlisting}
-\begin{itemize}
- \item Routing and resource discovery;
- \item Resilient and scalable networks;
- \item Distributed storage and search.
-\end{itemize}
-\end{lstlisting}
-\end{minipage}
-\begin{minipage}[c]{0.48\linewidth}
-\begin{itemize}
- \item Routing and resource discovery;
- \item Resilient and scalable networks;
- \item Distributed storage and search.
-\end{itemize}
-\end{minipage}
+ \item \lstinline{math=cm} (default), use \LaTeX{} default math font (recommended).
+ \item \lstinline{math=newtx}, use \lstinline{newtxmath} math font (may bring about bugs).
+ \item \lstinline{math=mtpro2}, use \lstinline{mtpro2} package to set math font.
+\end{enumerate}
-\subsection{Table}
-I strongly recommend you to use the \lstinline{booktabs} package in your paper. It adds three commands to make the table prettier, ie. \lstinline{\toprule}, \lstinline{\midrule} and \lstinline{\bottomrule}. \tabref{tab:reg} is an example.
-\begin{lstlisting}
-\begin{table}[htbp]
- \small
- \centering
- \caption{Auto MPG and Price \label{tab:reg}}
- \begin{tabular}{lcc}
- \toprule
- & (1) & (2) \\
- \midrule
- mpg & -238.90*** & -49.51 \\
- & (53.08) & (86.16) \\
- weight & & 1.75*** \\
- & & (0.641) \\
- constant & 11,253*** & 1,946 \\
- & (1,171) & (3,597) \\
- obs & 74 & 74 \\
- $R^2$ & 0.220 & 0.293 \\
- \bottomrule
- \multicolumn{3}{l}{\scriptsize Standard errors in parentheses} \\
- \multicolumn{3}{l}{\scriptsize *** p<0.01, ** p<0.05, * p<0.1} \\
- \end{tabular}%
-\end{table}%
-\end{lstlisting}
-\begin{table}[htbp]
- \small
- \centering
- \caption{Auto MPG and Price \label{tab:reg}}
- \begin{tabular}{lcc}
- \toprule
- & (1) & (2) \\
- \midrule
- mpg & -238.90*** & -49.51 \\
- & (53.08) & (86.16) \\
- weight & & 1.75*** \\
- & & (0.641) \\
- constant & 11,253*** & 1,946 \\
- & (1,171) & (3,597) \\
- obs & 74 & 74 \\
- $R^2$ & 0.220 & 0.293 \\
- \bottomrule
- \multicolumn{3}{l}{\scriptsize Standard errors in parentheses} \\
- \multicolumn{3}{l}{\scriptsize *** p<0.01, ** p<0.05, * p<0.1} \\
- \end{tabular}%
-\end{table}%
+\subsection{Custom Commands}
+Default \LaTeX{} commands and environments are all the same in this template\footnote{To ensure the codes are replicatable. We recommend users pay more attention to the contents other than formats. This is the meaning of the existence of the template.}. We created four new commands:
+\begin{enumerate}
+ \item \lstinline{\email}: create the hyperlink to email address.
+ \item \lstinline{\figref}: same usage as \lstinline{\ref}, but start with label text <\textbf{Figure n}>.
+ \item \lstinline{\tabref}: same usage as \lstinline{\ref}, but start with label text <\textbf{Table n}>.
+ \item \lstinline{\keywords}: create the keywords in the abstract section.
+\end{enumerate}
+\subsection{Bibliography}
+This template used \hologo{BibTeX} to generate the bibliography, the default bibliography style is \lstinline{aer} under the option \lstinline{lang=en}. Citation example: ~\citep{en1,en2,en3} used data from a major peer-to-peer lending marketplace in China to study whether female and male investors evaluate loan performance differently.
-\subsection{Graphics}
-To include a graphic, you can use figure environment as usual. \figref{fig:scatter} shows the effect. You can put all your images in the sub directories (\lstinline{./image/}, \lstinline{./img/}, \lstinline{./figure/}, \lstinline{./fig/}) of your current working directory.
+If you want to use \hologo{BibTeX}, you must create a file named \lstinline{wpref.bib}, and add bib items (from Google Scholar, Mendeley, EndNote, and etc.) to \lstinline{wpref.bib} file, and cite the bibkey in the \lstinline{tex} file. Note that \hologo{BibTeX} has to be added.
+Three options for the references, \lstinline{cite=numbers} (default), \lstinline{cite=super} and \lstinline{cite=authoryear}. Those who major in science and engineering use \lstinline{numbers} and \lstinline{super} more often, while those who major in arts use \lstinline{authoryear} more frequently. To switch different options, use
\begin{lstlisting}
-\begin{figure}[htbp]
+\documentclass[cite=super]{elegantpaper} % super style ref style
+\documentclass[super]{elegantpaper}
+
+\documentclass[cite=authoryear]{elegantpaper} % author-year ref style
+\documentclass[authoryear]{elegantpaper}
+\end{lstlisting}
+
+\section{Recruit Support Members}
+
+Recruit support members for Elegant\LaTeX{} to translate template official guide, maintain wiki entries(Markdown), update Wechat articles. No deadline for this recruitment.
+
+So far, Elegant\LaTeX{} has four support members:
+\begin{itemize}
+ \item OG Translator: \href{https://github.com/peggy2006xzyz}{YPY};
+ \item Wiki Maintainer: \href{https://github.com/izinngo}{Ingo Zinngo}, \href{https://github.com/xiaohao890809}{Xiaohao890809};
+ \item QQ Group Manager: \href{https://github.com/sikouhjw}{Sikouhjw}.
+\end{itemize}
+
+Thank them all!!!
+
+\section{Acknowledgement}
+The number of stars on GitHub for ElegantPaper reached 277 on April 12, 2020 at the release of ElegantPaper v0.09. Thank China\TeX{} and \href{http://www.latexstudio.net/}{\LaTeX{} studio} for their promotion. If you like our templates, you can star it on GitHub.
+\begin{figure}[!ht]
\centering
- \includegraphics[width=0.6\textwidth]{scatter.pdf}
- \caption{Scatter Plot Example \label{fig:scatter}}
+ \includegraphics[width=\textwidth]{star.png}
+ \caption{Twinkle, Twinkle, Little Star}
\end{figure}
-\end{lstlisting}
-\begin{figure}[htbp]
+
+\section{Donation}
+To express your love for our templates and/or our developers, please do not hesitate to tip us.
+\begin{figure}[!htbp]
\centering
- \includegraphics[width=0.6\textwidth]{scatter.pdf}
- \caption{Scatter Plot Example \label{fig:scatter}}
+ \includegraphics[width=0.4\textwidth]{donate.jpg}
\end{figure}
-\subsection{Bibliography}
-This template uses Bib\TeX{} to generate the bibliography, the default bibliography style is \lstinline{unsrt}. Let's take a glance at the citation effect, ~\cite{en3} use data from a major peer-to-peer lending marketplace in China to study whether female and male investors evaluate loan performance differently.
+\textbf{The explanation right of the tip usage belongs to Elegant\LaTeX{} with no supervision. Feel free to tip us.} Those who donate more than 10 RMB will be recorded in the donation list. Thank all the tippers!
-If you want to use Bib\TeX{}, you must create a file named \lstinline{wpref.bib}, and add bib items (from Google Scholar, Mendeley, EndNote, and etc.) to \lstinline{wpref.bib} file, and cite the bibkey in the \lstinline{tex} file. The Bib\TeX{} will automatically generate the bibliography for you for the reference you cited. If you want to add some noncited references or all of them to the bibliography, you can use
-\begin{lstlisting}
-\nocite{EINAV2010, Havrylchyk2018} % add two noncited references
-\nocite{*} % list all the references of the bib file.
-\end{lstlisting}
+\begin{table}[!htb]
+ \centering
+ \caption{Donation List}
+ \begin{tabular}{*{4}{>{\scriptsize}c}|*{4}{>{\scriptsize}c}}
+ \toprule
+ \textbf{Tipper} & \textbf{Amount} & \textbf{Date} & \textbf{Channel} & \textbf{Tipper} & \textbf{Amount} & \textbf{Date} & \textbf{Channel} \\
+ \midrule
+ Lerh & 10 RMB & 2019/05/15 & Wechat & yueguodipingxian & 10 RMB & 2019/05/15 & Wechat \\
+ yinsang & 20 RMB & 2019/05/27 & Wechat & *kong & 10 RMB & 2019/05/30 & Wechat \\
+ latexstudio.net & 666 RMB & 2019/06/05 & Alipay & A*n & 40 RMB & 2019/06/15 & Wechat \\
+ * xia & 22 RMB & 2019/06/15 & Wechat & * qian & 21 RMB & 2019/06/15 & Wechat \\
+ Cassis & 11 RMB & 2019/06/30 & Wechat & * jun & 10 RMB & 2019/07/23 & Wechat \\
+ P*u & 50 RMB & 2019/07/30 & Wechat & * meng & 19 RMB & 2019/08/28 & Wechat \\
+ Qu Doudou & 10 RMB & 2019/08/28 & Wechat & Li Bo & 100 RMB & 2019/10/06 & Wechat \\
+ Njustsll & 10 RMB & 2019/10/11 & Wechat & Liu Zhikuo & 99.99 RMB & 2019/10/15 & Alipay \\
+ * tao & 16 RMB & 2019/10/17 & Wechat & Chini & 12 RMB & 2019/10/17 & Alipay \\
+ yuanfengjing & 10 RMB & 2019/10/28 & Wechat & Guo Deliang & 88 RMB & 2019/11/03 & Wechat \\
+ ziqiangbuxi & 20 RMB & 2019/11/04 & Alipay & dushuzhichong & 20 RMB & 2019/11/18 & Wechat \\
+ * deng & 10 RMB & 2019/11/18 & Wechat & * zhe & 20 RMB & 2019/11/18 & Wechat \\
+ anonymous & 10 RMB & 2019/11/24 & Wechat & Jiye Qian & 66 RMB & 2019/12/04 & Wechat \\
+ * yang & 20 RMB & 2019/12/05 & Wechat & Catcher & 11 RMB & 2019/12/08 & Alipay \\
+ xierbotementu & 10 RMB & 2019/12/09 & Alipay & * wei & 10 RMB & 2019/12/09 & Wechat \\
+ Simon & 20 RMB & 2019/12/11 & Alipay & liushangqianyi & 66.60 RMB & 2019/12/18 & Alipay \\
+ yu & 10 RMB & 2019/12/20 & Alipay & *chen & 15 RMB & 2019/12/20 & Wechat \\
+ suifeng & 20 RMB & 2019/12/27 & Alipay & Ws & 23.30 RMB & 2019/12/28 & Wechat \\
+ chuba & 100 RMB & 2020/01/02 & Alipay & p*e & 20 RMB & 2020/01/03 & Wechat \\
+ Shunmx & 100 RMB & 2020/01/03 & Wechat & hj & 10 RMB & 2020/01/03 & Wechat \\
+ F*5 & 10 RMB & 2020/01/03 & Wechat & S*m & 20.20 RMB & 2020/01/03 & Wechat \\
+ erdaiqingzhi & 13 RMB & 2020/01/14 & Alipay & *? & 66 RMB & 2020/01/15 & Wechat \\
+ Mr. Xiong & 20 RMB & 2020/01/17 & Wechat & *bo & 15 RMB & 2020/01/18 & Wechat \\
+ *Zhe & 10 RMB & 2020/02/02 & Wechat & Jackie & 88.80 RMB & 2020/02/09 & Wechat \\
+ Henry\_Sun & 50 RMB & 2020/02/14 & Alipay & * Qiao & 50 RMB & 2020/02/21 & Wechat \\
+ YunLian & 10 RMB & 2020/03/02 & Alipay & S*y & 10 RMB & 2020/03/15 & Wechat \\
+ * Ge & 66.66 RMB & 2020/03/17 & Wechat & K*e & 30 RMB & 2020/03/30 & Wechat\\
+ * Yang & 20 RMB & 2020/04/02 & Wechat & Shi*n & 30 RMB & 2020/04/11 & Wechat \\
+ \bottomrule
+ \end{tabular}%
+ \label{tab:donation}%
+ \end{table}%
+
+\section{FAQ}
+
+\begin{enumerate}[label=\arabic*).]
+ \item \textit{How to remove the information of version?}\\
+ Please comment \lstinline|\version{x.xx}|.
+ \item \textit{How to remove the information of date?}\\
+ Please type in \lstinline|\date{}|.
+ \item \textit{How to add several authors?}\\
+ Use \lstinline{\and} in \lstinline{\author} and use \lstinline{\\} to start a new line.
+ \begin{lstlisting}
+ \author{author 1\\ org. 1 \and author 2 \\ org. 2 }
+ \end{lstlisting}
+ \item \textit{How to display bilingual abstracts?}\\
+ Please refer to \href{https://github.com/ElegantLaTeX/ElegantPaper/issues/5}{GitHub::ElegantPaper/issues/5}
+\end{enumerate}
-If you want to change the bibliography style, you can replace \lstinline{aer} for the prefered style, for example, the \lstinline{unsrt} style.
-\begin{lstlisting}
-\bibliographystyle{unsrt}
-\end{lstlisting}
+\nocite{en1,en2}
-\section{A Minimal Example}
-In this section, we give a simple example using this template.
+\bibliography{wpref}
-\begin{lstlisting}
-\documentclass[lang=en]{elegantpaper}
+\appendix
+%\appendixpage
+\addappheadtotoc
-% title information
-\title{A Working Paper Example}
-\author{ddswhu}
-\institute{Elegant\LaTeX{} Group}
-\version{1.00}
-\date{\today}
-\begin{document}
+\section{Use newtx fonts}
+If you use \lstinline{newtx} fonts, type in:
-\maketitle
+\begin{lstlisting}
+\documentclass[math=newtx]{elegantbook}
+\end{lstlisting}
-\begin{abstract}
-Your abstract goes here.
-\keywords{keyword1, keyword2}
-\end{abstract}
-\section{Introduction}
-The content of introduction section.
+\subsection{Hyphens}
+Since the template uses \lstinline{newtx}, please pay attention to the hyphens. For instance,
+\begin{equation}
+\int_{R^q} f(x,y) dy.\emph{of\kern0pt f}
+\end{equation}
-\section{Conclusion}
-The content of conclusion section.
+The corresponding code is:
+\begin{lstlisting}
+\begin{equation}
+\int_{R^q} f(x,y) dy.\emph{of \kern0pt f}
+\end{equation}
+\end{lstlisting}
-% include the noncited reference
-\nocite{ref1, ref2}
-\bibliographystyle{aer}
-\bibliography{wpref}
-\end{document}
+\subsection{Symbol Fonts}
+Feedback from ElegantBook users claims that error occurs when using our templates with \lstinline{yhmath}, \lstinline{esvect} and other packages.
+\begin{lstlisting}
+LaTeX Error:
+Too many symbol fonts declared.
\end{lstlisting}
-\nocite{en1,en2}
+The reason is that the template redefines font for math so that no new math font is allowed to be added. To use \lstinline{yhmath} and/or \lstinline{esvect}, please locate \lstinline{yhmath} or \lstinline{esvect} in \lstinline{elegantpaper.cls}, uncomment corresponding related code.
-% If you want change the bibliography style, replace aer with the prefered one.
-\bibliographystyle{aer}
+\begin{lstlisting}
+%%% use yhmath pkg, uncomment following code
+% \let\oldwidering\widering
+% \let\widering\undefined
+% \RequirePackage{yhmath}
+% \let\widering\oldwidering
-\bibliography{wpref}
+%%% use esvect pkg, uncomment following code
+% \RequirePackage{esvect}
+\end{lstlisting}
\end{document}
Binary files old/doc/latex/elegantpaper/figure/ElegantLaTeX.png and new/doc/latex/elegantpaper/figure/ElegantLaTeX.png differ
Binary files old/doc/latex/elegantpaper/figure/scatter.pdf and new/doc/latex/elegantpaper/figure/scatter.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/elegantpaper/figure/scatter.py new/doc/latex/elegantpaper/figure/scatter.py
--- old/doc/latex/elegantpaper/figure/scatter.py 2019-01-12 23:54:57.000000000 +0100
+++ new/doc/latex/elegantpaper/figure/scatter.py 1970-01-01 01:00:00.000000000 +0100
@@ -1,27 +0,0 @@
-# This file is the source file of the scatter.pdf
-# source page: https://matplotlib.org/gallery/shapes_and_collections/scatter.html
-import numpy as np
-import matplotlib.pyplot as plt
-
-# Fixing random state for reproducibility
-np.random.seed(19680801)
-
-
-N = 50
-x = np.random.rand(N)
-y = np.random.rand(N)
-colors = np.random.rand(N)
-area = (30 * np.random.rand(N))**2 # 0 to 15 point radii
-
-ax = plt.subplot(111)
-ax.scatter(x, y, s=area, c=colors, alpha=0.5)
-
-# Hide the right and top spines
-ax.spines['right'].set_visible(False)
-ax.spines['top'].set_visible(False)
-
-# Only show ticks on the left and bottom spines
-ax.yaxis.set_ticks_position('left')
-ax.xaxis.set_ticks_position('bottom')
-
-plt.savefig('scatter.pdf', transparent=True)
Binary files old/doc/latex/elegantpaper/image/donate.jpg and new/doc/latex/elegantpaper/image/donate.jpg differ
Binary files old/doc/latex/elegantpaper/image/founder.png and new/doc/latex/elegantpaper/image/founder.png differ
Binary files old/doc/latex/elegantpaper/image/star.png and new/doc/latex/elegantpaper/image/star.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/elegantpaper/wpref.bib new/doc/latex/elegantpaper/wpref.bib
--- old/doc/latex/elegantpaper/wpref.bib 2019-03-31 23:54:30.000000000 +0200
+++ new/doc/latex/elegantpaper/wpref.bib 2019-10-17 22:48:24.000000000 +0200
@@ -34,6 +34,7 @@
@article{cn1,
author = {æ¹åé},
+ key = {fang1 jun1 xiong2},
title = {{ææå¶ãå¶åºŠç¯å¢äžä¿¡èŽ·èµéé
眮}},
journal = {ç»æµç 究},
number = {12},
@@ -45,6 +46,7 @@
@article{cn2,
author = {åå€è¯ and ç« æœè and äºæ³œ},
+ key = {liu2 feng4 liang2 zhang1 xiao1 meng2 yu2 ze2},
title = {{é«æèµãç»æ倱衡äžä»·æ Œææ°äºå
åå}},
journal = {éèç 究},
number = {02},
@@ -56,6 +58,7 @@
@article{cn3,
author = {åæ· and çé«æ},
+ key = {lv3 jie2 wang2 gao1 wang4},
title = {{CPI äž PPI âè犻âçç»ææ§è§£é}},
journal = {ç»æµç 究},
volume = {50},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elegantpaper.doc.tlpobj new/tlpkg/tlpobj/elegantpaper.doc.tlpobj
--- old/tlpkg/tlpobj/elegantpaper.doc.tlpobj 2019-04-01 02:24:56.000000000 +0200
+++ new/tlpkg/tlpobj/elegantpaper.doc.tlpobj 2020-04-16 01:56:57.000000000 +0200
@@ -1,16 +1,16 @@
name elegantpaper.doc
category Package
-revision 50679
+revision 54758
shortdesc doc files of elegantpaper
relocated 1
-docfiles size=132
+docfiles size=309
RELOC/doc/latex/elegantpaper/License
RELOC/doc/latex/elegantpaper/README.md
RELOC/doc/latex/elegantpaper/elegantpaper-cn.pdf
RELOC/doc/latex/elegantpaper/elegantpaper-cn.tex
RELOC/doc/latex/elegantpaper/elegantpaper-en.pdf
RELOC/doc/latex/elegantpaper/elegantpaper-en.tex
- RELOC/doc/latex/elegantpaper/figure/ElegantLaTeX.png
- RELOC/doc/latex/elegantpaper/figure/scatter.pdf
- RELOC/doc/latex/elegantpaper/figure/scatter.py
+ RELOC/doc/latex/elegantpaper/image/donate.jpg
+ RELOC/doc/latex/elegantpaper/image/founder.png
+ RELOC/doc/latex/elegantpaper/image/star.png
RELOC/doc/latex/elegantpaper/wpref.bib
++++++ elegantpaper.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/elegantpaper/elegantpaper.cls new/tex/latex/elegantpaper/elegantpaper.cls
--- old/tex/latex/elegantpaper/elegantpaper.cls 2019-03-31 23:54:30.000000000 +0200
+++ new/tex/latex/elegantpaper/elegantpaper.cls 2020-04-12 23:31:37.000000000 +0200
@@ -1,17 +1,13 @@
-% Current Version: 0.07
% Author: Dongsheng Deng
% Homepage: https://ddswhu.me/
% Email: elegantlatex2e(a)gmail.com
% Lastest Version: https://github.com/ElegantLaTeX/ElegantPaper
% --- Class structure: identification part
-\ProvidesClass{elegantpaper}[2019/04/01 v0.07 ElegantLaTeX Paper class]
+\ProvidesClass{elegantpaper}[2020/04/12 v0.09 ElegantLaTeX Paper class]
\NeedsTeXFormat{LaTeX2e}
-
\RequirePackage{kvoptions}
-\RequirePackage{ifthen}
-\RequirePackage{ifxetex}
\RequirePackage{etoolbox}
\RequirePackage{calc}
@@ -19,37 +15,70 @@
\newcommand{\ekv}[1]{\kvsetkeys{ELEGANT}{#1}}
\DeclareStringOption[en]{lang}
-\DeclareVoidOption{cn}{\ekv{lang = cn}}
-\DeclareVoidOption{en}{\ekv{lang = en}}
+\DeclareVoidOption{cn}{\ekv{lang=cn}}
+\DeclareVoidOption{en}{\ekv{lang=en}}
-% \PassOptionsToClass{11pt}{article}
+\DeclareStringOption[cm]{math}
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
-\ProcessOptions\relax
-\ProcessKeyvalOptions*\relax
-\LoadClass{article}
+\DeclareStringOption[numbers]{cite}
+\DeclareVoidOption{numbers}{\ekv{cite=numbers}}
+\DeclareVoidOption{authoryear}{\ekv{cite=authoryear}}
+\DeclareVoidOption{super}{\ekv{cite=super}}
+\DeclareStringOption[apalike]{bibstyle}
+\DeclareStringOption[ctexfont]{chinesefont}
+\DeclareVoidOption{ctexfont}{\ekv{chinesefont=ctexfont}}
+\DeclareVoidOption{founder}{\ekv{chinesefont=founder}}
+\DeclareVoidOption{nofont}{\ekv{chinesefont=nofont}}
-\RequirePackage{amsthm}
-\RequirePackage{amsmath,amssymb}
+\DeclareVoidOption{newtx}{\ekv{math=newtx}}
+\DeclareVoidOption{mtpro2}{\ekv{math=mtpro2}}
+\DeclareVoidOption{cm}{\ekv{math=cm}}
-\linespread{1.35}
+\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{article}}
+\ProcessKeyvalOptions*\relax
+\LoadClass{article}
+\RequirePackage{hyperref}
+\hypersetup{
+ pdfborder={0 0 0},
+ colorlinks=true,
+ linkcolor={winered},
+ urlcolor={winered},
+ filecolor={winered},
+ citecolor={winered},
+ linktoc=all,
+}
+% settings for the hyperref and geometry
+\RequirePackage[
+ left=1in,
+ right=1in,
+ top=1in,
+ bottom=1in,
+ headheight=0pt,
+ headsep=0pt]{geometry}
+\setlength{\headsep}{5pt}
-% indentation, table and figure package
+\RequirePackage{amsthm}
+\RequirePackage{amsmath}
+\RequirePackage{amssymb}
\RequirePackage{indentfirst}
\RequirePackage{booktabs}
\RequirePackage{multicol}
+\RequirePackage{multirow}
+% \RequirePackage{linegoal}
\RequirePackage{xcolor}
\RequirePackage{graphicx}
\RequirePackage{fancyvrb}
\RequirePackage{abstract}
+\RequirePackage{hologo}
+\linespread{1.35}
\graphicspath{{image/}{figure/}{fig/}{img/}}
% caption settings
-\RequirePackage[font=small,labelfont={bf}]{caption}
+\RequirePackage[font=small,labelfont={bf}]{caption}
\captionsetup[table]{skip=3pt}
\captionsetup[figure]{skip=3pt}
@@ -57,90 +86,165 @@
\RequirePackage[shortlabels,inline]{enumitem}
\setlist{nolistsep}
+
% define the hyperref color
\RequirePackage{xcolor}
\definecolor{winered}{rgb}{0.5,0,0}
-% bib-settings
-\RequirePackage{natbib}
-\setlength{\bibsep}{0.0pt}
-\def\bibfont{\footnotesize}
+\definecolor{lightgrey}{rgb}{0.95,0.95,0.95}
+\definecolor{commentcolor}{RGB}{0,100,0}
+\definecolor{frenchplum}{RGB}{190,20,83}
-% settings for the geometry
-\RequirePackage{hyperref}
-\hypersetup{
- pdfborder={0 0 0},
- colorlinks=true,
- linkcolor={winered},
- urlcolor={winered},
- filecolor={winered},
- citecolor={winered},
- linktoc=all,
-}
-\RequirePackage[left=1in, right=1in, top=1in, bottom=1in]{geometry}
-% add the \email cmd
+% add the email cmd
\newcommand\email[1]{\href{mailto:#1}{\nolinkurl{#1}}}
+% font settings
+
\PassOptionsToPackage{no-math}{fontspec}
-\RequirePackage[UTF8, scheme=plain]{ctex}
-\RequirePackage[T1]{fontenc}
+\ifdefstring{\ELEGANT@lang}{cn}{
+ \ifXeTeX
+ \ifdefstring{\ELEGANT@chinesefont}{founder}{
+ \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}
+ \setCJKmainfont[BoldFont={FZHei-B01},ItalicFont={FZKai-Z03}]{FZShuSong-Z01}
+ \setCJKsansfont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZHei-B01}
+ \setCJKmonofont[BoldFont={FZHei-B01},ItalicFont={FZHei-B01}]{FZFangSong-Z02}
+ \setCJKfamilyfont{zhsong}{FZShuSong-Z01}
+ \setCJKfamilyfont{zhhei}{FZHei-B01}
+ \setCJKfamilyfont{zhkai}{FZKai-Z03}
+ \setCJKfamilyfont{zhfs}{FZFangSong-Z02}
+ \newcommand*{\songti}{\CJKfamily{zhsong}}
+ \newcommand*{\heiti}{\CJKfamily{zhhei}}
+ \newcommand*{\kaishu}{\CJKfamily{zhkai}}
+ \newcommand*{\fangsong}{\CJKfamily{zhfs}}}{\relax}
+
+ \ifdefstring{\ELEGANT@chinesefont}{nofont}{
+ \RequirePackage[UTF8,scheme=plain,fontset=none]{ctex}}{\relax}
+
+ \ifdefstring{\ELEGANT@chinesefont}{ctexfont}{
+ \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
+ \else
+ \ifdefstring{\ELEGANT@chinesefont}{ctexfont}{
+ \RequirePackage[UTF8,scheme=plain]{ctex}}{\relax}
+ \fi
+ \AfterEndPreamble{
+ % \renewcommand{\itshape}{\kaishu}
+ \setlength\parindent{2\ccwd}}}{\relax}
+
+\ifcsname kaishu\endcsname
+ \newcommand{\citshape}{\kaishu}
+\else
+ \newcommand{\citshape}{\itshape}
+\fi
+\ifcsname kaishu\endcsname
+ \newcommand{\cnormal}{\kaishu}
+\else
+ \newcommand{\cnormal}{\normalfont}
+\fi
+
+\ifcsname fangsong\endcsname
+ \newcommand{\cfs}{\fangsong}
+\else
+ \newcommand{\cfs}{\normalfont}
+\fi
+
\RequirePackage{newtxtext}
-\RequirePackage{newtxmath}
+\ifdefstring{\ELEGANT@math}{newtx}{
+ \RequirePackage{newtxmath}
+ \let\Bbbk\relax
+ \RequirePackage{esint}
+ %%% use yhmath pkg, uncomment following code
+ % \let\oldwidering\widering
+ % \let\widering\undefined
+ % \RequirePackage{yhmath}
+ % \let\widering\oldwidering
+
+ %%% use esvect pkg, uncomment following code
+ % \RequirePackage{esvect}
+
+ \DeclareSymbolFont{CMlargesymbols}{OMX}{cmex}{m}{n}
+ \let\sumop\relax\let\prodop\relax
+ \DeclareMathSymbol{\sumop}{\mathop}{CMlargesymbols}{"50}
+ \DeclareMathSymbol{\prodop}{\mathop}{CMlargesymbols}{"51}
+}{\relax}
+\RequirePackage{appendix}
\ifdefstring{\ELEGANT@lang}{cn}{
- \theoremstyle{plain}% default
- \newtheorem{theorem}{å®ç}[section] %
- \newtheorem{lemma}[theorem]{åŒç} %
- \newtheorem{proposition}[theorem]{æ§èŽš} %
- \newtheorem*{corollary}{æšè®º} %
- \theoremstyle{definition} %
- \newtheorem{definition}{å®ä¹}[section] %
- \newtheorem{conjecture}{çæ³}[section] %
- \newtheorem{example}{äŸ}[section] %
- \theoremstyle{remark} %
- \newtheorem*{remark}{\normalfont\bfseries è¯è®º} %
- \newtheorem*{note}{\normalfont\bfseries 泚} %
- \newtheorem{case}{\normalfont\bfseries æ¡äŸ} %
- \renewcommand*{\proofname}{\normalfont\bfseries è¯æ} %
- \renewcommand\contentsname{ç®åœ}
- \renewcommand\refname{åèæç®} %
- \renewcommand\figurename{åŸ} %
- \renewcommand\tablename{è¡š}%
- \newcommand\versiontext{\itshape çæ¬ïŒ}%
- \newcommand\updatetext{\itshape æŽæ°ïŒ}%
- \renewcommand\abstractname{æ\hspace{2em}èŠ}
- \setlength{\parindent}{2em}
- \renewcommand{\abstracttextfont}{\small\sffamily\kaishu}
- \newcommand{\keywords}[1]{\vskip2ex\par\noindent\normalfont{\bfseries å
³é®è¯: } #1}
- \newcommand\figref[1]{{\bfseries åŸ~\ref{#1}}}
- \newcommand\tabref[1]{{\bfseries è¡š~\ref{#1}}}
-}{\relax}
+ \theoremstyle{plain}% default
+ \newtheorem{theorem}{å®ç}[section] %
+ \newtheorem{lemma}[theorem]{åŒç} %
+ \newtheorem{proposition}[theorem]{åœé¢} %
+ \newtheorem*{corollary}{æšè®º} %
+ \theoremstyle{definition} %
+ \newtheorem{definition}{å®ä¹}[section] %
+ \newtheorem{conjecture}{çæ³}[section] %
+ \newtheorem{example}{äŸ}[section] %
+ \theoremstyle{remark} %
+ \newtheorem*{remark}{\normalfont\bfseries è¯è®º} %
+ \newtheorem*{note}{\normalfont\bfseries 泚} %
+ \newtheorem{case}{\normalfont\bfseries æ¡äŸ} %
+ \renewcommand*{\proofname}{\normalfont\bfseries è¯æ} %
+ \renewcommand\contentsname{ç®åœ}
+ \renewcommand\refname{åèæç®} %
+ \renewcommand\figurename{åŸ} %
+ \renewcommand\tablename{è¡š}%
+ \newcommand\versiontext{çæ¬ïŒ}%
+ \newcommand\updatetext{æ¥æïŒ}%
+ \renewcommand\abstractname{æ\hspace{2em}èŠ}
+ \setlength\parindent{2\ccwd}
+ \renewcommand{\abstracttextfont}{\small\citshape\noindent\ignorespaces}
+ % æ°å®ä¹åœä»€
+ \newcommand{\keywords}[1]{\vskip2ex\par\noindent\normalfont{\bfseries å
³é®è¯: } #1}
+ \newcommand\figref[1]{{\bfseries åŸ~\ref{#1}}}
+ \newcommand\tabref[1]{{\bfseries è¡š~\ref{#1}}}
+ \RequirePackage{gbt7714}
+ \ifdefstring{\ELEGANT@cite}{authoryear}{
+ \bibliographystyle{gbt7714-author-year}}{
+ \bibliographystyle{gbt7714-numerical}}
+ \ifdefstring{\ELEGANT@cite}{numbers}{
+ \citestyle{numbers}}{\relax}
+ \renewcommand{\appendixtocname}{éåœ}
+ \renewcommand{\appendixpagename}{éåœ}}{\relax}
+
\ifdefstring{\ELEGANT@lang}{en}{
\theoremstyle{plain}% default
- \newtheorem{theorem}{Theorem}[section] %
- \newtheorem{lemma}[theorem]{Lemma} %
- \newtheorem{proposition}[theorem]{Proposition} %
- \newtheorem*{corollary}{Corollary} %
- \theoremstyle{definition} %
- \newtheorem{definition}{Definition}[section] %
- \newtheorem{conjecture}{Conjecture}[section] %
- \newtheorem{example}{Example}[section] %
- \theoremstyle{remark} %
- \newtheorem*{remark}{Remark} %
- \newtheorem*{note}{Note} %
- \newtheorem{case}{Case} %
- \renewcommand*{\proofname}{\normalfont\bfseries Proof}%
- \newcommand\versiontext{\itshape Version: }%
- \newcommand\updatetext{\itshape Update: }%
- \renewcommand{\abstracttextfont}{\sffamily\small\kaishu}
- \newcommand{\keywords}[1]{\vskip2ex\par\noindent\normalfont{\bfseries Keywords: } #1}
- \newcommand\figref[1]{{\bfseries Figure~\ref{#1}}}
- \newcommand\tabref[1]{{\bfseries Table~\ref{#1}}}
-}{\relax}
+ \newtheorem{theorem}{Theorem}[section] %
+ \newtheorem{lemma}[theorem]{Lemma} %
+ \newtheorem{proposition}[theorem]{Proposition} %
+ \newtheorem*{corollary}{Corollary} %
+ \theoremstyle{definition} %
+ \newtheorem{definition}{Definition}[section] %
+ \newtheorem{conjecture}{Conjecture}[section] %
+ \newtheorem{example}{Example}[section] %
+ \theoremstyle{remark} %
+ \newtheorem*{remark}{Remark} %
+ \newtheorem*{note}{Note} %
+ \newtheorem{case}{Case} %
+ \renewcommand*{\proofname}{\normalfont\bfseries Proof}%
+ \newcommand\versiontext{\itshape Version: }%
+ \newcommand\updatetext{\itshape Date: }%
+ \setlength\parindent{2em}
+ \renewcommand{\abstracttextfont}{\sffamily\small\noindent\ignorespaces}
+ % newcommands defined in this template.
+ \newcommand{\keywords}[1]{\vskip 2ex\par\noindent\normalfont{\bfseries Keywords: } #1}
+ \newcommand\figref[1]{{\bfseries Figure~\ref{#1}}}
+ \newcommand\tabref[1]{{\bfseries Table~\ref{#1}}}
+ \RequirePackage[\ELEGANT@cite,sort&compress]{natbib}
+ \bibliographystyle{\ELEGANT@bibstyle}}{\relax}
+
+\setlength{\bibsep}{0.0pt}
+\def\bibfont{\footnotesize}
\AtBeginEnvironment{verbatim}{\microtypesetup{activate=false}}
+\BeforeBeginEnvironment{tabular}{\small}
+\AfterEndEnvironment{tabular}{}
+
+\AtBeginDocument{
+ \setlength{\abovedisplayskip}{3pt}
+ \setlength{\belowdisplayskip}{3pt}
+ \RequirePackage[flushmargin]{footmisc}
+ \setlength{\footnotesep}{12pt}}
\def\IfEmpty#1{%
\edef\1{\the#1}
@@ -148,13 +252,13 @@
}
\newtoks\version
\newtoks\institute
-\def \ifempty#1{\def\temp{#1} \ifx\temp\empty }
+
\renewcommand\maketitle{\par
\begingroup
\renewcommand\thefootnote{\@fnsymbol\c@footnote}%
\def\@makefnmark{\rlap{\@textsuperscript{\normalfont\@thefnmark}}}%
\long\def\@makefntext##1{\parindent 1em\noindent
- \hb@xt@1.8em{%
+ \hb@xt@0.1em{%
\hss\@textsuperscript{\normalfont\@thefnmark}}##1}%
\if@twocolumn
\ifnum \col@number=\@ne
@@ -195,76 +299,49 @@
{\large
\lineskip .5em%
\begin{tabular}[t]{c}%
- \@author\\
- \the\institute
- \end{tabular}\par}%
-\vskip 1.5em%
+ \@author\\[1ex]
+ \end{tabular}\par}
+ \the\institute%
+\vskip 0.5ex%
\IfEmpty\version
\else
-{\small \normalfont\kaishu \versiontext \itshape\the\version}
+{\small\normalfont\citshape\versiontext\the\version}
\fi
\ifx\@date\empty
\else
\vskip 0.1em%
- {\small\normalfont\kaishu \updatetext \itshape \@date}%
+ {\small\normalfont\citshape\updatetext\@date}%
\fi
\end{center}%
\par
}
-
-
-\DeclareSymbolFont{CMletters} {OML}{cmm} {m}{it}%
-\DeclareSymbolFont{CMsymbols} {OMS}{cmsy}{m}{n}%
-\DeclareSymbolFont{CMlargesymbols}{OMX}{cmex}{m}{n}%
-
-% \let\sum\relax
-% \DeclareMathSymbol{\sum}{\mathop}{CMlargesymbols}{"50}%
-% \let\int\relax
-% \DeclareMathSymbol{\int}{\mathop}{CMlargesymbols}{"5A}%
-
-\let\intop\relax\let\sumop\relax\let\ointop\relax\let\prodop\relax
-\DeclareMathSymbol{\sumop}{\mathop}{CMlargesymbols}{"50}
-\DeclareMathSymbol{\intop}{\mathop}{CMlargesymbols}{"52}
-\DeclareMathSymbol{\ointop}{\mathop}{CMlargesymbols}{"49}
-\DeclareMathSymbol{\prodop}{\mathop}{CMlargesymbols}{"59}
-
-% \let\partial\relax
-% \DeclareMathSymbol{\partial}{\mathord}{CMletters}{"40}%
-% \let\in\relax
-%\DeclareMathSymbol{\in}{\mathrel}{CMsymbols}{"32}%
-% \let\pi\relax
-% \DeclareMathSymbol{\pi}{\mathord}{CMletters}{"19}
-
-
-
-\RequirePackage{listings}
+\RequirePackage{listings}
\renewcommand{\ttdefault}{cmtt}
-\lstdefinestyle{mystyle}{
+
+\lstdefinestyle{estyle}{
basicstyle=%
\ttfamily
\lst@ifdisplaystyle\footnotesize\fi
}
+\lstset{basicstyle=\scriptsize\ttfamily,style=estyle}
-\lstset{basicstyle=\scriptsize\ttfamily,style=mystyle}
-
-\definecolor{lightgrey}{rgb}{0.9,0.9,0.9}
-\definecolor{frenchplum}{RGB}{190,20,83}
\lstset{language=[LaTeX]TeX,
texcsstyle=*\color{winered},
numbers=none,
breaklines=true,
keywordstyle=\color{winered},
- commentstyle=\color{gray},
- emph={elegantpaper,fontenc,fontspec,xeCJK,FiraMono,xunicode,newtxmath,figure,fig,image,img,table,itemize,enumerate,newtxtext,newtxtt,ctex,microtype,description,times,newtx,booktabs,tabular,PDFLaTeX,XeLaTeX,type1cm,BibTeX},
+ frame=tlbr,framesep=4pt,framerule=0pt,
+ commentstyle=\color{commentcolor},
+ emph={elegantpaper,fontenc,fontspec,xeCJK,FiraMono,xunicode,newtxmath,figure,fig,image,img,table,itemize,enumerate,newtxtext,newtxtt,ctex,microtype,description,times,newtx,booktabs,tabular,PDFLaTeX,XeLaTeX,type1cm,BibTeX,cite,gbt7714,lang},
emphstyle={\color{frenchplum}},
- morekeywords={DeclareSymbolFont,SetSymbolFont,toprule,midrule,bottomrule,institute,version,includegraphics,setmainfont,setsansfont,setmonofont ,setCJKmainfont,setCJKsansfont,setCJKmonofont,RequirePackage,figref,tabref,email,maketitle,keywords},
- frame=none,
+ morekeywords={DeclareSymbolFont,SetSymbolFont,toprule,midrule,bottomrule,institute,version,includegraphics,setmainfont,setsansfont,setmonofont ,setCJKmainfont,setCJKsansfont,setCJKmonofont,RequirePackage,figref,tabref,email,maketitle,keywords,zhdate,zhtoday},
tabsize=2,
backgroundcolor=\color{lightgrey}
}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elegantpaper.tlpobj new/tlpkg/tlpobj/elegantpaper.tlpobj
--- old/tlpkg/tlpobj/elegantpaper.tlpobj 2019-04-01 02:24:56.000000000 +0200
+++ new/tlpkg/tlpobj/elegantpaper.tlpobj 2020-04-16 01:56:57.000000000 +0200
@@ -1,20 +1,19 @@
name elegantpaper
category Package
-revision 50679
+revision 54758
shortdesc An Elegant LaTeX Template for Working Papers
relocated 1
longdesc ElegantPaper is designed for writing working papers, especially
longdesc for economics students. This template is based on the standard
longdesc LaTeX article class. The goal of this template is to make the
longdesc writing process easier and more comfortable.
-runfiles size=2
+runfiles size=3
RELOC/tex/latex/elegantpaper/elegantpaper.cls
catalogue-contact-announce https://elegantlatex.org/
catalogue-contact-home https://elegantlatex.org/
catalogue-contact-repository https://github.com/ElegantLaTeX/ElegantPaper/
catalogue-contact-support https://github.com/ElegantLaTeX/ElegantPaper/issues
catalogue-ctan /macros/latex/contrib/elegantpaper
-catalogue-date 2019-03-31 19:57:20 +0200
catalogue-license lppl1.3c
catalogue-topics class
-catalogue-version 0.07
+catalogue-version 0.09
++++++ elements.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/elements/README new/doc/latex/elements/README
--- old/doc/latex/elements/README 2018-01-31 23:00:24.000000000 +0100
+++ new/doc/latex/elements/README 2019-10-16 00:00:30.000000000 +0200
@@ -1,15 +1,14 @@
--------------------------------------------------------------------------
-the ELEMENTS package v0.2c
+the ELEMENTS package v0.3 2019/10/14
retrieve different properties of chemical elements
-2018/01/31
--------------------------------------------------------------------------
Clemens Niederberger
Web: https://github.com/cgnieder/elements/
E-Mail: contact(a)mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2015--2018 Clemens Niederberger
+Copyright 2011--2019 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -26,8 +25,9 @@
The elements package consists of the files
- elements.sty
- elements_en.tex, elements_en.pdf
- - elements_names_english.def, elements_names_german.def,
- elements_names_french.def, elements_names_spanish.def
+ - elements_names_brazil.def, elements_names_english.def,
+ elements_names_french.def, elements_names_german.def,
+ elements_names_portuges.def, elements_names_spanish.def
- README
--------------------------------------------------------------------------
If you have any ideas, questions, suggestions or bugs to report, please
Binary files old/doc/latex/elements/elements_en.pdf and new/doc/latex/elements/elements_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/elements/elements_en.tex new/doc/latex/elements/elements_en.tex
--- old/doc/latex/elements/elements_en.tex 2018-01-31 23:00:24.000000000 +0100
+++ new/doc/latex/elements/elements_en.tex 2019-10-16 00:00:30.000000000 +0200
@@ -12,7 +12,7 @@
% Web: http://www.mychemistry.eu/forums/forum/elements/
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2015--2018 Clemens Niederberger
+% Copyright 2011--2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -37,7 +37,7 @@
package = elements ,
authors = Clemens Niederberger ,
email = contact(a)mychemistry.eu ,
- url = http://www.mychemistry.eu/forums/forum/elements/ ,
+ url = https://github.com/cgnieder/elements ,
add-cmds = {
atomicnumber,
DeclareAtomIsotopes,
@@ -71,7 +71,7 @@
This package provides means for retrieving properties of chemical elements
like atomic number, element symbol, element name, electron distribution or
isotope number. Properties are defined for the elements up to the atomic
- number~112.
+ number~118.
This package is a spin-off of the package \pkg{bohr}~\cite{pkg:bohr} by
the same author.
@@ -87,9 +87,14 @@
}
}
-\expandafter\def\csname libertine@figurestyle\endcsname{LF}
-\usepackage[libertine]{newtxmath}
-\expandafter\def\csname libertine@figurestyle\endcsname{OsF}
+\makeatletter
+\def\libertine@figurestyle{LF}
+\RequirePackage{amsmath}
+\undef\lvert \undef\lVert
+\undef\rvert \undef\rVert
+\RequirePackage[libertine]{newtxmath}
+\def\libertine@figurestyle{OsF}
+\makeatother
\usepackage{array,booktabs,longtable}
\usepackage{lscape}
@@ -259,6 +264,16 @@
\clearpage
+\section{Supported Languages}
+Currently the following languages are supported:
+\begin{itemize}
+ \item English
+ \item German
+ \item French
+ \item \sinceversion{0.2}Spanish
+ \item \sinceversion{0.3}Portuguese and Brazilian Portuguese
+\end{itemize}
+
\addsec{Element Properties}
On the following pages a table containing the properties known to \elements\
@@ -277,7 +292,7 @@
Number & Symbol & Name & Main Isotope & Electron Configuration \\
\midrule
\endhead
- \whileboolexpr{test{\ifnumless{\value{element}}{113}}}
+ \whileboolexpr{test{\ifnumless{\value{element}}{119}}}
{
\theelement &
\elementsymbol{\arabic{element}} &
@@ -301,7 +316,7 @@
Number & Symbol & Name & Main Isotope & Electron Configuration \\
\midrule
\endhead
- \whileboolexpr{test{\ifnumless{\value{element}}{113}}}
+ \whileboolexpr{test{\ifnumless{\value{element}}{119}}}
{
\theelement &
\elementsymbol{\arabic{element}} &
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elements.doc.tlpobj new/tlpkg/tlpobj/elements.doc.tlpobj
--- old/tlpkg/tlpobj/elements.doc.tlpobj 2019-02-28 03:35:12.000000000 +0100
+++ new/tlpkg/tlpobj/elements.doc.tlpobj 2019-10-16 02:05:37.000000000 +0200
@@ -1,9 +1,9 @@
name elements.doc
category Package
-revision 46505
+revision 52398
shortdesc doc files of elements
relocated 1
-docfiles size=103
+docfiles size=104
RELOC/doc/latex/elements/README
RELOC/doc/latex/elements/elements_en.pdf
RELOC/doc/latex/elements/elements_en.tex
++++++ elements.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/elements/elements.sty new/tex/latex/elements/elements.sty
--- old/tex/latex/elements/elements.sty 2018-01-31 23:00:24.000000000 +0100
+++ new/tex/latex/elements/elements.sty 2019-10-16 00:00:30.000000000 +0200
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/elements/
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2015--2018 Clemens Niederberger
+% Copyright 2011--2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,8 +25,8 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-\newcommand*\@elements@date{2018/01/31}
-\newcommand*\@elements@version{v0.2c}
+\newcommand*\@elements@date{2019/10/14}
+\newcommand*\@elements@version{v0.3}
\newcommand*\@elements@description{properties of chemical elements}
\ProvidesPackage{elements}[%
@@ -296,17 +296,23 @@
% extendable language settings
\RequirePackage{translations}
\AfterEndPreamble{
- % this will load a file `elements_elements_<lang>.def', <lang> is a
- % `translations' base language
- % currently German, English, and French are available, English being the
- % fallback; other languages are added by providing the corresponding file
+ % this will load a file `elements_names_<lang>.def', <lang> is a
+ % `translations' base language or dialect
+ % currently German, English, French, Portuguese, and Spanish are available,
+ % English being the fallback; other languages are added by providing the
+ % corresponding file
\ifdef\@elements@language
- {\edef\@elements@language{\@trnslt@language{\@elements@language}}}
- {\def\@elements@language{\@trnslt@language{\@trnslt@current@language}}}
+ {\edef\@elements@language{\@trnslt@language\@elements@language}}
+ {\def\@elements@language{\@trnslt@language\@trnslt@current@language}}
\InputIfFileExists
{elements_names_\@elements@language.def}
{}
- {\input{elements_names_english.def}}
+ {
+ \InputIfFileExists
+ {elements_names_\@trnslt@dialect@of\@elements@language.def}
+ {}
+ {\input{elements_names_english.def}}
+ }
}
% ==========================================================================
@@ -431,6 +437,12 @@
\DeclareAtomSymbol{110}{Ds}
\DeclareAtomSymbol{111}{Rg}
\DeclareAtomSymbol{112}{Cn}
+\DeclareAtomSymbol{113}{Nh}
+\DeclareAtomSymbol{114}{Fl}
+\DeclareAtomSymbol{115}{Mc}
+\DeclareAtomSymbol{116}{Lv}
+\DeclareAtomSymbol{117}{Ts}
+\DeclareAtomSymbol{118}{Og}
% --------------------------------------------------------------------------
% declare electron distributions:
@@ -553,6 +565,12 @@
\DeclareElectronDistribution{110}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+9,1}
\DeclareElectronDistribution{111}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+10,1}
\DeclareElectronDistribution{112}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+10,2}
+\DeclareElectronDistribution{113}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+10,2+1}
+\DeclareElectronDistribution{114}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+10,2+2}
+\DeclareElectronDistribution{115}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+10,2+3}
+\DeclareElectronDistribution{116}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+10,2+4}
+\DeclareElectronDistribution{117}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+10,2+5}
+\DeclareElectronDistribution{118}{2,2+6,2+6+10,2+6+10+14,2+6+10+14,2+6+10,2+6}
% --------------------------------------------------------------------------
% declare isotope lists:
@@ -694,6 +712,18 @@
\DeclareAtomIsotopes{111}{272,274,278,279,280}
% no main isotope:
\DeclareAtomIsotopes{112}{277,283,285}
+% no main isotope:
+\DeclareAtomIsotopes{113}{283,284}
+% no main isotope:
+\DeclareAtomIsotopes{114}{285,286,287,288,289}
+% no main isotope:
+\DeclareAtomIsotopes{115}{287,288,289,290,291}
+% no main isotope:
+\DeclareAtomIsotopes{116}{290,291,292,293}
+% no main isotope:
+\DeclareAtomIsotopes{117}{291,929,293,294}
+% no main isotope:
+\DeclareAtomIsotopes{118}{294}
% --------------------------------------------------------------------------
\endinput
@@ -712,3 +742,5 @@
- correct wrong isotope lists
2017/06/17 v0.2b - fix typos in French translations
2018/01/31 v0.2c - fix typos in German translations
+2019/10/14 v0.3 - add Portuguese language -- thanks to Phelype Oleinik
+ - add elements 113 to 118
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/elements/elements_names_brazil.def new/tex/latex/elements/elements_names_brazil.def
--- old/tex/latex/elements/elements_names_brazil.def 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/elements/elements_names_brazil.def 2019-10-16 00:00:30.000000000 +0200
@@ -0,0 +1,146 @@
+% --------------------------------------------------------------------------
+% the ELEMENTS package
+%
+% retrieve different properties of chemical elements
+%
+% --------------------------------------------------------------------------
+% Clemens Niederberger
+% Web: https://github.com/cgnieder/elements/
+% E-Mail: contact(a)mychemistry.eu
+% --------------------------------------------------------------------------
+% Copyright 2015--2019 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.
+%
+% Brazilian Portuguese translation added by GRSousaJr
+% --------------------------------------------------------------------------
+\DeclareAtomName[Hidrogenio]{1}{Hidrog\^enio}
+\DeclareAtomName[Helio]{2}{H\'elio}
+\DeclareAtomName[Litio]{3}{L\'itio}
+\DeclareAtomName[Berilio]{4}{Ber\'ilio}
+\DeclareAtomName[Boro]{5}{Boro}
+\DeclareAtomName[Carbono]{6}{Carbono}
+\DeclareAtomName[Nitrogenio]{7}{Nitrog\^enio}
+\DeclareAtomName[Oxigenio]{8}{Oxig\^enio}
+\DeclareAtomName[Fluor]{9}{Fl\'uor}
+\DeclareAtomName[Neonio]{10}{Ne\^onio}
+\DeclareAtomName[Sodio]{11}{S\'odio}
+\DeclareAtomName[Magnesio]{12}{Magn\'esio}
+\DeclareAtomName[Aluminio]{13}{Alum\'inio}
+\DeclareAtomName[Silicio]{14}{Sil\'icio}
+\DeclareAtomName[Fosforo]{15}{F\'osforo}
+\DeclareAtomName[Enxofre]{16}{Enxofre}
+\DeclareAtomName[Cloro]{17}{Cloro}
+\DeclareAtomName[Argonio]{18}{Arg\^onio}
+\DeclareAtomName[Potassio]{19}{Pot\'assio}
+\DeclareAtomName[Calcio]{20}{C\'alcio}
+\DeclareAtomName[Escandio]{21}{Esc\^andio}
+\DeclareAtomName[Titanio]{22}{Tit\^anio}
+\DeclareAtomName[Vanadio]{23}{Van\'adio}
+\DeclareAtomName[Cromio]{24}{Cr\^omio}
+\DeclareAtomName[Manganes]{25}{Mangan\^es}
+\DeclareAtomName[Ferro]{26}{Ferro}
+\DeclareAtomName[Cobalto]{27}{Cobalto}
+\DeclareAtomName[Niquel]{28}{N\'iquel}
+\DeclareAtomName[Cobre]{29}{Cobre}
+\DeclareAtomName[Zinco]{30}{Zinco}
+\DeclareAtomName[Galio]{31}{G\'alio}
+\DeclareAtomName[Germanio]{32}{Germ\^anio}
+\DeclareAtomName[Arsenio]{33}{Ars\^enio}
+\DeclareAtomName[Selenio]{34}{Sel\^enio}
+\DeclareAtomName[Bromo]{35}{Bromo}
+\DeclareAtomName[Criptonio]{36}{Cript\^onio}
+\DeclareAtomName[Rubidio]{37}{Rub\'idio}
+\DeclareAtomName[Estroncio]{38}{Estr\^oncio}
+\DeclareAtomName[Itrio]{39}{\'Itrio}
+\DeclareAtomName[Zirconio]{40}{Zirc\^onio}
+\DeclareAtomName[Niobio]{41}{Ni\'obio}
+\DeclareAtomName[Molibdenio]{42}{Molibd\^enio}
+\DeclareAtomName[Tecnecio]{43}{Tecn\'ecio}
+\DeclareAtomName[Rutenio]{44}{Rut\^enio}
+\DeclareAtomName[Rodio]{45}{R\'odio}
+\DeclareAtomName[Paladio]{46}{Pal\'adio}
+\DeclareAtomName[Prata]{47}{Prata}
+\DeclareAtomName[Cadmio]{48}{C\'admio}
+\DeclareAtomName[Indio]{49}{\'Indio}
+\DeclareAtomName[Estanho]{50}{Estanho}
+\DeclareAtomName[Antimonio]{51}{Antim\^onio}
+\DeclareAtomName[Telurio]{52}{Tel\'urio}
+\DeclareAtomName[Iodo]{53}{Iodo}
+\DeclareAtomName[Xenonio]{54}{Xen\^onio}
+\DeclareAtomName[Cesio]{55}{C\'esio}
+\DeclareAtomName[Bario]{56}{B\'ario}
+\DeclareAtomName[Lantanio]{57}{Lant\^anio}
+\DeclareAtomName[Cerio]{58}{C\'erio}
+\DeclareAtomName[Praseodimio]{59}{Praseod\'imio}
+\DeclareAtomName[Neodimio]{60}{Neod\'imio}
+\DeclareAtomName[Promecio]{61}{Prom\'ecio}
+\DeclareAtomName[Samario]{62}{Sam\'ario}
+\DeclareAtomName[Europio]{63}{Eur\'opio}
+\DeclareAtomName[Gadolinio]{64}{Gadol\'inio}
+\DeclareAtomName[Terbio]{65}{T\'erbio}
+\DeclareAtomName[Disprosio]{66}{Dispr\'osio}
+\DeclareAtomName[Holmio]{67}{H\'olmio}
+\DeclareAtomName[Erbio]{68}{\'Erbio}
+\DeclareAtomName[Tulio]{69}{T\'ulio}
+\DeclareAtomName[Iterbio]{70}{It\'erbio}
+\DeclareAtomName[Lutecio]{71}{Lut\'ecio}
+\DeclareAtomName[Hafnio]{72}{H\'afnio}
+\DeclareAtomName[Tantalo]{73}{T\^antalo}
+\DeclareAtomName[Tungstenio]{74}{Tungst\^enio}
+\DeclareAtomName[Renio]{75}{R\^enio}
+\DeclareAtomName[Osmio]{76}{\'Osmio}
+\DeclareAtomName[Iridio]{77}{Ir\'idio}
+\DeclareAtomName[Platina]{78}{Platina}
+\DeclareAtomName[Ouro]{79}{Ouro}
+\DeclareAtomName[Mercurio]{80}{Merc\'urio}
+\DeclareAtomName[Talio]{81}{T\'alio}
+\DeclareAtomName[Chumbo]{82}{Chumbo}
+\DeclareAtomName[Bismuto]{83}{Bismuto}
+\DeclareAtomName[Polonio]{84}{Pol\^onio}
+\DeclareAtomName[Astato]{85}{Astato}
+\DeclareAtomName[Radonio]{86}{Rad\^onio}
+\DeclareAtomName[Francio]{87}{Fr\^ancio}
+\DeclareAtomName[Radio]{88}{R\'adio}
+\DeclareAtomName[Actinio]{89}{Act\'inio}
+\DeclareAtomName[Torio]{90}{T\'orio}
+\DeclareAtomName[Protactinio]{91}{Protact\'inio}
+\DeclareAtomName[Uranio]{92}{Ur\^anio}
+\DeclareAtomName[Netunio]{93}{Net\'unio}
+\DeclareAtomName[Plutonio]{94}{Plut\^onio}
+\DeclareAtomName[Americio]{95}{Amer\'icio}
+\DeclareAtomName[Curio]{96}{C\'urio}
+\DeclareAtomName[Berquelio]{97}{Berqu\'elio}
+\DeclareAtomName[Californio]{98}{Calif\'ornio}
+\DeclareAtomName[Einstenio]{99}{Einst\^enio}
+\DeclareAtomName[Fermio]{100}{F\'ermio}
+\DeclareAtomName[Mendelevio]{101}{Mendel\'evio}
+\DeclareAtomName[Nobelio]{102}{Nob\'elio}
+\DeclareAtomName[Laurencio]{103}{Laur\^encio}
+\DeclareAtomName[Rutherfordio]{104}{Rutherf\'ordio}
+\DeclareAtomName[Dubnio]{105}{D\'ubnio}
+\DeclareAtomName[Seaborgio]{106}{Seab\'orgio}
+\DeclareAtomName[Bohrio]{107}{B\'ohrio}
+\DeclareAtomName[Hassio]{108}{H\'assio}
+\DeclareAtomName[Meitnerio]{109}{Meitn\'erio}
+\DeclareAtomName[Darmstacio]{110}{Darmst\'adio}
+\DeclareAtomName[Roentgenio]{111}{Roentg\^enio}
+\DeclareAtomName[Copernicio]{112}{Copern\'icio}
+\DeclareAtomName[Nihonio]{113}{Nih\^onio}
+\DeclareAtomName[Flerovio]{114}{Fler\'ovio}
+\DeclareAtomName[Moscovio]{115}{Mosc\'ovio}
+\DeclareAtomName[Livermorio]{116}{Liverm\'orio}
+\DeclareAtomName[Tennesso]{117}{Tennesso}
+\DeclareAtomName[Oganessonio]{118}{Oganess\^onio}
+
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/elements/elements_names_english.def new/tex/latex/elements/elements_names_english.def
--- old/tex/latex/elements/elements_names_english.def 2018-01-31 23:00:24.000000000 +0100
+++ new/tex/latex/elements/elements_names_english.def 2019-10-16 00:00:30.000000000 +0200
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/elements/
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2015--2018 Clemens Niederberger
+% Copyright 2011--2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -134,5 +134,11 @@
\DeclareAtomName{110}{Darmstadtium}
\DeclareAtomName{111}{Roentgenium}
\DeclareAtomName{112}{Copernicium}
+\DeclareAtomName{113}{Nihonium}
+\DeclareAtomName{114}{Flerovium}
+\DeclareAtomName{115}{Moscovium}
+\DeclareAtomName{116}{Livermorium}
+\DeclareAtomName{117}{Tennessine}
+\DeclareAtomName{118}{Oganesson}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/elements/elements_names_french.def new/tex/latex/elements/elements_names_french.def
--- old/tex/latex/elements/elements_names_french.def 2018-01-31 23:00:24.000000000 +0100
+++ new/tex/latex/elements/elements_names_french.def 2019-10-16 00:00:30.000000000 +0200
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/elements/
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2015--2018 Clemens Niederberger
+% Copyright 2011--2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -134,5 +134,11 @@
\DeclareAtomName{110}{Darmstadtium}
\DeclareAtomName{111}{Roentgenium}
\DeclareAtomName{112}{Copernicium}
+\DeclareAtomName{113}{Nihonium}
+\DeclareAtomName[Flerovium]{114}{Fl\'erovium}
+\DeclareAtomName{115}{Moscovium}
+\DeclareAtomName{116}{Livermorium}
+\DeclareAtomName{117}{Tennesse}
+\DeclareAtomName{118}{Oganesson}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/elements/elements_names_german.def new/tex/latex/elements/elements_names_german.def
--- old/tex/latex/elements/elements_names_german.def 2018-01-31 23:00:24.000000000 +0100
+++ new/tex/latex/elements/elements_names_german.def 2019-10-16 00:00:30.000000000 +0200
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/elements/
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2015--2018 Clemens Niederberger
+% Copyright 2011--2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -134,5 +134,11 @@
\DeclareAtomName{110}{Darmstadtium}
\DeclareAtomName{111}{Roentgenium}
\DeclareAtomName{112}{Copernicium}
+\DeclareAtomName{113}{Nihonium}
+\DeclareAtomName{114}{Flerovium}
+\DeclareAtomName{115}{Moscovium}
+\DeclareAtomName{116}{Livermorium}
+\DeclareAtomName{117}{Tenness}
+\DeclareAtomName{118}{Oganesson}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/elements/elements_names_portuges.def new/tex/latex/elements/elements_names_portuges.def
--- old/tex/latex/elements/elements_names_portuges.def 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/elements/elements_names_portuges.def 2019-10-16 00:00:30.000000000 +0200
@@ -0,0 +1,147 @@
+% --------------------------------------------------------------------------
+% the ELEMENTS package
+%
+% retrieve different properties of chemical elements
+%
+% --------------------------------------------------------------------------
+% Clemens Niederberger
+% Web: https://github.com/cgnieder/elements/
+% E-Mail: contact(a)mychemistry.eu
+% --------------------------------------------------------------------------
+% Copyright 2015--2019 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.
+%
+% Portuguese translation added by Phelype Oleinik
+% from https://www.areaseg.com/sinais/elementos.html
+% --------------------------------------------------------------------------
+\DeclareAtomName[Hidrogenio]{001}{Hidrog\^enio}
+\DeclareAtomName[Helio]{002}{H\'elio}
+\DeclareAtomName[Litio]{003}{L{\'\i}tio}
+\DeclareAtomName[Berilio]{004}{Ber{\'\i}lio}
+\DeclareAtomName{005}{Boro}
+\DeclareAtomName{006}{Carbono}
+\DeclareAtomName[Nitrogenio]{007}{Nitrog\^enio}
+\DeclareAtomName[Oxigenio]{008}{Oxig\^enio}
+\DeclareAtomName[Fluor]{009}{Fl\'uor}
+\DeclareAtomName[Neonio]{010}{Ne\^onio}
+\DeclareAtomName[Sodio]{011}{S\'odio}
+\DeclareAtomName[Magnesio]{012}{Magn\'esio}
+\DeclareAtomName[Aluminio]{013}{Alum{\'\i}nio}
+\DeclareAtomName[Silicio]{014}{Sil{\'\i}cio}
+\DeclareAtomName[Fosforo]{015}{F\'osforo}
+\DeclareAtomName{016}{Enxofre}
+\DeclareAtomName{017}{Cloro}
+\DeclareAtomName[Argonio]{018}{Arg\^onio}
+\DeclareAtomName[Potassio]{019}{Pot\'assio}
+\DeclareAtomName[Calcio]{020}{C\'alcio}
+\DeclareAtomName[Escandio]{021}{Esc\^andio}
+\DeclareAtomName[Titanio]{022}{Tit\^anio}
+\DeclareAtomName[Vanadio]{023}{Van\'adio}
+\DeclareAtomName{024}{Cromo}
+\DeclareAtomName[Manganes]{025}{Mangan\^es}
+\DeclareAtomName{026}{Ferro}
+\DeclareAtomName{027}{Cobalto}
+\DeclareAtomName[Niquel]{028}{N{\'\i}quel}
+\DeclareAtomName{029}{Cobre}
+\DeclareAtomName{030}{Zinco}
+\DeclareAtomName[Galio]{031}{G\'alio}
+\DeclareAtomName[Germanio]{032}{Germ\^anio}
+\DeclareAtomName[Arsenio]{033}{Ars\'enio}
+\DeclareAtomName[Selenio]{034}{Sel\'enio}
+\DeclareAtomName{035}{Bromo}
+\DeclareAtomName[Criptonio]{036}{Cript\^onio}
+\DeclareAtomName[Rubidio]{037}{Rub{\'\i}dio}
+\DeclareAtomName[Estroncio]{038}{Estr\^oncio}
+\DeclareAtomName[Itrio]{039}{\'Itrio}
+\DeclareAtomName[Zirconio]{040}{Zirc\^onio}
+\DeclareAtomName[Niobio]{041}{Ni\'obio}
+\DeclareAtomName[Molibdenio]{042}{Molibd\'enio}
+\DeclareAtomName[Tecnecio]{043}{Tecn\'ecio}
+\DeclareAtomName[Rutenio]{044}{Rut\^enio}
+\DeclareAtomName[Rodio]{045}{R\'odio}
+\DeclareAtomName[Paladio]{046}{Pal\'adio}
+\DeclareAtomName{047}{Prata}
+\DeclareAtomName[Cadmio]{048}{C\'admio}
+\DeclareAtomName[Indio]{049}{\'Indio}
+\DeclareAtomName{050}{Estanho}
+\DeclareAtomName[Antimonio]{051}{Antim\^onio}
+\DeclareAtomName[Telurio]{052}{Tel\'urio}
+\DeclareAtomName{053}{Iodo}
+\DeclareAtomName[Xenonio]{054}{Xen\^onio}
+\DeclareAtomName[Cesio]{055}{C\'esio}
+\DeclareAtomName[Bario]{056}{B\'ario}
+\DeclareAtomName[Lantanio]{057}{Lant\^anio}
+\DeclareAtomName[Cerio]{058}{C\'erio}
+\DeclareAtomName[Praseodimio]{059}{Praseod{\'\i}mio}
+\DeclareAtomName[Neodimio]{060}{Neod{\'\i}mio}
+\DeclareAtomName[Promecio]{061}{Prom\'ecio}
+\DeclareAtomName[Samario]{062}{Sam\'ario}
+\DeclareAtomName[Europio]{063}{Eur\'opio}
+\DeclareAtomName[Gadolinio]{064}{Gadol{\'\i}nio}
+\DeclareAtomName[Terbio]{065}{T\'erbio}
+\DeclareAtomName[Disprosio]{066}{Dispr\'osio}
+\DeclareAtomName[Holmio]{067}{H\'olmio}
+\DeclareAtomName[Erbio]{068}{\'Erbio}
+\DeclareAtomName[Tulio]{069}{T\'ulio}
+\DeclareAtomName[Iterbio]{070}{It\'erbio}
+\DeclareAtomName[Lutecio]{071}{Lut\'ecio}
+\DeclareAtomName[Hafnio]{072}{H\'afnio}
+\DeclareAtomName[Tantalo]{073}{T\^antalo}
+\DeclareAtomName[Tungstenio]{074}{Tungst\^enio}
+\DeclareAtomName[Renio]{075}{R\^enio}
+\DeclareAtomName[Osmio]{076}{\'Osmio}
+\DeclareAtomName[Iridio]{077}{Ir{\'\i}dio}
+\DeclareAtomName{078}{Platina}
+\DeclareAtomName{079}{Ouro}
+\DeclareAtomName[Mercurio]{080}{Merc\'urio}
+\DeclareAtomName[Talio]{081}{T\'alio}
+\DeclareAtomName{082}{Chumbo}
+\DeclareAtomName{083}{Bismuto}
+\DeclareAtomName[Polonio]{084}{Pol\^onio}
+\DeclareAtomName[Astatinio]{085}{Astat{\'\i}nio}
+\DeclareAtomName[Radonio]{086}{Rad\^onio}
+\DeclareAtomName[Francio]{087}{Fr\^ancio}
+\DeclareAtomName[Radio]{088}{R\'adio}
+\DeclareAtomName[Actinio]{089}{Act{\'\i}nio}
+\DeclareAtomName[Torio]{090}{T\'orio}
+\DeclareAtomName[Protactinio]{091}{Protact{\'\i}nio}
+\DeclareAtomName[Uranio]{092}{Ur\^anio}
+\DeclareAtomName[Netunio]{093}{Net\'unio}
+\DeclareAtomName[Plutonio]{094}{Plut\^onio}
+\DeclareAtomName[Americio]{095}{Amer{\'\i}cio}
+\DeclareAtomName[Curio]{096}{C\'urio}
+\DeclareAtomName[Berquelio]{097}{Berqu\'elio}
+\DeclareAtomName[Californio]{098}{Calif\'ornio}
+\DeclareAtomName[Einstenio]{099}{Einst\'enio}
+\DeclareAtomName[Fermio]{100}{F\'ermio}
+\DeclareAtomName[Mendelevio]{101}{Mendel\'evio}
+\DeclareAtomName[Nobelio]{102}{Nob\'elio}
+\DeclareAtomName[Laurencio]{103}{Laur\^encio}
+\DeclareAtomName[Rutherfordio]{104}{Rutherf\'ordio}
+\DeclareAtomName[Dubnio]{105}{D\'ubnio}
+\DeclareAtomName[Seaborgio]{106}{Seab\'orgio}
+\DeclareAtomName[Bohrio]{107}{B\'ohrio}
+\DeclareAtomName[Hassio]{108}{H\'assio}
+\DeclareAtomName[Meitnerio]{109}{Meitn\'erio}
+\DeclareAtomName{110}{Darmstadtio}
+\DeclareAtomName[Roentgenio]{111}{Roentg\'enio}
+\DeclareAtomName[Copernicio]{112}{Copern{\'\i}cio}
+\DeclareAtomName[Niponio]{113}{Nip\'onio}
+\DeclareAtomName[Flerovio]{114}{Fler\'ovio}
+\DeclareAtomName[Moscovio]{115}{Mosc\'ovio}
+\DeclareAtomName[Livermorio]{116}{Liverm\'orio}
+\DeclareAtomName{117}{Tenesso}
+\DeclareAtomName[Oganesson]{118}{Ogan\'esson}
+
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/elements/elements_names_spanish.def new/tex/latex/elements/elements_names_spanish.def
--- old/tex/latex/elements/elements_names_spanish.def 2018-01-31 23:00:24.000000000 +0100
+++ new/tex/latex/elements/elements_names_spanish.def 2019-10-16 00:00:30.000000000 +0200
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/elements/
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2015--2018 Clemens Niederberger
+% Copyright 2011--2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -134,5 +134,11 @@
\DeclareAtomName{110}{Darmstadtio}
\DeclareAtomName{111}{Roentgenio}
\DeclareAtomName{112}{Copernicio}
+\DeclareAtomName{113}{Nihonio}
+\DeclareAtomName{114}{Flerovio}
+\DeclareAtomName{115}{Moscovio}
+\DeclareAtomName{116}{Livermorio}
+\DeclareAtomName{117}{Tenese}
+\DeclareAtomName[Oganesson]{118}{Oganess\'on}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elements.tlpobj new/tlpkg/tlpobj/elements.tlpobj
--- old/tlpkg/tlpobj/elements.tlpobj 2019-02-28 03:35:13.000000000 +0100
+++ new/tlpkg/tlpobj/elements.tlpobj 2019-10-16 02:05:37.000000000 +0200
@@ -1,6 +1,6 @@
name elements
category Package
-revision 46505
+revision 52398
shortdesc Provides properties of chemical elements
relocated 1
longdesc The package provides means for retrieving properties of
@@ -8,16 +8,18 @@
longdesc name, electron distribution or isotope number. Properties are
longdesc defined for the elements up to the atomic number 112. This
longdesc package is a spin-off of the package bohr by the same author.
-runfiles size=15
+runfiles size=19
RELOC/tex/latex/elements/elements.sty
+ RELOC/tex/latex/elements/elements_names_brazil.def
RELOC/tex/latex/elements/elements_names_english.def
RELOC/tex/latex/elements/elements_names_french.def
RELOC/tex/latex/elements/elements_names_german.def
+ RELOC/tex/latex/elements/elements_names_portuges.def
RELOC/tex/latex/elements/elements_names_spanish.def
catalogue-contact-bugs https://github.com/cgnieder/elements/issues
catalogue-contact-repository https://github.com/cgnieder/elements/
catalogue-ctan /macros/latex/contrib/elements
-catalogue-date 2018-01-31 16:01:38 +0100
+catalogue-date 2019-10-14 22:13:20 +0200
catalogue-license lppl1.3
catalogue-topics chemistry
-catalogue-version 0.2c
+catalogue-version 0.3
++++++ els-cas-templates.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/els-cas-templates/README new/doc/latex/els-cas-templates/README
--- old/doc/latex/els-cas-templates/README 2019-04-06 23:20:23.000000000 +0200
+++ new/doc/latex/els-cas-templates/README 2020-03-14 21:58:49.000000000 +0100
@@ -16,8 +16,9 @@
- cas-dc-template.pdf, PDF of the cas-ddc-template.tex
- cas-common.sty, additional macro package for formatting
model2-names.bst, BibTeX style file
-- twitter.jpeg, linkedin.jpeg, url.jpeg, gplus.jpeg, facebook.jpeg,
- email.jpeg - thumbnail images of social networking sites
+- cas-twitter.jpeg, cas-linkedin.jpeg, cas-url.jpeg, cas-gplus.jpeg,
+ cas-facebook.jpeg, cas-email.jpeg - thumbnail images of social
+ networking sites
The documentation file is elsdoc-cas.tex in the doc directory. To
compile it:
@@ -33,9 +34,9 @@
The above procedure will create a print version, namely elsdoc-cas.pdf.
-Copyright 2019, Elsevier. Bugs, feature requests, suggestions and
-comments may be mailed to elsarticle(a)stmdocs.in. elsarticle.cls,
-related documentation and supporting packages are released under the
+Copyright 2019-2020, Elsevier. Bugs, feature requests, suggestions and
+comments may be mailed to elsarticle(a)stmdocs.in. cas-sc.cls, cas-dc.cls
+related documentations and supporting packages are released under the
LATEX Project Public Licence, either version 1.2 or any later
version. This work has the LPPL maintenance status
'author-maintained'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/els-cas-templates/cas-dc-template.tex new/doc/latex/els-cas-templates/cas-dc-template.tex
--- old/doc/latex/els-cas-templates/cas-dc-template.tex 2019-04-06 23:20:23.000000000 +0200
+++ new/doc/latex/els-cas-templates/cas-dc-template.tex 2020-02-25 23:02:48.000000000 +0100
@@ -1,5 +1,5 @@
%%
-%% Copyright 2019 Elsevier Ltd
+%% Copyright 2019-2020 Elsevier Ltd
%%
%% This file is part of the 'CAS Bundle'.
%% --------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/els-cas-templates/cas-sc-template.tex new/doc/latex/els-cas-templates/cas-sc-template.tex
--- old/doc/latex/els-cas-templates/cas-sc-template.tex 2019-04-06 23:20:23.000000000 +0200
+++ new/doc/latex/els-cas-templates/cas-sc-template.tex 2020-02-25 23:02:48.000000000 +0100
@@ -1,5 +1,5 @@
%%
-%% Copyright 2019 Elsevier Ltd
+%% Copyright 2019-2020 Elsevier Ltd
%%
%% This file is part of the 'CAS Bundle'.
%% --------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/els-cas-templates/doc/elsdoc-cas.tex new/doc/latex/els-cas-templates/doc/elsdoc-cas.tex
--- old/doc/latex/els-cas-templates/doc/elsdoc-cas.tex 2019-04-06 23:20:23.000000000 +0200
+++ new/doc/latex/els-cas-templates/doc/elsdoc-cas.tex 2020-02-25 23:02:48.000000000 +0100
@@ -1,5 +1,5 @@
%%
-%% Copyright 2019 Elsevier Ltd
+%% Copyright 2019-2020 Elsevier Ltd
%%
%% This file is part of the 'CAS Bundle'.
%% ---------------------------------------------
@@ -14,7 +14,7 @@
%% The list of all files belonging to the 'CAS Bundle' is
%% given in the file `manifest.txt'.
%%
-%% $Id: elsdoc-cas.tex 4 2019-02-11 10:03:00Z rishi $
+%% $Id: elsdoc-cas.tex 35 2020-02-25 09:04:59Z rishi $
%%
\documentclass[a4paper,12pt]{article}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/els-cas-templates/doc/makefile new/doc/latex/els-cas-templates/doc/makefile
--- old/doc/latex/els-cas-templates/doc/makefile 2019-04-06 23:20:23.000000000 +0200
+++ new/doc/latex/els-cas-templates/doc/makefile 2020-02-25 23:02:48.000000000 +0100
@@ -1,4 +1,4 @@
-# $Id: makefile 5 2019-02-11 10:03:21Z rishi $
+# $Id: makefile 37 2020-02-25 09:06:02Z rishi $
file=elsdoc-cas
@@ -34,7 +34,3 @@
copy:
cp $(file).sty ../
-
-
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/els-cas-templates/doc/rvdtx.sty new/doc/latex/els-cas-templates/doc/rvdtx.sty
--- old/doc/latex/els-cas-templates/doc/rvdtx.sty 2019-04-06 23:20:23.000000000 +0200
+++ new/doc/latex/els-cas-templates/doc/rvdtx.sty 2020-02-25 23:02:48.000000000 +0100
@@ -4,7 +4,7 @@
%
% Auxiliary package to format *.dtx documents.
%
-% Copyright (c) 2008-2019 CV Radhakrishnan <cvr(a)stmdocs.in>,
+% Copyright (c) 2008-2020 CV Radhakrishnan <cvr(a)stmdocs.in>,
%
% This file may be distributed and/or modified under the conditions
% of the LaTeX Project Public License, either version 1.2 of this
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/els-cas-templates/manifest.txt new/doc/latex/els-cas-templates/manifest.txt
--- old/doc/latex/els-cas-templates/manifest.txt 2019-04-06 23:20:23.000000000 +0200
+++ new/doc/latex/els-cas-templates/manifest.txt 2020-02-25 23:02:48.000000000 +0100
@@ -1,4 +1,4 @@
-% Copyright 2019 Elsevier Ltd
+% Copyright 2019-2020 Elsevier Ltd
%
% This file is part of the 'CAS Bundle'.
% --------------------------------------
@@ -62,12 +62,12 @@
Contains thumbnail images which will be included in the
typeset PDF.
- email.jpeg
- facebook.jpeg
- gplus.jpeg
- linkedin.jpeg
- twitter.jpeg
- url.jpeg
+ cas-email.jpeg
+ cas-facebook.jpeg
+ cas-gplus.jpeg
+ cas-linkedin.jpeg
+ cas-twitter.jpeg
+ cas-url.jpeg
Directory figs/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/els-cas-templates.doc.tlpobj new/tlpkg/tlpobj/els-cas-templates.doc.tlpobj
--- old/tlpkg/tlpobj/els-cas-templates.doc.tlpobj 2019-04-06 23:32:40.000000000 +0200
+++ new/tlpkg/tlpobj/els-cas-templates.doc.tlpobj 2020-03-15 02:47:19.000000000 +0100
@@ -1,6 +1,6 @@
name els-cas-templates.doc
category Package
-revision 50820
+revision 54317
shortdesc doc files of els-cas-templates
relocated 1
docfiles size=338
++++++ els-cas-templates.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/els-cas-templates/cas-model2-names.bst new/bibtex/bst/els-cas-templates/cas-model2-names.bst
--- old/bibtex/bst/els-cas-templates/cas-model2-names.bst 2019-04-06 23:20:23.000000000 +0200
+++ new/bibtex/bst/els-cas-templates/cas-model2-names.bst 2020-02-25 23:02:48.000000000 +0100
@@ -1,7 +1,7 @@
%%
-%% This is file `model2-names.bst' (Version 2.0),
+%% This is file `cas-model2-names.bst' (Version 2.0),
%%
-%% Copyright 2009-2013 Elsevier Ltd
+%% Copyright 2009-2019 Elsevier Ltd
%%
%% This file is part of the 'Elsarticle Bundle'.
%% ---------------------------------------------
@@ -13,9 +13,9 @@
%% and version 1.2 or later is part of all distributions of LaTeX
%% version 1999/12/01 or later.
%%
-%% $Id: model2-names.bst 217 2013-03-13 11:50:49Z rishi $
+%% $Id: cas-model2-names.bst 23 2019-04-05 10:17:39Z rishi $
%%
-%% $URL: http://lenova.river-valley.com/svn/elsbst/trunk/New-Model-2/model2-names.bst $
+%% $URL: https://lenova.river-valley.com/svn/elscastemplates/trunk/cas-model2-names.… $
%%
ENTRY
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/els-cas-templates/cas-common.sty new/tex/latex/els-cas-templates/cas-common.sty
--- old/tex/latex/els-cas-templates/cas-common.sty 2019-04-06 23:20:23.000000000 +0200
+++ new/tex/latex/els-cas-templates/cas-common.sty 2020-03-14 21:58:49.000000000 +0100
@@ -15,11 +15,11 @@
%% given in the file `manifest.txt'.
%%
-% $Id: cas-common.sty 12 2019-03-19 06:03:53Z rishi $
+% $Id: cas-common.sty 49 2020-03-14 09:05:10Z rishi $
\def\RCSfile{cas-common}%
- \def\RCSversion{1.0}%
- \def\RCSdate{2019/02/11}%
+ \def\RCSversion{2.1}%
+ \def\RCSdate{2020/03/14}%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ExplSyntaxOn
@@ -32,6 +32,8 @@
% Usage of those macros and methods are gratefully acknowledged.
%
+\tl_set:Nn \l_stm_title_color_tl { black }
+
\keys_define:nn { stm / title }
{
mode .choice: ,
@@ -143,7 +145,7 @@
\l_stm_title_shape_tl
\l_stm_title_weight_tl
\color { \l_stm_title_color_tl }
- #2
+ \noindent \unskip \ignorespaces #2
\tl_set:Nn \l_tmpa_tl { title }
\tl_if_eq:NNTF \l_stm_title_type_tl \l_tmpa_tl
{ \processTmarks } { }
@@ -460,7 +462,7 @@
{ \int_set:Nn \l_tmpa_int { 0 }
\clist_map_inline:nn { #1 }
{
-% \msg_term:n { ##1 .. [\cs:w X@##1:\cs_end:] }
+% \iow_term:n { ##1 .. [\cs:w X@##1:\cs_end:] }
\cs_if_free:cTF { X@##1: }
{ \csdef{X@##1:}{0} }
{
@@ -482,7 +484,7 @@
{
\tl_if_head_eq_catcode:nNTF { #1 } a
{
- \msg_term:n { [TNOTE:~alpha] }%
+% \iow_term:n { [TNOTE:~alpha] }%
\seq_gput_right:Nn \g_stm_tnote_seq
{ \int_incr:N \g_stm_tnote_int
\str_set:Nx \@currentlabel { \int_use:N \g_stm_tnote_int }
@@ -499,7 +501,7 @@
}
}
{
- \msg_term:n { [TNOTE:~Number] }
+% \iow_term:n { [TNOTE:~Number] }
\seq_gput_right:Nn \g_stm_tnote_seq
{
\int_set:Nn \l_tmpa_int { #1 }
@@ -540,7 +542,7 @@
{
\tl_if_head_eq_catcode:nNTF { #1 } a
{
- \msg_term:n { [FN:~alpha] }%
+% \iow_term:n { [FN:~alpha] }%
\seq_gput_right:Nn \g_stm_fnote_seq
{ \int_incr:N \g_stm_fnote_int
\str_set:Nx \@currentlabel { \int_use:N \g_stm_fnote_int }
@@ -550,7 +552,7 @@
}
}
{
- \msg_term:n { [FN:~Number] }
+% \iow_term:n { [FN:~Number] }
\seq_gput_right:Nn \g_stm_fnote_seq
{
\int_set:Nn \l_tmpa_int { #1 }
@@ -569,7 +571,7 @@
{
\tl_if_head_eq_catcode:nNTF { #1 } a
{
- \msg_term:n { [COR:~alpha] }%
+% \iow_term:n { [COR:~alpha] }%
\seq_gput_right:Nn \g_stm_cor_seq
{ \int_incr:N \g_stm_cor_int
\str_set:Nx \@currentlabel { \int_use:N \g_stm_cor_int }
@@ -586,7 +588,7 @@
}
}
{
- \msg_term:n { [COR:~Number] }
+% \iow_term:n { [COR:~Number] }
\seq_gput_right:Nn \g_stm_cor_seq
{
\int_set:Nn \l_tmpa_int { #1 }
@@ -896,13 +898,13 @@
\tl_if_empty:NF \l_stm_au_prefix
{ \l_stm_au_prefix_tl \c_space_token }
\str_if_eq:VnTF \l_stm_au_style_tl { chinese }
- { %\msg_term:n {STYLE~T=\l_stm_au_style_tl........}
+ { %\iow_term:n {STYLE~T=\l_stm_au_style_tl........}
\invparsename { #2 }
\textcolor{\l_stm_augroup_color_tl}{\surname}
\no_break_space:
\textcolor{\l_stm_augroup_color_tl !50}{\firstname}
}
- { %\msg_term:n {STYLE~F=\l_stm_au_style_tl........}
+ { %\iow_term:n {STYLE~F=\l_stm_au_style_tl........}
\parsename { #2 }
\textcolor{\l_stm_augroup_color_tl !50}{\firstname}
\no_break_space:
@@ -1215,7 +1217,7 @@
\seq_new:c {g_stm_aff\int_use:N \g_stm_augr_int _seq}
\seq_new:c {g_stm_collab\int_use:N \g_stm_augr_int _seq}
\seq_new:c {g_stm_clau\int_use:N \g_stm_augr_int _seq}
- \msg_term:n { AUGR:~\int_use:N \g_stm_augr_int ... }
+% \iow_term:n { AUGR:~\int_use:N \g_stm_augr_int ... }
}
{
\seq_gput_right:Nn \g_stm_augr_seq
@@ -1247,7 +1249,7 @@
\seq_use:cn { g_stm_aff\int_use:N \g_stm_aaugr_int _seq }
{ \par \smallskip }
\par\vskip\l_stm_aff_after_dim
- \msg_term:n { AAUGR:~\int_use:N \g_stm_aaugr_int ... }
+% \iow_term:n { AAUGR:~\int_use:N \g_stm_aaugr_int ... }
\group_end:
%
\group_begin:
@@ -1862,6 +1864,15 @@
abovetbl .skip_set:N = \l_tbl_abovetbl_skip ,
belowtbl .skip_set:N = \l_tbl_belowtbl_skip ,
full .bool_gset:N = \g_tbl_full_bool ,
+ unknown .code:n = {
+ \ifstrempty { #1 }
+ {
+ \tl_set:Nn \l_fig_pos_tl { \l_keys_key_tl }
+ }
+ {
+ \l_keys_key_tl=#1
+ }
+ }
}
\cs_set:Npn \__reset_tbl:
@@ -1938,6 +1949,15 @@
abovefig .skip_set:N = \l_fig_abovefig_skip ,
belowfig .skip_set:N = \l_fig_belowfig_skip ,
full .bool_gset:N = \g_fig_full_bool ,
+ unknown .code:n = {
+ \ifstrempty { #1 }
+ {
+ \tl_set:Nn \l_fig_pos_tl { \l_keys_key_tl }
+ }
+ {
+ \l_keys_key_tl=#1,
+ }
+ }
}
\cs_set:Npn \__reset_fig:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/els-cas-templates/cas-dc.cls new/tex/latex/els-cas-templates/cas-dc.cls
--- old/tex/latex/els-cas-templates/cas-dc.cls 2019-04-06 23:20:23.000000000 +0200
+++ new/tex/latex/els-cas-templates/cas-dc.cls 2020-03-14 21:58:49.000000000 +0100
@@ -15,11 +15,11 @@
%% given in the file `manifest.txt'.
%%
-%% $Id: cas-dc.cls 7 2019-02-13 12:02:17Z apu.v $
+%% $Id: cas-dc.cls 49 2020-03-14 09:05:10Z rishi $
\def\RCSfile{cas-dc}%
- \def\RCSversion{1.0}%
- \def\RCSdate{2019/02/11}%
+ \def\RCSversion{2.1}%
+ \def\RCSdate{2020/03/14}%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{\RCSfile}[\RCSdate, \RCSversion: Formatting class
for CAS double column articles]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/els-cas-templates/cas-sc.cls new/tex/latex/els-cas-templates/cas-sc.cls
--- old/tex/latex/els-cas-templates/cas-sc.cls 2019-04-06 23:20:23.000000000 +0200
+++ new/tex/latex/els-cas-templates/cas-sc.cls 2020-03-14 21:58:49.000000000 +0100
@@ -15,11 +15,11 @@
%% given in the file `manifest.txt'.
%%
-%% $Id: cas-sc.cls 7 2019-02-13 12:02:17Z apu.v $
+%% $Id: cas-sc.cls 49 2020-03-14 09:05:10Z rishi $
\def\RCSfile{cas-sc}%
- \def\RCSversion{1.0}%
- \def\RCSdate{2018/09/22}%
+ \def\RCSversion{2.1}%
+ \def\RCSdate{2020/03/14}%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{\RCSfile}[\RCSdate, \RCSversion: Formatting class
for CAS single column articles]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/els-cas-templates.tlpobj new/tlpkg/tlpobj/els-cas-templates.tlpobj
--- old/tlpkg/tlpobj/els-cas-templates.tlpobj 2019-04-06 23:32:40.000000000 +0200
+++ new/tlpkg/tlpobj/els-cas-templates.tlpobj 2020-03-15 02:47:19.000000000 +0100
@@ -1,21 +1,20 @@
name els-cas-templates
category Package
-revision 50820
-shortdesc Elsevier CAS LaTeX templates
+revision 54317
+shortdesc Elsevier updated LaTeX templates
relocated 1
longdesc This bundle provides two class and corresponding template files
longdesc for typesetting journal articles supposed to go through
-longdesc Elsevier's Complex Article Service (CAS) workflow. One of the
-longdesc sets is meant for one-column, the other for two-column layout.
-longdesc These are now accepted for submitting articles both in
-longdesc Elsevier's electronic submission system and elsewhere.
+longdesc Elsevier's updated workflow. One of the sets is meant for
+longdesc one-column, the other for two-column layout. These are now
+longdesc accepted for submitting articles both in Elsevier's electronic
+longdesc submission system and elsewhere.
runfiles size=29
RELOC/bibtex/bst/els-cas-templates/cas-model2-names.bst
RELOC/tex/latex/els-cas-templates/cas-common.sty
RELOC/tex/latex/els-cas-templates/cas-dc.cls
RELOC/tex/latex/els-cas-templates/cas-sc.cls
catalogue-ctan /macros/latex/contrib/els-cas-templates
-catalogue-date 2019-04-05 18:15:15 +0200
catalogue-license lppl1.2
catalogue-topics class journalpub
-catalogue-version 1.0
+catalogue-version 2.1
++++++ elteikthesis.doc.tar.xz ++++++
++++ 38691 lines of diff (skipped)
++++++ elteikthesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/elteikthesis/elteikthesis.cls new/tex/latex/elteikthesis/elteikthesis.cls
--- old/tex/latex/elteikthesis/elteikthesis.cls 2011-05-18 01:14:17.000000000 +0200
+++ new/tex/latex/elteikthesis/elteikthesis.cls 2020-02-26 23:08:22.000000000 +0100
@@ -1,115 +1,536 @@
+%% MIT License
%%
-%% This is file `elteikthesis.cls',
-%% generated with the docstrip utility.
+%% Version 2.0, 2020/02/26
+%% Copyright (c) 2013-2020 Máté Cserép <mcserep(a)inf.elte.hu>, Bálint Bognár
%%
-%% The original source files were:
+%% Permission is hereby granted, free of charge, to any person obtaining a copy
+%% of this software and associated documentation files (the "Software"), to deal
+%% in the Software without restriction, including without limitation the rights
+%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+%% copies of the Software, and to permit persons to whom the Software is
+%% furnished to do so, subject to the following conditions:
%%
-%% ./elteikthesis.dtx (with options: `class')
-%% This is a generated file.
-%% Copyright (C) 2010 Majoros Daniel
-%% This file may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either
-%% version 1.2 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.2 or later is part of all distributions of
-%% LaTeX version 1999/12/01 or later.
-%%
-
-\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{elteikthesis}[2010/09/18 v1.2 class for ELTE/IK thesis]
-\LoadClass[a4paper,12pt,oneside]{book}
+%% The above copyright notice and this permission notice shall be included in all
+%% copies or substantial portions of the Software.
+%%
+%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+%% SOFTWARE.
+%%
+%% -----------------------------------------------------------------------------
+%%
+%% The original 1.x versions of the CTAN package were developed by
+%% Dániel Majoros, under the LaTeX Project Public License version 1.2 or later.
+%% This updated work is a complete rewrite with no connection
+%% to the original package.
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{elteikthesis}[2020/02/26 ELTE FI bachelor and master thesis template]
+
+% LaTeX programozói eszközök
+\RequirePackage{etoolbox}
+\RequirePackage{xparse}
+\RequirePackage{ifthen}
+
+% ------------------------------
+% Paraméterek feldolgozása
+\newtoggle{oneside}\toggletrue{oneside}
+\newtoggle{hypenation}\toggletrue{hypenation}
+\newtoggle{parspace}\togglefalse{parspace}
+\newtoggle{indent}\toggletrue{indent}
+
+\DeclareOption{nohyp}{\togglefalse{hypenation}}
+\DeclareOption{parspace}{\toggletrue{parspace}}
+\DeclareOption{noindent}{\togglefalse{indent}}
+\DeclareOption{twoside}{
+ \PassOptionsToClass{\CurrentOption}{report}
+ \PassOptionsToClass{openright}{report}
+ \togglefalse{oneside}
+}
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{report}}
+\ProcessOptions \relax
+
+% Osztály betöltése (alapértelmezett beállÃtások)
+\LoadClass[a4paper, 12pt, oneside]{report}
+% ------------------------------
+
+% ------------------------------
+% Metaadatok
+\DeclareDocumentCommand{\author}{m}{\newcommand{\authorname}{#1}\renewcommand{\@author}{#1}}
+\NewDocumentCommand{\degree}{m}{\newcommand{\degreename}{#1}}
+
+\NewDocumentCommand{\supervisor}{m}{\newcommand{\supname}{#1}}
+\NewDocumentCommand{\affiliation}{m}{\newcommand{\supaff}{#1}}
+
+\NewDocumentCommand{\extsupervisor}{m}{\newcommand{\extsupname}{#1}}
+\NewDocumentCommand{\extaffiliation}{m}{\newcommand{\extsupaff}{#1}}
+
+\NewDocumentCommand{\university}{m}{\newcommand{\univname}{#1}}
+\NewDocumentCommand{\faculty}{m}{\newcommand{\facname}{#1}}
+\NewDocumentCommand{\department}{m}{\newcommand{\deptname}{#1}}
+\NewDocumentCommand{\city}{m}{\newcommand{\cityname}{#1}}
+\NewDocumentCommand{\logo}{m}{\newcommand{\logofilename}{#1}}
+
+\DeclareDocumentCommand{\title}{m}{\newcommand{\thesistitle}{#1}\renewcommand{\@title}{#1}}
+\DeclareDocumentCommand{\date}{m}{\newcommand{\thesisyear}{#1}\renewcommand{\@date}{#1}}
+% ------------------------------
+
+% ------------------------------
+% FordÃtások
+\DeclareDocumentCommand{\documentlang}{m}{
+ \selectlanguage{#1}
+
+ % Magyar
+ \ifthenelse{\equal{\detokenize{#1}}{\detokenize{magyar}}}
+ {
+ \newcommand{\authorlabel}{SzerzÅ}
+ \newcommand{\suplabel}{TémavezetÅ}
+ \newcommand{\intsuplabel}{BelsÅ témavezetÅ}
+ \newcommand{\extsuplabel}{KÃŒlsÅ témavezetÅ}
+
+ \newcommand{\deflabel}{DefinÃció}
+ \newcommand{\theolabel}{Tétel}
+ \newcommand{\remlabel}{EmlékeztetÅ}
+ \newcommand{\notelabel}{Megjegyzés}
+
+ \newcommand{\codelabel}{forráskód}
+ \newcommand{\alglabel}{Algoritmus}
+
+ \newcommand{\biblabel}{Irodalomjegyzék}
+ \newcommand{\lstfigurelabel}{Ãbrajegyzék}
+ \newcommand{\lsttablelabel}{Táblázatjegyzék}
+ \newcommand{\lstcodelabel}{Forráskódjegyzék}
+ \newcommand{\lstnomencl}{Jelölésjegyzék}
+ \newcommand{\todolabel}{TeendÅk listája}
+
+ \newcommand{\declarationplaceholder}{Az eredeti szakdolgozati / diplomamunka témabejelentŠhelye.}
+ }
+ { % Angol
+ \newcommand{\authorlabel}{Author}
+ \newcommand{\suplabel}{Supervisor}
+ \newcommand{\intsuplabel}{Internal supervisor}
+ \newcommand{\extsuplabel}{External supervisor}
+
+ \newcommand{\deflabel}{Definition}
+ \newcommand{\theolabel}{Theorem}
+ \newcommand{\remlabel}{Remark}
+ \newcommand{\notelabel}{Note}
+
+ \newcommand{\codelabel}{Code}
+ \newcommand{\alglabel}{Algorithm}
+
+ \newcommand{\biblabel}{Bibliography}
+ \newcommand{\lstfigurelabel}{List of Figures}
+ \newcommand{\lsttablelabel}{List of Tables}
+ \newcommand{\lstcodelabel}{List of Codes}
+ \newcommand{\lstnomencl}{List of Symbols}
+ \newcommand{\todolabel}{Todo list}
+
+ \newcommand{\declarationplaceholder}{This page should be the original Thesis Topic Declaration.}
+ }
+}
+% ------------------------------
+
+% ------------------------------
+% Fejlécek és láblécek
+\RequirePackage{fancyhdr}
+\pagestyle{fancy}
+
+% Chapter és section információk stÃlusának felÃŒldefiniálása
+\renewcommand{\chaptermark}[1]{\markboth{\thechapter.\ #1}{}}
+\renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}{}}
+% Fej- és lábléc vonalak beállÃtása
+\renewcommand{\headrulewidth}{1pt}
+\renewcommand{\footrulewidth}{0pt}
+
+% Fejléc törlése
+\fancyhead{}
+% Fejléc beállÃtása
+\iftoggle{oneside}{ % egyoldalashoz
+ \fancyhead[C]{\slshape \leftmark}
+}{ % kétoldalashoz
+ \fancyhead[EC]{\slshape \leftmark}
+ \fancyhead[OC]{\slshape \rightmark}
+}
+
+% Fejléc és lábléc távolsága a tartalomtól
+\topskip = 15pt % default: 10pt
+\footskip = 40pt % default: 30pt
+
+% Lábléc törlése
+\fancyfoot{}
+% Lábléc beállÃtása
+\fancyfoot[C]{\thepage}
+
+% A chapter page-k mindig visszaállnak plain style-ra, ezért azt is felÌl kell kÌlön definiálni.
+\fancypagestyle{plain}{
+ % Fejléc vonal letiltása
+ \renewcommand{\headrulewidth}{0pt}
+ % Teljes fejléc és lábléc törlés
+ \fancyhf{}
+ % Lábléc beállÃtása
+ \fancyfoot[C]{\thepage}
+}
+
+% Ãres oldalakon ne legyen fej- és lábléc
+% http://www.tex.ac.uk/cgi-bin/texfaq2html?label=reallyblank
+\let\origdoublepage\cleardoublepage
+ \newcommand{\clearemptydoublepage}{
+ \clearpage
+ {\pagestyle{empty}\origdoublepage}
+ }
+\let\cleardoublepage\clearemptydoublepage
+% ------------------------------
+
+% ------------------------------
+% Karakterkódolás, nyelv
+\RequirePackage[utf8]{inputenc}
+\RequirePackage[T1]{fontenc}
+\RequirePackage[english,magyar]{babel}
+\RequirePackage{indentfirst}
+% ------------------------------
+
+% ------------------------------
+% Grafika
\RequirePackage{graphicx}
+\RequirePackage{float}
+% Maximális ill. minimális méret megadása ábráknak
+\RequirePackage[export]{adjustbox}
+% Több ábra egy figure-on belÌl
+\RequirePackage[center]{subfigure}
+% Ãbrák forgatása
+\RequirePackage{rotating}
+
+% Az EPS fájlok támogatása pdflatex használata esetén
+\RequirePackage{epstopdf}
+% Képek kiterjesztési prioritása
+\DeclareGraphicsExtensions{.pdf,.eps,.png,.jpg}
+% Képek tárolási helye
+\graphicspath{{./images/}}
+% Ãbrajegyzék elnevezése
+\renewcommand{\listfigurename}{\lstfigurelabel}
+% ------------------------------
+
+% ------------------------------
+% PapÃrméret
+\paperwidth 210mm
+\paperheight 297mm
+% ------------------------------
+
+% ------------------------------
+% Margók
+\RequirePackage[left=35mm, right=25mm, top=25mm, bottom=25mm]{geometry}
+%\setlength{\textwidth}{150mm}
+%\setlength{\textheight}{247mm}
+% ------------------------------
+
+% ------------------------------
+% Térköz bekezdések közé
+\iftoggle{parspace}{
+ \RequirePackage{parskip}
+ % A bekezdések elsŠsoros behúzása maradjon meg
+ \iftoggle{indent}{
+ \setlength{\parindent}{3.5ex}
+ }{}
+}{
+ % Nincs se térköz, se behúzás
+ \nottoggle{indent}{
+ \RequirePackage[skip=0pt]{parskip}
+ }{
+ % alapértelmezés szerint nincs térköz, de van behúzás
+ }
+}
+% ------------------------------
+
+% ------------------------------
+% Ãrva- és fattyúsorok tiltása
+\clubpenalty=3000
+\widowpenalty=3000
+% ------------------------------
+
+% ------------------------------
+% Helyközök és tördelés
+\linespread{1.5}
+% Egyszeres helyköz a mondatok végén
\frenchspacing
-\RequirePackage[left=3.5cm, top=2.5cm, right=2.5cm, bottom=2.5cm]{geometry}
-\RequirePackage[onehalfspacing]{setspace}
-\newcommand{\ths@period}{}
-\DeclareRobustCommand{\period}[1]{
-\renewcommand{\ths@period}{#1}
-}
-\newcommand{\ths@supervisor}{}
-\DeclareRobustCommand{\supervisor}[1]{
-\renewcommand{\ths@supervisor}{#1}
-}
-\newcommand{\ths@supervisorstitle}{}
-\DeclareRobustCommand{\supervisorstitle}[1]{
-\renewcommand{\ths@supervisorstitle}{#1}
-}
-\newcommand{\ths@city}{Budapest}
-\DeclareRobustCommand{\city}[1]{
-\renewcommand{\ths@city}{#1}
-}
-\newcommand{\ths@thesisyear}{}
-\DeclareRobustCommand{\thesisyear}[1]{
-\renewcommand{\ths@thesisyear}{#1}
-}
-\newcommand{\ths@university}{E\"otv\"os Lor\'and Tudom\'anyegyetem}
-\DeclareRobustCommand{\university}[1]{
-\renewcommand{\ths@university}{#1}
-}
-\newcommand{\ths@additionaltext}{}
-\DeclareRobustCommand{\additionaltext}[1]{
-\renewcommand{\ths@additionaltext}{#1}
-}
-\newcommand{\ths@faculty}{Informatikai Kar}
-\DeclareRobustCommand{\faculty}[1]{
-\renewcommand{\ths@faculty}{#1}
-}
-\newcommand{\ths@department}{}
-\DeclareRobustCommand{\department}[1]{
-\renewcommand{\ths@department}{#1}
-}
-\newcommand{\ths@logopic}{pics/eltecimerszines}
-\DeclareRobustCommand{\logopic}[1]{
-\renewcommand{\ths@logopic}{#1}
-}
-
-\DeclareRobustCommand{\temavezeto}[1]{\supervisor{#1}}
-\DeclareRobustCommand{\temavezetocime}[1]{\supervisorstitle{#1}}
-\DeclareRobustCommand{\egyetem}[1]{\university{#1}}
-\DeclareRobustCommand{\kar}[1]{\faculty{#1}}
-\DeclareRobustCommand{\tanszek}[1]{\department{#1}}
-\DeclareRobustCommand{\evszam}[1]{\thesisyear{#1}}
-\DeclareRobustCommand{\varos}[1]{\city{#1}}
-\DeclareRobustCommand{\szak}[1]{\period{#1}}
-\DeclareRobustCommand{\plusszoveg}[1]{\additionaltext{#1}}
+% Szavak jobb margón túlnyúlásának tiltása
+\sloppy
+% Szavak elválasztásának tiltása
+\nottoggle{hypenation}{\RequirePackage[none]{hyphenat}}{}
+
+% BeállÃtás alternatÃv módon
+%\RequirePackage{setspace}
+%\singlespacing % ~1.0 linespread
+%\onehalfspacing % ~1.3 linespread
+%\doublespacing % ~1.6 linespread
+
+% Azonos sorköz használata láblácben
+%\RequirePackage{footmisc}
+%\setlength{\footnotesep}{\baselineskip}
+% ------------------------------
+
+% ------------------------------
+% Nagybetűs szavak elválasztásának mellÅzése
+\uchyph=0
+% ------------------------------
+
+% ------------------------------
+% Szoros térközű felsorolások
+\RequirePackage{paralist}
+% ------------------------------
+
+% ------------------------------
+% Matematikai mód
+\RequirePackage{amsthm}
+\RequirePackage{amsmath}
+\RequirePackage{amsfonts}
+\DeclareMathAlphabet{\mathpzc}{OT1}{pzc}{m}{it}
+% ------------------------------
+
+% ------------------------------
+% Tételek, definÃciók
+\newtheorem{definition}{\deflabel}
+\newtheorem{theorem}{\theolabel}
+\newtheorem*{remark}{\remlabel}
+\newtheorem*{note}{\notelabel}
+% ------------------------------
+
+% ------------------------------
+% Times font használata
+%\RequirePackage{mathptmx}
+% ------------------------------
+
+% ------------------------------
+% SzÃnes szövegek
+\RequirePackage{color}
+\RequirePackage{xcolor}
+% SzÃnek
+\definecolor{codebackg}{rgb}{0.95,0.95,0.95}
+\definecolor{codecomment}{rgb}{0,0.6,0}
+\definecolor{codestring}{rgb}{0.58,0,0.82}
+\colorlet{todobackg}{orange!10}
+% ------------------------------
+
+% ------------------------------
+% Hivatkozások
+% dvipdfm-hez
+%\newcommand{\hyperrefComp}{dvipdfm}
+% pdflatex-hez
+\newcommand{\hyperrefComp}{}
+
+\RequirePackage[pdfborder={0 0 0}, unicode, \hyperrefComp]{hyperref}
+\RequirePackage[all]{hypcap}
+\RequirePackage{url}
+\RequirePackage{bookmark}
+% ------------------------------
+
+% ------------------------------
+% Multirow és multicolumn táblázathoz
+\RequirePackage{multirow}
+% Táblázatok tördelése több oldalra
+\RequirePackage{longtable}
+% Celltartalmak vertikális igazÃtása
+\RequirePackage{array}
+% Sortörés táblázat cellákban
+\RequirePackage{makecell}
+% Táblázatjegyzék elnevezése
+\renewcommand{\listtablename}{\lsttablelabel}
+% ------------------------------
+
+% ------------------------------
+% FelsŠés alsó indexek
+% http://anthony.liekens.net/index.php/LaTeX/SubscriptAndSuperscriptInTextMode
+\newcommand{\superscript}[1]{\ensuremath{^{\textrm{\scriptsize{#1}}}}}
+\newcommand{\subscript}[1]{\ensuremath{_{\textrm{\scriptsize{#1}}}}}
+% ------------------------------
+
+% ------------------------------
+% Számozott elemek kezelése
+\RequirePackage{chngcntr}
+% Lábjegyzet oldalak közti eltörésének tiltása
+\interfootnotelinepenalty=10000
+% ------------------------------
+
+% ------------------------------
+% Lábjegyzet teljes körűbb támogatása (savenotes)
+%\RequirePackage{footnote}
+% Lábjegyzet kezelése minipage-ekben
+% http://www.cs.brown.edu/system/software/latex/doc/mpfnmark.pdf
+%\RequirePackage{mpfnmark}
+% ------------------------------
+
+% ------------------------------
+% FÌggelék
+\RequirePackage{appendix}
+% ------------------------------
+
+% ------------------------------
+% Irodalomjegyzék
+\RequirePackage[style=english]{csquotes}
+\RequirePackage[
+ backend=bibtex,
+ style=numeric, % irodalomjegyzék stÃlusa
+ sorting=none % idézések rendezettségee
+]{biblatex}
+% ------------------------------
+
+% ------------------------------
+% Feliratok, tartalomjegyzék, ábrajegyzék, táblázatjegyzék
+\RequirePackage[justification=centering]{caption}
+\RequirePackage[subfigure]{tocloft}
+
+% ------------------------------
+
+% ------------------------------
+% Tárgymutató
+\RequirePackage{makeidx}
+\makeindex
+% ------------------------------
+
+% ------------------------------
+% Jelölésjegyzék
+\RequirePackage[intoc,noprefix,refpage]{nomencl}
+% Elemek közötti bigskip kihagyása
+\setlength{\nomitemsep}{-\parsep}
+% Jobbra igazÃtás
+\renewcommand{\nomlabel}[1]{\hfil \hfil #1}
+% Oldalhivatkozás megjelenése
+\renewcommand{\pagedeclaration}[1]{, #1}
+% Jelölésjegyzék elnevezése
+\renewcommand{\nomname}{\lstnomencl}
+% Jelölésjegyzék elkészÃtése (még nem szúrja be)
+\makenomenclature
+% ------------------------------
+
+% ------------------------------
+% Algoritmusok és kódblokkok Ãrása
+\RequirePackage{algorithm}
+\RequirePackage{algorithmic}
+\RequirePackage{listingsutf8}
+\lstset{
+ basicstyle=\footnotesize\ttfamily,
+ numbers=left,
+ numberstyle=\tiny,
+ backgroundcolor=\color{codebackg},
+ keywordstyle=\color{blue},
+ commentstyle=\color{codecomment},
+ stringstyle=\color{codestring},
+ stepnumber=1,
+ firstnumber=1,
+ numbersep=5pt,
+ showspaces=false,
+ showstringspaces=false,
+ showtabs=false,
+ tabsize=2,
+ breaklines=true,
+ breakatwhitespace=false,
+ float,
+ frame=linesc,
+ captionpos=b
+}
+% Forráskód elnevezése
+\renewcommand{\lstlistingname}{\codelabel}
+% Forráskódjegyzék elnevezése
+\renewcommand{\lstlistlistingname}{\lstcodelabel}
+% Algoritmus kommentek jobb szélre igazÃtása
+\renewcommand{\algorithmiccomment}[1]{\hfill {\it #1}}
+% Algoritmus elnevezése
+\renewcommand{\ALG@name}{\alglabel}
+% ------------------------------
+
+% ------------------------------
+% TeendÅlista
+% http://www.tex.ac.uk/tex-archive/help/Catalogue/entries/todonotes.html
+\RequirePackage[textwidth=30mm, textsize=small, color=todobackg, linecolor=orange, colorinlistoftodos, shadow, obeyFinal]{todonotes}
+\RequirePackage[displaymath, tightpage]{preview}
+% A bal margóra kerÌljenek a TODO-k
+\reversemarginpar
+\setlength{\marginparwidth}{30mm}
+% ------------------------------
+
+% ------------------------------
+% CÃmlap
\renewcommand{\maketitle}{
-\begin{titlepage}
-\vspace*{0cm}
-\centering
-\begin{tabular}{cp{2cm}c}
-\begin{minipage}{4cm}
-\vspace{0pt}
-\includegraphics[width=1\textwidth]{\ths@logopic}
-\end{minipage} & &
-\begin{minipage}{7cm}
-\vspace{0pt}\ths@university \vspace{10pt}
-\newline \ths@faculty \vspace{10pt}
-\newline \ths@department
-\end{minipage}
-\end{tabular}
-
-\vspace*{0.2cm}
-\rule{\textwidth}{1pt}
-
-\vspace*{6cm}
-{\Huge \@title}
-
-\vspace*{5cm}
-\begin{tabular}{lp{3cm}l}
-\ths@supervisor & & \@author \\
-\ths@supervisorstitle & & \ths@period
-\end{tabular}
-
-\vfill
-\ths@additionaltext
-
-\vspace*{1cm}
-\ths@city, \ths@thesisyear
-\end{titlepage}
+ \begin{titlepage}
+
+ \begin{center}
+
+ \begin{tabular}{ c c }
+ \multirow{4}{*}{\hspace{-1.0cm}\includegraphics[width=0.25\textwidth]{\logofilename}}
+
+ & {\sc \Large \makecell{\univname}} \vspace{0.3cm}\\
+ & {\sc \Large \makecell{\facname}} \vspace{0.5cm}\\
+ & {\sc \large \makecell{\deptname}}
+ \end{tabular}
+
+ \vspace{5.0cm}
+ {\bf \LARGE \thesistitle}
+ \vspace{4.0cm}
+
+ \ifdefined\extsupaff
+ {\it \large \authorlabel:}\\
+ {\large \authorname}\\
+ \degreename\\
+ \vspace{2.0cm}
+
+ \begin{tabular}{ l c l }
+ {\it \large \intsuplabel:} &
+ \hspace{4.0cm} &
+ {\it \large \extsuplabel:}\\
+
+ {\large \supname} &
+ \hspace{4.0cm} &
+ {\large \extsupname}\\
+
+ \supaff &
+ \hspace{4.0cm} &
+ \extsupaff\\
+ \end{tabular}
+ \else
+ \vspace{1.0cm}
+ \begin{tabular}{ l c l }
+ {\it \large \suplabel:} &
+ \hspace{4.0cm} &
+ {\it \large \authorlabel:}\\
+
+ {\large \supname} &
+ \hspace{4.0cm} &
+ {\large \authorname}\\
+
+ \supaff &
+ \hspace{4.0cm} &
+ \degreename\\
+ \end{tabular}
+ \fi
+
+ \vfill
+
+ {\it \cityname, \thesisyear}
+
+ \end{center}
+
+ \end{titlepage}
}
-\endinput
-%%
-%% End of file `elteikthesis.cls'.
+% ------------------------------
+
+% ------------------------------
+% TémabejelentÅ
+\newcommand{\topicdeclaration}{
+ \thispagestyle{empty}
+ \begin{center}
+ \vspace*{\fill}
+
+ {\large \declarationplaceholder}
+
+ \vspace*{\fill}
+ \end{center}
+
+
+ \cleardoublepage
+ \setcounter{page}{1}
+}
+% ------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elteikthesis.tlpobj new/tlpkg/tlpobj/elteikthesis.tlpobj
--- old/tlpkg/tlpobj/elteikthesis.tlpobj 2019-02-28 03:35:17.000000000 +0100
+++ new/tlpkg/tlpobj/elteikthesis.tlpobj 2020-02-27 01:55:31.000000000 +0100
@@ -1,14 +1,16 @@
name elteikthesis
category Package
-revision 22513
-shortdesc Thesis class for ELTE University Informatics wing
+revision 53926
+shortdesc Thesis template for Eotvos Lorand University (Informatics)
relocated 1
-longdesc This is not an official University class, and has not been
-longdesc approved by the University.
-runfiles size=1
+longdesc This package provides a Bachelor and Master thesis template for
+longdesc the Eotvos Lorand University, Faculty of Informatics (Budapest,
+longdesc Hungary). The template supports producing both Hungarian and
+longdesc English theses.
+runfiles size=4
RELOC/tex/latex/elteikthesis/elteikthesis.cls
+catalogue-contact-repository https://github.com/mcserep/elteikthesis
catalogue-ctan /macros/latex/contrib/elteikthesis
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl1.2
+catalogue-license mit
catalogue-topics dissertation hungarian class
-catalogue-version 1.2
+catalogue-version 2.0
++++++ elzcards.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/elzcards/README new/doc/latex/elzcards/README
--- old/doc/latex/elzcards/README 2015-04-26 23:24:24.000000000 +0200
+++ new/doc/latex/elzcards/README 2019-08-17 23:50:28.000000000 +0200
@@ -1,7 +1,14 @@
<elzcards>
-elzcards is a package meant to be an easy and flexible way
-to typeset business cards, index cards and flash cards,
-with -optional- back side. You must bother only by setting
-the paper size, margins and the design of your card.
-Everything else is done by elzcards.
+A package for typesetting business cards, index cards, and
+flash cards in an easy and flexible way, optionally also with
+reverse side. You will have to furnish the paper size, the
+desired size of your card, the printable area of your paper,
+and the design of the card. Everything else is taken care of by
+elzcards.
+
+Un paquete para componer tarjetas de presentación, fichas y
+tarjetas flash en una forma fácil y flexible, opcionalmente con
+reverso. Usted tiene que proporcionar el tamaño del papel, el
+tamaño deseado de su tarjeta, el área imprimible del papel,
+y el diseño de su tarjeta. Todo lo demás lo hace elzcards.
Binary files old/doc/latex/elzcards/elzcards-examples.pdf and new/doc/latex/elzcards/elzcards-examples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/elzcards/elzcards-examples.tex new/doc/latex/elzcards/elzcards-examples.tex
--- old/doc/latex/elzcards/elzcards-examples.tex 2017-07-14 01:08:44.000000000 +0200
+++ new/doc/latex/elzcards/elzcards-examples.tex 2019-08-17 23:50:28.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% elzcards.dtx (with options: `ejemplo')
%%
-%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2019 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and elzcards.dtx with
%% its derived files elzcards.ins, elzcards.sty and
@@ -28,7 +28,7 @@
%%
\documentclass{article}
\usepackage{elzcards}
-\usepackage[landscape,letterpaper,vmargin={0.25in,0.25in},hmargin={0.25in,0.25in}]{geometry}
+\usepackage[landscape,letterpaper,vmargin={0mm,0mm},hmargin={0mm,0mm}]{geometry}
\newcommand{\mycenter}[1]{%
\vspace*{2pt}\hspace*{2pt}$\nwarrow$ top left corner\vfill
@@ -36,26 +36,26 @@
\vfill\hfill bottom right corner $\searrow$\hspace*{2pt}\vspace*{2pt}}
\begin{document}
- %% Printing business cards with different options, showing all elzcards can do:
+ %% Writing business cards with different options:
\BusinessCard{\mycenter{Business card \\ only front side \\ default options}}
\MakeBC
\BusinessCard{\mycenter{Business card \\ front side \\ vertical shaped \\
with thicker and longer external segments}}%
[\mycenter{Business card \\ back side \\ vertical shaped}]
- \MakeBC[segments,hsize=2in, vsize=3.5in, line thickness=1pt, segment length=0.5cm]
+ \MakeBC[segments, hsize=2in, vsize=3.5in, line thickness=1pt, segment length=0.5cm]
\BusinessCard{\mycenter{Business card \\ only front side \\ with dots}}
- %% Using \MakeBC* to avoid purging the card from memory:
+ %% Using \MakeBC* to avoid clearing the card from memory:
\MakeBC*[dots]
- %% We can do \MakeBC again because we've used \MakeBC* before:
- \MakeBC[crop color=blue]
+ %% We can issue \MakeBC again because we've used \MakeBC* before:
+ \MakeBC[dots]
\BusinessCard{\mycenter{Business card \\ only front side \\ with big dots and gaps}}
\MakeBC[dots, dot size=4pt, hgap=1.666cm, vgap=0.666cm]
- \BusinessCard{\mycenter{Business card \\ only front side \\ with lines}}
+ \BusinessCard{\mycenter{Business card \\ only front side \\ with green lines}}
\MakeBC[crop color=green, lines]
\BusinessCard{\mycenter{Business card \\ only front side \\ with thicker lines}}
@@ -66,21 +66,29 @@
\BusinessCard{\mycenter{Business card \\ front side \\ other size \\ with gaps}}%
[\mycenter{Business card \\ back side \\ other size \\ with gaps}]
- %% We can specify the size also with \BCdim command; this will make default that change onwards:
+ %% We can specify the size also with \BCdim command; this will change the default onwards:
\BCdim{74mm}{52mm}
- \MakeBC[segments,hgap=1.666cm, vgap=0.666cm]
+ \MakeBC[hgap=1.666cm, vgap=0.666cm]
- %% Testing with index/flash cards:
- \IndexCard{\mycenter{Index/flash card \\ front side \CurrentIC{} of \TotalIC}}%
+ \BusinessCard{\mycenter{Business card \\ only front side \\ other size \\ auto gap inner}}%
+ \MakeBC[autogap inner]
+
+ %% Autogap total best works if all paper margins are set to zero, so all gaps will be equal.
+ \BusinessCard{\mycenter{Business card \\ only front side \\ other size \\ auto gap total}}%
+ \MakeBC[autogap total]
+
+ %% Writing index/flash cards:
+ \IndexCard{\mycenter{Index/flash card \CurrentIC{} of \TotalIC \\ front side}}%
[\mycenter{Index/flash card \CurrentIC{} of \TotalIC \\ back side}]
%% Note that not all cards has back side.
- \IndexCard{\mycenter{Index/flash card \\ only front side \CurrentIC{} of \TotalIC}}
- \IndexCard{\mycenter{Index/flash card \\ only front side \CurrentIC{} of \TotalIC}}
- \IndexCard{\mycenter{Index/flash card \\ front side \CurrentIC{} of \TotalIC}}%
+ \IndexCard{\mycenter{Index/flash card \CurrentIC{} of \TotalIC \\ only front side}}
+ \IndexCard{\mycenter{Index/flash card \CurrentIC{} of \TotalIC \\ only front side}}
+ \IndexCard{\mycenter{Index/flash card \CurrentIC{} of \TotalIC \\ front side}}%
[\mycenter{Index/flash card \CurrentIC{} of \TotalIC \\ back side}]
- \IndexCard{\mycenter{Index/flash card \\ only front side \CurrentIC{} of \TotalIC}}
- \IndexCard{\mycenter{Index/flash card \\ only front side \CurrentIC{} of \TotalIC}}
- \IndexCard{\mycenter{Index/flash card \\ only front side \CurrentIC{} of \TotalIC}}
+ \IndexCard{\mycenter{Index/flash card \CurrentIC{} of \TotalIC \\ only front side}}
+ \IndexCard{\mycenter{Index/flash card \CurrentIC{} of \TotalIC \\ only front side}}
+ \IndexCard{\mycenter{Index/flash card \CurrentIC{} of \TotalIC \\ only front side}}
+ \IndexCard{\mycenter{Index/flash card \CurrentIC{} of \TotalIC \\ only front side}}
%% Now \MakeIC* instead of \MakeIC,
%% so we can process the same set of cards again with \MakeIC or \MakeIC*.
\MakeIC*
@@ -89,10 +97,11 @@
\CardGap{0.5cm}{0.5cm}
\SegmentLength{10pt}
\LineThickness{1pt}
- \CropColor{Orange}
+ \CropColor{orange}
\CropSegments
%% \MakeIC* again because we did use \MakeIC* before and the cards weren't cleared:
- \MakeIC*[hsize=2.5in,vsize=1.5in]
+ %% Now restricting the grid to 3 rows and 3 columns even if 4x4 might fit on the page
+ \MakeIC*[hsize=2.25in, vsize=1.5in, rows=3, columns=3]
%% We redefine again some default parameters:
\CardGap{0pt}{0pt}
@@ -101,8 +110,19 @@
\CropDots
%% Also we can change some other defaults with
%% \CropCrosses, \CropLines, \NoCropMarks and \CropColor.
+ %% \AutoGapInner, \AutoGapTotal, \NoAutoGap, \Transverse, \NoTransverse.
%% \MakeFC is an alias to \MakeIC:
\MakeFC*[hgap=0pt, vgap=0pt]
+ %%
+ %% Different order:
+ \MakeIC*[order=1 5 4 8 6 3 7 2]
+ %%
+ %% Adding four more cards to show the transverse option:
+ \IndexCard{\mycenter{Index/flash card \CurrentIC{} of \TotalIC \\ only front side}}
+ \IndexCard{\mycenter{Index/flash card \CurrentIC{} of \TotalIC \\ only front side}}
+ \IndexCard{\mycenter{Index/flash card \CurrentIC{} of \TotalIC \\ only front side}}
+ \IndexCard{\mycenter{Index/flash card \CurrentIC{} of \TotalIC \\ only front side}}
+ \MakeIC[rows=2, columns=2, transverse]
\end{document}
%%
%%
Binary files old/doc/latex/elzcards/elzcards.pdf and new/doc/latex/elzcards/elzcards.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elzcards.doc.tlpobj new/tlpkg/tlpobj/elzcards.doc.tlpobj
--- old/tlpkg/tlpobj/elzcards.doc.tlpobj 2019-02-28 03:35:17.000000000 +0100
+++ new/tlpkg/tlpobj/elzcards.doc.tlpobj 2019-08-18 01:53:32.000000000 +0200
@@ -1,9 +1,9 @@
name elzcards.doc
category Package
-revision 44785
+revision 51894
shortdesc doc files of elzcards
relocated 1
-docfiles size=45
+docfiles size=52
RELOC/doc/latex/elzcards/README
RELOC/doc/latex/elzcards/elzcards-examples.pdf
RELOC/doc/latex/elzcards/elzcards-examples.tex
++++++ elzcards.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/elzcards/elzcards.sty new/tex/latex/elzcards/elzcards.sty
--- old/tex/latex/elzcards/elzcards.sty 2017-07-14 01:08:44.000000000 +0200
+++ new/tex/latex/elzcards/elzcards.sty 2019-08-17 23:50:28.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% elzcards.dtx (with options: `package')
%%
-%% Copyright 2017 Emilio Lazo Zaia <emiliolazozaia(a)gmail.com>
+%% Copyright 2019 Emilio Augusto Lazo Zaia <emiliolazozaia(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -20,30 +20,42 @@
%%
%% This work has the LPPL maintenance status `maintained'.
%%
-%% The Current Maintainer of this work is Emilio Lazo Zaia.
+%% The Current Maintainer of this work is Emilio Augusto Lazo Zaia.
%%
%% This work consists of the files README and elzcards.dtx with
%% its derived files elzcards.ins, elzcards.sty and
%% elzcards-examples.tex.
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{elzcards}[2017/07/09 v1.23 ELZ cards]
+\ProvidesPackage{elzcards}[2019/08/16 v1.60 ELZ cards]
\RequirePackage{calc}
\RequirePackage{xparse}
\RequirePackage{keyval}
-\RequirePackage[usenames,dvipsnames]{xcolor}
+
+\AtBeginDocument{\@ifpackageloaded{xcolor}{}{\RequirePackage{xcolor}}}
+
+\newcommand{\PKGERROR}[1]{\PackageError{elzcards}{** #1. **}{}}
+\newcommand{\PKGWARNING}[1]{\PackageWarning{elzcards}{** #1. **}{}}
\newif\if@elzc@cruces
\newif\if@elzc@segmentos
\newif\if@elzc@puntos
\newif\if@elzc@lineas
\newif\if@elzc@sinmarcas
-\newif\if@elzc@tarjeta
+\newif\if@elzc@autosep
+\newif\if@elzc@autosepinterno
+\newif\if@elzc@autoseptotal
+\newif\if@elzc@columnasfilas
+\newif\if@elzc@fichas
+\newif\if@elzc@inicio
+\newif\if@elzc@orden
+\newif\if@elzc@calculaorden
+\newif\if@elzc@ordentransverso
\newif\if@elzc@tarjetaconreverso
\newif\if@elzc@fichaconreverso
-\newif\if@elzc@conreverso
-\newif\if@elzc@reverso
+\newif\if@elzc@actualconreverso
+\newif\if@elzc@procesareverso
\newlength{\elzc@TarjXdim}
\newlength{\elzc@TarjYdim}
@@ -65,27 +77,35 @@
\newcounter{elzc@TarjYdim}
\newcounter{elzc@PapelX}
\newcounter{elzc@PapelY}
+\newcounter{elzc@MatrizXo}
+\newcounter{elzc@MatrizYo}
\newcounter{elzc@NumX}
\newcounter{elzc@NumY}
\newcounter{elzc@NumXY}
+\newcounter{elzc@NumForzadoX}
+\newcounter{elzc@NumForzadoY}
\newcounter{elzc@ContX}
\newcounter{elzc@ContY}
\newcounter{elzc@PosX}
\newcounter{elzc@PosY}
+\newcounter{elzc@PosMarcaX}
+\newcounter{elzc@PosMarcaY}
\newcounter{elzc@SeparaX}
\newcounter{elzc@SeparaY}
-\newcounter{elzc@XInicial}
-\newcounter{elzc@RestoX}
\newcounter{elzc@Punto}
\newcounter{elzc@Arista}
\newcounter{elzc@Fichas}
+\newcounter{elzc@FichasEnOrden}
\newcounter{elzc@FichaActual}
+\newcounter{elzc@FichaActualOrdenada}
+\newcounter{elzc@ElementosOrden}
+\newcounter{elzc@OrdenCiclo}
+\newcounter{elzc@OrdenResto}
+\newcounter{elzc@OrdenCicloDos}
\newcounter{elzc@TempNumX}
\newcounter{elzc@TempNumY}
-\newcounter{elzc@TempMarcaX}
-\newcounter{elzc@TempMarcaY}
-\newcounter{elzc@TempFichaActualRev}
-\newcounter{elzc@TempInfo}
+\newcounter{elzc@Temp}
+\newcounter{elzc@TempDos}
\def\elzc@aux@cruces{%
\@elzc@crucestrue\@elzc@segmentostrue\@elzc@puntosfalse\@elzc@lineasfalse\@elzc@sinmarcasfalse}
@@ -98,11 +118,34 @@
\def\elzc@aux@sinmarcas{%
\@elzc@crucesfalse\@elzc@segmentosfalse\@elzc@puntosfalse\@elzc@lineasfalse\@elzc@sinmarcastrue}
+\def\elzc@aux@autosep@interno{%
+ \@elzc@autoseptrue\@elzc@autosepinternotrue\@elzc@autoseptotalfalse}
+\def\elzc@aux@autosep@total{%
+ \@elzc@autoseptrue\@elzc@autosepinternofalse\@elzc@autoseptotaltrue}
+\def\elzc@aux@autosep@ninguno{%
+ \@elzc@autosepfalse\@elzc@autosepinternofalse\@elzc@autoseptotalfalse}
+
+\ExplSyntaxOn
+ \cs_new:Npn \elzc@aux@elementosorden{
+ \seq_set_split:NnV \l_tmpa_seq {~} {\elzc@Orden}
+ \int_set:Nn \c@elzc@ElementosOrden {(\seq_count:N \l_tmpa_seq) -2}}
+
+ \cs_new:Npn \elzc@aux@fichatransversa #1#2{
+ \seq_set_split:NnV \l_tmpa_seq {~} {\elzc@Orden}
+ \tl_set:Nx \l_tmpa_tl {\seq_item:Nn \l_tmpa_seq {#1+1}}
+ \int_set:cn {c@#2} \l_tmpa_tl}
+\ExplSyntaxOff
+
\define@key{ELZc}{hsize}{\setlength{\elzc@TarjXdim}{#1}}
\define@key{ELZc}{vsize}{\setlength{\elzc@TarjYdim}{#1}}
-\define@key{ELZc}{hgap}{\setlength{\elzc@SeparaX}{#1}}
-\define@key{ELZc}{vgap}{\setlength{\elzc@SeparaY}{#1}}
-\define@key{ELZc}{segment length}{%
+\define@key{ELZc}{columns}{\@elzc@columnasfilastrue\setcounter{elzc@NumForzadoX}{#1}}
+\define@key{ELZc}{rows}{\@elzc@columnasfilastrue\setcounter{elzc@NumForzadoY}{#1}}
+\define@key{ELZc}{hgap}{\elzc@aux@autosep@ninguno\setlength{\elzc@SeparaX}{#1}}
+\define@key{ELZc}{vgap}{\elzc@aux@autosep@ninguno\setlength{\elzc@SeparaY}{#1}}
+\define@key{ELZc}{autogap inner}[true]{\elzc@aux@autosep@interno}
+\define@key{ELZc}{autogap total}[true]{\elzc@aux@autosep@total}
+\define@key{ELZc}{no autogap}[true]{\elzc@aux@autosep@ninguno}
+\define@key{ELZc}{segment length}{
\setlength{\elzc@TempLen}{#1}\setcounter{elzc@Arista}{\elzc@TempLen}}
\define@key{ELZc}{dot size}{\setlength{\elzc@TempLen}{#1}\setcounter{elzc@Punto}{\elzc@TempLen}}
\define@key{ELZc}{line thickness}{\linethickness{#1}}
@@ -110,12 +153,29 @@
\define@key{ELZc}{segments}[true]{\elzc@aux@segmentos}
\define@key{ELZc}{dots}[true]{\elzc@aux@puntos}
\define@key{ELZc}{lines}[true]{\elzc@aux@lineas}
-\define@key{ELZc}{crop color}{\def\elzc@ColorMarcas{#1}}
\define@key{ELZc}{no marks}[true]{\elzc@aux@sinmarcas}
+\define@key{ELZc}{crop color}{\def\elzc@ColorMarcas{#1}}
+\define@key{ELZc}{order}{
+ \if@elzc@ordentransverso
+ \PKGWARNING{Transverse ordering not available when order pattern is given}
+ \@elzc@ordentransversofalse
+ \fi
+ \@elzc@ordentrue\@elzc@calculaordentrue\def\elzc@Orden{ #1 }\elzc@aux@elementosorden}
+\define@key{ELZc}{transverse}[true]{
+ \if@elzc@orden
+ \PKGWARNING{Transverse ordering not available when order pattern is given}
+ \else
+ \@elzc@ordentransversotrue\@elzc@calculaordentrue
+ \fi}
+\define@key{ELZc}{no transverse}[true]{
+ \@elzc@ordentransversofalse
+ \if@elzc@orden\else\@elzc@calculaordenfalse\fi}
-\newcommand*{\CurrentIC}{\arabic{elzc@FichaActual}}
-\newcommand*{\TotalIC}{\arabic{elzc@Fichas}}
+\NewDocumentCommand{\CurrentIC}{s}{%
+ \IfBooleanTF{#1}{\arabic{elzc@FichaActual}}{\arabic{elzc@FichaActualOrdenada}}}
\let\CurrentFC\CurrentIC
+
+\newcommand*{\TotalIC}{\arabic{elzc@Fichas}}
\let\TotalFC\TotalIC
\newcommand*{\BCdim}[2]{\setlength{\elzc@DefTPXdim}{#1}\setlength{\elzc@DefTPYdim}{#2}}
@@ -123,6 +183,7 @@
\let\FCdim\ICdim
\NewDocumentCommand{\CardGap}{m g}{%
+ \def\elzc@DefAutoSep{\elzc@aux@autosep@ninguno}%
\setlength{\elzc@DefSeparaX}{#1}%
\IfValueTF{#2}{\setlength{\elzc@DefSeparaY}{#2}}{\setlength{\elzc@DefSeparaY}{#1}}}
@@ -137,31 +198,36 @@
\newcommand*{\CropColor}[1]{\def\elzc@DefColorMarcas{#1}}
\newcommand*{\NoCropMarks}{\def\elzc@DefMarcasCorte{\elzc@aux@sinmarcas}}
+\newcommand*{\AutoGapInner}{\def\elzc@DefAutoSep{\elzc@aux@autosep@interno}}
+\newcommand*{\AutoGapTotal}{\def\elzc@DefAutoSep{\elzc@aux@autosep@total}}
+\newcommand*{\NoAutoGap}{\def\elzc@DefAutoSep{\elzc@aux@autosep@ninguno}}
+
+\newcommand*{\Transverse}{%
+ \def\elzc@DefTrasverso{\@elzc@ordentransversotrue\@elzc@calculaordentrue}}
+\newcommand*{\NoTransverse}{%
+ \def\elzc@DefTrasverso{\@elzc@ordentransversofalse\@elzc@calculaordenfalse}}
+
\NewDocumentCommand{\MakeBC}{s o}{%
\ifx\undefined\@elzc@TarjetaAnverso
- \PackageError{elzcards}{There are no business cards defined}{}%
+ \PKGERROR{There are no business cards defined}%
\else
- \@elzc@tarjetatrue
- \if@elzc@tarjetaconreverso \@elzc@conreversotrue \else \@elzc@conreversofalse \fi
+ \@elzc@fichasfalse
+ \if@elzc@tarjetaconreverso\@elzc@actualconreversotrue\else\@elzc@actualconreversofalse\fi
\elzc@Predeterminados
- \setlength{\elzc@TarjXdim}{\elzc@DefTPXdim}%
- \setlength{\elzc@TarjYdim}{\elzc@DefTPYdim}%
\IfValueT{#2}{\setkeys{ELZc}{#2}}%
- \elzc@Tarjetas
+ \elzc@CicloCompleto
\IfBooleanF{#1}{\elzc@TodoCero}%
\fi}
\NewDocumentCommand{\MakeIC}{s o}{%
\ifnum \value{elzc@Fichas} = 0%
- \PackageError{elzcards}{There are no index/flash cards in stack}{}%
+ \PKGERROR{There are no index/flash cards in the stack}%
\else
- \@elzc@tarjetafalse
- \if@elzc@fichaconreverso \@elzc@conreversotrue \else \@elzc@conreversofalse \fi
- \elzc@Predeterminados
- \setlength{\elzc@TarjXdim}{\elzc@DefFichaXdim}%
- \setlength{\elzc@TarjYdim}{\elzc@DefFichaYdim}%
+ \@elzc@fichastrue
+ \if@elzc@fichaconreverso\@elzc@actualconreversotrue\else\@elzc@actualconreversofalse\fi
+ \elzc@Predeterminados*
\IfValueT{#2}{\setkeys{ELZc}{#2}}%
- \elzc@Tarjetas
+ \elzc@CicloCompleto
\IfBooleanF{#1}{\elzc@TodoCero*}%
\fi}
\let\MakeFC\MakeIC
@@ -173,7 +239,7 @@
\@elzc@tarjetaconreversotrue
\def\@elzc@TarjetaReverso{#2}%
\immediate\write\@auxout{\string\@twosidetrue\string\@mparswitchtrue}}
- {\def\@elzc@TarjetaReverso{}}
+ {\def\@elzc@TarjetaReverso{}}%
\else
\PackageError{elzcards}{There are business cards already defined}{}%
\fi}
@@ -188,157 +254,348 @@
{\expandafter\def\csname @elzc@FichaReverso\romannumeral\value{elzc@Fichas}\endcsname{}}}
\let\FlashCard\IndexCard
-\newcommand*{\elzc@Cuadricula}{%
- \setlength{\elzc@TempUnitLength}{\unitlength}%
- \setlength{\unitlength}{1sp}%
- \setlength{\parindent}{0pt}%
- \thispagestyle{empty}%
- \setcounter{elzc@NumX}{0}%
- \setcounter{elzc@NumY}{0}%
- \setcounter{elzc@TempNumX}{0}%
- \setcounter{elzc@TempNumY}{0}%
- \setcounter{elzc@TarjXdim}{\elzc@TarjXdim}%
- \setcounter{elzc@TarjYdim}{\elzc@TarjYdim}%
- \setcounter{elzc@SeparaX}{\elzc@SeparaX}%
- \setcounter{elzc@SeparaY}{\elzc@SeparaY}%
- \setcounter{elzc@PapelX}{\textwidth}%
- \setcounter{elzc@PapelY}{\textheight}%
+\NewDocumentCommand{\elzc@TodoCero}{s}{%
+ \IfBooleanTF{#1}{%
+ \setcounter{elzc@Fichas}{0}%
+ \setcounter{elzc@FichasEnOrden}{0}%
+ \@elzc@fichaconreversofalse}
+ {\let\@elzc@TarjetaAnverso\undefined
+ \let\@elzc@TarjetaReverso\undefined
+ \@elzc@tarjetaconreversofalse}}
+
+\NewDocumentCommand{\elzc@Predeterminados}{s}{%
+ \elzc@DefAutoSep
+ \elzc@DefMarcasCorte
+ \let\elzc@ColorMarcas\elzc@DefColorMarcas
+ \linethickness{\elzc@DefLinea}%
+ \setlength{\elzc@SeparaX}{\elzc@DefSeparaX}%
+ \setlength{\elzc@SeparaY}{\elzc@DefSeparaY}%
+ \setlength{\elzc@TempLen}{\elzc@DefArista}\setcounter{elzc@Arista}{\elzc@TempLen}%
+ \setlength{\elzc@TempLen}{\elzc@DefPunto}\setcounter{elzc@Punto}{\elzc@TempLen}%
+ \IfBooleanTF{#1}
+ {\elzc@DefTrasverso
+ \setlength{\elzc@TarjXdim}{\elzc@DefFichaXdim}\setlength{\elzc@TarjYdim}{\elzc@DefFichaYdim}}%
+ {\setlength{\elzc@TarjXdim}{\elzc@DefTPXdim}\setlength{\elzc@TarjYdim}{\elzc@DefTPYdim}}}
+
+\newcommand*{\elzc@CalculaMatriz}{%
\loop \ifnum\value{elzc@TempNumX} < \value{elzc@PapelX}%
- \advance\value{elzc@TempNumX} by \value{elzc@TarjXdim}{%
- \addtocounter{elzc@NumX}{1}%
- \addtocounter{elzc@TempNumX}{\value{elzc@SeparaX}}}%
+ \advance\value{elzc@TempNumX} by \value{elzc@TarjXdim}{%
+ \addtocounter{elzc@NumX}{1}%
+ \addtocounter{elzc@TempNumX}{\value{elzc@SeparaX}}}%
\repeat
\loop \ifnum\value{elzc@TempNumY} < \value{elzc@PapelY}%
- \advance\value{elzc@TempNumY} by \value{elzc@TarjYdim}{%
- \addtocounter{elzc@NumY}{1}%
- \addtocounter{elzc@TempNumY}{\value{elzc@SeparaY}}}%
+ \advance\value{elzc@TempNumY} by \value{elzc@TarjYdim}{%
+ \addtocounter{elzc@NumY}{1}%
+ \addtocounter{elzc@TempNumY}{\value{elzc@SeparaY}}}%
\repeat
\addtocounter{elzc@TempNumX}{-\value{elzc@SeparaX}}%
\addtocounter{elzc@TempNumY}{-\value{elzc@SeparaY}}%
\ifnum\value{elzc@TempNumX} > \value{elzc@PapelX}%
+ \addtocounter{elzc@TempNumX}{-\value{elzc@TarjXdim}}%
\addtocounter{elzc@NumX}{-1}%
\fi
\ifnum\value{elzc@TempNumY} > \value{elzc@PapelY}%
+ \addtocounter{elzc@TempNumY}{-\value{elzc@TarjYdim}}%
\addtocounter{elzc@NumY}{-1}%
\fi
- \setcounter{elzc@NumXY}{\value{elzc@NumX} * \value{elzc@NumY}}%
- \setcounter{elzc@ContX}{-1}%
- \setcounter{elzc@ContY}{-1}%
- \setcounter{elzc@RestoX}{- \value{elzc@PapelX} + \value{elzc@NumX} *%
- (\value{elzc@TarjXdim} + \value{elzc@SeparaX}) - \value{elzc@SeparaX}}%
+ \ifnum\value{elzc@NumX} = 0
+ \PKGERROR{No space to print at least one card. Check dimensions}\stop
+ \fi
+ \ifnum\value{elzc@NumY} = 0
+ \PKGERROR{No space to print at least one card. Check dimensions}\stop
+ \fi}
+
+\newcommand*{\elzc@ColumnasFilas}{%
+ \ifnum\value{elzc@NumForzadoX} > \value{elzc@NumX}%
+ \PKGWARNING{No space to print \arabic{elzc@NumForzadoX} columns;
+ printing \arabic{elzc@NumX} columns instead}%
+ \setcounter{elzc@NumForzadoX}{0}%
+ \else
+ \ifnum\value{elzc@NumForzadoX} > 0
+ \addtocounter{elzc@TempNumX}{-\value{elzc@NumX} * \value{elzc@TarjXdim}
+ + \value{elzc@NumForzadoX} * \value{elzc@TarjXdim}}%
+ \setcounter{elzc@NumX}{\arabic{elzc@NumForzadoX}}%
+ \fi
+ \fi
+ \ifnum\value{elzc@NumForzadoY} > \value{elzc@NumY}%
+ \PKGWARNING{No space to print \arabic{elzc@NumForzadoY} rows;
+ printing \arabic{elzc@NumY} rows instead}%
+ \setcounter{elzc@NumForzadoY}{0}%
+ \else
+ \ifnum\value{elzc@NumForzadoY} > 0
+ \addtocounter{elzc@TempNumY}{-\value{elzc@NumY} * \value{elzc@TarjYdim}
+ + \value{elzc@NumForzadoY} * \value{elzc@TarjYdim}}%
+ \setcounter{elzc@NumY}{\arabic{elzc@NumForzadoY}}%
+ \fi
+ \fi}
+
+\newcommand*{\elzc@Cuadricula}{%
+ \setlength{\elzc@TempUnitLength}{\unitlength}%
+ \setlength{\unitlength}{1sp}%
+ \setlength{\parindent}{0pt}%
+ \thispagestyle{empty}%
\elzc@Informacion
- \begin{picture}(\value{elzc@PapelX}, \value{elzc@PapelY})(\value{elzc@XInicial}, 0)%
- \loop \ifnum\value{elzc@ContY} < \value{elzc@NumY} \advance\value{elzc@ContY} by 1{%
- \loop \ifnum\value{elzc@ContX} < \value{elzc@NumX} \advance\value{elzc@ContX} by 1{%
- \if@elzc@reverso
- \setcounter{elzc@PosX}{(\value{elzc@NumX} - \value{elzc@ContX} - 1) * \value{elzc@TarjXdim}%
+ \setcounter{elzc@MatrizXo}{
+ (\value{elzc@PapelX} - \value{elzc@NumX} * (\value{elzc@TarjXdim} + \value{elzc@SeparaX})
+ + \value{elzc@SeparaX}) / 2}%
+ \setcounter{elzc@MatrizYo}
+ {(\value{elzc@PapelY} - \value{elzc@NumY} * (\value{elzc@TarjYdim} + \value{elzc@SeparaY})
+ + \value{elzc@SeparaY}) / 2}%
+ \begin{picture}
+ (\value{elzc@PapelX}, \value{elzc@PapelY})
+ (-\value{elzc@MatrizXo}, -\value{elzc@MatrizYo})%
+ \loop \ifnum\value{elzc@ContY} < \value{elzc@NumY}\advance\value{elzc@ContY} by 1{%
+ \loop \ifnum\value{elzc@ContX} < \value{elzc@NumX}\advance\value{elzc@ContX} by 1{%
+ \if@elzc@procesareverso
+ \setcounter{elzc@PosX}{(\value{elzc@NumX} - \value{elzc@ContX} - 1) * \value{elzc@TarjXdim}
+ (\value{elzc@NumX} - \value{elzc@ContX} - 1) * \value{elzc@SeparaX}}%
\else
\setcounter{elzc@PosX}{\value{elzc@ContX} * (\value{elzc@TarjXdim} + \value{elzc@SeparaX})}%
\fi
- \setcounter{elzc@PosY}{\value{elzc@ContY} * (\value{elzc@TarjYdim} + \value{elzc@SeparaY})}%
+ \setcounter{elzc@PosY}{\value{elzc@PapelY} -
+ (\value{elzc@ContY} * (\value{elzc@TarjYdim} + \value{elzc@SeparaY}))
+ - \value{elzc@TarjYdim} - 2 * \value{elzc@MatrizYo}}%
\ifnum \value{elzc@ContX} < \value{elzc@NumX}%
\ifnum \value{elzc@ContY} < \value{elzc@NumY}%
\put(\value{elzc@PosX}, \value{elzc@PosY}){%
\makebox(\value{elzc@TarjXdim}, \value{elzc@TarjYdim}){%
\setlength{\unitlength}{\elzc@TempUnitLength}%
\parbox[t][\elzc@TarjYdim]{\elzc@TarjXdim}{%
- \if@elzc@tarjeta
- \if@elzc@reverso \@elzc@TarjetaReverso \else \@elzc@TarjetaAnverso \fi
- \else
- \ifnum\value{elzc@FichaActual} < \value{elzc@Fichas}%
+ \if@elzc@fichas
+ \ifnum\value{elzc@FichaActual} < \value{elzc@FichasEnOrden}%
\addtocounter{elzc@FichaActual}{1}%
- \addtocounter{elzc@TempFichaActualRev}{1}%
- \if@elzc@reverso
- \expandafter\csname @elzc@FichaReverso\romannumeral\value{elzc@FichaActual}\endcsname
+ \if@elzc@calculaorden
+ \elzc@CalculaOrden
+ \else
+ \setcounter{elzc@FichaActualOrdenada}{\value{elzc@FichaActual}}%
+ \fi
+ \if@elzc@procesareverso
+ \expandafter
+ \csname @elzc@FichaReverso\romannumeral\value{elzc@FichaActualOrdenada}\endcsname
\else
- \expandafter\csname @elzc@FichaAnverso\romannumeral\value{elzc@FichaActual}\endcsname
+ \expandafter
+ \csname @elzc@FichaAnverso\romannumeral\value{elzc@FichaActualOrdenada}\endcsname
\fi
\fi
+ \else
+ \if@elzc@procesareverso\@elzc@TarjetaReverso\else\@elzc@TarjetaAnverso\fi
\fi}}}%
\fi
\fi
- \if@elzc@reverso \else \elzc@CalculaMarcas \fi
+ \if@elzc@procesareverso\else\elzc@CalculaMarcas\fi
}\repeat
}\repeat
- \end{picture}}
+ \end{picture}\global\@elzc@iniciofalse}
-\newcommand*{\elzc@Tarjetas}{%
- {\pagestyle{empty}\cleardoublepage}%
- \elzc@Cuadricula
- \if@elzc@conreverso
- \@elzc@reversotrue
- \if@elzc@tarjeta \else \addtocounter{elzc@FichaActual}{-\value{elzc@TempFichaActualRev}}\fi
- \setcounter{elzc@XInicial}{\value{elzc@RestoX}}%
- \clearpage
- \elzc@Cuadricula
- \setcounter{elzc@XInicial}{0}%
- \@elzc@reversofalse
+\newcommand*{\elzc@Inicializa}{%
+ \setcounter{elzc@NumX}{0}%
+ \setcounter{elzc@NumY}{0}%
+ \setcounter{elzc@TempNumX}{0}%
+ \setcounter{elzc@TempNumY}{0}%
+ \if@elzc@inicio
+ \setcounter{elzc@PapelX}{\textwidth}%
+ \setcounter{elzc@PapelY}{\textheight}%
+ \setcounter{elzc@TarjXdim}{\elzc@TarjXdim}%
+ \setcounter{elzc@TarjYdim}{\elzc@TarjYdim}%
\fi
- \if@elzc@tarjeta
+ \if@elzc@autosep
+ \setlength{\elzc@SeparaX}{0pt}\setlength{\elzc@SeparaY}{0pt}%
+ \fi
+ \setcounter{elzc@SeparaX}{\elzc@SeparaX}%
+ \setcounter{elzc@SeparaY}{\elzc@SeparaY}%
+ \elzc@CalculaMatriz
+ \if@elzc@columnasfilas\elzc@ColumnasFilas\fi
+ \if@elzc@autosep
+ \if@elzc@autoseptotal
+ \setcounter{elzc@SeparaX}{
+ (\value{elzc@PapelX} - \value{elzc@TempNumX}) / (\value{elzc@NumX} + 1)}%
+ \setcounter{elzc@SeparaY}{
+ (\value{elzc@PapelY} - \value{elzc@TempNumY}) / (\value{elzc@NumY} + 1)}%
+ \else
+ \ifnum\value{elzc@NumX} > 1
+ \setcounter{elzc@SeparaX}{
+ (\value{elzc@PapelX} - \value{elzc@TempNumX}) / (\value{elzc@NumX} - 1)}%
+ \fi
+ \ifnum\value{elzc@NumY} > 1
+ \setcounter{elzc@SeparaY}{
+ (\value{elzc@PapelY} - \value{elzc@TempNumY}) / (\value{elzc@NumY} - 1)}%
+ \fi
+ \fi
+ \setlength{\elzc@SeparaX}{\value{elzc@SeparaX}sp}%
+ \setlength{\elzc@SeparaY}{\value{elzc@SeparaY}sp}%
+ \fi
+ \setcounter{elzc@NumXY}{\value{elzc@NumX} * \value{elzc@NumY}}%
+ \if@elzc@orden
+ \setcounter{elzc@FichasEnOrden}
+ {\value{elzc@Fichas} / \value{elzc@ElementosOrden} * \value{elzc@ElementosOrden}}
+ \ifnum\value{elzc@FichasEnOrden} < \value{elzc@Fichas}%
+ \addtocounter{elzc@FichasEnOrden}{\value{elzc@ElementosOrden}}%
+ \fi
\else
- \setcounter{elzc@TempFichaActualRev}{0}%
- \ifnum\value{elzc@FichaActual} < \value{elzc@Fichas}%
- \elzc@Tarjetas
+ \setcounter{elzc@FichasEnOrden}{\value{elzc@Fichas} / \value{elzc@NumXY} * \value{elzc@NumXY}}%
+ \ifnum\value{elzc@FichasEnOrden} < \value{elzc@Fichas}%
+ \addtocounter{elzc@FichasEnOrden}{\value{elzc@NumXY}}%
\fi
- \setcounter{elzc@FichaActual}{0}%
\fi
+ \setcounter{elzc@ContX}{-1}%
+ \setcounter{elzc@ContY}{-1}%
+ \if@elzc@inicio
+ \if@elzc@ordentransverso
+ \elzc@CalculaOrdenTrasverso
+ \else
+ \if@elzc@orden\elzc@VerificaOrden\fi
+ \fi
+ \fi}
+
+\newcommand*{\elzc@CicloCompleto}{%
+ \@elzc@iniciotrue
+ \elzc@Inicializa
+ \if@elzc@fichas
+ \loop\ifnum\value{elzc@FichaActual} < \value{elzc@FichasEnOrden}%
+ {\elzc@CicloPagina}\repeat
+ \setcounter{elzc@FichaActual}{0}%
+ \@elzc@ordenfalse
+ \@elzc@ordentransversofalse
+ \@elzc@calculaordenfalse
+ \else
+ \elzc@CicloPagina
+ \fi
+ \@elzc@columnasfilasfalse
+ \setcounter{elzc@NumForzadoX}{0}%
+ \setcounter{elzc@NumForzadoY}{0}%
\clearpage}
-\NewDocumentCommand{\elzc@TodoCero}{s}{%
- \IfBooleanTF{#1}{%
- \setcounter{elzc@Fichas}{0}%
- \@elzc@fichaconreversofalse}
- {\let\@elzc@TarjetaAnverso\undefined
- \let\@elzc@TarjetaReverso\undefined
- \@elzc@tarjetaconreversofalse}}
+\newcommand*{\elzc@CicloPagina}{%
+ {\pagestyle{empty}\cleardoublepage}%
+ \elzc@Cuadricula
+ \if@elzc@actualconreverso
+ \@elzc@procesareversotrue
+ \if@elzc@fichas\addtocounter{elzc@FichaActual}{-\value{elzc@NumXY}}\fi
+ \clearpage
+ \elzc@Cuadricula
+ \@elzc@procesareversofalse
+ \fi}
-\newcommand*{\elzc@Predeterminados}{%
- \elzc@DefMarcasCorte
- \setlength{\elzc@SeparaX}{\elzc@DefSeparaX}%
- \setlength{\elzc@SeparaY}{\elzc@DefSeparaY}%
- \setlength{\elzc@TempLen}{\elzc@DefArista}\setcounter{elzc@Arista}{\elzc@TempLen}%
- \setlength{\elzc@TempLen}{\elzc@DefPunto}\setcounter{elzc@Punto}{\elzc@TempLen}%
- \linethickness{\elzc@DefLinea}%
- \let\elzc@ColorMarcas\elzc@DefColorMarcas}
+\newcommand*{\elzc@CalculaOrdenTrasverso}{%
+ \setcounter{elzc@OrdenCiclo}{0}%
+ \setcounter{elzc@OrdenCicloDos}{0}%
+ \if@elzc@fichas
+ \def\elzc@Orden{ }%
+ \setcounter{elzc@Temp}{\value{elzc@Fichas} / \value{elzc@NumXY}}%
+ \setcounter{elzc@TempDos}{\value{elzc@Temp} * \value{elzc@NumXY}}%
+ \ifnum\value{elzc@TempDos} = \value{elzc@Fichas}%
+ \else
+ \addtocounter{elzc@Temp}{1}%
+ \fi
+ \loop \ifnum\value{elzc@OrdenCiclo} < \value{elzc@Temp}%
+ \advance \value{elzc@OrdenCiclo} by 1{%
+ \setcounter{elzc@TempDos}{\value{elzc@OrdenCiclo}}%
+ \addtocounter{elzc@TempDos}{-\value{elzc@Temp}}%
+ \loop \ifnum\value{elzc@OrdenCicloDos} < \value{elzc@NumXY}%
+ \advance \value{elzc@OrdenCicloDos} by 1{%
+ \addtocounter{elzc@TempDos}{\value{elzc@Temp}}%
+ \global\edef\elzc@Orden{\elzc@Orden \arabic{elzc@TempDos} }%
+ }\repeat
+ }\repeat
+ \elzc@aux@elementosorden
+ \else
+ \PKGWARNING{Transverse ordering not available on business cards}%
+ \global\@elzc@ordentransversofalse
+ \global\@elzc@calculaordenfalse
+ \fi}
+
+\newcommand*{\elzc@ErrorEnPatronOrden}{%
+ \PKGWARNING{Ordering pattern incorrectly given. Ignoring it}%
+ \global\@elzc@ordenfalse
+ \global\@elzc@calculaordenfalse}
+
+\newcommand*{\elzc@VerificaOrden}{%
+ \if@elzc@fichas
+ \setcounter{elzc@Temp}{\value{elzc@ElementosOrden} - \value{elzc@ElementosOrden} /
+ \value{elzc@NumXY} * \value{elzc@NumXY}}%
+ \ifnum\value{elzc@Temp} = 0
+ \else
+ \ifnum\value{elzc@Temp} = \value{elzc@Fichas}%
+ \else
+ \ifnum\value{elzc@ElementosOrden} = \value{elzc@Fichas}%
+ \else
+ \elzc@ErrorEnPatronOrden
+ \fi
+ \fi
+ \fi
+ \if@elzc@orden
+ \setcounter{elzc@OrdenCiclo}{0}%
+ \loop \ifnum\value{elzc@OrdenCiclo} < \value{elzc@ElementosOrden}%
+ \advance \value{elzc@OrdenCiclo} by 1{%
+ \setcounter{elzc@OrdenCicloDos}{0}%
+ \loop \ifnum\value{elzc@OrdenCicloDos} < \value{elzc@ElementosOrden}%
+ \advance \value{elzc@OrdenCicloDos} by 1{%
+ \elzc@aux@fichatransversa{\value{elzc@OrdenCicloDos}}{elzc@Temp}%
+ \ifnum\value{elzc@OrdenCiclo} = \value{elzc@Temp}%
+ \setcounter{elzc@OrdenCicloDos}{\value{elzc@ElementosOrden}}%
+ \else
+ \ifnum\value{elzc@OrdenCicloDos} = \value{elzc@ElementosOrden}%
+ \elzc@ErrorEnPatronOrden
+ \setcounter{elzc@OrdenCiclo}{\value{elzc@ElementosOrden}}%
+ \fi
+ \fi
+ }\repeat
+ }\repeat
+ \fi
+ \else
+ \PKGWARNING{Ordering pattern not available on business cards}%
+ \global\@elzc@ordenfalse
+ \global\@elzc@calculaordenfalse
+ \fi}
+
+\newcommand*{\elzc@CalculaOrden}{%
+ \setcounter{elzc@OrdenCiclo}{\value{elzc@FichaActual} / \value{elzc@ElementosOrden}}%
+ \setcounter{elzc@OrdenResto}{\value{elzc@FichaActual} - \value{elzc@FichaActual} /
+ \value{elzc@ElementosOrden} * \value{elzc@ElementosOrden}}%
+ \ifnum\value{elzc@OrdenResto} = 0
+ \addtocounter{elzc@OrdenCiclo}{-1}%
+ \setcounter{elzc@OrdenResto}{\value{elzc@ElementosOrden}}%
+ \fi
+ \elzc@aux@fichatransversa{\value{elzc@OrdenResto}}{elzc@FichaActualOrdenada}%
+ \addtocounter{elzc@FichaActualOrdenada}{\value{elzc@OrdenCiclo} * \value{elzc@ElementosOrden}}}
\newcommand*{\elzc@CalculaMarcas}{%
- \setcounter{elzc@TempMarcaX}{\value{elzc@PosX}}%
- \setcounter{elzc@TempMarcaY}{\value{elzc@PosY}}%
+ \setcounter{elzc@PosMarcaX}{\value{elzc@PosX}}%
+ \setcounter{elzc@PosMarcaY}{\value{elzc@PosY} + \value{elzc@TarjYdim}}%
\ifnum \value{elzc@ContX} = \value{elzc@NumX}%
\else
\ifnum \value{elzc@ContY} = \value{elzc@NumY}%
\else
- \elzc@DibujaMarcas{\value{elzc@TempMarcaX}}{\value{elzc@TempMarcaY}}%
+ \elzc@DibujaMarcas{\value{elzc@PosMarcaX}}{\value{elzc@PosMarcaY}}%
\fi
\fi
- \addtocounter{elzc@TempMarcaX}{-\value{elzc@SeparaX}}%
- \ifnum \value{elzc@ContX} = 0%
+ \addtocounter{elzc@PosMarcaX}{-\value{elzc@SeparaX}}%
+ \ifnum \value{elzc@ContX} = 0
\else
\ifnum \value{elzc@ContY} = \value{elzc@NumY}%
\else
- \elzc@DibujaMarcas{\value{elzc@TempMarcaX}}{\value{elzc@TempMarcaY}}%
+ \elzc@DibujaMarcas{\value{elzc@PosMarcaX}}{\value{elzc@PosMarcaY}}%
\fi
\fi
- \addtocounter{elzc@TempMarcaY}{-\value{elzc@SeparaY}}%
- \ifnum \value{elzc@ContX} = 0%
+ \addtocounter{elzc@PosMarcaY}{\value{elzc@SeparaY}}%
+ \ifnum \value{elzc@ContX} = 0
\else
- \ifnum \value{elzc@ContY} = 0%
+ \ifnum \value{elzc@ContY} = 0
\else
- \elzc@DibujaMarcas{\value{elzc@TempMarcaX}}{\value{elzc@TempMarcaY}}%
+ \elzc@DibujaMarcas{\value{elzc@PosMarcaX}}{\value{elzc@PosMarcaY}}%
\fi
\fi
- \addtocounter{elzc@TempMarcaX}{\value{elzc@SeparaX}}%
- \ifnum \value{elzc@ContY} = 0%
+ \addtocounter{elzc@PosMarcaX}{\value{elzc@SeparaX}}%
+ \ifnum \value{elzc@ContY} = 0
\else
\ifnum \value{elzc@ContX} = \value{elzc@NumX}%
\else
- \elzc@DibujaMarcas{\value{elzc@TempMarcaX}}{\value{elzc@TempMarcaY}}%
+ \elzc@DibujaMarcas{\value{elzc@PosMarcaX}}{\value{elzc@PosMarcaY}}%
\fi
\fi}
\newcommand*{\elzc@DibujaMarcas}[2]{%
- \ifnum \value{elzc@ContX} = 0%
+ \ifnum \value{elzc@ContX} = 0
\if@elzc@segmentos\put(#1,#2){\color{\elzc@ColorMarcas}\line(-1,0){\value{elzc@Arista}}}\fi
\if@elzc@puntos\put(#1,#2){\color{\elzc@ColorMarcas}\circle*{\value{elzc@Punto}}}\fi
\else
@@ -357,12 +614,12 @@
\fi
\fi
\fi
- \ifnum \value{elzc@ContY} = 0%
- \if@elzc@segmentos\put(#1,#2){\color{\elzc@ColorMarcas}\line(0,-1){\value{elzc@Arista}}}\fi
+ \ifnum \value{elzc@ContY} = 0
+ \if@elzc@segmentos\put(#1,#2){\color{\elzc@ColorMarcas}\line(0,0){\value{elzc@Arista}}}\fi
\if@elzc@puntos\put(#1,#2){\color{\elzc@ColorMarcas}\circle*{\value{elzc@Punto}}}\fi
\else
\ifnum \value{elzc@ContY} = \value{elzc@NumY}%
- \if@elzc@segmentos\put(#1,#2){\color{\elzc@ColorMarcas}\line(0,0){\value{elzc@Arista}}}\fi
+ \if@elzc@segmentos\put(#1,#2){\color{\elzc@ColorMarcas}\line(0,-1){\value{elzc@Arista}}}\fi
\if@elzc@puntos\put(#1,#2){\color{\elzc@ColorMarcas}\circle*{\value{elzc@Punto}}}\fi
\else
\if@elzc@cruces
@@ -379,32 +636,52 @@
\newcommand*{\elzc@Informacion}{%
\message{^^JProcessing}%
- \if@elzc@tarjeta
- \message{business cards,}%
+ \if@elzc@fichas\message{index/flash cards,}\else\message{business cards,}\fi
+ \if@elzc@procesareverso
+ \message{back side,^^J}%
\else
- \message{index/flash cards,}%
- \setcounter{elzc@TempInfo}{\value{elzc@NumXY} + \value{elzc@FichaActual}}%
- \ifnum \value{elzc@TempInfo} > \value{elzc@Fichas}%
- \setcounter{elzc@TempInfo}{\value{elzc@Fichas}}%
- \fi
+ \if@elzc@actualconreverso\else\message{only}\fi
+ \message{front side,^^J}%
+ \fi
+ \if@elzc@fichas
+ \setcounter{elzc@Temp}{\value{elzc@NumXY} + \value{elzc@FichaActual}}%
\addtocounter{elzc@FichaActual}{1}%
- \message{current=\arabic{elzc@FichaActual}-\arabic{elzc@TempInfo},
- total=\arabic{elzc@Fichas},}%
+ \message{ current=\arabic{elzc@FichaActual}-\arabic{elzc@Temp}}%
+ \message{of \arabic{elzc@FichasEnOrden},}%
+ \message{total cards=\arabic{elzc@Fichas},}%
+ \if@elzc@calculaorden
+ \if@elzc@ordentransverso \message{transverse order,}\fi
+ \if@elzc@orden \message{reordered,}\fi
+ \fi
\addtocounter{elzc@FichaActual}{-1}%
+ \message{^^J}%
\fi
- \if@elzc@reverso\message{back side,^^J}\else\message{front side,^^J}\fi
- \message{ per page: \arabic{elzc@NumXY} (\arabic{elzc@NumX}x\arabic{elzc@NumY}),}%
- \message{ hsize=\the\elzc@TarjXdim, vsize=\the\elzc@TarjYdim,
- hgap=\the\elzc@SeparaX, vgap=\the\elzc@SeparaY,^^J}%
+ \message{ per page:
+ \ifnum\value{elzc@NumForzadoX} > 0
+ forced
+ \else
+ \ifnum\value{elzc@NumForzadoY} > 0
+ forced
+ \fi
+ \fi
+ \arabic{elzc@NumXY} (\arabic{elzc@NumX}x\arabic{elzc@NumY}),}%
+ \message{hsize=\the\elzc@TarjXdim, vsize=\the\elzc@TarjYdim,^^J}%
+ \message{ hgap=\the\elzc@SeparaX, vgap=\the\elzc@SeparaY,
+ \if@elzc@autosep
+ \if@elzc@autosepinterno auto gap inner,\fi
+ \if@elzc@autoseptotal auto gap total,\fi
+ \else no auto gap,
+ \fi^^J}%
\if@elzc@cruces
\message{ with crosses,}%
\setlength{\elzc@TempLen}{\value{elzc@Arista}sp}%
\message{segment length=\the\elzc@TempLen, line thickness=\the\(a)wholewidth.^^J}%
- \fi
- \if@elzc@segmentos
- \message{ with segments,}%
- \setlength{\elzc@TempLen}{\value{elzc@Arista}sp}%
- \message{segment length=\the\elzc@TempLen, line thickness=\the\(a)wholewidth.^^J}%
+ \else
+ \if@elzc@segmentos
+ \message{ with segments,}%
+ \setlength{\elzc@TempLen}{\value{elzc@Arista}sp}%
+ \message{segment length=\the\elzc@TempLen, line thickness=\the\(a)wholewidth.^^J}%
+ \fi
\fi
\if@elzc@puntos
\message{ with dots,}%
@@ -427,8 +704,10 @@
\setlength{\elzc@DefArista}{1mm}
\setlength{\elzc@DefPunto}{1pt}
\setlength{\elzc(a)DefLinea}{0.1mm}
-\CropColor{Red!90!Black}
+\CropColor{red!90!black}
\CropCrosses
+\NoAutoGap
+\NoTransverse
\InputIfFileExists{\jobname.aux}{}\relax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elzcards.tlpobj new/tlpkg/tlpobj/elzcards.tlpobj
--- old/tlpkg/tlpobj/elzcards.tlpobj 2019-02-28 03:35:17.000000000 +0100
+++ new/tlpkg/tlpobj/elzcards.tlpobj 2019-08-18 01:53:32.000000000 +0200
@@ -1,18 +1,18 @@
name elzcards
category Package
-revision 44785
+revision 51894
shortdesc Typeset business cards, index cards and flash cards easily
relocated 1
-longdesc A package for typesetting business cards, index cards, and
-longdesc flash cards in an easy and flexible way, optionally also the
-longdesc reverse side. You will have to furnish the paper size, the
+longdesc A LaTeX package for typesetting business cards, index cards,
+longdesc and flash cards in an easy and flexible way, optionally also
+longdesc the reverse side. You will have to furnish the paper size, the
longdesc desired size of your card, the printable area of your printer,
longdesc and the design of the card. Everything else is taken care of by
longdesc elzcards.
-runfiles size=4
+runfiles size=7
RELOC/tex/latex/elzcards/elzcards.sty
catalogue-ctan /macros/latex/contrib/elzcards
-catalogue-date 2017-07-10 19:52:44 +0200
+catalogue-date 2019-08-17 09:45:16 +0200
catalogue-license lppl1.3
catalogue-topics card-gen
-catalogue-version 1.23
+catalogue-version 1.60
++++++ embedall.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/embedall/README new/doc/latex/embedall/README
--- old/doc/latex/embedall/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/embedall/README 2019-05-21 23:03:31.000000000 +0200
@@ -0,0 +1,2 @@
+This package provides an easy way of storing the main TeX file as an attachment in the output PDF.
+The same functionality is provided for several types of content imports like external TeX files, images and listings.
Binary files old/doc/latex/embedall/embedall.pdf and new/doc/latex/embedall/embedall.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/embedall.doc.tlpobj new/tlpkg/tlpobj/embedall.doc.tlpobj
--- old/tlpkg/tlpobj/embedall.doc.tlpobj 2019-02-28 03:35:19.000000000 +0100
+++ new/tlpkg/tlpobj/embedall.doc.tlpobj 2019-05-22 01:38:52.000000000 +0200
@@ -1,7 +1,8 @@
name embedall.doc
category Package
-revision 31903
+revision 51177
shortdesc doc files of embedall
relocated 1
-docfiles size=38
+docfiles size=59
+ RELOC/doc/latex/embedall/README
RELOC/doc/latex/embedall/embedall.pdf
++++++ embedall.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/embedall/embedall.sty new/tex/latex/embedall/embedall.sty
--- old/tex/latex/embedall/embedall.sty 2013-10-15 00:28:46.000000000 +0200
+++ new/tex/latex/embedall/embedall.sty 2019-05-21 23:03:31.000000000 +0200
@@ -9,70 +9,130 @@
%% This is a generated file.
%%
%% Copyright (C) 2013 by Alberto Sartori
+%% Copyright (C) 2019 by David Lichti
%%
-%% This file may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, either version 1.2 of this license
-%% or (at your option) any later version. The latest version of this
-%% license is in:
+%% This file may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either
+%% version 1.3 of this license or (at your option) any later
+%% version. The latest version of this license is in:
%%
-%% http://www.latex-project.org/lppl.txt
+%% http://www.latex-project.org/lppl.txt
%%
-%% and version 1.2 or later is part of all distributions of LaTeX version
-%% 1999/12/01 or later.
+%% and version 1.3 or later is part of all distributions of
+%% LaTeX version 2005/12/01 or later.
%%
-\NeedsTeXFormat{LaTeX2e}[1994/06/01]
-\ProvidesPackage{embedall}
- [2013/10/10 v1.0 embed files in pdf]
-
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{embedall}[2019/05/18 v2.0 Automatically embed source files in PDF]
+\newif\ifembedall@all
+\embedall@alltrue
+\newif\ifembedall@main
+\embedall@mainfalse
+\newif\ifembedall@input
+\embedall@inputfalse
+\newif\ifembedall@include
+\embedall@includefalse
+\newif\ifembedall@graphicx
+\embedall@graphicxfalse
+\newif\ifembedall@csvsimple
+\embedall@csvsimplefalse
+\newif\ifembedall@compat
+\embedall@compatfalse
+\DeclareOption{all}{\embedall@alltrue}
+\DeclareOption{notall}{\embedall@allfalse}
+\DeclareOption{main}{\embedall@maintrue\embedall@allfalse}
+\DeclareOption{input}{\embedall@inputtrue\embedall@allfalse}
+\DeclareOption{include}{\embedall@includetrue\embedall@allfalse}
+\DeclareOption{graphicx}{\embedall@graphicxtrue\embedall@allfalse}
+\DeclareOption{csvsimple}{\embedall@csvsimpletrue\embedall@allfalse}
+\DeclareOption{compat}{\embedall@compattrue}
+\ProcessOptions\relax
+\ifembedall@all
+ \embedall@maintrue
+ \embedall@inputtrue
+ \embedall@includetrue
+ \embedall@graphicxtrue
+ \embedall@csvsimpletrue
+\fi
\RequirePackage{embedfile}
-\RequirePackage{graphicx}
-\RequirePackage{listings}
-\RequirePackage{letltxmacro}
-
-\newcommand\embedall@all{1}
-\newcommand\embedall@graphicx{0}
-\newcommand\embedall@list{0}
-\newcommand\embedall@source{0}
-
-\DeclareOption{graphicx}{\def\embedall@graphicx{1}\def\embedall@all{0}}
-\DeclareOption{listings}{\def\embedall@list{1}\def\embedall@all{0}}
-\DeclareOption{source}{\def\embedall@source{1}\def\embedall@all{0}}
-
-\ProcessOptions
-
-\LetLtxMacro\embedall@latex@includegraphics\includegraphics
-\newcommand\embedall@includegraphics[2][]{%
- \embedfile[desc=image]{#2}
- \embedall@latex@includegraphics[#1]{#2}%
-}
-
-\LetLtxMacro\embedall@latex@lstinputlisting\lstinputlisting
-\newcommand\embedall@lstinputlisting[2][]{%
- \embedfile[desc=listing file]{#2}
- \embedall@latex@lstinputlisting[#1]{#2}%
-}
-
-\DeclareRobustCommand\embedinput[2][input file]{%
- \input{#2}%
- \embedfile[desc={#1}]{#2}%
+\RequirePackage{filehook}
+\RequirePackage{currfile}
+\RequirePackage{etoolbox}
+\ifembedall@compat
+ \RequirePackage{letltxmacro}
+\fi
+\newcommand\embedsource[1][]{\embedall@embed[#1]{\currfilename}}
+\def\embedall@filelist{}
+\newcommand{\embedall@embed}[2][]{%
+ \xifinlist{#2}{\embedall@filelist}{}{%
+ \newlinechar=`\^^J%
+ \message{^^J^^Jembedall: Attaching file '#2'.^^J^^J}%
+ \embedfile[#1]{#2}%
+ \listxadd{\embedall@filelist}{#2}%
+ }%
}
-
-\ifnum\embedall@all=1%
- \def\embedall@graphicx{1}
- \def\embedall@list{1}
- \def\embedall@source{1}
-\fi
-\ifnum\embedall@graphicx=1%
- \LetLtxMacro\includegraphics\embedall@includegraphics
-\fi
-\ifnum\embedall@list=1%
- \LetLtxMacro\lstinputlisting\embedall@lstinputlisting
-\fi
-
-\IfFileExists{./\jobname.tex}{%
- \ifnum\embedall@source=1%
- \embedfile[desc=main source file]{\jobname.tex}\fi}{}
-
+\ifembedall@compat
+ \LetLtxMacro\embedall@latex@includegraphics\includegraphics
+ \newcommand\embedall@includegraphics[2][]{%
+ \embedall@embed[desc=image]{#2}
+ \embedall@latex@includegraphics[#1]{#2}%
+ }
+ \LetLtxMacro\embedall@latex@lstinputlisting\lstinputlisting
+ \newcommand\embedall@lstinputlisting[2][]{%
+ \embedfile[desc=listing file]{#2}
+ \embedall@latex@lstinputlisting[#1]{#2}%
+ }
+ \ifembedall@input
+ \DeclareRobustCommand\embedinput[2][]{%
+ \input{#2}%
+ }
+ \else
+ \DeclareRobustCommand\embedinput[2][input file]{%
+ \input{#2}%
+ \embedall@embed[desc={#1}]{#2}%
+ }
+ \fi
+\fi
+\ifembedall@main
+ \ifembedall@compat
+ \IfFileExists{./\jobname.tex}{%
+ \embedall@embed[desc=main source file]{\jobname.tex}
+ }{}
+ \else
+ \AtBeginDocument{\embedsource[desc=main source file]}
+ \fi
+\fi
+\ifembedall@input
+ \AtBeginOfInputs{\embedsource[desc=input file]}
+\fi
+\ifembedall@include
+ \AtBeginOfIncludes{\embedsource[desc=include file]}
+\fi
+\ifembedall@graphicx
+ \ifcsname Gin@setfile\endcsname
+ \let\embedall@Gin@setfile\Gin@setfile
+ \def\Gin@setfile#1#2#3{%
+ \embedall@Gin@setfile{#1}{#2}{#3}%
+ \embedall@embed[image file]{#3}%
+ }
+ \else
+ \ifembedall@all\else
+ \PackageWarning{embedall}{Patching of graphicx requested, but package not loaded. Consider removing the 'graphicx' option.}
+ \fi
+ \fi
+\fi
+\ifembedall@csvsimple
+ \ifcsname csvloop\endcsname
+ \let\embedall@csvloop\csvloop
+ \def\csvloop#1{%
+ \embedall@csvloop{#1}%
+ \embedall@embed[CSV file]{\csv@input@filename}%
+ }
+ \else
+ \ifembedall@all\else
+ \PackageWarning{embedall}{Patching of csvsimple requested explicitly, but package not loaded. Consider removing the 'csvsimple' option.}
+ \fi
+ \fi
+\fi
\endinput
%%
%% End of file `embedall.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/embedall.tlpobj new/tlpkg/tlpobj/embedall.tlpobj
--- old/tlpkg/tlpobj/embedall.tlpobj 2019-02-28 03:35:19.000000000 +0100
+++ new/tlpkg/tlpobj/embedall.tlpobj 2019-05-22 01:38:52.000000000 +0200
@@ -1,6 +1,6 @@
name embedall
category Package
-revision 31903
+revision 51177
shortdesc Embed source files into the generated PDF
relocated 1
longdesc The package provides a means of storing a project, without
@@ -8,10 +8,10 @@
longdesc generated PDF all files used in creating your project. In
longdesc particular, it can embed images, external TeX files, external
longdesc codes and
-runfiles size=1
+runfiles size=2
RELOC/tex/latex/embedall/embedall.sty
catalogue-ctan /macros/latex/contrib/embedall
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-05-20 21:36:38 +0200
catalogue-license lppl1.2
catalogue-topics pdf-feat archival
-catalogue-version 1.0
+catalogue-version 2.0
++++++ embrac.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/embrac/README new/doc/latex/embrac/README
--- old/doc/latex/embrac/README 2017-07-06 23:26:45.000000000 +0200
+++ new/doc/latex/embrac/README 2020-01-06 00:48:51.000000000 +0100
@@ -3,13 +3,13 @@
Upright Brackets in Emphasized Text
-2017/07/04 v0.7
+2019/12/31 v0.9
--------------------------------------------------------------------------
Clemens Niederberger
Web: https://bitbucket.org/cgnieder/embrac/
E-Mail: contact(a)mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2012--2017 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/embrac/embrac_en.pdf and new/doc/latex/embrac/embrac_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/embrac/embrac_en.tex new/doc/latex/embrac/embrac_en.tex
--- old/doc/latex/embrac/embrac_en.tex 2017-07-06 23:26:45.000000000 +0200
+++ new/doc/latex/embrac/embrac_en.tex 2020-01-06 00:48:51.000000000 +0100
@@ -1,7 +1,7 @@
-% arara: pdflatex
-% !arara: biber
-% !arara: pdflatex
-% arara: pdflatex
+% arara: pdflatex: { interaction: nonstopmode }
+% arara: biber
+% arara: pdflatex: { interaction: nonstopmode }
+% arara: pdflatex: { interaction: nonstopmode }
% --------------------------------------------------------------------------
% the EMBRAC package
%
@@ -12,7 +12,7 @@
% Web: https://bitbucket.org/cgnieder/embrac/
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012--2017 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
@@ -40,6 +40,8 @@
AddEmph,
ChangeEmph,
DeleteEmph,
+ emb,embbracket,embparen,
+ EmbracMakeKnown,
EmbracOff,
EmbracOn,
printbibliography,
@@ -97,17 +99,6 @@
Bruno Le Floch for providing code~\cite{lefloch11}. Without either of them this
package probably wouldn't exist.
-\section{New}
-\begin{description}
- \item[v0.1a] The command \cs{RenewEmph} has been renamed into
- \cs{ChangeEmph} and a new slightly different \cs{RenewEmph} has been added.
- \item[v0.2] Improved interaction with \pkg{biblatex}.
- \item[v0.3] Added support for \pkg*{fontspec}'s \cs{textsi}.
- \item[v0.5] Don't replace brackets in math mode.
- \item[v0.6] Added support for \cs{textsl}.
- \item[v0.7] Added support for symbols with a catcode other than~12.
-\end{description}
-
\section{About}\label{sec:about}
\begin{cnltxquote}[{\cite[85]{bringhurst04}}]
Parentheses and brackets are not letters, and it makes little sense to speak
@@ -127,7 +118,6 @@
from my [sic] bed}.\kern.05em}
\end{cnltxquote}
-\noindent
Both this quote from~\citetitle{bringhurst04} by Robert Bringhurst and the
article \citetitle{dtk12-dw} by Dominik WaÃenhoven~\cite{dtk12-dw} inspired
this package. Indeed, \embrac\ heavily borrows from the code
@@ -303,6 +293,22 @@
\code{embrac\_kerning\_test.tex} for testing kerning values. You should find
it in the same directory as this documentation.
+\section{Adding More Commands}
+If\sinceversion{0.9} you like to add additional macros to \embrac's treatment
+(in addition to the already known \cs*{emph}, \cs*{textit}, \cs*{textsl}, and
+\cs*{textsi}) then you can use the following command
+\begin{commands}
+ \command{EmbracMakeKnown}[\marg{command}]
+ Redefine the command \meta{command} to replace brackets and parentheses by
+ upright ones. \meta{command} is the name of the command \emph{without} the
+ leading backslash!
+\end{commands}
+\embrac\ does this:
+\begin{sourcecode}
+ \EmbracMakeKnown{emph}
+ \EmbracMakeKnown{textit}
+ \EmbracMakeKnown{textsl}
+\end{sourcecode}
\section{biblatex Compatibility}
This is \embrac's only package option:
@@ -341,5 +347,33 @@
\begin{example}
\itshape This is italic [sic] text.
\end{example}
+In cases like this one of the following commands could be used:
+\begin{commands}
+ \command{emb}[\marg{op}\marg{cl}\marg{text}]
+ Encloses\sinceversion{0.8} \meta{text} with \meta{op} and \meta{cl}. Both
+ \meta{op} and \meta{cl} must be brackets known to \embrac.
+ \command{embparen}[\marg{text}]
+ Encloses\sinceversion{0.8} \meta{text} with upright parentheses. This is
+ the same as \cs{emb}\Marg{(}\Marg{)}\marg{text}.
+ \command{embbracket}[\marg{text}]
+ Encloses\sinceversion{0.8} \meta{text} with upright brackets. This is
+ the same as \cs{emb}\Marg{[}\Marg{]}\marg{text}.
+\end{commands}
+\begin{example}
+ \itshape This is italic \embbracket{sic} text.
+\end{example}
+
+\section{Version History}
+\begin{description}
+ \item[v0.1a] The command \cs{RenewEmph} has been renamed into
+ \cs{ChangeEmph} and a new slightly different \cs{RenewEmph} has been added.
+ \item[v0.2] Improved interaction with \pkg{biblatex}.
+ \item[v0.3] Added support for \pkg*{fontspec}'s \cs{textsi}.
+ \item[v0.5] Don't replace brackets in math mode.
+ \item[v0.6] Added support for \cs{textsl}.
+ \item[v0.7] Added support for symbols with a catcode other than~12.
+ \item[v0.8] Added \cs{embparen}, \cs{embbracket} and \cs{emb}.
+ \item[v0.9] Added \cs{EmbracMakeKnown}
+\end{description}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/embrac/embrac_kerning_test.tex new/doc/latex/embrac/embrac_kerning_test.tex
--- old/doc/latex/embrac/embrac_kerning_test.tex 2013-03-23 23:58:28.000000000 +0100
+++ new/doc/latex/embrac/embrac_kerning_test.tex 2019-10-01 23:17:56.000000000 +0200
@@ -1,4 +1,4 @@
-% arara: pdflatex
+% arara: lualatex: { interaction: nonstopmode }
% --------------------------------------------------------------------------
% the EMBRAC package
%
@@ -35,8 +35,8 @@
\usepackage{fontspec}
% load desired font, for example:
-% \usepackage{libertine}
-\setmainfont{Minion Pro}
+\usepackage{libertine}
+% \setmainfont{Minion Pro}
\usepackage{embrac}
@@ -76,4 +76,4 @@
\emph{This is emphasized text (as you can see).}
-\end{document}
\ No newline at end of file
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/embrac.doc.tlpobj new/tlpkg/tlpobj/embrac.doc.tlpobj
--- old/tlpkg/tlpobj/embrac.doc.tlpobj 2019-02-28 03:35:19.000000000 +0100
+++ new/tlpkg/tlpobj/embrac.doc.tlpobj 2020-03-24 01:57:32.000000000 +0100
@@ -1,9 +1,9 @@
name embrac.doc
category Package
-revision 44757
+revision 54512
shortdesc doc files of embrac
relocated 1
-docfiles size=119
+docfiles size=118
RELOC/doc/latex/embrac/README
RELOC/doc/latex/embrac/embrac_en.pdf
RELOC/doc/latex/embrac/embrac_en.tex
++++++ embrac.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/embrac/embrac.sty new/tex/latex/embrac/embrac.sty
--- old/tex/latex/embrac/embrac.sty 2017-07-06 23:26:45.000000000 +0200
+++ new/tex/latex/embrac/embrac.sty 2020-01-06 00:48:51.000000000 +0100
@@ -8,7 +8,7 @@
% Web: https://bitbucket.org/cgnieder/embrac/
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012--2017 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
@@ -34,14 +34,17 @@
\RequirePackage { expl3 , xparse , l3keys2e }
\ProvidesExplPackage
{embrac}
- {2017/07/04}
- {0.7}
+ {2019/12/31}
+ {0.9}
{Upright Brackets in Emphasized Text}
% --------------------------------------------------------------------------
\bool_new:N \l__embrac_treat_biblatex_bool
-\tl_new:N \l__embrac_tmpa_tl
-\tl_new:N \l__embrac_treat_biblatex_tl
+
+\tl_new:N \l__embrac_tmpa_tl
+\tl_new:N \l__embrac_treat_biblatex_tl
+
+\int_new:N \l__embrac_penalty_int
\keys_define:nn {embrac}
{
@@ -85,56 +88,100 @@
}
}
-\cs_new:Npn \embrac_nobreak:
- { \tex_penalty:D \c_ten_thousand }
+\cs_new_protected:Npn \embrac_nobreak:
+ { \tex_penalty:D 10000 \scan_stop: }
+
+\cs_new_protected:Npn \embrac_allow_break:
+ { \tex_penalty:D 0 \scan_stop: }
% --------------------------------------------------------------------------
% THE MAIN PART:
% storage of the tokens to be replaced:
-\prop_new:N \l__embrac_emph_obrackets_symp_prop
-\prop_new:N \l__embrac_emph_obrackets_prop
-\prop_new:N \l__embrac_emph_obrackets_before_prop
-\prop_new:N \l__embrac_emph_cbrackets_symp_prop
-\prop_new:N \l__embrac_emph_cbrackets_prop
-\prop_new:N \l__embrac_emph_cbrackets_after_prop
-
-\cs_new_protected:Npn \__embrac_replace:Nnnn #1#2#3#4
+\prop_new:N \l__embrac_emph_obrackets_symbol_prop
+\prop_new:N \l__embrac_emph_obrackets_inner_prop
+\prop_new:N \l__embrac_emph_obrackets_outer_prop
+\prop_new:N \l__embrac_emph_cbrackets_symbol_prop
+\prop_new:N \l__embrac_emph_cbrackets_inner_prop
+\prop_new:N \l__embrac_emph_cbrackets_outer_prop
+
+\bool_new:N \l__embrac_opening_bool
+
+% #1: tl macro
+% #2: kerning before
+% #3: symbol
+% #4: kerning after
+% #5: code after
+\cs_new_protected:Npn \__embrac_replace:Nnnnn #1#2#3#4#5
{
\tl_replace_all:Nnn #1 {#3}
{
\mode_if_math:TF
- {#3}
+ {#4}
{
+ \embrac_nobreak:
\embrac_kern:n {#2}
\embrac_nobreak:
\embrac_braces_format:n {#3}
\embrac_nobreak:
\embrac_kern:n {#4}
- \embrac_nobreak:
+ #5
}
}
}
-\cs_generate_variant:Nn \__embrac_replace:Nnnn {Nxx,Nnxx}
+\cs_generate_variant:Nn \__embrac_replace:Nnnnn {Nxx,Nnxx}
% do the replacing:
+% #1: tl macro
\cs_new_protected:Npn \embrac_replace_brackets:N #1
{
- \prop_map_inline:Nn \l__embrac_emph_obrackets_prop
+ \prop_map_inline:Nn \l__embrac_emph_obrackets_inner_prop
{
- \__embrac_replace:Nxxn #1
- { \prop_item:Nn \l__embrac_emph_obrackets_before_prop {##1} }
- { \prop_item:Nn \l__embrac_emph_obrackets_symp_prop {##1} }
+ \__embrac_replace:Nxxnn #1
+ { \prop_item:Nn \l__embrac_emph_obrackets_outer_prop {##1} }
+ { \prop_item:Nn \l__embrac_emph_obrackets_symbol_prop {##1} }
{##2}
+ { \embrac_nobreak: }
}
- \prop_map_inline:Nn \l__embrac_emph_cbrackets_prop
+ \prop_map_inline:Nn \l__embrac_emph_cbrackets_inner_prop
{
- \__embrac_replace:Nnxx #1
+ \__embrac_replace:Nnxxn #1
{##2}
- { \prop_item:Nn \l__embrac_emph_cbrackets_symp_prop {##1} }
- { \prop_item:Nn \l__embrac_emph_cbrackets_after_prop {##1} }
+ { \prop_item:Nn \l__embrac_emph_cbrackets_symbol_prop {##1} }
+ { \prop_item:Nn \l__embrac_emph_cbrackets_outer_prop {##1} }
+ {
+ \peek_charcode:NTF \c_space_tl
+ { \embrac_allow_break: }
+ { \embrac_nobreak: }
+ }
}
}
+\cs_new_protected:Npn \embrac_enparen:nnn #1#2#3
+ {
+ \embrac_nobreak:
+ \embrac_kern:n
+ { \prop_item:Nn \l__embrac_emph_obrackets_outer_prop {#1} }
+ \embrac_nobreak:
+ \embrac_braces_format:n
+ { \prop_item:Nn \l__embrac_emph_obrackets_symbol_prop {#1} }
+ \embrac_nobreak:
+ \embrac_kern:n
+ { \prop_item:Nn \l__embrac_emph_obrackets_inner_prop {#1} }
+ #3
+ \embrac_nobreak:
+ \embrac_kern:n
+ { \prop_item:Nn \l__embrac_emph_cbrackets_inner_prop {#2} }
+ \embrac_nobreak:
+ \embrac_braces_format:n
+ { \prop_item:Nn \l__embrac_emph_cbrackets_symbol_prop {#2} }
+ \embrac_nobreak:
+ \embrac_kern:n
+ { \prop_item:Nn \l__embrac_emph_cbrackets_outer_prop {#2} }
+ \peek_charcode:NTF \c_space_tl
+ { \embrac_allow_break: }
+ { \embrac_nobreak: }
+ }
+
% --------------------------------------------------------------------------
% biblatex compatibility:
\cs_new_protected:Npn \embrac_treat_bibparens:
@@ -165,6 +212,7 @@
% redefine \emph and friends:
\seq_new:N \l__embrac_changed_macros_seq
+% #1: name of macro to be treated
\cs_new_protected:Npn \embrac_new_replacement_macro:n #1
{
\seq_put_right:Nn \l__embrac_changed_macros_seq {#1}
@@ -193,11 +241,14 @@
}
}
-\embrac_new_replacement_macro:n {emph}
-\embrac_new_replacement_macro:n {textit}
-\embrac_new_replacement_macro:n {textsl}
+\NewDocumentCommand \EmbracMakeKnown {m}
+ { \embrac_new_replacement_macro:n {#1} }
+
+\EmbracMakeKnown {emph}
+\EmbracMakeKnown {textit}
+\EmbracMakeKnown {textsl}
\AtBeginDocument
- { \embrac_if_fontspec:T { \embrac_new_replacement_macro:n {textsi} } }
+ { \embrac_if_fontspec:T { \EmbracMakeKnown {textsi} } }
% --------------------------------------------------------------------------
% TURNING EMBRAC OFF AND ON:
@@ -230,24 +281,24 @@
% internal add commands:
\cs_new_protected:Npn \embrac_add_op_to_emph:nnn #1#2#3
{
- \prop_put:Nnn \l__embrac_emph_obrackets_symp_prop {#1} {#1}
+ \prop_put:Nnn \l__embrac_emph_obrackets_symbol_prop {#1} {#1}
\embrac_empty_or_no_value:nTF {#2}
- { \prop_put_if_new:Nnn \l__embrac_emph_obrackets_prop {#1} {0pt} }
- { \prop_put_if_new:Nnn \l__embrac_emph_obrackets_prop {#1} {#2} }
+ { \prop_put_if_new:Nnn \l__embrac_emph_obrackets_inner_prop {#1} {0pt} }
+ { \prop_put_if_new:Nnn \l__embrac_emph_obrackets_inner_prop {#1} {#2} }
\embrac_empty_or_no_value:nTF {#3}
- { \prop_put_if_new:Nnn \l__embrac_emph_obrackets_before_prop {#1} {0pt} }
- { \prop_put_if_new:Nnn \l__embrac_emph_obrackets_before_prop {#1} {#3} }
+ { \prop_put_if_new:Nnn \l__embrac_emph_obrackets_outer_prop {#1} {0pt} }
+ { \prop_put_if_new:Nnn \l__embrac_emph_obrackets_outer_prop {#1} {#3} }
}
\cs_new_protected:Npn \embrac_add_cl_to_emph:nnn #1#2#3
{
- \prop_put:Nnn \l__embrac_emph_cbrackets_symp_prop {#1} {#1}
+ \prop_put:Nnn \l__embrac_emph_cbrackets_symbol_prop {#1} {#1}
\embrac_empty_or_no_value:nTF {#2}
- { \prop_put_if_new:Nnn \l__embrac_emph_cbrackets_prop {#1} {0pt} }
- { \prop_put_if_new:Nnn \l__embrac_emph_cbrackets_prop {#1} {#2} }
+ { \prop_put_if_new:Nnn \l__embrac_emph_cbrackets_inner_prop {#1} {0pt} }
+ { \prop_put_if_new:Nnn \l__embrac_emph_cbrackets_inner_prop {#1} {#2} }
\embrac_empty_or_no_value:nTF {#3}
- { \prop_put_if_new:Nnn \l__embrac_emph_cbrackets_after_prop {#1} {0pt} }
- { \prop_put_if_new:Nnn \l__embrac_emph_cbrackets_after_prop {#1} {#3} }
+ { \prop_put_if_new:Nnn \l__embrac_emph_cbrackets_outer_prop {#1} {0pt} }
+ { \prop_put_if_new:Nnn \l__embrac_emph_cbrackets_outer_prop {#1} {#3} }
}
\cs_new_protected:Npn \embrac_add_to_emph:nnnnnn #1#2#3#4#5#6
@@ -259,14 +310,14 @@
% internal delete commands:
\cs_new_protected:Npn \embrac_remove_op_from_emph:n #1
{
- \prop_remove:Nn \l__embrac_emph_obrackets_prop {#1}
- \prop_remove:Nn \l__embrac_emph_obrackets_before_prop {#1}
+ \prop_remove:Nn \l__embrac_emph_obrackets_inner_prop {#1}
+ \prop_remove:Nn \l__embrac_emph_obrackets_outer_prop {#1}
}
\cs_new_protected:Npn \embrac_remove_cl_from_emph:n #1
{
- \prop_remove:Nn \l__embrac_emph_cbrackets_prop {#1}
- \prop_remove:Nn \l__embrac_emph_cbrackets_after_prop {#1}
+ \prop_remove:Nn \l__embrac_emph_cbrackets_inner_prop {#1}
+ \prop_remove:Nn \l__embrac_emph_cbrackets_outer_prop {#1}
}
\cs_new_protected:Npn \embrac_remove_from_emph:nn #1#2
@@ -279,21 +330,21 @@
\cs_new_protected:Npn \embrac_renew_op_emph:nnn #1#2#3
{
\embrac_empty_or_no_value:nTF {#2}
- { \prop_put:Nnn \l__embrac_emph_obrackets_prop {#1} {0pt} }
- { \prop_put:Nnn \l__embrac_emph_obrackets_prop {#1} {#2} }
+ { \prop_put:Nnn \l__embrac_emph_obrackets_inner_prop {#1} {0pt} }
+ { \prop_put:Nnn \l__embrac_emph_obrackets_inner_prop {#1} {#2} }
\embrac_empty_or_no_value:nTF {#3}
- { \prop_put:Nnn \l__embrac_emph_obrackets_before_prop {#1} {0pt} }
- { \prop_put:Nnn \l__embrac_emph_obrackets_before_prop {#1} {#3} }
+ { \prop_put:Nnn \l__embrac_emph_obrackets_outer_prop {#1} {0pt} }
+ { \prop_put:Nnn \l__embrac_emph_obrackets_outer_prop {#1} {#3} }
}
\cs_new_protected:Npn \embrac_renew_cl_emph:nnn #1#2#3
{
\embrac_empty_or_no_value:nTF {#2}
- { \prop_put:Nnn \l__embrac_emph_cbrackets_prop {#1} {0pt} }
- { \prop_put:Nnn \l__embrac_emph_cbrackets_prop {#1} {#2} }
+ { \prop_put:Nnn \l__embrac_emph_cbrackets_inner_prop {#1} {0pt} }
+ { \prop_put:Nnn \l__embrac_emph_cbrackets_inner_prop {#1} {#2} }
\embrac_empty_or_no_value:nTF {#3}
- { \prop_put:Nnn \l__embrac_emph_cbrackets_after_prop {#1} {0pt} }
- { \prop_put:Nnn \l__embrac_emph_cbrackets_after_prop {#1} {#3} }
+ { \prop_put:Nnn \l__embrac_emph_cbrackets_outer_prop {#1} {0pt} }
+ { \prop_put:Nnn \l__embrac_emph_cbrackets_outer_prop {#1} {#3} }
}
\cs_new_protected:Npn \embrac_renew_emph:nnnnnn #1#2#3#4#5#6
@@ -305,23 +356,23 @@
% internal change commands:
\cs_new_protected:Npn \embrac_change_op_emph:nnn #1#2#3
{
- \prop_if_in:NnT \l__embrac_emph_obrackets_prop {#1}
+ \prop_if_in:NnT \l__embrac_emph_obrackets_inner_prop {#1}
{
\embrac_empty_or_no_value:nF {#2}
- { \prop_put:Nnn \l__embrac_emph_obrackets_prop {#1} {#2} }
+ { \prop_put:Nnn \l__embrac_emph_obrackets_inner_prop {#1} {#2} }
\embrac_empty_or_no_value:nF {#3}
- { \prop_put:Nnn \l__embrac_emph_obrackets_before_prop {#1} {#3} }
+ { \prop_put:Nnn \l__embrac_emph_obrackets_outer_prop {#1} {#3} }
}
}
\cs_new_protected:Npn \embrac_change_cl_emph:nnn #1#2#3
{
- \prop_if_in:NnT \l__embrac_emph_cbrackets_prop {#1}
+ \prop_if_in:NnT \l__embrac_emph_cbrackets_inner_prop {#1}
{
\embrac_empty_or_no_value:nF {#2}
- { \prop_put:Nnn \l__embrac_emph_cbrackets_prop {#1} {#2} }
+ { \prop_put:Nnn \l__embrac_emph_cbrackets_inner_prop {#1} {#2} }
\embrac_empty_or_no_value:nF {#3}
- { \prop_put:Nnn \l__embrac_emph_cbrackets_after_prop {#1} {#3} }
+ { \prop_put:Nnn \l__embrac_emph_cbrackets_outer_prop {#1} {#3} }
}
}
@@ -423,6 +474,15 @@
\ignorespaces
}
+\NewDocumentCommand \embparen {+m}
+ { \embrac_enparen:nnn {(} {)} {#1} }
+
+\NewDocumentCommand \embbracket {+m}
+ { \embrac_enparen:nnn {[} {]} {#1} }
+
+\NewDocumentCommand \emb {mm+m}
+ { \embrac_enparen:nnn {#1} {#2} {#3} }
+
% --------------------------------------------------------------------------
% add some defaults and finalize package:
\AddEmph{[}{]}[.04em,-.12em]
@@ -432,7 +492,7 @@
\AtBeginDocument { \embrac_treat_bibemph: }
-\tex_endinput:D
+\file_input_stop:
% --------------------------------------------------------------------------
% HISTORY
@@ -457,3 +517,7 @@
2016/01/07 - v0.6d - \prop_get:Nn => \prop_item:Nn
2017/07/04 - v0.7 - implement issue #8 (now treatment of symbols with catcode
other than 12 is possible)
+2019/10/01 - v0.8 - fix issue #9
+ - new macros \embparen, \embbracket and \emb
+2019/12/31 - v0.9 - new: \EmbracMakeKnown
+ - change penalties
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/embrac.tlpobj new/tlpkg/tlpobj/embrac.tlpobj
--- old/tlpkg/tlpobj/embrac.tlpobj 2019-02-28 03:35:20.000000000 +0100
+++ new/tlpkg/tlpobj/embrac.tlpobj 2020-03-24 01:57:32.000000000 +0100
@@ -1,6 +1,6 @@
name embrac
category Package
-revision 44757
+revision 54512
shortdesc Upright brackets in emphasised text
relocated 1
longdesc The package redefines the commands \emph and \textit so that
@@ -10,10 +10,9 @@
longdesc bundle.
runfiles size=4
RELOC/tex/latex/embrac/embrac.sty
-catalogue-contact-bugs https://bitbucket.org/cgnieder/embrac/issues
-catalogue-contact-repository https://bitbucket.org/cgnieder/embrac/
+catalogue-contact-bugs https://github.com/cgnieder/embrac/issues
+catalogue-contact-repository https://github.com/cgnieder/embrac/
catalogue-ctan /macros/latex/contrib/embrac
-catalogue-date 2017-07-06 13:15:18 +0200
catalogue-license lppl1.3
catalogue-topics typesetting paren-mgmt expl3
-catalogue-version 0.7
+catalogue-version 0.9
++++++ endfloat.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/endfloat/README new/doc/latex/endfloat/README
--- old/doc/latex/endfloat/README 2018-03-25 23:25:08.000000000 +0200
+++ new/doc/latex/endfloat/README 2019-05-05 19:43:13.000000000 +0200
@@ -1,4 +1,4 @@
-This is the readme file for the endfloat package v2.6
+This is the readme file for the endfloat package v2.7
This readme was modified on October 2, 1997 but without
updated endfloat itself, instead to fix errors in this file
@@ -15,6 +15,10 @@
<axel.sommerfeldt(a)f-m.fm> to reflect the changes introduced
with version 2.6 of the endfloat package.
+It was again modified on April 15, 2019, by Axel Sommerfeldt
+<axel.sommerfeldt(a)f-m.fm> to reflect the changes introduced
+with version 2.7 of the endfloat package.
+
Endfloat is a LaTeX package. Versions 2.1 and above require
LaTeX2e.
@@ -55,6 +59,14 @@
of contents.
===============================================================================
+Major changes in version 2.7 since 2.6:
+ New package option 'disable' has been added.
+ New command \addtodelayedfloat has beed added.
+ New macros \efloatbegin, \efloatend, \efloatbeginlist,
+ and \efloatendlist for customization have been added.
+ The bugfix regarding the usage of UTF-8 characters in floating environments
+ has been revised.
+
Major changes in version 2.6 since 2.5:
New package options 'notables' and 'nofigures' have been added.
New macros \efloattype, \efloatheading, \efloatpreamble, and \efloatpostamble
@@ -79,24 +91,22 @@
generally.
===============================================================================
-Maintainer: Axel Sommerfeldt <axel.sommerfeldt(a)f-m.fm>
-Original authors: James Darrell McCauley and Jeff Goldberg (jeffrey(a)goldmark.org)
+Maintainer: -none-
+Original authors: James Darrell McCauley, Jeff Goldberg (jeffrey(a)goldmark.org),
+ and Axel Sommerfeldt <axel.sommerfeldt(a)f-m.fm>
Obtaining endfloat: The necessary files are kept on the Comprehensive
-TeX Archive Network (CTAN). Current CTAN sites are ftp.tex.ac.uk,
-ftp.shsu.edu, and ftp.dante.de. They are also mirrored at other locations.
-Once on CTAN, type the command "quote site index endfloat" to
-find where endfloat lives. It is probably in
-macros/latex/contrib/supported/endfloat .
-Get the whole directory.
+TeX Archive Network (CTAN): http://mirror.ctan.org/macros/latex/contrib/endfloat
+Code repository: https://gitlab.com/axelsommerfeldt/endfloat
+Bug tracker: https://gitlab.com/axelsommerfeldt/endfloat/issues
===============================================================================
License and copying:
endfloat for LaTeX
Copyright (C) 1992 Darrel McCauley
Copyright (C) 1994-2011 Jeffrey Goldberg <jeffrey(a)goldmark.org>
- Copyright (C) 2011-2018 Axel Sommerfeldt <axel.sommerfeldt(a)f-m.fm>
+ Copyright (C) 2011-2019 Axel Sommerfeldt <axel.sommerfeldt(a)f-m.fm>
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/endfloat/efxmpl.cfg new/doc/latex/endfloat/efxmpl.cfg
--- old/doc/latex/endfloat/efxmpl.cfg 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/endfloat/efxmpl.cfg 2019-05-05 19:43:13.000000000 +0200
@@ -0,0 +1,53 @@
+%%
+%% This is file `efxmpl.cfg',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% endfloat.dtx (with options: `config')
+%%
+%% IMPORTANT NOTICE:
+%% This is part of a set of tools (or better yet, experiments) written
+%% by Jeff Goldberg (jeffrey(a)goldmark.org), who is writting this
+%% not only for it utility value, but as part of the process of learning
+%% LaTeX. These tools are far from perfect, and comments are welcome.
+%%
+%% The usual disclaimers apply: If it doesn't work right that's your
+%% problem (but do let me know).
+%%
+%% The usual GNU-style conditions apply: If you change it, you take
+%% the blame; if you pass it on, pass on all present condiditions;
+%%
+\def\filename{endfloat}
+\def\fileversion{v2.7}
+\def\filedate{2019/04/15}
+\def\docdate{2019/04/15}
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+%%
+%% Description: LaTeX style to put figures and tables at end of article
+%% Keywords: LaTeX, style-option, float, figure, table
+%% Authors: James Darrell McCauley <jdm5548(a)diamond.tamu.edu>,
+%% Jeff Goldberg <jeffrey(a)goldmark.org>,
+%% Axel Sommerfeldt <axel.sommerfeldt(a)f-m.fm>
+%% Maintainer: -none-
+%% Latest Version: Version 2.7 <April 2019>
+\RequirePackage{rotating}
+\DeclareDelayedFloatFlavor{sidewaysfigure}{figure}
+\DeclareDelayedFloatFlavor{sidewaystable}{table}
+\endinput
+%%
+%% End of file `efxmpl.cfg'.
Binary files old/doc/latex/endfloat/endfloat.pdf and new/doc/latex/endfloat/endfloat.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/endfloat.doc.tlpobj new/tlpkg/tlpobj/endfloat.doc.tlpobj
--- old/tlpkg/tlpobj/endfloat.doc.tlpobj 2019-02-28 03:35:22.000000000 +0100
+++ new/tlpkg/tlpobj/endfloat.doc.tlpobj 2019-05-06 01:38:30.000000000 +0200
@@ -1,9 +1,10 @@
name endfloat.doc
category Package
-revision 47108
+revision 51003
shortdesc doc files of endfloat
relocated 1
-docfiles size=50
+docfiles size=62
RELOC/doc/latex/endfloat/COPYING
RELOC/doc/latex/endfloat/README
+ RELOC/doc/latex/endfloat/efxmpl.cfg
RELOC/doc/latex/endfloat/endfloat.pdf
++++++ endfloat.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/endfloat/efxmpl.cfg new/tex/latex/endfloat/efxmpl.cfg
--- old/tex/latex/endfloat/efxmpl.cfg 2018-03-25 23:25:08.000000000 +0200
+++ new/tex/latex/endfloat/efxmpl.cfg 1970-01-01 01:00:00.000000000 +0100
@@ -1,53 +0,0 @@
-%%
-%% This is file `efxmpl.cfg',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% endfloat.dtx (with options: `config')
-%%
-%% IMPORTANT NOTICE:
-%% This is part of a set of tools (or better yet, experiments) written
-%% by Jeff Goldberg (jeffrey(a)goldmark.org), who is writting this
-%% not only for it utility value, but as part of the process of learning
-%% LaTeX. These tools are far from perfect, and comments are welcome.
-%%
-%% The usual disclaimers apply: If it doesn't work right that's your
-%% problem (but do let me know).
-%%
-%% The usual GNU-style conditions apply: If you change it, you take
-%% the blame; if you pass it on, pass on all present condiditions;
-%%
-\def\filename{endfloat}
-\def\fileversion{v2.6}
-\def\filedate{2018/03/24}
-\def\docdate{2018/03/24}
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
-%% Description: LaTeX style to put figures and tables at end of article
-%% Keywords: LaTeX, style-option, float, figure, table
-%% Authors: James Darrell McCauley <jdm5548(a)diamond.tamu.edu>,
-%% Jeff Goldberg <jeffrey(a)goldmark.org>,
-%% Axel Sommerfeldt <axel.sommerfeldt(a)f-m.fm>
-%% Maintainer: Axel Sommerfeldt <axel.sommerfeldt(a)f-m.fm>
-%% Latest Version: Version 2.6 <March 2018>
-\RequirePackage{rotating}
-\DeclareDelayedFloatFlavor{sidewaysfigure}{figure}
-\DeclareDelayedFloatFlavor{sidewaystable}{table}
-\endinput
-%%
-%% End of file `efxmpl.cfg'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/endfloat/endfloat.sty new/tex/latex/endfloat/endfloat.sty
--- old/tex/latex/endfloat/endfloat.sty 2018-03-25 23:25:08.000000000 +0200
+++ new/tex/latex/endfloat/endfloat.sty 2019-05-05 19:43:13.000000000 +0200
@@ -19,9 +19,9 @@
%% the blame; if you pass it on, pass on all present condiditions;
%%
\def\filename{endfloat}
-\def\fileversion{v2.6}
-\def\filedate{2018/03/24}
-\def\docdate{2018/03/24}
+\def\fileversion{v2.7}
+\def\filedate{2019/04/15}
+\def\docdate{2019/04/15}
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -41,10 +41,10 @@
%% Description: LaTeX style to put figures and tables at end of article
%% Keywords: LaTeX, style-option, float, figure, table
%% Authors: James Darrell McCauley <jdm5548(a)diamond.tamu.edu>,
-%% Jeff Goldberg <jeffrey(a)goldmark.org>,
-%% Axel Sommerfeldt <axel.sommerfeldt(a)f-m.fm>
-%% Maintainer: Axel Sommerfeldt <axel.sommerfeldt(a)f-m.fm>
-%% Latest Version: Version 2.6 <March 2018>
+%% Jeff Goldberg <jeffrey(a)goldmark.org>,
+%% Axel Sommerfeldt <axel.sommerfeldt(a)f-m.fm>
+%% Maintainer: -none-
+%% Latest Version: Version 2.7 <April 2019>
\NeedsTeXFormat{LaTeX2e}[1994/06/01]
\ProvidesPackage{endfloat}[\filedate\space\fileversion\space
LaTeX2e package puts figures and tables at end (jdm)]
@@ -84,12 +84,15 @@
\newcommand*\efloat@setkey{%
\@expandtwoargs\efloat@@setkey\efloat@type}
\newcommand*\efloat@@setkey[3]{%
+ \efloat@ifdelayed{#1}{%
+ \efloat@setflag{#1#2}{#3}%
+ \efloat@syncobsoleteflags}}
+\newcommand\efloat@ifdelayed[2]{%
\@ifundefined{ef@ext@#1}%
{\PackageError{endfloat}%
- {Unknown environment `#1'}%
+ {`#1' is not a delayed float type}%
{Only environments known to the `endfloat' package are allowed here.}}%
- {\efloat@setflag{#1#2}{#3}%
- \efloat@syncobsoleteflags}}
+ {#2}}%
\newcommand*\efloat@ifflag[1]{%
\@nameuse{ef@if@#1}}
\newcommand*\efloat@setflag[2]{%
@@ -120,12 +123,33 @@
\fi}
\newcommand*\efloat@condopen[1]{%
\ef@ifct{#1}{}{\efloat@openpost{#1}}}
+\providecommand\protected@iwrite[3]{%
+ \begingroup
+ \let\thepage\relax
+ #2%
+ \let\protect\@unexpandable@protect
+ \edef\reserved@a{\immediate\write #1{#3}}%
+ \reserved@a
+ \endgroup
+ \if@nobreak\ifvmode\nobreak\fi\fi}
\newcommand\efloat@iwrite[1]{%
- \immediate\expandafter\protected@write\csname efloat@post#1\endcsname{}}
-\providecommand\efloatheading[1]{\markboth{\uppercase{#1}}{\uppercase{#1}}}
+ \expandafter\protected@iwrite\csname efloat@post#1\endcsname{}}
+\newcommand\addtodelayedfloat{%
+ \@ifstar{\efloat@addto\@firstofone}{\efloat@addto\detokenize}}
+\newcommand\efloat@addto[3]{%
+ \efloat@ifdelayed{#2}{%
+ \expandafter\efloat@@addto\expandafter{\csname ef@ext@#2\endcsname}{#1{#3}}}}
+\newcommand\efloat@@addto[1]{%
+ \efloat@condopen{#1}\efloat@iwrite{#1}}
+\providecommand\efloatheading[1]{%
+ \markboth{\uppercase{#1}}{\uppercase{#1}}}
\providecommand\efloatpreamble{}
-\providecommand{\efloatseparator}{\clearpage}
+\providecommand\efloatseparator{\clearpage}
\providecommand\efloatpostamble{\efloatseparator}
+\providecommand\efloatbegin{\clearpage}
+\providecommand\efloatend{}
+\providecommand\efloatbeginlist{\normalsize}
+\providecommand\efloatendlist{\clearpage}
\newcommand*{\ef@makeinnocent}[1]{\catcode`#1=12 }
\providecommand{\figurename}{Figure}
\providecommand{\tablename}{Table}
@@ -183,13 +207,10 @@
\let\DeclareDelayedFloatFlavour\DeclareDelayedFloatFlavor
\@onlypreamble\DeclareDelayedFloatFlavour
\newcommand*\efloat@declareflavor[3]{%
- \@ifundefined{ef@ext@#3}%
- {\PackageError{endfloat}%
- {Unknown environment `#3'}%
- {Only environments known to the `endfloat' package are allowed here.}}%
- {\efloat@AtBeginDocument{%
- \efloat@@declareflavor{#2}{#3}%
- #1{\efloat@@declareflavor{#2*}{#3}}}}}
+ \efloat@ifdelayed{#3}{%
+ \efloat@AtBeginDocument{%
+ \efloat@@declareflavor{#2}{#3}%
+ #1{\efloat@@declareflavor{#2*}{#3}}}}}
\@onlypreamble\efloat@declareflavor
\newcommand*\efloat@@declareflavor[2]{%
\def\@tempa{\@efloat{#2}{#1}}%
@@ -256,8 +277,18 @@
\DeclareOption{figuresonly}{\efloat@figurestrue \efloat@tablesfalse}
\DeclareOption{notables}{\efloat@tablesfalse}
\DeclareOption{nofigures}{\efloat@figuresfalse}
+\newcommand*\efloat@AtEndDocument{\AtEndDocument}
+\DeclareOption{disable}{%
+ \def\efloat@@declare#1#2[#3]#4{%
+ \PackageInfo{endfloat}{`#2' is not delayed since option `disable' was specified}}%
+ \renewcommand*\efloat@declareflavor[3]{}%
+ \renewcommand*\efloat@@setkey[3]{}%
+ \renewcommand*\efloat@AtEndDocument{\@gobble}%
+ \AtBeginDocument{\renewcommand*\processdelayedfloats{}}}
\DeclareOption*{%
- \PackageWarning{endfloat}{Unknown option `\CurrentOption'}}
+ \PackageError{endfloat}%
+ {Unknown option `\CurrentOption'}%
+ {Please take a look at the documentation of the `endfloat' package.}}
\ProcessOptions*
\let\@bfig\figure % bj
\let\@btab\table % bj
@@ -353,10 +384,13 @@
\ef@ifct{#1}{%
\efloat@closepost{#1}%
\def\efloattype{#2}% % as
- \clearpage % bj
+ \efloatbegin % bj
\efloat@ifflag{#2list}{% % bj
- {\normalsize\efloat@listof{#2}}% % bj
- \clearpage % bj
+ \begingroup
+ \efloatbeginlist % bj
+ \efloat@listof{#2}% % bj
+ \efloatendlist % bj
+ \endgroup
}{}%
\efloat@ifflag{#2head}{%
\section*{\@nameuse{#2section}}% % bj
@@ -369,6 +403,7 @@
\efloatpreamble
\efloat(a)input{\jobname.#1}%
\efloatpostamble
+ \efloatend % as
}{}}
\newcommand*\efloat@input[1]{%
\makeatletter
@@ -388,7 +423,7 @@
\renewcommand{\bottomfraction}{1.0}
\renewcommand{\topfraction}{1.0}
\renewcommand{\textfraction}{0.0}
-\newcommand{\processdelayedfloats}{{%
+\newcommand*\processdelayedfloats{{%
\def\baselinestretch{1}\normalsize
\efloat@restorefloats
\processdelayedfloats@hook
@@ -400,7 +435,7 @@
\efloat@list
\let\@elt\relax
\@tempa}
-\AtEndDocument{% % jpg
+\efloat@AtEndDocument{% % jpg
\message{AED endfloat: Processing end Figures and Tables}% % jpg
\onecolumn
\processdelayedfloats }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/endfloat.tlpobj new/tlpkg/tlpobj/endfloat.tlpobj
--- old/tlpkg/tlpobj/endfloat.tlpobj 2019-02-28 03:35:22.000000000 +0100
+++ new/tlpkg/tlpobj/endfloat.tlpobj 2019-05-06 01:38:30.000000000 +0200
@@ -1,6 +1,6 @@
name endfloat
category Package
-revision 47108
+revision 51003
shortdesc Move floats to the end, leaving markers where they belong
relocated 1
longdesc Place all floats on pages by themselves at the end of the
@@ -11,12 +11,11 @@
longdesc define other types of float, it is possible to register these
longdesc float types with endfloat.
runfiles size=5
- RELOC/tex/latex/endfloat/efxmpl.cfg
RELOC/tex/latex/endfloat/endfloat.sty
catalogue-contact-bugs https://gitlab.com/axelsommerfeldt/endfloat/issues
catalogue-contact-repository https://gitlab.com/axelsommerfeldt/endfloat
catalogue-ctan /macros/latex/contrib/endfloat
-catalogue-date 2018-06-09 18:48:06 +0200
+catalogue-date 2019-05-05 20:54:15 +0200
catalogue-license gpl
catalogue-topics float
-catalogue-version 2.6
+catalogue-version 2.7
++++++ endnotes.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/endnotes/README.md new/doc/latex/endnotes/README.md
--- old/doc/latex/endnotes/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/endnotes/README.md 2020-01-04 23:04:59.000000000 +0100
@@ -0,0 +1,2 @@
+# endnotes
+Place footnotes at the end
Binary files old/doc/latex/endnotes/endnotes.pdf and new/doc/latex/endnotes/endnotes.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/endnotes/endnotes.tex new/doc/latex/endnotes/endnotes.tex
--- old/doc/latex/endnotes/endnotes.tex 2010-02-25 01:39:17.000000000 +0100
+++ new/doc/latex/endnotes/endnotes.tex 2020-01-04 23:04:59.000000000 +0100
@@ -1,7 +1,5 @@
\documentclass[pagesize=auto]{scrartcl}
-\usepackage{fixltx2e}
-\usepackage{etex}
\usepackage{lmodern}
\usepackage[T1]{fontenc}
\usepackage{textcomp}
@@ -23,8 +21,9 @@
\addtokomafont{title}{\rmfamily}
\title{The \pkg{endnotes} package}
-\author{John Lavagnino\thanks{Centre for Computing in the Humanities, King's College London}~~(\mail{John.Lavagnino(a)kcl.ac.uk})}
-\date{15 January 2003}
+\author{John Lavagnino\thanks{Centre for Computing in the Humanities, King's College London}\thanks{Now Maintained by the \LaTeX3 project, \url{https://github.com/rf-latex/endnotes}}}
+
+\date{2020-01-02}
\begin{document}
@@ -142,6 +141,14 @@
\item[JL] John Lavagnino, 15 January 2003: fix my garbled version of
Frank's updates.
+
+\item[JS] Modification by JÃŒrgen SpitzmÃŒller, 17.\,8.\,2019:
+
+ Do not break but just warn if \verb|\theendnotes| is used, but no
+ endnotes have been inserted yet.
+
+ If the last remaining \verb|\endnote| is removed, clear the \verb|*.ent|
+ auxiliary file.
\end{labeling}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/endnotes.doc.tlpobj new/tlpkg/tlpobj/endnotes.doc.tlpobj
--- old/tlpkg/tlpobj/endnotes.doc.tlpobj 2019-02-28 03:35:23.000000000 +0100
+++ new/tlpkg/tlpobj/endnotes.doc.tlpobj 2020-01-05 01:55:00.000000000 +0100
@@ -1,8 +1,9 @@
name endnotes.doc
category Package
-revision 17197
+revision 53319
shortdesc doc files of endnotes
relocated 1
-docfiles size=69
+docfiles size=72
+ RELOC/doc/latex/endnotes/README.md
RELOC/doc/latex/endnotes/endnotes.pdf
RELOC/doc/latex/endnotes/endnotes.tex
++++++ endnotes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/endnotes/endnotes.sty new/tex/latex/endnotes/endnotes.sty
--- old/tex/latex/endnotes/endnotes.sty 2010-02-25 01:39:17.000000000 +0100
+++ new/tex/latex/endnotes/endnotes.sty 2020-01-04 23:04:59.000000000 +0100
@@ -4,9 +4,10 @@
% * ENDNOTES *
% ****************************************
%
-% Date of this version: 15 January 2003.
+% Date of this version: 02 January 2020.
%
%% Copyright 2002 John Lavagnino
+%% Copyright 2019-2020 LaTeX3 Project
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.2
@@ -114,6 +115,11 @@
% Frank's updates.
%
%
+% Jürgen Spitzmüller 2019-08-17: just warn if \verb|\theendnotes| is
+% used, but noendnotes have been inserted yet.
+%
+% Jürgen Spitzmüller 2020-01-02: ensure .ent file is cleared.
+%
% ****************************************
% * ENDNOTE COMMANDS *
% ****************************************
@@ -254,6 +260,8 @@
% ****************************************
%
+\ProvidesPackage{endnotes}[2020-01-02 endnotes package]
+
\@definecounter{endnote}
\def\theendnote{\@arabic\c@endnote}
@@ -283,6 +291,7 @@
\newwrite\@enotes
\newif\if@enotesopen \global\@enotesopenfalse
+\newif\if@haveenotes \global\@haveenotesfalse
\def\@openenotes{\immediate\openout\@enotes=\jobname.ent\relax
\global\@enotesopentrue}
@@ -296,6 +305,7 @@
% of the lines wind up being quite short.
\long\def\@endnotetext#1{%
+ \global\@haveenotestrue
\if@enotesopen \else \@openenotes \fi
\immediate\write\@enotes{\@doanenote{\@theenmark}}%
\begingroup
@@ -309,6 +319,7 @@
% have, requiring the use of \protect for fragile commands.
\long\def\addtoendnotes#1{%
+ \global\@haveenotestrue
\if@enotesopen \else \@openenotes \fi
\begingroup
\newlinechar='40
@@ -316,6 +327,16 @@
\immediate\write\@enotes{#1}%
\endgroup}
+% Check at document end if endnotes have been inserted;
+% if not, assure the *.ent file is cleared if it exists.
+\AtEndDocument{%
+ \if@haveenotes\else
+ \IfFileExists{\jobname.ent}{
+ \if@enotesopen\else\@openenotes\fi
+ \addtoendnotes{}}{}
+ \fi
+}
+
% End of unique endnote code
\def\endnotemark{%
@@ -411,7 +432,9 @@
\def\@endanenote{\par\endgroup}%
\enoteheading
\enotesize
- \input{\jobname.ent}%
+ \InputIfFileExists{\jobname.ent}{}{%
+ \PackageWarning{endnotes}{No endnotes found (file \jobname.ent does not exist)\MessageBreak}
+ }%
\endgroup}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/endnotes.tlpobj new/tlpkg/tlpobj/endnotes.tlpobj
--- old/tlpkg/tlpobj/endnotes.tlpobj 2019-02-28 03:35:23.000000000 +0100
+++ new/tlpkg/tlpobj/endnotes.tlpobj 2020-01-05 01:55:00.000000000 +0100
@@ -1,6 +1,6 @@
name endnotes
category Package
-revision 17197
+revision 53319
shortdesc Place footnotes at the end
relocated 1
longdesc Accumulates notes (using the \endnote command, which can be
@@ -12,6 +12,5 @@
catalogue-contact-repository https://github.com/rf-latex/endnotes
catalogue-contact-support https://github.com/rf-latex/endnotes/issues
catalogue-ctan /macros/latex/contrib/endnotes
-catalogue-date 2018-09-14 18:05:06 +0200
catalogue-license lppl1.2
catalogue-topics endnote
++++++ enotez.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/enotez/README new/doc/latex/enotez/README
--- old/doc/latex/enotez/README 2017-04-24 23:26:18.000000000 +0200
+++ new/doc/latex/enotez/README 2020-01-17 22:53:10.000000000 +0100
@@ -1,15 +1,14 @@
--------------------------------------------------------------------------
-the ENOTEZ package v0.9a
+the ENOTEZ package v0.10b 2020/01/16
Endnotes for LaTeX2e
-2017/04/24
--------------------------------------------------------------------------
Clemens Niederberger
Web: https://bitbucket.org/cgnieder/enotez/
E-Mail: contact(a)mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2012-2017 Clemens Niederberger
+Copyright 2012--2020 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/enotez/enotez_en.pdf and new/doc/latex/enotez/enotez_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/enotez/enotez_en.tex new/doc/latex/enotez/enotez_en.tex
--- old/doc/latex/enotez/enotez_en.tex 2017-04-24 23:26:18.000000000 +0200
+++ new/doc/latex/enotez/enotez_en.tex 2020-01-17 22:53:10.000000000 +0100
@@ -12,7 +12,7 @@
% Web: http://www.mychemistry.eu/forums/forum/enotez/
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -91,9 +91,8 @@
\enotez\ needs and loads the following packages:
\bnd{l3kernel}~\cite{bnd:l3kernel}, \pkg{xparse}, \pkg{xtemplate} and
-\pkg{l3keys2e} from the \bnd{l3packages} bundle~\cite{bnd:l3packages},
-\pkg{xpatch}~\cite{pkg:xpatch}, \pkg{scrlfile} from the \KOMAScript\
-bundle~\cite{bnd:koma-script} and \pkg{translations}~\cite{pkg:translations}.
+\pkg{l3keys2e} from the \bnd{l3packages} bundle~\cite{bnd:l3packages} and
+\pkg{translations}~\cite{pkg:translations}.
\section{Motivation}
\enotez\ is a new implementation of endnotes for \LaTeXe\ since the
@@ -116,11 +115,6 @@
automatically separated by the sections or chapters they were set in, see
section~\ref{sec:split} for more information.
-As an aside: \enotez\ is nicely compatible with the \pkg{fnpct}
-package~\cite{pkg:fnpct}. Version~0.2j or newer of \pkg{fnpct} automatically
-detects \enotez\ and adapts the \cs{endnote} command.
-
-
\section{Usage}
\subsection{Placing the Notes}
The usage is simple: use \cs{endnote} in the text where you want to place the
@@ -132,24 +126,17 @@
\sinceversion{0.9}Add an endnotemark.
\command{endnotetext}[\marg{text}]
\sinceversion{0.9}Add text to an endnote placed with \cs{endnotemark}.
+ % \command{refendnote}[\marg{label name}]
+ % \sinceversion{0.10}This command can be used to create an endnote mark by
+ % referencing an earlier endnote which has been marked with \cs*{label}.
\end{commands}
\begin{example}
This is some text.\endnote{With an endnote.}
\end{example}
There's not really much more to it. It is possible to add a custom mark by
-using the optional argument but that shouldn't be needed too often.
-% \cs{endnote} works fine inside tables, minipages, floats and
-% captions\footnote{This has been tested with the standard classes,
-% \cls{memoir}, and the \cls{KOMA-Script} classes, with and without the
-% \pkg*{caption} package. If you're using another package that redefines
-% \cs*{caption} or are using another class it might not work. Before you
-% place a note in a caption you should re-think the idea anyway.}.
-Endnotes
+using the optional argument but that shouldn't be needed too often. Endnotes
can also be nested.
-% Since this functionality seemed making a pair
-% \cs{endnotemark}/\cs{endnotetext} superfluous they are \emph{not} defined by
-% \enotez.
\begin{example}
This is some text.\endnote{With another endnote.\endnote{This is a
nested\endnote{And another level deeper\ldots} endnote!}}
@@ -162,27 +149,9 @@
contains the current mark which is preceded by \cs{enmarkstyle}. Both of
these commands can be redefined of course to adapt to custom settings. This
can also be done using options, see section~\ref{sec:options}. The mark of
-the endnote that has been set last is stored in % \cs{theendnote} and in
+the endnote that has been set last is stored in
\verbcode+\(a)currentlabel+.\sinceversion{0.6}
-% This could be used to define a command which writes a mark:
-% \begin{example}
-% % we cannot use \newcommand -- the command starts with \end...
-% \makeatletter
-% \def\endnotemark{\@ifnextchar[{\@endnotemark}{\@endnotemark[\theendnote]}}
-% \def\@endnotemark[#1]{\enotezwritemark{\enmarkstyle#1}}
-% \makeatother
-% Text\endnotemark
-% \end{example}
-% Please note that this definition \emph{does not} step the endnote counter but
-% either refers to the last number (no optional argument) or uses the one
-% provided in the optional argument.
-
-% \makeatletter
-% \def\endnotemark{\@ifnextchar[{\@endnotemark}{\@endnotemark[\theendnote]}}
-% \def\@endnotemark[#1]{\enotezwritemark{\enmarkstyle#1}}
-% \makeatother
-
Endnotes can also be labelled and later be referred to:
\begin{example}
The next endnote\endnote{This endnote gets a label.}\label{en:test} has
@@ -197,11 +166,12 @@
Print the list of endnotes. \meta{style} is one of the instances
explained in section~\ref{sec:customizing_the_list}.
\end{commands}
-If used without argument it prints all notes set so far with
-\cs{endnote}. The current list will then be cleared. All endnotes set after
-it are stored again for the next usage of \cs{printendnotes}. The starred
-version will print \emph{all} endnotes but shouldn't be used more than once if
-you have nested endnotes.
+If used without argument it prints all notes set so far with \cs{endnote}. The
+current list will then be cleared. All endnotes set after it are stored again
+for the next usage of \cs{printendnotes}. The starred version will print
+\emph{all} endnotes but shouldn't be used more than once if you have nested
+endnotes. \emph{Unfortunately the starred version also does not work together
+ with the \option{split} option.}
It may take several compilation runs until all notes are printed correctly.
In a first run they are written to the \code{aux} file. In the second run
@@ -244,8 +214,9 @@
\section{Options}\label{sec:options}
\subsection{Package Options}
\enotez\ has a few package options which should be pretty self-explanatory.
-They can be set either as package options with
-\cs*{usepackage}\oarg{options}\Marg{enotez} or with the setup command.
+They can be set with the setup command\footnote{Earlier versions allowed to
+ use them as package options. This is not possible any more since
+ version~0.10.}.
\begin{commands}
\command{setenotez}[\marg{options}]
Setup command for setting \enotez' options.
@@ -272,8 +243,12 @@
\sinceversion{0.7}If set to \code{true} and \pkg{hyperref} has been
loaded backlinks from the notes in the list to the marks in the text are
added.
- \keychoice{totoc}{section,chapter,false}\Default{false}\label{key:totoc}
- Add an entry to the table of contents.
+ \keychoice{totoc}{subsection,section,chapter,part,\default{auto},false}%
+ \Default{false}\label{key:totoc}
+ Add\changedversion{0.10} an entry to the table of contents. When used
+ with no value the value \code{auto} is chosen and \enotez\ tries to detect
+ the correct level by itself. If this fails the option will be ignored and
+ a warning is written to the log file.
\keyval{list-heading}{sectioning command including argument}
You can use this option to manually set the list heading command, \eg,
\keyis{list-heading}{\cs{chapter}\Marg{\#1}} for a numbered heading. The
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/enotez/enotez_split_example.tex new/doc/latex/enotez/enotez_split_example.tex
--- old/doc/latex/enotez/enotez_split_example.tex 2016-11-08 23:36:54.000000000 +0100
+++ new/doc/latex/enotez/enotez_split_example.tex 2020-01-17 22:53:10.000000000 +0100
@@ -1,3 +1,34 @@
+% --------------------------------------------------------------------------
+% the ENOTEZ package
+%
+% Endnotes for LaTeX2e
+%
+% --------------------------------------------------------------------------
+% Clemens Niederberger
+% Web: https://bitbucket.org/cgnieder/enotez/
+% E-Mail: contact(a)mychemistry.eu
+% --------------------------------------------------------------------------
+% Copyright 2012--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.
+% --------------------------------------------------------------------------
+% The enotez package consists of the files
+% - enotez.sty, enotez_en.tex, enotez_en.pdf, README
+% --------------------------------------------------------------------------
+% If you have any ideas, questions, suggestions or bugs to report, please
+% feel free to contact me.
+% --------------------------------------------------------------------------
+
\documentclass{article}
% \documentclass{scrartcl}
% \documentclass{memoir}
@@ -9,11 +40,11 @@
\usepackage{enotez}
\usepackage{kantlipsum}
-\DeclareInstance{enotez-list}{section}{paragraph}{heading=\section{#1}}
+\DeclareInstance{enotez-list}{itemize}{list}{list-type=itemize,heading=\section{#1}}
\setenotez{
split=section,
list-style=section,
- reset,
+ % reset,
backref
% customize the titles in between, e.g.:
% split-sectioning=addsec,
@@ -46,7 +77,8 @@
\end{figure}
\appendix
-\printendnotes
+\printendnotes[itemize]
+
\end{document}
\tableofcontents
@@ -69,5 +101,4 @@
\appendix
\printendnotes
-
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/enotez.doc.tlpobj new/tlpkg/tlpobj/enotez.doc.tlpobj
--- old/tlpkg/tlpobj/enotez.doc.tlpobj 2019-02-28 03:35:25.000000000 +0100
+++ new/tlpkg/tlpobj/enotez.doc.tlpobj 2020-03-24 01:57:32.000000000 +0100
@@ -1,9 +1,9 @@
name enotez.doc
category Package
-revision 44024
+revision 54512
shortdesc doc files of enotez
relocated 1
-docfiles size=121
+docfiles size=118
RELOC/doc/latex/enotez/README
RELOC/doc/latex/enotez/enotez_en.pdf
RELOC/doc/latex/enotez/enotez_en.tex
++++++ enotez.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/enotez/enotez.sty new/tex/latex/enotez/enotez.sty
--- old/tex/latex/enotez/enotez.sty 2017-04-24 23:26:18.000000000 +0200
+++ new/tex/latex/enotez/enotez.sty 2020-01-17 22:53:10.000000000 +0100
@@ -8,7 +8,7 @@
% Web: https://bitbucket.org/cgnieder/enotez/
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--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,23 +28,15 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-\RequirePackage{ expl3 , xparse , l3keys2e , xtemplate , etoolbox , xpatch , scrlfile }
+\RequirePackage {expl3,xparse,l3keys2e,xtemplate}
\ProvidesExplPackage
{enotez}
- {2017/04/24}
- {0.9a}
+ {2020/01/16}
+ {0.10b}
{Endnotes for LaTeX2e}
% --------------------------------------------------------------------------
% messages
-% \msg_new:nnnn {enotez} {captions}
-% { Endnotes~might~not~work~in~captions. }
-% {
-% Endnotes~might~not~work~inside~captions.~You~might~try~to~use~the~caption~
-% package~if~you~encounter~problems~but~that's~not~a~promise~that~things~
-% will~work~then.
-% }
-
\msg_new:nnnn {enotez} {deprecated}
{ The~#1~`#2'~is~deprecated.~Use~`#3'~instead~\msg_line_context:. }
{
@@ -53,10 +45,17 @@
forever~I~encourage~you~to~switch.
}
-\cs_new:Npn \enotez_option_deprecated:nn #1#2
+\msg_new:nnn {enotez} {totoc}
+ {
+ You've~ set~ `totoc~ =~ auto'.~ However,~ I'm~ unbale~ to~ determine~ the~
+ toc~ level~ automatically.~ Please~ choose~ the~ level~ yourself.
+ }
+
+
+\cs_new_protected:Npn \enotez_option_deprecated:nn #1#2
{ \msg_warning:nnnnn {enotez} {deprecated} {option} {#1} {#2} }
-\cs_new:Npn \enotez_command_deprecated:NN #1#2
+\cs_new_protected:Npn \enotez_command_deprecated:NN #1#2
{
\msg_warning:nnnnn {enotez} {deprecated} {command}
{ \token_to_str:N #1 } { \token_to_str:N #2 }
@@ -65,7 +64,9 @@
% --------------------------------------------------------------------------
% variants of kernel functions
\cs_generate_variant:Nn \tl_if_eq:nnTF { Vn , nx }
-\cs_generate_variant:Nn \tl_if_eq:nnT { xx }
+\cs_generate_variant:Nn \tl_if_eq:nnT { xx , V }
+\cs_generate_variant:Nn \str_if_in:nnT { o }
+\cs_generate_variant:Nn \cs_set:Npn { cpV }
% --------------------------------------------------------------------------
% variables:
@@ -76,9 +77,6 @@
\bool_new:N \l__enotez_hyperfootnotes_bool
\bool_new:N \l__enotez_hyperbackref_bool
\bool_new:N \l__enotez_split_bool
-% \bool_new:N \l__enotez_caption_patched_bool
-% \bool_new:N \l__enotez_koma_patched_bool
-% \bool_new:N \l__enotez_memoir_patched_bool
\bool_new:N \l__enotez_disable_bool
\tl_new:N \l__enotez_tmpa_tl
@@ -88,7 +86,7 @@
\tl_new:N \l__enotez_totoc_tl
\tl_new:N \l__enotez_list_name_tl
\tl_set:Nn \l__enotez_list_name_tl {Notes}
-\tl_new:N \l__enotez_endnote_text_tl
+\tl_new:N \g__enotez_endnote_text_tl
\tl_new:N \l__enotez_endnote_mark_tl
\tl_new:N \l__enotez_list_instance_tl
\tl_set:Nn \l__enotez_list_instance_tl {plain}
@@ -131,7 +129,18 @@
\prop_new:N \g__enotez_endnote_sect_id_prop
\prop_new:N \g__enotez_endnote_man_prop
-\cs_new_protected:Npn \enotez_nobreak: { \tex_penalty:D \c_ten_thousand }
+\seq_new:N \l__enotez_tmpa_seq
+\seq_new:N \l__enotez_sectioning_seq
+\seq_put_right:Nn \l__enotez_sectioning_seq {part}
+\seq_put_right:Nn \l__enotez_sectioning_seq {chapter}
+\seq_put_right:Nn \l__enotez_sectioning_seq {section}
+\seq_put_right:Nn \l__enotez_sectioning_seq {subsection}
+\seq_put_right:Nn \l__enotez_sectioning_seq {subsubsection}
+\seq_put_right:Nn \l__enotez_sectioning_seq {paragraph}
+
+\str_new:N \l__enotez_tmpa_str
+
+\cs_new_protected:Npn \enotez_nobreak: { \tex_penalty:D 10000 \scan_stop: }
% --------------------------------------------------------------------------
% options:
@@ -141,7 +150,6 @@
footnotes .bool_set:N = \l__enotez_footnotes_tl ,
list-name .tl_set:N = \l__enotez_list_name_tl ,
reset .bool_set:N = \l__enotez_reset_bool ,
- % TODO: add symbols and other possible formats, use cntformats?
counter-format .choice: ,
counter-format / arabic .code:n = \cs_set:Npn \theendnote {\arabic{endnote}} ,
counter-format / alph .code:n = \cs_set:Npn \theendnote {\alph{endnote}} ,
@@ -152,27 +160,28 @@
mark-format .code:n = \cs_set:Npn \enmarkstyle {#1} ,
mark-cs .code:n = \cs_set:Npn \enotezwritemark {#1} ,
totoc .choices:nn =
- { section , chapter , false }
+ { subsection , section , chapter , part , auto , false }
{
- \tl_if_eq:VnTF \l_keys_choice_tl { false }
+ \tl_if_eq:VnTF \l_keys_choice_tl {false}
{ \bool_set_false:N \l__enotez_totoc_bool }
{
\bool_set_true:N \l__enotez_totoc_bool
\tl_set_eq:NN \l__enotez_totoc_tl \l_keys_choice_tl
}
} ,
+ totoc .default:n = auto ,
list-heading .code:n =
\cs_set:Npn \enotezlistheading ##1 {#1} ,
split .choices:nn =
{ section , chapter , false }
{
- \tl_if_eq:VnTF \l_keys_choice_tl { false }
+ \tl_if_eq:VnTF \l_keys_choice_tl {false}
{ \bool_set_false:N \l__enotez_split_bool }
{ \bool_set_true:N \l__enotez_split_bool }
\tl_set_eq:NN \l__enotez_split_tl \l_keys_choice_tl
} ,
split-sectioning .code:n =
- \enotez_option_deprecated:nn { split-sectioning } { split-heading }
+ \enotez_option_deprecated:nn {split-sectioning} {split-heading}
\cs_set:Npn \enotezsplitlistheading ##1 {#1}
\bool_set_true:N \l__enotez_splitted_list_heading_bool ,
split-heading .code:n =
@@ -190,6 +199,7 @@
% #2: mark
\cs_new_protected:Npn \enotez_write_mark:nn #1#2
{
+ % but what if #2 is the reference to a different mark?
\bool_if:NTF \l__enotez_hyperfootnotes_bool
{
\enotezwritemark { \hyperlink {enz.#1} { \enmarkstyle #2 } }
@@ -203,6 +213,10 @@
}
\cs_generate_variant:Nn \enotez_write_mark:nn {x}
+% % #1: argument to \ref
+% \cs_new_protected:Npn \enotez_ref_note:n #1
+% { \enotezwritemark { \enmarkstyle { \ref {#1} } } }
+
% the internal endnote:
\cs_new_protected:Npn \enotez_endnote:nn #1#2
{
@@ -215,16 +229,13 @@
\int_gincr:N \g__enotez_endnote_id_int
\quark_if_no_value:nTF {#1}
{
- \stepcounter {endnote}% problem with option `reset'
- % \show \theendnote
- \cs_gset:cpx {@currentlabel} {\theendnote}
+ \refstepcounter {endnote}
\enotez_write_mark:xn
{ \int_use:N \g__enotez_endnote_id_int }
{ \theendnote }
}
{
- \cs_gset:cpn {@currentlabel} {#1}
- % \cs_gset_eq:NN \theendnote \@currentlabel
+ \cs_gset:cpn {@currentlabel} {\p@endnote#1}
\enotez_write_mark:xn { \int_use:N \g__enotez_endnote_id_int } {#1}
}
\bool_if:NT \l__enotez_disable_bool
@@ -254,22 +265,20 @@
\enotez_save_note:xxxxxnn
{ \int_use:N \g__enotez_endnote_id_int }
{ \theendnote }
- % { \int_use:N \g__enotez_endnote_mark_int }
{ \int_use:N \g__enotez_list_printed_int }
{ \thechapter }
{ \int_eval:n { \value{chapter} } }
- { a }
+ {a}
{#2}
}
{
\enotez_save_note:xxxxxnn
{ \int_use:N \g__enotez_endnote_id_int }
{ \theendnote }
- % { \int_use:N \g__enotez_endnote_mark_int }
{ \int_use:N \g__enotez_list_printed_int }
{ \thesection }
{ \int_eval:n { \value{section} } }
- {a }
+ {a}
{#2}
}
}
@@ -287,7 +296,7 @@
{ \int_use:N \g__enotez_list_printed_int }
{ \thechapter }
{ \int_eval:n { \value{chapter} } }
- { m }
+ {m}
{#2}
}
{
@@ -297,7 +306,7 @@
{ \int_use:N \g__enotez_list_printed_int }
{ \thesection }
{ \int_eval:n { \value{section} } }
- { m }
+ {m}
{#2}
}
}
@@ -313,7 +322,10 @@
% #6: a/m (automatic/manually)
% #7: text
\cs_new_protected:Npn \enotez_save_note:nnnnnnn #1#2#3#4#5#6#7
- { \iow_now:Nn \@auxout { \enotez@note {#1} {#2} {#3} {#4} {#5} {#6} {#7} } }
+ {
+ \legacy_if:nT {@filesw}
+ { \iow_now:Nn \@auxout { \enotez@note {#1} {#2} {#3} {#4} {#5} {#6} {#7} } }
+ }
\cs_generate_variant:Nn \enotez_save_note:nnnnnnn { xxxxx , xnxxx }
\cs_new_protected:Npn \enotez@note #1#2#3#4#5#6#7
@@ -372,153 +384,188 @@
{ \enotez_endnote_text:nn { \q_no_value } }
}
+% \cs_new_protected:Npn \refendnote #1
+% { \enotez_ref_note:n {#1} }
+
\cs_new:Npn \enotez_endnote_text_aux:w [#1]#2
{ \enotez_endnote_text:nn {#1} {#2} }
% --------------------------------------------------------------------------
% the list of notes
-\cs_if_exist:cTF { chapter }
+\cs_if_exist:cTF {chapter}
{ \cs_new:Npn \enotezlistheading { \chapter* } }
{ \cs_new:Npn \enotezlistheading { \section* } }
\tl_new:N \enotezsplitlistheading
\bool_new:N \l__enotez_splitted_list_heading_bool
-% \cs_new:Npn \enotezsplitlistheading
-% { \use:c { \l__enotez_splitted_list_sectioning_tl } }
+
+\cs_new_protected:Npn \enotez_set_totoc:
+ {
+ \bool_if:NT \l__enotez_totoc_bool
+ {
+ \bool_if:NT \l__enotez_hyperref_bool { \phantomsection }
+ \bool_set_false:N \l__enotez_tmpa_bool
+ \tl_if_eq:VnTF \l__enotez_totoc_tl {auto}
+ {
+ \seq_map_inline:Nn \l__enotez_sectioning_seq
+ {
+ \str_if_in:onT { \enotezlistheading{} } {##1}
+ {
+ \bool_set_true:N \l__enotez_tmpa_bool
+ \tl_set:Nn \l__enotez_totoc_tl {##1}
+ }
+ }
+ \bool_if:NF \l__enotez_tmpa_bool
+ {
+ \tl_set:Nn \l__enotez_totoc_tl {false}
+ \msg_warning:nn {enotez} {totoc}
+ }
+ }
+ { \bool_set_true:N \l__enotez_tmpa_bool }
+ \bool_if:NT \l__enotez_tmpa_bool
+ {
+ \addcontentsline
+ {toc}
+ { \l__enotez_totoc_tl }
+ { \l__enotez_list_name_tl }
+ }
+ }
+ }
+
+\cs_new_protected:Npn \enotez_build_print_list:nnnn #1#2#3#4
+ {
+ \int_zero:N \l__enotez_tmpa_int
+ \bool_if:nTF {#1}
+ {
+ \prop_map_inline:Nn \g__enotez_endnote_mark_prop
+ {
+ \enotez_get_note:nn {#1} {##1}
+ \bool_if:NT \l__enotez_print_note_bool {#3}
+ }
+ }
+ {
+ \int_do_while:nn { \l__enotez_tmpa_int <= \g__enotez_list_printed_int }
+ {
+ \seq_clear:N \l__enotez_tmpa_seq
+ \prop_map_inline:Nn \g__enotez_endnote_mark_prop
+ {
+ \tl_if_eq:xxT
+ { \int_use:N \l__enotez_tmpa_int }
+ { \prop_item:Nn \g__enotez_endnote_split_prop {##1} }
+ { \seq_put_right:Nn \l__enotez_tmpa_seq {##1} }
+ }
+ \seq_if_empty:NF \l__enotez_tmpa_seq
+ {
+ \enotez_get_split_title:x { \seq_item:Nn \l__enotez_tmpa_seq {1} }
+ #2
+ }
+ \seq_map_inline:Nn \l__enotez_tmpa_seq
+ {
+ \enotez_get_note:nn {#1} {##1}
+ \bool_if:NT \l__enotez_print_note_bool {#3}
+ }
+ \seq_if_empty:NF \l__enotez_tmpa_seq {#4}
+ \int_incr:N \l__enotez_tmpa_int
+ }
+ }
+ }
\DeclareObjectType {enotez-list} {1}
\DeclareTemplateInterface {enotez-list} {paragraph} {1}
{
- heading : function 1 = \enotezlistheading{#1} ,
- format : tokenlist = \footnotesize ,
- number : function 1 = \enmark{#1} ,
- number-format : tokenlist = \normalfont ,
- notes-sep : length = .5\baselineskip ,
+ heading : function 1 = \enotezlistheading {#1} ,
+ format : tokenlist = \footnotesize ,
+ number : function 1 = \enmark{#1} ,
+ number-format : tokenlist = \normalfont ,
+ notes-sep : length = .5\baselineskip
}
\DeclareTemplateCode {enotez-list} {paragraph} {1}
{
- heading = \enotez_list_heading:n ,
+ heading = \enotez_list_heading:n ,
format = \l__enotez_list_format_tl ,
- number = \enotez_list_number:n ,
+ number = \enotez_list_number:n ,
number-format = \l__enotez_list_number_format_tl ,
- notes-sep = \l__enotez_list_notes_sep_dim ,
+ notes-sep = \l__enotez_list_notes_sep_dim
}
{
\AssignTemplateKeys
- \bool_if:NT \l__enotez_totoc_bool
- {
- \bool_if:NT \l__enotez_hyperref_bool { \phantomsection }
- \addcontentsline {toc} { \l__enotez_totoc_tl } { \l__enotez_list_name_tl }
- }
+ \enotez_set_totoc:
\enotez_list_heading:n { \l__enotez_list_name_tl }
\enotez_list_preamble:
- \int_zero:N \l__enotez_tmpa_int
- \int_do_while:nn { \l__enotez_tmpa_int <= \g__enotez_list_printed_int }
- {
- \prop_map_inline:Nn \g__enotez_endnote_mark_prop
+ \enotez_build_print_list:nnnn {#1}
+ {}
+ {
+ \par\noindent
+ \group_begin:
+ \tl_use:N \l__enotez_list_format_tl
+ \hbox_overlap_left:n
{
- \tl_if_eq:xxT
- { \int_use:N \l__enotez_tmpa_int }
- { \prop_item:Nn \g__enotez_endnote_split_prop { ##1 } }
- {
- \enotez_get_split_title:n { ##1 }
- \enotez_get_note:nn {#1} { ##1 }
- \bool_if:NT \l__enotez_print_note_bool
- {
- \par\noindent
- \group_begin:
- \tl_use:N \l__enotez_list_format_tl
- \llap
- {
- \enotez_list_number:n
- { \enotez_write_list_number:n { ##1 } }
- \tl_use:N \c_space_tl
- }
- \tl_use:N \l__enotez_endnote_text_tl
- \par
- \group_end:
- }
- }
- \par
- \dim_compare:nT { \l__enotez_list_notes_sep_dim != 0pt }
- { \addvspace { \l__enotez_list_notes_sep_dim } }
+ \enotez_list_number:n
+ { \enotez_write_list_number:n {##1} }
+ \tl_use:N \c_space_tl
}
- \int_incr:N \l__enotez_tmpa_int
- }
+ % \cs_set:cpn {@currentlabel}
+ % { \p@endnote \l__enotez_endnote_mark_tl }
+ \tl_use:N \g__enotez_endnote_text_tl
+ \par
+ \dim_compare:nT { \l__enotez_list_notes_sep_dim != 0pt }
+ { \addvspace { \l__enotez_list_notes_sep_dim } }
+ \group_end:
+ }
+ {}
\enotez_list_postamble:
}
\DeclareTemplateInterface {enotez-list} {list} {1}
{
- heading : function 1 = \enotezlistheading{#1} ,
- format : tokenlist = \footnotesize ,
- number : function 1 = \enmark{#1} ,
- number-format : tokenlist = \normalfont ,
- list-type : tokenlist = description ,
+ heading : function 1 = \enotezlistheading {#1} ,
+ format : tokenlist = \footnotesize ,
+ number : function 1 = \enmark{#1} ,
+ number-format : tokenlist = \normalfont ,
+ list-type : tokenlist = description
}
\DeclareTemplateCode {enotez-list} {list} {1}
{
- heading = \enotez_list_heading:n ,
+ heading = \enotez_list_heading:n ,
format = \l__enotez_list_format_tl ,
- number = \enotez_list_number:n ,
+ number = \enotez_list_number:n ,
number-format = \l__enotez_list_number_format_tl ,
list-type = \l__enotez_list_type_tl
}
{
\AssignTemplateKeys
- \bool_if:NT \l__enotez_totoc_bool
- {
- \bool_if:NT \l__enotez_hyperref_bool { \phantomsection }
- \addcontentsline { toc } { \l__enotez_totoc_tl } { \l__enotez_list_name_tl }
- }
+ \enotez_set_totoc:
\enotez_list_heading:n { \l__enotez_list_name_tl }
\enotez_list_preamble:
- \int_zero:N \l__enotez_tmpa_int
- \int_do_while:nn { \l__enotez_tmpa_int <= \g__enotez_list_printed_int }
- {
- \prop_map_inline:Nn \g__enotez_endnote_mark_prop
- {
- \tl_clear:N \l__enotez_tmpc_tl
- \tl_if_eq:xxT
- { \int_use:N \l__enotez_tmpa_int }
- { \prop_item:Nn \g__enotez_endnote_split_prop { ##1 } }
- { \tl_put_right:Nn \l__enotez_tmpc_tl { ##1 } }
- \tl_if_blank:VF \l__enotez_tmpc_tl
- {
- \enotez_get_split_title:n { ##1 }
- \group_begin:
- \tl_use:N \l__enotez_list_format_tl
- \begin{\l__enotez_list_type_tl}
- }
- \tl_if_eq:xxT
- { \int_use:N \l__enotez_tmpa_int }
- { \prop_item:Nn \g__enotez_endnote_split_prop { ##1 } }
- {
- \enotez_get_note:nn {#1} { ##1 }
- \bool_if:NT \l__enotez_print_note_bool
- {
- \item
- [
- \enotez_list_number:n
- { \enotez_write_list_number:n { ##1 } }
- ]
- \tl_use:N \l__enotez_endnote_text_tl
- }
- }
- \tl_if_blank:VF \l__enotez_tmpc_tl
- { \end{\l__enotez_list_type_tl} \group_end: }
- }
- \int_incr:N \l__enotez_tmpa_int
- }
+ \enotez_build_print_list:nnnn {#1}
+ {
+ \group_begin:
+ \tl_use:N \l__enotez_list_format_tl
+ \begin{\l__enotez_list_type_tl}
+ }
+ {
+ \item
+ [
+ \enotez_list_number:n
+ { \enotez_write_list_number:n {##1} }
+ ]
+ % \cs_set:cpn {@currentlabel}
+ % { \p@endnote \l__enotez_endnote_mark_tl }
+ \tl_use:N \g__enotez_endnote_text_tl
+ }
+ {
+ \end{\l__enotez_list_type_tl}
+ \group_end:
+ }
\enotez_list_postamble:
}
% some default styles:
-\DeclareInstance {enotez-list} {plain} {paragraph } { }
-\DeclareInstance {enotez-list} {description} {list} { }
+\DeclareInstance {enotez-list} {plain} {paragraph } { }
+\DeclareInstance {enotez-list} {description} {list} { }
\DeclareInstance {enotez-list} {itemize} {list} { list-type = itemize }
% --------------------------------------------------------------------------
@@ -528,8 +575,7 @@
\bool_if:NT \l__enotez_hyperfootnotes_bool
{ \box_move_up:nn {1em} { \hbox:n { \hypertarget {enz.#1} { } } } }
\tl_use:N \l__enotez_list_number_format_tl
- \tl_if_eq:nxTF {a}
- { \prop_item:Nn \g__enotez_endnote_man_prop {#1} }
+ \tl_if_eq:nxTF {a} { \prop_item:Nn \g__enotez_endnote_man_prop {#1} }
{
\bool_if:nTF
{ \l__enotez_hyperfootnotes_bool && \l__enotez_hyperbackref_bool }
@@ -559,7 +605,10 @@
\bool_if:nTF {#1}
{
\prop_get:NnN \g__enotez_endnote_mark_prop {#2} \l__enotez_endnote_mark_tl
- \prop_get:NnN \g__enotez_endnote_text_prop {#2} \l__enotez_endnote_text_tl
+ \prop_get:NnN \g__enotez_endnote_text_prop {#2} \g__enotez_endnote_text_tl
+ \tl_gset_eq:NN
+ \g__enotez_endnote_text_tl
+ \g__enotez_endnote_text_tl
\bool_set_true:N \l__enotez_print_note_bool
}
{
@@ -569,14 +618,8 @@
\bool_set_true:N \l__enotez_print_note_bool
\tl_set:Nx \l__enotez_endnote_mark_tl
{ \prop_item:Nn \g__enotez_endnote_mark_prop {#2} }
- \tl_set:Nx \l__enotez_endnote_text_tl
+ \tl_gset:Nx \g__enotez_endnote_text_tl
{ \prop_item:Nn \g__enotez_endnote_text_prop {#2} }
- % \prop_gpop:NnN \g__enotez_endnote_mark_prop
- % {#2}
- % \l__enotez_endnote_mark_tl
- % \prop_gpop:NnN \g__enotez_endnote_text_prop
- % {#2}
- % \l__enotez_endnote_text_tl
}
{
\int_compare:nTF { \l__enotez_tmpa_tl = \g__enotez_list_printed_int }
@@ -584,14 +627,8 @@
\bool_set_true:N \l__enotez_print_note_bool
\tl_set:Nx \l__enotez_endnote_mark_tl
{ \prop_item:Nn \g__enotez_endnote_mark_prop {#2} }
- \tl_set:Nx \l__enotez_endnote_text_tl
+ \tl_gset:Nx \g__enotez_endnote_text_tl
{ \prop_item:Nn \g__enotez_endnote_text_prop {#2} }
- % \prop_gpop:NnN \g__enotez_endnote_mark_prop
- % {#2}
- % \l__enotez_endnote_mark_tl
- % \prop_gpop:NnN \g__enotez_endnote_text_prop
- % {#2}
- % \l__enotez_endnote_text_tl
\prop_gremove:Nn \g__enotez_endnote_split_prop {#2}
}
{ \bool_set_false:N \l__enotez_print_note_bool }
@@ -653,7 +690,7 @@
\cs_generate_variant:Nn \tl_set_rescan:Nnn { NnV }
\cs_new_protected:Npn \enotez_first_upper:n #1
- { \tl_upper_case:n { \tl_head:n {#1} } \tl_tail:n {#1} }
+ { \text_titlecase_first:n {#1} }
\cs_generate_variant:Nn \enotez_first_upper:n { V }
\tl_new:N \l__enotez_last_split_id_tl
@@ -676,7 +713,7 @@
\bool_if:NTF \l__enotez_splitted_list_heading_bool
{ \exp_args:No \enotezsplitlistheading }
{
- \tl_if_eq:VnTF \l__enotez_split_tl { section }
+ \tl_if_eq:VnTF \l__enotez_split_tl {section}
{ \exp_args:NNo \subsection* }
{ \exp_args:NNo \section* }
}
@@ -686,6 +723,7 @@
}
\prop_get:NnN \g__enotez_endnote_split_prop {#1} \l__enotez_last_split_id_tl
}
+\cs_generate_variant:Nn \enotez_get_split_title:n {x}
% --------------------------------------------------------------------------
% the marks in the list:
@@ -697,6 +735,8 @@
% --------------------------------------------------------------------------
% internal printendnotes:
+% #1: boolean
+% #2: list style
\cs_new_protected:Npn \enotez_print_endnotes:nn #1#2
{
\enotez_if_endnotes:T
@@ -708,30 +748,29 @@
\bool_if:NF \l__enotez_split_bool
{
\bool_if:NT \l__enotez_reset_bool
- {
- \setcounter {endnote} {0}
- % \int_gzero:N \g__enotez_endnote_mark_int
- }
+ { \setcounter {endnote} {0} }
\int_gincr:N \g__enotez_list_printed_int
}
+ \bool_if:NT \l__enotez_reset_bool
+ { \setcounter {endnote} {0} }
}
}
\prg_new_conditional:Npnn \enotez_if_endnotes: {p,T,F,TF}
{
- \int_compare:nTF { \value {endnote} > 0 }
+ \int_compare:nTF { \g__enotez_endnote_id_int > 0 }
{ \prg_return_true: }
{ \prg_return_false: }
}
% the user command:
-\NewDocumentCommand \printendnotes { so }
+\NewDocumentCommand \printendnotes {so}
{
\IfNoValueTF {#2}
{
\bool_if:NTF \l__enotez_split_bool
- { \enotez_print_endnotes:nn { \BooleanFalse } { } }
- { \enotez_print_endnotes:nn {#1} { } }
+ { \enotez_print_endnotes:nn { \BooleanFalse } { } }
+ { \enotez_print_endnotes:nn {#1} { } }
}
{
\bool_if:NTF \l__enotez_split_bool
@@ -839,8 +878,6 @@
\cs_new:Npn \EnotezCurrentSplitTitle {}
% --------------------------------------------------------------------------
-% process the options:
-\ProcessKeysOptions {enotez}
\AtBeginDocument
{
@@ -852,10 +889,7 @@
{
\int_gincr:N \g__enotez_list_printed_int
\bool_if:NT \l__enotez_reset_bool
- {
- \setcounter {endnote} {0}
- % \int_gzero:N \g__enotez_endnote_mark_int
- }
+ { \setcounter {endnote} {0} }
}
}
{
@@ -863,10 +897,7 @@
{
\int_gincr:N \g__enotez_list_printed_int
\bool_if:NT \l__enotez_reset_bool
- {
- \setcounter {endnote} {0}
- % \int_gzero:N \g__enotez_endnote_mark_int
- }
+ { \setcounter {endnote} {0} }
}
}
}
@@ -942,50 +973,54 @@
\tl_set:Nn \l__enotez_section_tl { \GetTranslation {enotez-section} }
\tl_set:Nn \l__enotez_chapter_tl { \GetTranslation {enotez-chapter} }
-\tex_endinput:D
+\file_input_stop:
% --------------------------------------------------------------------------
% HISTORY:
-2012/07/03 v0.1 - first public version on bitbucket
-2012/07/05 v0.2 - added preliminary `split' option
- - enable endnotes in captions with KOMA classes, `memoir' and
- the `caption' package
-2012/07/06 v0.2a - made the splitted list titles customizable
-2012/07/07 v0.3 - list-building rewritten due to a design flaw
-2012/07/24 v0.3a - adapted to deprecated functions in l3kernel and l3packages,
- removed debugging leftover
-2012/12/14 v0.3b - bug fix: works again when used with a KOMA class and an
- endnote is used inside a caption
-2012/12/30 v0.4 - new options `mark-cs' and `mark-format', redefinable
- commands \enmarkstyle and \enotezwritemark
-2012/01/18 v0.4a - added beginnings of internationalization -- this will need
- help from users speaking the actual languages
-2013/03/12 v0.5 - \AtNextEndnotesList, \AtEveryEndnotesList
- - use protected internal commands where appropriate
- - fix wrong endnote marks when used with the `caption'
- package
-2013/03/18 v0.5a - adapt to deprecated expl3 commands
-2013/04/06 v0.6 - \endnote sets \@currentlabel so endnotes can be referenced
- with \label{} and \ref{}
-2013/05/01 v0.7 - new option `backref' adds links from the notes in the list
- back to the notes in the text (needs `hyperref' loaded)
- - new: \AtEveryListSplit, \AfterEveryListSplit,
- \EnotezCurrentSplitTitle
- - new option: `list-heading'
-2013/08/03 v0.7a - corrected bug: `reset=true' now works as it should
- - added counter-format `symbols'
-2013/10/31 v0.7b - corrected bug: \acro_command_deprecated:NN should of course
- be \enotez_command_deprecated:NN
-2014/02/04 v0.7c - added a missing \par to the `paragraph' template for the
- list
-2015/06/24 v0.8 - bug fix in typesetting the split-headings
- - new command \NewSplitTitleTag
-2015/07/29 v0.8a - adapt to deprecated choice selection in keys
-2016/01/07 v0.8b - \prop_get:Nn => \prop_item:Nn
-2016/11/08 v0.9 - fix issues #6, #7, and #8
- - remove caption patching and add \endnotemark and \endnotetext
-2017/04/24 v0.9a - fix wrong format of number in list
-
-% --------------------------------------------------------------------------
-% TODO:
-- add \endnotemark and \endnotetext
-- make the headings obey the `totoc' option?
+2012/07/03 v0.1 - first public version on bitbucket
+2012/07/05 v0.2 - added preliminary `split' option
+ - enable endnotes in captions with KOMA classes, `memoir' and
+ the `caption' package
+2012/07/06 v0.2a - made the splitted list titles customizable
+2012/07/07 v0.3 - list-building rewritten due to a design flaw
+2012/07/24 v0.3a - adapted to deprecated functions in l3kernel and l3packages,
+ removed debugging leftover
+2012/12/14 v0.3b - bug fix: works again when used with a KOMA class and an
+ endnote is used inside a caption
+2012/12/30 v0.4 - new options `mark-cs' and `mark-format', redefinable
+ commands \enmarkstyle and \enotezwritemark
+2012/01/18 v0.4a - added beginnings of internationalization -- this will need
+ help from users speaking the actual languages
+2013/03/12 v0.5 - \AtNextEndnotesList, \AtEveryEndnotesList
+ - use protected internal commands where appropriate
+ - fix wrong endnote marks when used with the `caption'
+ package
+2013/03/18 v0.5a - adapt to deprecated expl3 commands
+2013/04/06 v0.6 - \endnote sets \@currentlabel so endnotes can be referenced
+ with \label{} and \ref{}
+2013/05/01 v0.7 - new option `backref' adds links from the notes in the list
+ back to the notes in the text (needs `hyperref' loaded)
+ - new: \AtEveryListSplit, \AfterEveryListSplit,
+ \EnotezCurrentSplitTitle
+ - new option: `list-heading'
+2013/08/03 v0.7a - corrected bug: `reset=true' now works as it should
+ - added counter-format `symbols'
+2013/10/31 v0.7b - corrected bug: \acro_command_deprecated:NN should of course
+ be \enotez_command_deprecated:NN
+2014/02/04 v0.7c - added a missing \par to the `paragraph' template for the
+ list
+2015/06/24 v0.8 - bug fix in typesetting the split-headings
+ - new command \NewSplitTitleTag
+2015/07/29 v0.8a - adapt to deprecated choice selection in keys
+2016/01/07 v0.8b - \prop_get:Nn => \prop_item:Nn
+2016/11/08 v0.9 - fix issues #6, #7, and #8
+ - remove caption patching and add \endnotemark and \endnotetext
+2017/04/24 v0.9a - fix wrong format of number in list
+2019/09/30 v0.10 - fix issus #14
+ - don't allow package options any more
+ - implement issue #17: new choices for the totoc option:
+ `auto', `subsection' and `part'
+ - fix issue #18
+ - implement issue #13
+ - implement issue #9
+2019/10/12 v0.10a - remove unnecessary package dependencies
+2020/01/16 v0.10b - adapt to renaming of string case changing functions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/enotez.tlpobj new/tlpkg/tlpobj/enotez.tlpobj
--- old/tlpkg/tlpobj/enotez.tlpobj 2019-02-28 03:35:26.000000000 +0100
+++ new/tlpkg/tlpobj/enotez.tlpobj 2020-03-24 01:57:32.000000000 +0100
@@ -1,6 +1,6 @@
name enotez
category Package
-revision 44024
+revision 54512
shortdesc Support for end-notes
relocated 1
longdesc The package allows nested endnotes, supports hyperref and
@@ -10,10 +10,9 @@
runfiles size=10
RELOC/tex/latex/enotez/enotez.sty
catalogue-also endnote endnotes
-catalogue-contact-bugs https://bitbucket.org/cgnieder/enotez/issues
-catalogue-contact-repository https://bitbucket.org/cgnieder/enotez/
+catalogue-contact-bugs https://github.com/cgnieder/enotez/issues
+catalogue-contact-repository https://github.com/cgnieder/enotez/
catalogue-ctan /macros/latex/contrib/enotez
-catalogue-date 2017-04-24 19:51:11 +0200
catalogue-license lppl1.3
catalogue-topics endnote expl3
-catalogue-version 0.9a
+catalogue-version 0.10b
++++++ enumitem.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/enumitem/README.md new/doc/latex/enumitem/README.md
--- old/doc/latex/enumitem/README.md 2019-02-04 22:36:54.000000000 +0100
+++ new/doc/latex/enumitem/README.md 2019-06-22 23:22:49.000000000 +0200
@@ -1,4 +1,4 @@
-## Enumitem 3.8
+## Enumitem 3.9
This package provides most of the flexibility you may want to customize
the three basic list environments (`enumerate`, `itemize` and
@@ -8,6 +8,8 @@
### Latest changes
```
+3.9 2019-06-20
+ - \DrawEnumitemLabel rewritten
3.8 2019-02-04
- Fix - calc stopped working if loaded after.
- Improved \DrawEnumitemLabel
@@ -36,4 +38,4 @@
________
Javier Bezos --- http://www.texnia.com
-2019/02/04
+2019/06/20
Binary files old/doc/latex/enumitem/enumitem.pdf and new/doc/latex/enumitem/enumitem.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/enumitem/enumitem.tex new/doc/latex/enumitem/enumitem.tex
--- old/doc/latex/enumitem/enumitem.tex 2019-02-04 22:36:54.000000000 +0100
+++ new/doc/latex/enumitem/enumitem.tex 2019-06-22 23:22:49.000000000 +0200
@@ -56,9 +56,10 @@
suggestions go to \href{http://www.texnia.com/enumitem.html}%
{\texttt{http://www.texnia.com/enumitem.html}}.}}
-\date{Version 3.8\\2019/02/04}
+\date{Version 3.9\\2019/06/20}
\IfFileExists{enumitem.sty}{\usepackage{enumitem}}{}
+\IfFileExists{layouts.sty}{\usepackage{layouts}}{}
\addtolength{\topmargin}{-3pc}
\addtolength{\textwidth}{6pc}
@@ -83,8 +84,8 @@
with \New{X.X}\hspace{-.5em}. The most recent features could be still
unstable. Please, report any issues you find on
\texttt{https://github.com/jbezos/enumitem/issues}, which is better
- than just complaining on an e-mail list or a web forum. Feel free to
- fork it and make pull requests.
+ than just complaining on an e-mail list or a web forum. Forking
+ and pull requests are welcome.
\end{note}
\begin{warning}
@@ -161,8 +162,16 @@
\end{example}
\begin{note}
- A way to see how these parameters work is with the |layout| package
+ A way to see how these parameters work is with the |layouts| package
(the manual is named |layman.pdf|).
+ \ifx\listdiagram\notundefined\else
+ See figure \ref{f.drawlist}.
+ \begin{figure}
+ \centering
+ \listdiagram
+ \caption{List parameters}\label{f.drawlist}
+ \end{figure}
+ \fi
\end{note}
\section{Quick reference}
@@ -434,9 +443,9 @@
\New{3.6} If you find these parameters baffling, you are not alone. You
can visualize them by writing |\DrawEnumitemLabel| just before the
first item (or in |first|), which draws 4 rules from top to bottom,
-|leftmargin| (thin), |labelindent| (thick if positive, thin if
-negative), |labelwidth| (thick) and |labelsep| (thick if positive, thin
-if negative). If 0, a rule is not shown.
+|labelindent|, |labelwidth|, |labelsep|, |itemindent| (thin if
+positive, thick if negative); the |leftmargin| is marked with two
+vertical rules.
\end{note}
\begin{desc}
@@ -516,7 +525,7 @@
\begin{note}
With |align=right| (the default), |labelindent=!| and |labelwidth=!|
- behave similarly in practice.
+ behave similarly in practice.
\end{note}
\begin{desc}
@@ -558,7 +567,9 @@
\end{note}
\begin{note}
- |labelwidth=*| and |labelwidth=!| are synonymous.
+ |labelwidth=*| and |labelwidth=!| are synonymous. Use them with care,
+ because they may take negative values, which does not make sense (a
+ warning is shown).
\end{note}
\begin{desc}
@@ -1594,7 +1605,7 @@
\noindent\showsep\hskip\parindent En un lugar de la Mancha, de cuyo nombre no quiero acordarme,
no ha mucho tiempo que viv\'{\i}a un hidalgo de los de
-\begin{enumerate}[leftmargin=*]
+\begin{enumerate}[leftmargin=*]
\item lanza en astillero,
\item adarna antigua,
\item roc\'{\i}n flaco, y
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/enumitem.doc.tlpobj new/tlpkg/tlpobj/enumitem.doc.tlpobj
--- old/tlpkg/tlpobj/enumitem.doc.tlpobj 2019-02-28 03:35:26.000000000 +0100
+++ new/tlpkg/tlpobj/enumitem.doc.tlpobj 2019-06-23 01:38:54.000000000 +0200
@@ -1,9 +1,9 @@
name enumitem.doc
category Package
-revision 49937
+revision 51423
shortdesc doc files of enumitem
relocated 1
-docfiles size=52
+docfiles size=53
RELOC/doc/latex/enumitem/README.md
RELOC/doc/latex/enumitem/enumitem.pdf
RELOC/doc/latex/enumitem/enumitem.tex
++++++ enumitem.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/enumitem/enumitem.sty new/tex/latex/enumitem/enumitem.sty
--- old/tex/latex/enumitem/enumitem.sty 2019-02-04 22:36:54.000000000 +0100
+++ new/tex/latex/enumitem/enumitem.sty 2019-06-22 23:22:49.000000000 +0200
@@ -10,7 +10,7 @@
% ~~~~~~~
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{enumitem}[2019/02/04 v3.8 Customized lists]
+\ProvidesPackage{enumitem}[2019/06/20 v3.9 Customized lists]
% Notes
% ~~~~~
@@ -881,6 +881,13 @@
\enit@calcwidth
\advance\itemindent-\dimen@
\fi}
+
+\def\enit@negwidth{%
+ \ifdim\labelwidth<\z@
+ \PackageWarning{enumitem}%
+ {Negative labelwidth. This does not make much\MessageBreak
+ sense,}%
+ \fi}
% "Normalizing" labels
% ====================
@@ -1369,7 +1376,8 @@
\enit@normlabel\@itemlabel\@itemlabel
\enit@ref
\enit@calcleft
- \enit@before}%
+ \enit@before
+ \enit@negwidth}%
\enit@keyfirst
\fi}
@@ -1405,7 +1413,8 @@
\def\makelabel##1{\enit@align{\enit@format{##1}}}%
\enit@preset{#2}{#1}{#4}%
\enit@calcleft
- \enit@before}%
+ \enit@before
+ \enit@negwidth}%
\enit@keyfirst
\fi}
@@ -1452,7 +1461,8 @@
\enit@svlabel{\enit@format{##1}}%
\aftergroup\enit@postlabel
\fi}%
- \enit@before}%
+ \enit@before
+ \enit@negwidth}%
\enit@keyfirst
\fi}
@@ -1830,34 +1840,35 @@
% | TOOLS |
% +=============================+
+\def\enit@drawrule#1#2#3#4{%
+ \rlap{%
+ \ifdim#1>0pt\relax
+ \vrule width #1 height #2 depth -#3\relax
+ \else\ifdim#1=0pt\relax
+ %
+ \else
+ \hskip#1%
+ \vrule width -#1 height #2 depth -#4\relax
+ \fi\fi}}
+
\def\DrawEnumitemLabel{%
- \ifvmode
- \hbox{\hskip\@totalleftmargin
- \hskip-\leftmargin
- \vrule width \leftmargin height 8pt depth -7pt
- \hskip\itemindent
- \ifdim\labelindent<\z@
- \hskip-\leftmargin
- \vrule width -\labelindent height 6pt depth -5pt
- \hskip\labelindent
- \else
- \hskip-\labelsep
- \hskip-\labelwidth
- \hskip-\labelindent
- \vrule width \labelindent height 6pt depth -4pt
- \fi
- \vrule width \labelwidth height 4pt depth -2pt
- \ifdim\labelsep<\z@
- \hskip\labelsep
- \vrule width -\labelsep height 1pt
- \else
- \vrule width \labelsep height 2pt
- \fi}%
- \else
- \enit@error
- {\string\DrawEnumitemLabel\space must be used in vertical mode}%
- {Very likely, just inserting a blank line before will fix it}%
- \fi}
+ \begingroup
+ \item[]%
+ \hskip-\labelsep
+ \enit(a)drawrule\labelsep{4pt}{3pt}{2.3pt}%
+ \hskip-\labelwidth
+ \enit(a)drawrule\labelwidth{6pt}{5pt}{4.3pt}%
+ \hskip\labelwidth
+ \hskip\labelsep
+ %
+ \hskip-\itemindent
+ \enit(a)drawrule\itemindent{2pt}{1pt}{.3pt}%
+ \rlap{\vrule height 9pt depth .5pt}%
+ \hskip-\leftmargin
+ \rlap{\vrule height 9pt depth .5pt}%
+ \enit(a)drawrule\labelindent{8pt}{7pt}{6.5pt}%
+ % \message{\the\labelindent/\the\labelwidth/\the\labelsep/\the\itemindent}%
+ \endgroup}
% TODO - option 'verbose'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/enumitem.tlpobj new/tlpkg/tlpobj/enumitem.tlpobj
--- old/tlpkg/tlpobj/enumitem.tlpobj 2019-02-28 03:35:26.000000000 +0100
+++ new/tlpkg/tlpobj/enumitem.tlpobj 2019-06-23 01:38:54.000000000 +0200
@@ -1,6 +1,6 @@
name enumitem
category Package
-revision 49937
+revision 51423
shortdesc Control layout of itemize, enumerate, description
relocated 1
longdesc This package provides user control over the layout of the three
@@ -15,7 +15,7 @@
catalogue-contact-home http://www.texnia.com/enumitem.html
catalogue-contact-repository https://github.com/jbezos/enumitem
catalogue-ctan /macros/latex/contrib/enumitem
-catalogue-date 2019-02-04 19:02:13 +0100
+catalogue-date 2019-06-22 16:35:43 +0200
catalogue-license mit
catalogue-topics list
-catalogue-version 3.8
+catalogue-version 3.9
++++++ environ.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/environ.doc.tlpobj new/tlpkg/tlpobj/environ.doc.tlpobj
--- old/tlpkg/tlpobj/environ.doc.tlpobj 2019-02-28 03:35:27.000000000 +0100
+++ new/tlpkg/tlpobj/environ.doc.tlpobj 2020-03-04 23:50:49.000000000 +0100
@@ -1,6 +1,6 @@
name environ.doc
category Package
-revision 33821
+revision 54080
shortdesc doc files of environ
relocated 1
docfiles size=40
++++++ environ.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/environ.tlpobj new/tlpkg/tlpobj/environ.tlpobj
--- old/tlpkg/tlpobj/environ.tlpobj 2019-02-28 03:35:27.000000000 +0100
+++ new/tlpkg/tlpobj/environ.tlpobj 2020-03-04 23:50:49.000000000 +0100
@@ -1,19 +1,18 @@
name environ
category Package
-revision 33821
+revision 54080
shortdesc A new interface for environments in LaTeX
relocated 1
longdesc The package provides the \collect@body command (as in amsmath),
longdesc as well as a \long version \Collect@Body, for collecting the
longdesc body text of an environment. These commands are used to define
longdesc a new author interface to creating new environments. For
-longdesc example: \NewEnviron{test} wraps the entire environment body in
-longdesc square brackets, doing the right thing in ignoring leading and
-longdesc trailing spaces.
+longdesc example, \NewEnviron{test}, wraps the entire environment body
+longdesc in square brackets, doing the right thing in ignoring leading
+longdesc and trailing spaces.
runfiles size=2
RELOC/tex/latex/environ/environ.sty
catalogue-ctan /macros/latex/contrib/environ
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics macro-supp
catalogue-version 0.3
++++++ epigraph.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/epigraph/README new/doc/latex/epigraph/README
--- old/doc/latex/epigraph/README 2009-09-04 02:50:58.000000000 +0200
+++ new/doc/latex/epigraph/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,78 +0,0 @@
-____________________
-The EPIGRAPH package
-
- The epigraph package is designed for typesetting epigraphs --- the
-pithy quotations often found at the start (or end) of a chapter. Both
-single epigraphs and lists of epigraphs are catered for. Various aspects
-are easily configurable.
-
-______________
-Change History
-
-Version 1.5c (2009/09/02)
-- New maintainer (Will Robertson)
-
-Changes in Version 1.5a (2002/10/22)
-- Replaced flushleftright environment by flushepinormal environment
- to avoid clash with the ccaption package's \flushleftright
-
-Changes in Version 1.5 (2000/02/20)
-- Generalised \cleartoevenpage command
-
-Changes in Version 1.4 (2000/01/16)
-- Added flushleftright environment
-
-Changes in Version 1.3 (1999/12/01)
-- Added \dropchapter and \undodrop commands
-
-Changes in Version 1.2 (1999/09/12)
-- Added \cleartoevenpage command
-- Improved documentation
-
-Changes in Version 1.1: (1998/11/29)
-- Added support for epigraphs above chapter titles.
-
------------------------------------------------------------------
- Author: Peter Wilson, Herries Press
- Maintainer: Will Robertson (will dot robertson at latex-project dot org)
- Copyright 1998--2004 Peter R. Wilson
-
- 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: <http://www.latex-project.org/lppl.txt>
-
- This work has the LPPL maintenance status "maintained".
- The Current Maintainer of this work is Will Robertson.
-
- This work consists of the files:
-README (this file)
-epigraph.dtx
-epigraph.ins
-epigraph.pdf (user manual)
- and the derived files:
-epigraph.sty
-
-The distribution consists of the files:
-README (this file)
-epigraph.dtx
-epigraph.ins
-epigraph.pdf (user manual)
-
------------------------------------------------------------------
-
-To install the package:
-- run: latex epigraph.ins (which will generate epigraph.sty)
-- Move epigraph.sty to a location where LaTeX will find it
- (typically in a local texmf tree at tex/latex/***) and refresh the
- file database. See the FAQ on CTAN at help/uk-tex-faq or
- http://www.tug.ac.uk/faq for more information on this.
-
-To process the user manual:
-- run: latex epigraph.dtx
-- run: makeindex -s gind.ist epigraph
-- run: latex epigraph.dtx
-- Print epigraph.dvi for a hardcopy of the package manual
-
-2004/04/22
-Peter Wilson
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/epigraph/README.md new/doc/latex/epigraph/README.md
--- old/doc/latex/epigraph/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/epigraph/README.md 2020-01-02 23:06:59.000000000 +0100
@@ -0,0 +1,89 @@
+# The EPIGRAPH package
+
+The epigraph package is designed for typesetting epigraphs --- the
+pithy quotations often found at the start (or end) of a chapter. Both
+single epigraphs and lists of epigraphs are catered for. Various aspects
+are easily configurable.
+
+## Change History
+
+Version 1.5e (2020/01/02)
+- Try to prevent breaks after epigraphs
+- Add \epigraphnoindent to automatically suppress indentation
+ after all \epigraph commands
+
+Version 1.5d (2011/08/07)
+- Load the nextpage package for \cleartoevenpage
+ (this avoids loading order conflicts)
+
+Version 1.5c (2009/09/02)
+- New maintainer (Will Robertson)
+
+Changes in Version 1.5a (2002/10/22)
+- Replaced flushleftright environment by flushepinormal environment
+ to avoid clash with the ccaption package's \flushleftright
+
+Changes in Version 1.5 (2000/02/20)
+- Generalised \cleartoevenpage command
+
+Changes in Version 1.4 (2000/01/16)
+- Added flushleftright environment
+
+Changes in Version 1.3 (1999/12/01)
+- Added \dropchapter and \undodrop commands
+
+Changes in Version 1.2 (1999/09/12)
+- Added \cleartoevenpage command
+- Improved documentation
+
+Changes in Version 1.1: (1998/11/29)
+- Added support for epigraphs above chapter titles.
+
+## Copyright
+
+ Author: Peter Wilson, Herries Press
+ Maintainer: Will Robertson
+ will dot robertson at latex-project dot org
+ Copyright 1998--2004 Peter R. Wilson
+ 2009--2020 Will Robertson
+
+ 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: <http://www.latex-project.org/lppl.txt>
+
+ This work has the LPPL maintenance status "maintained".
+ The Current Maintainer of this work is Will Robertson.
+
+## Manifest
+
+This work consists of the files:
+* README (this file)
+* epigraph.dtx
+* epigraph.ins
+* epigraph.pdf (user manual)
+and the derived files:
+* epigraph.sty
+
+The distribution consists of the files:
+* README (this file)
+* epigraph.dtx
+* epigraph.ins
+* epigraph.pdf (user manual)
+
+## Installation
+
+To install the package:
+- run: latex epigraph.ins (which will generate epigraph.sty)
+- Move epigraph.sty to a location where LaTeX will find it
+ (typically in a local texmf tree at tex/latex/***) and refresh the
+ file database. See the FAQ on CTAN at help/uk-tex-faq or
+ http://www.tug.ac.uk/faq for more information on this.
+- (or `l3build install`)
+
+To process the user manual:
+- run: latex epigraph.dtx
+- run: makeindex -s gind.ist epigraph
+- run: latex epigraph.dtx
+- (or `l3build doc`)
+
Binary files old/doc/latex/epigraph/epigraph.pdf and new/doc/latex/epigraph/epigraph.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epigraph.doc.tlpobj new/tlpkg/tlpobj/epigraph.doc.tlpobj
--- old/tlpkg/tlpobj/epigraph.doc.tlpobj 2019-02-28 03:35:28.000000000 +0100
+++ new/tlpkg/tlpobj/epigraph.doc.tlpobj 2020-01-03 01:54:38.000000000 +0100
@@ -1,8 +1,8 @@
name epigraph.doc
category Package
-revision 15878
+revision 53298
shortdesc doc files of epigraph
relocated 1
-docfiles size=46
- RELOC/doc/latex/epigraph/README
+docfiles size=78
+ RELOC/doc/latex/epigraph/README.md
RELOC/doc/latex/epigraph/epigraph.pdf
++++++ epigraph.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/epigraph/epigraph.sty new/tex/latex/epigraph/epigraph.sty
--- old/tex/latex/epigraph/epigraph.sty 2009-09-04 02:50:58.000000000 +0200
+++ new/tex/latex/epigraph/epigraph.sty 2020-01-02 23:06:59.000000000 +0100
@@ -23,7 +23,8 @@
%% -----------------------------------------------------------------
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{epigraph}[2009/09/02 v1.5c typesetting epigraphs]
+\ProvidesPackage{epigraph}[2020/01/02 v1.5e typesetting epigraphs]
+\RequirePackage{nextpage}
\newlength{\beforeepigraphskip}
\setlength{\beforeepigraphskip}{.5\baselineskip}
\newlength{\afterepigraphskip}
@@ -33,6 +34,8 @@
\newlength{\epigraphrule}
\setlength{\epigraphrule}{.4\p@}
\newcommand{\epigraphsize}{\small}
+\newif\ifepigraphnoindent
+\newcommand\epigraphnoindent{\epigraphnoindenttrue}
\newcommand{\epigraphflush}{flushright}
\newcommand{\textflush}{flushleft}
\newcommand{\sourceflush}{flushright}
@@ -57,11 +60,21 @@
\newcommand{\@episource}[1]{%
\begin{minipage}{\epigraphwidth}\begin{\sourceflush} #1\end{\sourceflush}
\end{minipage}}
-\newcommand{\epigraph}[2]{\vspace{\beforeepigraphskip}
- {\epigraphsize\begin{\epigraphflush}\begin{minipage}{\epigraphwidth}
- \@epitext{#1}\\ \@episource{#2}
- \end{minipage}\end{\epigraphflush}
- \vspace{\afterepigraphskip}}}
+\newcommand{\epigraph}[2]{%
+ \vspace{\beforeepigraphskip}
+ \vbox{%
+ \epigraphsize
+ \begin{\epigraphflush}
+ \begin{minipage}{\epigraphwidth}
+ \@epitext{#1}\\
+ \@episource{#2}%
+ \end{minipage}%
+ \end{\epigraphflush}%
+ }%
+ \nointerlineskip
+ \vspace*{\afterepigraphskip}%
+ \ifepigraphnoindent\@afterheading\fi
+}
\newcommand{\qitem}[2]{{\raggedright\item \begin{minipage}{\epigraphwidth}
\@epitext{#1}\\ \@episource{#2}
\end{minipage}}}
@@ -75,10 +88,8 @@
\leftmargin\z@ \rightmargin\z@
\let\makelabel\qitemlabel}}%
{\endlist\end{minipage}\end{\epigraphflush}
- \vspace{\afterepigraphskip}}
-\providecommand{\cleartoevenpage}[1][\@empty]{%
- \clearpage%
- \ifodd\c@page\hbox{}#1\clearpage\fi}
+ \vspace{\afterepigraphskip}%
+}
\newcommand{\dropchapter}[1]{%
\let\@epichapapp\@chapapp
\renewcommand{\@chapapp}{\vspace*{#1}\@epichapapp}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epigraph.tlpobj new/tlpkg/tlpobj/epigraph.tlpobj
--- old/tlpkg/tlpobj/epigraph.tlpobj 2019-02-28 03:35:28.000000000 +0100
+++ new/tlpkg/tlpobj/epigraph.tlpobj 2020-01-03 01:54:39.000000000 +0100
@@ -1,6 +1,6 @@
name epigraph
category Package
-revision 15878
+revision 53298
shortdesc A package for typesetting epigraphs
relocated 1
longdesc Epigraphs are the pithy quotations often found at the start (or
@@ -8,8 +8,8 @@
longdesc are catered for. Various aspects are easily configurable.
runfiles size=2
RELOC/tex/latex/epigraph/epigraph.sty
+catalogue-contact-repository https://github.com/wspr/herries-press/
catalogue-ctan /macros/latex/contrib/epigraph
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
catalogue-topics epigram
-catalogue-version 1.5c
+catalogue-version 1.5e
++++++ eplain.doc.tar.xz ++++++
++++ 10910 lines of diff (skipped)
++++++ eplain.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/eplain/btxmac.tex new/texmf-dist/tex/eplain/btxmac.tex
--- old/texmf-dist/tex/eplain/btxmac.tex 2016-05-16 00:07:24.000000000 +0200
+++ new/texmf-dist/tex/eplain/btxmac.tex 2019-05-31 23:46:33.000000000 +0200
@@ -1,14 +1,14 @@
%% @texfile{
%% author = "Karl Berry and Oren Patashnik",
-%% version = "0.99o",
-%% date = "12 May 2016",
+%% version = "0.99p",
+%% date = "30 May 2019",
%% filename = "btxmac.tex",
%% address = "tex-eplain(a)tug.org",
%% supported = "yes",
%% docstring = "Defines macros that make BibTeX work with plain TeX",
%% }
% BibTeX-for-TeX macros for BibTeX 0.99c, TeX 3.0 or later.
-% Copyright 1990, 1991, 1992, 1995, 2005, 2007, 2013, 2016 Karl Berry &
+% Copyright 1990, 1991, 1992, 1995, 2005, 2007, 2013, 2016, 2019 Karl Berry &
% Oren Patashnik.
%
% Unlimited copying and redistribution of this file are permitted as
@@ -144,8 +144,8 @@
% \mbox, since many .bib files use them. This version was
% never actually released, but these changes appear
% starting with 0.99k-18aug05.
-% 18-Aug-05 0.99k-18aug05, made the \emph, etc., definitions effective only
-% if not already defined. Provided
+% 18-Aug-05 0.99k-18aug05, made the \em, \emph, etc., definitions effective
+% only if not already defined. Provided
% \printcite{pre,post}item, \bblitemhook.
% 09-Sep-07 0.99k-09sep07, executed \@citedef in a group to avoid potential
% save-stack overflow.
@@ -156,6 +156,8 @@
% ignored spaces after the optional argument.
% 12-May-16 0.99o, renamed \@newcommand and others to \@btx..., to avoid
% conflict with Babel's file plain.def.
+% 30-May-19 0.99p, one missed rename of \@continuenewcommand to \@btx...,
+% that made \providecommand fail.
%
% The LaTeX-related commands defined in this file include
% (a) the four commands that a user types (\bibliography,
@@ -794,9 +796,9 @@
\def\@btxcommandname{#1}%
%
\expandafter\ifx\@btxcommandname \@undefined
- \let\cs=\@continuenewcommand % undefined, so we'll define it
+ \let\cs=\@btxcontinuenewcommand % undefined, so we'll define it
\else
- \let\cs=\@gobble % already defined, so ignore it
+ \let\cs=\@gobble % already defined, so ignore it
\fi
\@getoptionalarg\cs
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/eplain/eplain.tex new/texmf-dist/tex/eplain/eplain.tex
--- old/texmf-dist/tex/eplain/eplain.tex 2016-05-16 00:07:24.000000000 +0200
+++ new/texmf-dist/tex/eplain/eplain.tex 2019-05-31 23:46:33.000000000 +0200
@@ -1,10 +1,10 @@
%% @texfile{
%% author = "Karl Berry, Steven Smith, Oleg Katsitadze, and others",
-%% version = "3.8",
-%% date = "Thu May 12 09:13:53 PDT 2016",
+%% version = "3.9",
+%% date = "Thu May 30 08:55:47 PDT 2019",
%% filename = "eplain.tex",
%% email = "bug-eplain(a)tug.org",
-%% checksum = "4135 9294 134238",
+%% checksum = "4135 9294 134244",
%% codetable = "ASCII",
%% supported = "yes",
%% docstring = "This file defines macros that extend and expand on
@@ -184,8 +184,8 @@
\fi
%% @texfile{
%% author = "Karl Berry and Oren Patashnik",
-%% version = "0.99o",
-%% date = "10 May 2016",
+%% version = "0.99p",
+%% date = "30 May 2019",
%% filename = "btxmac.tex",
%% address = "tex-eplain(a)tug.org",
%% supported = "yes",
@@ -441,9 +441,9 @@
\long\def\providecommand#1{%
\def\@btxcommandname{#1}%
\expandafter\ifx\@btxcommandname \@undefined
- \let\cs=\@continuenewcommand % undefined, so we'll define it
+ \let\cs=\@btxcontinuenewcommand % undefined, so we'll define it
\else
- \let\cs=\@gobble % already defined, so ignore it
+ \let\cs=\@gobble % already defined, so ignore it
\fi
\@getoptionalarg\cs
}%
@@ -4131,5 +4131,5 @@
\def\fmtname{eplain}%
\def\eplain{t}%
{\edef\plainversion{\fmtversion}%
- \xdef\fmtversion{3.8: 12 May 2016 (and plain \plainversion)}%
+ \xdef\fmtversion{3.9: 30 May 2019 (and plain \plainversion)}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eplain.tlpobj new/tlpkg/tlpobj/eplain.tlpobj
--- old/tlpkg/tlpobj/eplain.tlpobj 2019-02-28 03:35:29.000000000 +0100
+++ new/tlpkg/tlpobj/eplain.tlpobj 2020-03-24 01:57:33.000000000 +0100
@@ -1,25 +1,31 @@
name eplain
category Package
-revision 48634
+revision 54498
shortdesc Extended plain TeX macros
longdesc An extended version of the plain TeX format, adding support for
longdesc bibliographies, tables of contents, enumerated lists, verbatim
longdesc input of files, numbered equations, tables, two-column output,
longdesc footnotes, hyperlinks in PDF output and commutative diagrams.
longdesc Eplain can also load some of the more useful LaTeX packages,
-longdesc notably graphics, graphicx (an extended of version of
-longdesc graphics), color, autopict (a package instance of the LaTeX
-longdesc picture code), psfrag, and url.
+longdesc notably graphics, graphicx (an extended version of graphics),
+longdesc color, autopict (a package instance of the LaTeX picture code),
+longdesc psfrag, and url.
depend pdftex
depend babel
depend cm
-depend dehyph
depend hyphen-base
-depend knuth-lib
depend latex-fonts
+depend l3backend
+depend l3kernel
+depend l3packages
+depend tex-ini-files
+depend unicode-data
+depend dehyph
+depend hyph-utf8
+depend knuth-lib
depend plain
depend eplain.ARCH
-execute AddFormat name=eplain engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *eplain.ini" fmttriggers=babel,cm,dehyph,hyphen-base,knuth-lib,latex-fonts,plain
+execute AddFormat name=eplain engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *eplain.ini" fmttriggers=babel,cm,hyphen-base,latex-fonts,l3backend,l3kernel,l3packages,tex-ini-files,unicode-data,dehyph,hyph-utf8,knuth-lib,plain
runfiles size=50
texmf-dist/tex/eplain/arrow.tex
texmf-dist/tex/eplain/btxmac.tex
@@ -28,7 +34,6 @@
texmf-dist/tex/eplain/eplain.tex
catalogue-contact-home http://tug.org/eplain/
catalogue-ctan /macros/eplain
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license gpl2
catalogue-topics plain-ext format
-catalogue-version 3.8
+catalogue-version 3.9
++++++ epspdf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/info/epspdf.info new/texmf-dist/doc/info/epspdf.info
--- old/texmf-dist/doc/info/epspdf.info 2019-02-05 23:51:58.000000000 +0100
+++ new/texmf-dist/doc/info/epspdf.info 2020-01-21 00:47:22.000000000 +0100
@@ -1,8 +1,8 @@
-This is epspdf.info, produced by makeinfo version 6.5 from epspdf.texi.
+This is epspdf.info, produced by makeinfo version 6.7 from epspdf.texi.
-This manual is for epspdf and epspdftk, version 0.6.4.
+This manual is for epspdf and epspdftk, version 0.6.5.
-Copyright (C) 2006-2019 Siep Kroonenberg.
+Copyright (C) 2006-2020 Siep Kroonenberg.
Copying and distribution of this file, with or without
modification, are permitted in any medium without royalty provided
@@ -19,9 +19,9 @@
Epspdf and epspdftk
*******************
-This manual is for epspdf and epspdftk, version 0.6.4.
+This manual is for epspdf and epspdftk, version 0.6.5.
-Copyright (C) 2006-2019 Siep Kroonenberg.
+Copyright (C) 2006-2020 Siep Kroonenberg.
Copying and distribution of this file, with or without
modification, are permitted in any medium without royalty provided
@@ -71,6 +71,8 @@
* No options for output format visible::
* Ghostscript stackunderflow error::
+* Error message ``pdf_crop failed''::
+* Wrong boundingbox (.eps or .ps output)::
* Part of the graphic gets cut off::
* Fonts look ugly::
* The page has been converted to a bitmap::
@@ -79,7 +81,8 @@
Change history
-* Version 6.4::
+* Version 0.6.5::
+* Version 0.6.4::
* Version 0.6::
* Version 0.5::
* Version 0.4::
@@ -180,6 +183,9 @@
viewers, from which you can select one, but you can also enter one
manually.
+Some viewers require a plugin for eps and PostScript. The GUI does not
+check whether such a plugin is actually installed.
+
For Windows and Mac OS there is no such configuration option. Epspdf
will use the program associated with the file type, which can be
configured outside epspdf.
@@ -230,7 +236,7 @@
Below, we assume that there is a suitable wrapper or symlink for epspdf
on your searchpath. This is the case if you installed epspdf as a TeX
-Live package.
+Live- or MiKTeX package.
Basic usage of epspdf itself:
@@ -453,7 +459,7 @@
in the background.
-File: epspdf.info, Node: Troubleshooting, Next: Change history, Prev: Bitmapped graphics for LaTeX and pdflatex, Up: Top
+File: epspdf.info, Node: Troubleshooting, Next: Requirements, Prev: Bitmapped graphics for LaTeX and pdflatex, Up: Top
5 Troubleshooting
*****************
@@ -462,6 +468,8 @@
* No options for output format visible::
* Ghostscript stackunderflow error::
+* Error message ``pdf_crop failed''::
+* Wrong boundingbox (.eps or .ps output)::
* Part of the graphic gets cut off::
* Fonts look ugly::
* The page has been converted to a bitmap::
@@ -477,7 +485,7 @@
Widen the window, to make the output format radio buttons visible.
-File: epspdf.info, Node: Ghostscript stackunderflow error, Next: Part of the graphic gets cut off, Prev: No options for output format visible, Up: Troubleshooting
+File: epspdf.info, Node: Ghostscript stackunderflow error, Next: Error message ``pdf_crop failed'', Prev: No options for output format visible, Up: Troubleshooting
5.2 Ghostscript stackunderflow error
====================================
@@ -488,19 +496,37 @@
use the "default" or "prepress" target instead.
-File: epspdf.info, Node: Part of the graphic gets cut off, Next: Fonts look ugly, Prev: Ghostscript stackunderflow error, Up: Troubleshooting
+File: epspdf.info, Node: Error message ``pdf_crop failed'', Next: Wrong boundingbox (.eps or .ps output), Prev: Ghostscript stackunderflow error, Up: Troubleshooting
+
+5.3 Error message mentioning failure of pdf_crop
+================================================
+
+Problably, the luatex format has not been generated. Fix this with TeX
+Live Manager or with the MiKTeX Console.
+
+
+File: epspdf.info, Node: Wrong boundingbox (.eps or .ps output), Next: Part of the graphic gets cut off, Prev: Error message ``pdf_crop failed'', Up: Troubleshooting
+
+5.4 Wrong boundingbox (.eps or .ps output)
+==========================================
+
+This may be a bug in pdftops. Do not use pdftops (epspdftk: see
+configuration screen; command-line epspdf: use the "-I" option)
+
+
+File: epspdf.info, Node: Part of the graphic gets cut off, Next: Fonts look ugly, Prev: Wrong boundingbox (.eps or .ps output), Up: Troubleshooting
-5.3 Part of the graphic gets cut off
+5.5 Part of the graphic gets cut off
====================================
-If the PostScript file was generated with the Windows PostScript driver,
-experiment with the PostScript Output option. Don't choose Optimize for
-Speed.
+If the PostScript file was generated with the old Windows PostScript
+driver, experiment with the PostScript Output option. Don't choose
+Optimize for Speed.
File: epspdf.info, Node: Fonts look ugly, Next: The page has been converted to a bitmap, Prev: Part of the graphic gets cut off, Up: Troubleshooting
-5.4 Fonts look ugly
+5.6 Fonts look ugly
===================
If Ghostscript has to do the conversion from pdf to ps then text may not
@@ -512,7 +538,7 @@
File: epspdf.info, Node: The page has been converted to a bitmap, Next: Temporary files are not removed, Prev: Fonts look ugly, Up: Troubleshooting
-5.5 The page has been converted to a bitmap
+5.7 The page has been converted to a bitmap
===========================================
The usual cause is that the page contains features such as transparency
@@ -524,7 +550,7 @@
File: epspdf.info, Node: Temporary files are not removed, Next: Resources for troubleshooting, Prev: The page has been converted to a bitmap, Up: Troubleshooting
-5.6 Temporary files are not removed
+5.8 Temporary files are not removed
===================================
* Command-line: make sure that you did not specify the option '-d'.
@@ -538,7 +564,7 @@
File: epspdf.info, Node: Resources for troubleshooting, Prev: Temporary files are not removed, Up: Troubleshooting
-5.7 Resources for troubleshooting
+5.9 Resources for troubleshooting
=================================
Logfile. The GUI has a button for viewing log output. This same output
@@ -586,23 +612,37 @@
creates a menu shortcut and an uninstaller.
-File: epspdf.info, Node: Change history, Prev: Troubleshooting, Up: Top
+File: epspdf.info, Node: Change history, Prev: Requirements, Up: Top
Appendix B Change history
*************************
* Menu:
-* Version 6.4::
+* Version 0.6.5::
+* Version 0.6.4::
* Version 0.6::
* Version 0.5::
* Version 0.4::
-File: epspdf.info, Node: Version 6.4, Next: Version 0.6, Up: Change history
+File: epspdf.info, Node: Version 0.6.5, Next: Version 0.6.4, Prev: Change history, Up: Change history
-B.1 Version 6.4
-===============
+B.1 Version 0.6.5
+=================
+
+Epspdf: Compatibility change for ghostscript 9.50 and later.
+
+Epspdftk: improvements to viewer selection; does not impact Windows or
+MacOS.
+
+A few updates to the manual, mostly for the troubleshooting section.
+
+
+File: epspdf.info, Node: Version 0.6.4, Next: Version 0.6, Prev: Version 0.6.5, Up: Change history
+
+B.2 Version 0.6.4
+=================
Compatibility changes for luatex 1.9 and later.
@@ -616,9 +656,9 @@
console windows popping up.
-File: epspdf.info, Node: Version 0.6, Next: Version 0.5, Prev: Change history, Up: Change history
+File: epspdf.info, Node: Version 0.6, Next: Version 0.5, Prev: Version 0.6.4, Up: Change history
-B.2 Version 0.6
+B.3 Version 0.6
===============
The command-line backend component has been rewritten in texlua and
@@ -640,7 +680,7 @@
File: epspdf.info, Node: Version 0.5, Next: Version 0.4, Prev: Version 0.6, Up: Change history
-B.3 Version 0.5
+B.4 Version 0.5
===============
The GUI has been rewritten in Tcl/Tk, removing the dependence on the
@@ -677,7 +717,7 @@
File: epspdf.info, Node: Version 0.4, Prev: Version 0.5, Up: Change history
-B.4 Version 0.4
+B.5 Version 0.4
===============
Hi-res boundingboxes are now supported. By default, conversion from eps
@@ -696,40 +736,48 @@
Tag Table:
Node: Top552
-Node: Usage1986
-Node: Overview2189
-Node: Viewing2574
-Node: Conversion options3035
-Ref: gray3182
-Node: Converting3833
-Node: The configuration screen4226
-Node: Command-line usage6313
-Node: Option summary7018
-Node: Notes on PostScript and pdf8325
-Node: Bitmapped and vector8708
-Node: Font embedding9938
-Node: Eps preview headers10393
-Node: Bounding- and other boxes10840
-Node: Orientation11462
-Node: Exporting PostScript or pdf from Windows programs11895
-Node: Bitmapped graphics for LaTeX and pdflatex12848
-Node: Linux13317
-Node: Mac OS14070
-Node: Windows14380
-Node: Troubleshooting15131
-Node: No options for output format visible15555
-Node: Ghostscript stackunderflow error15859
-Node: Part of the graphic gets cut off16365
-Node: Fonts look ugly16743
-Node: The page has been converted to a bitmap17275
-Node: Temporary files are not removed17764
-Node: Resources for troubleshooting18429
-Ref: Documentation19376
-Node: Requirements19694
-Node: Change history20591
-Node: Version 6.420796
-Node: Version 0.621274
-Node: Version 0.522057
-Node: Version 0.423536
+Node: Usage2087
+Node: Overview2290
+Node: Viewing2675
+Node: Conversion options3136
+Ref: gray3283
+Node: Converting3934
+Node: The configuration screen4327
+Node: Command-line usage6538
+Node: Option summary7254
+Node: Notes on PostScript and pdf8561
+Node: Bitmapped and vector8944
+Node: Font embedding10174
+Node: Eps preview headers10629
+Node: Bounding- and other boxes11076
+Node: Orientation11698
+Node: Exporting PostScript or pdf from Windows programs12131
+Node: Bitmapped graphics for LaTeX and pdflatex13084
+Node: Linux13553
+Node: Mac OS14306
+Node: Windows14616
+Node: Troubleshooting15367
+Node: No options for output format visible15870
+Node: Ghostscript stackunderflow error16174
+Node: Error message ``pdf_crop failed''16681
+Node: Wrong boundingbox (.eps or .ps output)17067
+Node: Part of the graphic gets cut off17457
+Node: Fonts look ugly17845
+Node: The page has been converted to a bitmap18377
+Node: Temporary files are not removed18866
+Node: Resources for troubleshooting19531
+Ref: Documentation20478
+Node: Requirements20796
+Node: Change history21693
+Node: Version 0.6.521915
+Node: Version 0.6.422272
+Node: Version 0.622778
+Node: Version 0.523560
+Node: Version 0.425039
End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/epspdf/Changelog new/texmf-dist/doc/support/epspdf/Changelog
--- old/texmf-dist/doc/support/epspdf/Changelog 2019-02-05 23:55:48.000000000 +0100
+++ new/texmf-dist/doc/support/epspdf/Changelog 2020-01-21 00:47:22.000000000 +0100
@@ -1,3 +1,13 @@
+2020-01-09 0.6.5
+
+ Ghostscript invocations: no more .setpdfwrite, which is now
+ deprecated
+
+ epspdftk: improved handling of selection of Unix pdf- and
+ Postscript viewers
+
+ Updates to the manual
+
2019-02-01 0.6.4
pdf_crop: epdf replaced by pdfe if available (LuaTeX >= 1.9)
Binary files old/texmf-dist/doc/support/epspdf/epspdf.pdf and new/texmf-dist/doc/support/epspdf/epspdf.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/epspdf/epspdf.texi new/texmf-dist/doc/support/epspdf/epspdf.texi
--- old/texmf-dist/doc/support/epspdf/epspdf.texi 2019-02-05 23:55:48.000000000 +0100
+++ new/texmf-dist/doc/support/epspdf/epspdf.texi 2020-01-21 00:47:22.000000000 +0100
@@ -29,7 +29,7 @@
@hyphenation{epspdf-tk epspdf}
@end iftex
-@set version 0.6.4
+@set version 0.6.5
@setchapternewpage off
@paragraphindent none
@@ -37,7 +37,7 @@
@copying
This manual is for epspdf and epspdftk, version @value{version}.
-Copyright @copyright{} 2006-2019 Siep Kroonenberg.
+Copyright @copyright{} 2006-2020 Siep Kroonenberg.
@quotation
Copying and distribution of this file, with or without modification,
@@ -114,6 +114,8 @@
* No options for output format visible::
* Ghostscript stackunderflow error::
+* Error message ``pdf_crop failed''::
+* Wrong boundingbox (.eps or .ps output)::
* Part of the graphic gets cut off::
* Fonts look ugly::
* The page has been converted to a bitmap::
@@ -122,7 +124,8 @@
Change history
-* Version 6.4::
+* Version 0.6.5::
+* Version 0.6.4::
* Version 0.6::
* Version 0.5::
* Version 0.4::
@@ -225,6 +228,9 @@
viewers, from which you can select one, but you can also enter one
manually.
+Some viewers require a plugin for eps and PostScript. The GUI
+does not check whether such a plugin is actually installed.
+
For Windows and Mac OS there is no such configuration option. Epspdf
will use the program associated with the file type, which can be
configured outside epspdf.
@@ -268,7 +274,7 @@
Below, we assume that there is a suitable wrapper or symlink for epspdf
on your searchpath. This is the case if you installed epspdf as a TeX
-Live package.
+Live- or MiKTeX package.
Basic usage of epspdf itself:
@@ -465,12 +471,14 @@
Windows Explorer and ``open'' with @emph{bitmap2eps}, which uses sam2p
or bmeps in the background.
-@node Troubleshooting, Change history, Bitmapped graphics for @LaTeX{} and pdflatex, Top
+@node Troubleshooting, Requirements, Bitmapped graphics for @LaTeX{} and pdflatex, Top
@chapter Troubleshooting
@menu
* No options for output format visible::
* Ghostscript stackunderflow error::
+* Error message ``pdf_crop failed''::
+* Wrong boundingbox (.eps or .ps output)::
* Part of the graphic gets cut off::
* Fonts look ugly::
* The page has been converted to a bitmap::
@@ -483,7 +491,7 @@
Widen the window, to make the output format radio buttons visible.
-@node Ghostscript stackunderflow error, Part of the graphic gets cut off, No options for output format visible, Troubleshooting
+@node Ghostscript stackunderflow error, Error message ``pdf_crop failed'', No options for output format visible, Troubleshooting
@section Ghostscript stackunderflow error
Some Ghostscript versions, @emph{e.g.} 9.10, have an error in color
@@ -491,12 +499,24 @@
lead to an error @code{stackunderflow in .setdistillerparams}. If you
run into this, use the ``default'' or ``prepress'' target instead.
-@node Part of the graphic gets cut off, Fonts look ugly, Ghostscript stackunderflow error, Troubleshooting
+@node Error message ``pdf_crop failed'', Wrong boundingbox (.eps or .ps output), Ghostscript stackunderflow error, Troubleshooting
+@section Error message mentioning failure of pdf_crop
+
+Problably, the luatex format has not been generated. Fix this with
+TeX Live Manager or with the MiKTeX Console.
+
+@node Wrong boundingbox (.eps or .ps output), Part of the graphic gets cut off, Error message ``pdf_crop failed'', Troubleshooting
+@section Wrong boundingbox (.eps or .ps output)
+
+This may be a bug in pdftops. Do not use pdftops (epspdftk: see
+configuration screen; command-line epspdf: use the ``-I'' option)
+
+@node Part of the graphic gets cut off, Fonts look ugly, Wrong boundingbox (.eps or .ps output), Troubleshooting
@section Part of the graphic gets cut off
-If the PostScript file was generated with the Windows PostScript driver,
-experiment with the PostScript Output option. Don't choose Optimize for
-Speed.
+If the PostScript file was generated with the old Windows PostScript
+driver, experiment with the PostScript Output option. Don't choose
+Optimize for Speed.
@node Fonts look ugly, The page has been converted to a bitmap, Part of the graphic gets cut off, Troubleshooting
@section Fonts look ugly
@@ -560,7 +580,7 @@
for Windows there is a file pdftops.txt in the distribution zip. TeX
Live includes the man page in pdf format: pdftops.pdf.
-@node Requirements
+@node Requirements, Change history, Troubleshooting, Top
@appendix Requirements
Epspdftk consists of a GUI front end and a command-line back end.
@@ -579,18 +599,29 @@
embedded Tcl/Tk runtime and a regular Windows installer, which also
creates a menu shortcut and an uninstaller.
-@node Change history, , Troubleshooting, Top
+@node Change history, , Requirements, Top
@appendix Change history
@menu
-* Version 6.4::
+* Version 0.6.5::
+* Version 0.6.4::
* Version 0.6::
* Version 0.5::
* Version 0.4::
@end menu
-@node Version 6.4
-@section Version 6.4
+@node Version 0.6.5, Version 0.6.4, Change history, Change history
+@section Version 0.6.5
+
+Epspdf: Compatibility change for ghostscript 9.50 and later.
+
+Epspdftk: improvements to viewer selection; does not impact Windows or
+MacOS.
+
+A few updates to the manual, mostly for the troubleshooting section.
+
+@node Version 0.6.4, Version 0.6, Version 0.6.5, Change history
+@section Version 0.6.4
Compatibility changes for luatex 1.9 and later.
@@ -603,7 +634,7 @@
epspdf.tlu is now invoked via a batchfile. This should prevent black
console windows popping up.
-@node Version 0.6, Version 0.5, Change history, Change history
+@node Version 0.6, Version 0.5, Version 0.6.4, Change history
@section Version 0.6
The command-line backend component has been rewritten in texlua and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/epspdf/images/logo.svg new/texmf-dist/doc/support/epspdf/images/logo.svg
--- old/texmf-dist/doc/support/epspdf/images/logo.svg 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/epspdf/images/logo.svg 2020-01-21 00:47:22.000000000 +0100
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="1052.3622"
+ height="744.09448"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.47pre4 r22446"
+ sodipodi:docname="epspdf.svg"
+ style="display:inline">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ <inkscape:perspective
+ id="perspective2921"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2984"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective3898"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath2886">
+ <path
+ id="path2888"
+ style="fill:none;stroke:#000000;stroke-width:1.15759587;display:inline"
+ d="m 662.69592,363.42152 c 0,148.23849 -120.17108,268.40953 -268.40958,268.40953 -148.2385,0 -268.40954,-120.17104 -268.40954,-268.40953 0,-148.23851 120.17104,-268.40955 268.40954,-268.40955 148.2385,0 268.40958,120.17104 268.40958,268.40955 z m -123.7647,-10e-6 c 0,-79.88516 -64.75972,-144.64488 -144.64488,-144.64488 -79.88517,0 -144.64489,64.75972 -144.64489,144.64488 0,79.88517 64.75972,144.64489 144.64489,144.64489 79.88516,0 144.64488,-64.75972 144.64488,-144.64489 z" />
+ </clipPath>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.1295785"
+ inkscape:cx="404.62267"
+ inkscape:cy="380.57534"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer2"
+ showgrid="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1272"
+ inkscape:window-height="911"
+ inkscape:window-x="402"
+ inkscape:window-y="117"
+ inkscape:window-maximized="0"
+ inkscape:snap-global="false"
+ inkscape:object-paths="true"
+ inkscape:snap-intersection-paths="false"
+ inkscape:snap-page="true" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer2"
+ inkscape:label="Layer"
+ style="display:inline">
+ <g
+ id="g3853"
+ clip-path="url(#clipPath2886)">
+ <path
+ id="path3822"
+ d="m 423.25,469.15625 c -10.09348,1.24175 -20.18906,2.46673 -30.28125,3.71875 -18.4916,31.25922 -36.9755,62.52301 -55.46875,93.78125 18.55393,33.75824 37.05144,67.54777 55.59375,101.3125 27.78142,-3.72777 55.55723,-7.49833 83.34375,-11.1875 -26.58572,-27.90445 -53.14375,-55.83532 -79.71875,-83.75 9.84306,-34.73978 19.69161,-69.478 29.53125,-104.21875 -1,0.11458 -2,0.22917 -3,0.34375 z"
+ style="fill:#0b2817;stroke:none" />
+ <path
+ style="fill:#d40000;stroke:none"
+ d="m 316.05617,71.823338 78.15822,81.661702 -28.70783,102.88966 -27.3834,11.06187 1.51539,-106.43282 -96.3054,-58.82396 72.72302,-30.356452 z"
+ id="path3830"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ id="path3832"
+ d="m 472.3726,655.52027 -78.15822,-81.66169 28.70783,-102.88968 27.3834,-11.06187 -1.51539,106.43283 96.3054,58.82396 -72.72302,30.35645 z"
+ style="fill:#0b2817;stroke:none" />
+ <path
+ id="path3836"
+ d="m 241.96875,100.40625 c -21.83042,16.85792 -43.68483,33.68489 -65.5,50.5625 36.97454,10.86566 73.93656,21.77405 110.90625,32.65625 8.85895,34.99878 17.67974,70.00731 26.5625,105 8.90627,-6.74614 17.84062,-13.45586 26.78125,-20.15625 0.3408,-36.31262 0.75616,-72.62486 1.09375,-108.9375 -32.91375,-19.9839 -65.82147,-39.97811 -98.75,-59.9375 l -0.80274,0.59632 -0.29101,0.21618 z"
+ style="fill:#800000;stroke:none" />
+ <path
+ id="path3838"
+ d="m 472.125,440.53125 c -8.13836,6.11062 -16.25394,12.25194 -24.40625,18.34375 -0.3408,36.31262 -0.75616,72.62486 -1.09375,108.9375 32.90907,20.00202 65.8493,39.95316 98.75,59.96875 22.18542,-17.1381 44.39191,-34.24901 66.5625,-51.40625 -36.97454,-10.86566 -73.93656,-21.77405 -110.90625,-32.65625 -8.84881,-34.99871 -17.65722,-70.00773 -26.53125,-105 -0.79167,0.60417 -1.58333,1.20833 -2.375,1.8125 z"
+ style="fill:none;stroke:none" />
+ <path
+ style="fill:#800000;stroke:none"
+ d="m 180.60315,150.00273 108.51786,31.642 26.58312,103.45898 -18.18379,23.27156 -51.90404,-92.93123 -112.8149,-2.79034 47.80175,-62.65097 z"
+ id="path3842"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ id="path3844"
+ d="m 607.82562,577.34089 -108.51785,-31.642 -26.58313,-103.45898 18.18379,-23.27156 51.90405,92.93123 112.8149,2.79034 -47.80176,62.65097 z"
+ style="fill:#0055d4;stroke:none" />
+ <path
+ id="path3848"
+ d="m 130.75,211.8125 c -10.49227,25.50931 -20.9624,51.02775 -31.46875,76.53125 37.45067,-9.08351 74.91791,-18.09905 112.375,-27.15625 25.1662,25.88587 50.33612,51.76813 75.5,77.65625 4.37516,-10.28715 8.74305,-20.57753 13.09375,-30.875 -17.81224,-31.63098 -35.64932,-63.24804 -53.46875,-94.875 -38.49971,-0.86603 -77.00012,-1.70338 -115.5,-2.5625 l -0.38302,0.92374 -0.14823,0.35751 z"
+ style="fill:#550000;stroke:none" />
+ <path
+ id="path3850"
+ d="m 500.09375,391.28125 c -3.97605,9.36589 -7.97624,18.72165 -11.9375,28.09375 17.82214,31.63127 35.67073,63.24772 53.5,94.875 38.49971,0.86603 77.00012,1.70338 115.5,2.5625 10.6772,-25.93315 21.31525,-51.88246 32,-77.8125 -37.45067,9.08351 -74.91791,18.09905 -112.375,27.15625 -25.1662,-25.88587 -50.33612,-51.76813 -75.5,-77.65625 -0.39583,0.92708 -0.79167,1.85417 -1.1875,2.78125 z"
+ style="fill:#0044aa;stroke:none" />
+ <path
+ style="fill:#550000;stroke:none"
+ d="m 102.38709,285.43458 109.80022,-26.85616 74.75114,76.30654 -4.11184,29.24566 -91.41583,-54.52878 -99.095738,53.99095 10.072048,-78.15821 z"
+ id="path3854"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ id="path3856"
+ d="m 686.04168,441.90904 -109.80022,26.85616 -74.75115,-76.30655 4.11184,-29.24566 91.41584,54.52879 99.09574,-53.99094 -10.07205,78.1582 z"
+ style="fill:#0044aa;stroke:none" />
+ <path
+ id="path3860"
+ d="m 190.21875,307.53125 c -33.42637,18.33463 -66.85842,36.65894 -100.28125,55 3.727767,27.78142 7.498332,55.55723 11.1875,83.34375 27.89398,-26.57536 55.8145,-53.12291 83.71875,-79.6875 34.75009,9.833 69.49943,19.66867 104.25,29.5 -1.30917,-11.09907 -2.70355,-22.18816 -4.0625,-33.28125 -31.26916,-18.482 -62.54438,-36.95375 -93.8125,-55.4375 l -0.87158,0.49026 -0.12842,0.0722 z"
+ style="fill:none;stroke:none" />
+ <path
+ id="path3862"
+ d="M 684.46875,284.1875 C 657.5,309.84375 630.53125,335.5 603.5625,361.15625 c -34.7397,-9.83292 -69.47847,-19.66913 -104.21875,-29.5 1.30917,11.09907 2.70355,22.18816 4.0625,33.28125 31.26916,18.482 62.54438,36.95375 93.8125,55.4375 33.74768,-18.54378 67.5271,-37.03031 101.28125,-55.5625 -3.72777,-27.78142 -7.49833,-55.55723 -11.1875,-83.34375 -0.94792,0.90625 -1.89583,1.8125 -2.84375,2.71875 z"
+ style="fill:#003380;stroke:none" />
+ <path
+ style="fill:#2ca05a;stroke:none"
+ d="m 102.36592,441.83003 81.6617,-78.15822 102.88966,28.70783 11.06187,27.3834 -106.43282,-1.51539 -58.82396,96.3054 -30.35645,-72.72302 z"
+ id="path3866"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ id="path3868"
+ d="m 686.06285,285.5136 -81.66169,78.15822 -102.88968,-28.70783 -11.06187,-27.3834 106.43283,1.51539 58.82396,-96.3054 30.35645,72.72302 z"
+ style="fill:#003380;stroke:none" />
+ <path
+ id="path3872"
+ d="m 189.46875,417.03125 c -19.77769,32.59589 -39.58367,65.17478 -59.34375,97.78125 17.08893,22.22516 34.23322,44.40895 51.375,66.59375 10.86566,-36.97454 21.77405,-73.93656 32.65625,-110.90625 35.00918,-8.85901 70.02824,-17.67932 105.03125,-26.5625 -6.7258,-8.9192 -13.45366,-17.83687 -20.1875,-26.75 -36.31263,-0.35053 -72.62485,-0.77776 -108.9375,-1.125 l -0.52256,0.8526 -0.0712,0.11615 z"
+ style="fill:#217844;stroke:none" />
+ <path
+ id="path3874"
+ d="m 605.84375,149.6875 c -10.53125,35.71875 -21.0625,71.4375 -31.59375,107.15625 -34.99878,8.85895 -70.00731,17.67974 -105,26.5625 6.7258,8.9192 13.45366,17.83687 20.1875,26.75 36.31263,0.35053 72.62485,0.77776 108.9375,1.125 19.97403,-32.91341 39.95665,-65.82184 59.90625,-98.75 -17.07951,-22.22439 -34.21034,-44.41053 -51.34375,-66.59375 -0.36458,1.25 -0.72917,2.5 -1.09375,3.75 z"
+ style="fill:#002255;stroke:none" />
+ <path
+ style="fill:#217844;stroke:none"
+ d="m 180.54531,577.28305 31.642,-108.51786 103.45898,-26.58312 23.27156,18.18379 -92.93123,51.90404 -2.79034,112.8149 -62.65097,-47.80175 z"
+ id="path3878"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ id="path3880"
+ d="m 607.88347,150.06058 -31.642,108.51785 -103.45898,26.58313 -23.27156,-18.18379 92.93123,-51.90405 2.79034,-112.8149 62.65097,47.80176 z"
+ style="fill:#002255;stroke:none" />
+ <path
+ id="path3884"
+ d="m 337.6875,458.09375 c -31.3543,17.66642 -62.70751,35.3348 -94.0625,53 -0.85617,38.52053 -1.68305,77.04177 -2.53125,115.5625 25.94402,10.60347 51.85869,21.28092 77.78125,31.9375 -9.08351,-37.45067 -18.09905,-74.91791 -27.15625,-112.375 25.89614,-25.16635 51.78983,-50.33522 77.6875,-75.5 -10.28715,-4.37516 -20.57753,-8.74305 -30.875,-13.09375 l -0.84375,0.46875 z"
+ style="fill:#16502d;stroke:none" />
+ <path
+ id="path3886"
+ d="m 470.5,72.5625 c 8.73958,36.1875 17.47917,72.375 26.21875,108.5625 -25.89614,25.16635 -51.78983,50.33522 -77.6875,75.5 10.28715,4.37516 20.57753,8.74305 30.875,13.09375 31.64123,-17.81253 63.26906,-35.64899 94.90625,-53.46875 0.85617,-38.52053 1.68305,-77.04177 2.53125,-115.5625 C 521.39973,90.084032 495.48506,79.406582 469.5625,68.75 c 0.3125,1.270833 0.625,2.541667 0.9375,3.8125 z"
+ style="fill:none;stroke:none" />
+ <path
+ style="fill:#16502d;stroke:none"
+ d="M 315.97716,655.49911 289.121,545.69889 l 76.30654,-74.75115 29.24566,4.11184 -54.52878,91.41583 53.99095,99.09574 -78.15821,-10.07204 z"
+ id="path3890"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ id="path3892"
+ d="m 472.45162,71.844518 26.85616,109.800212 -76.30655,74.75116 -29.24566,-4.11184 54.52879,-91.41584 -53.99094,-99.095741 78.1582,10.072049 z"
+ style="fill:#ff0000;stroke:none" />
+ <path
+ id="path3820"
+ d="m 393.96875,59.5625 c -27.32378,3.660109 -54.64045,7.374185 -81.96875,11 26.57646,27.903358 53.12273,55.8355 79.6875,83.75 -9.83292,34.7397 -19.66913,69.47847 -29.5,104.21875 11.09907,-1.30917 22.18816,-2.70355 33.28125,-4.0625 18.4916,-31.25922 36.9755,-62.52301 55.46875,-93.78125 C 432.38357,126.92926 413.88606,93.139727 395.34375,59.375 l -0.99083,0.135113 -0.38417,0.05239 z"
+ style="fill:#d40000;stroke:none" />
+ </g>
+ <path
+ sodipodi:type="arc"
+ style="fill:none;stroke:none"
+ id="path2985"
+ sodipodi:cx="408.40744"
+ sodipodi:cy="364.15735"
+ sodipodi:rx="205.37555"
+ sodipodi:ry="205.37555"
+ d="m 613.78299,364.15735 a 205.37555,205.37555 0 1 1 -410.7511,0 205.37555,205.37555 0 1 1 410.7511,0 z"
+ transform="matrix(1.0258634,0,0,1.0258634,-23.842106,-8.5330716)" />
+ </g>
+</svg>
Binary files old/texmf-dist/doc/support/epspdf/images/main_wx.png and new/texmf-dist/doc/support/epspdf/images/main_wx.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epspdf.doc.tlpobj new/tlpkg/tlpobj/epspdf.doc.tlpobj
--- old/tlpkg/tlpobj/epspdf.doc.tlpobj 2019-02-28 03:35:32.000000000 +0100
+++ new/tlpkg/tlpobj/epspdf.doc.tlpobj 2020-01-21 01:56:23.000000000 +0100
@@ -1,8 +1,8 @@
name epspdf.doc
category Package
-revision 49952
+revision 53472
shortdesc doc files of epspdf
-docfiles size=91
+docfiles size=98
texmf-dist/doc/info/epspdf.info
texmf-dist/doc/support/epspdf/COPYING
texmf-dist/doc/support/epspdf/Changelog
@@ -13,4 +13,6 @@
texmf-dist/doc/support/epspdf/images/config_lnx.png
texmf-dist/doc/support/epspdf/images/epspdf.png
texmf-dist/doc/support/epspdf/images/logo.pdf
+ texmf-dist/doc/support/epspdf/images/logo.svg
+ texmf-dist/doc/support/epspdf/images/main_wx.png
texmf-dist/doc/support/epspdf/pstexi.tex
++++++ epspdf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/epspdf/epspdf.help new/texmf-dist/scripts/epspdf/epspdf.help
--- old/texmf-dist/scripts/epspdf/epspdf.help 2019-02-05 23:51:58.000000000 +0100
+++ new/texmf-dist/scripts/epspdf/epspdf.help 2020-01-21 00:47:22.000000000 +0100
@@ -24,23 +24,26 @@
5 Troubleshooting
5.1 No options for output format visible
5.2 Ghostscript stackunderflow error
- 5.3 Part of the graphic gets cut off
- 5.4 Fonts look ugly
- 5.5 The page has been converted to a bitmap
- 5.6 Temporary files are not removed
- 5.7 Resources for troubleshooting
+ 5.3 Error message mentioning failure of pdf_crop
+ 5.4 Wrong boundingbox (.eps or .ps output)
+ 5.5 Part of the graphic gets cut off
+ 5.6 Fonts look ugly
+ 5.7 The page has been converted to a bitmap
+ 5.8 Temporary files are not removed
+ 5.9 Resources for troubleshooting
Appendix A Requirements
Appendix B Change history
- B.1 Version 6.4
- B.2 Version 0.6
- B.3 Version 0.5
- B.4 Version 0.4
+ B.1 Version 0.6.5
+ B.2 Version 0.6.4
+ B.3 Version 0.6
+ B.4 Version 0.5
+ B.5 Version 0.4
Epspdf and epspdftk
*******************
-This manual is for epspdf and epspdftk, version 0.6.4.
+This manual is for epspdf and epspdftk, version 0.6.5.
-Copyright (C) 2006-2019 Siep Kroonenberg.
+Copyright (C) 2006-2020 Siep Kroonenberg.
Copying and distribution of this file, with or without
modification, are permitted in any medium without royalty provided
@@ -116,6 +119,9 @@
viewers, from which you can select one, but you can also enter one
manually.
+Some viewers require a plugin for eps and PostScript. The GUI does not
+check whether such a plugin is actually installed.
+
For Windows and Mac OS there is no such configuration option. Epspdf
will use the program associated with the file type, which can be
configured outside epspdf.
@@ -163,7 +169,7 @@
Below, we assume that there is a suitable wrapper or symlink for epspdf
on your searchpath. This is the case if you installed epspdf as a TeX
-Live package.
+Live- or MiKTeX package.
Basic usage of epspdf itself:
@@ -346,14 +352,26 @@
error 'stackunderflow in .setdistillerparams'. If you run into this,
use the "default" or "prepress" target instead.
-5.3 Part of the graphic gets cut off
+5.3 Error message mentioning failure of pdf_crop
+================================================
+
+Problably, the luatex format has not been generated. Fix this with TeX
+Live Manager or with the MiKTeX Console.
+
+5.4 Wrong boundingbox (.eps or .ps output)
+==========================================
+
+This may be a bug in pdftops. Do not use pdftops (epspdftk: see
+configuration screen; command-line epspdf: use the "-I" option)
+
+5.5 Part of the graphic gets cut off
====================================
-If the PostScript file was generated with the Windows PostScript driver,
-experiment with the PostScript Output option. Don't choose Optimize for
-Speed.
+If the PostScript file was generated with the old Windows PostScript
+driver, experiment with the PostScript Output option. Don't choose
+Optimize for Speed.
-5.4 Fonts look ugly
+5.6 Fonts look ugly
===================
If Ghostscript has to do the conversion from pdf to ps then text may not
@@ -362,7 +380,7 @@
fonts, the pdftops utility may still handle more cases. It is part of
the xpdf suite and of the Poppler utilities.
-5.5 The page has been converted to a bitmap
+5.7 The page has been converted to a bitmap
===========================================
The usual cause is that the page contains features such as transparency
@@ -371,7 +389,7 @@
Otherwise, set pdf target use and target version both to "default" to
avoid unnecessary conversions: '-T default -N default'
-5.6 Temporary files are not removed
+5.8 Temporary files are not removed
===================================
* Command-line: make sure that you did not specify the option '-d'.
@@ -382,7 +400,7 @@
However, you should have no trouble removing temporary files
manually.
-5.7 Resources for troubleshooting
+5.9 Resources for troubleshooting
=================================
Logfile. The GUI has a button for viewing log output. This same output
@@ -429,8 +447,18 @@
Appendix B Change history
*************************
-B.1 Version 6.4
-===============
+B.1 Version 0.6.5
+=================
+
+Epspdf: Compatibility change for ghostscript 9.50 and later.
+
+Epspdftk: improvements to viewer selection; does not impact Windows or
+MacOS.
+
+A few updates to the manual, mostly for the troubleshooting section.
+
+B.2 Version 0.6.4
+=================
Compatibility changes for luatex 1.9 and later.
@@ -443,7 +471,7 @@
epspdf.tlu is now invoked via a batchfile. This should prevent black
console windows popping up.
-B.2 Version 0.6
+B.3 Version 0.6
===============
The command-line backend component has been rewritten in texlua and
@@ -462,7 +490,7 @@
parameters. The corresponding command-line options are accepted but
have no effect.
-B.3 Version 0.5
+B.4 Version 0.5
===============
The GUI has been rewritten in Tcl/Tk, removing the dependence on the
@@ -496,7 +524,7 @@
The "-info" option now also prints the number of pages for pdf files.
-B.4 Version 0.4
+B.5 Version 0.4
===============
Hi-res boundingboxes are now supported. By default, conversion from eps
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/epspdf/epspdf.tlu new/texmf-dist/scripts/epspdf/epspdf.tlu
--- old/texmf-dist/scripts/epspdf/epspdf.tlu 2019-02-05 23:51:58.000000000 +0100
+++ new/texmf-dist/scripts/epspdf/epspdf.tlu 2020-01-21 00:47:22.000000000 +0100
@@ -11,8 +11,10 @@
0.6.3: compatibility fixes for luatex 0.9x
0.6.4: adaptations for newer versions of LuaTeX and ghostscript;
some refactoring; better handling of some corner cases
+0.6.5: eliminate .setpdfwrite from ghostscript commandlines,
+ since this is now considered obsolete
-Copyright (C) 2006-2019 Siep Kroonenberg
+Copyright (C) 2006-2020 Siep Kroonenberg
siepo at bitmuis nl
@@ -1895,17 +1897,13 @@
-- `distiller' settings
-- these depend on whether final output is pdf
- -- '.setpdfwrite' is just some optimization option for ghostscript
if options.type=='pdf' then
if settings.pdf_target and (settings.pdf_target~='default') then
table.insert(pdf_options, '-dPDFSETTINGS#/'..settings.pdf_target)
end
- if settings.pdf_target=='screen' or settings.pdf_target=='ebook' then
- pdf_tail_options = {'-c', '.setpdfwrite', '-f'}
- -- -f ensures that the input filename is not added to the -c string
- else
+ if settings.pdf_target~='screen' and settings.pdf_target~='ebook' then
pdf_tail_options = {
- '-c', '.setpdfwrite <</NeverEmbed [ ] >> setdistillerparams', '-f'}
+ '-c', '<</NeverEmbed [ ] >> setdistillerparams', '-f'}
end
end
@@ -2228,7 +2226,7 @@
settings.ps_viewer = false
descriptions.ps_viewer =
- 'Epspdftk: viewer for PostScript files; not used on Windows or OS X'
+ 'Epspdftk: viewer for PostScript files; not used on Windows or Mac OS'
settings.pdf_viewer = false
descriptions.pdf_viewer =
@@ -2271,7 +2269,8 @@
pdf_options = {'-sDEVICE#pdfwrite'} -- '-dUseCIEColor' causes serious slowdown
-- options for final conversion to pdf;
-- will be completed after reading settings and options
-pdf_tail_options = {'-c', '.setpdfwrite', '-f'}
+-- -f ensures that the input filename is not added to a -c string
+pdf_tail_options = {'-f'}
gray_options = {'-dProcessColorModel#/DeviceGray',
'-sColorConversionStrategy#Gray'}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/epspdf/epspdftk.tcl new/texmf-dist/scripts/epspdf/epspdftk.tcl
--- old/texmf-dist/scripts/epspdf/epspdftk.tcl 2019-02-05 23:51:58.000000000 +0100
+++ new/texmf-dist/scripts/epspdf/epspdftk.tcl 2020-01-21 00:47:22.000000000 +0100
@@ -3,7 +3,7 @@
# epspdf conversion utility, GUI frontend
#####
-# Copyright (C) 2006-2019 Siep Kroonenberg
+# Copyright (C) 2006-2020 Siep Kroonenberg
# siepo at bitmuis dot nl
#
# This program is free software, licensed under the GNU GPL, >=2.0.
@@ -130,34 +130,38 @@
}
# unix: viewer settings
+ # It may depend on installed plugins whether a pdf viewer
+ # can render postscript.
+ # AFAIK, no such plugins exist for xpdf or mupdf.
+ # chrome and firefox also only render pdf and not postscript.
# configured viewer, if valid, heads the list
if {$::classic_unix} {
- set ::ps_viewers {}
- if {$::settings(ps_viewer) ne "" && [is_prog $::settings(ps_viewer)]} {
- lappend ::ps_viewers $::settings(ps_viewer)
- }
- foreach v {evince okular gv qpdfview} {
- if {$v ne $::settings(ps_viewer) && [is_prog $v]} {
- lappend ::ps_viewers $v
- }
- }
- # puts [join $::ps_viewers " "]
-
set ::pdf_viewers {}
if {$::settings(pdf_viewer) ne "" && [is_prog $::settings(pdf_viewer)]} {
lappend ::pdf_viewers $::settings(pdf_viewer)
}
- foreach v {evince okular mupdf qpdfview texworks xpdf zathura} {
+ foreach v {
+ atril evince okular qpdfview mupdf xpdf zathura gv firefox chrome \
+ chromium chromium-browser} {
if {$v ne $::settings(pdf_viewer) && [is_prog $v]} {
lappend ::pdf_viewers $v
}
}
# puts [join $::pdf_viewers " "]
- if {[llength ::pdf_viewers] == 0 && [llength ::ps_viewers] != 0} {
- lappend ::pdf_viewers [lindex $::ps_viewers 0]
+ set ::ps_viewers {}
+ if {$::settings(ps_viewer) ne "" && [is_prog $::settings(ps_viewer)]} {
+ lappend ::ps_viewers $::settings(ps_viewer)
+ }
+ foreach v $::pdf_viewers {
+ if {$v ne $::settings(ps_viewer) && \
+ $v ni {xpdf mupdf firefox chrome chromium chromium-browser}} {
+ lappend ::ps_viewers $v
+ }
}
+ # puts [join $::ps_viewers " "]
+
if {[llength ::pdf_viewers] == 0} {
tk_messageBox -message "No viewers found"
} elseif {[llength ::ps_viewers] == 0} {
@@ -227,19 +231,30 @@
font create bfont {*}[font configure TkDefaultFont]
font configure bfont -weight bold
-proc update_combo {w vls} {
- upvar $vls vs
+proc update_combo w {
+ # check that a manually supplied entry is actually a program
+ # proc used for postscript- and pdf viewers
+ set vls [$w cget -values]
set new [$w get]
- if {$new ni $vs} {
+ if {$new ni $vls} {
if {[is_prog $new]} {
- set vs [linsert $vs 0 $new]
- $w configure -values $vs
+ set vls [linsert $vls 0 $new]
+ $w configure -values $vls
} else {
- tk_messageBox -title Error -icon error -message "$vl Not a program"
+ tk_messageBox -title Error -icon error -message "$new not a program"
+ raise .config_t
+ focus $w
}
}
}
+proc revert_combo w {
+ # aborts entry of new value
+ if {[$w current] < 0} {
+ $w current 0
+ }
+}
+
### and now the actual GUI ###################################
wm title . "PostScript- and pdf conversions"
@@ -319,11 +334,15 @@
grid [ttk::combobox .config_t.viewf.pdf] -row 1 -column 1 -sticky e
.config_t.viewf.pdf configure -values $::pdf_viewers
.config_t.viewf.pdf configure -textvariable ::settings(pdf_viewer)
- bind .config_t.viewf.pdf <Return> {update_combo %W $::pdf_viewers}
+ bind .config_t.viewf.pdf <Escape> {revert_combo %W}
+ bind .config_t.viewf.pdf <Return> {update_combo %W}
+ bind .config_t.viewf.pdf <FocusOut> {update_combo %W}
grid [ttk::combobox .config_t.viewf.ps] -row 2 -column 1 -sticky e
.config_t.viewf.ps configure -values $::ps_viewers
.config_t.viewf.ps configure -textvariable ::settings(ps_viewer)
- bind .config_t.viewf.ps <Return> {update_combo %W $::ps_viewers}
+ bind .config_t.viewf.ps <Escape> {revert_combo %W}
+ bind .config_t.viewf.ps <Return> {update_combo %W}
+ bind .config_t.viewf.ps <FocusOut> {update_combo %W}
grid columnconfigure .config_t.viewf 1 -weight 1 -pad 2
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epspdf.tlpobj new/tlpkg/tlpobj/epspdf.tlpobj
--- old/tlpkg/tlpobj/epspdf.tlpobj 2019-02-28 03:35:32.000000000 +0100
+++ new/tlpkg/tlpobj/epspdf.tlpobj 2020-01-21 01:56:23.000000000 +0100
@@ -1,6 +1,6 @@
name epspdf
category Package
-revision 49952
+revision 53472
shortdesc Converter for PostScript, EPS and PDF
longdesc Epspdftk.tcl is a GUI ps/eps/pdf converter. Epspdf.tlu, its
longdesc command-line backend, can be used by itself. Options include
@@ -8,14 +8,13 @@
longdesc conversion options are made possible by converting in multiple
longdesc steps.
depend epspdf.ARCH
-runfiles size=32
+runfiles size=33
texmf-dist/scripts/epspdf/epspdf.help
texmf-dist/scripts/epspdf/epspdf.tlu
texmf-dist/scripts/epspdf/epspdf4tk.cmd
texmf-dist/scripts/epspdf/epspdftk.tcl
catalogue-also epstopdf
catalogue-ctan /support/epspdf
-catalogue-date 2019-02-06 12:56:04 +0100
catalogue-license gpl2
catalogue-topics graphics-epspdf
-catalogue-version 0.6.4
+catalogue-version 0.6.5
++++++ eqexpl.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/eqexpl/README.md new/doc/latex/eqexpl/README.md
--- old/doc/latex/eqexpl/README.md 2018-11-13 23:50:57.000000000 +0100
+++ new/doc/latex/eqexpl/README.md 2019-07-01 23:12:25.000000000 +0200
@@ -1,13 +1,13 @@
-Explanation of the formulas in LaTeX
+Align explanation for formulas in LaTeX
========
The package is licenced under Creative Commons Attribution-ShareAlike
4.0 International (CC BY-SA 4.0).
-The package was developed as an answer to question [on tex.stackexchange.com](https://tex.stackexchange.com/q/95838/119485)
+The package was developed as an answer to the question on [tex.stackexchange.com](https://tex.stackexchange.com/q/95838/119485)
-Package `eqexpl` was developed to give the tool to make «perfect»
-explanation to formulas, not just the enumeration.
+The package `eqexpl` was developed to give the tool to make «perfect»
+explanation for formulas, not just the enumeration.
I = U / Rs, (1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/eqexpl/README.ru.md new/doc/latex/eqexpl/README.ru.md
--- old/doc/latex/eqexpl/README.ru.md 2018-11-13 23:50:57.000000000 +0100
+++ new/doc/latex/eqexpl/README.ru.md 2019-07-01 23:12:25.000000000 +0200
@@ -1,10 +1,10 @@
-ÐПÑÑÐœÐµÐœÐžÑ Ðº ÑПÑÐŒÑлаЌ в LaTeX
+ÐÑÑавМОваМОе пПÑÑМеМОй к ÑПÑÐŒÑлаЌ в LaTeX
========
ÐÐ°ÐºÐµÑ ÑаÑпÑПÑÑÑаМÑеÑÑÑ Ð¿ÐŸ лОÑеМзОО Creative Commons
Attribution-ShareAlike 4.0 International (CC BY-SA 4.0).
-ÐÐ°ÐºÐµÑ Ð±Ñл ÑазÑабПÑаМ в каÑеÑÑве ПÑвеÑа Ма вПпÑÐŸÑ [Ма tex.stackexchange.com](https://tex.stackexchange.com/q/95838/119485)
+ÐÐ°ÐºÐµÑ Ð±Ñл ÑазÑабПÑаМ в каÑеÑÑве ПÑвеÑа Ма вПпÑÐŸÑ ÐœÐ° [tex.stackexchange.com](https://tex.stackexchange.com/q/95838/119485)
ÐÐ°ÐºÐµÑ `eqexpl` бÑл ÑазÑабПÑаМ ÐŽÐ»Ñ ÑПгП, ÑÑÐŸÐ±Ñ ÐŸÐ±ÐµÑпеÑОÑÑ Ð²ÐŸÐ·ÐŒÐŸÐ¶ÐœÐŸÑÑÑ
ЎаваÑÑ ÑПÑÐŒÑлаЌ бПлее ПÑÐŒÑÑлеММÑе пПÑÑМеМОÑ, ПÑПÑЌлеМОе кПÑПÑÑÑ
Binary files old/doc/latex/eqexpl/eqexpl.pdf and new/doc/latex/eqexpl/eqexpl.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/eqexpl/eqexpl.tex new/doc/latex/eqexpl/eqexpl.tex
--- old/doc/latex/eqexpl/eqexpl.tex 2018-11-13 23:50:57.000000000 +0100
+++ new/doc/latex/eqexpl/eqexpl.tex 2019-07-01 23:12:25.000000000 +0200
@@ -6,7 +6,7 @@
\begin{document}
-\title{eqexpl}
+\title{eqexpl v. 1.1}
\author{Konstantin Morenko}
\maketitle
@@ -14,13 +14,18 @@
The package is licenced under Creative Commons Attribution-ShareAlike
4.0 International (CC BY-SA 4.0)
+The package use \href{https://semver.org/}{semantic versioning}.
+
\section{The aim of the package}
-The package was developed as an answer to question \href{https://tex.stackexchange.com/q/95838/119485}{on tex.stackexchange.com}
+The package was developed as an answer to the question \href{https://tex.stackexchange.com/q/95838/119485}{on tex.stackexchange.com}
Package was developed to give the tool to make <<perfect>> explanation
for formulas, not just the enumeration.
+This package allows to describe formula's variables in unified through
+the document manner.
+
\section{Similar packages}
Nomencl: \href{http://ctan.org/pkg/nomencl}{http://ctan.org/pkg/nomencl}
@@ -44,7 +49,39 @@
explanation text).
\end{itemize}
-\section{Test list}
+\section{Usage}
+
+First, include package into preamble with
+
+\begin{verbatim}
+ \usepackage{eqexpl}
+\end{verbatim}
+
+Then write a formula and describe the parameters
+
+\begin{equation}
+ E = m c^2
+\end{equation}
+\begin{eqexpl}
+\item{$E$} equivalent energy
+\item{$m$} mass
+\item{$c$} speed of light ($ c \approx 3 \times 10^8 m/s$)
+\end{eqexpl}
+using
+\begin{verbatim}
+ \begin{equation}
+ E = m c^2
+ \end{equation}
+ \begin{eqexpl}
+ \item{$E$} equivalent energy
+ \item{$m$} mass
+ \item{$c$} speed of light ($ c \approx 3 \times 10^8 m/s$)
+ \end{eqexpl}
+\end{verbatim}
+
+\section{Configure and examples}
+
+\subsection{Test list}
\newcommand{\testList}{
\item{U} voltage at the section, V;
@@ -55,13 +92,11 @@
very very very very very very very very very long line;
}
-This list used for all examples:
+This list is used for next examples:
\begin{eqexpl}
\testList
\end{eqexpl}
-\section{Configure and examples}
-
\subsection{Setting eqexplSetSpace}
\noindent Set \verb+\eqexplSetSpace{0mm}+
@@ -102,9 +137,9 @@
\vspace{5mm}
-\noindent Set \verb+\eqexplSetIntro{where we have}+
+\noindent Set \verb+\eqexplSetIntro{in this equation}+
-\eqexplSetIntro{where we have}
+\eqexplSetIntro{in this equation}
\begin{eqexpl}
\testList
\end{eqexpl}
@@ -243,4 +278,19 @@
\eqexplSetItemAlign{r}
+\subsection{Setting custom delimiter for individual items}
+
+\noindent Setting \verb+\item{U}[=]...+ and
+\verb+\item[$\to$]{Rs}...+.
+
+\begin{eqexpl}
+ \item{U}[=] voltage at the section, V;
+ \item{Rs}[$\to$] total section resistance, Ohm.
+ \item{$Very^{46}$}[$\propto$] very very very very very very very
+ very very very very very very very very very very very very very
+ very very very very very very very very very very very very very
+ very very very very very very very very very very very very very
+ long line;
+\end{eqexpl}
+
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eqexpl.doc.tlpobj new/tlpkg/tlpobj/eqexpl.doc.tlpobj
--- old/tlpkg/tlpobj/eqexpl.doc.tlpobj 2019-02-28 03:35:33.000000000 +0100
+++ new/tlpkg/tlpobj/eqexpl.doc.tlpobj 2020-03-04 23:50:49.000000000 +0100
@@ -1,9 +1,9 @@
name eqexpl.doc
category Package
-revision 49151
+revision 54080
shortdesc doc files of eqexpl
relocated 1
-docfiles size=26
+docfiles size=30
RELOC/doc/latex/eqexpl/README.md
RELOC/doc/latex/eqexpl/README.ru.md
RELOC/doc/latex/eqexpl/eqexpl.pdf
++++++ eqexpl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/eqexpl/eqexpl.sty new/tex/latex/eqexpl/eqexpl.sty
--- old/tex/latex/eqexpl/eqexpl.sty 2018-11-13 23:50:57.000000000 +0100
+++ new/tex/latex/eqexpl/eqexpl.sty 2019-07-01 23:12:25.000000000 +0200
@@ -1,5 +1,9 @@
-\ProvidesPackage{eqexpl}[2018/11/11 v.1]
+%% The package is licenced under Creative Commons Attribution-ShareAlike
+%% 4.0 International (CC BY-SA 4.0)
+
+\ProvidesPackage{eqexpl}[2019/05/15 v. 1.1]
\RequirePackage{etoolbox}
+\RequirePackage{xparse}
\RequirePackage{calc}
%% Spaces between elements
@@ -47,7 +51,7 @@
\eqexplSpaceWidth}%
\newtoggle{eqexplFirstItem}%
\toggletrue{eqexplFirstItem}%
- \renewcommand{\item}[1]{%
+ \RenewDocumentCommand{\item}{ m O{\eqexplDelim}}{%
\olditem \makebox[\leftSideWidth]{%
\ifdefempty{\eqexplIntro}{}{
\makebox[\widthof{\eqexplIntro}][l]{\iftoggle{eqexplFirstItem}{\eqexplIntro}{}}%
@@ -55,7 +59,7 @@
}
\makebox[\itemWidth][\eqexplItemAlign]{##1}%
\hspace{\eqexplSpaceWidth}%
- \makebox[\widthof{\eqexplDelim}][c]{\eqexplDelim}%
+ \makebox[\widthof{##2}][c]{##2}%
\hspace{\eqexplSpaceWidth}%
}%
\togglefalse{eqexplFirstItem}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eqexpl.tlpobj new/tlpkg/tlpobj/eqexpl.tlpobj
--- old/tlpkg/tlpobj/eqexpl.tlpobj 2019-02-28 03:35:33.000000000 +0100
+++ new/tlpkg/tlpobj/eqexpl.tlpobj 2020-03-04 23:50:49.000000000 +0100
@@ -1,19 +1,18 @@
name eqexpl
category Package
-revision 49151
+revision 54080
shortdesc Align explanations for formulas
relocated 1
longdesc This package was developed in response to a question on
longdesc https://tex.stackexchange.com. Its purpose is to enable a
-longdesc perfectly formatted explanation of components of a formula.
+longdesc perfectly formatted explanation of components of a formula. The
+longdesc package depends on calc, etoolbox, and xparse.
runfiles size=1
RELOC/tex/latex/eqexpl/eqexpl.sty
catalogue-also nomencl
catalogue-contact-bugs https://github.com/konstantin-morenko/latex-equation-explanation/issues
-catalogue-contact-home https://konstantin-morenko.github.io/latex-equation-explanation/
catalogue-contact-repository https://github.com/konstantin-morenko/latex-equation-explanation
catalogue-ctan /macros/latex/contrib/eqexpl
-catalogue-date 2018-11-15 07:57:03 +0100
catalogue-license cc-by-sa-4
-catalogue-topics alignment
-catalogue-version 1
+catalogue-topics alignment maths
+catalogue-version 1.1
++++++ erewhon.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/erewhon/OFL-FAQ.txt new/doc/fonts/erewhon/OFL-FAQ.txt
--- old/doc/fonts/erewhon/OFL-FAQ.txt 2014-09-30 02:08:26.000000000 +0200
+++ new/doc/fonts/erewhon/OFL-FAQ.txt 2020-03-20 22:26:48.000000000 +0100
@@ -1,11 +1,12 @@
OFL FAQ - Frequently Asked Questions about the SIL Open Font License (OFL)
-Version 1.1-update2 - 23 August 2010
+Version 1.1-update5 - April 2017
+The OFL FAQ is copyright (c) 2005-2017 SIL International.
(See http://scripts.sil.org/OFL for updates)
CONTENTS OF THIS FAQ
1 USING AND DISTRIBUTING FONTS LICENSED UNDER THE OFL
-2 USING OFL FONTS FOR WEB PAGES AND ONLINE WEBFONT SERVICES
+2 USING OFL FONTS FOR WEB PAGES AND ONLINE WEB FONT SERVICES
3 MODIFYING OFL-LICENSED FONTS
4 LICENSING YOUR ORIGINAL FONTS UNDER THE OFL
5 CHOOSING RESERVED FONT NAMES
@@ -15,14 +16,19 @@
9 ABOUT SIL INTERNATIONAL
APPENDIX A - FONTLOG EXAMPLE
-
1 USING AND DISTRIBUTING FONTS LICENSED UNDER THE OFL
-1.1 Can I use the fonts for a book or other print publication?
-Yes. You can mention the font and author in the book's colophon if you wish, but that is not required.
+1.1 Can I use the fonts for a book or other print publication, to create logos or other graphics or even to manufacture objects based on their outlines?
+Yes. You are very welcome to do so. Authors of fonts released under the OFL allow you to use their font software as such for any kind of design work. No additional license or permission is required, unlike with some other licenses. Some examples of these uses are: logos, posters, business cards, stationery, video titling, signage, t-shirts, personalised fabric, 3D-printed/laser-cut shapes, sculptures, rubber stamps, cookie cutters and lead type.
+
+1.1.1 Does that restrict the license or distribution of that artwork?
+No. You remain the author and copyright holder of that newly derived graphic or object. You are simply using an open font in the design process. It is only when you redistribute, bundle or modify the font itself that other conditions of the license have to be respected (see below for more details).
+
+1.1.2 Is any kind of acknowledgement required?
+No. Font authors may appreciate being mentioned in your artwork's acknowledgements alongside the name of the font, possibly with a link to their website, but that is not required.
-1.2 Can the fonts be included with Free/Libre and Open Source Software collections such as GNU/Linux and BSD distributions?
-Yes! Fonts licensed under the OFL can be freely included alongside other software under FLOSS (Free/Libre and Open Source Software) licenses. Since fonts are typically aggregated with, not merged into, existing software, there is little need to be concerned about incompatibility with existing software licenses. You may also repackage the fonts and the accompanying components in a .rpm or .deb package and include them in distribution CD/DVDs and online repositories. (Also see section 5.9 about rebuilding from source.)
+1.2 Can the fonts be included with Free/Libre and Open Source Software collections such as GNU/Linux and BSD distributions and repositories?
+Yes! Fonts licensed under the OFL can be freely included alongside other software under FLOSS (Free/Libre and Open Source Software) licenses. Since fonts are typically aggregated with, not merged into, existing software, there is little need to be concerned about incompatibility with existing software licenses. You may also repackage the fonts and the accompanying components in a .rpm or .deb package (or other similar package formats or installers) and include them in distribution CD/DVDs and online repositories. (Also see section 5.9 about rebuilding from source.)
1.3 I want to distribute the fonts with my program. Does this mean my program also has to be Free/Libre and Open Source Software?
No. Only the portions based on the Font Software are required to be released under the OFL. The intent of the license is to allow aggregation or bundling with software under restricted licensing as well.
@@ -40,7 +46,7 @@
You are very welcome to share open fonts with friends, family and colleagues through removable media. Just remember to include the full font package, including any copyright notices and licensing information as available in OFL.txt. In the case where you sell the font, it has to come bundled with software.
1.8 Can I host the fonts on a web site for others to use?
-Yes, as long as you make the full font package available. In most cases it may be best to point users to the main site that distributes the Original Version so they always get the most recent stable and complete version. See also discussion of webfonts in Section 2.
+Yes, as long as you make the full font package available. In most cases it may be best to point users to the main site that distributes the Original Version so they always get the most recent stable and complete version. See also discussion of web fonts in Section 2.
1.9 Can I host the fonts on a server for use over our internal network?
Yes. If the fonts are transferred from the server to the client computer by means that allow them to be used even if the computer is no longer attached to the network, the full package (copyright notices, licensing information, etc.) should be included.
@@ -58,10 +64,10 @@
No. Referencing or embedding an OFL font in any document does not change the license of the document itself. The requirement for fonts to remain under the OFL does not apply to any document created using the fonts and their derivatives. Similarly, creating any kind of graphic using a font under OFL does not make the resulting artwork subject to the OFL.
1.14 If OFL fonts are extracted from a document in which they are embedded (such as a PDF file), what can be done with them? Is this a risk to author(s)?
-The few utilities that can extract fonts embedded in a PDF will typically output limited amounts of outlines - not a complete font. To create a working font from this method is much more difficult and time consuming than finding the source of the original OFL font. So there is little chance that an OFL font would be extracted and redistributed inappropriately through this method. Even so, copyright laws address any misrepresentation of authorship. All Font Software released under the OFL and marked as such by the author(s) is intended to remain under this license regardless of the distribution method, and cannot be redistributed under any other license. We strongly discourage any font extraction - we recommend directly using the font sources instead - but if you extract font outlines from a document, please be considerate: use your common sense and respect the work of the author(s) and the licensing model.
+The few utilities that can extract fonts embedded in a PDF will typically output limited amounts of outlines - not a complete font. To create a working font from this method is much more difficult and time consuming than finding the source of the original OFL font. So there is little chance that an OFL font would be extracted and redistributed inappropriately through this method. Even so, copyright laws address any misrepresentation of authorship. All Font Software released under the OFL and marked as such by the author(s) is intended to remain under this license regardless of the distribution method, and cannot be redistributed under any other license. We strongly discourage any font extraction - we recommend directly using the font sources instead - but if you extract font outlines from a document, please be considerate: respect the work of the author(s) and the licensing model.
1.15 What about distributing fonts with a document? Within a compressed folder structure? Is it distribution, bundling or embedding?
-Certain document formats may allow the inclusion of an unmodified font within their file structure which consists of a compressed folder containing the various resources forming the document (such as pictures and thumbnails). Including fonts within such a structure is understood as being different from embedding but rather similar to bundling (or mere aggregation) which the license explicitly allows. In this case the font is conveyed unchanged whereas embedding a font usually transforms it from the original format. The OFL does not allow anyone to extract the font from such a structure to then redistribute it under another license. The explicit permission to redistribute and embed does not cancel the requirement for the Font Software to remain under the license chosen by its author(s).
+Certain document formats may allow the inclusion of an unmodified font within their file structure which may consist of a compressed folder containing the various resources forming the document (such as pictures and thumbnails). Including fonts within such a structure is understood as being different from embedding but rather similar to bundling (or mere aggregation) which the license explicitly allows. In this case the font is conveyed unchanged whereas embedding a font usually transforms it from the original format. The OFL does not allow anyone to extract the font from such a structure to then redistribute it under another license. The explicit permission to redistribute and embed does not cancel the requirement for the Font Software to remain under the license chosen by its author(s). Even if the font travels inside the document as one of its assets, it should not lose its authorship information and licensing.
1.16 What about ebooks shipping with open fonts?
The requirements differ depending on whether the fonts are linked, embedded or distributed (bundled or aggregated). Some ebook formats use web technologies to do font linking via @font-face, others are designed for font embedding, some use fonts distributed with the document or reading software, and a few rely solely on the fonts already present on the target system. The license requirements depend on the type of inclusion as discussed in 1.15.
@@ -70,19 +76,36 @@
Yes, but these issues are out-of-scope for the OFL. The license itself neither encourages their use nor prohibits them since such mechanisms are not implemented in the components of the Font Software but through external software. Such restrictions are put in place for many different purposes corresponding to various usage scenarios. One common example is to limit potentially dangerous cross-site scripting attacks. However, in the spirit of libre/open fonts and unrestricted writing systems, we strongly encourage open sharing and reuse of OFL fonts, and the establishment of an environment where such restrictions are unnecessary. Note that whether you wish to use such mechanisms or you prefer not to, you must still abide by the rules set forth by the OFL when using fonts released by their authors under this license. Derivative fonts must be licensed under the OFL, even if they are part of a service for which you charge fees and/or for which access to source code is restricted. You may not sell the fonts on their own - they must be part of a larger software package, bundle or subscription plan. For example, even if the OFL font is distributed in a software package or via an online service using a DRM mechanism, the user would still have the right to extract that font, use, study, modify and redistribute it under the OFL.
1.18 I've come across a font released under the OFL. How can I easily get more information about the Original Version? How can I know where it stands compared to the Original Version or other Modified Versions?
-Consult the copyright statement(s) in the license for ways to contact the original authors. Consult the FONTLOG for information on how the font differs from the Original Version, and get in touch with the various contributors via the information in the acknowledgement section. Please consider using the Original Versions of the fonts whenever possible.
+Consult the copyright statement(s) in the license for ways to contact the original authors. Consult the FONTLOG (see section 6 for more details and examples) for information on how the font differs from the Original Version, and get in touch with the various contributors via the information in the acknowledgement section. Please consider using the Original Versions of the fonts whenever possible.
-1.19 What do you mean in condition 4? Can you provide examples of abusive promotion / endorsement / advertisement vs. normal acknowledgement?
+1.19 What do you mean in condition 4 of the OFL's permissions and conditions? Can you provide examples of abusive promotion / endorsement / advertisement vs. normal acknowledgement?
The intent is that the goodwill and reputation of the author(s) should not be used in a way that makes it sound like the original author(s) endorse or approve of a specific Modified Version or software bundle. For example, it would not be right to advertise a word processor by naming the author(s) in a listing of software features, or to promote a Modified Version on a web site by saying "designed by ...". However, it would be appropriate to acknowledge the author(s) if your software package has a list of people who deserve thanks. We realize that this can seem to be a grey area, but the standard used to judge an acknowledgement is that if the acknowledgement benefits the author(s) it is allowed, but if it primarily benefits other parties, or could reflect poorly on the author(s), then it is not.
+1.20 I'm writing a small app for mobile platforms, do I need to include the whole package?
+If you bundle a font under the OFL with your mobile app you must comply with the terms of the license. At a minimum you must include the copyright statement, the license notice and the license text. A mention of this information in your About box or Changelog, with a link to where the font package is from, is good practice, and the extra space needed to carry these items is very small. You do not, however, need to include the full contents of the font package - only the fonts you use and the copyright and license that apply to them. For example, if you only use the regular weight in your app, you do not need to include the italic and bold versions.
+
+1.21 What about including OFL fonts by default in my firmware or dedicated operating system?
+Many such systems are restricted and turned into appliances so that users cannot study or modify them. Using open fonts to increase quality and language coverage is a great idea, but you need to be aware that if there is a way for users to extract fonts you cannot legally prevent them from doing that. The fonts themselves, including any changes you make to them, must be distributed under the OFL even if your firmware has a more restrictive license. If you do transform the fonts and change their formats when you include them in your firmware you must respect any names reserved by the font authors via the RFN mechanism and pick your own font name. Alternatively if you directly add a font under the OFL to the font folder of your firmware without modifying or optimizing it you are simply bundling the font like with any other software collection, and do not need to make any further changes.
+
+1.22 Can I make and publish CMS themes or templates that use OFL fonts? Can I include the fonts themselves in the themes or templates? Can I sell the whole package?
+Yes, you are very welcome to integrate open fonts into themes and templates for your preferred CMS and make them more widely available. Remember that you can only sell the fonts and your CMS add-on as part of a software bundle. (See 1.4 for details and examples about selling bundles).
+
+1.23 Can OFL fonts be included in services that deliver fonts to the desktop from remote repositories? Even if they contain both OFL and non-OFL fonts?
+Yes. Some foundries have set up services to deliver fonts to subscribers directly to desktops from their online repositories; similarly, plugins are available to preview and use fonts directly in your design tool or publishing suite. These services may mix open and restricted fonts in the same channel, however they should make a clear distinction between them to users. These services should also not hinder users (such as through DRM or obfuscation mechanisms) from extracting and using the OFL fonts in other environments, or continuing to use OFL fonts after subscription terms have ended, as those uses are specifically allowed by the OFL.
-2 USING OFL FONTS FOR WEBPAGES AND ONLINE WEBFONT SERVICES
+1.24 Can services that provide or distribute OFL fonts restrict my use of them?
+No. The terms of use of such services cannot replace or restrict the terms of the OFL, as that would be the same as distributing the fonts under a different license, which is not allowed. You are still entitled to use, modify and redistribute them as the original authors have intended outside of the sole control of that particular distribution channel. Note, however, that the fonts provided by these services may differ from the Original Versions.
+
+
+2 USING OFL FONTS FOR WEBPAGES AND ONLINE WEB FONT SERVICES
+
+NOTE: This section often refers to a separate paper on 'Web Fonts & RFNs'. This is available at http://scripts.sil.org/OFL_web_fonts_and_RFNs
2.1 Can I make webpages using these fonts?
-Yes! Go ahead! Using CSS (Cascading Style Sheets) is recommended. Your three best options:
+Yes! Go ahead! Using CSS (Cascading Style Sheets) is recommended. Your three best options are:
- referring directly in your stylesheet to open fonts which may be available on the user's system
- providing links to download the full package of the font - either from your own website or from elsewhere - so users can install it themselves
-- using @font-face to distribute the font directly to browsers. This is recommended and explicitly allowed by the licensing model because it is distribution. The font file itself is distributed with other components of the webpage. It is not embedded in the webpage but referenced through a web address which will cause the browser to retrieve and use the corresponding font to render the webpage (see 1.11 and 1.15 for details related to embedding fonts into documents). As you take advantage of the @font-face cross-platform standard, be aware that webfonts are often tuned for a web environment and not intended for installation and use outside a browser. The reasons in favour of using webfonts are to allow design of dynamic text elements instead of static graphics, to make it easier for content to be localized and translated, indexed and searched, and all this with cross-platform open standards without depending on restricted extensions or plugins. You should check the CSS cascade (the order in which fonts are being called or delivered to your users) when testing.
+- using @font-face to distribute the font directly to browsers. This is recommended and explicitly allowed by the licensing model because it is distribution. The font file itself is distributed with other components of the webpage. It is not embedded in the webpage but referenced through a web address which will cause the browser to retrieve and use the corresponding font to render the webpage (see 1.11 and 1.15 for details related to embedding fonts into documents). As you take advantage of the @font-face cross-platform standard, be aware that web fonts are often tuned for a web environment and not intended for installation and use outside a browser. The reasons in favour of using web fonts are to allow design of dynamic text elements instead of static graphics, to make it easier for content to be localized and translated, indexed and searched, and all this with cross-platform open standards without depending on restricted extensions or plugins. You should check the CSS cascade (the order in which fonts are being called or delivered to your users) when testing.
2.2 Can I make and use WOFF (Web Open Font Format) versions of OFL fonts?
Yes, but you need to be careful. A change in font format normally is considered modification, and Reserved Font Names (RFNs) cannot be used. Because of the design of the WOFF format, however, it is possible to create a WOFF version that is not considered modification, and so would not require a name change. You are allowed to create, use and distribute a WOFF version of an OFL font without changing the font name, but only if:
@@ -94,28 +117,52 @@
Please note that most WOFF conversion tools and online services do not meet the two requirements listed above, and so their output must be considered a Modified Version. So be very careful and check to be sure that the tool or service you're using is compressing unchanged data and completely and accurately reflecting the original font metadata.
-2.3 What about other webfont formats such as EOT/EOTLite/CWT/etc.?
-In most cases these formats alter the original font data more than WOFF, and do not completely support appropriate metadata, so their use must be considered modification and RFNs may not be used.
+2.3 What about other web font formats such as EOT/EOTLite/CWT/etc.?
+In most cases these formats alter the original font data more than WOFF, and do not completely support appropriate metadata, so their use must be considered modification and RFNs may not be used. However, there may be certain formats or usage scenarios that may allow the use of RFNs. See http://scripts.sil.org/OFL_web_fonts_and_RFNs
+
+2.4 Can I make OFL fonts available through web font online services?
+Yes, you are welcome to include OFL fonts in online web font services as long as you properly meet all the conditions of the license. The origin and open status of the font should be clear among the other fonts you are hosting. Authorship, copyright notices and license information must be sufficiently visible to your users or subscribers so they know where the font comes from and the rights granted by the author(s). Make sure the font file contains the needed copyright notice(s) and licensing information in its metadata. Please double-check the accuracy of every field to prevent contradictory information. Other font formats, including EOT/EOTLite/CWT and superior alternatives like WOFF, already provide fields for this information. Remember that if you modify the font within your library or convert it to another format for any reason the OFL restrictions apply and you need to change the names accordingly. Please respect the author's wishes as expressed in the OFL and do not misrepresent original designers and their work. Don't lump quality open fonts together with dubious freeware or public domain fonts. Consider how you can best work with the original designers and foundries, support their efforts and generate goodwill that will benefit your service. (See 1.17 for details related to URL-based access restrictions methods or DRM mechanisms).
+
+2.5 Some web font formats and services provide ways of "optimizing" the font for a particular website or web application; is that allowed?
+Yes, it is permitted, but remember that these optimized versions are Modified Versions and so must follow OFL requirements like appropriate renaming. Also you need to bear in mind the other important parameters beyond compression, speed and responsiveness: you need to consider the audience of your particular website or web application, as choosing some optimization parameters may turn out to be less than ideal for them. Subsetting by removing certain glyphs or features may seriously limit functionality of the font in various languages that your users expect. It may also introduce degradation of quality in the rendering or specific bugs on the various target platforms compared to the original font from upstream. In other words, remember that one person's optimized font may be another person's missing feature. Various advanced typographic features (OpenType, Graphite or AAT) are also available through CSS and may provide the desired effects without the need to modify the font.
+
+2.6 Is subsetting a web font considered modification?
+Yes. Removing any parts of the font when delivering a web font to a browser, including unused glyphs and smart font code, is considered modification. This is permitted by the OFL but would not normally allow the use of RFNs. Some newer subsetting technologies may be able to subset in a way that allows users to effectively have access to the complete font, including smart font behaviour. See 2.8 and http://scripts.sil.org/OFL_web_fonts_and_RFNs
-2.4 Can I make OFL fonts available through webfont online services?
-Yes, you are welcome to include OFL fonts in online webfont services as long as you properly meet all the conditions of the license. The origin and open status of the font should be clear among the other fonts you are hosting. Authorship, copyright notices and license information must be sufficiently visible to your users or subscribers so they know where the font comes from and the rights granted by the author(s). Make sure the font file contains the needed copyright notice(s) and licensing information in its metadata. Please double-check the accuracy of every field to prevent contradictory information. Other font formats, including EOT/EOTLite/CWT and superior alternatives like WOFF, already provide fields for this information. Remember that if you modify the font within your library or convert it to another format for any reason the OFL restrictions apply and you need to change the names accordingly. Please respect the author's wishes as expressed in the OFL and do not misrepresent original designers and their work. Don't lump quality open fonts together with dubious freeware or public domain fonts. Consider how you can best work with the original designers and foundries, support their efforts and generate goodwill that will benefit your service. (See 1.17 for details related to URL-based access restrictions methods or DRM mechanisms).
+2.7 Are there any situations in which a modified web font could use RFNs?
+Yes. If a web font is optimized only in ways that preserve Functional Equivalence (see 2.8), then it may use RFNs, as it reasonably represents the Original Version and respects the intentions of the author(s) and the main purposes of the RFN mechanism (avoids collisions, protects authors, minimizes support, encourages derivatives). However this is technically very difficult and often impractical, so a much better scenario is for the web font service or provider to sign a separate agreement with the author(s) that allows the use of RFNs for Modified Versions.
-2.5 Can I make and publish CMS themes or templates that use OFL fonts? Can I include the fonts themselves in the themes or templates? Can I sell the whole package?
-Yes, you are very welcome to integrate open fonts into themes and templates for your preferred CMS and make them more widely available. Be aware that you can only sell the fonts and your CMS add-on as part of a software bundle. (See 1.4 for details and examples about selling bundles).
+2.8 How do you know if an optimization to a web font preserves Functional Equivalence?
+Functional Equivalence is described in full in the 'Web fonts and RFNs' paper at http://scripts.sil.org/OFL_web_fonts_and_RFNs, in general, an optimized font is deemed to be Functionally Equivalent (FE) to the Original Version if it:
-2.6 Some webfont formats and services provide ways of "optimising" the font for a particular website or web application; is that allowed?
-Yes, it is permitted, but remember that these optimised versions are Modified Versions and so must follow OFL requirements like appropriate renaming. Also you need to bear in mind the other important parameters beyond compression, speed and responsiveness: you need to consider the audience of your particular website or web application, as choosing some optimisation parameters may turn out to be less than ideal for them. Subsetting by removing certain glyphs or features may seriously limit functionality of the font in various languages used by your users. It may also introduce degradation of quality in the rendering or specific bugs on the various platforms compared to the original font. In other words, remember that one person's optimised font may be another person's missing feature. Various advanced typographic features are also available through CSS and may provide the desired effects without the need to modify the font.
+- Supports the same full character inventory. If a character can be properly displayed using the Original Version, then that same character, encoded correctly on a web page, will display properly.
+- Provides the same smart font behavior. Any dynamic shaping behavior that works with the Original Version should work when optimized, unless the browser or environment does not support it. There does not need to be guaranteed support in the client, but there should be no forced degradation of smart font or shaping behavior, such as the removal or obfuscation of OpenType, Graphite or AAT tables.
+- Presents text with no obvious degradation in visual quality. The lettershapes should be equally (or more) readable, within limits of the rendering platform.
+- Preserves original author, project and license metadata. At a minimum, this should include: Copyright and authorship; The license as stated in the Original Version, whether that is the full text of the OFL or a link to the web version; Any RFN declarations; Information already present in the font or documentation that points back to the Original Version, such as a link to the project or the author's website.
+
+If an optimized font meets these requirements, and so is considered to be FE, then it's very likely that the original author would feel that the optimized font is a good and reasonable equivalent. If it falls short of any of these requirements, the optimized font does not reasonably represent the Original Version, and so should be considered to be a Modified Version. Like other Modified Versions, it would not be allowed to use any RFNs and you simply need to pick your own font name.
+
+2.9 Isn't use of web fonts another form of embedding?
+No. Unlike embedded fonts in a PDF, web fonts are not an integrated part of the document itself. They are not specific to a single document and are often applied to thousands of documents around the world. The font data is not stored alongside the document data and often originates from a different location. The ease by which the web fonts used by a document may be identified and downloaded for desktop use demonstrates that they are philosophically and technically separate from the web pages that specify them. See http://scripts.sil.org/OFL_web_fonts_and_RFNs
+
+2.10 So would it be better to not use RFNs at all if you want your font to be distributed by a web fonts service?
+No. Although the OFL does not require authors to use RFNs, the RFN mechanism is an important part of the OFL model and completely compatible with web font services. If that web font service modifies the fonts, then the best solution is to sign a separate agreement for the use of any RFNs. It is perfectly valid for an author to not declare any RFNs, but before they do so they need to fully understand the benefits they are giving up, and the overall negative effect of allowing many different versions bearing the same name to be widely distributed. As a result, we don't generally recommend it.
+
+2.11 What should an agreement for the use of RFNs say? Are there any examples?
+There is no prescribed format for this agreement, as legal systems vary, and no recommended examples. Authors may wish to add specific clauses to further restrict use, require author review of Modified Versions, establish user support mechanisms or provide terms for ending the agreement. Such agreements are usually not public, and apply only to the main parties. However, it would be very beneficial for web font services to clearly state when they have established such agreements, so that the public understands clearly that their service is operating appropriately.
+
+See the separate paper on 'Web Fonts & RFNs' for in-depth discussion of issues related to the use of RFNs for web fonts. This is available at http://scripts.sil.org/OFL_web_fonts_and_RFNs
3 MODIFYING OFL-LICENSED FONTS
3.1 Can I change the fonts? Are there any limitations to what things I can and cannot change?
-You are allowed to change anything, as long as such changes do not violate the terms of the license. In other words, you are not allowed to remove the copyright statement(s) from the font, but you could put additional information into it that covers your contribution.
+You are allowed to change anything, as long as such changes do not violate the terms of the license. In other words, you are not allowed to remove the copyright statement(s) from the font, but you could put additional information into it that covers your contribution. See the placeholders in the OFL header template for recommendations on where to add your own statements. (Remember that, when authors have reserved names via the RFN mechanism, you need to change the internal names of the font to your own font name when making your modified version even if it is just a small change.)
3.2 I have a font that needs a few extra glyphs - can I take them from an OFL licensed font and copy them into mine?
Yes, but if you distribute that font to others it must be under the OFL, and include the information mentioned in condition 2 of the license.
-3.3 Can I charge people for my additional work? In other words, if I add a bunch of special glyphs and/or OpenType/Graphite code, can I sell the enhanced font?
+3.3 Can I charge people for my additional work? In other words, if I add a bunch of special glyphs or OpenType/Graphite/AAT code, can I sell the enhanced font?
Not by itself. Derivative fonts must be released under the OFL and cannot be sold by themselves. It is permitted, however, to include them in a larger software package (such as text editors, office suites or operating systems), even if the larger package is sold. In that case, you are strongly encouraged, but not required, to also make that derived font easily and freely available outside of the larger package.
3.4 Can I pay someone to enhance the fonts for my use and distribution?
@@ -128,7 +175,10 @@
No, but please consider sharing your improvements with others. You may find that you receive in return more than what you gave.
3.7 If a trademark is claimed in the OFL font, does that trademark need to remain in modified fonts?
-Yes, any trademark notices must remain in any derivative fonts to respect trademark laws, but you may add any additional trademarks you claim, officially registered or not. For example if an OFL font called "Foo" contains a notice that "Foo is a trademark of Acme", then if you rename the font to "Bar" when creating a Modified Version, the new trademark notice could say "Foo is a trademark of Acme Inc. - Bar is a trademark of Roadrunner Technologies Ltd.". Trademarks work alongside the OFL and are not subject to the terms of the licensing agreement. Please refer to the appropriate trademark laws.
+Yes. Any trademark notices must remain in any derivative fonts to respect trademark laws, but you may add any additional trademarks you claim, officially registered or not. For example if an OFL font called "Foo" contains a notice that "Foo is a trademark of Acme", then if you rename the font to "Bar" when creating a Modified Version, the new trademark notice could say "Foo is a trademark of Acme Inc. - Bar is a trademark of Roadrunner Technologies Ltd.". Trademarks work alongside the OFL and are not subject to the terms of the licensing agreement. The OFL does not grant any rights under trademark law. Bear in mind that trademark law varies from country to country and that there are no international trademark conventions as there are for copyright. You may need to significantly invest in registering and defending a trademark for it to remain valid in the countries you are interested in. This may be costly for an individual independent designer.
+
+3.8 If I commit changes to a font (or publish a branch in a DVCS) as part of a public open source software project, do I have to change the internal font names?
+Only if there are declared RFNs. Making a public commit or publishing a public branch is effectively redistributing your modifications, so any change to the font will require that you do not use the RFNs. Even if there are no RFNs, it may be useful to change the name or add a suffix indicating that a particular version of the font is still in development and not released yet. This will clearly indicate to users and fellow designers that this particular font is not ready for release yet. See section 5 for more details.
4 LICENSING YOUR ORIGINAL FONTS UNDER THE OFL
@@ -139,35 +189,37 @@
4.2 What do I have to do to apply the OFL to my font?
If you want to release your fonts under the OFL, we recommend you do the following:
-4.2.1 Put your copyright and Reserved Font Names information at the beginning of the main OFL.txt file in place of the dedicated placeholders. Include this file in your release package.
+4.2.1 Put your copyright and Reserved Font Names information at the beginning of the main OFL.txt file in place of the dedicated placeholders (marked with the <> characters). Include this file in your release package.
-4.2.2 Put your copyright and the OFL text with Reserved Font Names into your font files (the copyright and license fields). A link to the OFL text on the OFL web site is an acceptable (but not recommended) alternative. Also add this information to any other components (build scripts, glyph databases, documentation, test files, etc). Depending on the format of your fonts and sources, you can use template human-readable headers or machine-readable metadata.
+4.2.2 Put your copyright and the OFL text with your chosen Reserved Font Name(s) into your font files (the copyright and license fields). A link to the OFL text on the OFL web site is an acceptable (but not recommended) alternative. Also add this information to any other components (build scripts, glyph databases, documentation, test files, etc). Accurate metadata in your font files is beneficial to you as an increasing number of applications are exposing this information to the user. For example, clickable links can bring users back to your website and let them know about other work you have done or services you provide. Depending on the format of your fonts and sources, you can use template human-readable headers or machine-readable metadata. You should also double-check that there is no conflicting metadata in the font itself contradicting the license, such as the fstype bits in the os2 table or fields in the name table.
-4.2.3 Write an initial FONTLOG.txt for your font and include it in the release package.
+4.2.3 Write an initial FONTLOG.txt for your font and include it in the release package (see Section 6 and Appendix A for details including a template).
-4.2.4 Include the relevant practical documentation on the license by including the OFL-FAQ.txt in your package.
+4.2.4 Include the relevant practical documentation on the license by adding the current OFL-FAQ.txt file in your package.
+
+4.2.5 If you wish you can use the OFL graphics (http://scripts.sil.org/OFL_logo) on your website.
4.3 Will you make my font OFL for me?
-We won't do the work for you. We can, however, try to answer your questions, unfortunately we do not have the resources to review and check your font packages for correct use of the OFL.
+We won't do the work for you. We can, however, try to answer your questions, unfortunately we do not have the resources to review and check your font packages for correct use of the OFL. We recommend you turn to designers, foundries or consulting companies with experience in doing open font design to provide this service to you.
4.4 Will you distribute my OFL font for me?
-No, although if the font is of sufficient quality and general interest we may include a link to it on our partial list of OFL fonts on the OFL web site. You may wish to consider other open font catalogs or hosting services, such as the Unifont Font Guide (http://unifont.org/fontguide), The League of Movable Type (http://theleagueofmovabletype.com), Kernest (http://kernest.com/) or the Open Font Library (http://openfontlibrary.org/), which despite the name has no direct relationship to the OFL or SIL. We do not endorse any particular catalog or hosting service - it is your responsibility to determine if the service is right for you.
+No, although if the font is of sufficient quality and general interest we may include a link to it on our partial list of OFL fonts on the OFL web site. You may wish to consider other open font catalogs or hosting services, such as the Unifont Font Guide (http://unifont.org/fontguide), The League of Movable Type (http://theleagueofmovabletype.com) or the Open Font Library (http://openfontlibrary.org/), which despite the name has no direct relationship to the OFL or SIL. We do not endorse any particular catalog or hosting service - it is your responsibility to determine if the service is right for you and if it treats authors with fairness.
4.5 Why should I use the OFL for my fonts?
-- to meet needs for fonts that can be modified to support minority languages
+- to meet needs for fonts that can be modified to support lesser-known languages
- to provide a legal and clear way for people to respect your work but still use it (and reduce piracy)
- to involve others in your font project
- to enable your fonts to be expanded with new weights and improved writing system/language support
-- to allow more technical font developers to add features to your design (such as OpenType and Graphite support)
+- to allow more technical font developers to add features to your design (such as OpenType, Graphite or AAT support)
- to renew the life of an old font lying on your hard drive with no business model
- to allow your font to be included in Libre Software operating systems like Ubuntu
- to give your font world status and wide, unrestricted distribution
- to educate students about quality typeface and font design
- to expand your test base and get more useful feedback
- to extend your reach to new markets when users see your metadata and go to your website
-- to get your font more easily into one of the webfont online services
+- to get your font more easily into one of the web font online services
- to attract attention for your commercial fonts
-- to make money through webfont services
+- to make money through web font services
- to make money by bundling fonts with applications
- to make money adjusting and extending existing open fonts
- to get a better chance that foundations/NGOs/charities/companies who commission fonts will pick you
@@ -190,28 +242,28 @@
You may not use individual words from the Reserved Font Names, but you would be allowed to use parts of words, as long as you do not use any word from the Reserved Font Names entirely. We do not recommend using parts of words because of potential confusion, but it is allowed. For example, if "Foobar" was a Reserved Font Name, you would be allowed to use "Foo" or "bar", although we would not recommend it. Such an unfortunate choice would confuse the users of your fonts as well as make it harder for other designers to contribute.
5.5 So what should I, as an author, identify as Reserved Font Names?
-Original authors are encouraged to name their fonts using clear, distinct names, and only declare the unique parts of the name as Reserved Font Names. For example, the author of a font called "Foobar Sans" would declare "Foobar" as a Reserved Font Name, but not "Sans", as that is a common typographical term, and may be a useful word to use in a derivative font name. Reserved Font Names should also be single words. A font called "Flowing River" should have Reserved Font Names "Flowing" and "River", not "Flowing River". You also need to be very careful about reserving font names which are already linked to trademarks (whether registered or not) which you do not own.
+Original authors are encouraged to name their fonts using clear, distinct names, and only declare the unique parts of the name as Reserved Font Names. For example, the author of a font called "Foobar Sans" would declare "Foobar" as a Reserved Font Name, but not "Sans", as that is a common typographical term, and may be a useful word to use in a derivative font name. Reserved Font Names should also be single words for simplicity and legibility. A font called "Flowing River" should have Reserved Font Names "Flowing" and "River", not "Flowing River". You also need to be very careful about reserving font names which are already linked to trademarks (whether registered or not) which you do not own.
5.6 Do I, as an author, have to identify any Reserved Font Names?
-No, but we strongly encourage you to do so. This is to avoid confusion between your work and Modified Versions.
+No. RFNs are optional and not required, but we encourage you to use them. This is primarily to avoid confusion between your work and Modified Versions. As an author you can release a font under the OFL and not declare any Reserved Font Names. There may be situations where you find that using no RFNs and letting your font be changed and modified - including any kind of modification - without having to change the original name is desirable. However you need to be fully aware of the consequences. There will be no direct way for end-users and other designers to distinguish your Original Version from many Modified Versions that may be created. You have to trust whoever is making the changes and the optimizations to not introduce problematic changes. The RFNs you choose for your own creation have value to you as an author because they allow you to maintain artistic integrity and keep some control over the distribution channel to your end-users. For discussion of RFNs and web fonts see section 2.
5.7 Are any names (such as the main font name) reserved by default?
No. That is a change to the license as of version 1.1. If you want any names to be Reserved Font Names, they must be specified after the copyright statement(s).
5.8 Is there any situation in which I can use Reserved Font Names for a Modified Version?
-The Copyright Holder(s) can give certain trusted parties the right to use any of the Reserved Font Names through separate written agreements. For example, even if "Foobar" is a RFN, you could write up an agreement to give company "XYZ" the right to distribute a modified version with a name that includes "Foobar". This allows for freedom without confusion.
+The Copyright Holder(s) can give certain trusted parties the right to use any of the Reserved Font Names through separate written agreements. For example, even if "Foobar" is a RFN, you could write up an agreement to give company "XYZ" the right to distribute a modified version with a name that includes "Foobar". This allows for freedom without confusion. The existence of such an agreement should be made as clear as possible to downstream users and designers in the distribution package and the relevant documentation. They need to know if they are a party to the agreement or not and what they are practically allowed to do or not even if all the details of the agreement are not public.
5.9 Do font rebuilds require a name change? Do I have to change the name of the font when my packaging workflow includes a full rebuild from source?
-Yes, all rebuilds which change the font data and the smart code are Modified Versions and the requirements of the OFL apply: you need to respect what the Author(s) have chosen in terms of Reserved Font Names. However if a package (or installer) is simply a wrapper or a compressed structure around the final font - leaving them intact on the inside - then no name change is required. Please get in touch with the author(s) and copyright holder(s) to inquire about the presence of font sources beyond the final font file(s) and the recommended build path. That build path may very well be non-trivial and hard to reproduce accurately by the maintainer. If a full font build path is made available by the upstream author(s) please be aware that any regressions and changes you may introduce when doing a rebuild for packaging purposes is your responsibility as a package maintainer since you are effectively creating a separate branch. You should make it very clear to your users that your rebuilt version is not the canonical one from upstream.
+Yes, all rebuilds which change the font data and the smart code are Modified Versions and the requirements of the OFL apply: you need to respect what the Author(s) have chosen in terms of Reserved Font Names. However if a package (or installer) is simply a wrapper or a compressed structure around the final font - leaving them intact on the inside - then no name change is required. Please get in touch with the author(s) and copyright holder(s) to inquire about the presence of font sources beyond the final font file(s) and the recommended build path. That build path may very well be non-trivial and hard to reproduce accurately by the maintainer. If a full font build path is made available by the upstream author(s) please be aware that any regressions and changes you may introduce when doing a rebuild for packaging purposes is your own responsibility as a package maintainer since you are effectively creating a separate branch. You should make it very clear to your users that your rebuilt version is not the canonical one from upstream.
5.10 Can I add other Reserved Font Names when making a derivative font?
-Yes. List your additional Reserved Font Names after your additional copyright statement, as indicated with example placeholders at the top of the OFL.txt file. Be sure you do not remove any exiting RFNs but only add your own.
+Yes. List your additional Reserved Font Names after your additional copyright statement, as indicated with example placeholders at the top of the OFL.txt file. Be sure you do not remove any existing RFNs but only add your own. RFN statements should be placed next to the copyright statement of the relevant author as indicated in the OFL.txt template to make them visible to designers wishing to make their separate version.
6 ABOUT THE FONTLOG
6.1 What is this FONTLOG thing exactly?
-It has three purposes: 1) to provide basic information on the font to users and other developers, 2) to document changes that have been made to the font or accompanying files, either by the original authors or others, and 3) to provide a place to acknowledge authors and other contributors. Please use it!
+It has three purposes: 1) to provide basic information on the font to users and other designers and developers, 2) to document changes that have been made to the font or accompanying files, either by the original authors or others, and 3) to provide a place to acknowledge authors and other contributors. Please use it!
6.2 Is the FONTLOG required?
It is not a requirement of the license, but we strongly recommend you have one.
@@ -239,7 +291,7 @@
It would benefit many people if you contributed back in response to what you've received. Your contributions and improvements to the fonts and other components could be a tremendous help and would encourage others to contribute as well and 'give back'. You will then benefit from other people's contributions as well. Sometimes maintaining your own separate version takes more effort than merging back with the original. Be aware that any contributions, however, must be either your own original creation or work that you own, and you may be asked to affirm that clearly when you contribute.
7.3 I've made some very nice improvements to the font. Will you consider adopting them and putting them into future Original Versions?
-Most authors would be very happy to receive such contributions. Keep in mind that it is unlikely that they would want to incorporate major changes that would require additional work on their end. Any contributions would likely need to be made for all the fonts in a family and match the overall design and style. Authors are encouraged to include a guide to the design with the fonts. It would also help to have contributions submitted as patches or clearly marked changes - the use of smart source revision control systems like subversion, svk, mercurial, git or bzr is a good idea. Please follow the recommendations given by the author(s) in terms of preferred source formats and configuration parameters for sending contributions. If this is not indicated in a FONTLOG or other documentation of the font, consider asking them directly. Examples of useful contributions are bug fixes, additional glyphs, stylistic alternates (and the smart font code to access them) or improved hinting. Keep in mind that some kinds of changes (esp. hinting) may be technically difficult to integrate.
+Most authors would be very happy to receive such contributions. Keep in mind that it is unlikely that they would want to incorporate major changes that would require additional work on their end. Any contributions would likely need to be made for all the fonts in a family and match the overall design and style. Authors are encouraged to include a guide to the design with the fonts. It would also help to have contributions submitted as patches or clearly marked changes - the use of smart source revision control systems like subversion, mercurial, git or bzr is a good idea. Please follow the recommendations given by the author(s) in terms of preferred source formats and configuration parameters for sending contributions. If this is not indicated in a FONTLOG or other documentation of the font, consider asking them directly. Examples of useful contributions are bug fixes, additional glyphs, stylistic alternates (and the smart font code to access them) or improved hinting. Keep in mind that some kinds of changes (esp. hinting) may be technically difficult to integrate.
7.4 How can I financially support the development of OFL fonts?
It is likely that most authors of OFL fonts would accept financial contributions - contact them for instructions on how to do this. Such contributions would support future development. You can also pay for others to enhance the fonts and contribute the results back to the original authors for inclusion in the Original Version.
@@ -251,15 +303,22 @@
Version 1.1 is the first minor revision of the OFL. We are confident that version 1.1 will meet most needs, but are open to future improvements. Any revisions would be for future font releases, and previously existing licenses would remain in effect. No retroactive changes are possible, although the Copyright Holder(s) can re-release the font under a revised OFL. All versions will be available on our web site: http://scripts.sil.org/OFL.
8.2 Does this license restrict the rights of the Copyright Holder(s)?
-No. The Copyright Holder(s) still retain(s) all the rights to their creation; they are only releasing a portion of it for use in a specific way. For example, the Copyright Holder(s) may choose to release a 'basic' version of their font under the OFL, but sell a restricted 'enhanced' version. Only the Copyright Holder(s) can do this.
+No. The Copyright Holder(s) still retain(s) all the rights to their creation; they are only releasing a portion of it for use in a specific way. For example, the Copyright Holder(s) may choose to release a 'basic' version of their font under the OFL, but sell a restricted 'enhanced' version under a different license. They may also choose to release the same font under both the OFL and some other license. Only the Copyright Holder(s) can do this, and doing so does not change the terms of the OFL as it applies to that font.
8.3 Is the OFL a contract or a license?
-The OFL is a license and not a contract and so does not require you to sign it to have legal validity. By using, modifying and redistributing components under the OFL you indicate that you accept the license.
+The OFL is a worldwide license based on international copyright agreements and conventions. It is not a contract and so does not require you to sign it to have legal validity. By using, modifying and redistributing components under the OFL you indicate that you accept the license.
8.4 I really like the terms of the OFL, but want to change it a little. Am I allowed to take ideas and actual wording from the OFL and put them into my own custom license for distributing my fonts?
-We strongly recommend against creating your very own unique open licensing model. Using a modified or derivative license will likely cut you off - along with the font(s) under that license - from the community of designers using the OFL, potentially expose you and your users to legal liabilities, and possibly put your work and rights at risk. The OFL went though a community and legal review process that took years of effort, and that review is only applicable to an unmodified OFL. The text of the OFL has been written by SIL (with review and consultation from the community) and is copyright (c) 2005-2010 SIL International. You may re-use the ideas and wording (in part, not in whole) in another non-proprietary license provided that you call your license by another unambiguous name, that you do not use the preamble, that you do not mention SIL and that you clearly present your license as different from the OFL so as not to cause confusion by being too similar to the original. If you feel the OFL does not meet your needs for an open license, please contact us.
+We strongly recommend against creating your very own unique open licensing model. Using a modified or derivative license will likely cut you off - along with the font(s) under that license - from the community of designers using the OFL, potentially expose you and your users to legal liabilities, and possibly put your work and rights at risk. The OFL went though a community and legal review process that took years of effort, and that review is only applicable to an unmodified OFL. The text of the OFL has been written by SIL (with review and consultation from the community) and is copyright (c) 2005-2017 SIL International. You may re-use the ideas and wording (in part, not in whole) in another non-proprietary license provided that you call your license by another unambiguous name, that you do not use the preamble, that you do not mention SIL and that you clearly present your license as different from the OFL so as not to cause confusion by being too similar to the original. If you feel the OFL does not meet your needs for an open license, please contact us.
+
+8.5 Can I quote from the OFL FAQ?
+Yes, SIL gives permission to quote from the OFL FAQ (OFL-FAQ.txt), in whole or in part, provided that the quoted text is:
+
+- unmodified,
+- used to help explain the intent of the OFL, rather than cause misunderstanding, and
+- accompanied with the following attribution: "From the OFL FAQ (OFL-FAQ.txt), copyright (c) 2005-2017 SIL International. Used by permission. http://scripts.sil.org/OFL-FAQ_web".
-8.5 Can I translate the license and the FAQ into other languages?
+8.6 Can I translate the license and the FAQ into other languages?
SIL certainly recognises the need for people who are not familiar with English to be able to understand the OFL and its use. Making the license very clear and readable has been a key goal for the OFL, but we know that people understand their own language best.
If you are an experienced translator, you are very welcome to translate the OFL and OFL-FAQ so that designers and users in your language community can understand the license better. But only the original English version of the license has legal value and has been approved by the community. Translations do not count as legal substitutes and should only serve as a way to explain the original license. SIL - as the author and steward of the license for the community at large - does not approve any translation of the OFL as legally valid because even small translation ambiguities could be abused and create problems.
@@ -274,6 +333,9 @@
If you start such a unofficial translation effort of the OFL and OFL-FAQ please let us know.
+8.7 Does the OFL have an explicit expiration term?
+No, the implicit intent of the OFL is that the permissions granted are perpetual and irrevocable.
+
9 ABOUT SIL INTERNATIONAL
@@ -311,6 +373,9 @@
ChangeLog
+10 December 2010 (Fred Foobar) GlobalFontFamily-devel version 1.4
+- fix new build and testing system (bug #123456)
+
1 August 2008 (Tom Parker) GlobalFontFamily version 1.2.1
- Tweaked the smart font code (Branch merged with trunk version)
- Provided improved build and debugging environment for smart behaviours
@@ -365,5 +430,6 @@
Fontstudio.org is an not-for-profit design group whose purpose is...
Foobar.org is a distributed community of developers...
Company.com is a small business who likes to support community designers...
-University.edu is a renowed educational institution with a strong design department...
+University.edu is a renowned educational institution with a strong design department...
-----
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/erewhon/README new/doc/fonts/erewhon/README
--- old/doc/fonts/erewhon/README 2019-01-15 22:39:07.000000000 +0100
+++ new/doc/fonts/erewhon/README 2020-03-23 23:22:28.000000000 +0100
@@ -2,7 +2,31 @@
http://www.ctan.org/license/lppl1.3
for the details of that license.
-Current version: 1.091, 2019-01-14
+Current version: 1.104, 2020-03-22
+
+Changes in version 1.104
+Corrected some jumbled upper-case Greek italic glyphs.
+
+Changes in version 1.103
+Added Fourier Greek symbols to the opentype fonts.
+
+Changes in version 1.102
+Corrected date string in erewhon.sty.
+
+Changes in version 1.101
+1. Removed untxmia.fd from erewhon package an placed it where it belongs, in newtx package.
+2. Corrected version number and date in erewhon.sty.
+3. Renamed newtx-utopia-subs.tex to newtx-erewhon-subs.tex.
+
+Changes in version 1.10
+1. Math mode under option utopia to newtxmath was modified to generate pdf output complying with the PDF/A-1b standard, so that utopia now qualifies as an enhanced option to newtxmath.
+2. Math mode Greek was modified to use mainly glyphs from the fourier package rather than modified txfonts Greek.
+
+Changes in version 1.093
+Corrected an error in the last correction to the fd file. (Thanks, Frank Mittelbach.)
+
+Changes in version 1.092
+Corrected an error in the fd files. The use of \providecommand in the fd could cause problems for users who did not load erewhon.sty.
Changes in version 1.091
Added the file erewhon.fontspec, which was inadvertently omitted from version 1.09.
Binary files old/doc/fonts/erewhon/erewhon-doc.pdf and new/doc/fonts/erewhon/erewhon-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/erewhon/erewhon-doc.tex new/doc/fonts/erewhon/erewhon-doc.tex
--- old/doc/fonts/erewhon/erewhon-doc.tex 2019-01-15 22:39:07.000000000 +0100
+++ new/doc/fonts/erewhon/erewhon-doc.tex 2020-03-20 22:26:48.000000000 +0100
@@ -1,17 +1,29 @@
-% !TEX TS-program = pdflatexmk
+% !TEX TS-program = pdflatexmk
+\pdfcompresslevel=0
+\pdfobjcompresslevel=0
\documentclass[11pt]{amsart}
+\pdfgentounicode=1
+\input glyphtounicode.tex
+\InputIfFileExists{glyphtounicode-cmr.tex}{}{}
+\InputIfFileExists{glyphtounicode-ntx.tex}{}{}
+\pdfglyphtounicode{afii61664}{200B}
\usepackage[margin=1.5in]{geometry}
\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
\usepackage{graphicx}
\pdfmapfile{=erewhon.map}
%SetFonts
+%\pdfmapline{+erewMI erewMI <erewMI.pfb}
+%\pdfmapline{+erewBMI erewBMI <erewBMI.pfb}
+%\pdfmapline{+erewMR erewMR <erewMR.pfb}
+%\pdfmapline{+erewBRM erewBRM <erewBRM.pfb}
+\usepackage[a-1b]{pdfx}
% erewhon+newtxmath
\usepackage[sups,p,osf,scaled=.98,space]{erewhon}
\usepackage[T2A,OT2,T1]{fontenc}
\usepackage{textcomp}
\usepackage{cabin}
\usepackage[varqu,varl]{zi4}% inconsolata
-\usepackage[utopia,vvarbb,bigdelims]{newtxmath}
+\usepackage[utopia,vvarbb]{newtxmath}
%SetFonts
\usepackage{fonttable}
\title{LaTeX Support for Erewhon}
@@ -35,16 +47,27 @@
\item the bold upright face has been made less cramped.
\end{itemize}
-The {\tt newtx} package has been modified, as of version $1.26$, to offer a new option {\tt utopia} (or, equivalently, {\tt heuristica} or {\tt erewhon}) that uses math italic glyphs taken from Utopia and oldstyle figures from \emph{Erewhon}. Its slanted Greek alphabets are constructed from the {\tt txfonts} slanted Greek letters by reducing their italic angle from $15.5$\textdegree\ to $13$\textdegree, matching Utopia's italic angle. So, for Erewhon text and matching math, you can use\footnote{There is most likely also a way to use {\tt MathDesign} or {\tt fourier} with at least partial compatibility.}:
+The {\tt newtx} package has been modified, as of version $1.26$, to offer a new option {\tt utopia} (or, equivalently, {\tt heuristica} or {\tt erewhon}) that uses math italic glyphs taken from Utopia and oldstyle figures from \emph{Erewhon}. Its slanted Greek alphabets are constructed from the {\tt txfonts} slanted Greek letters by reducing their italic angle from $15.5$\textdegree\ to $13$\textdegree, matching Utopia's italic angle.
+
+\textbf{Important Note:} Starting with version 1.10 (2019-11-04), the mathematical Greek glyphs are derived mainly from those in the {\tt fourier} package.
+
+For Erewhon text and matching math, you can use\footnote{There is most likely also a way to use {\tt MathDesign} or {\tt fourier} with at least partial compatibility.}:
\begin{verbatim}
% load babel package and options before erewhon
-\usepackage[p,osf,scaled=.98,space]{erewhon}
+\usepackage[p,osf,scaled=.98,space]{erewhon} % scaling by .98 not really necessary
\usepackage[varqu,varl]{inconsolata} % typewriter
\usepackage[type1,scaled=.95]{cabin} % sans serif like Gill Sans
\usepackage[utopia,vvarbb]{newtxmath}
\end{verbatim}
The effect of the options {\tt p,osf} is to force the default figure style in {\tt erewhon} text to be proportional oldstyle 0123456789 while using lining figures $0123456789$ in math mode. If no options are specified, tabular lining figures will be used throughout.
+With the settings above, there is now almost no difference between its output and the output from the {\tt fourier} package, except:
+\begin{itemize}
+\item
+the math axis using {\tt fourier} will be about {\tt .03pt} higher;
+\item rules and math symbols in {\tt fourier} will be about \verb|5%| less thick.
+\end{itemize}
+
\textsc{Options available:}
\begin{itemize}
\item The option {\tt scaled} allows you to change the scale. E.g., if you want \emph{Erewhon} to render at the same size as the original \emph{Utopia} or \emph{Heuristica}, use {\tt scaled=1.064}.
@@ -64,7 +87,7 @@
\usepackage{zlmtt} % serifed typewriter font extending cmtt
\end{verbatim}
-As Utopia text is a rather cramped, you might try applying a small amount of letterspacing (tracking) and increasing the interword spacing by means of the {\tt microtype} package. As of version $1.08$, this provides a number of ways to modify interword spacing by specifying one or more of the options described below. Erewhon word-spacing is governed by three quantities:
+As Utopia text is rather cramped, you might try applying a small amount of letterspacing (tracking) and increasing the interword spacing by means of the {\tt microtype} package. As of version $1.08$, this provides a number of ways to modify interword spacing by specifying one or more of the options described below. Erewhon word-spacing is governed by three quantities:
\begin{itemize}
\item
{\tt spacing} (default value {\tt .211em}), \verb|\fontdimen2| of the main text font.
@@ -111,6 +134,12 @@
Let $B(X)$ be the set of blocks of $\Lambda_{X}$
and let $b(X) \coloneq |{B(X)}|$ so that $\hat\phi=\sum_{Y\subset X}(-1)^{b(Y)}b(Y)$.
+\textsc{Enhanced Mathematical Options:}\\
+As of version {\tt 1.10}, the {\tt utopia} option to {\tt newtxmath} enjoys enhanced status. Most importantly, this means that you can generate pdf output satisfying the PDF/A-1b standards. It means, in addition, that the option {\tt subscriptcorrection} is available, permitting you to improve the spacing of subscripts by copying {\tt newtx-erewhon-subs.tex} to your home texmf tree and modifying its entries. For details, consult Appendix 2 of {\tt newtxdoc.pdf}, the documentation file for the {\tt newtx} package.
+
+\textsc{Greek symbols in the opentype fonts:}\\
+As of version $1.103$ ($2020-03-19$) the opentype text fonts contain the Greek symbols from the Fourier package, and also the symbols {\tt Ohm} and {\tt Ohminv}. This may be a temporary measure that will disappear after {\tt fontspec} is able to fully mimic the capabilities of virtual fonts.
+\newpage
\textsc{Glyph Coverage Examples}\\
\textbf{Erewhon-Regular-tlf-t1}\\
\fonttable{Erewhon-Regular-tlf-t1}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/erewhon.doc.tlpobj new/tlpkg/tlpobj/erewhon.doc.tlpobj
--- old/tlpkg/tlpobj/erewhon.doc.tlpobj 2019-02-28 03:35:35.000000000 +0100
+++ new/tlpkg/tlpobj/erewhon.doc.tlpobj 2020-03-24 01:57:33.000000000 +0100
@@ -1,9 +1,9 @@
name erewhon.doc
category Package
-revision 49715
+revision 54512
shortdesc doc files of erewhon
relocated 1
-docfiles size=109
+docfiles size=201
RELOC/doc/fonts/erewhon/FontLog.txt
RELOC/doc/fonts/erewhon/OFL-FAQ.txt
RELOC/doc/fonts/erewhon/OFL.txt
++++++ erewhon.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/erewhon/erewBMI.afm new/fonts/afm/public/erewhon/erewBMI.afm
--- old/fonts/afm/public/erewhon/erewBMI.afm 1970-01-01 01:00:00.000000000 +0100
+++ new/fonts/afm/public/erewhon/erewBMI.afm 2019-11-06 23:09:47.000000000 +0100
@@ -0,0 +1,167 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20190801
+Comment Creation Date: Fri Nov 1 14:25:51 2019
+FontName erewBMI
+FullName Erewhon Math Bold Italic
+FamilyName erew
+Weight Bold
+Notice (Copyright (c) 1989, 1991 Adobe Systems Incorporated. All Rights Reserved. Utopia is either a registered trademark or trademark of Adobe Systems Incorporated in the United States and/or other countrie)
+Comment s. Used under license. The Utopia fonts are freely available; see http://tug.org/fonts/utopia.
+Comment
+Comment Copyright (c) 2003-2004 GUTenberg project for the Greek glyphs, which are part of the Fourier fonts licensed under the Latex Public Project License (LPPL)
+Comment
+Comment Copyright (c) 2014--2019, Michael Sharpe. for further revisions and additions to the Greek glyphs and other symbols, also licensed under the Latex Public Project License (LPPL).
+ItalicAngle -13
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.000
+EncodingScheme FontSpecific
+FontBBox -402 -240 1032 820
+StartCharMetrics 144
+C 0 ; WX 372 ; N degree ; B 32 339 339 639 ;
+C 1 ; WX 318 ; N u1D6A4.bit ; B 64 -11 325 472 ;
+C 2 ; WX 524 ; N uni019B ; B 0 -7 521 697 ;
+C 3 ; WX 577 ; N uni01B5 ; B 0 0 570 651 ;
+C 4 ; WX 420 ; N u1D6A5.bit ; B 15 -225 440 474 ;
+C 5 ; WX 404 ; N gravecomb ; B 38 481 293 696 ;
+C 6 ; WX 404 ; N acutecomb ; B 112 481 368 696 ;
+C 7 ; WX 0 ; N uni0302 ; B -378 489 -26 702 ;
+C 8 ; WX 0 ; N tildecomb ; B -402 520 -3 664 ;
+C 9 ; WX 0 ; N uni0304 ; B -348 552 -55 634 ;
+C 10 ; WX 0 ; N uni0306 ; B -352 523 -52 673 ;
+C 11 ; WX 0 ; N uni0307 ; B -276 527 -128 668 ;
+C 12 ; WX 0 ; N uni0308 ; B -389 527 -15 668 ;
+C 13 ; WX 0 ; N uni030A ; B -314 508 -90 717 ;
+C 14 ; WX 0 ; N uni030C ; B -378 489 -26 702 ;
+C 15 ; WX 411 ; N uni03F6 ; B 50 -3 458 458 ;
+C 16 ; WX 551 ; N uni20DB ; B 15 527 536 668 ;
+C 17 ; WX 737 ; N uni20DC ; B 15 527 722 668 ;
+C 18 ; WX 578 ; N uni2107 ; B 36 -14 545 665 ;
+C 19 ; WX 474 ; N lscript ; B 28 -11 437 684 ;
+C 20 ; WX 795 ; N uni2126 ; B 63 0 812 662 ;
+C 21 ; WX 795 ; N uni2127 ; B 63 -15 812 647 ;
+C 22 ; WX 605 ; N uni212B ; B -26 0 623 820 ;
+C 23 ; WX 534 ; N u1D71E ; B 40 0 670 651 ;
+C 24 ; WX 699 ; N u1D71F ; B 39 0 659 652 ;
+C 25 ; WX 715 ; N u1D723 ; B 106 -14 755 665 ;
+C 26 ; WX 697 ; N u1D726 ; B 41 0 672 651 ;
+C 27 ; WX 726 ; N u1D729 ; B 62 0 787 651 ;
+C 28 ; WX 746 ; N u1D72B ; B 40 0 858 651 ;
+C 29 ; WX 664 ; N u1D72E ; B 42 0 711 651 ;
+C 30 ; WX 591 ; N u1D730 ; B 63 -3 680 631 ;
+C 31 ; WX 737 ; N u1D731 ; B 110 0 778 651 ;
+C 32 ; WX 782 ; N u1D733 ; B 178 0 895 665 ;
+C 33 ; WX 795 ; N u1D734 ; B 63 0 812 662 ;
+C 34 ; WX 655 ; N u1D736 ; B 69 -11 669 475 ;
+C 35 ; WX 549 ; N u1D737 ; B 0 -228 568 698 ;
+C 36 ; WX 642 ; N u1D738 ; B 107 -232 709 476 ;
+C 37 ; WX 530 ; N u1D739 ; B 72 -11 616 706 ;
+C 38 ; WX 478 ; N u1D750 ; B 56 -11 503 472 ;
+C 39 ; WX 468 ; N u1D73B ; B 62 -172 542 704 ;
+C 40 ; WX 626 ; N u1D73C ; B 120 -225 648 475 ;
+C 41 ; WX 520 ; N u1D73D ; B 85 -12 592 698 ;
+C 42 ; WX 362 ; N u1D73E ; B 75 -11 340 472 ;
+C 43 ; WX 695 ; N u1D73F ; B 118 0 717 471 ;
+C 44 ; WX 669 ; N u1D740 ; B 33 -11 675 698 ;
+C 45 ; WX 586 ; N u1D741 ; B -8 -228 606 472 ;
+C 46 ; WX 621 ; N u1D742 ; B 127 1 675 476 ;
+C 47 ; WX 481 ; N u1D743 ; B 62 -176 525 702 ;
+C 48 ; WX 652 ; N u1D745 ; B 62 -12 736 476 ;
+C 49 ; WX 539 ; N u1D746 ; B 15 -229 569 472 ;
+C 50 ; WX 646 ; N u1D748 ; B 92 -11 718 474 ;
+C 51 ; WX 599 ; N u1D749 ; B 133 -11 653 475 ;
+C 52 ; WX 587 ; N u1D74A ; B 121 -11 655 477 ;
+C 53 ; WX 692 ; N u1D753 ; B 79 -228 723 661 ;
+C 54 ; WX 637 ; N u1D74C ; B 44 -227 639 472 ;
+C 55 ; WX 832 ; N u1D74D ; B 105 -228 904 542 ;
+C 56 ; WX 748 ; N u1D74E ; B 81 -9 760 472 ;
+C 57 ; WX 411 ; N u1D73A ; B 60 -3 503 458 ;
+C 58 ; WX 599 ; N u1D751 ; B 98 -11 659 698 ;
+C 59 ; WX 740 ; N u1D755 ; B 32 -9 702 552 ;
+C 60 ; WX 608 ; N u1D754 ; B 51 -220 566 466 ;
+C 61 ; WX 465 ; N u1D747 ; B 63 -172 538 472 ;
+C 62 ; WX 712 ; N u1D74B ; B 76 -228 745 469 ;
+C 63 ; WX 699 ; N u1D735 ; B 87 0 706 652 ;
+C 64 ; WX 551 ; N u1D74F ; B 33 -9 515 683 ;
+C 65 ; WX 669 ; N uni019B.alt ; B 33 -11 675 698 ;
+C 66 ; WX 591 ; N uni210F ; B 44 -11 596 698 ;
+C 67 ; WX 591 ; N uni210F.alt ; B 44 -11 596 698 ;
+C 68 ; WX 550 ; N u1D752 ; B -26 -13 490 474 ;
+C 70 ; WX 669 ; N uni019B.bit ; B 33 -11 675 701 ;
+C 71 ; WX 596 ; N u1D468 ; B -23 0 634 651 ;
+C 72 ; WX 639 ; N u1D469 ; B 38 0 681 652 ;
+C 73 ; WX 631 ; N u1D46A ; B 104 -14 731 665 ;
+C 74 ; WX 727 ; N u1D46B ; B 38 0 770 651 ;
+C 75 ; WX 584 ; N u1D46C ; B 38 0 679 651 ;
+C 76 ; WX 550 ; N u1D46D ; B 38 0 675 651 ;
+C 77 ; WX 682 ; N u1D46E ; B 104 -14 744 665 ;
+C 78 ; WX 752 ; N u1D46F ; B 38 0 860 651 ;
+C 79 ; WX 362 ; N u1D470 ; B 38 0 471 651 ;
+C 80 ; WX 364 ; N u1D471 ; B -14 -108 481 651 ;
+C 81 ; WX 646 ; N u1D472 ; B 38 -6 807 651 ;
+C 82 ; WX 551 ; N u1D473 ; B 38 0 589 651 ;
+C 83 ; WX 866 ; N u1D474 ; B 33 0 971 651 ;
+C 84 ; WX 696 ; N u1D475 ; B 28 0 821 651 ;
+C 85 ; WX 715 ; N u1D476 ; B 106 -14 755 665 ;
+C 86 ; WX 620 ; N u1D477 ; B 38 0 686 651 ;
+C 87 ; WX 715 ; N u1D478 ; B 106 -181 755 665 ;
+C 88 ; WX 640 ; N u1D479 ; B 38 0 687 651 ;
+C 89 ; WX 518 ; N u1D47A ; B 62 -14 569 665 ;
+C 90 ; WX 579 ; N u1D47B ; B 118 0 712 651 ;
+C 91 ; WX 729 ; N u1D47C ; B 140 -14 848 651 ;
+C 92 ; WX 592 ; N u1D47D ; B 119 0 769 651 ;
+C 93 ; WX 865 ; N u1D47E ; B 108 0 1032 651 ;
+C 94 ; WX 592 ; N u1D47F ; B -20 0 733 651 ;
+C 95 ; WX 584 ; N u1D480 ; B 119 0 752 651 ;
+C 96 ; WX 581 ; N u1D481 ; B 5 0 704 651 ;
+C 97 ; WX 560 ; N u1D482 ; B 57 -11 608 472 ;
+C 98 ; WX 551 ; N u1D483 ; B 65 -11 590 698 ;
+C 99 ; WX 428 ; N u1D484 ; B 69 -11 501 472 ;
+C 100 ; WX 572 ; N u1D485 ; B 60 -12 645 698 ;
+C 101 ; WX 447 ; N u1D486 ; B 69 -11 500 472 ;
+C 102 ; WX 427 ; N u1D487 ; B 12 -240 653 686 ;
+C 103 ; WX 490 ; N u1D488 ; B 20 -228 606 481 ;
+C 104 ; WX 591 ; N u1D489 ; B 74 -11 626 698 ;
+C 105 ; WX 318 ; N u1D48A ; B 94 -11 369 677 ;
+C 106 ; WX 442 ; N u1D48B ; B 7 -228 462 677 ;
+C 107 ; WX 536 ; N u1D48C ; B 70 -11 601 698 ;
+C 108 ; WX 307 ; N u1D48D ; B 91 -11 371 698 ;
+C 109 ; WX 859 ; N u1D48E ; B 76 -11 895 472 ;
+C 110 ; WX 597 ; N u1D48F ; B 75 -11 634 472 ;
+C 111 ; WX 528 ; N u1D490 ; B 72 -11 556 472 ;
+C 112 ; WX 569 ; N u1D491 ; B 33 -228 609 472 ;
+C 113 ; WX 549 ; N u1D492 ; B 59 -228 601 482 ;
+C 114 ; WX 413 ; N u1D493 ; B 81 -11 500 472 ;
+C 115 ; WX 392 ; N u1D494 ; B 42 -11 439 472 ;
+C 116 ; WX 337 ; N u1D495 ; B 96 -11 435 603 ;
+C 117 ; WX 596 ; N u1D496 ; B 99 -11 638 472 ;
+C 118 ; WX 487 ; N u1D497 ; B 97 -11 547 472 ;
+C 119 ; WX 747 ; N u1D498 ; B 99 -11 810 472 ;
+C 120 ; WX 485 ; N u1D499 ; B 8 -11 546 472 ;
+C 121 ; WX 489 ; N u1D49A ; B 16 -228 563 472 ;
+C 122 ; WX 438 ; N u1D49B ; B 17 -11 509 461 ;
+C 125 ; WX 536 ; N zero.oldstyle ; B 31 -11 505 487 ;
+C 126 ; WX 397 ; N one.oldstyle ; B 42 0 357 498 ;
+C 127 ; WX 518 ; N two.oldstyle ; B 22 0 491 487 ;
+C 128 ; WX 514 ; N three.oldstyle ; B 20 -150 482 487 ;
+C 129 ; WX 514 ; N four.oldstyle ; B 12 -150 491 476 ;
+C 130 ; WX 506 ; N five.oldstyle ; B 21 -150 467 476 ;
+C 131 ; WX 536 ; N six.oldstyle ; B 34 -11 510 626 ;
+C 132 ; WX 504 ; N seven.oldstyle ; B 12 -150 476 476 ;
+C 133 ; WX 536 ; N eight.oldstyle ; B 31 -11 505 626 ;
+C 134 ; WX 536 ; N nine.oldstyle ; B 38 -150 497 487 ;
+C 135 ; WX 536 ; N zero ; B 34 -11 502 639 ;
+C 136 ; WX 536 ; N one ; B 101 0 436 639 ;
+C 137 ; WX 536 ; N two ; B 33 0 513 639 ;
+C 138 ; WX 536 ; N three ; B 31 -11 494 639 ;
+C 139 ; WX 536 ; N four ; B 23 0 506 628 ;
+C 140 ; WX 536 ; N five ; B 46 -11 494 628 ;
+C 141 ; WX 536 ; N six ; B 33 -11 511 639 ;
+C 142 ; WX 536 ; N seven ; B 37 -11 503 628 ;
+C 143 ; WX 536 ; N eight ; B 31 -11 506 639 ;
+C 144 ; WX 536 ; N nine ; B 37 -11 497 639 ;
+C 145 ; WX 263 ; N period ; B 44 -11 219 164 ;
+C 146 ; WX 263 ; N comma ; B 38 -157 213 169 ;
+EndCharMetrics
+EndFontMetrics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/erewhon/erewBRM.afm new/fonts/afm/public/erewhon/erewBRM.afm
--- old/fonts/afm/public/erewhon/erewBRM.afm 1970-01-01 01:00:00.000000000 +0100
+++ new/fonts/afm/public/erewhon/erewBRM.afm 2019-11-06 23:09:47.000000000 +0100
@@ -0,0 +1,139 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20190801
+Comment Creation Date: Fri Nov 1 14:21:27 2019
+FontName erewBRM
+FullName Erewhon Math Bold Roman
+FamilyName erew
+Weight Bold
+Notice (Copyright (c) 1989, 1991 Adobe Systems Incorporated. All Rights Reserved. Utopia is either a registered trademark or trademark of Adobe Systems Incorporated in the United States and/or other countrie)
+Comment s. Used under license. The Utopia fonts are freely available; see http://tug.org/fonts/utopia.
+Comment
+Comment Copyright (c) 2003-2004 GUTenberg project for the Greek glyphs, which are part of the Fourier fonts licensed under the Latex Public Project License (LPPL)
+Comment
+Comment Copyright (c) 2014--2019, Michael Sharpe. for further revisions and additions to the Greek glyphs and other symbols, also licensed under the Latex Public Project License (LPPL).
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.000
+EncodingScheme FontSpecific
+FontBBox -402 -232 903 820
+StartCharMetrics 116
+C 0 ; WX 539 ; N u1D6AA ; B 31 0 526 651 ;
+C 1 ; WX 728 ; N u1D6AB ; B 41 0 686 652 ;
+C 2 ; WX 722 ; N u1D6AF ; B 39 -14 683 665 ;
+C 3 ; WX 726 ; N u1D6B2 ; B 43 0 693 651 ;
+C 4 ; WX 708 ; N u1D6B5 ; B 53 0 658 651 ;
+C 5 ; WX 752 ; N u1D6B7 ; B 31 0 721 651 ;
+C 6 ; WX 694 ; N u1D6BA ; B 44 0 655 651 ;
+C 7 ; WX 562 ; N u1D6BC ; B -12 -3 569 626 ;
+C 8 ; WX 782 ; N u1D6BD ; B 50 0 730 651 ;
+C 9 ; WX 824 ; N u1D6BF ; B 34 0 791 660 ;
+C 10 ; WX 830 ; N u1D6C0 ; B 35 0 791 662 ;
+C 11 ; WX 622 ; N u1D6C2 ; B 36 -11 601 472 ;
+C 12 ; WX 561 ; N u1D6C3 ; B 42 -228 512 698 ;
+C 13 ; WX 612 ; N u1D6C4 ; B 31 -232 576 470 ;
+C 14 ; WX 555 ; N u1D6C5 ; B 36 -11 516 706 ;
+C 15 ; WX 411 ; N u1D6DC ; B 25 -3 408 458 ;
+C 16 ; WX 490 ; N u1D6C7 ; B 34 -176 464 707 ;
+C 17 ; WX 593 ; N u1D6C8 ; B 45 -225 542 472 ;
+C 18 ; WX 557 ; N u1D6C9 ; B 43 -12 513 698 ;
+C 19 ; WX 364 ; N u1D6CA ; B 50 -11 309 472 ;
+C 20 ; WX 650 ; N u1D6CB ; B 41 -7 607 476 ;
+C 21 ; WX 653 ; N u1D6CC ; B 35 -11 627 698 ;
+C 22 ; WX 577 ; N u1D6CD ; B 33 -228 567 472 ;
+C 23 ; WX 607 ; N u1D6CE ; B 48 1 558 472 ;
+C 24 ; WX 507 ; N u1D6CF ; B 32 -176 476 702 ;
+C 25 ; WX 660 ; N u1D6D1 ; B 32 -14 632 475 ;
+C 26 ; WX 553 ; N u1D6D2 ; B 49 -229 513 472 ;
+C 27 ; WX 678 ; N u1D6D4 ; B 51 -11 637 474 ;
+C 28 ; WX 621 ; N u1D6D5 ; B 48 -11 562 472 ;
+C 29 ; WX 589 ; N u1D6D6 ; B 41 -11 559 472 ;
+C 30 ; WX 728 ; N u1D6DF ; B 39 -228 696 661 ;
+C 31 ; WX 571 ; N u1D6D8 ; B 41 -228 546 481 ;
+C 32 ; WX 818 ; N u1D6D9 ; B 30 -228 785 542 ;
+C 33 ; WX 766 ; N u1D6DA ; B 47 -9 711 472 ;
+C 34 ; WX 486 ; N u1D6C6 ; B 34 -11 442 472 ;
+C 35 ; WX 611 ; N u1D6DD ; B 34 -11 577 698 ;
+C 36 ; WX 726 ; N u1D6E1 ; B 36 -9 686 546 ;
+C 37 ; WX 554 ; N u1D6E0 ; B 36 -220 511 461 ;
+C 38 ; WX 507 ; N u1D6D3 ; B 32 -176 476 472 ;
+C 39 ; WX 730 ; N u1D6D7 ; B 41 -228 689 469 ;
+C 40 ; WX 728 ; N u1D6C1 ; B 41 0 686 652 ;
+C 41 ; WX 502 ; N u1D6DB ; B 19 -9 487 683 ;
+C 46 ; WX 550 ; N u1D6DE ; B 28 -13 523 474 ;
+C 47 ; WX 411 ; N uni03F6 ; B 25 -3 408 458 ;
+C 48 ; WX 605 ; N uni212B ; B -26 0 623 820 ;
+C 49 ; WX 577 ; N uni01B5 ; B 0 0 570 651 ;
+C 50 ; WX 830 ; N uni2126 ; B 35 0 791 662 ;
+C 51 ; WX 830 ; N uni2127 ; B 35 0 791 662 ;
+C 52 ; WX 578 ; N uni2107 ; B 36 -14 545 665 ;
+C 53 ; WX 404 ; N uni0300 ; B 38 481 293 696 ;
+C 54 ; WX 404 ; N uni0301 ; B 112 481 368 696 ;
+C 55 ; WX 0 ; N uni0302 ; B -378 489 -26 702 ;
+C 56 ; WX 0 ; N uni0303 ; B -402 520 -3 664 ;
+C 57 ; WX 0 ; N uni0304 ; B -348 552 -55 634 ;
+C 58 ; WX 0 ; N uni0306 ; B -352 523 -52 673 ;
+C 59 ; WX 0 ; N uni0307 ; B -276 527 -128 668 ;
+C 60 ; WX 0 ; N uni0308 ; B -389 527 -15 668 ;
+C 61 ; WX 0 ; N uni030A ; B -314 508 -90 717 ;
+C 62 ; WX 0 ; N uni030C ; B -378 489 -26 702 ;
+C 63 ; WX 551 ; N uni20DB ; B 15 527 536 668 ;
+C 64 ; WX 737 ; N uni20DC ; B 15 527 722 668 ;
+C 65 ; WX 372 ; N degree ; B 32 339 339 639 ;
+C 66 ; WX 297 ; N u1D6A4.bup ; B 24 0 289 472 ;
+C 67 ; WX 297 ; N u1D6A5.bup ; B -11 -218 234 472 ;
+C 68 ; WX 605 ; N u1D400 ; B -26 0 623 651 ;
+C 69 ; WX 642 ; N u1D401 ; B 31 0 607 651 ;
+C 70 ; WX 647 ; N u1D402 ; B 39 -14 615 665 ;
+C 71 ; WX 730 ; N u1D403 ; B 31 0 691 651 ;
+C 72 ; WX 591 ; N u1D404 ; B 31 0 568 651 ;
+C 73 ; WX 557 ; N u1D405 ; B 35 0 534 651 ;
+C 74 ; WX 682 ; N u1D406 ; B 39 -14 667 665 ;
+C 75 ; WX 758 ; N u1D407 ; B 31 0 728 651 ;
+C 76 ; WX 361 ; N u1D408 ; B 31 0 330 651 ;
+C 77 ; WX 362 ; N u1D409 ; B 6 -108 339 651 ;
+C 78 ; WX 664 ; N u1D40A ; B 31 -6 676 651 ;
+C 79 ; WX 550 ; N u1D40B ; B 31 0 549 651 ;
+C 80 ; WX 863 ; N u1D40C ; B 22 0 832 651 ;
+C 81 ; WX 694 ; N u1D40D ; B 24 0 676 651 ;
+C 82 ; WX 722 ; N u1D40E ; B 39 -14 683 665 ;
+C 83 ; WX 611 ; N u1D40F ; B 31 0 586 651 ;
+C 84 ; WX 722 ; N u1D410 ; B 39 -181 683 665 ;
+C 85 ; WX 643 ; N u1D411 ; B 31 0 645 651 ;
+C 86 ; WX 527 ; N u1D412 ; B 39 -14 501 665 ;
+C 87 ; WX 586 ; N u1D413 ; B 14 0 573 651 ;
+C 88 ; WX 739 ; N u1D414 ; B 27 -14 712 651 ;
+C 89 ; WX 606 ; N u1D415 ; B -15 0 639 651 ;
+C 90 ; WX 877 ; N u1D416 ; B -9 0 903 651 ;
+C 91 ; WX 596 ; N u1D417 ; B -18 0 631 651 ;
+C 92 ; WX 580 ; N u1D418 ; B -11 0 616 651 ;
+C 93 ; WX 577 ; N u1D419 ; B 0 0 570 651 ;
+C 94 ; WX 511 ; N u1D41A ; B 39 -11 528 472 ;
+C 95 ; WX 568 ; N u1D41B ; B 14 -11 537 698 ;
+C 96 ; WX 464 ; N u1D41C ; B 32 -11 455 472 ;
+C 97 ; WX 568 ; N u1D41D ; B 32 -11 560 698 ;
+C 98 ; WX 488 ; N u1D41E ; B 32 -11 475 472 ;
+C 99 ; WX 321 ; N u1D41F ; B 25 0 396 698 ;
+C 100 ; WX 501 ; N u1D420 ; B 24 -228 513 481 ;
+C 101 ; WX 593 ; N u1D421 ; B 18 0 585 698 ;
+C 102 ; WX 297 ; N u1D422 ; B 24 0 289 677 ;
+C 103 ; WX 297 ; N u1D423 ; B -11 -218 245 677 ;
+C 104 ; WX 547 ; N u1D424 ; B 18 0 560 698 ;
+C 105 ; WX 290 ; N u1D425 ; B 18 0 282 698 ;
+C 106 ; WX 891 ; N u1D426 ; B 24 0 883 472 ;
+C 107 ; WX 599 ; N u1D427 ; B 24 0 592 472 ;
+C 108 ; WX 550 ; N u1D428 ; B 32 -11 519 472 ;
+C 109 ; WX 578 ; N u1D429 ; B 18 -216 546 472 ;
+C 110 ; WX 561 ; N u1D42A ; B 32 -216 560 472 ;
+C 111 ; WX 413 ; N u1D42B ; B 24 0 416 472 ;
+C 112 ; WX 419 ; N u1D42C ; B 36 -11 400 472 ;
+C 113 ; WX 347 ; N u1D42D ; B 30 -11 351 579 ;
+C 114 ; WX 591 ; N u1D42E ; B 22 -11 583 472 ;
+C 115 ; WX 489 ; N u1D42F ; B -8 0 513 461 ;
+C 116 ; WX 727 ; N u1D430 ; B -9 0 754 461 ;
+C 117 ; WX 490 ; N u1D431 ; B -14 0 517 461 ;
+C 118 ; WX 492 ; N u1D432 ; B -11 -228 524 461 ;
+C 119 ; WX 454 ; N u1D433 ; B -1 0 451 461 ;
+EndCharMetrics
+EndFontMetrics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/erewhon/erewMI.afm new/fonts/afm/public/erewhon/erewMI.afm
--- old/fonts/afm/public/erewhon/erewMI.afm 1970-01-01 01:00:00.000000000 +0100
+++ new/fonts/afm/public/erewhon/erewMI.afm 2019-11-06 23:09:47.000000000 +0100
@@ -0,0 +1,170 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20190801
+Comment Creation Date: Fri Nov 1 14:18:11 2019
+FontName erewMI
+FullName Erewhon Math Italic
+FamilyName erew
+Weight Regular
+Notice (Copyright (c) 1989, 1991 Adobe Systems Incorporated. All Rights Reserved. Utopia is either a registered trademark or trademark of Adobe Systems Incorporated in the United States and/or other countrie)
+Comment s. Used under license. The Utopia fonts are freely available; see http://tug.org/fonts/utopia.
+Comment
+Comment Copyright (c) 2003-2004 GUTenberg project for the Greek glyphs, which are part of the Fourier fonts licensed under the Latex Public Project License (LPPL)
+Comment
+Comment Copyright (c) 2014--2019, Michael Sharpe. for further revisions and additions to the Greek glyphs and other symbols, also licensed under the Latex Public Project License (LPPL).
+ItalicAngle -11
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.000
+EncodingScheme FontSpecific
+FontBBox -68 -229 1043 809
+StartCharMetrics 147
+C 0 ; WX 329 ; N degree ; B 35 380 294 639 ;
+C 1 ; WX 564 ; N uni019B ; B 36 -11 538 681 ;
+C 2 ; WX 573 ; N uni01B5 ; B 8 0 558 650 ;
+C 3 ; WX 376 ; N uni0300 ; B 46 509 255 680 ;
+C 4 ; WX 376 ; N uni0301 ; B 121 509 330 680 ;
+C 5 ; WX 376 ; N uni0302 ; B 44 509 332 677 ;
+C 6 ; WX 376 ; N uni0303 ; B 21 529 354 641 ;
+C 7 ; WX 376 ; N uni0304 ; B 53 561 323 617 ;
+C 8 ; WX 376 ; N uni0306 ; B 59 534 317 662 ;
+C 9 ; WX 376 ; N uni0307 ; B 132 536 244 642 ;
+C 10 ; WX 376 ; N uni0308 ; B 34 536 342 642 ;
+C 11 ; WX 376 ; N uni030A ; B 86 517 290 707 ;
+C 12 ; WX 376 ; N uni030C ; B 44 509 332 677 ;
+C 13 ; WX 422 ; N uni03F6 ; B 12 -11 430 461 ;
+C 14 ; WX 491 ; N uni20DB ; B 34 536 457 642 ;
+C 15 ; WX 646 ; N uni20DC ; B 34 536 612 642 ;
+C 16 ; WX 561 ; N uni2107 ; B 48 -14 529 664 ;
+C 17 ; WX 570 ; N uni210E ; B 86 -11 586 697 ;
+C 18 ; WX 433 ; N lscript ; B 33 -11 387 682 ;
+C 19 ; WX 723 ; N uni2126 ; B 54 0 755 661 ;
+C 20 ; WX 723 ; N uni2127 ; B 44 -13 745 648 ;
+C 21 ; WX 589 ; N uni212B ; B -30 0 608 809 ;
+C 22 ; WX 586 ; N u1D434 ; B -22 0 619 650 ;
+C 23 ; WX 594 ; N u1D435 ; B 36 0 631 651 ;
+C 24 ; WX 621 ; N u1D436 ; B 107 -14 713 665 ;
+C 25 ; WX 717 ; N u1D437 ; B 38 0 754 650 ;
+C 26 ; WX 560 ; N u1D438 ; B 36 0 650 650 ;
+C 27 ; WX 536 ; N u1D439 ; B 36 0 653 650 ;
+C 28 ; WX 666 ; N u1D43A ; B 107 -14 726 665 ;
+C 29 ; WX 728 ; N u1D43B ; B 38 0 838 650 ;
+C 30 ; WX 324 ; N u1D43C ; B 38 0 435 650 ;
+C 31 ; WX 330 ; N u1D43D ; B -40 -112 443 650 ;
+C 32 ; WX 611 ; N u1D43E ; B 38 -5 772 650 ;
+C 33 ; WX 531 ; N u1D43F ; B 38 0 567 650 ;
+C 34 ; WX 864 ; N u1D440 ; B 29 0 975 650 ;
+C 35 ; WX 717 ; N u1D441 ; B 29 0 837 650 ;
+C 36 ; WX 707 ; N u1D442 ; B 107 -14 742 665 ;
+C 37 ; WX 577 ; N u1D443 ; B 38 0 640 650 ;
+C 38 ; WX 707 ; N u1D444 ; B 107 -191 742 665 ;
+C 39 ; WX 601 ; N u1D445 ; B 38 0 636 650 ;
+C 40 ; WX 501 ; N u1D446 ; B 65 -14 542 665 ;
+C 41 ; WX 569 ; N u1D447 ; B 129 0 698 650 ;
+C 42 ; WX 746 ; N u1D448 ; B 155 -14 860 650 ;
+C 43 ; WX 598 ; N u1D449 ; B 123 0 772 650 ;
+C 44 ; WX 889 ; N u1D44A ; B 114 0 1043 650 ;
+C 45 ; WX 594 ; N u1D44B ; B -1 0 724 650 ;
+C 46 ; WX 555 ; N u1D44C ; B 123 0 732 650 ;
+C 47 ; WX 584 ; N u1D44D ; B 14 0 694 650 ;
+C 48 ; WX 527 ; N u1D44E ; B 62 -11 562 472 ;
+C 49 ; WX 525 ; N u1D44F ; B 77 -11 556 697 ;
+C 50 ; WX 414 ; N u1D450 ; B 76 -11 470 472 ;
+C 51 ; WX 551 ; N u1D451 ; B 68 -12 608 697 ;
+C 52 ; WX 425 ; N u1D452 ; B 75 -11 476 472 ;
+C 53 ; WX 296 ; N u1D453 ; B -68 -227 507 697 ;
+C 54 ; WX 469 ; N u1D454 ; B 28 -227 572 481 ;
+C 55 ; WX 297 ; N u1D456 ; B 107 -11 341 672 ;
+C 56 ; WX 290 ; N u1D457 ; B -56 -227 343 672 ;
+C 57 ; WX 512 ; N u1D458 ; B 86 -11 566 697 ;
+C 58 ; WX 287 ; N u1D459 ; B 104 -11 344 697 ;
+C 59 ; WX 857 ; N u1D45A ; B 92 -11 873 472 ;
+C 60 ; WX 580 ; N u1D45B ; B 92 -11 597 472 ;
+C 61 ; WX 504 ; N u1D45C ; B 79 -11 524 472 ;
+C 62 ; WX 554 ; N u1D45D ; B 54 -227 584 472 ;
+C 63 ; WX 525 ; N u1D45E ; B 69 -227 566 494 ;
+C 64 ; WX 377 ; N u1D45F ; B 98 -11 455 472 ;
+C 65 ; WX 365 ; N u1D460 ; B 51 -11 406 472 ;
+C 66 ; WX 320 ; N u1D461 ; B 112 -11 413 579 ;
+C 67 ; WX 580 ; N u1D462 ; B 116 -11 605 472 ;
+C 68 ; WX 479 ; N u1D463 ; B 112 -11 529 472 ;
+C 69 ; WX 737 ; N u1D464 ; B 115 -11 792 472 ;
+C 70 ; WX 485 ; N u1D465 ; B 29 -11 532 472 ;
+C 71 ; WX 439 ; N u1D466 ; B -5 -227 508 472 ;
+C 72 ; WX 439 ; N u1D467 ; B 37 -11 487 461 ;
+C 73 ; WX 518 ; N u1D6E4 ; B 42 0 654 650 ;
+C 74 ; WX 640 ; N u1D6E5 ; B 39 0 606 651 ;
+C 75 ; WX 707 ; N u1D6E9 ; B 107 -14 741 664 ;
+C 76 ; WX 688 ; N u1D6EC ; B 41 0 657 651 ;
+C 77 ; WX 684 ; N u1D6EF ; B 50 0 757 650 ;
+C 78 ; WX 725 ; N u1D6F1 ; B 41 0 834 650 ;
+C 79 ; WX 600 ; N u1D6F4 ; B 43 0 650 650 ;
+C 80 ; WX 646 ; N u1D6F6 ; B 165 0 762 661 ;
+C 81 ; WX 695 ; N u1D6F7 ; B 110 0 740 650 ;
+C 82 ; WX 787 ; N u1D6F9 ; B 191 0 885 659 ;
+C 83 ; WX 723 ; N u1D6FA ; B 54 0 755 661 ;
+C 84 ; WX 588 ; N u1D6FB ; B -27 -4 517 664 ;
+C 85 ; WX 568 ; N u1D6FC ; B 65 -11 596 461 ;
+C 86 ; WX 501 ; N u1D6FD ; B -2 -222 519 681 ;
+C 87 ; WX 557 ; N u1D6FE ; B 115 -229 634 463 ;
+C 88 ; WX 481 ; N u1D6FF ; B 91 -11 575 690 ;
+C 89 ; WX 424 ; N u1D700 ; B 53 -11 456 461 ;
+C 90 ; WX 391 ; N u1D701 ; B 69 -168 479 683 ;
+C 91 ; WX 561 ; N u1D702 ; B 117 -222 586 461 ;
+C 92 ; WX 473 ; N u1D703 ; B 79 -12 527 681 ;
+C 93 ; WX 295 ; N u1D704 ; B 73 -11 271 461 ;
+C 94 ; WX 573 ; N u1D705 ; B 118 0 620 461 ;
+C 95 ; WX 559 ; N u1D706 ; B 31 -11 563 680 ;
+C 96 ; WX 614 ; N u1D707 ; B 64 -222 611 461 ;
+C 97 ; WX 538 ; N u1D708 ; B 111 1 592 461 ;
+C 98 ; WX 410 ; N u1D709 ; B 72 -168 470 682 ;
+C 99 ; WX 575 ; N u1D70B ; B 93 -11 629 461 ;
+C 100 ; WX 467 ; N u1D70C ; B 21 -223 498 461 ;
+C 101 ; WX 432 ; N u1D70D ; B 71 -168 497 461 ;
+C 102 ; WX 591 ; N u1D70E ; B 90 -11 658 460 ;
+C 103 ; WX 494 ; N u1D70F ; B 124 -11 547 461 ;
+C 104 ; WX 516 ; N u1D710 ; B 115 -11 572 465 ;
+C 105 ; WX 625 ; N u1D711 ; B 77 -222 659 461 ;
+C 106 ; WX 533 ; N u1D712 ; B 33 -222 546 461 ;
+C 107 ; WX 697 ; N u1D713 ; B 96 -222 774 519 ;
+C 108 ; WX 658 ; N u1D714 ; B 73 -9 670 461 ;
+C 109 ; WX 505 ; N u1D715 ; B 31 -9 474 683 ;
+C 110 ; WX 407 ; N u1D716 ; B 22 -11 440 461 ;
+C 111 ; WX 558 ; N u1D717 ; B 56 -11 569 681 ;
+C 112 ; WX 535 ; N u1D718 ; B 8 -12 530 461 ;
+C 113 ; WX 623 ; N u1D719 ; B 74 -222 655 635 ;
+C 114 ; WX 549 ; N u1D71A ; B 40 -222 510 461 ;
+C 115 ; WX 703 ; N u1D71B ; B 43 -11 663 546 ;
+C 116 ; WX 559 ; N uni019B.alt ; B 11 -11 543 680 ;
+C 117 ; WX 556 ; N uni210F ; B 35 -11 524 681 ;
+C 118 ; WX 556 ; N uni210F.alt ; B 35 -11 524 681 ;
+C 120 ; WX 559 ; N uni019B.ital ; B 11 -11 543 680 ;
+C 121 ; WX 297 ; N u1D6A4 ; B 107 -11 314 472 ;
+C 122 ; WX 290 ; N u1D6A5 ; B -56 -227 306 472 ;
+C 123 ; WX 499 ; N u1D463.alt ; B 15 0 457 484 ;
+C 124 ; WX 743 ; N u1D464.alt ; B 15 0 703 485 ;
+C 125 ; WX 481 ; N zero.oldstyle ; B 42 -11 468 487 ;
+C 126 ; WX 357 ; N one.oldstyle ; B 37 0 326 482 ;
+C 127 ; WX 453 ; N two.oldstyle ; B 27 0 442 487 ;
+C 128 ; WX 456 ; N three.oldstyle ; B 26 -150 445 487 ;
+C 129 ; WX 479 ; N four.oldstyle ; B 16 -150 467 476 ;
+C 130 ; WX 475 ; N five.oldstyle ; B 39 -150 451 476 ;
+C 131 ; WX 472 ; N six.oldstyle ; B 32 -11 458 626 ;
+C 132 ; WX 464 ; N seven.oldstyle ; B 19 -150 446 476 ;
+C 133 ; WX 475 ; N eight.oldstyle ; B 40 -11 458 626 ;
+C 134 ; WX 472 ; N nine.oldstyle ; B 39 -150 451 487 ;
+C 136 ; WX 485 ; N zero ; B 30 -3 456 626 ;
+C 137 ; WX 485 ; N one ; B 119 -3 367 627 ;
+C 138 ; WX 485 ; N two ; B 42 0 443 627 ;
+C 139 ; WX 485 ; N three ; B 59 -5 426 627 ;
+C 140 ; WX 485 ; N four ; B 26 -6 459 629 ;
+C 141 ; WX 485 ; N five ; B 59 -5 426 629 ;
+C 142 ; WX 485 ; N six ; B 48 -6 438 632 ;
+C 143 ; WX 485 ; N seven ; B 38 -5 448 621 ;
+C 144 ; WX 485 ; N eight ; B 59 -9 427 628 ;
+C 145 ; WX 485 ; N nine ; B 48 -6 437 632 ;
+C 146 ; WX 454 ; N u1D454.alt ; B -1 -207 478 439 ;
+C 147 ; WX 249 ; N period ; B 66 -11 184 109 ;
+C 148 ; WX 249 ; N comma ; B 48 -133 181 133 ;
+EndCharMetrics
+EndFontMetrics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/erewhon/erewMR.afm new/fonts/afm/public/erewhon/erewMR.afm
--- old/fonts/afm/public/erewhon/erewMR.afm 1970-01-01 01:00:00.000000000 +0100
+++ new/fonts/afm/public/erewhon/erewMR.afm 2019-11-06 23:09:47.000000000 +0100
@@ -0,0 +1,99 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20190801
+Comment Creation Date: Sat Nov 2 11:59:39 2019
+FontName erewMR
+FullName erewhon Math Regular
+FamilyName erewMath
+Weight Regular
+Notice (Copyright (c) 1989, 1991 Adobe Systems Incorporated. All Rights Reserved. Utopia is either a registered trademark or trademark of Adobe Systems Incorporated in the United States and/or other countrie)
+Comment s. Used under license. The Utopia fonts are freely available; see http://tug.org/fonts/utopia.
+Comment
+Comment Copyright (c) 2003-2004 GUTenberg project for the Greek glyphs, which are part of the Fourier fonts licensed under the Latex Public Project License (LPPL)
+Comment
+Comment Copyright (c) 2014--2019, Michael Sharpe. for further revisions and additions to the Greek glyphs and other symbols, also licensed under the Latex Public Project License (LPPL).
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.000
+EncodingScheme FontSpecific
+FontBBox -30 -227 782 809
+CapHeight 650
+XHeight 519
+Ascender 650
+Descender -229
+StartCharMetrics 72
+C 0 ; WX 500 ; N uni0393 ; B 13 0 484 650 ;
+C 1 ; WX 643 ; N uni0394 ; B 25 0 617 651 ;
+C 2 ; WX 695 ; N uni0398 ; B 35 -14 661 664 ;
+C 3 ; WX 678 ; N uni039B ; B 16 0 653 651 ;
+C 4 ; WX 666 ; N uni039E ; B 39 0 627 650 ;
+C 5 ; WX 710 ; N uni03A0 ; B 18 0 692 650 ;
+C 6 ; WX 588 ; N uni03A3 ; B 18 0 562 650 ;
+C 7 ; WX 646 ; N uni03A5 ; B 29 0 628 661 ;
+C 8 ; WX 817 ; N uni03A6 ; B 35 0 782 654 ;
+C 9 ; WX 758 ; N uni03A8 ; B 18 0 740 659 ;
+C 10 ; WX 740 ; N uni03A9 ; B 29 0 711 661 ;
+C 11 ; WX 581 ; N uni03B1 ; B 41 -11 552 461 ;
+C 12 ; WX 538 ; N uni03B2 ; B 59 -222 496 681 ;
+C 13 ; WX 512 ; N uni03B3 ; B 19 -227 493 463 ;
+C 14 ; WX 515 ; N uni03B4 ; B 44 -11 471 690 ;
+C 15 ; WX 407 ; N uni03F5 ; B 21 -11 390 461 ;
+C 16 ; WX 420 ; N uni03B6 ; B 39 -168 392 683 ;
+C 17 ; WX 517 ; N uni03B7 ; B 19 -222 458 461 ;
+C 18 ; WX 526 ; N uni03B8 ; B 51 -12 475 681 ;
+C 19 ; WX 241 ; N uni03B9 ; B 59 -11 228 461 ;
+C 20 ; WX 488 ; N uni03BA ; B 32 0 489 464 ;
+C 21 ; WX 544 ; N uni03BB ; B 26 -11 528 681 ;
+C 22 ; WX 545 ; N uni03BC ; B 59 -222 527 461 ;
+C 23 ; WX 507 ; N uni03BD ; B 18 1 482 461 ;
+C 24 ; WX 416 ; N uni03BE ; B 28 -168 390 682 ;
+C 25 ; WX 579 ; N uni03C0 ; B 31 -14 542 462 ;
+C 26 ; WX 517 ; N uni03C1 ; B 43 -223 464 461 ;
+C 27 ; WX 580 ; N uni03C3 ; B 41 -11 570 460 ;
+C 28 ; WX 465 ; N uni03C4 ; B 9 -11 441 461 ;
+C 29 ; WX 551 ; N uni03C5 ; B 20 -11 481 465 ;
+C 30 ; WX 680 ; N uni03D5 ; B 43 -222 637 635 ;
+C 31 ; WX 478 ; N uni03C7 ; B 20 -226 458 461 ;
+C 32 ; WX 720 ; N uni03C8 ; B 12 -222 709 519 ;
+C 33 ; WX 682 ; N uni03C9 ; B 41 -9 641 461 ;
+C 34 ; WX 443 ; N uni03B5 ; B 41 -11 416 461 ;
+C 35 ; WX 558 ; N uni03D1 ; B 29 -11 524 681 ;
+C 36 ; WX 646 ; N uni03D6 ; B 35 -10 609 501 ;
+C 37 ; WX 520 ; N uni03F1 ; B 39 -222 478 461 ;
+C 38 ; WX 463 ; N uni03C2 ; B 41 -168 426 461 ;
+C 39 ; WX 580 ; N uni03C6 ; B 37 -223 541 422 ;
+C 40 ; WX 654 ; N uni2207 ; B 31 0 623 651 ;
+C 41 ; WX 502 ; N uni2202 ; B 41 -9 463 683 ;
+C 46 ; WX 535 ; N uni03F0 ; B 4 -12 501 461 ;
+C 47 ; WX 407 ; N uni03F6 ; B 21 -11 390 461 ;
+C 68 ; WX 561 ; N uni2107 ; B 48 -14 529 664 ;
+C 69 ; WX 589 ; N uni212B ; B -30 0 608 809 ;
+C 70 ; WX 573 ; N uni01B5 ; B 8 0 558 650 ;
+C 71 ; WX 756 ; N uni2126 ; B 35 0 717 661 ;
+C 72 ; WX 756 ; N uni2127 ; B 35 0 717 661 ;
+C 122 ; WX 273 ; N u1D6A4.up ; B 30 0 259 472 ;
+C 123 ; WX 303 ; N u1D6A5.up ; B 9 -227 228 472 ;
+C 124 ; WX 570 ; N h ; B 36 -11 536 697 ;
+C 125 ; WX 570 ; N uni210F ; B 36 -11 536 697 ;
+C 126 ; WX 421 ; N uni2113 ; B 33 -11 387 682 ;
+C 127 ; WX 570 ; N uni210F.alt ; B 36 -11 536 697 ;
+C 128 ; WX 564 ; N uni019B ; B 36 -11 538 681 ;
+C 130 ; WX 559 ; N uni019B.ital ; B 11 -11 543 680 ;
+C 131 ; WX 559 ; N uni019B.ital.alt ; B 11 -11 543 680 ;
+C 136 ; WX 376 ; N uni0300 ; B 46 509 255 680 ;
+C 137 ; WX 376 ; N uni0301 ; B 121 509 330 680 ;
+C 138 ; WX 376 ; N uni0302 ; B 44 509 332 677 ;
+C 139 ; WX 376 ; N uni0303 ; B 21 529 354 641 ;
+C 140 ; WX 376 ; N uni0304 ; B 53 561 323 617 ;
+C 141 ; WX 464 ; N uni0305 ; B 32 555 432 610 ;
+C 142 ; WX 376 ; N uni0306 ; B 59 534 317 662 ;
+C 143 ; WX 376 ; N uni0307 ; B 132 536 244 642 ;
+C 144 ; WX 376 ; N uni0308 ; B 34 536 342 642 ;
+C 145 ; WX 376 ; N uni030A ; B 86 517 290 707 ;
+C 146 ; WX 376 ; N uni030C ; B 44 509 332 677 ;
+C 147 ; WX 491 ; N uni20DB ; B 34 536 457 642 ;
+C 148 ; WX 646 ; N uni20DC ; B 34 536 612 642 ;
+C 149 ; WX 329 ; N degree ; B 35 380 294 639 ;
+EndCharMetrics
+EndFontMetrics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/erewhon/erewhon.map new/fonts/map/dvips/erewhon/erewhon.map
--- old/fonts/map/dvips/erewhon/erewhon.map 2019-01-15 22:39:07.000000000 +0100
+++ new/fonts/map/dvips/erewhon/erewhon.map 2019-11-06 23:09:47.000000000 +0100
@@ -390,3 +390,8 @@
Erewhon-Bold-tlf-ot2 Erewhon-Bold " erewhonOT2tlfenc ReEncodeFont " <[erewhontlf-ot2.enc <Erewhon-Bold.pfb
Erewhon-BoldSlanted-tlf-ot2 Erewhon-BoldSlanted " erewhonOT2tlfenc ReEncodeFont " <[erewhontlf-ot2.enc <Erewhon-BoldSlanted.pfb
Erewhon-BoldItalic-tlf-ot2 Erewhon-BoldItalic " erewhonOT2tlfenc ReEncodeFont " <[erewhontlf-ot2.enc <Erewhon-BoldItalic.pfb
+
+erewMI erewMI <erewMI.pfb
+erewBMI erewBMI <erewBMI.pfb
+erewMR erewMR <erewMR.pfb
+erewBRM erewBRM <erewBRM.pfb
Binary files old/fonts/opentype/public/erewhon/Erewhon-Bold.otf and new/fonts/opentype/public/erewhon/Erewhon-Bold.otf differ
Binary files old/fonts/opentype/public/erewhon/Erewhon-BoldItalic.otf and new/fonts/opentype/public/erewhon/Erewhon-BoldItalic.otf differ
Binary files old/fonts/opentype/public/erewhon/Erewhon-BoldSlanted.otf and new/fonts/opentype/public/erewhon/Erewhon-BoldSlanted.otf differ
Binary files old/fonts/opentype/public/erewhon/Erewhon-Italic.otf and new/fonts/opentype/public/erewhon/Erewhon-Italic.otf differ
Binary files old/fonts/opentype/public/erewhon/Erewhon-Regular.otf and new/fonts/opentype/public/erewhon/Erewhon-Regular.otf differ
Binary files old/fonts/opentype/public/erewhon/Erewhon-RegularSlanted.otf and new/fonts/opentype/public/erewhon/Erewhon-RegularSlanted.otf differ
Binary files old/fonts/tfm/public/erewhon/erewBMI.tfm and new/fonts/tfm/public/erewhon/erewBMI.tfm differ
Binary files old/fonts/tfm/public/erewhon/erewBRM.tfm and new/fonts/tfm/public/erewhon/erewBRM.tfm differ
Binary files old/fonts/tfm/public/erewhon/erewMI.tfm and new/fonts/tfm/public/erewhon/erewMI.tfm differ
Binary files old/fonts/tfm/public/erewhon/erewMR.tfm and new/fonts/tfm/public/erewhon/erewMR.tfm differ
Binary files old/fonts/type1/public/erewhon/erewBMI.pfb and new/fonts/type1/public/erewhon/erewBMI.pfb differ
Binary files old/fonts/type1/public/erewhon/erewBRM.pfb and new/fonts/type1/public/erewhon/erewBRM.pfb differ
Binary files old/fonts/type1/public/erewhon/erewMI.pfb and new/fonts/type1/public/erewhon/erewMI.pfb differ
Binary files old/fonts/type1/public/erewhon/erewMR.pfb and new/fonts/type1/public/erewhon/erewMR.pfb differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/LY1erewhon-Dnom.fd new/tex/latex/erewhon/LY1erewhon-Dnom.fd
--- old/tex/latex/erewhon/LY1erewhon-Dnom.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/LY1erewhon-Dnom.fd 2019-06-09 23:33:03.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \let\erewhon@@sf\@empty
+\fi
\DeclareFontFamily{LY1}{erewhon-Dnom}{\erewhon@sf}
\DeclareFontShape{LY1}{erewhon-Dnom}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/LY1erewhon-Inf.fd new/tex/latex/erewhon/LY1erewhon-Inf.fd
--- old/tex/latex/erewhon/LY1erewhon-Inf.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/LY1erewhon-Inf.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{LY1}{erewhon-Inf}{\erewhon@sf}
\DeclareFontShape{LY1}{erewhon-Inf}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/LY1erewhon-LF.fd new/tex/latex/erewhon/LY1erewhon-LF.fd
--- old/tex/latex/erewhon/LY1erewhon-LF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/LY1erewhon-LF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{LY1}{erewhon-LF}{\erewhon@sf}
\DeclareFontShape{LY1}{erewhon-LF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/LY1erewhon-Numr.fd new/tex/latex/erewhon/LY1erewhon-Numr.fd
--- old/tex/latex/erewhon/LY1erewhon-Numr.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/LY1erewhon-Numr.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{LY1}{erewhon-Numr}{\erewhon@sf}
\DeclareFontShape{LY1}{erewhon-Numr}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/LY1erewhon-OsF.fd new/tex/latex/erewhon/LY1erewhon-OsF.fd
--- old/tex/latex/erewhon/LY1erewhon-OsF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/LY1erewhon-OsF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{LY1}{erewhon-OsF}{\erewhon@sf}
\DeclareFontShape{LY1}{erewhon-OsF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/LY1erewhon-Sup.fd new/tex/latex/erewhon/LY1erewhon-Sup.fd
--- old/tex/latex/erewhon/LY1erewhon-Sup.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/LY1erewhon-Sup.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{LY1}{erewhon-Sup}{\erewhon@sf}
\DeclareFontShape{LY1}{erewhon-Sup}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/LY1erewhon-TLF.fd new/tex/latex/erewhon/LY1erewhon-TLF.fd
--- old/tex/latex/erewhon/LY1erewhon-TLF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/LY1erewhon-TLF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{LY1}{erewhon-TLF}{\erewhon@sf}
\DeclareFontShape{LY1}{erewhon-TLF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/LY1erewhon-TOsF.fd new/tex/latex/erewhon/LY1erewhon-TOsF.fd
--- old/tex/latex/erewhon/LY1erewhon-TOsF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/LY1erewhon-TOsF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{LY1}{erewhon-TOsF}{\erewhon@sf}
\DeclareFontShape{LY1}{erewhon-TOsF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/OT2erewhon-TLF.fd new/tex/latex/erewhon/OT2erewhon-TLF.fd
--- old/tex/latex/erewhon/OT2erewhon-TLF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/OT2erewhon-TLF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -13,7 +13,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{OT2}{erewhon-TLF}{\erewhon@sf}
\DeclareFontShape{OT2}{erewhon-TLF}{m}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T1erewhon-Dnom.fd new/tex/latex/erewhon/T1erewhon-Dnom.fd
--- old/tex/latex/erewhon/T1erewhon-Dnom.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T1erewhon-Dnom.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T1}{erewhon-Dnom}{\erewhon@sf}
\DeclareFontShape{T1}{erewhon-Dnom}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T1erewhon-Inf.fd new/tex/latex/erewhon/T1erewhon-Inf.fd
--- old/tex/latex/erewhon/T1erewhon-Inf.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T1erewhon-Inf.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T1}{erewhon-Inf}{\erewhon@sf}
\DeclareFontShape{T1}{erewhon-Inf}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T1erewhon-LF.fd new/tex/latex/erewhon/T1erewhon-LF.fd
--- old/tex/latex/erewhon/T1erewhon-LF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T1erewhon-LF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T1}{erewhon-LF}{\erewhon@sf}
\DeclareFontShape{T1}{erewhon-LF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T1erewhon-Numr.fd new/tex/latex/erewhon/T1erewhon-Numr.fd
--- old/tex/latex/erewhon/T1erewhon-Numr.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T1erewhon-Numr.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T1}{erewhon-Numr}{\erewhon@sf}
\DeclareFontShape{T1}{erewhon-Numr}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T1erewhon-OsF.fd new/tex/latex/erewhon/T1erewhon-OsF.fd
--- old/tex/latex/erewhon/T1erewhon-OsF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T1erewhon-OsF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T1}{erewhon-OsF}{\erewhon@sf}
\DeclareFontShape{T1}{erewhon-OsF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T1erewhon-Sup.fd new/tex/latex/erewhon/T1erewhon-Sup.fd
--- old/tex/latex/erewhon/T1erewhon-Sup.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T1erewhon-Sup.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T1}{erewhon-Sup}{\erewhon@sf}
\DeclareFontShape{T1}{erewhon-Sup}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T1erewhon-TLF.fd new/tex/latex/erewhon/T1erewhon-TLF.fd
--- old/tex/latex/erewhon/T1erewhon-TLF.fd 2019-01-15 22:39:07.000000000 +0100
+++ new/tex/latex/erewhon/T1erewhon-TLF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T1}{erewhon-TLF}{\erewhon@sf}
\DeclareFontShape{T1}{erewhon-TLF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T1erewhon-TOsF.fd new/tex/latex/erewhon/T1erewhon-TOsF.fd
--- old/tex/latex/erewhon/T1erewhon-TOsF.fd 2019-01-15 22:39:07.000000000 +0100
+++ new/tex/latex/erewhon/T1erewhon-TOsF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T1}{erewhon-TOsF}{\erewhon@sf}
\DeclareFontShape{T1}{erewhon-TOsF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Aerewhon-Dnom.fd new/tex/latex/erewhon/T2Aerewhon-Dnom.fd
--- old/tex/latex/erewhon/T2Aerewhon-Dnom.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Aerewhon-Dnom.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2A}{erewhon-Dnom}{\erewhon@sf}
\DeclareFontShape{T2A}{erewhon-Dnom}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Aerewhon-Inf.fd new/tex/latex/erewhon/T2Aerewhon-Inf.fd
--- old/tex/latex/erewhon/T2Aerewhon-Inf.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Aerewhon-Inf.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2A}{erewhon-Inf}{\erewhon@sf}
\DeclareFontShape{T2A}{erewhon-Inf}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Aerewhon-LF.fd new/tex/latex/erewhon/T2Aerewhon-LF.fd
--- old/tex/latex/erewhon/T2Aerewhon-LF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Aerewhon-LF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2A}{erewhon-LF}{\erewhon@sf}
\DeclareFontShape{T2A}{erewhon-LF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Aerewhon-Numr.fd new/tex/latex/erewhon/T2Aerewhon-Numr.fd
--- old/tex/latex/erewhon/T2Aerewhon-Numr.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Aerewhon-Numr.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2A}{erewhon-Numr}{\erewhon@sf}
\DeclareFontShape{T2A}{erewhon-Numr}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Aerewhon-OsF.fd new/tex/latex/erewhon/T2Aerewhon-OsF.fd
--- old/tex/latex/erewhon/T2Aerewhon-OsF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Aerewhon-OsF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2A}{erewhon-OsF}{\erewhon@sf}
\DeclareFontShape{T2A}{erewhon-OsF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Aerewhon-Sup.fd new/tex/latex/erewhon/T2Aerewhon-Sup.fd
--- old/tex/latex/erewhon/T2Aerewhon-Sup.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Aerewhon-Sup.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2A}{erewhon-Sup}{\erewhon@sf}
\DeclareFontShape{T2A}{erewhon-Sup}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Aerewhon-TLF.fd new/tex/latex/erewhon/T2Aerewhon-TLF.fd
--- old/tex/latex/erewhon/T2Aerewhon-TLF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Aerewhon-TLF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2A}{erewhon-TLF}{\erewhon@sf}
\DeclareFontShape{T2A}{erewhon-TLF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Aerewhon-TOsF.fd new/tex/latex/erewhon/T2Aerewhon-TOsF.fd
--- old/tex/latex/erewhon/T2Aerewhon-TOsF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Aerewhon-TOsF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2A}{erewhon-TOsF}{\erewhon@sf}
\DeclareFontShape{T2A}{erewhon-TOsF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Berewhon-Dnom.fd new/tex/latex/erewhon/T2Berewhon-Dnom.fd
--- old/tex/latex/erewhon/T2Berewhon-Dnom.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Berewhon-Dnom.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2B}{erewhon-Dnom}{\erewhon@sf}
\DeclareFontShape{T2B}{erewhon-Dnom}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Berewhon-Inf.fd new/tex/latex/erewhon/T2Berewhon-Inf.fd
--- old/tex/latex/erewhon/T2Berewhon-Inf.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Berewhon-Inf.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2B}{erewhon-Inf}{\erewhon@sf}
\DeclareFontShape{T2B}{erewhon-Inf}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Berewhon-LF.fd new/tex/latex/erewhon/T2Berewhon-LF.fd
--- old/tex/latex/erewhon/T2Berewhon-LF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Berewhon-LF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2B}{erewhon-LF}{\erewhon@sf}
\DeclareFontShape{T2B}{erewhon-LF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Berewhon-Numr.fd new/tex/latex/erewhon/T2Berewhon-Numr.fd
--- old/tex/latex/erewhon/T2Berewhon-Numr.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Berewhon-Numr.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2B}{erewhon-Numr}{\erewhon@sf}
\DeclareFontShape{T2B}{erewhon-Numr}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Berewhon-OsF.fd new/tex/latex/erewhon/T2Berewhon-OsF.fd
--- old/tex/latex/erewhon/T2Berewhon-OsF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Berewhon-OsF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2B}{erewhon-OsF}{\erewhon@sf}
\DeclareFontShape{T2B}{erewhon-OsF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Berewhon-Sup.fd new/tex/latex/erewhon/T2Berewhon-Sup.fd
--- old/tex/latex/erewhon/T2Berewhon-Sup.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Berewhon-Sup.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2B}{erewhon-Sup}{\erewhon@sf}
\DeclareFontShape{T2B}{erewhon-Sup}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Berewhon-TLF.fd new/tex/latex/erewhon/T2Berewhon-TLF.fd
--- old/tex/latex/erewhon/T2Berewhon-TLF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Berewhon-TLF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2B}{erewhon-TLF}{\erewhon@sf}
\DeclareFontShape{T2B}{erewhon-TLF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Berewhon-TOsF.fd new/tex/latex/erewhon/T2Berewhon-TOsF.fd
--- old/tex/latex/erewhon/T2Berewhon-TOsF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Berewhon-TOsF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2B}{erewhon-TOsF}{\erewhon@sf}
\DeclareFontShape{T2B}{erewhon-TOsF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Cerewhon-Dnom.fd new/tex/latex/erewhon/T2Cerewhon-Dnom.fd
--- old/tex/latex/erewhon/T2Cerewhon-Dnom.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Cerewhon-Dnom.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2C}{erewhon-Dnom}{\erewhon@sf}
\DeclareFontShape{T2C}{erewhon-Dnom}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Cerewhon-Inf.fd new/tex/latex/erewhon/T2Cerewhon-Inf.fd
--- old/tex/latex/erewhon/T2Cerewhon-Inf.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Cerewhon-Inf.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2C}{erewhon-Inf}{\erewhon@sf}
\DeclareFontShape{T2C}{erewhon-Inf}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Cerewhon-LF.fd new/tex/latex/erewhon/T2Cerewhon-LF.fd
--- old/tex/latex/erewhon/T2Cerewhon-LF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Cerewhon-LF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2C}{erewhon-LF}{\erewhon@sf}
\DeclareFontShape{T2C}{erewhon-LF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Cerewhon-Numr.fd new/tex/latex/erewhon/T2Cerewhon-Numr.fd
--- old/tex/latex/erewhon/T2Cerewhon-Numr.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Cerewhon-Numr.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2C}{erewhon-Numr}{\erewhon@sf}
\DeclareFontShape{T2C}{erewhon-Numr}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Cerewhon-OsF.fd new/tex/latex/erewhon/T2Cerewhon-OsF.fd
--- old/tex/latex/erewhon/T2Cerewhon-OsF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Cerewhon-OsF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2C}{erewhon-OsF}{\erewhon@sf}
\DeclareFontShape{T2C}{erewhon-OsF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Cerewhon-Sup.fd new/tex/latex/erewhon/T2Cerewhon-Sup.fd
--- old/tex/latex/erewhon/T2Cerewhon-Sup.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Cerewhon-Sup.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2C}{erewhon-Sup}{\erewhon@sf}
\DeclareFontShape{T2C}{erewhon-Sup}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Cerewhon-TLF.fd new/tex/latex/erewhon/T2Cerewhon-TLF.fd
--- old/tex/latex/erewhon/T2Cerewhon-TLF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Cerewhon-TLF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2C}{erewhon-TLF}{\erewhon@sf}
\DeclareFontShape{T2C}{erewhon-TLF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/T2Cerewhon-TOsF.fd new/tex/latex/erewhon/T2Cerewhon-TOsF.fd
--- old/tex/latex/erewhon/T2Cerewhon-TOsF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/T2Cerewhon-TOsF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{T2C}{erewhon-TOsF}{\erewhon@sf}
\DeclareFontShape{T2C}{erewhon-TOsF}{b}{scsl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/TS1erewhon-LF.fd new/tex/latex/erewhon/TS1erewhon-LF.fd
--- old/tex/latex/erewhon/TS1erewhon-LF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/TS1erewhon-LF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{TS1}{erewhon-LF}{\erewhon@sf}
\DeclareFontShape{TS1}{erewhon-LF}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/TS1erewhon-OsF.fd new/tex/latex/erewhon/TS1erewhon-OsF.fd
--- old/tex/latex/erewhon/TS1erewhon-OsF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/TS1erewhon-OsF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{TS1}{erewhon-OsF}{\erewhon@sf}
\DeclareFontShape{TS1}{erewhon-OsF}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/TS1erewhon-TLF.fd new/tex/latex/erewhon/TS1erewhon-TLF.fd
--- old/tex/latex/erewhon/TS1erewhon-TLF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/TS1erewhon-TLF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{TS1}{erewhon-TLF}{\erewhon@sf}
\DeclareFontShape{TS1}{erewhon-TLF}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/TS1erewhon-TOsF.fd new/tex/latex/erewhon/TS1erewhon-TOsF.fd
--- old/tex/latex/erewhon/TS1erewhon-TOsF.fd 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/TS1erewhon-TOsF.fd 2019-06-11 23:00:16.000000000 +0200
@@ -9,7 +9,9 @@
\edef\erewhon@@scale{s*[\csname erewhon@scale\endcsname]}%
\fi
-\providecommand{\erewhon@sf}{}
+\expandafter\ifx\csname erewhon@sf\endcsname\relax
+ \global\let\erewhon@sf\@empty
+\fi
\DeclareFontFamily{TS1}{erewhon-TOsF}{\erewhon@sf}
\DeclareFontShape{TS1}{erewhon-TOsF}{b}{sl}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/erewhon.sty new/tex/latex/erewhon/erewhon.sty
--- old/tex/latex/erewhon/erewhon.sty 2017-03-15 22:16:56.000000000 +0100
+++ new/tex/latex/erewhon/erewhon.sty 2019-11-13 22:45:10.000000000 +0100
@@ -1,8 +1,8 @@
%% erewhon.sty
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.08}
-\def\filedate{2017/03/14}
+\def\fileversion{1.102}
+\def\filedate{2019/11/13}
\ProvidesPackage{erewhon}
[\filedate\space v\fileversion]
@@ -149,7 +149,9 @@
\fi}%
\fi%
\fi
-
+\ifx\pdfglyphtounicode\@undefined \else
+ \pdfglyphtounicode{afii61664}{200B}% .. ..
+\fi
%\ifErewhon@babel
% \renewcommand*{\rmdefault}{erewhon-\Erewhon@figurealign%
% \Erewhon@figurestyle}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erewhon/newtx-erewhon-subs.tex new/tex/latex/erewhon/newtx-erewhon-subs.tex
--- old/tex/latex/erewhon/newtx-erewhon-subs.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/erewhon/newtx-erewhon-subs.tex 2019-11-07 23:15:30.000000000 +0100
@@ -0,0 +1,19 @@
+{f}{-1.5}
+{j}{-2}
+{p}{-0.5}
+{y}{0}
+{A}{-2.5}
+{B}{-1}
+{D}{-1}
+{H}{-1}
+{I}{-1}
+{K}{-1}
+{L}{-1}
+{M}{-1}
+{N}{-0.5}
+{P}{-1}
+{X}{-1}
+{Y}{0.5}
+{\beta}{-1}
+{\rho}{-1.5}
+{\mu}{-1}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/erewhon.tlpobj new/tlpkg/tlpobj/erewhon.tlpobj
--- old/tlpkg/tlpobj/erewhon.tlpobj 2019-02-28 03:35:35.000000000 +0100
+++ new/tlpkg/tlpobj/erewhon.tlpobj 2020-03-24 01:57:33.000000000 +0100
@@ -1,6 +1,6 @@
name erewhon
category Package
-revision 49715
+revision 54512
shortdesc Font package derived from Heuristica and Utopia
relocated 1
longdesc Erewhon is based on the Heuristica package, which is based in
@@ -10,13 +10,17 @@
longdesc superior letters. The size is 6% smaller than Heuristica,
longdesc matching that of UtopiaStd.
execute addMap erewhon.map
-runfiles size=2558
+runfiles size=2609
RELOC/fonts/afm/public/erewhon/Erewhon-Bold.afm
RELOC/fonts/afm/public/erewhon/Erewhon-BoldItalic.afm
RELOC/fonts/afm/public/erewhon/Erewhon-BoldSlanted.afm
RELOC/fonts/afm/public/erewhon/Erewhon-Italic.afm
RELOC/fonts/afm/public/erewhon/Erewhon-Regular.afm
RELOC/fonts/afm/public/erewhon/Erewhon-RegularSlanted.afm
+ RELOC/fonts/afm/public/erewhon/erewBMI.afm
+ RELOC/fonts/afm/public/erewhon/erewBRM.afm
+ RELOC/fonts/afm/public/erewhon/erewMI.afm
+ RELOC/fonts/afm/public/erewhon/erewMR.afm
RELOC/fonts/enc/dvips/erewhon/erewhontlf-ot2.enc
RELOC/fonts/enc/dvips/erewhon/zut1_2d6v2a.enc
RELOC/fonts/enc/dvips/erewhon/zut1_2jm7ak.enc
@@ -679,12 +683,20 @@
RELOC/fonts/tfm/public/erewhon/Erewhon-RegularSlanted-tosf-t2c.tfm
RELOC/fonts/tfm/public/erewhon/Erewhon-RegularSlanted-tosf-ts1--base.tfm
RELOC/fonts/tfm/public/erewhon/Erewhon-RegularSlanted-tosf-ts1.tfm
+ RELOC/fonts/tfm/public/erewhon/erewBMI.tfm
+ RELOC/fonts/tfm/public/erewhon/erewBRM.tfm
+ RELOC/fonts/tfm/public/erewhon/erewMI.tfm
+ RELOC/fonts/tfm/public/erewhon/erewMR.tfm
RELOC/fonts/type1/public/erewhon/Erewhon-Bold.pfb
RELOC/fonts/type1/public/erewhon/Erewhon-BoldItalic.pfb
RELOC/fonts/type1/public/erewhon/Erewhon-BoldSlanted.pfb
RELOC/fonts/type1/public/erewhon/Erewhon-Italic.pfb
RELOC/fonts/type1/public/erewhon/Erewhon-Regular.pfb
RELOC/fonts/type1/public/erewhon/Erewhon-RegularSlanted.pfb
+ RELOC/fonts/type1/public/erewhon/erewBMI.pfb
+ RELOC/fonts/type1/public/erewhon/erewBRM.pfb
+ RELOC/fonts/type1/public/erewhon/erewMI.pfb
+ RELOC/fonts/type1/public/erewhon/erewMR.pfb
RELOC/fonts/vf/public/erewhon/Erewhon-Bold-dnom-t1.vf
RELOC/fonts/vf/public/erewhon/Erewhon-Bold-inf-t1.vf
RELOC/fonts/vf/public/erewhon/Erewhon-Bold-lf-sc-ly1.vf
@@ -852,8 +864,8 @@
RELOC/tex/latex/erewhon/TS1erewhon-TOsF.fd
RELOC/tex/latex/erewhon/erewhon.fontspec
RELOC/tex/latex/erewhon/erewhon.sty
+ RELOC/tex/latex/erewhon/newtx-erewhon-subs.tex
catalogue-ctan /fonts/erewhon
-catalogue-date 2019-01-15 07:58:15 +0100
-catalogue-license ofllppl1.3
-catalogue-topics font font-otf font-type1 font-serif font-t1enc
-catalogue-version 1.091
+catalogue-license ofl lppl1.3
+catalogue-topics font font-body font-multilingual font-cyrillic font-proportional font-serif font-otf font-type1 font-supp font-t1enc
+catalogue-version 1.104
++++++ erw-l3.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/erw-l3/README.md new/doc/latex/erw-l3/README.md
--- old/doc/latex/erw-l3/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/erw-l3/README.md 2020-02-06 21:43:32.000000000 +0100
@@ -0,0 +1,7 @@
+----------------------------------------------------------------
+#### erw-l3 --- Utilities built around expl3
+- Source repository: https://github.com/rogard/erw-l3
+- Released under the LaTeX Project Public License v1.3c or later; see http://www.latex-project.org/lppl.txt
+
+----------------------------------------------------------------
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/erw-l3/README.txt new/doc/latex/erw-l3/README.txt
--- old/doc/latex/erw-l3/README.txt 2018-05-24 23:34:45.000000000 +0200
+++ new/doc/latex/erw-l3/README.txt 2020-02-06 21:43:32.000000000 +0100
@@ -1,6 +1,6 @@
----------------------------------------------------------------
erw-l3 --- Utilities built around expl3
-Source repository: https://github.com/er-cpp/erw-l3
+Source repository: https://github.com/rogard/erw-l3
Released under the LaTeX Project Public License v1.3c or later
See http://www.latex-project.org/lppl.txt
----------------------------------------------------------------
Binary files old/doc/latex/erw-l3/erw-l3.pdf and new/doc/latex/erw-l3/erw-l3.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/erw-l3.doc.tlpobj new/tlpkg/tlpobj/erw-l3.doc.tlpobj
--- old/tlpkg/tlpobj/erw-l3.doc.tlpobj 2019-02-28 03:35:39.000000000 +0100
+++ new/tlpkg/tlpobj/erw-l3.doc.tlpobj 2020-02-08 01:55:43.000000000 +0100
@@ -1,9 +1,9 @@
name erw-l3.doc
category Package
-revision 48069
+revision 53694
shortdesc doc files of erw-l3
relocated 1
-docfiles size=131
+docfiles size=133
+ RELOC/doc/latex/erw-l3/README.md
RELOC/doc/latex/erw-l3/README.txt
- RELOC/doc/latex/erw-l3/erw-l3.hd
RELOC/doc/latex/erw-l3/erw-l3.pdf
++++++ erw-l3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/erw-l3/erw-l3.sty new/tex/latex/erw-l3/erw-l3.sty
--- old/tex/latex/erw-l3/erw-l3.sty 2018-06-22 23:53:54.000000000 +0200
+++ new/tex/latex/erw-l3/erw-l3.sty 2020-02-06 21:43:32.000000000 +0100
@@ -11,15 +11,15 @@
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\ProvidesExplPackage
- {erw-l3} % Package name
- {2018/6/21} % Release date
- {0.1.3} % Release version
- {Utilities built around expl3} % Description
-\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}[2018/06/01]
\RequirePackage{xparse}[2018/02/01]
\RequirePackage{l3keys2e}
+\ProvidesExplPackage
+ {erw-l3} % Package name
+ {2020/02/05} % Release date
+ {0.1.6} % Release version
+ {Utilities built around expl3} % Description
+\NeedsTeXFormat{LaTeX2e}
\ExplSyntaxOn
\msg_new:nnn{erw}{generic}{#1}
\cs_set:Npn \erw_compose:NnV
@@ -86,6 +86,10 @@
{{\erw_numbrd_cs_names_braced:{}}}
{#2}
}
+\cs_set:Npn \erw_accum:nn #1 #2
+{
+ {#1{#2}}
+}
\cs_set:Npn \__erw_cs_name:N #1
{
\exp_last_unbraced:Nf \use_i:nnn {\cs_split_function:N #1}
@@ -102,11 +106,21 @@
\cs_set:Npn #1 ##1{#2{##1}}
}
\cs_generate_variant:Nn \erw_cs_set_eq:NN {cN}
+\cs_set:Npn \erw_cs_gset_eq:NN #1 #2
+{
+ \cs_gset:Npn #1 ##1{#2{##1}}
+}
+\cs_generate_variant:Nn \erw_cs_gset_eq:NN {cN}
\cs_set:Npn \erw_cs_set_inline:Nn #1 #2
{
\cs_set:Npn #1 ##1{#2}
}
\cs_generate_variant:Nn \erw_cs_set_inline:Nn {cn}
+\cs_set:Npn \erw_cs_gset_inline:Nn #1 #2
+{
+ \cs_gset:Npn #1 ##1{#2}
+}
+\cs_generate_variant:Nn \erw_cs_gset_inline:Nn {cn}
\tl_set:Nn \__erw_fold_set_par_tl{\c_novalue_tl}
\tl_set:Nn \__erw_fold_apply_par_tl{\c_novalue_tl}
\cs_set:Npn \erw_fold_set_par:n #1
@@ -137,27 +151,19 @@
}
\cs_generate_variant:Nn \erw_fold_seq:NV {cV}
\cs_set:Npn \erw_identity:n #1{#1}
-\cs_set:Npn\__erw_items_to:nnn #1 #2 #3
+\prg_set_conditional:Npnn \erw_is_matrix:n #1 { p, TF }
{
- \int_compare:nNnTF
- {#1}>{#2}
- {
- \exp_args:Nf \tl_head:n{#3}
- \__erw_items_to:nnn
- {#1}
- {\int_eval:n{#2+1}}
- {\exp_args:Nf \tl_tail:n{#3}}
- }
+ \erw_gset_map_inline:n{==\tl_count:n{##1}}
+ \int_compare:nTF
{
- \exp_args:Nf \tl_head:n{#3}
+ \exp_args:Nf\tl_count:n{\tl_head:n{#1}}
+ \exp_args:Nf \erw_map:n
+ {
+ \tl_tail:n{#1}
+ }
}
-}
-\cs_set:Npn \erw_items_to:nn #1 #2
-{
- \__erw_items_to:nnn
- {#1}
- {1}
- {#2}
+ {\prg_return_true:}
+ {\prg_return_false:}
}
\cs_set:Npn \erw_last_item:n #1
{
@@ -167,6 +173,10 @@
\tl_count:n{#1}
}
}
+\cs_set:Npn \erw_merge:nn #1 #2
+{
+ {#1#2}
+}
\cs_set:Npn \erw_repeat:nn #1 #2
{
\int_step_inline:nnnn{1}{1}{#1}{#2}
@@ -186,6 +196,43 @@
{
\erw_split:nnn{#1}{#2}{Nf}
}
+\cs_set:Npn \__erw_int_range:nnn #1 #2 #3
+{
+ \int_compare:nNnTF
+ {
+ \int_eval:n{#2+1}
+ }>{#3}
+ {
+ {#1}
+ }
+ {
+ \__erw_int_range:nnn
+ {
+ \exp_args:Nx\erw_accum:nn{#1}
+ {
+ \int_eval:n{#2+1}
+ }
+ }
+ {\int_eval:n{#2+1}}
+ {#3}
+ }
+}
+\cs_set:Npn \erw_int_range:nn #1 #2
+{
+ \__erw_int_range:nnn {{#1}}{#1}{#2}
+}
+\cs_set:Npn \erw_int_range:n #1
+{
+ \__erw_int_range:nnn {}{0}{#1}
+}
+\cs_set:Npn \erw_gset_map:N #1
+{
+ \erw_cs_gset_eq:NN \__erw_map:n #1
+}
+\cs_set:Npn \erw_gset_map_inline:n #1
+{
+ \erw_cs_gset_inline:Nn \__erw_map:n {#1}
+}
\cs_set:Npn \erw_map:n #1
{
\__erw_map:nn#1\q_recursion_tail\q_recursion_stop\q_recursion_tail\q_recursion_stop
@@ -228,7 +275,6 @@
{
#1{#2}{#3}{#4}{#5}
}
-
\cs_set:Npn \__erw_map_thread_at:Nnn #1 #2 #3
{
\erw_apply:Nn #1
@@ -276,7 +322,6 @@
{erw_map_thread_at:~count~of~#3~not~withing~1~to~4}
}
}
-
\cs_set:Npn \erw_map_thread:Nn #1 #2
{
% TODO check that #2 is a matrix
@@ -325,53 +370,6 @@
{
\erw_numbrd_cs_names_braced:nnn{1}{1}{\__erw_numbrd_cs_int}
}
-\cs_set:Npn \__erw_disambig:NN #1 #2 {#1{#2}}
-\cs_generate_variant:Nn \__erw_disambig:NN { Nc }
-\NewDocumentCommand{\disambignewcmd}{ s m m m }
-{
- \msg_error:nnn{erw}{generic}{disambignewcmd~undefined}
-}
-\NewDocumentCommand{\disambignewenv}{ s m m m m }
-{
- \msg_error:nnn{erw}{generic}{disambignewenv~undefined}
-}
-\keys_define:nn { erw }
-{
- disambig .code:n =
- {
- \RenewDocumentCommand{\disambignewcmd}{ s m m m }
- {
- \IfBooleanTF{##1}
- {\__erw_disambig:Nc{\RenewDocumentCommand}}
- {\__erw_disambig:Nc{\NewDocumentCommand}}
- {#1 \__erw_cs_name:N ##2}
- {##3}
- {##4}
- }
- \RenewDocumentCommand{\disambignewenv}{ s m m m m }
- {
- \IfBooleanTF{##1}
- {\RenewDocumentEnvironment}
- {\NewDocumentEnvironment}
- {#1##2}
- {##3}
- {##4}
- {##5}
- }
- },
- disambig .initial:n = \c_empty_tl
-}
-\NewDocumentCommand{\disambigset}{ m }
-{
- \keys_set:nn { erw }
- {
- disambig={#1}
- }
-}
-\NewDocumentCommand{\disambigunset}{}
-{
- \disambigset{\c_empty_tl}
-}
\NewDocumentCommand{\numbrdcsnew}{ s m }
{
\IfBooleanTF{#1}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/erw-l3.tlpobj new/tlpkg/tlpobj/erw-l3.tlpobj
--- old/tlpkg/tlpobj/erw-l3.tlpobj 2019-02-28 03:35:39.000000000 +0100
+++ new/tlpkg/tlpobj/erw-l3.tlpobj 2020-02-08 01:55:43.000000000 +0100
@@ -1,21 +1,18 @@
name erw-l3
category Package
-revision 48069
-shortdesc A bundle of small utilities built around expl3
+revision 53694
+shortdesc Utilities built around expl3
relocated 1
-longdesc Bundles LaTeX3 packages sharing the erw-l3 prefix. List of
-longdesc packages in this bundle: compose: compose control sequences,
-longdesc whether predefined or inline csutil: narrow purpose control
-longdesc sequences (backend to other packages) disambig: wrapper around
-longdesc \NewDocumentCommand to prevent name conflicts with external
-longdesc cmds numbrdcs: numbered control sequences built from other
-longdesc control sequences or inline
+longdesc Features: compose: compose control sequences, whether
+longdesc predefined or inline csutil: narrow purpose control sequences
+longdesc (backend to other packages) numbrdcs: numbered control
+longdesc sequences built from other control sequences or inline
runfiles size=3
RELOC/tex/latex/erw-l3/erw-l3.sty
catalogue-contact-home https://github.com/er-cpp/edu-latex3
+catalogue-contact-repository https://github.com/rogard/erw-l3
catalogue-contact-support https://github.com/er-cpp/edu-latex3/issues
catalogue-ctan /macros/latex/contrib/erw-l3
-catalogue-date 2018-06-22 06:13:31 +0200
catalogue-license lppl1.3c
-catalogue-topics latex3
-catalogue-version 0.1.3
+catalogue-topics latex3 expl3
+catalogue-version 0.1.6
++++++ esint.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/esint/README new/doc/latex/esint/README
--- old/doc/latex/esint/README 2007-12-24 02:38:47.000000000 +0100
+++ new/doc/latex/esint/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-The esint package is a solution to access to alternate integral symbols
-using the Computer Modern fonts.
-
-In the original Computer Modern Math font, several integral symbols are missing,
-such \oiint. Many of those symbols are available
-in other math fonts (pxfonts, txfonts, etc.), but there is no good solution if you
-want tu use Computer Modern.
-
-Run LaTeX on esint.ins to generate files.
-
-Install the files:
-
--- esint.sty and uesint.fd on TEXINPUT;
--- esint10.mf, mathint.mf and bigint.mf on MFINPUT;
--- generate tfm files running METAFONT on esint10.mf files, and put
-the *.tfm file on the right location.
-
-Run LaTeX on esint.dtx to generate
-documentation.
-
-Updates:
-
-*20/01/2005: minor change in esint.fd in order to avoid an error inside align environment.
-Thank's to Eckhard Neber.
-
-
-Contact me from my web page http://perso.wanadoo.fr/eddie.saudrais if you think
-an integral symbol is still missing.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/esint/README.txt new/doc/latex/esint/README.txt
--- old/doc/latex/esint/README.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/esint/README.txt 2019-08-29 01:41:23.000000000 +0200
@@ -0,0 +1,24 @@
+The esint package is a solution to access to alternate integral symbols
+using the Computer Modern fonts.
+
+In the original Computer Modern Math font, several integral symbols are missing,
+such \oiint. Many of those symbols are available
+in other math fonts (pxfonts, txfonts, etc.), but there is no good solution if you
+want tu use Computer Modern.
+
+The easing.ins file allows to generate mf files, but Type1 font are available on CTAN: it's better to use them!
+
+License : LPPL
+
+Updates:
+
+*2005/01/20: minor change in esint.fd in order to avoid an error inside align environment.
+Thank's to Eckhard Neber.
+
+*2019/07/19: add intimits and nointlimits options, and modify \dotsint command as \idotsint to modify all ams math symbols (request from Franck Mittelbach).
+
+*2019/08/21 and 2019/08/27: some modification of typos in dox and ins files.
+
+Eddie Saudrais
+e.saudrais(a)wanadoo.fr
+http://www.phylam.org
\ No newline at end of file
Binary files old/doc/latex/esint/esint-doc.pdf and new/doc/latex/esint/esint-doc.pdf differ
Binary files old/doc/latex/esint/esint.pdf and new/doc/latex/esint/esint.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/esint.doc.tlpobj new/tlpkg/tlpobj/esint.doc.tlpobj
--- old/tlpkg/tlpobj/esint.doc.tlpobj 2019-02-28 03:35:41.000000000 +0100
+++ new/tlpkg/tlpobj/esint.doc.tlpobj 2019-10-02 01:57:39.000000000 +0200
@@ -1,8 +1,8 @@
name esint.doc
category Package
-revision 15878
+revision 52240
shortdesc doc files of esint
relocated 1
-docfiles size=30
- RELOC/doc/latex/esint/README
- RELOC/doc/latex/esint/esint.pdf
+docfiles size=16
+ RELOC/doc/latex/esint/README.txt
+ RELOC/doc/latex/esint/esint-doc.pdf
++++++ esint.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/esint/bigint.mf new/fonts/source/public/esint/bigint.mf
--- old/fonts/source/public/esint/bigint.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/esint/bigint.mf 2019-08-29 01:41:23.000000000 +0200
@@ -6,21 +6,21 @@
%%
%% esint.dtx (with options: `mfsymbol')
%%
-%% esint package to typeset integrals signs.
+%% esint package to typeset integral signs.
%%
-%% See also http://perso.wanadoo.fr/eddie.saudrais (in french)
+%% Contact: e.saudrais(a)wanadoo.fr
%%
-%% Run LaTeX on esint.ins to generate files.
+%% License: The LATEX Project Public LiÂcense
+%%
+%% Run XeLaTeX on esint.ins to generate files.
%%
%% Install the files:
%%
-%% -- esint.sty and uesint.fd on TEXINPUT;
-%% -- esint10.mf, mathint.mf and bigint.mf on MFINPUT;
-%% -- generate tfm files running METAFONT on esint10.mf files, and put
-%% the *.tfm file on the right location.
+%% -- esint.sty and usent.fd on TEXINPUT;
+%% -- esint10.mf, mathint.mf and bigint.mf on MFINPUT
+%% -- generate Tom files running METAFONT on ensint10.mf files, and put the *.tfm file on the right location.
%%
-%% Run LaTeX on esint.dtx to generate
-%% documentation.
+%% Run XeLaTeX on esint.dtx to generate documentation.
%%
@@ -610,7 +610,7 @@
pos7(vair,-90); pos8(hair,-180); pos9(curve,-180);
pos70(vair,-90); pos80(hair,-180); pos90(curve,-180);
rt x1r=hround(w-u-tdec); x9=w-tdec-x1; x7=w-tdec-x3=3u;
-x90=x9+tdec;x70=x7+tdec; % on décalle de 10u
+x90=x9+tdec;x70=x7+tdec; % on décalle de 10u
y90=y9;y80=y8;y70=y7;
x10=x1+tdec;x30=x3+tdec;
y10=y1;y30=y3;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/esint/esint10.mf new/fonts/source/public/esint/esint10.mf
--- old/fonts/source/public/esint/esint10.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/esint/esint10.mf 2019-08-29 01:41:23.000000000 +0200
@@ -6,21 +6,21 @@
%%
%% esint.dtx (with options: `mffile')
%%
-%% esint package to typeset integrals signs.
+%% esint package to typeset integral signs.
%%
-%% See also http://perso.wanadoo.fr/eddie.saudrais (in french)
+%% Contact: e.saudrais(a)wanadoo.fr
%%
-%% Run LaTeX on esint.ins to generate files.
+%% License: The LATEX Project Public LiÂcense
+%%
+%% Run XeLaTeX on esint.ins to generate files.
%%
%% Install the files:
%%
-%% -- esint.sty and uesint.fd on TEXINPUT;
-%% -- esint10.mf, mathint.mf and bigint.mf on MFINPUT;
-%% -- generate tfm files running METAFONT on esint10.mf files, and put
-%% the *.tfm file on the right location.
+%% -- esint.sty and usent.fd on TEXINPUT;
+%% -- esint10.mf, mathint.mf and bigint.mf on MFINPUT
+%% -- generate Tom files running METAFONT on ensint10.mf files, and put the *.tfm file on the right location.
%%
-%% Run LaTeX on esint.dtx to generate
-%% documentation.
+%% Run XeLaTeX on esint.dtx to generate documentation.
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/esint/mathint.mf new/fonts/source/public/esint/mathint.mf
--- old/fonts/source/public/esint/mathint.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/esint/mathint.mf 2019-08-29 01:41:23.000000000 +0200
@@ -6,21 +6,21 @@
%%
%% esint.dtx (with options: `mfmath')
%%
-%% esint package to typeset integrals signs.
+%% esint package to typeset integral signs.
%%
-%% See also http://perso.wanadoo.fr/eddie.saudrais (in french)
+%% Contact: e.saudrais(a)wanadoo.fr
%%
-%% Run LaTeX on esint.ins to generate files.
+%% License: The LATEX Project Public LiÂcense
+%%
+%% Run XeLaTeX on esint.ins to generate files.
%%
%% Install the files:
%%
-%% -- esint.sty and uesint.fd on TEXINPUT;
-%% -- esint10.mf, mathint.mf and bigint.mf on MFINPUT;
-%% -- generate tfm files running METAFONT on esint10.mf files, and put
-%% the *.tfm file on the right location.
+%% -- esint.sty and usent.fd on TEXINPUT;
+%% -- esint10.mf, mathint.mf and bigint.mf on MFINPUT
+%% -- generate Tom files running METAFONT on ensint10.mf files, and put the *.tfm file on the right location.
%%
-%% Run LaTeX on esint.dtx to generate
-%% documentation.
+%% Run XeLaTeX on esint.dtx to generate documentation.
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/esint/esint.sty new/tex/latex/esint/esint.sty
--- old/tex/latex/esint/esint.sty 2006-01-13 00:55:03.000000000 +0100
+++ new/tex/latex/esint/esint.sty 2019-08-29 01:41:23.000000000 +0200
@@ -6,64 +6,69 @@
%%
%% esint.dtx (with options: `package')
%%
-%% esint package to typeset integrals signs.
+%% esint package to typeset integral signs.
%%
-%% See also http://perso.wanadoo.fr/eddie.saudrais (in french)
+%% Contact: e.saudrais(a)wanadoo.fr
%%
-%% Run LaTeX on esint.ins to generate files.
+%% License: The LATEX Project Public LiÂcense
+%%
+%% Run XeLaTeX on esint.ins to generate files.
%%
%% Install the files:
%%
-%% -- esint.sty and uesint.fd on TEXINPUT;
-%% -- esint10.mf, mathint.mf and bigint.mf on MFINPUT;
-%% -- generate tfm files running METAFONT on esint10.mf files, and put
-%% the *.tfm file on the right location.
+%% -- esint.sty and usent.fd on TEXINPUT;
+%% -- esint10.mf, mathint.mf and bigint.mf on MFINPUT
+%% -- generate Tom files running METAFONT on ensint10.mf files, and put the *.tfm file on the right location.
%%
-%% Run LaTeX on esint.dtx to generate
-%% documentation.
+%% Run XeLaTeX on esint.dtx to generate documentation.
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{esint}
+\DeclareOption{intlimits}{\let\ilimits@\displaylimits}
+\DeclareOption{nointlimits}{\let\ilimits@\nolimits}
+\ExecuteOptions{nointlimits}
+\ProcessOptions
\def\re@DeclareMathSymbol#1#2#3#4{%
\let#1=\undefined
\DeclareMathSymbol{#1}{#2}{#3}{#4}}
\DeclareSymbolFont{largesymbolsA}{U}{esint}{m}{n}
\re@DeclareMathSymbol{\intop}{\mathop}{largesymbolsA}{'001}
- \def\int{\intop\nolimits}
+ \def\int{\intop\ilimits@}
\re@DeclareMathSymbol{\iintop}{\mathop}{largesymbolsA}{'003}
- \def\iint{\iintop\nolimits}
+ \def\iint{\iintop\ilimits@}
\re@DeclareMathSymbol{\iiintop}{\mathop}{largesymbolsA}{'005}
- \def\iiint{\iiintop\nolimits}
+ \def\iiint{\iiintop\ilimits@}
\re@DeclareMathSymbol{\iiiintop}{\mathop}{largesymbolsA}{'007}
- \def\iiiint{\iiiintop\nolimits}
+ \def\iiiint{\iiiintop\ilimits@}
\re@DeclareMathSymbol{\dotsintop}{\mathop}{largesymbolsA}{'011}
- \def\dotsint{\dotsintop\nolimits}
+ \def\dotsint{\dotsintop\ilimits@}
\re@DeclareMathSymbol{\ointop}{\mathop}{largesymbolsA}{'013}
- \def\oint{\ointop\nolimits}
+ \def\oint{\ointop\ilimits@}
\re@DeclareMathSymbol{\oiintop}{\mathop}{largesymbolsA}{'015}
- \def\oiint{\oiintop\nolimits}
+ \def\oiint{\oiintop\ilimits@}
\re@DeclareMathSymbol{\sqintop}{\mathop}{largesymbolsA}{'017}
- \def\sqint{\sqintop\nolimits}
+ \def\sqint{\sqintop\ilimits@}
\re@DeclareMathSymbol{\sqiintop}{\mathop}{largesymbolsA}{'021}
- \def\sqiint{\sqiintop\nolimits}
+ \def\sqiint{\sqiintop\ilimits@}
\re@DeclareMathSymbol{\ointctrclockwiseop}{\mathop}{largesymbolsA}{'027}
- \def\ointctrclockwise{\ointctrclockwiseop\nolimits}
+ \def\ointctrclockwise{\ointctrclockwiseop\ilimits@}
\re@DeclareMathSymbol{\ointclockwiseop}{\mathop}{largesymbolsA}{'031}
- \def\ointclockwise{\ointclockwiseop\nolimits}
+ \def\ointclockwise{\ointclockwiseop\ilimits@}
\re@DeclareMathSymbol{\varointclockwiseop}{\mathop}{largesymbolsA}{'033}
- \def\varointclockwise{\varointclockwiseop\nolimits}
+ \def\varointclockwise{\varointclockwiseop\ilimits@}
\re@DeclareMathSymbol{\varointctrclockwiseop}{\mathop}{largesymbolsA}{'035}
- \def\varointctrclockwise{\varointctrclockwiseop\nolimits}
+ \def\varointctrclockwise{\varointctrclockwiseop\ilimits@}
\re@DeclareMathSymbol{\fintop}{\mathop}{largesymbolsA}{'037}
- \def\fint{\fintop\nolimits}
+ \def\fint{\fintop\ilimits@}
\re@DeclareMathSymbol{\varoiintop}{\mathop}{largesymbolsA}{'041}
- \def\varoiint{\varoiintop\nolimits}
+ \def\varoiint{\varoiintop\ilimits@}
\re@DeclareMathSymbol{\landupintop}{\mathop}{largesymbolsA}{'043}
- \def\landupint{\landupintop\nolimits}
+ \def\landupint{\landupintop\ilimits@}
\re@DeclareMathSymbol{\landdownintop}{\mathop}{largesymbolsA}{'045}
- \def\landdownint{\landdownintop\nolimits}
+ \def\landdownint{\landdownintop\ilimits@}
+\let\idotsint\dotsint
\endinput
%%
%% End of file `esint.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/esint/uesint.fd new/tex/latex/esint/uesint.fd
--- old/tex/latex/esint/uesint.fd 2006-01-13 00:55:03.000000000 +0100
+++ new/tex/latex/esint/uesint.fd 2019-08-29 01:41:23.000000000 +0200
@@ -6,21 +6,21 @@
%%
%% esint.dtx (with options: `fdfile')
%%
-%% esint package to typeset integrals signs.
+%% esint package to typeset integral signs.
%%
-%% See also http://perso.wanadoo.fr/eddie.saudrais (in french)
+%% Contact: e.saudrais(a)wanadoo.fr
%%
-%% Run LaTeX on esint.ins to generate files.
+%% License: The LATEX Project Public LiÂcense
+%%
+%% Run XeLaTeX on esint.ins to generate files.
%%
%% Install the files:
%%
-%% -- esint.sty and uesint.fd on TEXINPUT;
-%% -- esint10.mf, mathint.mf and bigint.mf on MFINPUT;
-%% -- generate tfm files running METAFONT on esint10.mf files, and put
-%% the *.tfm file on the right location.
+%% -- esint.sty and usent.fd on TEXINPUT;
+%% -- esint10.mf, mathint.mf and bigint.mf on MFINPUT
+%% -- generate Tom files running METAFONT on ensint10.mf files, and put the *.tfm file on the right location.
%%
-%% Run LaTeX on esint.dtx to generate
-%% documentation.
+%% Run XeLaTeX on esint.dtx to generate documentation.
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/esint.tlpobj new/tlpkg/tlpobj/esint.tlpobj
--- old/tlpkg/tlpobj/esint.tlpobj 2019-02-28 03:35:41.000000000 +0100
+++ new/tlpkg/tlpobj/esint.tlpobj 2019-10-02 01:57:39.000000000 +0200
@@ -1,10 +1,10 @@
name esint
category Package
-revision 15878
+revision 52240
shortdesc Extended set of integrals for Computer Modern
relocated 1
longdesc The esint package permits access to alternate integral symbols
-longdesc when you're using the Computer Modern fonts. In the original
+longdesc when you are using the Computer Modern fonts. In the original
longdesc set, several integral symbols are missing, such as \oiint. Many
longdesc of these symbols are available in other font sets (pxfonts,
longdesc txfonts, etc.), but there is no good solution if you want to
@@ -19,7 +19,7 @@
RELOC/tex/latex/esint/uesint.fd
catalogue-also esint-type1
catalogue-ctan /macros/latex/contrib/esint
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license pd
-catalogue-topics font font-symbol-maths font-mf
-catalogue-version 1.1
+catalogue-date 2019-08-28 20:16:01 +0200
+catalogue-license lppl
+catalogue-topics font font-symbol-maths font-mf font-supp
+catalogue-version 1.2d
1
0
Hello community,
here is the log from the commit of package texlive-specs-g for openSUSE:Factory checked in at 2020-05-29 21:17:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-g (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-g.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-g"
Fri May 29 21:17:19 2020 rev:39 rq:806889 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-g/texlive-specs-g.changes 2019-11-07 23:10:22.960125967 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-g.new.3606/texlive-specs-g.changes 2020-05-29 21:25:29.800525745 +0200
@@ -1,0 +2,60 @@
+Mon May 18 08:47:10 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Wed May 6 11:27:35 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Scan *.def files as well for RequirePackage
+
+-------------------------------------------------------------------
+Tue May 5 13:55:07 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- Update to TeXLive 2020
+ * Port patches
+ kpathsea_cnf.dif
+ latexpand_perl.dif
+ luaotfload_varfonts.dif
+ luatex_cnf.dif
+ musixtex_various.dif
+ * Delete patches not needed anymore as files have moved
+ tetex_scripts.dif
+ * Delete patche updmap-map_roboto.dif as fixed upstream
+ * Add new patches to catch moved files
+ texlive-scripts-extra_scripts.dif
+ texlive-scripts_scripts.dif
+ * Add new patch xetex_conf.dif to fit FHS location
+ * Remove TeXLive installer files breaking rpm database
+ texlive-scripts.removes
+
+-------------------------------------------------------------------
New:
----
ddphonism.doc.tar.xz
ddphonism.tar.xz
derivative.doc.tar.xz
derivative.tar.xz
domitian.doc.tar.xz
domitian.tar.xz
dotlessi.doc.tar.xz
dotlessi.tar.xz
dpcircling.doc.tar.xz
dpcircling.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-g.spec ++++++
++++ 13235 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-g/texlive-specs-g.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-g.new.3606/texlive-specs-g.spec
++++++ datetime2-breton.doc.tar.xz ++++++
Binary files old/doc/latex/datetime2-breton/datetime2-breton.pdf and new/doc/latex/datetime2-breton/datetime2-breton.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-breton.doc.tlpobj new/tlpkg/tlpobj/datetime2-breton.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-breton.doc.tlpobj 2019-02-28 03:31:15.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-breton.doc.tlpobj 2019-11-06 01:54:16.000000000 +0100
@@ -1,6 +1,6 @@
name datetime2-breton.doc
category Package
-revision 47030
+revision 52647
shortdesc doc files of datetime2-breton
relocated 1
docfiles size=70
++++++ datetime2-breton.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-breton/datetime2-breton-ascii.ldf new/tex/latex/datetime2-breton/datetime2-breton-ascii.ldf
--- old/tex/latex/datetime2-breton/datetime2-breton-ascii.ldf 2018-03-19 22:49:40.000000000 +0100
+++ new/tex/latex/datetime2-breton/datetime2-breton-ascii.ldf 2019-11-05 22:35:56.000000000 +0100
@@ -7,7 +7,7 @@
%% datetime2-breton.dtx (with options: `datetime2-breton-ascii.ldf,package')
%%
%% datetime2-breton.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{breton-ascii}[2018/03/19 v1.1]
+\ProvidesDateTimeModule{breton-ascii}[2019/11/05 v1.2]
\newcommand*{\DTMbretonordinal}[1]{%
\number#1
\ifnum#1=1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-breton/datetime2-breton-utf8.ldf new/tex/latex/datetime2-breton/datetime2-breton-utf8.ldf
--- old/tex/latex/datetime2-breton/datetime2-breton-utf8.ldf 2018-03-19 22:49:40.000000000 +0100
+++ new/tex/latex/datetime2-breton/datetime2-breton-utf8.ldf 2019-11-05 22:35:56.000000000 +0100
@@ -7,7 +7,7 @@
%% datetime2-breton.dtx (with options: `datetime2-breton-utf8.ldf,package')
%%
%% datetime2-breton.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{breton-utf8}[2018/03/19 v1.1]
+\ProvidesDateTimeModule{breton-utf8}[2019/11/05 v1.2]
\newcommand*{\DTMbretonordinal}[1]{%
\number#1
\ifnum#1=1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-breton/datetime2-breton.ldf new/tex/latex/datetime2-breton/datetime2-breton.ldf
--- old/tex/latex/datetime2-breton/datetime2-breton.ldf 2018-03-19 22:49:40.000000000 +0100
+++ new/tex/latex/datetime2-breton/datetime2-breton.ldf 2019-11-05 22:35:56.000000000 +0100
@@ -7,7 +7,7 @@
%% datetime2-breton.dtx (with options: `datetime2-breton.ldf,package')
%%
%% datetime2-breton.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{breton}[2018/03/19 v1.1]
+\ProvidesDateTimeModule{breton}[2019/11/05 v1.2]
\RequirePackage{ifxetex,ifluatex}
\ifxetex
\RequireDateTimeModule{breton-utf8}
@@ -62,8 +62,8 @@
\DTMdefkey{breton}{timezonesep}{\renewcommand*{\DTMbretontimezonesep}{#1}}
\DTMdefkey{breton}{datesep}{\renewcommand*{\DTMbretondatesep}{#1}}
\DTMdefkey{breton}{timesep}{\renewcommand*{\DTMbretontimesep}{#1}}
-\DTMdefchoicekey{breton}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{breton}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMbretonfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMbretonfmtordsuffix}[1]{%
@@ -108,7 +108,7 @@
\DTMifbool{breton}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMbretontimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -149,7 +149,7 @@
}%
{% time style
\renewcommand*\DTMdisplaytime[3]{%
- \number##1
+ \number##1 % space intended
\DTMbretontimesep\DTMtwodigits{##2}%
\ifDTMshowseconds\DTMbretontimesep\DTMtwodigits{##3}\fi
}%
@@ -161,7 +161,7 @@
\DTMifbool{breton}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMbretontimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-breton.tlpobj new/tlpkg/tlpobj/datetime2-breton.tlpobj
--- old/tlpkg/tlpobj/datetime2-breton.tlpobj 2019-02-28 03:31:15.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-breton.tlpobj 2019-11-06 01:54:16.000000000 +0100
@@ -1,6 +1,6 @@
name datetime2-breton
category Package
-revision 47030
+revision 52647
shortdesc Breton language module for the datetime2 package
relocated 1
longdesc This module provides the "breton" style that can be set using
@@ -12,7 +12,7 @@
RELOC/tex/latex/datetime2-breton/datetime2-breton-utf8.ldf
RELOC/tex/latex/datetime2-breton/datetime2-breton.ldf
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-breton
-catalogue-date 2018-03-19 17:33:02 +0100
+catalogue-date 2019-11-05 13:35:56 +0100
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.1
+catalogue-version 1.2
++++++ datetime2-english.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2-english/CHANGES new/doc/latex/datetime2-english/CHANGES
--- old/doc/latex/datetime2-english/CHANGES 2016-03-11 00:23:23.000000000 +0100
+++ new/doc/latex/datetime2-english/CHANGES 2019-10-21 23:00:42.000000000 +0200
@@ -1,3 +1,7 @@
+v1.05 (2019-10-21):
+
+ * Renamed scratch variables to avoid conflict
+
v1.04 (2016-03-09):
* Added "dowdaysep" option to en-GB, en-AU, en-NZ, en-GG,
Binary files old/doc/latex/datetime2-english/datetime2-english-sample.pdf and new/doc/latex/datetime2-english/datetime2-english-sample.pdf differ
Binary files old/doc/latex/datetime2-english/datetime2-english.pdf and new/doc/latex/datetime2-english/datetime2-english.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-english.doc.tlpobj new/tlpkg/tlpobj/datetime2-english.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-english.doc.tlpobj 2019-02-28 03:31:17.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-english.doc.tlpobj 2019-10-22 16:40:35.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-english.doc
category Package
-revision 39991
+revision 52479
shortdesc doc files of datetime2-english
relocated 1
docfiles size=161
++++++ datetime2-english.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-AU.ldf new/tex/latex/datetime2-english/datetime2-en-AU.ldf
--- old/tex/latex/datetime2-english/datetime2-en-AU.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-AU.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-AU.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-AU}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-AU}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenAUdowdaysep}{\space}
\newcommand*{\DTMenAUdaymonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-AU}{showyear}[true]{}
\DTMsetbool{en-AU}{showyear}{true}
\newcommand*{\DTMenAUfmtordsuffix}[1]{}
-\DTMdefchoicekey{en-AU}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-AU}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenAUfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenAUfmtordsuffix}[1]{%
@@ -82,11 +82,11 @@
\DTMtexorpdfstring{\protect\textsc{##1}}{##1}}%
\fi
}
-\DTMdefchoicekey{en-AU}{zone}[\val\nr]%
+\DTMdefchoicekey{en-AU}{zone}[\@dtm@val\@dtm@nr]%
{std,standard,dst,daylight,central,central-western,western%
eastern,christmas,lord-howe,cocos,keeling,clear}%
{%
- \ifcase\nr\relax
+ \ifcase\@dtm@nr\relax
% std
\appto\DTMenAUzonemaps{\DTMenAUstdzonemaps}%
\DTMenAUstdzonemaps
@@ -158,7 +158,7 @@
\renewcommand*{\DTMenglishfmtordsuffix}{\DTMenAUfmtordsuffix}%
\renewcommand*\DTMdisplaydate[4]{%
\ifDTMshowdow
- \ifnum##4>-1%
+ \ifnum##4>-1 % space intended
\DTMifbool{en-AU}{abbr}%
{\DTMenglishshortweekdayname{##4}}%
{\DTMenglishweekdayname{##4}}%
@@ -193,7 +193,7 @@
\DTMifbool{en-AU}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenAUtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -246,7 +246,7 @@
\DTMifbool{en-AU}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenAUtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-CA.ldf new/tex/latex/datetime2-english/datetime2-en-CA.ldf
--- old/tex/latex/datetime2-english/datetime2-en-CA.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-CA.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-CA.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-CA}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-CA}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenCAmonthdaysep}{\space}
\newcommand*{\DTMenCAdowmonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-CA}{showyear}[true]{}
\DTMsetbool{en-CA}{showyear}{true}
\newcommand*{\DTMenCAfmtordsuffix}[1]{}
-\DTMdefchoicekey{en-CA}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-CA}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenCAfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenCAfmtordsuffix}[1]{%
@@ -82,11 +82,11 @@
\DTMtexorpdfstring{\protect\textsc{##1}}{##1}}%
\fi
}
-\DTMdefchoicekey{en-CA}{zone}[\val\nr]%
+\DTMdefchoicekey{en-CA}{zone}[\@dtm@val\@dtm@nr]%
{std,standard,dst,daylight,newfoundland,atlantic,eastern,central,mountain,%
pacific,clear}%
{%
- \ifcase\nr\relax
+ \ifcase\@dtm@nr\relax
% std
\appto\DTMenCAzonemaps{\DTMenCAstdzonemaps}%
\DTMenCAstdzonemaps
@@ -188,7 +188,7 @@
\DTMifbool{en-CA}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenCAtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -241,7 +241,7 @@
\DTMifbool{en-CA}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenCAtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-GB.ldf new/tex/latex/datetime2-english/datetime2-en-GB.ldf
--- old/tex/latex/datetime2-english/datetime2-en-GB.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-GB.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-GB.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-GB}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-GB}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenGBdowdaysep}{\space}
\newcommand*{\DTMenGBdaymonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-GB}{showyear}[true]{}
\DTMsetbool{en-GB}{showyear}{true}
\newcommand*{\DTMenGBfmtordsuffix}[1]{#1}
-\DTMdefchoicekey{en-GB}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-GB}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenGBfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenGBfmtordsuffix}[1]{%
@@ -123,7 +123,7 @@
\DTMifbool{en-GB}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenGBtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -176,7 +176,7 @@
\DTMifbool{en-GB}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenGBtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-GG.ldf new/tex/latex/datetime2-english/datetime2-en-GG.ldf
--- old/tex/latex/datetime2-english/datetime2-en-GG.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-GG.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-GG.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-GG}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-GG}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenGGdowdaysep}{\space}
\newcommand*{\DTMenGGdaymonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-GG}{showyear}[true]{}
\DTMsetbool{en-GG}{showyear}{true}
\newcommand*{\DTMenGGfmtordsuffix}[1]{#1}
-\DTMdefchoicekey{en-GG}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-GG}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenGGfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenGGfmtordsuffix}[1]{%
@@ -88,7 +88,7 @@
\renewcommand*{\DTMenglishfmtordsuffix}{\DTMenGGfmtordsuffix}%
\renewcommand*\DTMdisplaydate[4]{%
\ifDTMshowdow
- \ifnum##4>-1%
+ \ifnum##4>-1 % space intended
\DTMifbool{en-GG}{abbr}%
{\DTMenglishshortweekdayname{##4}}%
{\DTMenglishweekdayname{##4}}%
@@ -123,7 +123,7 @@
\DTMifbool{en-GG}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenGGtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -176,7 +176,7 @@
\DTMifbool{en-GG}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenGGtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-IE.ldf new/tex/latex/datetime2-english/datetime2-en-IE.ldf
--- old/tex/latex/datetime2-english/datetime2-en-IE.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-IE.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-IE.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-IE}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-IE}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenIEdowdaysep}{\space}
\newcommand*{\DTMenIEdaymonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-IE}{showyear}[true]{}
\DTMsetbool{en-IE}{showyear}{true}
\newcommand*{\DTMenIEfmtordsuffix}[1]{#1}
-\DTMdefchoicekey{en-IE}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-IE}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenIEfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenIEfmtordsuffix}[1]{%
@@ -88,7 +88,7 @@
\renewcommand*{\DTMenglishfmtordsuffix}{\DTMenIEfmtordsuffix}%
\renewcommand*\DTMdisplaydate[4]{%
\ifDTMshowdow
- \ifnum##4>-1%
+ \ifnum##4>-1 % space intended
\DTMifbool{en-IE}{abbr}%
{\DTMenglishshortweekdayname{##4}}%
{\DTMenglishweekdayname{##4}}%
@@ -123,7 +123,7 @@
\DTMifbool{en-IE}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenIEtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -176,7 +176,7 @@
\DTMifbool{en-IE}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenIEtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-IM.ldf new/tex/latex/datetime2-english/datetime2-en-IM.ldf
--- old/tex/latex/datetime2-english/datetime2-en-IM.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-IM.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-IM.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-IM}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-IM}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenIMdowdaysep}{\space}
\newcommand*{\DTMenIMdaymonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-IM}{showyear}[true]{}
\DTMsetbool{en-IM}{showyear}{true}
\newcommand*{\DTMenIMfmtordsuffix}[1]{#1}
-\DTMdefchoicekey{en-IM}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-IM}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenIMfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenIMfmtordsuffix}[1]{%
@@ -88,7 +88,7 @@
\renewcommand*{\DTMenglishfmtordsuffix}{\DTMenIMfmtordsuffix}%
\renewcommand*\DTMdisplaydate[4]{%
\ifDTMshowdow
- \ifnum##4>-1%
+ \ifnum##4>-1 % space intended
\DTMifbool{en-IM}{abbr}%
{\DTMenglishshortweekdayname{##4}}%
{\DTMenglishweekdayname{##4}}%
@@ -123,7 +123,7 @@
\DTMifbool{en-IM}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenIMtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -176,7 +176,7 @@
\DTMifbool{en-IM}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenIMtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-JE.ldf new/tex/latex/datetime2-english/datetime2-en-JE.ldf
--- old/tex/latex/datetime2-english/datetime2-en-JE.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-JE.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-JE.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-JE}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-JE}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenJEdowdaysep}{\space}
\newcommand*{\DTMenJEdaymonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-JE}{showyear}[true]{}
\DTMsetbool{en-JE}{showyear}{true}
\newcommand*{\DTMenJEfmtordsuffix}[1]{#1}
-\DTMdefchoicekey{en-JE}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-JE}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenJEfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenJEfmtordsuffix}[1]{%
@@ -88,7 +88,7 @@
\renewcommand*{\DTMenglishfmtordsuffix}{\DTMenJEfmtordsuffix}%
\renewcommand*\DTMdisplaydate[4]{%
\ifDTMshowdow
- \ifnum##4>-1%
+ \ifnum##4>-1 % space intended
\DTMifbool{en-JE}{abbr}%
{\DTMenglishshortweekdayname{##4}}%
{\DTMenglishweekdayname{##4}}%
@@ -123,7 +123,7 @@
\DTMifbool{en-JE}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenJEtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -176,7 +176,7 @@
\DTMifbool{en-JE}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenJEtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-MT.ldf new/tex/latex/datetime2-english/datetime2-en-MT.ldf
--- old/tex/latex/datetime2-english/datetime2-en-MT.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-MT.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-MT.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-MT}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-MT}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenMTdowdaysep}{\space}
\newcommand*{\DTMenMTdaymonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-MT}{showyear}[true]{}
\DTMsetbool{en-MT}{showyear}{true}
\newcommand*{\DTMenMTfmtordsuffix}[1]{}
-\DTMdefchoicekey{en-MT}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-MT}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenMTfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenMTfmtordsuffix}[1]{%
@@ -88,7 +88,7 @@
\renewcommand*{\DTMenglishfmtordsuffix}{\DTMenMTfmtordsuffix}%
\renewcommand*\DTMdisplaydate[4]{%
\ifDTMshowdow
- \ifnum##4>-1%
+ \ifnum##4>-1 % space intended
\DTMifbool{en-MT}{abbr}%
{\DTMenglishshortweekdayname{##4}}%
{\DTMenglishweekdayname{##4}}%
@@ -123,7 +123,7 @@
\DTMifbool{en-MT}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenMTtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -176,7 +176,7 @@
\DTMifbool{en-MT}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenMTtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-NZ.ldf new/tex/latex/datetime2-english/datetime2-en-NZ.ldf
--- old/tex/latex/datetime2-english/datetime2-en-NZ.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-NZ.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-NZ.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-NZ}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-NZ}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenNZdowdaysep}{\space}
\newcommand*{\DTMenNZdaymonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-NZ}{showyear}[true]{}
\DTMsetbool{en-NZ}{showyear}{true}
\newcommand*{\DTMenNZfmtordsuffix}[1]{}
-\DTMdefchoicekey{en-NZ}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-NZ}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenNZfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenNZfmtordsuffix}[1]{%
@@ -88,7 +88,7 @@
\renewcommand*{\DTMenglishfmtordsuffix}{\DTMenNZfmtordsuffix}%
\renewcommand*\DTMdisplaydate[4]{%
\ifDTMshowdow
- \ifnum##4>-1%
+ \ifnum##4>-1 % space intended
\DTMifbool{en-NZ}{abbr}%
{\DTMenglishshortweekdayname{##4}}%
{\DTMenglishweekdayname{##4}}%
@@ -123,7 +123,7 @@
\DTMifbool{en-NZ}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenNZtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -176,7 +176,7 @@
\DTMifbool{en-NZ}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenNZtimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-en-US.ldf new/tex/latex/datetime2-english/datetime2-en-US.ldf
--- old/tex/latex/datetime2-english/datetime2-en-US.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-en-US.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-en-US.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{en-US}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{en-US}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\newcommand*{\DTMenUSmonthdaysep}{\space}
\newcommand*{\DTMenUSdowmonthsep}{\space}
@@ -69,8 +69,8 @@
\DTMdefboolkey{en-US}{showyear}[true]{}
\DTMsetbool{en-US}{showyear}{true}
\newcommand*{\DTMenUSfmtordsuffix}[1]{}
-\DTMdefchoicekey{en-US}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{en-US}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMenUSfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMenUSfmtordsuffix}[1]{%
@@ -82,11 +82,11 @@
\DTMtexorpdfstring{\protect\textsc{##1}}{##1}}%
\fi
}
-\DTMdefchoicekey{en-US}{zone}[\val\nr]%
+\DTMdefchoicekey{en-US}{zone}[\@dtm@val\@dtm@nr]%
{std,standard,dst,daylight,atlantic,eastern,central,mountain,%
pacific,alaska,hawaii-aleutian,hawaii,aleutian,samoa,charmorro,clear}%
{%
- \ifcase\nr\relax
+ \ifcase\@dtm@nr\relax
% std
\appto\DTMenUSzonemaps{\DTMenUSstdzonemaps}%
\DTMenUSstdzonemaps
@@ -210,7 +210,7 @@
\DTMifbool{en-US}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenUStimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -263,7 +263,7 @@
\DTMifbool{en-US}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMenUStimesep\DTMtwodigits{##2}\fi
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-english-base.ldf new/tex/latex/datetime2-english/datetime2-english-base.ldf
--- old/tex/latex/datetime2-english/datetime2-english-base.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-english-base.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-english-base.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{english-base}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{english-base}[2019/10/21 v1.05 (NLCT)]
\newcommand*{\DTMenglishordinal}[1]{%
\number#1 % space intended
\DTMenglishfmtordsuffix{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-english/datetime2-english.ldf new/tex/latex/datetime2-english/datetime2-english.ldf
--- old/tex/latex/datetime2-english/datetime2-english.ldf 2016-03-11 00:23:23.000000000 +0100
+++ new/tex/latex/datetime2-english/datetime2-english.ldf 2019-10-21 23:00:42.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-english.dtx (with options: `datetime2-english.ldf,package')
%%
%% datetime2-english.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -44,7 +44,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{english}[2016/03/09 v1.04 (NLCT)]
+\ProvidesDateTimeModule{english}[2019/10/21 v1.05 (NLCT)]
\RequireDateTimeModule{english-base}
\DTMnewstyle
{english}% label
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-english.tlpobj new/tlpkg/tlpobj/datetime2-english.tlpobj
--- old/tlpkg/tlpobj/datetime2-english.tlpobj 2019-02-28 03:31:17.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-english.tlpobj 2019-10-22 16:40:35.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-english
category Package
-revision 39991
+revision 52479
shortdesc English language module for the datetime2 package
relocated 1
longdesc This module provides the following styles that can be set using
@@ -28,7 +28,7 @@
RELOC/tex/latex/datetime2-english/datetime2-english-base.ldf
RELOC/tex/latex/datetime2-english/datetime2-english.ldf
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-english
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-10-21 13:10:15 +0200
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.04
+catalogue-version 1.05
++++++ datetime2-german.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2-german/README.md new/doc/latex/datetime2-german/README.md
--- old/doc/latex/datetime2-german/README.md 2017-10-05 02:41:45.000000000 +0200
+++ new/doc/latex/datetime2-german/README.md 2019-12-14 23:26:29.000000000 +0100
@@ -10,7 +10,6 @@
This module is maintained.
Current maintainer is Sebastian Friedl.
-Thanks to Jürgen Spitzmüller for his valuable advice while developing Version 2.0 of this module.
## Installation
@@ -20,12 +19,12 @@
Documentation:
- pdflatex datetime2-german.dtx
- makeindex -s gind.ist datetime2-german.idx
- makeindex -s gglo.ist -o datetime2-german.gls datetime2-german.glo
- pdflatex datetime2-german.dtx
- pdflatex datetime2-german.dtx
+ lualatex datetime2-german-doc.dtx
+ makeindex -s gind.ist datetime2-german-doc.idx
+ makeindex -s gglo.ist -o datetime2-german-doc.gls datetime2-german-doc.glo
+ lualatex datetime2-german-doc.dtx
+ lualatex datetime2-german-doc.dtx
-Move `datetime2-german.pdf` and `README` to `TEXMF/doc/latex/datetime2-contrib/datetime2-german/`
+Move `datetime2-german-doc.pdf` and `README.md` to `TEXMF/doc/latex/datetime2-contrib/datetime2-german/`
-This material is subject to the LaTeX Project Public License. See [http://www.latex-project.org/lppl.txt](http://www.latex-project.org/lppl.txt "Show the current version of the LPPL") for the details of that license.
+This material is subject to the LaTeX Project Public License. See [http://www.latex-project.org/lppl.txt](http://www.latex-project.org/lppl.txt "Show the current version of the LPPL") or `LICENSE.txt` for the details of that license.
Binary files old/doc/latex/datetime2-german/datetime2-german-doc.pdf and new/doc/latex/datetime2-german/datetime2-german-doc.pdf differ
Binary files old/doc/latex/datetime2-german/datetime2-german.pdf and new/doc/latex/datetime2-german/datetime2-german.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-german.doc.tlpobj new/tlpkg/tlpobj/datetime2-german.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-german.doc.tlpobj 2019-02-28 03:31:18.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-german.doc.tlpobj 2019-12-15 01:53:40.000000000 +0100
@@ -1,8 +1,8 @@
name datetime2-german.doc
category Package
-revision 45800
+revision 53125
shortdesc doc files of datetime2-german
relocated 1
-docfiles size=80
+docfiles size=35
RELOC/doc/latex/datetime2-german/README.md
- RELOC/doc/latex/datetime2-german/datetime2-german.pdf
+ RELOC/doc/latex/datetime2-german/datetime2-german-doc.pdf
++++++ datetime2-german.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-de-AT.ldf new/tex/latex/datetime2-german/datetime2-de-AT.ldf
--- old/tex/latex/datetime2-german/datetime2-de-AT.ldf 2017-11-14 22:06:39.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-de-AT.ldf 2019-12-14 23:26:29.000000000 +0100
@@ -4,11 +4,11 @@
%%
%% The original source files were:
%%
-%% datetime2-german.dtx (with options: `datetime2-de-AT.ldf,package')
+%% datetime2-de-AT.dtx (with options: `datetime2-de-AT.ldf,package')
%%
%% datetime2-german.dtx
%% Copyright 2015 Nicola Talbot
-%% Copyright 2017 Sebastian Friedl
+%% Copyright 2017-19 Sebastian Friedl
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -21,12 +21,16 @@
%% This work has the LPPL maintenance status `maintained'.
%% Current maintainer of the work is Sebastian Friedl
%%
-%% This work consists of the files datetime2-german.dtx and
-%% datetime2-german.ins and the derived files
-%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf,
-%% datetime2-german.ldf, datetime2-de-DE.ldf,
-%% datetime2-de-AT.ldf and datetime2-de-CH.ldf
-%%
+%% This work consists of the files and the derived files:
+%% - datetime2-german.ins, - datetime2-german-base.ldf,
+%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf,
+%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf,
+%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf,
+%% - datetime2-german.ldf, - datetime2-de-DE.ldf,
+%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and
+%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf
+%% - datetime2-de-CH.ldf and
+%% - datetime2-german-doc.dtx
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -42,14 +46,14 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{de-AT}[2017/11/13 v2.1]
-\RequireDateTimeModule{german}
+\ProvidesDateTimeModule{de-AT}[2019/12/13 v3.0]
+\RequireDateTimeModule{german-base}
\newcommand*{\DTMdeATdowdaysep}{,\space}
\newcommand*{\DTMdeATdaymonthsep}{.\DTMtexorpdfstring{\protect~}{\space}}
\newcommand*{\DTMdeATmonthyearsep}{\space}
\newcommand*{\DTMdeATdatetimesep}{,\space}
\newcommand*{\DTMdeATtimezonesep}{\space}
-\newcommand*{\DTMdeATdatesep}{-}
+\newcommand*{\DTMdeATdatesep}{.}
\newcommand*{\DTMdeATtimesep}{:}
\DTMdefkey{de-AT}{dowdaysep}{\renewcommand*{\DTMdeATdowdaysep}{#1}}
\DTMdefkey{de-AT}{daymonthsep}{\renewcommand*{\DTMdeATdaymonthsep}{#1}}
@@ -167,19 +171,28 @@
{de-AT-numeric}% label
{% date style
\renewcommand*\DTMdisplaydate[4]{%
- \DTMifbool{de-AT}{showyear}%
+ \ifDTMshowdow
+ \ifnum##4>-1
+ \DTMifbool{de-AT}{abbr}%
+ {\DTMgermanshortweekdayname{##4}}%
+ {\DTMgermanweekdayname{##4}}%
+ \DTMdeATdowdaysep
+ \fi
+ \fi
+ %
+ \DTMifbool{de-AT}{showdayofmonth}%
{%
- \number##1 % space intended
- \DTMdeATdatesep%
+ \DTMtwodigits{##3}%
+ \DTMdeATdatesep
}%
{}%
- %
\DTMtwodigits{##2}%
- %
- \DTMifbool{de-AT}{showdayofmonth}%
+ \DTMdeATdatesep%
+ \DTMifbool{de-AT}{showyear}%
{%
- \DTMdeATdatesep%
- \DTMtwodigits{##3}%
+ \DTMifbool{de-AT}{abbr}%
+ {\DTMtwodigits{##1}}%
+ {\number##1 }% space intended
}%
{}%
}%
@@ -219,20 +232,19 @@
\renewcommand*{\DTMDisplay}{\DTMdisplay}%
}
\DTMifcaseregional
-{}% do nothing
-{\DTMsetstyle{de-AT}}%
-{\DTMsetstyle{de-AT-numeric}}%
+ {}% do nothing
+ {\DTMsetstyle{de-AT}}%
+ {\DTMsetstyle{de-AT-numeric}}%
\ifcsundef{date\CurrentTrackedDialect}
{%
\ifundef\dategerman
- {% do nothing
- }%
+ {}% do nothing
{%
\def\dategerman{%
\DTMifcaseregional
{}% do nothing
- {\DTMsetstyle{german}}%
- {\DTMsetstyle{german-numeric}}%
+ {\DTMsetstyle{de-AT}}%
+ {\DTMsetstyle{de-AT-numeric}}%
}%
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-de-CH.ldf new/tex/latex/datetime2-german/datetime2-de-CH.ldf
--- old/tex/latex/datetime2-german/datetime2-de-CH.ldf 2017-11-14 22:06:39.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-de-CH.ldf 2019-12-14 23:26:29.000000000 +0100
@@ -4,11 +4,11 @@
%%
%% The original source files were:
%%
-%% datetime2-german.dtx (with options: `datetime2-de-CH.ldf,package')
+%% datetime2-de-CH.dtx (with options: `datetime2-de-CH.ldf,package')
%%
%% datetime2-german.dtx
%% Copyright 2015 Nicola Talbot
-%% Copyright 2017 Sebastian Friedl
+%% Copyright 2017-19 Sebastian Friedl
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -21,12 +21,16 @@
%% This work has the LPPL maintenance status `maintained'.
%% Current maintainer of the work is Sebastian Friedl
%%
-%% This work consists of the files datetime2-german.dtx and
-%% datetime2-german.ins and the derived files
-%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf,
-%% datetime2-german.ldf, datetime2-de-DE.ldf,
-%% datetime2-de-AT.ldf and datetime2-de-CH.ldf
-%%
+%% This work consists of the files and the derived files:
+%% - datetime2-german.ins, - datetime2-german-base.ldf,
+%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf,
+%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf,
+%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf,
+%% - datetime2-german.ldf, - datetime2-de-DE.ldf,
+%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and
+%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf
+%% - datetime2-de-CH.ldf and
+%% - datetime2-german-doc.dtx
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -42,8 +46,8 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{de-CH}[2017/11/13 v2.1]
-\RequireDateTimeModule{german}
+\ProvidesDateTimeModule{de-CH}[2019/12/13 v3.0]
+\RequireDateTimeModule{german-base}
\newcommand*{\DTMdeCHdowdaysep}{,\space}
\newcommand*{\DTMdeCHdaymonthsep}{.\DTMtexorpdfstring{\protect~}{\space}}
\newcommand*{\DTMdeCHmonthyearsep}{\space}
@@ -173,7 +177,7 @@
\DTMifbool{de-CH}{abbr}%
{\DTMgermanshortweekdayname{##4}}%
{\DTMgermanweekdayname{##4}}%
-\DTMdeCHdowdaysep
+ \DTMdeCHdowdaysep
\fi
\fi
%
@@ -187,7 +191,9 @@
\DTMdeCHdatesep%
\DTMifbool{de-CH}{showyear}%
{%
- \number##1 % space intended
+ \DTMifbool{de-CH}{abbr}%
+ {\DTMtwodigits{##1}}%
+ {\number##1 }% space intended
}%
{}%
}%
@@ -228,20 +234,19 @@
\renewcommand*{\DTMDisplay}{\DTMdisplay}%
}
\DTMifcaseregional
-{}% do nothing
-{\DTMsetstyle{de-CH}}%
-{\DTMsetstyle{de-CH-numeric}}%
+ {}% do nothing
+ {\DTMsetstyle{de-CH}}%
+ {\DTMsetstyle{de-CH-numeric}}%
\ifcsundef{date\CurrentTrackedDialect}
{%
\ifundef\dategerman
- {% do nothing
- }%
+ {}% do nothing
{%
\def\dategerman{%
\DTMifcaseregional
{}% do nothing
- {\DTMsetstyle{german}}%
- {\DTMsetstyle{german-numeric}}%
+ {\DTMsetstyle{de-CH}}%
+ {\DTMsetstyle{de-CH-numeric}}%
}%
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-de-DE.ldf new/tex/latex/datetime2-german/datetime2-de-DE.ldf
--- old/tex/latex/datetime2-german/datetime2-de-DE.ldf 2017-11-14 22:06:39.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-de-DE.ldf 2019-12-14 23:26:29.000000000 +0100
@@ -4,11 +4,11 @@
%%
%% The original source files were:
%%
-%% datetime2-german.dtx (with options: `datetime2-de-DE.ldf,package')
+%% datetime2-de-DE.dtx (with options: `datetime2-de-DE.ldf,package')
%%
%% datetime2-german.dtx
%% Copyright 2015 Nicola Talbot
-%% Copyright 2017 Sebastian Friedl
+%% Copyright 2017-19 Sebastian Friedl
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -21,12 +21,16 @@
%% This work has the LPPL maintenance status `maintained'.
%% Current maintainer of the work is Sebastian Friedl
%%
-%% This work consists of the files datetime2-german.dtx and
-%% datetime2-german.ins and the derived files
-%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf,
-%% datetime2-german.ldf, datetime2-de-DE.ldf,
-%% datetime2-de-AT.ldf and datetime2-de-CH.ldf
-%%
+%% This work consists of the files and the derived files:
+%% - datetime2-german.ins, - datetime2-german-base.ldf,
+%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf,
+%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf,
+%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf,
+%% - datetime2-german.ldf, - datetime2-de-DE.ldf,
+%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and
+%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf
+%% - datetime2-de-CH.ldf and
+%% - datetime2-german-doc.dtx
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -42,8 +46,8 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{de-DE}[2017/11/13 v2.1]
-\RequireDateTimeModule{german}
+\ProvidesDateTimeModule{de-DE}[2019/12/13 v3.0]
+\RequireDateTimeModule{german-base}
\newcommand*{\DTMdeDEdowdaysep}{,\space}
\newcommand*{\DTMdeDEdaymonthsep}{.\DTMtexorpdfstring{\protect~}{\space}}
\newcommand*{\DTMdeDEmonthyearsep}{\space}
@@ -90,9 +94,7 @@
\DTMifbool{de-DE}{showyear}%
{%
\DTMdeDEmonthyearsep%
- \DTMifbool{de-DE}{abbr}%
- {'\DTMtwodigits{##1}}%
- {\number##1 }% space intended
+ \number##1 % space intended
}%
{}%
}%
@@ -117,9 +119,7 @@
\DTMifbool{de-DE}{showyear}%
{%
\DTMdeDEmonthyearsep%
- \DTMifbool{de-DE}{abbr}%
- {'\DTMtwodigits{##1}}%
- {\number##1 }% space intended
+ \number##1 % space intended
}%
{}%
}
@@ -233,19 +233,18 @@
}
\DTMifcaseregional
{}% do nothing
- {\DTMsetstyle{de-DE}}
- {\DTMsetstyle{de-DE-numeric}}
+ {\DTMsetstyle{de-DE}}%
+ {\DTMsetstyle{de-DE-numeric}}%
\ifcsundef{date\CurrentTrackedDialect}
{%
\ifundef\dategerman
- {% do nothing
- }%
+ {}% do nothing
{%
\def\dategerman{%
\DTMifcaseregional
{}% do nothing
- {\DTMsetstyle{german}}%
- {\DTMsetstyle{german-numeric}}%
+ {\DTMsetstyle{de-DE}}%
+ {\DTMsetstyle{de-DE-numeric}}%
}%
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-german-ascii.ldf new/tex/latex/datetime2-german/datetime2-german-ascii.ldf
--- old/tex/latex/datetime2-german/datetime2-german-ascii.ldf 2017-11-14 22:06:39.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-german-ascii.ldf 1970-01-01 01:00:00.000000000 +0100
@@ -1,225 +0,0 @@
-%%
-%% This is file `datetime2-german-ascii.ldf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% datetime2-german.dtx (with options: `datetime2-german-ascii.ldf,package')
-%%
-%% datetime2-german.dtx
-%% Copyright 2015 Nicola Talbot
-%% Copyright 2017 Sebastian Friedl
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
-%% of this license of (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%% Current maintainer of the work is Sebastian Friedl
-%%
-%% This work consists of the files datetime2-german.dtx and
-%% datetime2-german.ins and the derived files
-%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf,
-%% datetime2-german.ldf, datetime2-de-DE.ldf,
-%% datetime2-de-AT.ldf and datetime2-de-CH.ldf
-%%
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{german-ascii}[2017/11/13 v2.1]
-\newcommand*{\DTMgermanordinal}[1]{%
- \number#1
-}
-\newcommand*{\DTMgermanmonthname}[1]{%
- \ifcase#1
- \or
- Januar%
- \or
- Februar%
- \or
- M\protect\"arz%
- \or
- April%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- August%
- \or
- September%
- \or
- Oktober%
- \or
- November%
- \or
- Dezember%
- \fi
-}
-\newcommand*{\DTMdeATmonthname}[1]{%
- \ifcase#1
- \or
- J\protect\"anner%
- \or
- Februar%
- \or
- M\protect\"arz%
- \or
- April%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- August%
- \or
- September%
- \or
- Oktober%
- \or
- November%
- \or
- Dezember%
- \fi
-}
-\newcommand*{\DTMgermanshortmonthname}[1]{%
- \ifcase#1
- \or
- Jan.%
- \or
- Feb.%
- \or
- M\protect\"arz%
- \or
- Apr.%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- Aug.%
- \or
- Sept.%
- \or
- Okt.%
- \or
- Nov.%
- \or
- Dez.%
- \fi
-}
-\newcommand*{\DTMdeATshortmonthname}[1]{%
- \ifcase#1
- \or
- J\protect\"an.%
- \or
- Feb.%
- \or
- M\protect\"arz%
- \or
- Apr.%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- Aug.%
- \or
- Sept.%
- \or
- Okt.%
- \or
- Nov.%
- \or
- Dez.%
- \fi
-}
-\newcommand*{\DTMdeCHshortmonthname}[1]{%
-\ifcase#1
-\or
-Jan.%
-\or
-Febr.%
-\or
-M\protect\"arz%
-\or
-April%
-\or
-Mai%
-\or
-Juni%
-\or
-Juli%
-\or
-Aug.%
-\or
-Sept.%
-\or
-Okt.%
-\or
-Nov.%
-\or
-Dez.%
-\fi
-}
-\newcommand*{\DTMgermanweekdayname}[1]{%
- \ifcase#1
- Montag%
- \or
- Dienstag%
- \or
- Mittwoch%
- \or
- Donnerstag%
- \or
- Freitag%
- \or
- Samstag%
- \or
- Sonntag%
- \fi
-}
-\newcommand*{\DTMgermanshortweekdayname}[1]{%
- \ifcase#1
- Mo%
- \or
- Di%
- \or
- Mi%
- \or
- Do%
- \or
- Fr%
- \or
- Sa%
- \or
- So%
- \fi
-}
-\endinput
-%%
-%% End of file `datetime2-german-ascii.ldf'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-german-base-ascii.ldf new/tex/latex/datetime2-german/datetime2-german-base-ascii.ldf
--- old/tex/latex/datetime2-german/datetime2-german-base-ascii.ldf 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-german-base-ascii.ldf 2019-12-14 23:26:29.000000000 +0100
@@ -0,0 +1,192 @@
+%%
+%% This is file `datetime2-german-base-ascii.ldf',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% datetime2-german-base-ascii.dtx (with options: `datetime2-german-base-ascii.ldf,package')
+%%
+%% datetime2-german.dtx
+%% Copyright 2015 Nicola Talbot
+%% Copyright 2017-19 Sebastian Friedl
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license of (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% Current maintainer of the work is Sebastian Friedl
+%%
+%% This work consists of the files and the derived files:
+%% - datetime2-german.ins, - datetime2-german-base.ldf,
+%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf,
+%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf,
+%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf,
+%% - datetime2-german.ldf, - datetime2-de-DE.ldf,
+%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and
+%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf
+%% - datetime2-de-CH.ldf and
+%% - datetime2-german-doc.dtx
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\ProvidesDateTimeModule{german-base-ascii}[2019/12/13 v3.0]
+\newcommand*{\DTMgermanmonthname}[1]{%
+ \ifcase#1
+ \or
+ Januar%
+ \or
+ Februar%
+ \or
+ M\protect\"arz%
+ \or
+ April%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ August%
+ \or
+ September%
+ \or
+ Oktober%
+ \or
+ November%
+ \or
+ Dezember%
+ \fi
+}
+\newcommand*{\DTMdeATmonthname}[1]{%
+ \ifcase#1
+ \or
+ J\protect\"anner%
+ \or
+ Februar%
+ \or
+ M\protect\"arz%
+ \or
+ April%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ August%
+ \or
+ September%
+ \or
+ Oktober%
+ \or
+ November%
+ \or
+ Dezember%
+ \fi
+}
+\newcommand*{\DTMgermanshortmonthname}[1]{%
+ \ifcase#1
+ \or
+ Jan.%
+ \or
+ Feb.%
+ \or
+ M\protect\"arz%
+ \or
+ Apr.%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ Aug.%
+ \or
+ Sept.%
+ \or
+ Okt.%
+ \or
+ Nov.%
+ \or
+ Dez.%
+ \fi
+}
+\newcommand*{\DTMdeATshortmonthname}[1]{%
+ \ifcase#1
+ \or
+ J\protect\"an.%
+ \or
+ Feb.%
+ \or
+ M\protect\"arz%
+ \or
+ Apr.%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ Aug.%
+ \or
+ Sept.%
+ \or
+ Okt.%
+ \or
+ Nov.%
+ \or
+ Dez.%
+ \fi
+}
+\newcommand*{\DTMdeCHshortmonthname}[1]{%
+ \ifcase#1
+ \or
+ Jan.%
+ \or
+ Febr.%
+ \or
+ M\protect\"arz%
+ \or
+ April%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ Aug.%
+ \or
+ Sept.%
+ \or
+ Okt.%
+ \or
+ Nov.%
+ \or
+ Dez.%
+ \fi
+}
+\endinput
+%%
+%% End of file `datetime2-german-base-ascii.ldf'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-german-base-utf8.ldf new/tex/latex/datetime2-german/datetime2-german-base-utf8.ldf
--- old/tex/latex/datetime2-german/datetime2-german-base-utf8.ldf 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-german-base-utf8.ldf 2019-12-14 23:26:29.000000000 +0100
@@ -0,0 +1,192 @@
+%%
+%% This is file `datetime2-german-base-utf8.ldf',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% datetime2-german-base-utf8.dtx (with options: `datetime2-german-base-utf8.ldf,package')
+%%
+%% datetime2-german.dtx
+%% Copyright 2015 Nicola Talbot
+%% Copyright 2017-19 Sebastian Friedl
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license of (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% Current maintainer of the work is Sebastian Friedl
+%%
+%% This work consists of the files and the derived files:
+%% - datetime2-german.ins, - datetime2-german-base.ldf,
+%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf,
+%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf,
+%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf,
+%% - datetime2-german.ldf, - datetime2-de-DE.ldf,
+%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and
+%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf
+%% - datetime2-de-CH.ldf and
+%% - datetime2-german-doc.dtx
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\ProvidesDateTimeModule{german-base-utf8}[2019/12/13 v3.0]
+\newcommand*{\DTMgermanmonthname}[1]{%
+ \ifcase#1
+ \or
+ Januar%
+ \or
+ Februar%
+ \or
+ März%
+ \or
+ April%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ August%
+ \or
+ September%
+ \or
+ Oktober%
+ \or
+ November%
+ \or
+ Dezember%
+ \fi
+}
+\newcommand*{\DTMdeATmonthname}[1]{%
+ \ifcase#1
+ \or
+ Jänner%
+ \or
+ Februar%
+ \or
+ März%
+ \or
+ April%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ August%
+ \or
+ September%
+ \or
+ Oktober%
+ \or
+ November%
+ \or
+ Dezember%
+ \fi
+}
+\newcommand*{\DTMgermanshortmonthname}[1]{%
+ \ifcase#1
+ \or
+ Jan.%
+ \or
+ Feb.%
+ \or
+ März%
+ \or
+ Apr.%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ Aug.%
+ \or
+ Sept.%
+ \or
+ Okt.%
+ \or
+ Nov.%
+ \or
+ Dez.%
+ \fi
+}
+\newcommand*{\DTMdeATshortmonthname}[1]{%
+ \ifcase#1
+ \or
+ Jän.%
+ \or
+ Feb.%
+ \or
+ März%
+ \or
+ Apr.%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ Aug.%
+ \or
+ Sept.%
+ \or
+ Okt.%
+ \or
+ Nov.%
+ \or
+ Dez.%
+ \fi
+}
+\newcommand*{\DTMdeCHshortmonthname}[1]{%
+ \ifcase#1
+ \or
+ Jan.%
+ \or
+ Febr.%
+ \or
+ März%
+ \or
+ April%
+ \or
+ Mai%
+ \or
+ Juni%
+ \or
+ Juli%
+ \or
+ Aug.%
+ \or
+ Sept.%
+ \or
+ Okt.%
+ \or
+ Nov.%
+ \or
+ Dez.%
+ \fi
+}
+\endinput
+%%
+%% End of file `datetime2-german-base-utf8.ldf'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-german-base.ldf new/tex/latex/datetime2-german/datetime2-german-base.ldf
--- old/tex/latex/datetime2-german/datetime2-german-base.ldf 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-german-base.ldf 2019-12-14 23:26:29.000000000 +0100
@@ -0,0 +1,103 @@
+%%
+%% This is file `datetime2-german-base.ldf',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% datetime2-german-base.dtx (with options: `datetime2-german-base.ldf,package')
+%%
+%% datetime2-german.dtx
+%% Copyright 2015 Nicola Talbot
+%% Copyright 2017-19 Sebastian Friedl
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3c
+%% of this license of (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008/05/04 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%% Current maintainer of the work is Sebastian Friedl
+%%
+%% This work consists of the files and the derived files:
+%% - datetime2-german.ins, - datetime2-german-base.ldf,
+%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf,
+%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf,
+%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf,
+%% - datetime2-german.ldf, - datetime2-de-DE.ldf,
+%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and
+%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf
+%% - datetime2-de-CH.ldf and
+%% - datetime2-german-doc.dtx
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\ProvidesDateTimeModule{german-base}[2019/12/13 v3.0]
+\newcommand*{\DTMgermanordinal}[1]{%
+ \number#1
+}
+\newcommand*{\DTMgermanweekdayname}[1]{%
+ \ifcase#1
+ Montag%
+ \or
+ Dienstag%
+ \or
+ Mittwoch%
+ \or
+ Donnerstag%
+ \or
+ Freitag%
+ \or
+ Samstag%
+ \or
+ Sonntag%
+ \fi
+}
+\newcommand*{\DTMgermanshortweekdayname}[1]{%
+ \ifcase#1
+ Mo%
+ \or
+ Di%
+ \or
+ Mi%
+ \or
+ Do%
+ \or
+ Fr%
+ \or
+ Sa%
+ \or
+ So%
+ \fi
+}
+\newcommand*{\DTMgermanzonemaps}{%
+ \DTMdefzonemap{01}{00}{MEZ}%
+ \DTMdefzonemap{02}{00}{MESZ}%
+}
+\RequirePackage{ifxetex, ifluatex}
+\ifxetex
+ \RequireDateTimeModule{german-base-utf8}
+\else
+ \ifluatex
+ \RequireDateTimeModule{german-base-utf8}
+ \else
+ \RequireDateTimeModule{german-base-ascii}
+ \fi
+\fi
+\endinput
+%%
+%% End of file `datetime2-german-base.ldf'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-german-utf8.ldf new/tex/latex/datetime2-german/datetime2-german-utf8.ldf
--- old/tex/latex/datetime2-german/datetime2-german-utf8.ldf 2017-11-14 22:06:39.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-german-utf8.ldf 1970-01-01 01:00:00.000000000 +0100
@@ -1,225 +0,0 @@
-%%
-%% This is file `datetime2-german-utf8.ldf',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% datetime2-german.dtx (with options: `datetime2-german-utf8.ldf,package')
-%%
-%% datetime2-german.dtx
-%% Copyright 2015 Nicola Talbot
-%% Copyright 2017 Sebastian Friedl
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3c
-%% of this license of (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%% Current maintainer of the work is Sebastian Friedl
-%%
-%% This work consists of the files datetime2-german.dtx and
-%% datetime2-german.ins and the derived files
-%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf,
-%% datetime2-german.ldf, datetime2-de-DE.ldf,
-%% datetime2-de-AT.ldf and datetime2-de-CH.ldf
-%%
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{german-utf8}[2017/11/13 v2.1]
-\newcommand*{\DTMgermanordinal}[1]{%
- \number#1
-}
-\newcommand*{\DTMgermanmonthname}[1]{%
- \ifcase#1
- \or
- Januar%
- \or
- Februar%
- \or
- März%
- \or
- April%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- August%
- \or
- September%
- \or
- Oktober%
- \or
- November%
- \or
- Dezember%
- \fi
-}
-\newcommand*{\DTMdeATmonthname}[1]{%
- \ifcase#1
- \or
- Jänner%
- \or
- Februar%
- \or
- März%
- \or
- April%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- August%
- \or
- September%
- \or
- Oktober%
- \or
- November%
- \or
- Dezember%
- \fi
-}
-\newcommand*{\DTMgermanshortmonthname}[1]{%
- \ifcase#1
- \or
- Jan.%
- \or
- Feb.%
- \or
- März%
- \or
- Apr.%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- Aug.%
- \or
- Sept.%
- \or
- Okt.%
- \or
- Nov.%
- \or
- Dez.%
- \fi
-}
-\newcommand*{\DTMdeATshortmonthname}[1]{%
- \ifcase#1
- \or
- Jän.%
- \or
- Feb.%
- \or
- März%
- \or
- Apr.%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- Aug.%
- \or
- Sept.%
- \or
- Okt.%
- \or
- Nov.%
- \or
- Dez.%
- \fi
-}
-\newcommand*{\DTMdeCHshortmonthname}[1]{%
- \ifcase#1
- \or
- Jan.%
- \or
- Febr.%
- \or
- März%
- \or
- April%
- \or
- Mai%
- \or
- Juni%
- \or
- Juli%
- \or
- Aug.%
- \or
- Sept.%
- \or
- Okt.%
- \or
- Nov.%
- \or
- Dez.%
- \fi
-}
-\newcommand*{\DTMgermanweekdayname}[1]{%
- \ifcase#1
- Montag%
- \or
- Dienstag%
- \or
- Mittwoch%
- \or
- Donnerstag%
- \or
- Freitag%
- \or
- Samstag%
- \or
- Sonntag%
- \fi
-}
-\newcommand*{\DTMgermanshortweekdayname}[1]{%
- \ifcase#1
- Mo%
- \or
- Di%
- \or
- Mi%
- \or
- Do%
- \or
- Fr%
- \or
- Sa%
- \or
- So%
- \fi
-}
-\endinput
-%%
-%% End of file `datetime2-german-utf8.ldf'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-german/datetime2-german.ldf new/tex/latex/datetime2-german/datetime2-german.ldf
--- old/tex/latex/datetime2-german/datetime2-german.ldf 2017-11-14 22:06:39.000000000 +0100
+++ new/tex/latex/datetime2-german/datetime2-german.ldf 2019-12-14 23:26:29.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% datetime2-german.dtx
%% Copyright 2015 Nicola Talbot
-%% Copyright 2017 Sebastian Friedl
+%% Copyright 2017-19 Sebastian Friedl
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -21,12 +21,16 @@
%% This work has the LPPL maintenance status `maintained'.
%% Current maintainer of the work is Sebastian Friedl
%%
-%% This work consists of the files datetime2-german.dtx and
-%% datetime2-german.ins and the derived files
-%% datetime2-german-utf8.ldf, datetime2-german-ascii.ldf,
-%% datetime2-german.ldf, datetime2-de-DE.ldf,
-%% datetime2-de-AT.ldf and datetime2-de-CH.ldf
-%%
+%% This work consists of the files and the derived files:
+%% - datetime2-german.ins, - datetime2-german-base.ldf,
+%% - datetime2-german-base.dtx, - datetime2-german-base-ascii.ldf,
+%% - datetime2-german-base-ascii.dtx, - datetime2-german-base-utf8.ldf,
+%% - datetime2-german-base-utf8.dtx, - datetime2-german.ldf,
+%% - datetime2-german.ldf, - datetime2-de-DE.ldf,
+%% - datetime2-de-DE.ldf, - datetime2-de-AT.ldf and
+%% - datetime2-de-AT.ldf, - datetime2-de-CH.ldf
+%% - datetime2-de-CH.ldf and
+%% - datetime2-german-doc.dtx
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -42,17 +46,8 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{german}[2017/11/13 v2.1]
-\RequirePackage{ifxetex,ifluatex}
-\ifxetex
- \RequireDateTimeModule{german-utf8}
-\else
- \ifluatex
- \RequireDateTimeModule{german-utf8}
- \else
- \RequireDateTimeModule{german-ascii}
- \fi
-\fi
+\ProvidesDateTimeModule{german}[2019/12/13 v3.0]
+\RequireDateTimeModule{german-base}
\newcommand*{\DTMgermandowdaysep}{,\space}
\newcommand*{\DTMgermandaymonthsep}{.\DTMtexorpdfstring{\protect~}{\space}}
\newcommand*{\DTMgermanmonthyearsep}{\space}
@@ -99,9 +94,7 @@
\DTMifbool{german}{showyear}%
{%
\DTMgermanmonthyearsep%
- \DTMifbool{german}{abbr}%
- {'\DTMtwodigits{##1}}%
- {\number##1 }% space intended
+ \number##1 % space intended
}%
{}%
}%
@@ -126,9 +119,7 @@
\DTMifbool{german}{showyear}%
{%
\DTMgermanmonthyearsep%
- \DTMifbool{german}{abbr}%
- {'\DTMtwodigits{##1}}%
- {\number##1 }% space intended
+ \number##1 % space intended
}%
{}%
}%
@@ -240,11 +231,6 @@
}%
\renewcommand*{\DTMDisplay}{\DTMdisplay}%
}
-\newcommand*{\DTMgermanzonemaps}{%
- \DTMdefzonemap{01}{00}{MEZ}%
- \DTMdefzonemap{02}{00}{MESZ}%
-}
-
\DTMifcaseregional
{}% do nothing
{\DTMsetstyle{german}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-german.tlpobj new/tlpkg/tlpobj/datetime2-german.tlpobj
--- old/tlpkg/tlpobj/datetime2-german.tlpobj 2019-02-28 03:31:18.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-german.tlpobj 2019-12-15 01:53:40.000000000 +0100
@@ -1,21 +1,21 @@
name datetime2-german
category Package
-revision 45800
+revision 53125
shortdesc German language module for the datetime2 package
relocated 1
longdesc This module provides the "german" style that can be set using
longdesc \DTMsetstyle provided by datetime2.sty.
-runfiles size=10
+runfiles size=11
RELOC/tex/latex/datetime2-german/datetime2-de-AT.ldf
RELOC/tex/latex/datetime2-german/datetime2-de-CH.ldf
RELOC/tex/latex/datetime2-german/datetime2-de-DE.ldf
- RELOC/tex/latex/datetime2-german/datetime2-german-ascii.ldf
- RELOC/tex/latex/datetime2-german/datetime2-german-utf8.ldf
+ RELOC/tex/latex/datetime2-german/datetime2-german-base-ascii.ldf
+ RELOC/tex/latex/datetime2-german/datetime2-german-base-utf8.ldf
+ RELOC/tex/latex/datetime2-german/datetime2-german-base.ldf
RELOC/tex/latex/datetime2-german/datetime2-german.ldf
-catalogue-contact-bugs https://github.com/SFr682k/datetime2-german/issues
-catalogue-contact-repository https://github.com/SFr682k/datetime2-german
+catalogue-contact-bugs https://gitlab.com/SFr682k/datetime2-german/issues
+catalogue-contact-repository https://gitlab.com/SFr682k/datetime2-german
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-german
-catalogue-date 2017-11-13 22:45:08 +0100
catalogue-license lppl1.3c
catalogue-topics date-time multilingual
-catalogue-version 2.1
+catalogue-version 3.0
++++++ datetime2-it-fulltext.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-it-fulltext.doc.tlpobj new/tlpkg/tlpobj/datetime2-it-fulltext.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-it-fulltext.doc.tlpobj 2019-02-28 03:31:20.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-it-fulltext.doc.tlpobj 2020-04-19 18:09:42.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-it-fulltext.doc
category Package
-revision 38093
+revision 54779
shortdesc doc files of datetime2-it-fulltext
relocated 1
docfiles size=44
++++++ datetime2-it-fulltext.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-it-fulltext.tlpobj new/tlpkg/tlpobj/datetime2-it-fulltext.tlpobj
--- old/tlpkg/tlpobj/datetime2-it-fulltext.tlpobj 2019-02-28 03:31:20.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-it-fulltext.tlpobj 2020-04-19 18:09:42.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-it-fulltext
category Package
-revision 38093
+revision 54779
shortdesc Italian full text styles for the datetime2 package
relocated 1
longdesc Italian date and time styles that use words for the numbers and
@@ -10,12 +10,12 @@
longdesc The necessary packages are datetime2, itnumpar, ifxetex, and
longdesc ifluatex. This package is the translation and adaptation of
longdesc datetime2-en-fulltext.
+depend iftex
runfiles size=10
RELOC/tex/latex/datetime2-it-fulltext/datetime2-it-fulltext-ascii.ldf
RELOC/tex/latex/datetime2-it-fulltext/datetime2-it-fulltext-utf8.ldf
RELOC/tex/latex/datetime2-it-fulltext/datetime2-it-fulltext.sty
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-it-fulltext
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics date-time multilingual
catalogue-version 1.6
++++++ datetime2-scottish.doc.tar.xz ++++++
Binary files old/doc/latex/datetime2-scottish/datetime2-scottish.pdf and new/doc/latex/datetime2-scottish/datetime2-scottish.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-scottish.doc.tlpobj new/tlpkg/tlpobj/datetime2-scottish.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-scottish.doc.tlpobj 2019-02-28 03:31:22.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-scottish.doc.tlpobj 2019-09-16 01:54:06.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-scottish.doc
category Package
-revision 36625
+revision 52101
shortdesc doc files of datetime2-scottish
relocated 1
docfiles size=71
++++++ datetime2-scottish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-scottish/datetime2-scottish-ascii.ldf new/tex/latex/datetime2-scottish/datetime2-scottish-ascii.ldf
--- old/tex/latex/datetime2-scottish/datetime2-scottish-ascii.ldf 2015-03-25 22:53:50.000000000 +0100
+++ new/tex/latex/datetime2-scottish/datetime2-scottish-ascii.ldf 2019-09-15 22:46:00.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-scottish.dtx (with options: `datetime2-scottish-ascii.ldf,package')
%%
%% datetime2-scottish.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{scottish-ascii}[2015/03/25 v1.0]
+\ProvidesDateTimeModule{scottish-ascii}[2019/09/14 v1.0]
\newcommand*{\DTMscottishordinal}[1]{%
\number#1 % space intended
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-scottish/datetime2-scottish-utf8.ldf new/tex/latex/datetime2-scottish/datetime2-scottish-utf8.ldf
--- old/tex/latex/datetime2-scottish/datetime2-scottish-utf8.ldf 2015-03-25 22:53:50.000000000 +0100
+++ new/tex/latex/datetime2-scottish/datetime2-scottish-utf8.ldf 2019-09-15 22:46:00.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-scottish.dtx (with options: `datetime2-scottish-utf8.ldf,package')
%%
%% datetime2-scottish.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{scottish-utf8}[2015/03/25 v1.0]
+\ProvidesDateTimeModule{scottish-utf8}[2019/09/14 v1.0]
\newcommand*{\DTMscottishordinal}[1]{%
\number#1 % space intended
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-scottish/datetime2-scottish.ldf new/tex/latex/datetime2-scottish/datetime2-scottish.ldf
--- old/tex/latex/datetime2-scottish/datetime2-scottish.ldf 2015-03-25 22:53:50.000000000 +0100
+++ new/tex/latex/datetime2-scottish/datetime2-scottish.ldf 2019-09-15 22:46:00.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-scottish.dtx (with options: `datetime2-scottish.ldf,package')
%%
%% datetime2-scottish.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{scottish}[2015/03/25 v1.0]
+\ProvidesDateTimeModule{scottish}[2019/09/14 v1.0]
\RequirePackage{ifxetex,ifluatex}
\ifxetex
\RequireDateTimeModule{scottish-utf8}
@@ -108,7 +108,7 @@
\DTMifbool{scottish}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMscottishtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -171,7 +171,7 @@
\DTMifbool{scottish}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMscottishtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -218,7 +218,7 @@
\DTMifcaseregional
{}% do nothing
{\DTMsetstyle{scottish}}%
- {\DTMsetstyle{scottish-numeric}}
+ {\DTMsetstyle{scottish-numeric}}%
}%
}%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-scottish.tlpobj new/tlpkg/tlpobj/datetime2-scottish.tlpobj
--- old/tlpkg/tlpobj/datetime2-scottish.tlpobj 2019-02-28 03:31:23.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-scottish.tlpobj 2019-09-16 01:54:06.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-scottish
category Package
-revision 36625
+revision 52101
shortdesc Scottish Gaelic Language Module for the datetime2 Package
relocated 1
longdesc This module provides the "scottish" style that can be set using
@@ -12,7 +12,7 @@
RELOC/tex/latex/datetime2-scottish/datetime2-scottish-utf8.ldf
RELOC/tex/latex/datetime2-scottish/datetime2-scottish.ldf
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-scottish
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-09-14 22:47:55 +0200
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.0
+catalogue-version 1.1
++++++ datetime2-serbian.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2-serbian/README new/doc/latex/datetime2-serbian/README
--- old/doc/latex/datetime2-serbian/README 2015-04-01 22:41:35.000000000 +0200
+++ new/doc/latex/datetime2-serbian/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,57 +0,0 @@
-Serbian Language Module for datetime2 Package
-
-Author: Nicola L. C. Talbot (inactive)
-
-Licence: LPPL
-
-Required Packages: datetime2, tracklang
-
-This module is unmaintained. If you want to volunteer to take over
-the maintenance contact me at www.dickimaw-books.com/contact.html
-
-Example usage:
-
-\documentclass{article}
-\usepackage[serbian]{datetime2}
-\begin{document}
-\today
-\end{document}
-
-\documentclass[serbian]{article}
-\usepackage{babel}
-\usepackage[useregional]{datetime2}
-\begin{document}
-\today
-\end{document}
-
-\documentclass{article}
-\usepackage{polyglossia}
-\setmainlanguage{serbian}
-\usepackage[serbian]{datetime2}
-\begin{document}
-\today
-\end{document}
-
-INSTALLATION
-============
-
-xelatex datetime2-serbian.ins
-
-Move all *.ldf files to
-TEXMF/tex/latex/datetime2-contrib/datetime2-serbian/
-
-Documentation:
-
-xelatex datetime2-serbian.dtx
-makeindex -s gind.ist datetime2-serbian.idx
-makeindex -s gglo.ist -o datetime2-serbian.gls datetime2-serbian.glo
-xelatex datetime2-serbian.dtx
-xelatex datetime2-serbian.dtx
-
-Move datetime2-serbian.pdf and README to
-TEXMF/doc/latex/datetime2-contrib/datetime2-serbian/
-
-This material is subject to the LaTeX Project Public License.
-See http://www.ctan.org/license/lppl1.3 for the details of that
-license.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2-serbian/README.md new/doc/latex/datetime2-serbian/README.md
--- old/doc/latex/datetime2-serbian/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/datetime2-serbian/README.md 2019-11-22 23:20:04.000000000 +0100
@@ -0,0 +1,95 @@
+Serbian Language Module for datetime2 CTAN Package
+==================================================
+
+**Current maintainer:** Andrej Radović
+
+**Authors:** Andrej Radović (r.andrej(a)gmail.com), Nicola L. C. Talbot (inactive)
+
+**Licence:** LPPL
+
+**Required Packages:** `datetime2`, `tracklang`
+
+Styles
+------
+
+This module provides the following styles:
+
+### Latin:
+* serbian - regionless style
+* sr-Latn - Serbian, Serbia
+* sr-Latn-RS - Serbian, Serbia
+* sr-Latn-ME - Serbian, Montenegro
+* sr-Latn-BA - Serbian, Bosnia and Herzegovina
+
+### Cyrillic
+* serbianc - regionless style
+* sr-Cyrl - Serbian, Serbia
+* sr-Cyrl-RS - Serbian, Serbia
+* sr-Cyrl-ME - Serbian, Montenegro
+* sr-Cyrl-BA - Serbian, Bosnia and Herzegovina
+
+Notes:
+------
+
+The regional settings still don't work, but `serbian` and `serbianc` work just
+fine.
+The package is still in development.
+
+Example usage:
+--------------
+
+### Generic w/ `babel`
+ \documentclass{article}
+ \usepackage[serbian]{datetime2}
+ \begin{document}
+ \today
+ \end{document}
+
+### Generic w/ `babel`
+
+ \documentclass[serbian]{article}
+ \usepackage{babel}
+ \usepackage[useregional]{datetime2}
+ \begin{document}
+ \today
+ \end{document}
+
+### Generic w/ `polyglossia`
+
+ \documentclass{article}
+ \usepackage{polyglossia}
+ \setmainlanguage{serbian}
+ \usepackage[serbian]{datetime2}
+ \begin{document}
+ \today
+ \end{document}
+
+
+Installation
+------------
+
+Extract the language definition files first:
+
+Run LuaLaTeX over the file `datetime2-serbian.ins`:
+
+ lualatex datetime2-serbian.ins
+
+Move all `*.ldf` files to
+
+ TEXMF/tex/latex/datetime2-contrib/datetime2-serbian/
+
+ Then, you can compile the documentation yourself by executing
+
+ lualatex datetime2-serbian.dtx
+ makeindex -s ginddt2s.ist datetime2-serbian.idx
+ makeindex -s gglodt2s.ist -o datetime2-serbian.gls datetime2-serbian.glo
+ lualatex datetime2-serbian.dtx
+ lualatex datetime2-serbian.dtx
+
+or just use the precompiled documentation shipped with the source files.
+In both cases, copy the files `datetime2-serbian.pdf` and `README.md` to
+`TEXMF/doc/latex/datetime2-contrib/datetime2-serbian/`.
+
+This material is subject to the LaTeX Project Public License.
+See http://www.ctan.org/license/lppl1.3 for the details of that
+license.
Binary files old/doc/latex/datetime2-serbian/datetime2-serbian.pdf and new/doc/latex/datetime2-serbian/datetime2-serbian.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-serbian.doc.tlpobj new/tlpkg/tlpobj/datetime2-serbian.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-serbian.doc.tlpobj 2019-02-28 03:31:23.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-serbian.doc.tlpobj 2019-11-23 01:54:20.000000000 +0100
@@ -1,8 +1,8 @@
name datetime2-serbian.doc
category Package
-revision 36699
+revision 52893
shortdesc doc files of datetime2-serbian
relocated 1
-docfiles size=23
- RELOC/doc/latex/datetime2-serbian/README
+docfiles size=71
+ RELOC/doc/latex/datetime2-serbian/README.md
RELOC/doc/latex/datetime2-serbian/datetime2-serbian.pdf
++++++ datetime2-serbian.tar.xz ++++++
++++ 4782 lines of diff (skipped)
++++++ datetime2-slovak.doc.tar.xz ++++++
Binary files old/doc/latex/datetime2-slovak/datetime2-slovak.pdf and new/doc/latex/datetime2-slovak/datetime2-slovak.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-slovak.doc.tlpobj new/tlpkg/tlpobj/datetime2-slovak.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-slovak.doc.tlpobj 2019-02-28 03:31:23.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-slovak.doc.tlpobj 2019-10-05 01:54:33.000000000 +0200
@@ -1,8 +1,8 @@
name datetime2-slovak.doc
category Package
-revision 36700
+revision 52281
shortdesc doc files of datetime2-slovak
relocated 1
-docfiles size=22
+docfiles size=19
RELOC/doc/latex/datetime2-slovak/README
RELOC/doc/latex/datetime2-slovak/datetime2-slovak.pdf
++++++ datetime2-slovak.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-slovak/datetime2-slovak-ascii.ldf new/tex/latex/datetime2-slovak/datetime2-slovak-ascii.ldf
--- old/tex/latex/datetime2-slovak/datetime2-slovak-ascii.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-slovak/datetime2-slovak-ascii.ldf 2019-10-04 22:48:18.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-slovak.dtx (with options: `datetime2-slovak-ascii.ldf,package')
%%
%% datetime2-slovak.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{slovak-ascii}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{slovak-ascii}[2019/10/04 v1.1]
\newcommand*{\DTMslovakordinal}[1]{%
\number#1.%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-slovak/datetime2-slovak-utf8.ldf new/tex/latex/datetime2-slovak/datetime2-slovak-utf8.ldf
--- old/tex/latex/datetime2-slovak/datetime2-slovak-utf8.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-slovak/datetime2-slovak-utf8.ldf 2019-10-04 22:48:18.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-slovak.dtx (with options: `datetime2-slovak-utf8.ldf,package')
%%
%% datetime2-slovak.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{slovak-utf8}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{slovak-utf8}[2019/10/04 v1.1]
\newcommand*{\DTMslovakordinal}[1]{%
\number#1.%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-slovak/datetime2-slovak.ldf new/tex/latex/datetime2-slovak/datetime2-slovak.ldf
--- old/tex/latex/datetime2-slovak/datetime2-slovak.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-slovak/datetime2-slovak.ldf 2019-10-04 22:48:18.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-slovak.dtx (with options: `datetime2-slovak.ldf,package')
%%
%% datetime2-slovak.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{slovak}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{slovak}[2019/10/04 v1.1]
\RequirePackage{ifxetex,ifluatex}
\ifxetex
\RequireDateTimeModule{slovak-utf8}
@@ -83,7 +83,7 @@
\DTMifbool{slovak}{showyear}%
{%
\DTMslovakmonthyearsep
- \number##1
+ \number##1 % space intended
}%
{}%
}%
@@ -100,7 +100,7 @@
\DTMifbool{slovak}{showyear}%
{%
\DTMslovakmonthyearsep
- \number##1
+ \number##1 % space intended
}%
{}%
}%
@@ -115,7 +115,7 @@
\DTMifbool{slovak}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMslovaktimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -166,7 +166,7 @@
}%
{% time style
\renewcommand*\DTMdisplaytime[3]{%
- \number##1
+ \number##1 % space intended
\DTMslovaktimesep\DTMtwodigits{##2}%
\ifDTMshowseconds\DTMslovaktimesep\DTMtwodigits{##3}\fi
}%
@@ -178,7 +178,7 @@
\DTMifbool{slovak}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMslovaktimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -204,7 +204,7 @@
\DTMifcaseregional
{}% do nothing
-{\DTMsetstyle{slovak}}
+{\DTMsetstyle{slovak}}%
{\DTMsetstyle{slovak-numeric}}
\ifcsundef{date\CurrentTrackedDialect}
{%
@@ -225,7 +225,7 @@
\DTMifcaseregional
{}% do nothing
{\DTMsetstyle{slovak}}%
- {\DTMsetstyle{slovak-numeric}}
+ {\DTMsetstyle{slovak-numeric}}%
}%
}%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-slovak.tlpobj new/tlpkg/tlpobj/datetime2-slovak.tlpobj
--- old/tlpkg/tlpobj/datetime2-slovak.tlpobj 2019-02-28 03:31:23.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-slovak.tlpobj 2019-10-05 01:54:33.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-slovak
category Package
-revision 36700
+revision 52281
shortdesc Slovak language module for the datetime2 package
relocated 1
longdesc This module provides the "slovak" style that can be set using
@@ -12,7 +12,7 @@
RELOC/tex/latex/datetime2-slovak/datetime2-slovak-utf8.ldf
RELOC/tex/latex/datetime2-slovak/datetime2-slovak.ldf
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-slovak
-catalogue-date 2018-01-07 11:26:57 +0100
+catalogue-date 2019-10-04 19:11:51 +0200
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.0
+catalogue-version 1.1
++++++ datetime2-slovene.doc.tar.xz ++++++
Binary files old/doc/latex/datetime2-slovene/datetime2-slovene.pdf and new/doc/latex/datetime2-slovene/datetime2-slovene.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-slovene.doc.tlpobj new/tlpkg/tlpobj/datetime2-slovene.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-slovene.doc.tlpobj 2019-02-28 03:31:23.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-slovene.doc.tlpobj 2019-10-05 01:54:33.000000000 +0200
@@ -1,8 +1,8 @@
name datetime2-slovene.doc
category Package
-revision 36700
+revision 52282
shortdesc doc files of datetime2-slovene
relocated 1
-docfiles size=21
+docfiles size=19
RELOC/doc/latex/datetime2-slovene/README
RELOC/doc/latex/datetime2-slovene/datetime2-slovene.pdf
++++++ datetime2-slovene.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-slovene/datetime2-slovene-ascii.ldf new/tex/latex/datetime2-slovene/datetime2-slovene-ascii.ldf
--- old/tex/latex/datetime2-slovene/datetime2-slovene-ascii.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-slovene/datetime2-slovene-ascii.ldf 2019-10-04 22:48:33.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-slovene.dtx (with options: `datetime2-slovene-ascii.ldf,package')
%%
%% datetime2-slovene.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{slovene-ascii}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{slovene-ascii}[2019/10/04 v1.1]
\newcommand*{\DTMsloveneordinal}[1]{%
\number#1.%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-slovene/datetime2-slovene-utf8.ldf new/tex/latex/datetime2-slovene/datetime2-slovene-utf8.ldf
--- old/tex/latex/datetime2-slovene/datetime2-slovene-utf8.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-slovene/datetime2-slovene-utf8.ldf 2019-10-04 22:48:33.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-slovene.dtx (with options: `datetime2-slovene-utf8.ldf,package')
%%
%% datetime2-slovene.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{slovene-utf8}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{slovene-utf8}[2019/10/04 v1.1]
\newcommand*{\DTMsloveneordinal}[1]{%
\number#1.%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-slovene/datetime2-slovene.ldf new/tex/latex/datetime2-slovene/datetime2-slovene.ldf
--- old/tex/latex/datetime2-slovene/datetime2-slovene.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-slovene/datetime2-slovene.ldf 2019-10-04 22:48:33.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-slovene.dtx (with options: `datetime2-slovene.ldf,package')
%%
%% datetime2-slovene.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{slovene}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{slovene}[2019/10/04 v1.1]
\RequirePackage{ifxetex,ifluatex}
\ifxetex
\RequireDateTimeModule{slovene-utf8}
@@ -83,7 +83,7 @@
\DTMifbool{slovene}{showyear}%
{%
\DTMslovenemonthyearsep
- \number##1
+ \number##1 % space intended
}%
{}%
}%
@@ -100,7 +100,7 @@
\DTMifbool{slovene}{showyear}%
{%
\DTMslovenemonthyearsep
- \number##1
+ \number##1 % space intended
}%
{}%
}%
@@ -115,7 +115,7 @@
\DTMifbool{slovene}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMslovenetimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -166,7 +166,7 @@
}%
{% time style
\renewcommand*\DTMdisplaytime[3]{%
- \number##1
+ \number##1 % space intended
\DTMslovenetimesep\DTMtwodigits{##2}%
\ifDTMshowseconds\DTMslovenetimesep\DTMtwodigits{##3}\fi
}%
@@ -178,7 +178,7 @@
\DTMifbool{slovene}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMslovenetimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -204,7 +204,7 @@
\DTMifcaseregional
{}% do nothing
-{\DTMsetstyle{slovene}}
+{\DTMsetstyle{slovene}}%
{\DTMsetstyle{slovene-numeric}}
\ifcsundef{date\CurrentTrackedDialect}
{%
@@ -225,7 +225,7 @@
\DTMifcaseregional
{}% do nothing
{\DTMsetstyle{slovene}}%
- {\DTMsetstyle{slovene-numeric}}
+ {\DTMsetstyle{slovene-numeric}}%
}%
}%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-slovene.tlpobj new/tlpkg/tlpobj/datetime2-slovene.tlpobj
--- old/tlpkg/tlpobj/datetime2-slovene.tlpobj 2019-02-28 03:31:23.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-slovene.tlpobj 2019-10-05 01:54:33.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-slovene
category Package
-revision 36700
+revision 52282
shortdesc Slovene language module for the datetime2 package
relocated 1
longdesc This module provides the "slovene" style that can be set using
@@ -12,7 +12,7 @@
RELOC/tex/latex/datetime2-slovene/datetime2-slovene-utf8.ldf
RELOC/tex/latex/datetime2-slovene/datetime2-slovene.ldf
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-slovene
-catalogue-date 2018-01-07 11:25:01 +0100
+catalogue-date 2019-10-04 19:30:17 +0200
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.0
+catalogue-version 1.1
++++++ datetime2-turkish.doc.tar.xz ++++++
Binary files old/doc/latex/datetime2-turkish/datetime2-turkish.pdf and new/doc/latex/datetime2-turkish/datetime2-turkish.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-turkish.doc.tlpobj new/tlpkg/tlpobj/datetime2-turkish.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-turkish.doc.tlpobj 2019-02-28 03:31:24.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-turkish.doc.tlpobj 2019-10-11 01:54:24.000000000 +0200
@@ -1,8 +1,8 @@
name datetime2-turkish.doc
category Package
-revision 36700
+revision 52331
shortdesc doc files of datetime2-turkish
relocated 1
-docfiles size=21
+docfiles size=19
RELOC/doc/latex/datetime2-turkish/README
RELOC/doc/latex/datetime2-turkish/datetime2-turkish.pdf
++++++ datetime2-turkish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-turkish/datetime2-turkish-ascii.ldf new/tex/latex/datetime2-turkish/datetime2-turkish-ascii.ldf
--- old/tex/latex/datetime2-turkish/datetime2-turkish-ascii.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-turkish/datetime2-turkish-ascii.ldf 2019-10-10 22:44:17.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-turkish.dtx (with options: `datetime2-turkish-ascii.ldf,package')
%%
%% datetime2-turkish.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{turkish-ascii}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{turkish-ascii}[2019/10/10 v1.1]
\newcommand*{\DTMturkishordinal}[1]{%
\number#1
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-turkish/datetime2-turkish-utf8.ldf new/tex/latex/datetime2-turkish/datetime2-turkish-utf8.ldf
--- old/tex/latex/datetime2-turkish/datetime2-turkish-utf8.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-turkish/datetime2-turkish-utf8.ldf 2019-10-10 22:44:17.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-turkish.dtx (with options: `datetime2-turkish-utf8.ldf,package')
%%
%% datetime2-turkish.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{turkish-utf8}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{turkish-utf8}[2019/10/10 v1.1]
\newcommand*{\DTMturkishordinal}[1]{%
\number#1
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-turkish/datetime2-turkish.ldf new/tex/latex/datetime2-turkish/datetime2-turkish.ldf
--- old/tex/latex/datetime2-turkish/datetime2-turkish.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-turkish/datetime2-turkish.ldf 2019-10-10 22:44:17.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-turkish.dtx (with options: `datetime2-turkish.ldf,package')
%%
%% datetime2-turkish.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{turkish}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{turkish}[2019/10/10 v1.1]
\RequirePackage{ifxetex,ifluatex}
\ifxetex
\RequireDateTimeModule{turkish-utf8}
@@ -83,7 +83,7 @@
\DTMifbool{turkish}{showyear}%
{%
\DTMturkishmonthyearsep
- \number##1
+ \number##1 % space intended
}%
{}%
}%
@@ -99,7 +99,7 @@
\DTMifbool{turkish}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMturkishtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -140,7 +140,7 @@
}%
{% time style
\renewcommand*\DTMdisplaytime[3]{%
- \number##1
+ \number##1 % space intended
\DTMturkishtimesep\DTMtwodigits{##2}%
\ifDTMshowseconds\DTMturkishtimesep\DTMtwodigits{##3}\fi
}%
@@ -152,7 +152,7 @@
\DTMifbool{turkish}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMturkishtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -199,7 +199,7 @@
\DTMifcaseregional
{}% do nothing
{\DTMsetstyle{turkish}}%
- {\DTMsetstyle{turkish-numeric}}
+ {\DTMsetstyle{turkish-numeric}}%
}%
}%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-turkish.tlpobj new/tlpkg/tlpobj/datetime2-turkish.tlpobj
--- old/tlpkg/tlpobj/datetime2-turkish.tlpobj 2019-02-28 03:31:24.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-turkish.tlpobj 2019-10-11 01:54:24.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-turkish
category Package
-revision 36700
+revision 52331
shortdesc Turkish language module for the datetime2 package
relocated 1
longdesc This module provides the "turkish" style that can be set using
@@ -12,7 +12,7 @@
RELOC/tex/latex/datetime2-turkish/datetime2-turkish-utf8.ldf
RELOC/tex/latex/datetime2-turkish/datetime2-turkish.ldf
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-turkish
-catalogue-date 2018-01-07 12:06:25 +0100
+catalogue-date 2019-10-10 13:05:36 +0200
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.0
+catalogue-version 1.1
++++++ datetime2-usorbian.doc.tar.xz ++++++
Binary files old/doc/latex/datetime2-usorbian/datetime2-usorbian.pdf and new/doc/latex/datetime2-usorbian/datetime2-usorbian.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-usorbian.doc.tlpobj new/tlpkg/tlpobj/datetime2-usorbian.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-usorbian.doc.tlpobj 2019-02-28 03:31:24.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-usorbian.doc.tlpobj 2019-10-14 01:54:01.000000000 +0200
@@ -1,8 +1,8 @@
name datetime2-usorbian.doc
category Package
-revision 36700
+revision 52375
shortdesc doc files of datetime2-usorbian
relocated 1
-docfiles size=22
+docfiles size=20
RELOC/doc/latex/datetime2-usorbian/README
RELOC/doc/latex/datetime2-usorbian/datetime2-usorbian.pdf
++++++ datetime2-usorbian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-usorbian/datetime2-usorbian-ascii.ldf new/tex/latex/datetime2-usorbian/datetime2-usorbian-ascii.ldf
--- old/tex/latex/datetime2-usorbian/datetime2-usorbian-ascii.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-usorbian/datetime2-usorbian-ascii.ldf 2019-10-13 23:53:20.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-usorbian.dtx (with options: `datetime2-usorbian-ascii.ldf,package')
%%
%% datetime2-usorbian.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{usorbian-ascii}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{usorbian-ascii}[2019/10/10 v1.1]
\newcommand*{\DTMusorbianordinal}[1]{%
\number#1.%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-usorbian/datetime2-usorbian-utf8.ldf new/tex/latex/datetime2-usorbian/datetime2-usorbian-utf8.ldf
--- old/tex/latex/datetime2-usorbian/datetime2-usorbian-utf8.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-usorbian/datetime2-usorbian-utf8.ldf 2019-10-13 23:53:20.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-usorbian.dtx (with options: `datetime2-usorbian-utf8.ldf,package')
%%
%% datetime2-usorbian.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{usorbian-utf8}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{usorbian-utf8}[2019/10/10 v1.1]
\newcommand*{\DTMusorbianordinal}[1]{%
\number#1.%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-usorbian/datetime2-usorbian.ldf new/tex/latex/datetime2-usorbian/datetime2-usorbian.ldf
--- old/tex/latex/datetime2-usorbian/datetime2-usorbian.ldf 2015-04-01 22:44:19.000000000 +0200
+++ new/tex/latex/datetime2-usorbian/datetime2-usorbian.ldf 2019-10-13 23:53:20.000000000 +0200
@@ -7,7 +7,7 @@
%% datetime2-usorbian.dtx (with options: `datetime2-usorbian.ldf,package')
%%
%% datetime2-usorbian.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{usorbian}[2015/04/01 v1.0]
+\ProvidesDateTimeModule{usorbian}[2019/10/10 v1.1]
\RequirePackage{ifxetex,ifluatex}
\ifxetex
\RequireDateTimeModule{usorbian-utf8}
@@ -92,7 +92,7 @@
\DTMifbool{usorbian}{showyear}%
{%
\DTMusorbianmonthyearsep
- \number##1
+ \number##1 % space intended
}%
{}%
}%
@@ -108,7 +108,7 @@
\DTMifbool{usorbian}{showyear}%
{%
\DTMusorbianmonthyearsep
- \number##1
+ \number##1 % space intended
}%
{}%
}%
@@ -123,7 +123,7 @@
\DTMifbool{usorbian}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMusorbiantimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -174,7 +174,7 @@
}%
{% time style
\renewcommand*\DTMdisplaytime[3]{%
- \number##1
+ \number##1 % space intended
\DTMusorbiantimesep\DTMtwodigits{##2}%
\ifDTMshowseconds\DTMusorbiantimesep\DTMtwodigits{##3}\fi
}%
@@ -186,7 +186,7 @@
\DTMifbool{usorbian}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMusorbiantimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -233,7 +233,7 @@
\DTMifcaseregional
{}% do nothing
{\DTMsetstyle{usorbian}}%
- {\DTMsetstyle{usorbian-numeric}}
+ {\DTMsetstyle{usorbian-numeric}}%
}%
}%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-usorbian.tlpobj new/tlpkg/tlpobj/datetime2-usorbian.tlpobj
--- old/tlpkg/tlpobj/datetime2-usorbian.tlpobj 2019-02-28 03:31:24.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-usorbian.tlpobj 2019-10-14 01:54:01.000000000 +0200
@@ -1,6 +1,6 @@
name datetime2-usorbian
category Package
-revision 36700
+revision 52375
shortdesc Upper Sorbian language module for the datetime2 package
relocated 1
longdesc This module provides the "usorbian" style that can be set using
@@ -12,7 +12,7 @@
RELOC/tex/latex/datetime2-usorbian/datetime2-usorbian-utf8.ldf
RELOC/tex/latex/datetime2-usorbian/datetime2-usorbian.ldf
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-usorbian
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-10-10 13:19:18 +0200
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.0
+catalogue-version 1.1
++++++ datetime2-welsh.doc.tar.xz ++++++
Binary files old/doc/latex/datetime2-welsh/datetime2-welsh.pdf and new/doc/latex/datetime2-welsh/datetime2-welsh.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-welsh.doc.tlpobj new/tlpkg/tlpobj/datetime2-welsh.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2-welsh.doc.tlpobj 2019-02-28 03:31:24.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-welsh.doc.tlpobj 2019-10-29 01:54:24.000000000 +0100
@@ -1,6 +1,6 @@
name datetime2-welsh.doc
category Package
-revision 36636
+revision 52553
shortdesc doc files of datetime2-welsh
relocated 1
docfiles size=71
++++++ datetime2-welsh.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-welsh/datetime2-welsh-ascii.ldf new/tex/latex/datetime2-welsh/datetime2-welsh-ascii.ldf
--- old/tex/latex/datetime2-welsh/datetime2-welsh-ascii.ldf 2015-03-26 22:52:35.000000000 +0100
+++ new/tex/latex/datetime2-welsh/datetime2-welsh-ascii.ldf 2019-10-28 21:56:57.000000000 +0100
@@ -7,7 +7,7 @@
%% datetime2-welsh.dtx (with options: `datetime2-welsh-ascii.ldf,package')
%%
%% datetime2-welsh.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,10 +39,10 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{welsh-ascii}[2015/03/26 v1.0]
+\ProvidesDateTimeModule{welsh-ascii}[2019/10/28 v1.1]
\newcommand*{\DTMwelshordinal}[1]{%
- \number#1
- \ifnum#1=1
+ \number#1 % space intended
+ \ifnum#1=1 % space intended
\DTMwelshfmtordsuffix{a\protect\~{n}}%
\fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-welsh/datetime2-welsh-utf8.ldf new/tex/latex/datetime2-welsh/datetime2-welsh-utf8.ldf
--- old/tex/latex/datetime2-welsh/datetime2-welsh-utf8.ldf 2015-03-26 22:52:35.000000000 +0100
+++ new/tex/latex/datetime2-welsh/datetime2-welsh-utf8.ldf 2019-10-28 21:56:57.000000000 +0100
@@ -7,7 +7,7 @@
%% datetime2-welsh.dtx (with options: `datetime2-welsh-utf8.ldf,package')
%%
%% datetime2-welsh.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,10 +39,10 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{welsh-utf8}[2015/03/26 v1.0]
+\ProvidesDateTimeModule{welsh-utf8}[2019/10/28 v1.1]
\newcommand*{\DTMwelshordinal}[1]{%
- \number#1
- \ifnum#1=1
+ \number#1 % space intended
+ \ifnum#1=1 % space intended
\DTMwelshfmtordinal{añ}%
\fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2-welsh/datetime2-welsh.ldf new/tex/latex/datetime2-welsh/datetime2-welsh.ldf
--- old/tex/latex/datetime2-welsh/datetime2-welsh.ldf 2015-03-26 22:52:35.000000000 +0100
+++ new/tex/latex/datetime2-welsh/datetime2-welsh.ldf 2019-10-28 21:56:57.000000000 +0100
@@ -7,7 +7,7 @@
%% datetime2-welsh.dtx (with options: `datetime2-welsh.ldf,package')
%%
%% datetime2-welsh.dtx
-%% Copyright 2015 Nicola Talbot
+%% Copyright 2015-2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesDateTimeModule{welsh}[2015/03/26 v1.0]
+\ProvidesDateTimeModule{welsh}[2019/10/28 v1.1]
\RequirePackage{ifxetex,ifluatex}
\ifxetex
\RequireDateTimeModule{welsh-utf8}
@@ -62,8 +62,8 @@
\DTMdefkey{welsh}{timezonesep}{\renewcommand*{\DTMwelshtimezonesep}{#1}}
\DTMdefkey{welsh}{datesep}{\renewcommand*{\DTMwelshdatesep}{#1}}
\DTMdefkey{welsh}{timesep}{\renewcommand*{\DTMwelshtimesep}{#1}}
-\DTMdefchoicekey{welsh}{ord}[\val\nr]{level,raise,omit,sc}{%
- \ifcase\nr\relax
+\DTMdefchoicekey{welsh}{ord}[\@dtm@val\@dtm@nr]{level,raise,omit,sc}{%
+ \ifcase\@dtm@nr\relax
\renewcommand*{\DTMwelshfmtordsuffix}[1]{##1}%
\or
\renewcommand*{\DTMwelshfmtordsuffix}[1]{%
@@ -121,7 +121,7 @@
\DTMifbool{welsh}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMwelshtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -184,7 +184,7 @@
\DTMifbool{welsh}{mapzone}%
{\DTMusezonemapordefault{##1}{##2}}%
{%
- \ifnum##1<0\else+\fi\DTMtwodigits{##1}%
+ \ifnum##1<0 \else+\fi\DTMtwodigits{##1}%
\ifDTMshowzoneminutes\DTMwelshtimesep\DTMtwodigits{##2}\fi
}%
}%
@@ -231,7 +231,7 @@
\DTMifcaseregional
{}% do nothing
{\DTMsetstyle{welsh}}%
- {\DTMsetstyle{welsh-numeric}}
+ {\DTMsetstyle{welsh-numeric}}%
}%
}%
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2-welsh.tlpobj new/tlpkg/tlpobj/datetime2-welsh.tlpobj
--- old/tlpkg/tlpobj/datetime2-welsh.tlpobj 2019-02-28 03:31:25.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2-welsh.tlpobj 2019-10-29 01:54:24.000000000 +0100
@@ -1,6 +1,6 @@
name datetime2-welsh
category Package
-revision 36636
+revision 52553
shortdesc Welsh language module for the datetime2 package
relocated 1
longdesc This module provides the "welsh" style that can be set using
@@ -12,7 +12,7 @@
RELOC/tex/latex/datetime2-welsh/datetime2-welsh-utf8.ldf
RELOC/tex/latex/datetime2-welsh/datetime2-welsh.ldf
catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-welsh
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-10-28 19:41:12 +0100
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.0
+catalogue-version 1.1
++++++ dccpaper.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dccpaper/README.md new/doc/latex/dccpaper/README.md
--- old/doc/latex/dccpaper/README.md 2019-03-08 23:22:53.000000000 +0100
+++ new/doc/latex/dccpaper/README.md 2020-01-15 22:48:33.000000000 +0100
@@ -1,9 +1,12 @@
# The dccpaper bundle: LaTeX classes for submissions to IJDC and IDCC
-The dccpaper bundle consists of two very similar classes.
+The dccpaper bundle consists of three very similar classes.
+
+ijdc-v14.cls corresponds to the template used by the
+[International Journal of Digital Curation], beginning with volume 14.
ijdc-v9.cls corresponds to the template used by the
-[International Journal of Digital Curation], beginning with volume 9.
+[International Journal of Digital Curation] for volumes 9 to 13 inclusive.
idcc.cls corresponds to the template used for the
[International Digital Curation Conference], beginning with IDCC15.
@@ -71,7 +74,7 @@
## Licence
-Copyright 2019 Digital Curation Centre, University of Edinburgh.
+Copyright 2020 Digital Curation Centre, University of Edinburgh.
This work consists of the image files dccpaper-by.eps and
dccpaper-by.pdf, the documented LaTeX file dccpaper.dtx and a Makefile.
Binary files old/doc/latex/dccpaper/dccpaper.pdf and new/doc/latex/dccpaper/dccpaper.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dccpaper.doc.tlpobj new/tlpkg/tlpobj/dccpaper.doc.tlpobj
--- old/tlpkg/tlpobj/dccpaper.doc.tlpobj 2019-03-09 02:24:23.000000000 +0100
+++ new/tlpkg/tlpobj/dccpaper.doc.tlpobj 2020-03-24 01:57:18.000000000 +0100
@@ -1,9 +1,9 @@
name dccpaper.doc
category Package
-revision 50294
+revision 54512
shortdesc doc files of dccpaper
relocated 1
-docfiles size=68
+docfiles size=82
RELOC/doc/latex/dccpaper/README.md
RELOC/doc/latex/dccpaper/dccpaper-apacite.bib
RELOC/doc/latex/dccpaper/dccpaper-biblatex.bib
++++++ dccpaper.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dccpaper/dccpaper-base.sty new/tex/latex/dccpaper/dccpaper-base.sty
--- old/tex/latex/dccpaper/dccpaper-base.sty 2019-03-08 23:22:53.000000000 +0100
+++ new/tex/latex/dccpaper/dccpaper-base.sty 2020-01-15 22:48:33.000000000 +0100
@@ -14,31 +14,115 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/03/08 v1.8}
+\def\Version{2020/01/15 v2.0}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{dccpaper-base}
[\Version\space Common class code for IJDC and IDCC papers.]
\RequirePackage[british]{babel}
-\RequirePackage{etoolbox}
+\RequirePackage{etoolbox,xpatch}
\RequirePackage{iftex}
\ifPDFTeX
\RequirePackage[T1]{fontenc}
- \IfFileExists{newtxtext.sty}{%
- \RequirePackage{newtxtext,newtxmath}
- }{%
- \RequirePackage{mathptmx}}
- \IfFileExists{tgheros.sty}{%
- \ifx\undefined\qhv@scale
- \RequirePackage[scale=0.92]{tgheros}\else
- \def\qhv(a)scale{0.92}\fi
+ \ifdefstring{\dccp@variant}{baskerville}{%
+ \IfFileExists{baskervillef.sty}{
+ \RequirePackage[scaled=.95]{baskervillef}
+ \RequirePackage[baskerville,vvarbb]{newtxmath}
+ }{
+ \IfFileExists{Baskervaldx.sty}{
+ \RequirePackage[scaled=.95]{baskervaldx}
+ \RequirePackage[baskervaldx,vvarbb]{newtxmath}
+ }{
+ \IfFileExists{baskervald.sty}{
+ \RequirePackage{baskervald}
+ \RequirePackage[baskervaldx,vvarbb]{newtxmath}
+ }{}
+ }
+ }
+ \IfFileExists{lsr.pfb}{%
+ \renewcommand{\sfdefault}{hls}
+ \def\hls(a)scale{0.805}
+ }{%
+ \IfFileExists{GoSans.sty}{%
+ \RequirePackage[scale=.8]{GoSans}
+ }{%
+ \RequirePackage[scaled=0.82]{helvet}}}
}{%
- \RequirePackage[scaled=0.92]{helvet}}
- \renewcommand{\ttdefault}{cmtt}
+ \IfFileExists{newtxtext.sty}{%
+ \RequirePackage{newtxtext,newtxmath}
+ }{%
+ \RequirePackage{mathptmx}}
+ \IfFileExists{tgheros.sty}{%
+ \ifx\undefined\qhv@scale
+ \RequirePackage[scale=0.92]{tgheros}\else
+ \def\qhv(a)scale{0.92}\fi
+ }{%
+ \RequirePackage[scaled=0.92]{helvet}}
+ \renewcommand{\ttdefault}{cmtt}
+ }
\else
\RequirePackage{fontspec}
- \IfFileExists{newtxtext.sty}{%
- \setmainfont{TeXGyreTermesX}
- \RequirePackage{newtxmath}
+ \ifdefstring{\dccp@variant}{baskerville}{%
+ \IfFontExistsTF{Baskerville}{%
+ \setmainfont{Baskerville}
+ \RequirePackage[baskerville,vvarbb]{newtxmath}
+ }{%
+ \IfFileExists{baskervillef.sty}{%
+ \setmainfont[Scale=.95]{BaskervilleF}
+ \RequirePackage[baskerville,vvarbb]{newtxmath}
+ }{%
+ \IfFileExists{Baskervaldx.sty}{%
+ \setmainfont[Scale=.95]{baskervaldx}
+ \RequirePackage[baskervaldx,vvarbb]{newtxmath}
+ }{%
+ \IfFileExists{baskervald.sty}{%
+ \RequirePackage[T1]{fontenc}
+ \RequirePackage{baskervald}
+ \RequirePackage[baskervaldx,vvarbb]{newtxmath}
+ }{}
+ }
+ }
+ }
+ \IfFontExistsTF{Lucida Sans}{%
+ \setsansfont[Scale=.805]{Lucida Sans}
+ }{
+ \IfFontExistsTF{LucidaSansOT}{%
+ \setsansfont[Scale=.805]{LucidaSansOT}
+ }{%
+ \IfFileExists{GoSans.sty}{%
+ \RequirePackage[scale=.8]{GoSans}
+ }{%
+ \@ifpackageloaded{fontenc}{}{%
+ \appto\sffamily{\fontencoding{T1}\selectfont}
+ }
+ \RequirePackage[scaled=0.82]{helvet}
+ }
+ }
+ }
+ }{%
+ \IfFileExists{newtxtext.sty}{%
+ \setmainfont{TeXGyreTermesX}
+ \RequirePackage{newtxmath}
+ }{%
+ \RequirePackage[T1]{fontenc}
+ \RequirePackage{mathptmx}
+ }
+ \IfFontExistsTF{texgyreheros-regular.otf}{%
+ \setsansfont{texgyreheros}%
+ [ Extension = .otf
+ , UprightFont = *-regular
+ , ItalicFont = *-italic
+ , BoldFont = *-bold
+ , BoldItalicFont = *-bolditalic
+ , Scale = 0.92
+ ]
+ }{%
+ \IfFileExists{newtxtext.sty}{%
+ \appto\sffamily{\fontencoding{T1}\selectfont}%
+ }{}
+ \RequirePackage[scaled=0.92]{helvet}
+ }
+ }
+ \@ifpackageloaded{newtxmath}{%
\DeclareSymbolFont{oldoperators}{OT1}{ntxtlf}{m}{n}
\SetSymbolFont{oldoperators}{bold}{OT1}{ntxtlf}{b}{n}
\AtBeginDocument{%
@@ -84,25 +168,7 @@
\DeclareMathAccent{\dot}{\mathalpha}{oldoperators}{"5F}%
\DeclareMathAccent{\mathring}{\mathalpha}{oldoperators}{"17}%
\DeclareMathSymbol{\mathdollar}{\mathord}{operators}{"24}%
- }
- }{%
- \RequirePackage[T1]{fontenc}
- \RequirePackage{mathptmx}
- }
- \IfFontExistsTF{texgyreheros-regular.otf}{%
- \setsansfont{texgyreheros}%
- [ Extension = .otf
- , UprightFont = *-regular
- , ItalicFont = *-italic
- , BoldFont = *-bold
- , BoldItalicFont = *-bolditalic
- , Scale = 0.92
- ]
- }{%
- \IfFileExists{newtxtext.sty}{%
- \appto\sffamily{\fontencoding{T1}\selectfont}%
- }{}
- \RequirePackage[scaled=0.92]{helvet}
+ }%
}
\fi
\RequirePackage{graphicx}
@@ -219,8 +285,8 @@
}
}
-\pretocmd{\date}{\begingroup\let\footnote\@gobble}{}{}%
-\apptocmd{\date}{%
+\xpretocmd{\date}{\begingroup\let\footnote\@gobble}{}{}%
+\xapptocmd{\date}{%
\begingroup
\renewcommand{\thanks}[1]{}
\protected@xdef\thedate{#1}
@@ -254,12 +320,16 @@
\def\dccp@dates{\emph{Received} #1}}
\newcommand*{\revised}[1]{%
\appto\dccp@dates{%
- \space\space\space\textbar\space\space\space
+ \space\space\space
+ \ifdefstring{\dccp@variant}{baskerville}{$\sim$}{\textbar}%
+ \space\space\space
\emph{Revision received} #1}%
}
\newcommand*{\accepted}[1]{%
\appto\dccp@dates{%
- \space\space\space\textbar\space\space\space
+ \space\space\space
+ \ifdefstring{\dccp@variant}{baskerville}{$\sim$}{\textbar}%
+ \space\space\space
\emph{Accepted} #1}%
}
\let\dccp@conf=\empty
@@ -298,7 +368,8 @@
\def\@oddhead{%
\begin{minipage}{\textwidth}%
\centering
- \LARGE\bfseries\color{struct}%
+ \ifdefstring{\dccp@variant}{baskerville}{\huge\sffamily}{\LARGE\bfseries}%
+ \color{struct}%
\ifx\dccp@type\dccp@editorial
\dccp@publ@long
\else
@@ -379,7 +450,8 @@
}%
\let\NormalHead=\@oddhead
\def\@oddfoot{\begin{minipage}[b]{\textwidth}
- \centering\bfseries\normalsize\color{struct}
+ \centering\ifdefstring{\dccp@variant}{baskerville}{\sffamily}{\bfseries}%
+ \normalsize\color{struct}
\ifx\dccp@type\dccp@editorial
\dccp@publ@long
\else
@@ -437,7 +509,7 @@
\null\nobreak\vspace*{-0.528\baselineskip}%
\begingroup
\centering
- {\Large\thetitle\par}
+ {\Large\ifdefstring{\dccp@variant}{baskerville}{\bfseries}{}\thetitle\par}
\vspace{0.7\baselineskip}
\AuthorBlock\par
\vspace{1.7\baselineskip}
@@ -847,7 +919,7 @@
\endgroup
}
%%
-%% Copyright (C) 2019 Digital Curation Centre, University of Edinburgh
+%% Copyright (C) 2020 Digital Curation Centre, University of Edinburgh
%% <info(a)dcc.ac.uk>
%%
%% End of file `dccpaper-base.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dccpaper/idcc.cls new/tex/latex/dccpaper/idcc.cls
--- old/tex/latex/dccpaper/idcc.cls 2019-03-08 23:22:53.000000000 +0100
+++ new/tex/latex/dccpaper/idcc.cls 2020-01-15 22:48:33.000000000 +0100
@@ -14,7 +14,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/03/08 v1.8}
+\def\Version{2020/01/15 v2.0}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{idcc}
[\Version\space Class for submissions to the International Digital Curation Conference.]
@@ -36,12 +36,14 @@
\DeclareOption{bof}{\def\dccp@type{Birds of a Feather}\dcp@proposaltrue}
\DeclareOption{workshop}{\def\dccp@type{Workshop}\dcp@proposaltrue}
\DeclareOption{practice}{\def\dccp@type{Practice Paper}\dcp@proposaltrue}
+\def\dccp@variant{baskerville}
\DeclareOption{15}{%
\def\dccp@publ@short{IDCC15}
\def\dccp@publ@msg{The 10th \dccp@publ@long\ takes place on 9--12 February
2015 in London. URL: \url{http://www.dcc.ac.uk/events/idcc15/}}
\def\dccp@subject{10th \dccp@publ@long, 2015}
\def\dccp@type@fallback{Practice Paper}
+ \def\dccp@variant{times}
}
\DeclareOption{16}{%
\def\dccp@publ@short{IDCC16}
@@ -49,6 +51,7 @@
2016 in Amsterdam. URL: \url{http://www.dcc.ac.uk/events/idcc16/}}
\def\dccp@subject{11th \dccp@publ@long, 2016}
\def\dccp@type@fallback{Practice Paper}
+ \def\dccp@variant{times}
}
\DeclareOption{17}{%
\def\dccp@publ@short{IDCC17}
@@ -56,6 +59,7 @@
2017 in Edinburgh. URL: \url{http://www.dcc.ac.uk/events/idcc17/}}
\def\dccp@subject{12th \dccp@publ@long, 2017}
\def\dccp@type@fallback{Practice Paper}
+ \def\dccp@variant{times}
}
\DeclareOption{18}{%
\def\dccp@publ@short{IDCC18}
@@ -63,12 +67,14 @@
2018 in Barcelona. URL: \url{http://www.dcc.ac.uk/events/idcc18/}}
\def\dccp@subject{13th \dccp@publ@long, 2018}
\def\dccp@type@fallback{Practice Paper}
+ \def\dccp@variant{times}
}
\DeclareOption{19}{%
\def\dccp@publ@short{IDCC19}
\def\dccp@publ@msg{The 14th \dccp@publ@long\ takes place on 4--7 February
2019 in Melbourne. URL: \url{http://www.dcc.ac.uk/events/idcc19/}}
\def\dccp@subject{14th \dccp@publ@long, 2019}
+ \def\dccp@variant{times}
}
\DeclareOption{20}{%
\def\dccp@publ@short{IDCC20}
@@ -99,7 +105,7 @@
\RequirePackage{dccpaper-base}
%%
-%% Copyright (C) 2019 Digital Curation Centre, University of Edinburgh
+%% Copyright (C) 2020 Digital Curation Centre, University of Edinburgh
%% <info(a)dcc.ac.uk>
%%
%% End of file `idcc.cls'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dccpaper/ijdc-v14.cls new/tex/latex/dccpaper/ijdc-v14.cls
--- old/tex/latex/dccpaper/ijdc-v14.cls 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/dccpaper/ijdc-v14.cls 2020-01-15 22:48:33.000000000 +0100
@@ -0,0 +1,62 @@
+%%
+%% This is file `ijdc-v14.cls',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% dccpaper.dtx (with options: `ijdc14')
+%%
+%% ----------------------------------------------------------------
+%% The dccpaper bundle: Classes for submissions to IJDC and IDCC
+%% Author: Alex Ball
+%% E-mail: a.ball(a)ukoln.ac.uk
+%% License: Released under the LaTeX Project Public License v1.3c or later
+%% See: http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
+%%
+\def\Version{2020/01/15 v2.0}
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesClass{ijdc-v14}
+ [\Version\space Class for submissions to the International Journal of Digital Curation, volume 14 onwards.]
+\def\dccp@type{General Article}
+\def\dccp@editorial{Editorial}
+\newif\ifdcp@proposal
+\DeclareOption{editorial}{\let\dccp@type=\dccp@editorial%
+ \AtBeginDocument{% Editorials use Roman numerals for page numbers
+ \pagenumbering{roman}%
+ \renewcommand{\thelastpage}{\@roman\c@lastpage}%
+ }%
+}
+\DeclareOption{paper}{\def\dccp@type{Research Paper}}
+\DeclareOption{preprint}{\def\dccp@type{Conference Preprint}}
+\DeclareOption{article}{\def\dccp@type{General Article}}
+\ProcessOptions\relax
+
+\def\dccp@publ@long{International Journal of Digital Curation}
+\def\dccp@publ@short{IJDC}
+\def\dccp@publ@msg{The \emph{\dccp@publ@long} is an international journal
+committed to scholarly excellence and dedicated to the advancement of digital
+curation across a wide range of sectors. The \dccp@publ@short\ is published by
+the University of Edinburgh on behalf of the Digital Curation Centre. ISSN:
+1746-8256. URL: \url{http://www.ijdc.net/}}
+\def\dccp@titlefoot@bib{%
+ \dccp@publ@long\\
+ \thedate, Vol.\ \thevolume, Iss.\ \theissue, \thepage--\thelastpage.%
+}
+\def\dccp@titlefoot@doi{%
+ \url{https://doi.org/\thedoi}\\
+ DOI: \thedoi
+}
+\def\dccp@normhead@doi{doi:\thedoi}
+\def\dccp@subject{\dccp@publ@long, \thedate, Vol.\ \thevolume, Iss.\ \theissue}
+
+\def\dccp@variant{baskerville}
+
+\LoadClass[a4paper,12pt,twoside]{article}
+
+\RequirePackage{dccpaper-base}
+%%
+%% Copyright (C) 2020 Digital Curation Centre, University of Edinburgh
+%% <info(a)dcc.ac.uk>
+%%
+%% End of file `ijdc-v14.cls'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dccpaper/ijdc-v9.cls new/tex/latex/dccpaper/ijdc-v9.cls
--- old/tex/latex/dccpaper/ijdc-v9.cls 2019-03-08 23:22:53.000000000 +0100
+++ new/tex/latex/dccpaper/ijdc-v9.cls 2020-01-15 22:48:33.000000000 +0100
@@ -14,10 +14,10 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/03/08 v1.8}
+\def\Version{2020/01/15 v2.0}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{ijdc-v9}
- [\Version\space Class for submissions to the International Journal of Digital Curation, volume 9 onwards.]
+ [\Version\space Class for submissions to the International Journal of Digital Curation, volumes 9--13 inclusive.]
\def\dccp@type{General Article}
\def\dccp@editorial{Editorial}
\newif\ifdcp@proposal
@@ -28,6 +28,7 @@
}%
}
\DeclareOption{paper}{\def\dccp@type{Peer-Reviewed Paper}}
+\DeclareOption{preprint}{\def\dccp@type{Conference Preprint}}
\DeclareOption{article}{\def\dccp@type{General Article}}
\ProcessOptions\relax
@@ -49,11 +50,13 @@
\def\dccp@normhead@doi{doi:\thedoi}
\def\dccp@subject{\dccp@publ@long, \thedate, Vol.\ \thevolume, Iss.\ \theissue}
+\def\dccp@variant{times}
+
\LoadClass[a4paper,12pt,twoside]{article}
\RequirePackage{dccpaper-base}
%%
-%% Copyright (C) 2019 Digital Curation Centre, University of Edinburgh
+%% Copyright (C) 2020 Digital Curation Centre, University of Edinburgh
%% <info(a)dcc.ac.uk>
%%
%% End of file `ijdc-v9.cls'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dccpaper.tlpobj new/tlpkg/tlpobj/dccpaper.tlpobj
--- old/tlpkg/tlpobj/dccpaper.tlpobj 2019-03-09 02:24:23.000000000 +0100
+++ new/tlpkg/tlpobj/dccpaper.tlpobj 2020-03-24 01:57:19.000000000 +0100
@@ -1,24 +1,25 @@
name dccpaper
category Package
-revision 50294
+revision 54512
shortdesc Typeset papers for the International Journal of Digital Curation
relocated 1
-longdesc The LaTeX class ijdc-v9 produces camera-ready papers and
+longdesc The LaTeX class ijdc-v14 produces camera-ready papers and
longdesc articles suitable for inclusion in the International Journal of
-longdesc Digital Curation, with applicability from volume 9 onwards. The
-longdesc similar idcc class can be used for submissions to the
-longdesc International Digital Curation Conference, beginning with the
-longdesc 2015 conference.
-runfiles size=25
+longdesc Digital Curation, with applicability from volume 14 onwards; a
+longdesc legacy class ijdc-v9 is provided for papers and articles
+longdesc written for volumes 9-13. The similar idcc class can be used
+longdesc for submissions to the International Digital Curation
+longdesc Conference, beginning with the 2015 conference.
+runfiles size=28
RELOC/tex/latex/dccpaper/dccpaper-base.sty
RELOC/tex/latex/dccpaper/dccpaper-by.eps
RELOC/tex/latex/dccpaper/dccpaper-by.pdf
RELOC/tex/latex/dccpaper/idcc.cls
+ RELOC/tex/latex/dccpaper/ijdc-v14.cls
RELOC/tex/latex/dccpaper/ijdc-v9.cls
catalogue-contact-bugs https://github.com/DigitalCurationCentre/dccpaper/issues
catalogue-contact-repository https://github.com/DigitalCurationCentre/dccpaper
catalogue-ctan /macros/latex/contrib/dccpaper
-catalogue-date 2019-03-08 18:49:03 +0100
-catalogue-license lppl1.3ccc-by-4
+catalogue-license lppl1.3c cc-by-4
catalogue-topics journalpub confproc class
-catalogue-version 1.8
+catalogue-version 2.0
++++++ dehyph-exptl.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dehyph-exptl.doc.tlpobj new/tlpkg/tlpobj/dehyph-exptl.doc.tlpobj
--- old/tlpkg/tlpobj/dehyph-exptl.doc.tlpobj 2019-04-06 23:32:30.000000000 +0200
+++ new/tlpkg/tlpobj/dehyph-exptl.doc.tlpobj 2020-03-24 01:57:19.000000000 +0100
@@ -1,6 +1,6 @@
name dehyph-exptl.doc
category Package
-revision 50772
+revision 54512
shortdesc doc files of dehyph-exptl
relocated 1
docfiles size=54
++++++ dehyph-exptl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dehyph-exptl.tlpobj new/tlpkg/tlpobj/dehyph-exptl.tlpobj
--- old/tlpkg/tlpobj/dehyph-exptl.tlpobj 2019-04-06 23:32:30.000000000 +0200
+++ new/tlpkg/tlpobj/dehyph-exptl.tlpobj 2020-03-24 01:57:19.000000000 +0100
@@ -1,6 +1,6 @@
name dehyph-exptl
category Package
-revision 50772
+revision 54512
shortdesc Experimental hyphenation patterns for the German language
relocated 1
longdesc The package provides experimental hyphenation patterns for the
@@ -14,8 +14,8 @@
longdesc Babel und hyphsubst aus dem Oberdiek-Bundel verwendet werden.
depend hyphen-base
depend hyph-utf8
-execute AddHyphen name=german-x-2019-04-04 synonyms=german-x-latest lefthyphenmin=2 righthyphenmin=2 file=dehypht-x-2019-04-04.tex file_patterns=hyph-de-1901.pat.txt file_exceptions=hyph-de-1901.hyp.txt
-execute AddHyphen name=ngerman-x-2019-04-04 synonyms=ngerman-x-latest lefthyphenmin=2 righthyphenmin=2 file=dehyphn-x-2019-04-04.tex file_patterns=hyph-de-1996.pat.txt file_exceptions=hyph-de-1996.hyp.txt
+execute AddHyphen name=german-x-2019-04-04 synonyms=german-x-latest lefthyphenmin=2 righthyphenmin=2 file=dehypht-x-2019-04-04.tex file_patterns=hyph-de-1901.pat.txt file_exceptions=
+execute AddHyphen name=ngerman-x-2019-04-04 synonyms=ngerman-x-latest lefthyphenmin=2 righthyphenmin=2 file=dehyphn-x-2019-04-04.tex file_patterns=hyph-de-1996.pat.txt file_exceptions=
runfiles size=143
RELOC/tex/generic/dehyph-exptl/dehyphn-x-2019-04-04.pat
RELOC/tex/generic/dehyph-exptl/dehyphn-x-2019-04-04.tex
@@ -25,7 +25,6 @@
RELOC/tex/generic/dehyph-exptl/dehyphts-x-2019-04-04.tex
catalogue-contact-home http://projekte.dante.de/Trennmuster/WebHome
catalogue-ctan /language/hyphenation/dehyph-exptl
-catalogue-date 2019-04-04 14:10:17 +0200
-catalogue-license mitlppl
+catalogue-license mit lppl
catalogue-topics hyphenation german
catalogue-version 0.6
++++++ denisbdoc.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/denisbdoc/README.md new/doc/latex/denisbdoc/README.md
--- old/doc/latex/denisbdoc/README.md 2017-01-03 00:40:41.000000000 +0100
+++ new/doc/latex/denisbdoc/README.md 2020-03-27 22:12:57.000000000 +0100
@@ -1,8 +1,8 @@
-denisbdoc - A personal package for documenting classes and packages, v. 0.7
+denisbdoc - A personal package for documenting classes and packages, v. 0.8
===========================================================================
-**The (quick 'n dirty) `denisbdoc` package is just for documenting the classes
-I've written.**
+**The sole purpose of this (quick 'n dirty) `denisbdoc` package is for
+documenting the classes written by its author (Denis Bitouz'e).**
The class is supplied in `.dtx` format. If you want to unpack the `.dtx`
yourself, running:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/denisbdoc/denisbdoc.xdy new/doc/latex/denisbdoc/denisbdoc.xdy
--- old/doc/latex/denisbdoc/denisbdoc.xdy 2016-10-30 22:47:55.000000000 +0100
+++ new/doc/latex/denisbdoc/denisbdoc.xdy 2020-03-27 22:12:57.000000000 +0100
@@ -29,7 +29,7 @@
\providecommand*\lettergroup[1]{%
\belowpdfbookmark{#1}{\csuse{DBD@index@symbolic@name}:#1}%
\par\indexheading{#1}{\csuse{DBD@index@symbolic@name}}\par
- \nopagebreak
+ % \nopagebreak
}
~n"
:close "~n~n\end{theindex}~n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/denisbdoc.doc.tlpobj new/tlpkg/tlpobj/denisbdoc.doc.tlpobj
--- old/tlpkg/tlpobj/denisbdoc.doc.tlpobj 2019-02-28 03:31:42.000000000 +0100
+++ new/tlpkg/tlpobj/denisbdoc.doc.tlpobj 2020-03-28 01:55:10.000000000 +0100
@@ -1,6 +1,6 @@
name denisbdoc.doc
category Package
-revision 42829
+revision 54584
shortdesc doc files of denisbdoc
relocated 1
docfiles size=3
++++++ denisbdoc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/denisbdoc/denisbdoc.sty new/tex/latex/denisbdoc/denisbdoc.sty
--- old/tex/latex/denisbdoc/denisbdoc.sty 2017-01-03 00:40:41.000000000 +0100
+++ new/tex/latex/denisbdoc/denisbdoc.sty 2020-03-27 22:12:57.000000000 +0100
@@ -6,16 +6,17 @@
%%
%% denisbdoc.dtx (with options: `package')
%% -----------------------------------------------------------------------------
-%% denisbdoc --- A personal dirty package for documenting packages, version 0.7
+%% denisbdoc --- A personal dirty package for documenting personal classes,
+%% version 0.8
%%
%% Maintained by Denis Bitouz'e
-%% E-mail: denis.bitouze(a)lmpa.univ-littoral.fr
+%% E-mail: denis.bitouze(a)univ-littoral.fr
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% -----------------------------------------------------------------------------
%%
\RequirePackage{expl3,l3keys2e,xparse}
-\ProvidesExplPackage {denisbdoc} {2017/01/01} {0.7}
+\ProvidesExplPackage {denisbdoc} {2020/03/27} {0.8}
{A personal package for documenting packages}
\@ifpackagelater { expl3 } { 2012/11/21 }
{ }
@@ -33,42 +34,61 @@
yad .bool_gset:N = \g__denisbdoc_yad_bool,
gzt .bool_gset:N = \g__denisbdoc_gzt_bool,
nwejm .bool_gset:N = \g__denisbdoc_nwejm_bool,
+ studentreport .bool_gset:N = \g__denisbdoc_studentreport_bool,
+ lscape .bool_gset:N = \g__denisbdoc_lscape_bool,
}
\ProcessKeysOptions { denisbdoc }
\PassOptionsToPackage{obeyspaces}{url}
\sys_if_engine_pdftex:TF
- {
- \RequirePackage[T1]{fontenc}
- \RequirePackage[utf8]{inputenc}
- }{
- \RequirePackage{fontspec}
- }
+{
+ \RequirePackage{cmap}
+ \RequirePackage[T1]{fontenc}
+ \RequirePackage[utf8]{inputenc}
+}{
+ \RequirePackage{fontspec}
+}
\RequirePackage{xpatch}%
\AtEndPreamble{%
\RequirePackage{mweights}%
}%
-\RequirePackage{parskip}%
\RequirePackage{fixfoot}%
-\RequirePackage{marginnote}
-\RequirePackage[inline]{enumitem}%
+\newif\if@DBD@beamer@not@loaded@
+\@DBD@beamer@not@loaded@true
+\@ifclassloaded{beamer}{\@DBD@beamer@not@loaded@false}{\@DBD@beamer@not@loaded@true}
+\if@DBD@beamer@not@loaded@
+\RequirePackage{parskip}%
+ \RequirePackage{marginnote}
+ \RequirePackage{mparhack}
+ \RequirePackage[inline]{enumitem}
+\fi%
\RequirePackage{afterpage}%
\RequirePackage{calc}%
\RequirePackage{siunitx}%
\RequirePackage{booktabs}%
\RequirePackage{multirow}%
\RequirePackage[xr]{zref}%
-\RequirePackage[multiple]{footmisc}%
-\RequirePackage{rotating}%
-\RequirePackage{pdflscape}%
+\if@DBD@beamer@not@loaded@
+ \RequirePackage[multiple]{footmisc}%
+ \RequirePackage{rotating}%
+\fi%
+\bool_if:nTF {\g__denisbdoc_lscape_bool} {%
+ \RequirePackage{lscape}%
+}{%
+ \RequirePackage{pdflscape}%
+}
\RequirePackage{xspace}%
\RequirePackage{accsupp}
+\RequirePackage{newunicodechar}
\RequirePackage{hologo}%
\RequirePackage{xifthen}%
\RequirePackage{refcount}%
+\RequirePackage{etoolbox}%
\RequirePackage{iflang}%
\RequirePackage{ifpdf}%
\RequirePackage{amssymb}%
-\RequirePackage{tocvsec2}%
+\if@DBD@beamer@not@loaded@
+ \RequirePackage{tocvsec2}%
+\fi
\RequirePackage{ltxcmds}%
\RequirePackage{csquotes}%
\RequirePackage{tikz}%
@@ -94,7 +114,6 @@
\__denisbdoc_printbibliography_ORI[heading=bibintoc,#1]%
\pagestyle{ordinary}%
}%
- }{%
}%
}%
}{%
@@ -104,8 +123,10 @@
\RequirePackage{babel}%
\RequirePackage[nodayofweek]{datetime}%
\RequirePackage{subcaption}%
-\RequirePackage{tocbibind}%
-\RequirePackage[xindy]{imakeidx}
+\if@DBD@beamer@not@loaded@
+ \RequirePackage{tocbibind}%
+ \RequirePackage[xindy]{imakeidx}
+\fi%
\RequirePackage{varioref}%
\@ifpackageloaded{tcolorbox}{%
}{%
@@ -115,13 +136,16 @@
}{%
\RequirePackage[hyperfootnotes=false,hyperindex=false]{hyperref}%
}%
-\RequirePackage{attachfile2} \@ifpackageloaded{nameref}{%
+\RequirePackage{attachfile2}%
+\@ifpackageloaded{nameref}{%
}{%
\RequirePackage{nameref}%
}%
\@ifpackageloaded{hypcap}{%
}{%
- \RequirePackage[all]{hypcap}%
+ \if@DBD@beamer@not@loaded@
+ \RequirePackage[all]{hypcap}%
+ \fi%
}%
\@ifpackageloaded{bookmark}{%
}{%
@@ -132,6 +156,15 @@
% \RequirePackage{glossaries}%
\RequirePackage[xindy,hyperfirst=false,toc=false]{glossaries-extra}%
\makeglossaries%
+ \newglossaryentry{zip}{%
+ name=zip,%
+ category={format},%
+ description={format~ de~ fichier~ permettant~ l'archivage~ (utilisation~
+ d'un~ seul~ fichier~ pour~ stocker~ plusieurs~ fichiers)~ et~ la~
+ compression~ de~ donn^^c3^^a9es~ (diminution~ de~ l'espace~ occup^^c3^^a9~ sur~ le~
+ support~ num^^c3^^a9rique)~ sans~ perte~ de~ qualit^^c3^^a9},%
+ text={zip}%
+ }%
\setglossarystyle{indexhypergroup}%
\setabbreviationstyle[acronym]{long-short-sc}%
\newcommand*{\formatfont}[1]{\textsc{#1}}%
@@ -147,22 +180,24 @@
}{%
\RequirePackage{cleveref}%
}%
-\def\hdpindex#1#2{%
- \csname\ifx\\#1\\relax\else#1\fi\endcsname{%
- \hyperpage{#2}%
- }%
-}
-\let\HDorg@wrglossary\@wrglossary
-\def\@wrglossary#1{%
- \let\HDorg@encapchar\encapchar
- \def\encapchar##1\encapchar##2\@nil{%
- \HDorg@encapchar
- hdpindex{##1}%
- }%
- \HDorg@wrglossary{#1\encapchar\encapchar\@nil}%
-}
+\if@DBD@beamer@not@loaded@
+ \def\hdpindex#1#2{%
+ \csname\ifx\\#1\\relax\else#1\fi\endcsname{%
+ \hyperpage{#2}%
+ }%
+ }
+ \let\HDorg@wrglossary\@wrglossary
+ \def\@wrglossary#1{%
+ \let\HDorg@encapchar\encapchar
+ \def\encapchar##1\encapchar##2\@nil{%
+ \HDorg@encapchar
+ hdpindex{##1}%
+ }%
+ \HDorg@wrglossary{#1\encapchar\encapchar\@nil}%
+ }
+\fi%
\renewcommand{\acrpluralsuffix}{}
-\ltx(a)iffilelater{frenchb.ldf}{2016/03/20}{%
+\ltx(a)iffilelater{french.ldf}{2016/03/20}{%
}{%
\DeclareRobustCommand*{\NoAutoSpacing}{\FBAutoSpaceGuillfalse%
\ifFB@active@punct\noautospace@beforeFDP\shorthandoff{;:!?}\fi%
@@ -175,12 +210,6 @@
\tcbuselibrary{listingsutf8}
\else
\tcbuselibrary{listings}
-\pdftex_if_engine:TF
- {
- \lstMakeShortInline[style=dbtex]|
- }{
- \lstMakeShortInline[style=dbtex]^^c3^^97
- }
\fi
\tcbuselibrary{%
documentation,theorems,breakable,skins,xparse%
@@ -204,11 +233,16 @@
}
}
\tcbset{doc marginnote={if odd page or oneside={flushright upper}{flushright upper}}}
-\patchcmd{\@mn@margintest}{\@tempswafalse}{\@tempswatrue}{}{}
-\patchcmd{\@mn@margintest}{\@tempswafalse}{\@tempswatrue}{}{}
\reversemarginpar
-\DeclareTotalTCBox{\commandshell}{ v }
-{ commandshell}{#1}
+\pretocmd{\tcbdocmarginnote}{%
+ \patchcmd{\@mn@margintest}{\@tempswafalse}{\@tempswatrue}{}{}
+ \patchcmd{\@mn@margintest}{\@tempswafalse}{\@tempswatrue}{}{}
+ \reversemarginpar%
+}{}{}
+\@ifpackageloaded{geometry}{%
+ \geometry{marginparwidth=.65in}%
+}{}
+\DeclareTotalTCBox{\commandshell}{ v }{ commandshell}{#1}
\newtcblisting{listingshell}[1][]{%
% colback=black,
% colupper=white,
@@ -236,6 +270,7 @@
}
\usetikzlibrary{trees,backgrounds,fit,calc,positioning}
\attachfilesetup{color=Hyperlink}
+\if@DBD@beamer@not@loaded@
\newcommand{\indexmark}[1]{\hypertarget{index:#1}{#1}\markboth{#1}{#1}}
\newcommand{\targetindexentry}[1]{\indexmark{#1}}
\newcounter{targeti}
@@ -249,14 +284,15 @@
\index{exemple!#1|example}%
}
\newcommand{\indexsee}[2]{\index{#1|see{#2}}}
-\xpretocmd{\printindex}{\def\DBD@index@symbolic@name{#1}}{}{}
+ \xpretocmd{\printindex}{\edef\DBD@index@symbolic@name{#1}}{}{\aaa}
+ % \xpretocmd{\printindex}{\edef\DBD@index@symbolic@name{#1}}{}{\aaa}
\xpatchcmd{\indexprologue}{#2}{%
#2
\par\bigskip
\csuse{DBD@indexnavigation@\csuse{DBD@index@symbolic@name}}%
-}{}{}%
-\newif\if@DBD@no@first@letter@
-\@DBD@no@first@letter@false
+}{}{\aaa}%
+ \newif\if@DBD@no@first@letter@
+ \@DBD@no@first@letter@false
\newcommand*{\indexheading}[2]{%
\hypertarget{#2:#1}{\textbf{#1}}%
\protected@write\@auxout{}{\string\DBD@indexgroup{#1}{#2}}%
@@ -272,7 +308,7 @@
\fi
\hyperlink{#2:#1}{\textbf{#1}}%
}%
-}
+}%
\DeclareUrlCommand\urldirectory{\urlstyle{tt}}
\ExplSyntaxOn
\tl_const:Nn \c__denisbdoc_examples_path_tl {../exemples}
@@ -302,6 +338,8 @@
\colorlet{en-arborescence}{red!20}
\colorlet{a-plat}{blue!20}
\colorlet{texcs}{blue}
+\colorlet{directive}{texcs}
+\colorlet{mandatory-argument}{red}
\colorlet{environment}{teal}
\colorlet{key}{purple}
\colorlet{value}{violet}
@@ -317,7 +355,7 @@
\lstdefinelanguage[extLaTeX]{TeX}[LaTeX]{TeX}{%
moretexcs={%
footnotesize,huge,Huge,large,Large,LARGE,large,Large,scriptsize,tiny,%
- includegraphics,cite,ttwplink,vref,LTXtable,tableofcontents,frontmatter,mainmatter,%
+ includegraphics,cite,ttwplink,cref,vref,LTXtable,tableofcontents,frontmatter,mainmatter,%
part,chapter,section,subsection,subsubsection,paragraph,subparagraph,RequirePackage,%
listoftables,listoffigures,lstlistingname,si,SI,ohm,num,space,shorthandon,shorthandoff,%
abstractname,appendixname,contentsname,listfigurename,listtablename,indexname,%
@@ -327,9 +365,9 @@
@pnumwidth,bookmarksetup,DeclareTextCommand,text,iiint,NewPairedDelimiter,%
norm,lnorm,llnorm,lpnorm,supnorm,abs,prt,brk,brc,lrangle,leqgeq,%
norm*,lnorm*,llnorm*,lpnorm*,supnorm*,abs*,prt*,brk*,brc*,lrangle*,leqgeq*,%
- pdfobjcompresslevel,chaptermark%
+ pdfobjcompresslevel,chaptermark,PassOptionsToClass%
},%
- morekeywords=[1]{% Environments' names
+ morekeywords={[1]% Environments' names
tabular,tabulary,math,document,minipage,eqnarray,eqnarray*,align,align*,%
equation,gather,multline,flalign,equation*,gather*,multline*,flalign*,%
itemize,itemize*,enumerate,enumerate*,description,description*,%
@@ -355,7 +393,7 @@
acrfullpl,Acrfullpl,%
Acrlong*,acronymtype,printacronyms,printsymbols%
},%
- % Environments' names
+ % Mandatory arguments (other than environments' names)
morekeywords={%
},%
% Mots-cl^^c3^^a9s de niveau 2 : arguments obligatoires et environnements
@@ -376,11 +414,58 @@
{%
% S^^c3^^a9quences de contr^^c3^^b4les (commun^^c3^^a9ment appel^^c3^^a9es commandes ou macros)
moretexcs={%
- printbibliography,SetCiteCommand,autocite,addbibresource,fullcite,%
- textcite,cite,citeauthor%
+ cite,Cite,parencite,Parencite,footcite,footcitetext,%
+ smartcite,Smartcite,%
+ textcite,Textcite,supercite,cites,Cites,parencites,%
+ Parencites,footcitesfootcitetexts,textcites,Textcites,%
+ supercites,autocite,Autocite,autocite*,Autocite*,autocites,%
+ Autocites,citeauthor,Citeauthor,citetitle,citetitle*,%
+ citeyear,citeurl,parentext,brackettext,nocite,fullcite,%
+ footfullcite,volcite,Volcite,pvolcite,Pvolcite,fvolcite,%
+ ftvolcite,tvolcite,Tvolcite,avolcite,Avolcite,notecite,%
+ Notecite,pnotecite,Pnotecite,fnotecite,citename,citelist,%
+ citefield,printbibliography,bibliography,citedate,%
+ ExecuteBibliographyOptions,defbibnote,psq,psqq,addbibresource%
+ },%
+ % morekeywords={%
+ % @article,@book,@inbook,@bookinbook,@suppbook,@booklet,@collection,%
+ % @conference,@incollection,@suppcollection,@manual,@misc,@online,%
+ % @patent,@periodical,@suppperiodical,@proceedings,@inproceedings,%
+ % @reference,@inreference,@report,@thesis,@unpublished,@masterthesis,%
+ % @phdthesis,%
+ % @Article,@Book,@Inbook,@Bookinbook,@Suppbook,@Booklet,@Collection,%
+ % @conference,@Incollection,@Suppcollection,@Manual,@Misc,@Online,%
+ % @patent,@Periodical,@Suppperiodical,@Proceedings,@Inproceedings,%
+ % @reference,@Inreference,@Report,@Thesis,@Unpublished,@Masterthesis,%
+ % @Phdthesis,%
+ % @ARTICLE,@BOOK,@INBOOK,@BOOKINBOOK,@SUPPBOOK,@BOOKLET,@COLLECTION,%
+ % @CONFERENCE,@INCOLLECTION,@SUPPCOLLECTION,@MANUAL,@MISC,@ONLINE,%
+ % @PATENT,@PERIODICAL,@SUPPPERIODICAL,@PROCEEDINGS,@INPROCEEDINGS,%
+ % @REFERENCE,@INREFERENCE,@REPORT,@THESIS,@UNPUBLISHED,@MASTERTHESIS,%
+ % @PHDTHESIS,%
+ % @string,@String,@STRING,@comment%
+ % },%
+ % directives
+ directives={%
+ article,book,inbook,bookinbook,suppbook,booklet,collection,%
+ conference,incollection,suppcollection,manual,misc,online,%
+ patent,periodical,suppperiodical,proceedings,inproceedings,%
+ reference,inreference,report,thesis,unpublished,masterthesis,%
+ phdthesis,%
+ Article,Book,Inbook,Bookinbook,Suppbook,Booklet,Collection,%
+ conference,Incollection,Suppcollection,Manual,Misc,Online,%
+ patent,Periodical,Suppperiodical,Proceedings,Inproceedings,%
+ reference,Inreference,Report,Thesis,Unpublished,Masterthesis,%
+ Phdthesis,%
+ ARTICLE,BOOK,INBOOK,BOOKINBOOK,SUPPBOOK,BOOKLET,COLLECTION,%
+ CONFERENCE,INCOLLECTION,SUPPCOLLECTION,MANUAL,MISC,ONLINE,%
+ PATENT,PERIODICAL,SUPPPERIODICAL,PROCEEDINGS,INPROCEEDINGS,%
+ REFERENCE,INREFERENCE,REPORT,THESIS,UNPUBLISHED,MASTERTHESIS,%
+ PHDTHESIS,%
+ string,String,STRING,comment%
},%
- % Mots-cl^^c3^^a9s de niveau 1 : arguments optionnels
- morekeywords={%
+ % Mots-cl^^c3^^a9s de niveau 1 : attributs et options de biblatex
+ morekeywords=[2]{%
abstract,addendum,afterword,annotation,annotator,author,authortype,%
bookauthor,bookpagination,booksubtitle,booktitle,booktitleaddon,%
chapter,commentator,date,doi,edition,editor,editora,editorb,%
@@ -400,35 +485,74 @@
archiveprefix,journal,key,pdf,primaryclass,school,address,%
%
backend,style,citestyle,bibstyle,sorting,maxnames,minnames,maxitems,minitems,%
- backref,abbreviate,firstinits,prenote,postnote,useprefix%
+ backref,abbreviate,firstinits,prenote,postnote,useprefix,autopunct%
+ },%
+ % Mots-cl^^c3^^a9s de niveau 3 : valeurs des attributs identifi^^c3^^a9es
+ morekeywords=[3]{%
+ submitted,inpress,danish dutch,american,USenglish,english,%
+ british,UKenglish,canadian,australian,newzealand,finnish,french,%
+ francais,canadien,german,ngerman,austrian,naustrian,greek,%
+ italian,norsk,nynorsk,brazil,portuges,spanish,swedish,%
+ %
+ biber,numeric,numeric-comp,numeric-verb,alphabetic,%
+ alphabetic-verb,authoryear,authoryear-comp,authoryear-ibid,%
+ authoryear-icomp,authortitle,authortitle-comp,authortitle-ibid,%
+ authortitle-icomp,authortitle-terse,authortitle-tcomp,%
+ authortitle-ticomp,verbose,verbose-ibid,verbose-note,%
+ verbose-inote,verbose-trad1,verbose-trad2,verbose-trad3,%
+ reading,draft,debug,%
+ inline,footnote,superscript,plain,%
+ nyt,ynt,none,false%
+ },%
+ alsoletter={-123},%
+ sensitive,%
+ delim=*[directive]@
+ %
+}[keywords,directives,tex,comments]%
+\lstdefinelanguage[csquotes]{TeX}[LaTeX]{TeX}%
+{%
+ % S^^c3^^a9quences de contr^^c3^^b4les (commun^^c3^^a9ment appel^^c3^^a9es commandes ou macros)
+ moretexcs={%
+ enquote,textelp,textins,blockcquote,SetCiteCommand%
+ },%
+ % Mots-cl^^c3^^a9s de niveau 1 : arguments optionnels
+ morekeywords={%
},%
% Mots-cl^^c3^^a9s de niveau 2 : arguments obligatoires et environnements
morekeywords=[2]{%
% title,
- heading,refsegment%
},%
% Mots-cl^^c3^^a9s de niveau 3 : arguments optionnels valeurs de cl^^c3^^a9s dans cl^^c3^^a9=valeur
morekeywords=[3]{%
- bibintoc,skipbib,chapter%
+ skipbib%
+ },%
+ % Mots-cl^^c3^^a9s de niveau 4 : arguments optionnels valeurs de cl^^c3^^a9s dans cl^^c3^^a9=valeur
+ morekeywords=[4]{%
},%
sensitive%
}[keywords,tex,comments]%
-\lstdefinelanguage[csquotes]{TeX}[LaTeX]{TeX}%
+\lstdefinelanguage[colophon]{TeX}[LaTeX]{TeX}%
{%
% S^^c3^^a9quences de contr^^c3^^b4les (commun^^c3^^a9ment appel^^c3^^a9es commandes ou macros)
moretexcs={%
- enquote,textelp,textins,blockcquote%
+ colophontitle,colophontitlestyle,colophontitlesize,colophonmidspace,%
+ colophonpagestyle,colophontitlealign,colophonpretitlehook,colophonposttitlehook,%
+ colophonparstyle,colophonparsize,colophonparlead,colophonnofirstindent,colophonpreparhook,%
+ colophonpostparhook,colophonparalign,colophonnofullpage,colophonnoclrdblpg,colophonclrpg,%
+ colophontopspace,colophonbotspace%
},%
% Mots-cl^^c3^^a9s de niveau 1 : arguments optionnels
morekeywords={%
},%
% Mots-cl^^c3^^a9s de niveau 2 : arguments obligatoires et environnements
morekeywords=[2]{%
- % title,
+ colophon,
},%
% Mots-cl^^c3^^a9s de niveau 3 : arguments optionnels valeurs de cl^^c3^^a9s dans cl^^c3^^a9=valeur
morekeywords=[3]{%
- skipbib%
+ titlestyle,titlesize,aftertitle,pagestyle,titlealign,%
+ parstyle,parsize,parlead,nofirstindent,nofullpage,noclrdblpg,%
+ clrpg,topspace,botspace%
},%
% Mots-cl^^c3^^a9s de niveau 4 : arguments optionnels valeurs de cl^^c3^^a9s dans cl^^c3^^a9=valeur
morekeywords=[4]{%
@@ -513,7 +637,12 @@
},%
% Mots-cl^^c3^^a9s de niveau 2 : arguments obligatoires et environnements
morekeywords=[2]{%
- breaklinks,colorlinks,bookmarks,pdfborderstyle,pdfborder,all%
+ breaklinks,colorlinks,bookmarks,pdfborderstyle,pdfborder,all,pdfencoding,final,%
+ hidelinks,linktoc,%
+ },%
+ % Mots-cl^^c3^^a9s de niveau 3 : arguments optionnels valeurs de cl^^c3^^a9s dans cl^^c3^^a9=valeur
+ morekeywords=[3]{%
+ unicode%
},%
sensitive%
}[keywords,tex,comments]%
@@ -524,7 +653,7 @@
laboratory,dedication,frontepigraph,keywords,subject,expression,tableofcontents,submissiondate,%
maketitle,makedisclaimer,makekeywords,makelaboratory,makeabstract,makededications,%
makefrontepigraphs,makebackcover,ordernumber,chapter*,disclaimer,newglssymbol,yadsetup,%
- comue,%
+ comue,newcorporation%
% acknowledgements,frenchabstract,foreword,preface,caution,
},%
% Environments' names
@@ -543,7 +672,7 @@
address,telephone,fax,email,type,acronym,heading,nowarning,noerror,nofrontcover,role,%
hyperfootnotes,hyperindex,plainpages,pdfpagemode,pdfpagelayout,locale,gray,frametitle,%
graphicx,adjustbox,setspace,xcolor,datatool,titleps,draftwatermark,babel,datetime,%
- bookmark,fncychap,localtocs,localbibs,localbibs*%
+ bookmark,fncychap,localtocs,localtocs/depth,localbibs,localbibs*%
},%
morekeywords=[3]{% Values of key-value lists
single,onehalf,double,doctor,yadsymbolstyle,%
@@ -567,7 +696,7 @@
comonitor*,supervisor,supervisor*,academicfield,doctoralschool,keywords,%
ordernumber,committeepresident,committeepresident*,speciality%
},%
- alsoletter={!-*1234560}%
+ alsoletter={!-*1234560/}%
}%
\lstdefinelanguage[gzt]{TeX}[LaTeX]{TeX}{%
moretexcs={% Control sequences' names
@@ -582,7 +711,7 @@
vec,surname,usetikzlibrary,arccos,arcsin,arctan,log,lg,le,leq,ge,geq,%
gztverb,th,epigraph%
},%
- % Environments' names
+ % Mandatory arguments (other than environments' names)
morekeywords={%
gzt,gztarticle%
},%
@@ -620,11 +749,13 @@
printauthorsdetails,date,title,author,maketitle,item,printbibliography,%
vec,surname,usetikzlibrary,arccos,arcsin,arctan,log,lg,le,leq,ge,geq,set,%
nwejmverb,th,epigraph,keywords,msc,acknowledgments,E,I,grad,Div,curl,rot,supp,%
- DeclareMathOperator,BinaryOperators,dif,articlesetup%
+ DeclareMathOperator,BinaryOperators,dif,articlesetup,%
+ bbN,bbZ,bbD,bbQ,bbR,bbC,bbK,%
+ newenumeration%
},%
- % Environments' names
+ % Mandatory arguments (other than environments' names)
morekeywords={%
- nwejm,nwejmart,assertions,hypotheses%
+ nwejm,nwejmart,%
},%
morekeywords=[1]{% Environments' names
abstract,minitoclist,bookreview,bookadvertisement,%
@@ -632,14 +763,15 @@
theorem,theoreme,corollary,corollaire,conjecture,proposition,%
lemma,lemme,axiom,axiome,definition,remark,remarque,example,exemple,notation,%
theorem*,theoreme*,corollary*,corollaire*,conjecture*,proposition*,proof,preuve,%
- lemma*,lemme*,axiom*,axiome*,definition*,remark*,remarque*,example*,exemple*,notation*%
+ lemma*,lemme*,axiom*,axiome*,definition*,remark*,remarque*,example*,exemple*,notation*,%
+ assertions,hypotheses%
},%
morekeywords=[2]{% Keys of key-value lists
number,month,year,publisher,address,phone,fax,email,url,issn,isbn,short,minishort,notintoc,%
abstract,frenchtitle,englishtitle,% title,label,%
pictogram,list,help,diameter,textwidth,xshift,yshift,%
affiliation,affiliationtagged,email,minibio,photo,webpage,frontcover,bibkey,copyright,%
- gradient%
+ gradient,title/french,style,title,title-plural,singular,plural,label%
},%
morekeywords=[3]{% Values of key-value lists
true,false,theorem,definition,proof%
@@ -647,6 +779,25 @@
morekeywords=[4]{% Class and packages options
pagegrid,forprinter,cover,forauthors,%
},%
+ alsoletter={!-*1234560/}%
+}%
+\lstdefinelanguage[studentreport]{TeX}[LaTeX]{TeX}{%
+ moretexcs={% Control sequences' names
+ reportsetup,daterange,professionaladvisor,academicadvisor,companylogo%
+ },%
+ % Mandatory arguments (other than environments' names)
+ morekeywords={%
+ },%
+ morekeywords=[1]{% Environments' names
+ },%
+ morekeywords=[2]{% Keys of key-value lists
+ institute,subinstitute,subsubinstitute,year,10pt,11pt,12pt,internship,project,layout,%
+ strings,pretitle,company,advisor,advisors,before~start~date,before~end~date,date,%
+ logos,logosheights,,%
+ },%
+ morekeywords=[3]{% Values of key-value lists
+ ulco,iutlco,gte,gim,%
+ },%
alsoletter={!-*1234560}%
}%
\lstdefinelanguage{bash}[]{sh}%
@@ -666,33 +817,35 @@
\ttfamily%
\DeclareFontShape{T1}{lmtt}{bx}{it}{<-> ssub * lmtt/b/sl}{}%
}
-\xapptocmd{\@chapter}{%
- \addtocontents{dbwarninglist}{\protect\addvspace{10\p@}}%
- \addtocontents{dbremarklist}{\protect\addvspace{10\p@}}%
- \addtocontents{dbexamplelist}{\protect\addvspace{10\p@}}%
- \addtocontents{dbfaqlist}{\protect\addvspace{10\p@}}%
- \addtocontents{dbtablist}{\protect\addvspace{10\p@}}%
-}{}{}
+\if@DBD@beamer@not@loaded@
+\ifcsdef{@chapter}{
+ \xapptocmd{\@chapter}{%
+ \addtocontents{dbwarninglist}{\protect\addvspace{10\p@}}%
+ \addtocontents{dbremarklist}{\protect\addvspace{10\p@}}%
+ \addtocontents{dbexamplelist}{\protect\addvspace{10\p@}}%
+ \addtocontents{dbfaqlist}{\protect\addvspace{10\p@}}%
+ \addtocontents{dbtablist}{\protect\addvspace{10\p@}}%
+ }{}{}
+}{}
+\fi%
\sisetup{locale=FR,detect-all}
-\lstdefinestyle{dbtex}{%
+\lstdefinestyle{pre-dbtex}{%
escapechar=",
language=[LaTeX]TeX,
alsolanguage=[extLaTeX]TeX,
- alsolanguage=[glossaries]TeX,
- alsolanguage=[biblatex]TeX,
+ % alsolanguage=[glossaries]TeX,
+ % alsolanguage=[biblatex]TeX,
alsolanguage=[csquotes]TeX,
- alsolanguage=[tcolorbox]TeX,
- alsolanguage=[listings]TeX,
- alsolanguage=[xcolor]TeX,
- alsolanguage=[hyperref]TeX,
- alsolanguage=[yad]TeX,
- alsolanguage=[gzt]TeX,
- alsolanguage=[nwejm]TeX,
+ % alsolanguage=[tcolorbox]TeX,
+ % alsolanguage=[listings]TeX,
+ % alsolanguage=[xcolor]TeX,
+ % alsolanguage=[hyperref]TeX,
texcsstyle=*\color{texcs},
breaklines=true,
basicstyle=\normalfont\ttfamily,
commentstyle=\color{comment}\itshape,
- keywordstyle={\color{environment}},
+ directivestyle={\color{directive}},
+ keywordstyle={\color{red}},
keywordstyle={[1]\color{environment}},
keywordstyle={[2]\color{key}},
keywordstyle={[3]\color{value}},
@@ -708,13 +861,54 @@
aboveskip=\c__denisbdoc_listings_aboveskip_skip,
belowskip=\c__denisbdoc_listings_belowskip_skip
}%
+\bool_if:nT {\g__denisbdoc_yad_bool} {%
+ \lstdefinestyle{dbtex}{%
+ style=pre-dbtex,%
+ alsolanguage=[yad]TeX,%
+ alsolanguage=[colophon]TeX,%
+ moretexcs={printbibliography,autocite},%
+ }
+}
+\bool_if:nT {\g__denisbdoc_gzt_bool} {%
+ \lstdefinestyle{dbtex}{%
+ style=pre-dbtex,%
+ alsolanguage=[gzt]TeX,%
+ }
+}
+\bool_if:nT {\g__denisbdoc_nwejm_bool} {%
+ \lstdefinestyle{dbtex}{%
+ style=pre-dbtex,%
+ alsolanguage=[nwejm]TeX,%
+ }
+}
+\bool_if:nT {\g__denisbdoc_studentreport_bool} {%
+ \lstdefinestyle{dbtex}{%
+ style=pre-dbtex,%
+ alsolanguage=[studentreport]TeX,%
+ }
+}
\lstset{style=dbtex}
+\sys_if_engine_pdftex:TF
+{
+ \ExplSyntaxOff
+ \lstMakeShortInline[style=dbtex]|
+ \ExplSyntaxOn
+}{
+ \lstMakeShortInline[style=dbtex]^^c3^^97
+}
\tcbset{dbtcb/.style={%
breakable,
fonttitle=\bfseries,
enlarge~top~by=1mm,
separator~sign~dash,
- label~separator=-
+ label~separator=-,
+ before~title={%
+ \hypersetup{hidelinks}%
+ \tcbset{%
+ color~definition=white,
+ color~hyperlink=white,
+ }%
+ }%
}%
}%
\tcbset{%
@@ -787,83 +981,89 @@
\index{expression!en~anglais!\enquote{\foreignlanguage{english}{\translate{#2}}}}%
}
}
-\expandafter\AtBeginDocument\expandafter{%
- \expandafter\def\expandafter\theindex\expandafter{\theindex}%
-}
-\expandafter\AtBeginDocument\expandafter{%
- \expandafter\def\expandafter\endtheindex\expandafter{\endtheindex}%
-}
-\ExplSyntaxOff
-\def\imki@finalmessage#1{}% since you're using latexmk
-\def\imki@startidx#1#2{%
- \if@filesw
+\@ifclassloaded{beamer}{%
+}{%
+ \expandafter\AtBeginDocument\expandafter{%
+ \expandafter\def\expandafter\theindex\expandafter{\theindex}%
+ }
+ \expandafter\AtBeginDocument\expandafter{%
+ \expandafter\def\expandafter\endtheindex\expandafter{\endtheindex}%
+ }
+ \ExplSyntaxOff
+ \def\imki@finalmessage#1{}% since you're using latexmk
+ \def\imki@startidx#1#2{%
+ \if@filesw
\def\index{\@bsphack
\@ifnextchar [{\@index}{\@index[\imki@jobname]}}
\expandafter\newwrite\csname #1@idxfile\endcsname
\immediate\openout \csname #1@idxfile\endcsname #1.#2\relax
\typeout{Writing index file #1.#2}%
- \fi}
-\xpatchcmd\imki@makeindex
+ \fi}
+ \xpatchcmd\imki@makeindex
{\imki@startidx\imki@name}
{\imki@startidx\imki@name\imki@extout}
{}{}
-\xpatchcmd\imki@build
+ \xpatchcmd\imki@build
{\imki@dokey\imki@title}
{\imki@dokey\imki@title
- \imki@dokey\imki@extin
- \imki@dokey\imki@extout}
+ \imki@dokey\imki@extin
+ \imki@dokey\imki@extout}
{}{}
-\xpatchcmd{\imki@putindex}
+ \xpatchcmd{\imki@putindex}
{\imki@options}
{\c_space_tl~ -o~ #1.\imki@extin\imki@options}
{}{}
-\xpatchcmd{\imki@putindex}
+ \xpatchcmd{\imki@putindex}
{.idx}
{.\imki@extout}
{}{}
-\xpatchcmd{\imki@putindex}
+ \xpatchcmd{\imki@putindex}
{.ind}
{.\imki@extin}
{}{}
-\def\imki@extout{idx}\def\imki@extin{ind}
-\define@key{imki}{extout}{\def\imki@extout{#1}}
-\define@key{imki}{extin}{\def\imki@extin{#1}}
-\ExplSyntaxOn
-\cs_new_protected:Nn \__denisbdoc_alert:n
-{
- \begingroup
- \color{red}
- #1
- \endgroup
+ \def\imki@extout{idx}\def\imki@extin{ind}
+ \define@key{imki}{extout}{\def\imki@extout{#1}}
+ \define@key{imki}{extin}{\def\imki@extin{#1}}
}%
-\NewDocumentCommand \alert {m}
-{
- \__denisbdoc_alert:n {#1}
-}%
-\DeclareDocumentCommand \changes { smmm } {
- \IfBooleanTF {#1}
+\ExplSyntaxOn
+\@ifclassloaded{beamer}{%
+}{%
+ \cs_new_protected:Nn \__denisbdoc_alert:n
{
- \tl_set:Nn \l_tmpa_tl {\alert{#4}}
- }{
- \tl_set:Nn \l_tmpa_tl {#4}
+ \begingroup
+ \color{red}
+ #1
+ \endgroup
+ }%
+ \NewDocumentCommand \alert {m}
+ {
+ \__denisbdoc_alert:n {#1}
+ }%
+ \DeclareDocumentCommand \changes { smmm } {
+ \IfBooleanTF {#1}
+ {
+ \tl_set:Nn \l_tmpa_tl {\alert{#4}}
+ }{
+ \tl_set:Nn \l_tmpa_tl {#4}
+ }
+ \ifx\@onlypreamble\@notprerr
+ \index[\jobname-changes]{\texttt{#2}~(#3)!\l_tmpa_tl}
+ \else
+ \index[\jobname-changes]{\texttt{#2}~(#3)!\emph{Globalement}!\l_tmpa_tl|gobble}
+ \fi
}
- \ifx\@onlypreamble\@notprerr
- \index[\jobname-changes]{\texttt{#2}~(#3)!\l_tmpa_tl}
- \else
- \index[\jobname-changes]{\texttt{#2}~(#3)!\emph{Globalement}!\l_tmpa_tl|gobble}
- \fi
-}
-\DeclareDocumentCommand \PrintChanges { O{} } {
- \indexprologue{#1}
- \def\imki@indexlevel{\chapter}
- \printindex[\jobname-changes]
- \def\imki@indexlevel{\chapter*}
-}
+ \DeclareDocumentCommand \PrintChanges { !O{} } {
+ \indexprologue{#1}
+ \def\imki@indexlevel{\chapter}
+ \printindex[\jobname-changes]
+ \def\imki@indexlevel{\chapter*}
+ }
+}%
\IfLanguageName{french}{%
\DeclarePlainStyle{^^c2^^ab~}{~^^c2^^bb}%
{^^e2^^80^^9c}{^^e2^^80^^9d}
}{}%
-\tl_const:Nx \c__denisbdoc_standard_url_tl { \tl_to_str:n { http://www.ctan.org/pkg/ } }
+\tl_const:Nx \c__denisbdoc_standard_url_tl { \tl_to_str:n { http://ctan.org/pkg/ } }
\cs_new_protected:Npn \__denisbdoc_package_format:nn #1#2
{
#2{\sffamily#1}
@@ -900,15 +1100,15 @@
}
{#4}
}
-\NewDocumentCommand{\package}{ s t+ O{} m O{package} O{} O{} } {
+\NewDocumentCommand{\package}{ s t+ O{} m !O{package} !O{} !O{} } {
\__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{package}{#6}{#7}
}
-\NewDocumentCommand{\Package}{ s t+ O{} m O{package} O{} O{} } {
+\NewDocumentCommand{\Package}{ s t+ O{} m !O{package} !O{} !O{} } {
\IfLanguageName{french}{package~}{}%
\__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{package}{#6}{#7}
\IfLanguageName{english}{~package}{}%
}
-\NewDocumentCommand{\class}{ s t+ O{} m O{} O{} O{} } {
+\NewDocumentCommand{\class}{ s t+ O{} m !O{} !O{} !O{} } {
\IfLanguageName{french}{%
\__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{classe}{#6}{#7}
}{}%
@@ -916,7 +1116,7 @@
\__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{class}{#6}{#7}
}{}%
}
-\NewDocumentCommand{\Class}{ s t+ O{} m O{} O{} O{} } {
+\NewDocumentCommand{\Class}{ s t+ O{} m !O{} !O{} !O{} } {
\IfLanguageName{french}{%
classe~%
\__denisbdoc_package:nnnnnnn {#1}{#2}{#3}{#4}{classe}{#6}{#7}
@@ -962,34 +1162,10 @@
}
\NewDocumentCommand{\Folder}{ m }
{%
- \IfLanguageName{french}{r^^c3^^a9pertoire~}{}%
+ \IfLanguageName{french}{dossier~}{}%
\__denisbdoc_file:n {#1}%
\IfLanguageName{english}{~directory}{}%
}%
-\NewDocumentCommand \ie { s } {%
- \IfBooleanTF {#1}
- {
- \IfLanguageName{french}{%
- c'est-\`{a}-dire
- }{}%
- \IfLanguageName{english}{%
- id est
- }{}%
- }
- {
- \IfLanguageName{french}{%
- c.-^^c3^^a0-d
- }{}%
- \IfLanguageName{english}{%
- i.e
- }{}%
- \(a)ifnextchar.%
- {
- }{
- .\xspace
- }%
- }
-}
\NewDocumentCommand{\program}{ m }
{
\__denisbdoc_file:n {#1}%
@@ -1096,7 +1272,7 @@
{
\hyperref[sec-comm-oblig]{%
\textcolor{red!75!black}{
- % \pdftex_if_engine:TF
+ % \sys_if_engine_pdftex:TF
% {
% % \string!
% \ding{52}
@@ -1111,9 +1287,17 @@
\fi%
}%
}
-\NewDocumentCommand{\mandatory}{ }
+\cs_new_protected:Nn \__denisbdoc_mandatory_no_link:
{
- \__denisbdoc_mandatory: {}
+ \textcolor{red!75!black}{
+ \faLock
+ }
+}
+\NewDocumentCommand{\mandatory}{ s }
+{
+ \IfBooleanTF {#1}
+ { \__denisbdoc_mandatory_no_link: {} }
+ { \__denisbdoc_mandatory: {} }
}%
\NewDocumentCommand{\unixtldirectory}{}
{
@@ -1247,12 +1431,15 @@
}
}
\pdfsuppresswarningpagegroup=1
+\newunicodechar{^^e3^^80^^88}{$\langle$}
+\newunicodechar{^^e3^^80^^89}{$\rangle$}
\cs_new_protected:Nn \__denisbdoc_meta:nn
{
\bgroup%
\normalfont
\ttfamily%
- \textcolor{#1}{$\langle$\emph{#2}$\rangle$}%
+ \itshape%
+ \textcolor{#1}{$\langle$#2$\rangle$}%
\egroup%
}
\AtBeginDocument{%
@@ -1260,12 +1447,12 @@
\__denisbdoc_meta:nn {#1}{#2}
}
}%
-\NewTCBListing{preamblecode}{ O{} }{%
+\NewTCBListing{preamblecode}{ !O{} }{%
codes,%
drop~lifted~shadow,
#1%
}
-\NewTCBListing{bodycode}{ O{} }{%
+\NewTCBListing{bodycode}{ !O{} }{%
codes,%
#1%
}
@@ -1296,9 +1483,14 @@
#3,
}%
\tl_new:N \g__denisbdoc_number_within_tl
-\tl_set:Nn \g__denisbdoc_number_within_tl {chapter}
+\ifcsdef{chapter}{
+ \tl_set:Nn \g__denisbdoc_number_within_tl {chapter}
+}{
+ \tl_set:Nn \g__denisbdoc_number_within_tl {section}
+}
\@ifclassloaded{gztarticle}{\tl_set:Nn \g__denisbdoc_number_within_tl {section}}{}%
\@ifclassloaded{nwejmart}{\tl_set:Nn \g__denisbdoc_number_within_tl {section}}{}%
+\@ifclassloaded{beamer}{\tl_set:Nn \g__denisbdoc_number_within_tl {section}}{}%
\newtcbtheorem[list~inside=dbwarninglist,number~within=\g__denisbdoc_number_within_tl,crefname={avertissement}{avertissements}]{dbwarning}{Avertissement}{%
colback=red!5!white,
colframe=red!75!black,
@@ -1361,7 +1553,7 @@
{
menufont = \sffamily ,
menusep = ${}\to{}$
- }% \end{macrocode}
+ }
\menuentryset{inputsep=>}
\tl_const:Nn \c__denisbdoc_yat_class_name_tl {yathesis}
\tl_const:Nn \c__denisbdoc_configuration_directory_string_tl {configuration}
@@ -1474,8 +1666,8 @@
\def\program#1{#1}
}
\ExplSyntaxOff
-%% Copyright (C) 2015, 2016, 2017 by
-%% Denis Bitouz'e <denis.bitouze(a)lmpa.univ-littoral.fr>
+%% Copyright (C) 2015-2020 by
+%% Denis Bitouz'e <denis.bitouze(a)univ-littoral.fr>
%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/denisbdoc.tlpobj new/tlpkg/tlpobj/denisbdoc.tlpobj
--- old/tlpkg/tlpobj/denisbdoc.tlpobj 2019-02-28 03:31:42.000000000 +0100
+++ new/tlpkg/tlpobj/denisbdoc.tlpobj 2020-03-28 01:55:10.000000000 +0100
@@ -1,13 +1,12 @@
name denisbdoc
category Package
-revision 42829
+revision 54584
shortdesc A personal dirty package for documenting packages
relocated 1
longdesc A personal dirty package for documenting packages.
-runfiles size=13
+runfiles size=15
RELOC/tex/latex/denisbdoc/denisbdoc.sty
catalogue-ctan /macros/latex/contrib/denisbdoc
-catalogue-date 2017-01-01 22:02:36 +0100
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
catalogue-topics doc-supp
-catalogue-version 0.7
+catalogue-version 0.8
++++++ detex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/detex.man1.pdf and new/texmf-dist/doc/man/man1/detex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/detex.doc.tlpobj new/tlpkg/tlpobj/detex.doc.tlpobj
--- old/tlpkg/tlpobj/detex.doc.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/detex.doc.tlpobj 2020-03-24 01:57:19.000000000 +0100
@@ -1,6 +1,6 @@
name detex.doc
category TLCore
-revision 50602
+revision 54512
shortdesc doc files of detex
docfiles size=8
texmf-dist/doc/man/man1/detex.1
++++++ diagbox.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/diagbox/README new/doc/latex/diagbox/README
--- old/doc/latex/diagbox/README 2016-02-25 23:37:50.000000000 +0100
+++ new/doc/latex/diagbox/README 2020-02-09 23:07:33.000000000 +0100
@@ -1,6 +1,6 @@
The diagbox package
-Copyright (C) 2011--2016 by Leo Liu <leoliu.pku(a)gmail.com>
+Copyright (C) 2011--2020 by Leo Liu <leoliu.pku(a)gmail.com>
The diagbox package is used for making table heads with diagonal lines.
And it is compatible with old slashbox package with many improvements.
Binary files old/doc/latex/diagbox/diagbox.pdf and new/doc/latex/diagbox/diagbox.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/diagbox.doc.tlpobj new/tlpkg/tlpobj/diagbox.doc.tlpobj
--- old/tlpkg/tlpobj/diagbox.doc.tlpobj 2019-02-28 03:31:46.000000000 +0100
+++ new/tlpkg/tlpobj/diagbox.doc.tlpobj 2020-03-04 23:50:33.000000000 +0100
@@ -1,8 +1,8 @@
name diagbox.doc
category Package
-revision 42843
+revision 54080
shortdesc doc files of diagbox
relocated 1
-docfiles size=70
+docfiles size=61
RELOC/doc/latex/diagbox/README
RELOC/doc/latex/diagbox/diagbox.pdf
++++++ diagbox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/diagbox/diagbox.sty new/tex/latex/diagbox/diagbox.sty
--- old/tex/latex/diagbox/diagbox.sty 2017-01-03 00:50:34.000000000 +0100
+++ new/tex/latex/diagbox/diagbox.sty 2020-03-04 00:05:10.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2011--2016 by Leo Liu <leoliu.pku(a)gmail.com>
+%% Copyright (C) 2011--2020 by Leo Liu <leoliu.pku(a)gmail.com>
%% --------------------------------------------------------------------------
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,11 +20,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{diagbox}
- [2016/12/28 v2.2 Making table heads with diagonal lines]
+ [2020/02/09 v2.3 Making table heads with diagonal lines]
\RequirePackage{keyval}
\RequirePackage{pict2e}
-\RequirePackage{fp}
-\FPmessagesfalse
\RequirePackage{calc}
\RequirePackage{array}
\newbox\diagbox@boxa
@@ -71,10 +69,10 @@
\setlength{\diagbox@outsepr}{#1}}
\define@key{diagbox}{leftsep}{%
\setlength{\diagbox@insepl}{#1}%
- \setlength{\diagbox@outsepl}{-(#1)}}
+ \setlength{\diagbox@outsepl}{(#1)*-1}}
\define@key{diagbox}{rightsep}{%
\setlength{\diagbox@insepr}{#1}%
- \setlength{\diagbox@outsepr}{-(#1)}}
+ \setlength{\diagbox@outsepr}{(#1)*-1}}
\define@key{diagbox}{trim}{%
\@tfor\@reserveda:=#1\do{%
\ifcsname diagbox@insep\@reserveda\endcsname
@@ -161,12 +159,18 @@
\end{tabular}}}
\let\diagbox@triple@setbox@SW\diagbox@triple@setbox@NW
\def\diagbox@triple@setbox@SE#1#2#3{%
- \setbox\diagbox@boxa=\hbox{%
- \begin{tabular}{@{\hspace{\diagbox@insepl}}l@{}}#1\end{tabular}}%
- \setbox\diagbox@boxm=\hbox{%
- \begin{tabular}{@{}r@{\hspace{\diagbox@insepr}}}#2\end{tabular}}%
- \setbox\diagbox@boxb=\hbox{%
- \begin{tabular}{@{}r@{\hspace{\diagbox@insepr}}}#3\end{tabular}}}
+\setbox\diagbox@boxa=\hbox{%
+ \begin{tabular}{@{\hspace{\diagbox@insepl}}>{\diagbox@font}l@{}}
+ #1
+ \end{tabular}}%
+\setbox\diagbox@boxm=\hbox{%
+ \begin{tabular}{@{}>{\diagbox@font}r@{\hspace{\diagbox@insepr}}}
+ #2
+ \end{tabular}}%
+\setbox\diagbox@boxb=\hbox{%
+ \begin{tabular}{@{}>{\diagbox@font}r@{\hspace{\diagbox@insepr}}}
+ #3
+ \end{tabular}}}
\let\diagbox@triple@setbox@NE\diagbox@triple@setbox@SE
\def\diagbox@triple@pict@NW{%
\put(0,0) {\makebox(0,0)[bl]{\box\diagbox@boxa}}
@@ -202,6 +206,166 @@
\def\diagbox@part{triple}%
\setkeys{diagbox}{dir=NW,#1}%
\@nameuse{diagbox@triple@setbox@\diagbox@dir}{#2}{#3}{#4}%
+ \diagbox@solve@equations
+ $\vcenter{\hbox{\diagbox@pict}}$%
+ \endgroup}
+\newcommand\diagbox[3][]{%
+ \@ifnextchar\bgroup
+ {\diagbox@triple{#1}{#2}{#3}}{\diagbox@double{#1}{#2}{#3}}}
+\expandafter\xdef\csname ver@slashbox.\@pkgextension\endcsname{9999/99/99}
+\def\slashbox{%
+ \def\diagbox@slashbox@options{dir=SW,}%
+ \slashbox@}
+\def\backslashbox{%
+ \def\diagbox@slashbox@options{dir=NW,}%
+ \slashbox@}
+\newcommand\slashbox@[1][]{%
+ \ifx\relax#1\relax\else
+ \edef\diagbox@slashbox@options{%
+ \unexpanded\expandafter{\diagbox@slashbox@options}%
+ \unexpanded{width=#1,}}%
+ \fi
+ \slashbox@@}
+\newcommand\slashbox@@[3][]{%
+ \edef\diagbox@slashbox@options{%
+ \unexpanded\expandafter{\diagbox@slashbox@options}%
+ \unexpanded{trim=#1,}}%
+ \expandafter\diagbox\expandafter[\diagbox@slashbox@options]{#2}{#3}}
+\ifcsname\detokenize{fp_eval:n}\endcsname
+\csname fi\endcsname
+\ExplSyntaxOn
+\cs_new_protected:Npn \__diagbox_solve_equations:
+ {
+ \fp_set:Nn \l__diagbox_xa_fp
+ { \dim_to_fp:n { \wd \diagbox@boxa } }
+ \fp_set:Nn \l__diagbox_ya_fp
+ { \dim_to_fp:n { \ht \diagbox@boxa + \dp \diagbox@boxa } }
+ \fp_set:Nn \l__diagbox_xb_fp
+ { \dim_to_fp:n { \wd \diagbox@boxb } }
+ \fp_set:Nn \l__diagbox_yb_fp
+ { \dim_to_fp:n { \ht \diagbox@boxb + \dp \diagbox@boxb } }
+ \fp_set:Nn \l__diagbox_xm_fp
+ { \dim_to_fp:n { \wd \diagbox@boxm } }
+ \fp_set:Nn \l__diagbox_ym_fp
+ { \dim_to_fp:n { \ht \diagbox@boxm + \dp \diagbox@boxm } }
+ \fp_set:Nn \l__diagbox_s_fp { \l__diagbox_xb_fp + \l__diagbox_xm_fp }
+ \fp_set:Nn \l__diagbox_t_fp { \l__diagbox_ya_fp + \l__diagbox_ym_fp }
+ \fp_set_eq:NN \l__diagbox_delta_fp \c_nan_fp
+ \dim_compare:nNnTF \diagbox@wd = \c_zero_dim
+ { \__diagbox_calculate_width: }
+ { \fp_set:Nn \l__diagbox_x_fp { \dim_to_fp:n { \diagbox@wd } } }
+ \dim_compare:nNnTF \diagbox@ht = \c_zero_dim
+ { \__diagbox_calculate_height: }
+ { \fp_set:Nn \l__diagbox_y_fp { \dim_to_fp:n { \diagbox@ht } } }
+ \edef \x { \fp_use:N \l__diagbox_x_fp }
+ \edef \y { \fp_use:N \l__diagbox_y_fp }
+ \edef \xm { \fp_use:N \l__diagbox_xm_fp }
+ \edef \ym { \fp_use:N \l__diagbox_ym_fp }
+ \edef \xxm { \fp_eval:n { \l__diagbox_x_fp - \l__diagbox_xm_fp } }
+ \edef \yym { \fp_eval:n { \l__diagbox_y_fp - \l__diagbox_ym_fp } }
+ }
+\cs_new_protected:Npn \__diagbox_calculate_width:
+ {
+ \fp_zero:N \l__diagbox_x_fp
+ \fp_compare:nNnT \l__diagbox_yb_fp < \l__diagbox_t_fp
+ {
+ \__diagbox_calculate_coefficient:
+ \fp_if_nan:nF { \l__diagbox_sqrt_fp }
+ {
+ \fp_set:Nn \l__diagbox_x_fp
+ {
+ ( \l__diagbox_u_fp + \l__diagbox_v_fp + \l__diagbox_sqrt_fp ) /
+ ( 2 ( \l__diagbox_t_fp - \l__diagbox_yb_fp ) )
+ }
+ }
+ }
+ \fp_compare:nNnF \l__diagbox_x_fp > \c_zero_fp
+ {
+ \fp_set:Nn \l__diagbox_x_fp
+ { 2 ( max( \l__diagbox_xa_fp , \l__diagbox_xb_fp ) + \l__diagbox_xm_fp ) }
+ \msg_warning:nnxx { diagbox } { calculate-error }
+ { width } { \fp_use:N \l__diagbox_x_fp }
+ }
+ \diagbox@wd = \fp_to_dim:N \l__diagbox_x_fp \scan_stop:
+ }
+\cs_new_protected:Npn \__diagbox_calculate_height:
+ {
+ \fp_zero:N \l__diagbox_y_fp
+ \fp_compare:nNnT \l__diagbox_xa_fp < \l__diagbox_s_fp
+ {
+ \__diagbox_calculate_coefficient:
+ \fp_if_nan:nF { \l__diagbox_sqrt_fp }
+ {
+ \fp_set:Nn \l__diagbox_y_fp
+ {
+ ( \l__diagbox_u_fp - \l__diagbox_v_fp - \l__diagbox_sqrt_fp ) /
+ ( 2 ( \l__diagbox_xa_fp - \l__diagbox_s_fp ) )
+ }
+ }
+ }
+ \fp_compare:nNnF \l__diagbox_y_fp > \c_zero_fp
+ {
+ \fp_set:Nn \l__diagbox_y_fp
+ { 2 ( max( \l__diagbox_ya_fp , \l__diagbox_yb_fp ) + \l__diagbox_ym_fp ) }
+ \msg_warning:nnxx { diagbox } { calculate-error }
+ { height } { \fp_use:N \l__diagbox_y_fp }
+ }
+ \diagbox@ht = \fp_to_dim:N \l__diagbox_y_fp \scan_stop:
+ }
+\cs_new_protected:Npn \__diagbox_calculate_coefficient:
+ {
+ \fp_if_nan:nT { \l__diagbox_delta_fp }
+ { \__diagbox_calculate_coefficient_aux: }
+ }
+\cs_new_protected:Npn \__diagbox_calculate_coefficient_aux:
+ {
+ \fp_set:Nn \l__diagbox_u_fp
+ {
+ \l__diagbox_xa_fp * \l__diagbox_ym_fp -
+ \l__diagbox_xm_fp * \l__diagbox_yb_fp
+ }
+ \fp_set:Nn \l__diagbox_v_fp
+ {
+ \l__diagbox_s_fp * \l__diagbox_t_fp -
+ \l__diagbox_xa_fp * \l__diagbox_yb_fp
+ }
+ \fp_set:Nn \l__diagbox_delta_fp
+ {
+ ( \l__diagbox_u_fp + \l__diagbox_v_fp )^2 +
+ 4 * \l__diagbox_xa_fp * ( \l__diagbox_t_fp - \l__diagbox_yb_fp ) *
+ ( \l__diagbox_xm_fp * ( \l__diagbox_yb_fp - \l__diagbox_ym_fp ) -
+ \l__diagbox_xb_fp * \l__diagbox_ym_fp )
+ }
+ \fp_compare:nNnTF \l__diagbox_delta_fp < \c_zero_fp
+ { \fp_set_eq:NN \l__diagbox_sqrt_fp \c_nan_fp }
+ { \fp_set:Nn \l__diagbox_sqrt_fp { sqrt(\l__diagbox_delta_fp) } }
+ }
+\cs_new_eq:NN \diagbox@solve@equations \__diagbox_solve_equations:
+\fp_new:N \l__diagbox_xa_fp
+\fp_new:N \l__diagbox_ya_fp
+\fp_new:N \l__diagbox_xb_fp
+\fp_new:N \l__diagbox_yb_fp
+\fp_new:N \l__diagbox_xm_fp
+\fp_new:N \l__diagbox_ym_fp
+\fp_new:N \l__diagbox_x_fp
+\fp_new:N \l__diagbox_y_fp
+\fp_new:N \l__diagbox_s_fp
+\fp_new:N \l__diagbox_t_fp
+\fp_new:N \l__diagbox_u_fp
+\fp_new:N \l__diagbox_v_fp
+\fp_new:N \l__diagbox_sqrt_fp
+\fp_new:N \l__diagbox_delta_fp
+\msg_new:nnn { diagbox } { calculate-error }
+ {
+ Cannot~calculate~proper~#1~of~triple~diagbox~
+ \msg_line_context:. \\
+ Use~#2pt~instead.
+ }
+\file_input_stop:
+\fi
+\RequirePackage{fp}
+\FPmessagesfalse
+\def\diagbox@solve@equations{%
\edef\xa{\strip@pt\wd\diagbox@boxa}%
\edef\ya{\strip@pt\dimexpr\ht\diagbox@boxa+\dp\diagbox@boxa\relax}%
\edef\xb{\strip@pt\wd\diagbox@boxb}%
@@ -216,47 +380,40 @@
\FPmul\dj\xa\ym
\FPsub\u\dj\di
\FPupn{v}{bj ci * bi cj * -}%
- \FPupn{delta}{bi dj * bj di * - cj ci - * 4 * %
- v u + copy * %
- - 2 swap root}%
+ \FPupn{delta}{bi dj * bj di * - cj ci - * 4 * v u + copy * -}%
+ \newif\ifdeltapositive
+ \FPifneg\delta \deltapositivefalse \else \deltapositivetrue \fi
+ \FPset\x{0}%
+ \FPset\y{0}%
\ifdim\diagbox@wd=\z@
- \FPupn{x}{2 bj bi - delta v u - + / /}%
+ \ifdim\bi\p@>\bj\p@\ifdeltapositive
+ \FPupn{x}{2 bj bi - 2 delta root v u - + / /}%
+ \fi\fi
+ \ifdim\x\p@=\z@
+ \FPupn{x}{xa xm + xb xm + max 2 *}%
+ \PackageWarning{diagbox}{Cannot calculate proper width of triple diagbox.\MessageBreak
+ Use \x pt instead.}%
+ \fi
\diagbox@wd=\x\p@
\else
\edef\x{\strip@pt\diagbox@wd}%
\fi
\ifdim\diagbox@ht=\z@
- \FPupn{y}{2 cj ci - delta v u + - / /}%
+ \ifdim\ci\p@<\cj\p@\ifdeltapositive
+ \FPupn{y}{2 cj ci - 2 delta root v u + - / /}%
+ \fi\fi
+ \ifdim\y\p@=\z@
+ \FPupn{y}{ya ym + yb ym + max 2 *}%
+ \PackageWarning{diagbox}{Cannot calculate proper height of triple diagbox.\MessageBreak
+ Use \y pt instead.}%
+ \fi
\diagbox@ht=\y\p@
\else
\edef\y{\strip@pt\diagbox@ht}%
\fi
\FPsub\xxm\x\xm
\FPsub\yym\y\ym
- $\vcenter{\hbox{\diagbox@pict}}$%
- \endgroup}
-\newcommand\diagbox[3][]{%
- \@ifnextchar\bgroup
- {\diagbox@triple{#1}{#2}{#3}}{\diagbox@double{#1}{#2}{#3}}}
-\expandafter\xdef\csname ver@slashbox.\@pkgextension\endcsname{9999/99/99}
-\def\slashbox{%
- \def\diagbox@slashbox@options{dir=SW,}%
- \slashbox@}
-\def\backslashbox{%
- \def\diagbox@slashbox@options{dir=NW,}%
- \slashbox@}
-\newcommand\slashbox@[1][]{%
- \ifx\relax#1\relax\else
- \edef\diagbox@slashbox@options{%
- \unexpanded\expandafter{\diagbox@slashbox@options}%
- \unexpanded{width=#1,}}%
- \fi
- \slashbox@@}
-\newcommand\slashbox@@[3][]{%
- \edef\diagbox@slashbox@options{%
- \unexpanded\expandafter{\diagbox@slashbox@options}%
- \unexpanded{trim=#1,}}%
- \expandafter\diagbox\expandafter[\diagbox@slashbox@options]{#2}{#3}}
+}
\endinput
%%
%% End of file `diagbox.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/diagbox.tlpobj new/tlpkg/tlpobj/diagbox.tlpobj
--- old/tlpkg/tlpobj/diagbox.tlpobj 2019-02-28 03:31:46.000000000 +0100
+++ new/tlpkg/tlpobj/diagbox.tlpobj 2020-03-04 23:50:33.000000000 +0100
@@ -1,6 +1,6 @@
name diagbox
category Package
-revision 42843
+revision 54080
shortdesc Table heads with diagonal lines
relocated 1
longdesc The package's principal command, \diagbox, takes two arguments
@@ -11,11 +11,10 @@
longdesc with the slashbox package, which it supersedes. diagbox depends
longdesc on e-TeX as well as the packages array, calc, fp, keyval, and
longdesc pict2e.
-runfiles size=3
+runfiles size=4
RELOC/tex/latex/diagbox/diagbox.sty
catalogue-contact-repository https://github.com/leo-liu/tex-pkg
catalogue-ctan /macros/latex/contrib/diagbox
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license lppl1.3
catalogue-topics table
-catalogue-version 2.2
+catalogue-version 2.4
++++++ diffcoeff.doc.tar.xz ++++++
++++ 7944 lines of diff (skipped)
++++++ diffcoeff.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/diffcoeff/diffcoeff.sty new/tex/latex/diffcoeff/diffcoeff.sty
--- old/tex/latex/diffcoeff/diffcoeff.sty 2019-03-10 22:02:00.000000000 +0100
+++ new/tex/latex/diffcoeff/diffcoeff.sty 2019-12-28 23:24:07.000000000 +0100
@@ -9,7 +9,7 @@
%
\RequirePackage{expl3}
\RequirePackage{xparse,l3keys2e,xtemplate}
-\ProvidesExplPackage {diffcoeff} {2019/03/10} {3.1}
+\ProvidesExplPackage {diffcoeff} {2019/12/28} {3.2}
{Write differential coefficients consistently and easily.}
%
\keys_define:nn { diffcoeff }
@@ -116,7 +116,7 @@
}
{
\AssignTemplateKeys
-
+
\bool_if:NF\l__diffcoeff_integ_bool
{
\int_compare:nNnT { \l__diffcoeff_format_int } > { 1 }
@@ -260,20 +260,22 @@
% differential
% #1 variant; #2 = space in mu before d (0--9)
% note \group_end placement for \vec{x} etc
-\NewDocumentCommand \dl { d.. m }
+\NewDocumentCommand \dl { d.. t- m }
{
\group_begin:
\bool_set_true:N \l__diffcoeff_integ_bool
\bool_set_true:N \l__diffcoeff_single_var_bool
\seq_set_from_clist:Nn \l__diffcoeff_orders_seq { 1 }
\tl_set:Nn \l__diffcoeff_tot_order_tl { 1 }
- \IfValueT { #1 } { \tl_set:Nn \l__diffcoeff_type_tl { .#1 } }
+ \IfValueTF { #1 }
+ { \tl_set:Nn \l__diffcoeff_type_tl { .#1 } }
+ { \tl_set:Nn \l__diffcoeff_type_tl { } }
\UseInstance { derivative } { ord\l__diffcoeff_type_tl }
\l__diffcoeff_orders_seq \l__diffcoeff_tot_order_tl
\c_empty_tl \c_empty_seq \c_empty_tl
- \tl_if_in:NnTF \c__diffcoeff_digits_tl { #2 }
- { \mkern #2 mu \l__diffcoeff_op_tl \group_end: }
- { \l__diffcoeff_op_tl \group_end: #2 }
+ \tl_if_in:NnTF \c__diffcoeff_digits_tl { #3 }
+ { \mkern \IfBooleanT #2 { - }#3 mu \l__diffcoeff_op_tl \group_end: }
+ { \l__diffcoeff_op_tl \group_end: {} #3 }
}
\NewDocumentCommand \negmu {} { \mkern -1 mu }
\NewDocumentCommand \nilmu {} { \mkern 0 mu }
@@ -285,7 +287,7 @@
% #5(tl) = diff'iand; #6( / ) = slash boolean
% #7(clist) = vars of diff.; #8(tl) = pt of eval./vars held const
% #9(tl) = as #8 (for backwards compat)
-\NewDocumentCommand \diff{ d.. s O{1} o m t/ m !O{#9} g }
+\NewDocumentCommand \diff { d.. s O{1} o m t/ m !O{#9} g }
{
\group_begin:
\tl_set:Nn \l__diffcoeff_differentiand_tl { #5 }
@@ -322,9 +324,11 @@
\l__diffcoeff_tot_order_tl
}
}
- \IfValueT { #1 } { \tl_set:Nn \l__diffcoeff_type_tl { .#1 } }
- \int_zero:N \l__diffcoeff_format_int
+ \IfValueTF { #1 }
+ { \tl_set:Nn \l__diffcoeff_type_tl { .#1 } }
+ { \tl_set:Nn \l__diffcoeff_type_tl { } }
% append? slash?
+ \int_zero:N \l__diffcoeff_format_int
\IfBooleanT #2 { \int_incr:N \l__diffcoeff_format_int }
\IfBooleanT #6 { \int_add:Nn \l__diffcoeff_format_int { 2 } }
@@ -614,7 +618,7 @@
\DeclareInstance { derivative } { ord } { DERIV } { }
\bool_if:NTF \g__diffcoeff_ISO_bool
{
- \diffdef {}
+ \diffdef { }
{
op-symbol = \mathrm{d},
op-order-sep = 0 mu ,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/diffcoeff.tlpobj new/tlpkg/tlpobj/diffcoeff.tlpobj
--- old/tlpkg/tlpobj/diffcoeff.tlpobj 2019-03-11 02:24:53.000000000 +0100
+++ new/tlpkg/tlpobj/diffcoeff.tlpobj 2019-12-29 01:55:35.000000000 +0100
@@ -1,6 +1,6 @@
name diffcoeff
category Package
-revision 50320
+revision 53244
shortdesc Write differential coefficients easily and consistently
relocated 1
longdesc diffcoeff.sty allows the easy and consistent writing of
@@ -19,8 +19,8 @@
runfiles size=7
RELOC/tex/latex/diffcoeff/diffcoeff-doc.def
RELOC/tex/latex/diffcoeff/diffcoeff.sty
+catalogue-also derivative
catalogue-ctan /macros/latex/contrib/diffcoeff
-catalogue-date 2019-03-10 08:30:44 +0100
catalogue-license lppl1.3c
catalogue-topics maths
-catalogue-version 3.1
+catalogue-version 3.2
++++++ dnp.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dnp.tlpobj new/tlpkg/tlpobj/dnp.tlpobj
--- old/tlpkg/tlpobj/dnp.tlpobj 2019-02-28 03:32:08.000000000 +0100
+++ new/tlpkg/tlpobj/dnp.tlpobj 2020-03-04 23:50:33.000000000 +0100
@@ -1,6 +1,6 @@
name dnp
category Package
-revision 45701
+revision 54074
shortdesc subfont numbers for DNP font encoding
relocated 1
longdesc part of the CJK package, ctan.org/pkg/cjk
++++++ doclicense.doc.tar.xz ++++++
Binary files old/doc/latex/doclicense/doclicense.pdf and new/doc/latex/doclicense/doclicense.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/doclicense.doc.tlpobj new/tlpkg/tlpobj/doclicense.doc.tlpobj
--- old/tlpkg/tlpobj/doclicense.doc.tlpobj 2019-04-09 01:38:21.000000000 +0200
+++ new/tlpkg/tlpobj/doclicense.doc.tlpobj 2020-04-16 01:56:55.000000000 +0200
@@ -1,8 +1,8 @@
name doclicense.doc
category Package
-revision 50871
+revision 54758
shortdesc doc files of doclicense
relocated 1
-docfiles size=107
+docfiles size=90
RELOC/doc/latex/doclicense/README
RELOC/doc/latex/doclicense/doclicense.pdf
++++++ doclicense.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-brazilian.ldf new/tex/latex/doclicense/doclicense-brazilian.ldf
--- old/tex/latex/doclicense/doclicense-brazilian.ldf 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/doclicense/doclicense-brazilian.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -0,0 +1,24 @@
+\ProvidesFile{doclicense-brazilian.ldf}
+
+\@namedef{doclicense@lang@thisDoc}{Essa obra tem a licença}%
+\@namedef{doclicense@lang@word@license}{}%
+
+\@namedef{doclicense@lang@lic@CC@code}{pt}%
+%% Using: https://en.wikipedia.org/wiki/ISO_639-1
+
+\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}%
+
+\@namedef{doclicense@lang@lic@CC@by@3.0}{Atribuição 3.0 Brasil}%
+\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Atribuição-CompartilhaIgual 3.0 Brasil}%
+\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{Atribuição-SemDerivações 3.0 Brasil}%
+\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{Atribuição-NãoComercial 3.0 Brasil}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{Atribuição-NãoComercial-CompartilhaIgual 3.0 Brasil}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{Atribuição-NãoComercial-SemDerivações 3.0 Brasil}%
+
+\@namedef{doclicense@lang@lic@CC@by@4.0}{Atribuição 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{Atribuição-CompartilhaIgual 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-nd@4.0}{Atribuição-SemDerivações 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-nc@4.0}{Atribuição-NãoComercial 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@4.0}{Atribuição-NãoComercial-CompartilhaIgual 4.0 Internacional}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@4.0}{Atribuição-NãoComercial-SemDerivações 4.0 Internacional}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-catalan.ldf new/tex/latex/doclicense/doclicense-catalan.ldf
--- old/tex/latex/doclicense/doclicense-catalan.ldf 2019-04-08 21:59:08.000000000 +0200
+++ new/tex/latex/doclicense/doclicense-catalan.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -1,13 +1,13 @@
\ProvidesFile{doclicense-catalan.ldf}
-\@namedef{doclicense@lang@thisDoc}{Aquesta obra està sota una llicència}%
+\@namedef{doclicense@lang@thisDoc}{Aquesta obra està subjecta a una llicència de}%
\@namedef{doclicense@lang@word@license}{}%
\@namedef{doclicense@lang@lic@CC@code}{ca}%
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}%
\@namedef{doclicense@lang@lic@CC@by@3.0}{Reconeixement 3.0 No adaptada}%
\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Reconeixement-CompartirIgual 3.0 No adaptada}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-chinese-gbk.ldf new/tex/latex/doclicense/doclicense-chinese-gbk.ldf
--- old/tex/latex/doclicense/doclicense-chinese-gbk.ldf 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/doclicense/doclicense-chinese-gbk.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -0,0 +1,24 @@
+\ProvidesFile{doclicense-chinese.ldf}
+
+\@namedef{doclicense@lang@thisDoc}{����Ʒ����}%
+\@namedef{doclicense@lang@word@license}{�������������}%
+
+\@namedef{doclicense@lang@lic@CC@code}{zh}%
+%% Using:https://en.wikipedia.org/wiki/ISO_639-1
+
+\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 ͨ��}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{�����ڰ�Ȩ����}%
+
+\@namedef{doclicense@lang@lic@CC@by@3.0}{���� 3.0 �й���½}%
+\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{����-��ͬ��ʽ���� 3.0 �й���½}%
+\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{����-��ֹ���� 3.0 �й���½}%
+\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{����-����ҵ��ʹ�� 3.0 �й���½}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{����-����ҵ��ʹ��-��ͬ��ʽ���� 3.0 �й���½}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{����-����ҵ��ʹ��-��ֹ���� 3.0 �й���½}%
+
+\@namedef{doclicense@lang@lic@CC@by@4.0}{���� 4.0 ����}%
+\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{����-��ͬ��ʽ���� 4.0 ����}%
+\@namedef{doclicense@lang@lic@CC@by-nd@4.0}{����-��ֹ���� 4.0 ����}%
+\@namedef{doclicense@lang@lic@CC@by-nc@4.0}{����-����ҵ��ʹ�� 4.0 ����}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@4.0}{����-����ҵ��ʹ��-��ͬ��ʽ���� 4.0 ����}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@4.0}{����-����ҵ��ʹ��-��ֹ���� 4.0 ����}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-chinese-utf8.ldf new/tex/latex/doclicense/doclicense-chinese-utf8.ldf
--- old/tex/latex/doclicense/doclicense-chinese-utf8.ldf 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/doclicense/doclicense-chinese-utf8.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -0,0 +1,24 @@
+\ProvidesFile{doclicense-chinese.ldf}
+
+\@namedef{doclicense@lang@thisDoc}{本作品采用}%
+\@namedef{doclicense@lang@word@license}{许可协议进行许可}%
+
+\@namedef{doclicense@lang@lic@CC@code}{zh}%
+%% Using:https://en.wikipedia.org/wiki/ISO_639-1
+
+\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 通用}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{仅限于版权贡献}%
+
+\@namedef{doclicense@lang@lic@CC@by@3.0}{署名 3.0 中国大陆}%
+\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{署名-相同方式共享 3.0 中国大陆}%
+\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{署名-禁止演绎 3.0 中国大陆}%
+\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{署名-非商业性使用 3.0 中国大陆}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{署名-非商业性使用-相同方式共享 3.0 中国大陆}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{署名-非商业性使用-禁止演绎 3.0 中国大陆}%
+
+\@namedef{doclicense@lang@lic@CC@by@4.0}{署名 4.0 国际}%
+\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{署名-相同方式共享 4.0 国际}%
+\@namedef{doclicense@lang@lic@CC@by-nd@4.0}{署名-禁止演绎 4.0 国际}%
+\@namedef{doclicense@lang@lic@CC@by-nc@4.0}{署名-非商业性使用 4.0 国际}%
+\@namedef{doclicense@lang@lic@CC@by-nc-sa@4.0}{署名-非商业性使用-相同方式共享 4.0 国际}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@4.0}{署名-非商业性使用-禁止演绎 4.0 国际}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-chinese.ldf new/tex/latex/doclicense/doclicense-chinese.ldf
--- old/tex/latex/doclicense/doclicense-chinese.ldf 2019-04-08 21:59:08.000000000 +0200
+++ new/tex/latex/doclicense/doclicense-chinese.ldf 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-\ProvidesFile{doclicense-chinese.ldf}
-
-\@namedef{doclicense@lang@thisDoc}{本作品采用}%
-\@namedef{doclicense@lang@word@license}{许可协议进行许可}%
-
-\@namedef{doclicense@lang@lic@CC@code}{zh}%
-%% Using:https://en.wikipedia.org/wiki/ISO_639-1
-
-\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 通用}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{仅限于版权贡献}%
-
-\@namedef{doclicense@lang@lic@CC@by@3.0}{署名 3.0 未本地化版本}%
-\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{署名-相同方式共享 3.0 未本地化版本}%
-\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{署名-禁止演绎 3.0 未本地化版本}%
-\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{署名-非商业性使用 3.0 未本地化版本}%
-\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{署名-非商业性使用-相同方式共享 3.0 未本地化版本}%
-\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{署名-非商业性使用-禁止演绎 3.0 未本地化版本}%
-
-\@namedef{doclicense@lang@lic@CC@by@4.0}{署名 4.0 国际}%
-\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{署名-相同方式共享 4.0 国际}%
-\@namedef{doclicense@lang@lic@CC@by-nd@4.0}{署名-禁止演绎 4.0 国际}%
-\@namedef{doclicense@lang@lic@CC@by-nc@4.0}{署名-非商业性使用 4.0 国际}%
-\@namedef{doclicense@lang@lic@CC@by-nc-sa@4.0}{署名-非商业性使用-相同方式共享 4.0 国际}%
-\@namedef{doclicense@lang@lic@CC@by-nc-nd@4.0}{署名-非商业性使用-禁止演绎 4.0 国际}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-english.ldf new/tex/latex/doclicense/doclicense-english.ldf
--- old/tex/latex/doclicense/doclicense-english.ldf 2015-06-23 01:43:59.000000000 +0200
+++ new/tex/latex/doclicense/doclicense-english.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -7,7 +7,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}%
\@namedef{doclicense@lang@lic@CC@by@3.0}{Attribution 3.0 Unported}%
\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Attribution-ShareAlike 3.0 Unported}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-french.ldf new/tex/latex/doclicense/doclicense-french.ldf
--- old/tex/latex/doclicense/doclicense-french.ldf 2016-04-25 00:06:36.000000000 +0200
+++ new/tex/latex/doclicense/doclicense-french.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -11,7 +11,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universel}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}%
\@namedef{doclicense@lang@lic@CC@by@3.0}{Attribution 3.0 non transpos\'e}%
\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Attribution - Partage dans les m\^emes conditions 3.0 non transpos\'e}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-galician.ldf new/tex/latex/doclicense/doclicense-galician.ldf
--- old/tex/latex/doclicense/doclicense-galician.ldf 2019-04-08 21:59:08.000000000 +0200
+++ new/tex/latex/doclicense/doclicense-galician.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -7,7 +7,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}%
\@namedef{doclicense@lang@lic@CC@by@3.0}{Recoñecemento 3.0 España}%
\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Recoñecemento-CompartirIgual 3.0 España}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-german.ldf new/tex/latex/doclicense/doclicense-german.ldf
--- old/tex/latex/doclicense/doclicense-german.ldf 2015-06-23 01:43:59.000000000 +0200
+++ new/tex/latex/doclicense/doclicense-german.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -10,7 +10,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universell}%
-% \@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}% Based on US right. Use Zero in no-US countries.
+% \@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}% Based on US right. Use Zero in no-US countries.
\@namedef{doclicense@lang@lic@CC@by@3.0}{Namensnennung 3.0 Deutschland}%
\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Namensnennung -- Weitergabe unter gleichen Bedingungen 3.0 Deutschland}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-italian.ldf new/tex/latex/doclicense/doclicense-italian.ldf
--- old/tex/latex/doclicense/doclicense-italian.ldf 2018-02-17 23:37:32.000000000 +0100
+++ new/tex/latex/doclicense/doclicense-italian.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -10,7 +10,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universale}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}% Based on US right. Use Zero in no-US countries.
+\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}% Based on US right. Use Zero in no-US countries.
\@namedef{doclicense@lang@lic@CC@by@3.0}{Attribuzione 3.0 Italia}%
\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Attribuzione -- Condividi allo stesso modo 3.0 Italia}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-polish.ldf new/tex/latex/doclicense/doclicense-polish.ldf
--- old/tex/latex/doclicense/doclicense-polish.ldf 2018-06-10 22:49:47.000000000 +0200
+++ new/tex/latex/doclicense/doclicense-polish.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -10,7 +10,7 @@
\@namedef{doclicense@lang@lic@CC@zero@1.0}{Przekazanie do Domeny Publicznej (CC0 1.0)}%
% https://creativecommons.org/publicdomain/zero/1.0/deed.pl
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Zaświadczenie Domeny Publicznej}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{Zaświadczenie Domeny Publicznej}%
% https://creativecommons.org/choose/publicdomain-2?lang=pl
\@namedef{doclicense@lang@lic@CC@by@3.0}{Uznanie autorstwa 3.0 Polska(CC BY 3.0 PL)}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-portuguese.ldf new/tex/latex/doclicense/doclicense-portuguese.ldf
--- old/tex/latex/doclicense/doclicense-portuguese.ldf 2019-04-08 21:59:08.000000000 +0200
+++ new/tex/latex/doclicense/doclicense-portuguese.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -7,14 +7,14 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}%
\@namedef{doclicense@lang@lic@CC@by@3.0}{Atribuição 3.0 Portugal}%
-\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Atribuição-CompartilhaIgua 3.0 Portugal}%
+\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Atribuição-CompartilhaIgual 3.0 Portugal}%
\@namedef{doclicense@lang@lic@CC@by-nd@3.0}{Atribuição-SemDerivações 3.0 Portugal}%
\@namedef{doclicense@lang@lic@CC@by-nc@3.0}{Atribuição-NãoComercial 3.0 Portugal}%
\@namedef{doclicense@lang@lic@CC@by-nc-sa@3.0}{Atribuição-NãoComercial-CompartilhaIgual 3.0 Portugal}%
-\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{Atribuição-NãoComercial-SemDerivaçõe 3.0 Portugal}%
+\@namedef{doclicense@lang@lic@CC@by-nc-nd@3.0}{Atribuição-NãoComercial-SemDerivações 3.0 Portugal}%
\@namedef{doclicense@lang@lic@CC@by@4.0}{Atribuição 4.0 Internacional}%
\@namedef{doclicense@lang@lic@CC@by-sa@4.0}{Atribuição-CompartilhaIgual 4.0 Internacional}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-russian.ldf new/tex/latex/doclicense/doclicense-russian.ldf
--- old/tex/latex/doclicense/doclicense-russian.ldf 2018-02-17 23:37:32.000000000 +0100
+++ new/tex/latex/doclicense/doclicense-russian.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -7,7 +7,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Универсальная}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Отказ от своих прав в пользу общества с сохранением лишь неотъемлемых авторских прав (основано на законодательстве США)}% Инструмент списан, следует использовать CC0.
+\@namedef{doclicense@lang@lic@CC@pd@null}{Отказ от своих прав в пользу общества с сохранением лишь неотъемлемых авторских прав (основано на законодательстве США)}% Инструмент списан, следует использовать CC0.
\@namedef{doclicense@lang@lic@CC@by@3.0}{Attribution (Атрибуция) 3.0 Непортированная}%
\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Attribution-ShareAlike (Атрибуция — На тех же условиях) 3.0 Непортированная}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense-spanish.ldf new/tex/latex/doclicense/doclicense-spanish.ldf
--- old/tex/latex/doclicense/doclicense-spanish.ldf 2018-02-17 23:37:32.000000000 +0100
+++ new/tex/latex/doclicense/doclicense-spanish.ldf 2020-04-12 23:31:05.000000000 +0200
@@ -7,7 +7,7 @@
%% Using: https://en.wikipedia.org/wiki/ISO_639-1
\@namedef{doclicense@lang@lic@CC@zero@1.0}{CC0 1.0 Universal}%
-\@namedef{doclicense@lang@lic@CC@pd@1.0}{Copyright-Only Dedication}%
+\@namedef{doclicense@lang@lic@CC@pd@null}{Copyright-Only Dedication}%
\@namedef{doclicense@lang@lic@CC@by@3.0}{Reconocimiento 3.0 España}%
\@namedef{doclicense@lang@lic@CC@by-sa@3.0}{Reconocimiento-CompartirIgual 3.0 España}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/doclicense/doclicense.sty new/tex/latex/doclicense/doclicense.sty
--- old/tex/latex/doclicense/doclicense.sty 2019-04-08 21:59:08.000000000 +0200
+++ new/tex/latex/doclicense/doclicense.sty 2020-04-12 23:31:05.000000000 +0200
@@ -1,7 +1,7 @@
%% See file 'doclicense.dtx' for copyright and license.
\NeedsTeXFormat{LaTeX2e}[1998/12/01]
\ProvidesPackage{doclicense}
- [2019/04/07 v1.9.0 Support for putting documents under a license]
+ [2020/04/12 v1.10.1 Support for putting documents under a license]
%% ^^A nag warned about the center environment and it really messes up spacing.
%% Parameters (((
@@ -24,15 +24,17 @@
\RequirePackage{etoolbox} %% \ifcsdef
\RequirePackage{xspace}
\RequirePackage{verbatim}
-\RequirePackage{enumitem}
+%% )))
-%% \setlistdepth{4} seems not to be needed. Try without it to avoid changing global variables.
-%% Enumeration scheme was chosen to match the html page once.
-\newlist{doclicense@enumerate}{enumerate}{4}
-\setlist[doclicense@enumerate,1]{label = (\alph*)}
-\setlist[doclicense@enumerate,2]{label = (\arabic*)}
-\setlist[doclicense@enumerate,3]{label = (\Alph*)}
-\setlist[doclicense@enumerate,4]{label = (\roman*)}
+%% Custom enumerate list with adjusted labels
+%% that match the license text convetions
+\newenvironment{doclicense@enumerate}{%
+ \begin{enumerate}
+ \renewcommand{\labelenumi}{(\alph{enumi})}%
+ \renewcommand{\labelenumii}{(\arabic{enumii})}%
+ \renewcommand{\labelenumiii}{(\Alph{enumiii})}%
+ \renewcommand{\labelenumiv}{(\roman{enumiv})}%
+}{\end{enumerate}}
\ifthenelse{
\equal{\doclicense@hyphenation}{}
@@ -261,7 +263,6 @@
\ifthenelse{\equal{\doclicense@imagemodifier}{-jp}}{%
\renewcommand{\doclicense@icon}{\ccbyncjp}
}{}
- \renewcommand{\doclicense@imagemodifier}{}
}{}
\ifthenelse{\equal{\doclicense@modifier}{by-nc-sa}}{
\renewcommand{\doclicense@icon}{\ccbyncsa}
@@ -294,11 +295,11 @@
\ifthenelse{\equal{\doclicense@modifier}{pd}}{
\renewcommand{\doclicense@icon}{\ccpd}
\renewcommand{\doclicense@imagemodifier}{}
- \doclicense(a)setVersion[1.0]
+ \doclicense@setVersion[null]
\edef\doclicenseURL{%
\doclicense@baseUrlCC/%
- licenses/publicdomain/%
- \doclicense@versionUsed\doclicense@UrlLangPart}
+ licenses/publicdomain%
+ \doclicense@UrlLangPart}
}{}
\ifcsdef{doclicense@lang@lic@\doclicense@type%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/doclicense.tlpobj new/tlpkg/tlpobj/doclicense.tlpobj
--- old/tlpkg/tlpobj/doclicense.tlpobj 2019-04-09 01:38:21.000000000 +0200
+++ new/tlpkg/tlpobj/doclicense.tlpobj 2020-04-16 01:56:55.000000000 +0200
@@ -1,6 +1,6 @@
name doclicense
category Package
-revision 50871
+revision 54758
shortdesc Support for putting documents under a license
relocated 1
longdesc This package allows you to put your document under a license
@@ -8,17 +8,19 @@
longdesc or image of the license. Currently, only Creative Commons is
longdesc supported, but this package is designed to handle all kinds of
longdesc licenses.
-runfiles size=178
+runfiles size=180
RELOC/tex/latex/doclicense/doclicense-UKenglish.ldf
RELOC/tex/latex/doclicense/doclicense-USenglish.ldf
RELOC/tex/latex/doclicense/doclicense-acadian.ldf
RELOC/tex/latex/doclicense/doclicense-american.ldf
RELOC/tex/latex/doclicense/doclicense-australian.ldf
+ RELOC/tex/latex/doclicense/doclicense-brazilian.ldf
RELOC/tex/latex/doclicense/doclicense-british.ldf
RELOC/tex/latex/doclicense/doclicense-canadian.ldf
RELOC/tex/latex/doclicense/doclicense-canadien.ldf
RELOC/tex/latex/doclicense/doclicense-catalan.ldf
- RELOC/tex/latex/doclicense/doclicense-chinese.ldf
+ RELOC/tex/latex/doclicense/doclicense-chinese-gbk.ldf
+ RELOC/tex/latex/doclicense/doclicense-chinese-utf8.ldf
RELOC/tex/latex/doclicense/doclicense-english.ldf
RELOC/tex/latex/doclicense/doclicense-french.ldf
RELOC/tex/latex/doclicense/doclicense-galician.ldf
@@ -71,7 +73,6 @@
catalogue-contact-bugs https://github.com/ypid/latex-packages/issues
catalogue-contact-repository https://github.com/ypid/latex-packages/tree/master/doclicense
catalogue-ctan /macros/latex/contrib/doclicense
-catalogue-date 2019-04-07 21:52:28 +0200
catalogue-license lppl1.3
catalogue-topics licence-mgmt
-catalogue-version 1.9.0
+catalogue-version 1.10.1
++++++ download.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/download/README new/doc/latex/download/README
--- old/doc/latex/download/README 2013-05-27 03:18:37.000000000 +0200
+++ new/doc/latex/download/README 2019-10-02 23:17:13.000000000 +0200
@@ -1,7 +1,7 @@
%% download - download files with LaTeX
%%
-%% Copyright (C) 2012-2013 by Simon Sigurdhsson <sigurdhsson(a)gmail.com>
-%%
+%% Copyright (C) 2012-2019 by Simon Sigurdhsson <sigurdhsson(a)gmail.com>
+%%
%% 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.
@@ -9,15 +9,15 @@
%% 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 Simon Sigurdhsson.
-%%
+%%
%% This work consists of the file download.tex
%% and the derived file download.sty.
-This is version 1.0 of the download package, a package which allows
+This is version 1.2 of the download package, a package which allows
LaTeX to download files using wget or cURL.
The following files are enclosed.
Binary files old/doc/latex/download/download.pdf and new/doc/latex/download/download.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/download.doc.tlpobj new/tlpkg/tlpobj/download.doc.tlpobj
--- old/tlpkg/tlpobj/download.doc.tlpobj 2019-02-28 03:32:16.000000000 +0100
+++ new/tlpkg/tlpobj/download.doc.tlpobj 2019-10-03 01:55:14.000000000 +0200
@@ -1,8 +1,8 @@
name download.doc
category Package
-revision 30695
+revision 52257
shortdesc doc files of download
relocated 1
-docfiles size=37
+docfiles size=65
RELOC/doc/latex/download/README
RELOC/doc/latex/download/download.pdf
++++++ download.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/download/download.sty new/tex/latex/download/download.sty
--- old/tex/latex/download/download.sty 2013-05-27 03:18:37.000000000 +0200
+++ new/tex/latex/download/download.sty 2019-10-02 23:17:13.000000000 +0200
@@ -1,7 +1,7 @@
%% This is file `download.sty', generated from `download.tex' (key `package').
%% download - download files with LaTeX
%%
-%% Copyright (C) 2012-2013 by Simon Sigurdhsson <sigurdhsson(a)gmail.com>
+%% Copyright (C) 2012-2019 by Simon Sigurdhsson <sigurdhsson(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,7 +20,7 @@
\RequirePackage{expl3,l3keys2e,pdftexcmds,xparse}
\ProvidesExplPackage{download}
- {2013/04/08}{1.1}{download files with LaTeX}
+ {2019/10/01}{1.2}{download files with LaTeX}
\msg_new:nnnn{download}{no-write18}{Could~not~use~\string\write18!}
{Please~run~`latex`~with~the~`--shell-escape`~flag.}
\msg_new:nnnn{download}{no-engine}{Could~not~find~any~engine!}
@@ -31,9 +31,9 @@
\msg_new:nnn{download}{use-wget}{Using~wget.}
\msg_new:nnn{download}{use-ariaII}{Using~aria2.}
\msg_new:nnn{download}{use-axel}{Using~axel.}
-\prg_new_conditional:Nnn\__download_if_shellescape:{F}{
+\prg_new_protected_conditional:Nnn\__download_if_shellescape:{F}{
\if_cs_exist:N\pdf@shellescape
- \if_int_compare:w\pdf@shellescape=\c_one
+ \if_int_compare:w\pdf@shellescape=\c_one_int
\prg_return_true:
\else:
\prg_return_false:
@@ -42,7 +42,7 @@
\prg_return_true:
\fi:
}
-\cs_new:Npn\__download_rm:n#1{
+\cs_new_protected:Npn\__download_rm:n#1{
\immediate\write18{rm~#1}
}
\prg_new_conditional:Npnn\__download_if_executable_test:n#1{TF,T,F,p}{
@@ -54,35 +54,35 @@
\prg_return_false:
}
}
-\cs_new:Npn\__download_curl_do:nn#1#2{
+\cs_new_protected:Npn\__download_curl_do:nn#1#2{
\IfNoValueTF{#1}{
\immediate\write18{curl~-L~-s~#2}
}{
\immediate\write18{curl~-L~-s~-o~#1~#2}
}
}
-\cs_new:Npn\__download_wget_do:nn#1#2{
+\cs_new_protected:Npn\__download_wget_do:nn#1#2{
\IfNoValueTF{#1}{
\immediate\write18{wget~-q~-nc~#2}
}{
\immediate\write18{wget~-q~-nc~-O~#1~#2}
}
}
-\cs_new:Npn\__download_ariaII_do:nn#1#2{
+\cs_new_protected:Npn\__download_ariaII_do:nn#1#2{
\IfNoValueTF{#1}{
\immediate\write18{aria2c~-q~--auto-file-renaming=false~#2}
}{
\immediate\write18{aria2c~-q~--auto-file-renaming=false~-o~#1~#2}
}
}
-\cs_new:Npn\__download_axel_do:nn#1#2{
+\cs_new_protected:Npn\__download_axel_do:nn#1#2{
\IfNoValueTF{#1}{
\immediate\write18{axel~-q~#2}
}{
\immediate\write18{axel~-q~-o~#1~#2}
}
}
-\prg_new_conditional:Nnn\__download_if_auto_test:{F,TF}{
+\prg_new_protected_conditional:Nnn\__download_if_auto_test:{F,TF}{
\__download_if_executable_test:nTF{wget}{
\prg_return_true:
}{
@@ -101,7 +101,7 @@
}
}
}
-\cs_new:Npn\__download_auto_do:nn#1#2{
+\cs_new_protected:Npn\__download_auto_do:nn#1#2{
\__download_if_executable_test:nTF{wget}{
\msg_info:nn{download}{use-wget}
\__download_wget_do:nn{#1}{#2}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/download.tlpobj new/tlpkg/tlpobj/download.tlpobj
--- old/tlpkg/tlpobj/download.tlpobj 2019-02-28 03:32:16.000000000 +0100
+++ new/tlpkg/tlpobj/download.tlpobj 2019-10-03 01:55:14.000000000 +0200
@@ -1,6 +1,6 @@
name download
category Package
-revision 30695
+revision 52257
shortdesc Allow LaTeX to download files using an external process
relocated 1
longdesc The package allows the user to download files (using cURL or
@@ -12,7 +12,7 @@
runfiles size=2
RELOC/tex/latex/download/download.sty
catalogue-ctan /macros/latex/contrib/download
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-10-02 09:51:27 +0200
catalogue-license lppl1.3
catalogue-topics ext-code
-catalogue-version 1.1
+catalogue-version 1.2
++++++ draftwatermark.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/draftwatermark/README new/doc/latex/draftwatermark/README
--- old/doc/latex/draftwatermark/README 2012-01-07 23:38:54.000000000 +0100
+++ new/doc/latex/draftwatermark/README 2020-03-14 21:58:33.000000000 +0100
@@ -1,16 +1,17 @@
-The "draftwatermark" package extends LaTeX providing a means to add a
-textual gray or colored watermark on every page or on the first page
-of a document. Typical usage may consist in writing words such as
-"DRAFT" or "CONFIDENTIAL" across document pages. The package may
-remind in some sense "draftcopy" by Dr. Juergen Vollmer, but its
-implementation is much lighter (as the reduced code footprint shows)
-and does not rely on postscript specials, making the package fully
-compatible with pdfLaTeX. The package depends on package "everypage"
-by the same author.
+The "draftwatermark" package extends LaTeX providing a means to add a textual
+gray or colored watermark on every page or on the first page of a
+document. Typical usage may consist in writing words such as "DRAFT" or
+"CONFIDENTIAL" across document pages. The package may remind in some sense
+"draftcopy" by Dr. Juergen Vollmer, but its implementation is lighter (as the
+reduced code footprint shows) and does not rely on postscript specials, making
+the package fully compatible with pdfLaTeX, xelatex and lualatex. The package
+depends on package "everypage" by the same author.
+The package focus is on simplicity, for complex layouts please consider
+scrlayer.sty in the KOMA script bundle.
-The "draftwatermark" package is copyright 2006, 2012 by Sergio
-Callegari <sergio.callegari(a)gmail.com>
+The "draftwatermark" package is copyright 2006, 2012, 2020 by Sergio Callegari
+<sergio.callegari(a)gmail.com>
It comprises this README file, as well as files
draftwatermark.dtx
Binary files old/doc/latex/draftwatermark/draftwatermark.pdf and new/doc/latex/draftwatermark/draftwatermark.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/draftwatermark/test_draftwatermark.tex new/doc/latex/draftwatermark/test_draftwatermark.tex
--- old/doc/latex/draftwatermark/test_draftwatermark.tex 2012-01-07 23:38:54.000000000 +0100
+++ new/doc/latex/draftwatermark/test_draftwatermark.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,53 +0,0 @@
-%%
-%% This is file `test_draftwatermark.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% draftwatermark.dtx (with options: `samplecode')
-%%
-\documentclass{article}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{mathptmx}
-\usepackage{draftwatermark}
-\title{Sample document for the draftwatermark package}
-
-\begin{document}
-\maketitle
-
-\section{One}
-This text is here just to fill in some space. This text is here just to
-fill in some space. This text is here just to fill in some space. This
-text is here just to fill in some space. This text is here just to fill in
-some space. This text is here just to fill in some space. This text is
-here just to fill in some space. This text is here just to fill in some
-space. This text is here just to fill in some space. This text is here
-just to fill in some space. This text is here just to fill in some
-space. This text is here just to fill in some space. This text is here
-just to fill in some space. This text is here just to fill in some
-space. This text is here just to fill in some space. This text is here
-just to fill in some space. This text is here just to fill in some
-space. This text is here just to fill in some space. This text is here
-just to fill in some space. This text is here just to fill in some
-space. This text is here just to fill in some space.
-
-\section{Two}
-
-Also this text is here just to fill in some space. Also this text is here
-just to fill in some space. Also this text is here just to fill in some
-space. Also this text is here just to fill in some space. Also this text
-is here just to fill in some space. Also this text is here just to fill in
-some space. Also this text is here just to fill in some space. Also this
-text is here just to fill in some space. Also this text is here just to
-fill in some space. Also this text is here just to fill in some
-space. Also this text is here just to fill in some space. Also this text
-is here just to fill in some space. Also this text is here just to fill in
-some space. Also this text is here just to fill in some space. Also this
-text is here just to fill in some space. Also this text is here just to
-fill in some space. Also this text is here just to fill in some space.
-
-\end{document}
-\endinput
-%%
-%% End of file `test_draftwatermark.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/draftwatermark/test_draftwatermark1.tex new/doc/latex/draftwatermark/test_draftwatermark1.tex
--- old/doc/latex/draftwatermark/test_draftwatermark1.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/draftwatermark/test_draftwatermark1.tex 2020-03-14 21:58:33.000000000 +0100
@@ -0,0 +1,45 @@
+%%
+%% This is file `test_draftwatermark1.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% draftwatermark.dtx (with options: `samplecode-modern')
+%%
+\documentclass{article}
+\usepackage[named]{xcolor}
+\usepackage[T1]{fontenc}
+\usepackage[firstpageonly, color={[gray]{0.5}}]{draftwatermark}
+\usepackage{mathptmx}
+\usepackage{lipsum}
+\title{Sample document for the draftwatermark package}
+\author{}
+
+\begin{document}
+\maketitle
+
+\section{One}
+\lipsum[1-3]
+
+\section{Two}
+\lipsum[4-6]
+
+\end{document}
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\endinput
+%%
+%% End of file `test_draftwatermark1.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/draftwatermark/test_draftwatermark2.tex new/doc/latex/draftwatermark/test_draftwatermark2.tex
--- old/doc/latex/draftwatermark/test_draftwatermark2.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/draftwatermark/test_draftwatermark2.tex 2020-03-14 21:58:33.000000000 +0100
@@ -0,0 +1,48 @@
+%%
+%% This is file `test_draftwatermark2.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% draftwatermark.dtx (with options: `samplecode-legacy')
+%%
+\documentclass{article}
+\usepackage[named]{xcolor}
+\usepackage[T1]{fontenc}
+\usepackage[firstpage]{draftwatermark}
+\usepackage{mathptmx}
+\usepackage{lipsum}
+
+\SetWatermarkLightness{0.5}
+
+\title{Sample document for the draftwatermark package}
+\author{}
+
+\begin{document}
+\maketitle
+
+\section{One}
+\lipsum[1-3]
+
+\section{Two}
+\lipsum[4-6]
+
+\end{document}
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\endinput
+%%
+%% End of file `test_draftwatermark2.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/draftwatermark/test_draftwatermark3.tex new/doc/latex/draftwatermark/test_draftwatermark3.tex
--- old/doc/latex/draftwatermark/test_draftwatermark3.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/draftwatermark/test_draftwatermark3.tex 2020-03-14 21:58:33.000000000 +0100
@@ -0,0 +1,48 @@
+%%
+%% This is file `test_draftwatermark3.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% draftwatermark.dtx (with options: `samplecode-anchor')
+%%
+\documentclass{article}
+\usepackage[named]{xcolor}
+\usepackage[T1]{fontenc}
+\usepackage[firstpage, anchor=tr, color=red,
+ pos={\dimexpr\paperwidth-5mm, 5mm},
+ angle=-45, fontsize=32pt]{draftwatermark}
+\usepackage{mathptmx}
+\usepackage{lipsum}
+\title{Sample document for the draftwatermark package}
+\author{}
+
+\DraftwatermarkOptions{text=\bfseries DRAFT}
+\begin{document}
+\maketitle
+
+\section{One}
+\lipsum[1-3]
+
+\section{Two}
+\lipsum[4-6]
+
+\end{document}
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\endinput
+%%
+%% End of file `test_draftwatermark3.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/draftwatermark/test_draftwatermark4.tex new/doc/latex/draftwatermark/test_draftwatermark4.tex
--- old/doc/latex/draftwatermark/test_draftwatermark4.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/draftwatermark/test_draftwatermark4.tex 2020-03-14 21:58:33.000000000 +0100
@@ -0,0 +1,58 @@
+%%
+%% This is file `test_draftwatermark4.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% draftwatermark.dtx (with options: `samplecode-custom')
+%%
+\documentclass{article}
+\usepackage[named]{xcolor}
+\usepackage[T1]{fontenc}
+\usepackage{draftwatermark}
+\usepackage{mathptmx}
+\usepackage[scaled]{helvet}
+\usepackage{lipsum}
+\title{Sample document for the draftwatermark package}
+\author{}
+
+\newsavebox\wmbox
+\savebox\wmbox{%
+ {\color[rgb]{1,0.8,0.8}\sffamily \fbox{DRAFT}}}
+\newcommand\MyWM{%
+ \ifodd\thepage
+ \hspace*{\dimexpr \paperwidth -\wd\wmbox-10mm}%
+ \usebox{\wmbox}%
+ \else
+ \usebox{\wmbox}%
+ \fi}
+
+\DraftwatermarkOptions{anchor=lt, pos={5mm, 5mm}, markcmd=\MyWM}
+\begin{document}
+\maketitle
+
+\section{One}
+\lipsum[1-3]
+
+\section{Two}
+\lipsum[4-6]
+
+\end{document}
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\endinput
+%%
+%% End of file `test_draftwatermark4.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/draftwatermark.doc.tlpobj new/tlpkg/tlpobj/draftwatermark.doc.tlpobj
--- old/tlpkg/tlpobj/draftwatermark.doc.tlpobj 2019-02-28 03:32:19.000000000 +0100
+++ new/tlpkg/tlpobj/draftwatermark.doc.tlpobj 2020-03-15 02:47:19.000000000 +0100
@@ -1,9 +1,12 @@
name draftwatermark.doc
category Package
-revision 37498
+revision 54317
shortdesc doc files of draftwatermark
relocated 1
-docfiles size=25
+docfiles size=50
RELOC/doc/latex/draftwatermark/README
RELOC/doc/latex/draftwatermark/draftwatermark.pdf
- RELOC/doc/latex/draftwatermark/test_draftwatermark.tex
+ RELOC/doc/latex/draftwatermark/test_draftwatermark1.tex
+ RELOC/doc/latex/draftwatermark/test_draftwatermark2.tex
+ RELOC/doc/latex/draftwatermark/test_draftwatermark3.tex
+ RELOC/doc/latex/draftwatermark/test_draftwatermark4.tex
++++++ draftwatermark.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/draftwatermark/draftwatermark.sty new/tex/latex/draftwatermark/draftwatermark.sty
--- old/tex/latex/draftwatermark/draftwatermark.sty 2015-06-12 01:05:22.000000000 +0200
+++ new/tex/latex/draftwatermark/draftwatermark.sty 2020-03-14 21:58:33.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% IMPORTANT NOTICE:
%%
-%% Copyright 2006
+%% Copyright 2006, 2020
%% Sergio Callegari <sergio.callegari(a)gmail.com>
%%
%% ---------------------------------------------
@@ -32,79 +32,183 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{draftwatermark}%
- [2015/02/19 1.2 Put a gray textual watermark on document pages]
+ [2020/03/14 2.0 Put a gray textual watermark on document pages]
+
+\RequirePackage{kvoptions}
\RequirePackage{everypage}[2007/06/20]
\RequirePackage{graphicx}
\RequirePackage{color}
-\newif\if@sc@wm@first
-\@sc@wm@firstfalse
-\newif\if@sc@wm@stamp
-\@sc@wm@stamptrue
-\DeclareOption{firstpage}{%
- \@sc@wm@firsttrue}
-\DeclareOption{nostamp}{%
- \@sc@wm@stampfalse}
-\DeclareOption{final}{%
- \@sc@wm@stampfalse}
-\DeclareOption{stamp}{%
- \@sc@wm@stamptrue}
-\ProcessOptions
-\newlength\sc@wm@hcenter
-\newlength\sc@wm@vcenter
-\newlength\sc@wm@fontsize
-%% defaults
-\def\sc@wm@angle{45}
-\def\sc@wm@colormodel{[gray]}
-\def\sc@wm@colorspecs{0.8}
-\def\sc@wm@scale{1}
-\setlength\sc@wm@hcenter{.5\paperwidth}
-\setlength\sc@wm@vcenter{.5\paperheight}
-\setlength\sc@wm@fontsize{5cm}
-\def\sc@wm@text{DRAFT}
-\newcommand\SetWatermarkAngle[1]{%
- \def\sc@wm@angle{#1}}
-\newcommand\SetWatermarkColor{}
-\def\SetWatermarkColor#1#{\sc@setWatermarkColor{#1}}
-\def\sc@setWatermarkColor#1#2{%
- \def\sc@wm@colormodel{#1}%
- \def\sc@wm@colorspecs{#2}}
-\newcommand\SetWatermarkLightness[1]{%
- \SetWatermarkColor[gray]{#1}}
-\newcommand\SetWatermarkFontSize[1]{%
- \setlength\sc@wm@fontsize{#1}}
-\newcommand\SetWatermarkScale[1]{%
- \def\sc@wm@scale{#1}}
+
+\DeclareBoolOption[false]{firstpageonly}
+\define@key{draftwatermark}{firstpage}[true]{%
+ \csname draftwatermark@firstpageonly#1\endcsname}
+\DeclareBoolOption[true]{stamp}
+\DeclareComplementaryOption{nostamp}{stamp}
+\DeclareComplementaryOption{final}{stamp}
+\DeclareStringOption[45]{angle}
+\DeclareStringOption[1]{scale}
+\DeclareStringOption[DRAFT]{text}
+\DeclareStringOption[0.5\paperwidth]{hpos}
+\DeclareStringOption[0.5\paperheight]{vpos}
+\DeclareStringOption[0.25\paperwidth]{fontsize}
+\DeclareStringOption[gray]{colormodel}
+\DeclareStringOption[0.8]{colorspec}
+\DeclareStringOption[c]{hanchor}
+\DeclareStringOption[m]{vanchor}
+\DeclareStringOption[\DraftwatermarkStdMark]{markcmd}
+\define@key{draftwatermark}{pos}{%
+ \draftwatermark@processpos #1\@nil}
+\define@key{draftwatermark}{anchor}{%
+ \draftwatermark@processanchor{#1}}
+\define@key{draftwatermark}{color}{%
+ \draftwatermark@processcolor #1\@nil}
+
+\def\draftwatermark@processpos#1,#2\@nil{%
+ \def\draftwatermark@hpos{#1}%
+ \def\draftwatermark@vpos{#2}}
+
+\def\draftwatermark@processanchor#1{%
+ \def\draftwatermark@tempa{#1}
+ \@onelevel@sanitize \draftwatermark@tempa
+ \expandafter \@tfor \expandafter \draftwatermark@tempb
+ \expandafter :\expandafter =\draftwatermark@tempa
+ \do
+ {%
+ \if \draftwatermark@tempb l%
+ \def \draftwatermark@hanchor{l}%
+ \else \if \draftwatermark@tempb c%
+ \def \draftwatermark@hanchor{c}%
+ \else \if \draftwatermark@tempb r%
+ \def \draftwatermark@hanchor{r}%
+ \else \if \draftwatermark@tempb t%
+ \def \draftwatermark@vanchor{t}%
+ \else \if \draftwatermark@tempb m%
+ \def \draftwatermark@vanchor{m}%
+ \else \if \draftwatermark@tempb b%
+ \def \draftwatermark@vanchor{b}
+ \else
+ \PackageError{draftwatermark}{%
+ Illegal anchor directive `\draftwatermark@tempb'}%
+ {Directive has been ingnored.}%
+ \fi\fi\fi\fi\fi\fi
+ }}
+
+\def\draftwatermark@processcolor{%
+ \@ifnextchar[
+ \draftwatermark@processcolor@ii\draftwatermark@processcolor@i}
+
+\def\draftwatermark@processcolor@i#1\@nil{%
+ \def\draftwatermark@colormodel{}%
+ \def\draftwatermark@colorspec{#1}}
+
+\def\draftwatermark@processcolor@ii[#1]#2\@nil{%
+ \def\draftwatermark@colormodel{#1}%
+ \def\draftwatermark@colorspec{#2}}
+
+\ProcessKeyvalOptions*
+\DisableKeyvalOption{draftwatermark}{firstpageonly}
+\DisableKeyvalOption{draftwatermark}{firstpage}
+
+\newcommand\DraftwatermarkOptions[1]{\setkeys{draftwatermark}{#1}}
+
+\newcommand\SetWatermarkAngle[1]{\DraftwatermarkOptions{angle=#1}}
+\newcommand\SetWatermarkFontSize[1]{\DraftwatermarkOptions{fontsize=#1}}
+\newcommand\SetWatermarkScale[1]{\DraftwatermarkOptions{scale=#1}}
\newcommand\SetWatermarkHorCenter[1]{%
- \setlength\sc@wm@hcenter{#1}}
+ \DraftwatermarkOptions{hpos=#1, hanchor=c}}
\newcommand\SetWatermarkVerCenter[1]{%
- \setlength\sc@wm@vcenter{#1}}
-\newcommand\SetWatermarkText[1]{%
- \def\sc@wm@text{#1}}
-\newcommand\sc@watermark{%
- \setlength{\@tempdimb}{\sc@wm@hcenter}%
- \setlength{\@tempdimc}{-\sc@wm@vcenter}%
- \put(\strip@pt\@tempdimb,\strip@pt\@tempdimc){%
- \makebox(0,0){\rotatebox{\sc@wm@angle}{%
- \scalebox{\sc@wm@scale}{%
- \expandafter\expandafter\expandafter\textcolor
- \expandafter\sc@wm@colormodel\expandafter{\sc@wm@colorspecs}{%
- \fontsize{\sc@wm@fontsize}{1.2\sc@wm@fontsize}
- \selectfont
- \sc@wm@text}}}}}}
-\newcommand\sc@wm@print[1]{%
- \if@sc@wm@stamp
- \setbox\@tempboxa\vbox to \z@{%
- \vskip -1in \moveleft 1in \vbox{%
- \hbox to \z@{%
- #1\hss}}\vss}
- \dp\@tempboxa\z@
- \box\@tempboxa
+ \DraftwatermarkOptions{vpos=#1, vanchor=m}}
+\newcommand\SetWatermarkText[1]{\DraftwatermarkOptions{text=#1}}
+\newcommand\SetWatermarkColor[2][]{%
+ \DraftwatermarkOptions{colormodel=#1, colorspec=#2}}
+\newcommand\SetWatermarkLightness[1]{%
+ \DraftwatermarkOptions{colormodel=gray, colorspec=#1}}
+
+\newcommand\DraftwatermarkStdMark{%
+ \rotatebox{\draftwatermark@angle}{%
+ \scalebox{\draftwatermark@scale}{%
+ \begingroup
+ \ifx\draftwatermark@colormodel\@empty
+ \color{\draftwatermark@colorspec}%
+ \else
+ \color[\draftwatermark@colormodel]{\draftwatermark@colorspec}%
+ \fi
+ \setlength{\@tempdima}{\draftwatermark@fontsize}%
+ \fontsize{\@tempdima}{1.2\@tempdima}\selectfont
+ \draftwatermark@text
+ \endgroup}}}
+
+\newcommand\draftwatermark@printwm[1]{%
+ \sbox\@tempboxa{#1}%
+ \setlength{\@tempdima}{\draftwatermark@hpos}%
+ \setlength{\@tempdimb}{\draftwatermark@vpos}%
+ \let \draftwatermark@tempa \draftwatermark@hanchor
+ \@onelevel@sanitize \draftwatermark@tempa
+ \expandafter\def\expandafter\draftwatermark@tempb
+ \expandafter{\expandafter\@car \draftwatermark@tempa\@nil}
+ \if \draftwatermark@tempb r%
+ \addtolength\@tempdima{-\wd\@tempboxa}%
+ \else\if \draftwatermark@tempb c%
+ \addtolength\@tempdima{-0.5\wd\@tempboxa}%
+ \else\if \draftwatermark@tempb l%
+ \relax
+ \else
+ \PackageError{draftwatermark}{%
+ Illegal anchor directive `\draftwatermark@tempb'}%
+ {Anchoring to left side.}%
+ \fi\fi\fi
+ \let \draftwatermark@tempa \draftwatermark@vanchor
+ \@onelevel@sanitize \draftwatermark@tempa
+ \expandafter\def\expandafter\draftwatermark@tempb
+ \expandafter{\expandafter\@car \draftwatermark@tempa\@nil}
+ \if \draftwatermark@tempb b%
+ \addtolength\@tempdimb{-\ht\@tempboxa}%
+ \addtolength\@tempdimb{-\dp\@tempboxa}%
+ \else\if \draftwatermark@tempb m%
+ \addtolength\@tempdimb{-0.5\ht\@tempboxa}%
+ \addtolength\@tempdimb{-0.5\dp\@tempboxa}%
+ \else\if \draftwatermark@tempb t%
+ \relax
+ \else
+ \PackageError{draftwatermark}{%
+ Illegal anchor directive `\draftwatermark@tempb'}%
+ {Anchoring to top side.}%
+ \fi\fi\fi
+ \vbox to 0pt {
+ \vspace*{-1in}%
+ \vspace*{\@tempdimb}%
+ \hbox to 0pt {%
+ \hspace*{-1in}%
+ \hspace*{\@tempdima}%
+ \usebox\@tempboxa
+ \hss}%
+ \vss}}
+
+\newcommand\draftwatermark@print[1]{%
+ \ifdraftwatermark@stamp
+ \draftwatermark@printwm{#1}%
\fi}
-\if@sc@wm@first
-\AddThispageHook{\sc@wm@print{\sc@watermark}}
+\ifdraftwatermark@firstpageonly
+ \AddThispageHook{\draftwatermark@print{\draftwatermark@markcmd}}
\else
-\AddEverypageHook{\sc@wm@print{\sc@watermark}}
+ \AddEverypageHook{\draftwatermark@print{\draftwatermark@markcmd}}
\fi
+
+%% \CharacterTable
+%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
\endinput
%%
%% End of file `draftwatermark.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/draftwatermark.tlpobj new/tlpkg/tlpobj/draftwatermark.tlpobj
--- old/tlpkg/tlpobj/draftwatermark.tlpobj 2019-02-28 03:32:19.000000000 +0100
+++ new/tlpkg/tlpobj/draftwatermark.tlpobj 2020-03-15 02:47:19.000000000 +0100
@@ -1,6 +1,6 @@
name draftwatermark
category Package
-revision 37498
+revision 54317
shortdesc Put a grey textual watermark on document pages
relocated 1
longdesc The package provides a means to add a textual, light grey
@@ -10,12 +10,11 @@
longdesc similar function to that of draftcopy, but its implementation
longdesc is output device independent, and made very simple by relying
longdesc on everypage.
-runfiles size=1
+runfiles size=2
RELOC/tex/latex/draftwatermark/draftwatermark.sty
catalogue-also eso-pic
catalogue-contact-repository https://github.com/callegar/LaTeX-draftwatermark
catalogue-ctan /macros/latex/contrib/draftwatermark
-catalogue-date 2017-05-22 12:38:58 +0200
catalogue-license lppl1.3
catalogue-topics editorial watermark
-catalogue-version 1.2
+catalogue-version 2.0
++++++ droid.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/droid/CHANGES new/doc/fonts/droid/CHANGES
--- old/doc/fonts/droid/CHANGES 2011-09-13 01:12:57.000000000 +0200
+++ new/doc/fonts/droid/CHANGES 2019-06-25 23:26:46.000000000 +0200
@@ -1,20 +1,37 @@
-Changelog for version 1.1:
- - clean comfortaa-fixlatin.etx
+VERSION 3.2:
+ - Fix ligatures for hyphens
+ - Fix TDS packaging
-Changelog for version 1.2:
- - clean comfortaa-fixlatin.etx (again...)
+VERSION 3.1:
+ - Fix OT1 encoding with italic/slanted shapes
+ - Fix packaging according to CTAN guidelines
-Changelog for version 1.3:
- - fix metrics bugs in TS1 encoding
- - fix documentation
- - add samples PDFs
-
-Changelog for version 2.0:
- - complete rewrite of the fontinst driver file
- - rename .vf and .tfm files based on the pattern <font>-<encoding>
- - fix NFSS shape for upright italic variant ("ui" instead of "up")
- - modify paths of the archive: documentation is now in doc/fonts/droid/
+VERSION 3.0:
+ - Update .ttf files to latest version available in Android Git tree
+ - Complete rewrite of the TeX metric file generation (otftotfm is now
+ used instead of fontinst)
+ - Support for XeLaTeX and LuaLaTeX
+ - Drop faked smallcaps support
+ - Fix kerning with uppercase Greek diacritics
+ - Add "scaled" alias option
+
+VERSION 2.1:
+ - fix bug in font scaling
+
+VERSION 2.0:
+ - complete rewrite of the fontinst driver file
+ - rename .vf and .tfm files based on the pattern <font>-<encoding>
+ - fix NFSS shape for upright italic variant ("ui" instead of "up")
+ - modify paths of the archive: documentation is now in doc/fonts/droid/
and sources in source/fonts/droid/
-Changelog for version 2.0:
- - fix bug in font scaling
+VERSION 1.3:
+ - fix metrics bugs in TS1 encoding
+ - fix documentation
+ - add samples PDFs
+
+VERSION 1.2:
+ - clean droid-fixlatin.etx (again...)
+
+VERSION 1.1:
+ - clean droid-fixlatin.etx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/droid/README new/doc/fonts/droid/README
--- old/doc/fonts/droid/README 2011-09-13 01:12:57.000000000 +0200
+++ new/doc/fonts/droid/README 2019-06-25 23:26:46.000000000 +0200
@@ -1,25 +1,25 @@
--------------------
- Droid, version 2.1
+ Droid, version 3.1
--------------------
The Droid typeface family was designed in the fall of 2006 by Ascender's Steve
Matteson, as a commission from Google to create a set of system fonts for its
Android platform. The goal was to provide optimal quality and comfort on a
mobile handset when rendered in application menus, web browsers and for other
-screen text. The Droid family of fonts consists of Droid Serif, Droid Sans and
-Droid Sans Mono, licensed under the Apache License version 2.0, and available in
-the Android Git at
-http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts
-as TrueType files.
+screen text. It consists of Droid Serif, Droid Sans and Droid Sans Mono.
-This package provides support for this font family in LaTeX. It includes the
-original TrueType fonts, as well as Type 1 versions, converted for this package
-using FontForge for full support with Dvips.
+The font family is available in the Android Git tree as TrueType-flavored
+OpenType files licensed under the Apache License version 2.0.
-Notice that this package does not support the Droid Pro family sold by Ascender.
+This package provides support for Droid in LaTeX, including XeLaTeX and
+LuaLaTeX. It includes the original OpenType fonts, as well as Type 1 versions,
+converted for this package using FontForge for full support with LaTeX and
+Dvips.
-Installation and usage instructions are described in
-doc/latex/droid/droid.pdf.
+Notice that this package does not support the Droid Pro family sold by
+Ascender. Notice also that the Noto font family is considered to be the
+successor for Droid, with better Unicode coverage and more weights and shapes
+available.
This package is released under the LaTeX Project Public License, either version
1.3c or above, with the exception of the .ttf and .pfb files, released under the
Binary files old/doc/fonts/droid/droid-samples.pdf and new/doc/fonts/droid/droid-samples.pdf differ
Binary files old/doc/fonts/droid/droid.pdf and new/doc/fonts/droid/droid.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/droid/droid.tex new/doc/fonts/droid/droid.tex
--- old/doc/fonts/droid/droid.tex 2011-09-13 01:12:57.000000000 +0200
+++ new/doc/fonts/droid/droid.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,283 +0,0 @@
-%% droid.tex
-%% Copyright 2010, 2011 Mohamed El Morabity
-%
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3 of this license or (at your option)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[american]{babel}
-\usepackage{booktabs}
-\usepackage{droid}
-\usepackage{microtype}
-\usepackage{multirow}
-\usepackage{path}
-\usepackage{varioref}
-\usepackage[colorlinks]{hyperref}
-
-\hypersetup{%
- pdftitle={LaTeX support for Droid},%
- pdfauthor={Mohamed El Morabity}%
-}%
-
-\newcommand{\acronym}[1]{\textsc{\lowercase{#1}}}
-\newcommand{\code}{\texttt}
-\newcommand{\command}{\texttt}
-\newcommand{\email}[1]{\href{mailto:#1}{\nolinkurl{#1}}}
-\newcommand{\name}{}
-\newcommand{\package}{\texttt}
-\newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
-\newcommand{\program}{}
-
-\title{\LaTeX{} support for Droid\\Version~2.1}
-
-\author{Mohamed \name{El~Morabity}\\\email{melmorabity(a)fedoraproject.org}}
-
-\begin{document}
-
-\maketitle
-
-\tableofcontents
-
-\section{Introduction}
-
-The Droid typeface family was designed in the fall of 2006 by Ascender's Steve
-\name{Matteson}, as a commission from Google to create a set of system fonts for
-its Android platform. The goal was to provide optimal quality and comfort on a
-mobile handset when rendered in application menus, web browsers and for other
-screen text. The Droid family of fonts consists of {\fdrfamily Droid Serif},
-{\fdsfamily Droid Sans} and {\fdmfamily Droid Sans Mono} (see
-figure~\vref{styles}), licensed under the Apache License version~2.0, and
-available in the Android \program{Git} tree~\cite{droid} as TrueType files.
-
-\begin{figure}
- \centering
- {%
- \fdrfamily%
- Droid Serif Regular\\
- {\itshape Droid Serif Italic}\\
- {\bfseries Droid Serif Bold}\\
- {\bfseries\itshape Droid Serif Bold Italic}\\
- }
- {%
- \fdsfamily%
- Droid Sans Regular\\
- {\bfseries Droid Sans Bold}\\
- }
- {%
- \fdmfamily%
- Droid Sans Mono Regular
- }
- \caption{Available styles for Droid}
- \label{styles}
-\end{figure}
-
-This package provides support for this font family in \LaTeX{}. It includes the
-original TrueType fonts, as well as Type~1 versions, converted for this package
-using \program{FontForge} for full support with \program{Dvips}.
-
-Notice that this package does not support the Droid Pro family sold by
-Ascender~\cite{droidpro}.
-
-\section{Installation}
-
-These directions assume that your \TeX{} distribution is
-\acronym{TDS}-compliant.
-
-Once the \path|droid.zip| archive extracted:
-\begin{enumerate}
-\item Copy \path|doc/|, \path|fonts/|, \path|source/|, and \path|tex/|
- directories to your \path|texmf/| directory (either your local or global
- \path|texmf/| directory).
-\item Run \command{mktexlsr} to refresh the file name database and make \TeX{}
- aware of the new files.
-\item Run \command{updmap --enable Map droid.map} to make \program{Dvips},
- \program{dvipdf} and \program{pdf\TeX} aware of the new fonts.
-\end{enumerate}
-
-Note that this package requires the \package{keyval}~\cite{keyval} and
-\package{slantsc}~\cite{slantsc} (to handle italic/slanted small caps) ones to
-work.
-
-\section{Usage}
-
-\subsection{Calling Droid}
-
-Several macro packages, described in table~\vref{packages}, are provided to use these font
-families with \LaTeX.
-\begin{table}
- \centering
- \begin{tabular}{llll}
- \toprule
- font name&family&package&switch command\\
- \midrule
- Droid Serif&fdr&\package{droidserif}&\code{\char`\\fdrfamily}\\
- Droid Sans&fds&\package{droidsans}&\code{\char`\\fdsfamily}\\
- Droid Sans Mono&fdm&\package{droidmono}&\code{\char`\\fdmfamily}\\
- \bottomrule
- \end{tabular}
- \caption{\LaTeX{} style files provided by the droid package}
- \label{packages}
-\end{table}
-For each family package, the provided commands \code{\char`\\fdrfamily},
-\code{\char`\\fdsfamily} and \code{\char`\\fdmfamily} will switch the current
-font to Droid Serif, Droid Sans and Droid Sans Mono respectively. You need not
-necessarily use all three font families together (even though this is supported,
-see below).
-
-\subsubsection{Using the Droid font families together}
-
-To make the use of the three Droid fonts families together most easy, a further
-macro package \package{droid} is provided:
-\begin{verbatim}
-\usepackage{droid}
-\end{verbatim}
-This will set Droid Serif, Droid Sans and Droid Sans Mono as the three main text
-font families.
-
-\subsubsection{Using each font family separately}
-
-You can set \LaTeX{} to use Droid Serif only as standard font throughout the
-whole document by passing the \code{default} option to the \package{droidserif}
-package:
-\begin{verbatim}
-\usepackage[default]{droidserif}
-\end{verbatim}
-
-As well, you can set \LaTeX{} to use Droid Sans as standard font with the
-\code{default} option to the \package{droidsans} package:
-\begin{verbatim}
-\usepackage[default]{droidsans}
-\end{verbatim}
-To set Droid Sans as default sans-serif only:
-\begin{verbatim}
-\usepackage[defaultsans]{droidsans}
-\end{verbatim}
-
-Finally, to set Droid Sans Mono as the default typewriter font:
-\begin{verbatim}
-\usepackage[defaultmono]{droidmono}
-\end{verbatim}
-
-\paragraph{Font scaling}
-
-The font can be up- and downscaled by any factor. This can be used to make the
-Droid fonts more friendly when used in company with other type faces, e.g., to
-adapt the x-height. The package option \code{scale=\parameter{ratio}} will scale
-the font according to \parameter{ratio} (1.0 by default), for example:
-\begin{verbatim}
-\usepackage[scale=0.95]{droidserif}
-\usepackage[scale=0.95]{droidsans}
-\usepackage[scale=0.95]{droidmono}
-\end{verbatim}
-
-\subsection{Encodings}
-
-The following encodings are supported:
-\begin{description}
-\item[Latin] OT1, T1, TS1 (partial)
-\item[Cyrillic] T2A, T2B, T2C, X2
-\item[Greek] LGR (monotonic only)
-\end{description}
-To use one or another encoding, give the \LaTeX{} name to the \package{fontenc}
-package as usual, as in
-\begin{verbatim}
-\usepackage[T1]{fontenc}
-\usepackage{droid}
-\end{verbatim}
-
-Note that, as usual with OT1 encoded fonts, kerning with accented characters is
-treated poorly, if at all. Note difference in kerning between these two encoding
-in table~\vref{kerning}.
-\begin{table}
-\centering
- \begin{tabular}{ll}
- \toprule
- OT1-encoded&{\fdsfamily Te T\'e}\\
- \midrule
- T1-encoded&{\fdsfamily\fontencoding{T1}\selectfont Te T\'e}\\
- \bottomrule
- \end{tabular}
- \caption{Kerning with OT1 and T1 encodings}
- \label{kerning}
-\end{table}
-It is therefore advised to always use the Droid fonts in any encoding than OT1
-when typing diacritics.
-
-\subsection{Available weights and variants}
-
-Table~\vref{nfss} lists the available font series and shapes with their
-\acronym{NFSS} classification. Parenthesized combinations are provided via
-substitutions.
-\begin{table}
- \centering
- \begin{tabular}{llll}
- \toprule
- family&encoding&series&shape\\
- \midrule
- \multirow{4}{*}{fdr}&OT1,T1,&\multirow{4}{*}{m, b (bx)}&\multirow{3}{*}{n, it, sl, ui, sc, scit, scsl, scui}\\
- &T2A, T2B, T2C, X2,&&\\
- &LGR&&\\
- \cmidrule{2-2}
- \cmidrule{4-4}
- &TS1&&n, it, sl, ui\\
- \midrule
- \multirow{4}{*}{fds}&OT1,T1,&\multirow{4}{*}{m, b (bx)}&\multirow{3}{*}{n, sl (it), sc, scsl (scit)}\\
- &T2A, T2B, T2C, X2,&&\\
- &LGR&&\\
- \cmidrule{2-2}
- \cmidrule{4-4}
- &TS1&&n, sl (it)\\
- \midrule
- \multirow{4}{*}{fdm}&OT1,T1,&\multirow{4}{*}{m}&\multirow{3}{*}{n, sl (it), sc, scsl (scit)}\\
- &T2A, T2B, T2C, X2,&&\\
- &LGR&&\\
- \cmidrule{2-2}
- \cmidrule{4-4}
- &TS1&&n, sl (it)\\
- \bottomrule
- \end{tabular}
- \caption{Available font series and shapes for Droid}
- \label{nfss}
-\end{table}
-Notice that the slanted shapes are faked ones, as well as the small capitals
-(reduced to 80\%).
-
-Samples of the font are available in the
-\href{run:droidserif-samples.pdf}{\path|droidserif-samples.pdf|},
-\href{run:droidsans-samples.pdf}{\path|droidsans-samples.pdf|}, and
-\href{run:droidsansmono-samples.pdf}{\path|droidsansmono-samples.pdf|} files.
-
-\section{Known bugs and improvements}
-
-Please send bug reports and suggestions about the Droid \LaTeX{} support to
-\href{mailto:melmorabity@fedoraproject.org}{Mohamed \name{El~Morabity}}.
-
-\section{License}
-
-This package is released under the \LaTeX{} project public license, either
-version~1.3c or above~\cite{lppl}. Anyway both the TrueType and Type~1 files are
-delivered under the Apache License Version~2.0~\cite{asl}.
-
-\begin{thebibliography}{9}
-\bibitem{droid}
- \url{http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts}
-\bibitem{droidpro} \url{http://www.DroidFonts.com/}
-\bibitem{keyval}
- \url{http://www.ctan.org/tex-archive/macros/latex/required/graphics/}
-\bibitem{slantsc}
- \url{http://www.ctan.org/tex-archive/macros/latex/contrib/slantsc/}
-\bibitem{lppl} \url{http://www.latex-project.org/lppl/lppl-1-3c.html}
-\bibitem{asl} \url{http://www.apache.org/licenses/LICENSE-2.0.html}
-\end{thebibliography}
-
-\end{document}
Binary files old/doc/fonts/droid/droidsans-samples.pdf and new/doc/fonts/droid/droidsans-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/droid/droidsans-samples.tex new/doc/fonts/droid/droidsans-samples.tex
--- old/doc/fonts/droid/droidsans-samples.tex 2011-05-09 01:17:01.000000000 +0200
+++ new/doc/fonts/droid/droidsans-samples.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,79 +0,0 @@
-%% droidsans-samples.tex
-%% Copyright 2011 Mohamed El Morabity
-%
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3 of this license or (at your option)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[greek,russian,francais,american]{babel}
-\usepackage{droidsans}
-\usepackage[LGR,T2A,T1,OT1]{fontenc}
-\usepackage[utf8x]{inputenc}
-\usepackage{microtype}
-\usepackage{textcomp}
-
-\newcommand{\latinSample}{%
- \foreignlanguage{francais}{%
- Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
- }%
-}
-
-\newcommand{\cyrillicSample}{%
- \foreignlanguage{russian}{%
- Все люди рождаются свободными и равными в своем достоинстве и правах. Они наделены разумом и совестью и должны поступать в отношении друг друга в духе братства.%
- }%
-}
-
-\newcommand{\greekSample}{%
- \foreignlanguage{greek}{%
- 'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
- }%
-}
-
-\newcommand{\miscSample}{%
- 0123456789 fi fl ffi ffl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
-}
-
-\newcommand{\fontSample}[2]{%
- {\usefont{T1}{fds}{#1}{#2} \latinSample}
-
- {\usefont{T2A}{fds}{#1}{#2} \cyrillicSample}
-
- {\usefont{LGR}{fds}{#1}{#2} \greekSample}%
-
- {\fontfamily{fds}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
-}
-
-\begin{document}
-
-\section*{Droid Sans Regular}
-
-\fontSample{m}{n}
-
-\fontSample{m}{sl}
-
-\fontSample{m}{sc}
-
-\fontSample{m}{scsl}
-
-\section*{Droid Sans Bold}
-
-\fontSample{b}{n}
-
-\fontSample{b}{sl}
-
-\fontSample{b}{sc}
-
-\fontSample{b}{scsl}
-
-\end{document}
Binary files old/doc/fonts/droid/droidsansmono-samples.pdf and new/doc/fonts/droid/droidsansmono-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/droid/droidsansmono-samples.tex new/doc/fonts/droid/droidsansmono-samples.tex
--- old/doc/fonts/droid/droidsansmono-samples.tex 2011-05-09 01:17:01.000000000 +0200
+++ new/doc/fonts/droid/droidsansmono-samples.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,69 +0,0 @@
-%% droidsansmono-samples.tex
-%% Copyright 2011 Mohamed El Morabity
-%
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3 of this license or (at your option)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[greek,russian,francais,american]{babel}
-\usepackage{droidmono}
-\usepackage[LGR,T2A,T1,OT1]{fontenc}
-\usepackage[utf8x]{inputenc}
-\usepackage{microtype}
-\usepackage{textcomp}
-
-\newcommand{\latinSample}{%
- \foreignlanguage{francais}{%
- Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
- }%
-}
-
-\newcommand{\cyrillicSample}{%
- \foreignlanguage{russian}{%
- Все люди рождаются свободными и равными в своем достоинстве и правах. Они наделены разумом и совестью и должны поступать в отношении друг друга в духе братства.%
- }%
-}
-
-\newcommand{\greekSample}{%
- \foreignlanguage{greek}{%
- 'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
- }%
-}
-
-\newcommand{\miscSample}{%
- 0123456789 fi fl ffi ffl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
-}
-
-\newcommand{\fontSample}[2]{%
- {\usefont{T1}{fdm}{#1}{#2} \latinSample}
-
- {\usefont{T2A}{fdm}{#1}{#2} \cyrillicSample}
-
- {\usefont{LGR}{fdm}{#1}{#2} \greekSample}%
-
- {\fontfamily{fdm}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
-}
-
-\begin{document}
-
-\section*{Droid Sans Mono}
-
-\fontSample{m}{n}
-
-\fontSample{m}{sl}
-
-\fontSample{m}{sc}
-
-\fontSample{m}{scsl}
-
-\end{document}
Binary files old/doc/fonts/droid/droidserif-samples.pdf and new/doc/fonts/droid/droidserif-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/droid/droidserif-samples.tex new/doc/fonts/droid/droidserif-samples.tex
--- old/doc/fonts/droid/droidserif-samples.tex 2011-08-27 00:20:49.000000000 +0200
+++ new/doc/fonts/droid/droidserif-samples.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,95 +0,0 @@
-%% droidserif-samples.tex
-%% Copyright 2011 Mohamed El Morabity
-%
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3 of this license or (at your option)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[greek,russian,francais,american]{babel}
-\usepackage{droidserif}
-\usepackage[LGR,T2A,T1,OT1]{fontenc}
-\usepackage[utf8x]{inputenc}
-\usepackage{microtype}
-\usepackage{textcomp}
-
-\newcommand{\latinSample}{%
- \foreignlanguage{francais}{%
- Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
- }%
-}
-
-\newcommand{\cyrillicSample}{%
- \foreignlanguage{russian}{%
- Все люди рождаются свободными и равными в своем достоинстве и правах. Они наделены разумом и совестью и должны поступать в отношении друг друга в духе братства.%
- }%
-}
-
-\newcommand{\greekSample}{%
- \foreignlanguage{greek}{%
- 'Ολοι οι άνθρωποι γεννιούνται ελεύθεροι και ίσοι στην αξιοπρέπεια και τα δικαιώματα. Είναι προικισμένοι με λογική και συνείδηση, και οφείλουν να συμπεριφέρονται μεταξύ τους με πνεύμα αδελφοσύνης.%
- }%
-}
-
-\newcommand{\miscSample}{%
- 0123456789 fi fl ffi ffl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
-}
-
-\newcommand{\fontSample}[2]{%
- {\usefont{T1}{fdr}{#1}{#2} \latinSample}
-
- {\usefont{T2A}{fdr}{#1}{#2} \cyrillicSample}
-
- {\usefont{LGR}{fdr}{#1}{#2} \greekSample}%
-
- {\fontfamily{fdr}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
-}
-
-\begin{document}
-
-\section*{Droid Serif Regular}
-
-\fontSample{m}{n}
-
-\fontSample{m}{it}
-
-\fontSample{m}{sl}
-
-\fontSample{m}{ui}
-
-\fontSample{m}{sc}
-
-\fontSample{m}{scit}
-
-\fontSample{m}{scsl}
-
-\fontSample{m}{scui}
-
-\section*{Droid Serif Bold}
-
-\fontSample{b}{n}
-
-\fontSample{b}{it}
-
-\fontSample{b}{sl}
-
-\fontSample{b}{ui}
-
-\fontSample{b}{sc}
-
-\fontSample{b}{scit}
-
-\fontSample{b}{scsl}
-
-\fontSample{b}{scui}
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/droid/manifest.txt new/doc/fonts/droid/manifest.txt
--- old/doc/fonts/droid/manifest.txt 2011-08-27 00:20:49.000000000 +0200
+++ new/doc/fonts/droid/manifest.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,557 +0,0 @@
-./README
-./tex/latex/droid/droidsans.sty
-./tex/latex/droid/droidserif.sty
-./tex/latex/droid/ot1fdr.fd
-./tex/latex/droid/ts1fdr.fd
-./tex/latex/droid/x2fdm.fd
-./tex/latex/droid/ot1fdm.fd
-./tex/latex/droid/x2fdr.fd
-./tex/latex/droid/lgrfdm.fd
-./tex/latex/droid/t2afds.fd
-./tex/latex/droid/t1fds.fd
-./tex/latex/droid/t2bfdm.fd
-./tex/latex/droid/t1fdr.fd
-./tex/latex/droid/droid.sty
-./tex/latex/droid/t2cfdr.fd
-./tex/latex/droid/ot1fds.fd
-./tex/latex/droid/t2afdm.fd
-./tex/latex/droid/t1fdm.fd
-./tex/latex/droid/ts1fdm.fd
-./tex/latex/droid/lgrfdr.fd
-./tex/latex/droid/ts1fds.fd
-./tex/latex/droid/droidmono.sty
-./tex/latex/droid/t2cfds.fd
-./tex/latex/droid/t2bfdr.fd
-./tex/latex/droid/lgrfds.fd
-./tex/latex/droid/x2fds.fd
-./tex/latex/droid/t2cfdm.fd
-./tex/latex/droid/t2bfds.fd
-./tex/latex/droid/t2afdr.fd
-./doc/fonts/droid/README
-./doc/fonts/droid/droidsansmono-samples.pdf
-./doc/fonts/droid/droidsans-samples.tex
-./doc/fonts/droid/droid.tex
-./doc/fonts/droid/droidserif-samples.pdf
-./doc/fonts/droid/CHANGES
-./doc/fonts/droid/droidsansmono-samples.tex
-./doc/fonts/droid/droidserif-samples.tex
-./doc/fonts/droid/droid.pdf
-./doc/fonts/droid/droidsans-samples.pdf
-./source/fonts/droid/droidsans-drv.tex
-./source/fonts/droid/ttf2type1.pe
-./source/fonts/droid/droid-map.tex
-./source/fonts/droid/droid-drv.tex
-./source/fonts/droid/Makefile
-./source/fonts/droid/droid-04.etx
-./source/fonts/droid/droid-02.etx
-./source/fonts/droid/droid-03.etx
-./source/fonts/droid/droid-01.etx
-./source/fonts/droid/droidserif-drv.tex
-./source/fonts/droid/droid-fixgreek.mtx
-./source/fonts/droid/droidsansmono-drv.tex
-./source/fonts/droid/droid-fixlatin.mtx
-./source/fonts/droid/droid-fixtextcomp.mtx
-./source/fonts/droid/droid-fixcyrillic.mtx
-./manifest.txt
-./fonts/tfm/public/droid/DroidSans-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSans-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-03.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-02.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-02.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-lgr.tfm
-./fonts/tfm/public/droid/DroidSansMono-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-02.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSansMono-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-04.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSansMono-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-01.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-02.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-04.tfm
-./fonts/tfm/public/droid/DroidSansMono-01.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-t2a.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-lgr.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-04.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-t1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-ts1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-lgr.tfm
-./fonts/tfm/public/droid/DroidSansMono-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-01.tfm
-./fonts/tfm/public/droid/DroidSans-t1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-t2a.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-03.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-04.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-x2.tfm
-./fonts/tfm/public/droid/DroidSans-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-ts1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-04.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-03.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-t2c.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-02.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-01.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSansMono-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-02.tfm
-./fonts/tfm/public/droid/DroidSansMono-lgr.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-ts1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-lgr.tfm
-./fonts/tfm/public/droid/DroidSansMono-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-ts1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-t1.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-ot1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-02.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-02.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-04.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-lgr.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-lgr.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSansMono-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSans-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-t2b.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-02.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-01.tfm
-./fonts/tfm/public/droid/DroidSans-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSans-02.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-ts1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-01.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-04.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-02.tfm
-./fonts/tfm/public/droid/DroidSans-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSansMono-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-ts1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-t2c.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-03.tfm
-./fonts/tfm/public/droid/DroidSansMono-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-03.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-03.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-ts1.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-t2c.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-04.tfm
-./fonts/tfm/public/droid/DroidSansMono-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-01.tfm
-./fonts/tfm/public/droid/DroidSans-04.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-t2b.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-01.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-ts1.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-t1.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-x2.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-04.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-t2b.tfm
-./fonts/tfm/public/droid/DroidSans-lgr.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-lgr.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-t2c.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-03.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-03.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSans-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-ts1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSansMono-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-x2.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-ts1.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-t2b.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-03.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-x2.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-ts1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-04.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-03.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-04.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-t1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-t2b.tfm
-./fonts/tfm/public/droid/DroidSansMono-03.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-lgr.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-04.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSans-ts1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-01.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-01.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-t1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSansMono-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-01.tfm
-./fonts/tfm/public/droid/DroidSans-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-02.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-ts1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-SmallCaps-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-02.tfm
-./fonts/tfm/public/droid/DroidSans-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSans-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-SmallCaps-t2c.tfm
-./fonts/tfm/public/droid/DroidSansMono-04.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-01.tfm
-./fonts/tfm/public/droid/DroidSans-t2c.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-03.tfm
-./fonts/tfm/public/droid/DroidSans-01.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-t2c.tfm
-./fonts/tfm/public/droid/DroidSans-x2.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-lgr.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-t2c.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-ot1.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-03.tfm
-./fonts/tfm/public/droid/DroidSerif-Italic-Upright-t1.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-01.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/droid/DroidSansMono-ts1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-SmallCaps-t2a.tfm
-./fonts/tfm/public/droid/DroidSans-03.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-Upright-x2.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSans-Bold-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSansMono-02.tfm
-./fonts/tfm/public/droid/DroidSansMono-Slanted-ot1.tfm
-./fonts/tfm/public/droid/DroidSans-t2a.tfm
-./fonts/tfm/public/droid/DroidSansMono-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Bold-Slanted-t2a.tfm
-./fonts/tfm/public/droid/DroidSerif-BoldItalic-ot1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-SmallCaps-t2b.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-Slanted-t1.tfm
-./fonts/tfm/public/droid/DroidSerif-Regular-t2c.tfm
-./fonts/map/dvips/droid/droid.map
-./fonts/vf/public/droid/DroidSans-Slanted-ts1.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSans-Bold-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Bold-t2a.vf
-./fonts/vf/public/droid/DroidSansMono-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSansMono-t1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Italic-t2a.vf
-./fonts/vf/public/droid/DroidSans-Bold-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-lgr.vf
-./fonts/vf/public/droid/DroidSans-Slanted-t2c.vf
-./fonts/vf/public/droid/DroidSans-Bold-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSans-ts1.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Regular-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-t2c.vf
-./fonts/vf/public/droid/DroidSans-Slanted-x2.vf
-./fonts/vf/public/droid/DroidSerif-Italic-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSans-t2b.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Regular-x2.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Regular-t1.vf
-./fonts/vf/public/droid/DroidSerif-Bold-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSans-Bold-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Bold-x2.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-t2c.vf
-./fonts/vf/public/droid/DroidSans-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-ts1.vf
-./fonts/vf/public/droid/DroidSans-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-t1.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Regular-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSansMono-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-ot1.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-t1.vf
-./fonts/vf/public/droid/DroidSans-t2c.vf
-./fonts/vf/public/droid/DroidSans-Bold-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-x2.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSansMono-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSans-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Regular-t2c.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSans-Bold-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSansMono-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Bold-t2b.vf
-./fonts/vf/public/droid/DroidSans-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSansMono-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-ot1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSans-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-t1.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-ts1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Bold-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Bold-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Regular-lgr.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-x2.vf
-./fonts/vf/public/droid/DroidSerif-Bold-ot1.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-ot1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-t1.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSansMono-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSansMono-ts1.vf
-./fonts/vf/public/droid/DroidSerif-Bold-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSans-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Regular-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-t2c.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-lgr.vf
-./fonts/vf/public/droid/DroidSans-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSans-x2.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Regular-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSans-Bold-t2a.vf
-./fonts/vf/public/droid/DroidSansMono-ot1.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Regular-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Regular-ts1.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Regular-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-ts1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-x2.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-t1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-t2c.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-ot1.vf
-./fonts/vf/public/droid/DroidSansMono-t2c.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSans-Slanted-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Bold-t1.vf
-./fonts/vf/public/droid/DroidSans-Slanted-t2b.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSans-Bold-x2.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-x2.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-ts1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-t1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-t2a.vf
-./fonts/vf/public/droid/DroidSans-Slanted-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-x2.vf
-./fonts/vf/public/droid/DroidSerif-Bold-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Bold-t2c.vf
-./fonts/vf/public/droid/DroidSans-Bold-ts1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Italic-t2c.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSans-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-t2b.vf
-./fonts/vf/public/droid/DroidSans-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-ts1.vf
-./fonts/vf/public/droid/DroidSansMono-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-t2a.vf
-./fonts/vf/public/droid/DroidSans-lgr.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-x2.vf
-./fonts/vf/public/droid/DroidSans-Bold-t2c.vf
-./fonts/vf/public/droid/DroidSans-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-t2b.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSans-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSans-Slanted-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-ot1.vf
-./fonts/vf/public/droid/DroidSansMono-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Italic-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-t1.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSansMono-lgr.vf
-./fonts/vf/public/droid/DroidSans-Slanted-t1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Bold-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSans-Bold-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-ts1.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/droid/DroidSans-Bold-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSans-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-lgr.vf
-./fonts/vf/public/droid/DroidSansMono-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSansMono-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSans-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-Italic-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Italic-SmallCaps-t2c.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-t2b.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSans-Bold-t1.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-ot1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-t1.vf
-./fonts/vf/public/droid/DroidSerif-Bold-ts1.vf
-./fonts/vf/public/droid/DroidSans-Slanted-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Bold-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Italic-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Bold-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSans-Bold-lgr.vf
-./fonts/vf/public/droid/DroidSans-SmallCaps-t2a.vf
-./fonts/vf/public/droid/DroidSerif-Italic-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSerif-Italic-ts1.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-ot1.vf
-./fonts/vf/public/droid/DroidSans-Bold-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-Bold-SmallCaps-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSansMono-x2.vf
-./fonts/vf/public/droid/DroidSerif-Regular-Slanted-SmallCaps-lgr.vf
-./fonts/vf/public/droid/DroidSans-SmallCaps-t2b.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-t2b.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-t2a.vf
-./fonts/vf/public/droid/DroidSerif-BoldItalic-Upright-ts1.vf
-./fonts/vf/public/droid/DroidSerif-Italic-Upright-SmallCaps-t1.vf
-./fonts/vf/public/droid/DroidSans-Bold-Slanted-t2b.vf
-./fonts/vf/public/droid/DroidSans-t1.vf
-./fonts/truetype/public/droid/DroidSerif-Italic.ttf
-./fonts/truetype/public/droid/DroidSerif-Bold.ttf
-./fonts/truetype/public/droid/DroidSans-Bold.ttf
-./fonts/truetype/public/droid/DroidSerif-BoldItalic.ttf
-./fonts/truetype/public/droid/DroidSans.ttf
-./fonts/truetype/public/droid/DroidSansMono.ttf
-./fonts/truetype/public/droid/DroidSerif-Regular.ttf
-./fonts/afm/public/droid/DroidSerif-Bold.afm
-./fonts/afm/public/droid/DroidSerif-BoldItalic.afm
-./fonts/afm/public/droid/DroidSans.afm
-./fonts/afm/public/droid/DroidSans-Bold.afm
-./fonts/afm/public/droid/DroidSansMono.afm
-./fonts/afm/public/droid/DroidSerif-Italic.afm
-./fonts/afm/public/droid/DroidSerif-Regular.afm
-./fonts/enc/dvips/droid/droid-04.enc
-./fonts/enc/dvips/droid/droid-01.enc
-./fonts/enc/dvips/droid/droid-02.enc
-./fonts/enc/dvips/droid/droid-03.enc
-./fonts/type1/public/droid/DroidSerif-Regular.pfb
-./fonts/type1/public/droid/DroidSans.pfb
-./fonts/type1/public/droid/DroidSerif-Italic.pfb
-./fonts/type1/public/droid/DroidSans-Bold.pfb
-./fonts/type1/public/droid/DroidSerif-Bold.pfb
-./fonts/type1/public/droid/DroidSansMono.pfb
-./fonts/type1/public/droid/DroidSerif-BoldItalic.pfb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/droid.doc.tlpobj new/tlpkg/tlpobj/droid.doc.tlpobj
--- old/tlpkg/tlpobj/droid.doc.tlpobj 2019-02-28 03:32:49.000000000 +0100
+++ new/tlpkg/tlpobj/droid.doc.tlpobj 2020-03-24 01:57:20.000000000 +0100
@@ -1,17 +1,10 @@
name droid.doc
category Package
-revision 23912
+revision 54512
shortdesc doc files of droid
relocated 1
-docfiles size=205
+docfiles size=211
RELOC/doc/fonts/droid/CHANGES
RELOC/doc/fonts/droid/README
+ RELOC/doc/fonts/droid/droid-samples.pdf
RELOC/doc/fonts/droid/droid.pdf
- RELOC/doc/fonts/droid/droid.tex
- RELOC/doc/fonts/droid/droidsans-samples.pdf
- RELOC/doc/fonts/droid/droidsans-samples.tex
- RELOC/doc/fonts/droid/droidsansmono-samples.pdf
- RELOC/doc/fonts/droid/droidsansmono-samples.tex
- RELOC/doc/fonts/droid/droidserif-samples.pdf
- RELOC/doc/fonts/droid/droidserif-samples.tex
- RELOC/doc/fonts/droid/manifest.txt
++++++ droid.tar.xz ++++++
++++ 151313 lines of diff (skipped)
++++++ dsserif.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/dsserif/README new/doc/fonts/dsserif/README
--- old/doc/fonts/dsserif/README 2018-05-02 22:46:57.000000000 +0200
+++ new/doc/fonts/dsserif/README 2020-01-13 00:29:21.000000000 +0100
@@ -19,7 +19,10 @@
Files provided "as is", with no warranties.
-Current version: 1.00 2018-05-01
+Current version: 1.01 2020-01-04
+
+Changes in version 1.01
+Corrections to DSSerif.map
Please send comments and bug reports or suggestions for improvement to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dsserif.doc.tlpobj new/tlpkg/tlpobj/dsserif.doc.tlpobj
--- old/tlpkg/tlpobj/dsserif.doc.tlpobj 2019-02-28 03:32:57.000000000 +0100
+++ new/tlpkg/tlpobj/dsserif.doc.tlpobj 2020-03-24 01:57:22.000000000 +0100
@@ -1,6 +1,6 @@
name dsserif.doc
category Package
-revision 47570
+revision 54512
shortdesc doc files of dsserif
relocated 1
docfiles size=72
++++++ dsserif.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/dsserif/DSSerif.map new/fonts/map/dvips/dsserif/DSSerif.map
--- old/fonts/map/dvips/dsserif/DSSerif.map 2018-05-02 22:46:57.000000000 +0200
+++ new/fonts/map/dvips/dsserif/DSSerif.map 2020-01-13 00:29:21.000000000 +0100
@@ -1,4 +1,4 @@
DSSerif DSSerif <DSSerif.pfb
-DSSerif-Bold DSSerif-Bold <DSSerif-Bold
+DSSerif-Bold DSSerif-Bold <DSSerif-Bold.pfb
DSSerifUni DSSerifUni <DSSerifUni.pfb
-DSSerifUni-Bold DSSerifUni-Bold <DSSerifUni-Bold
+DSSerifUni-Bold DSSerifUni-Bold <DSSerifUni-Bold.pfb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dsserif.tlpobj new/tlpkg/tlpobj/dsserif.tlpobj
--- old/tlpkg/tlpobj/dsserif.tlpobj 2019-02-28 03:32:57.000000000 +0100
+++ new/tlpkg/tlpobj/dsserif.tlpobj 2020-03-24 01:57:22.000000000 +0100
@@ -1,6 +1,6 @@
name dsserif
category Package
-revision 47570
+revision 54512
shortdesc A double-struck serifed font for mathematical use
relocated 1
longdesc DSSerif is a mathematical font package with double struck
@@ -26,7 +26,6 @@
RELOC/tex/latex/dsserif/dsserif.sty
RELOC/tex/latex/dsserif/udsserif.fd
catalogue-ctan /fonts/dsserif
-catalogue-date 2018-05-05 05:37:43 +0200
-catalogue-license ofllppllppl1.3
+catalogue-license ofl lppl lppl1.3
catalogue-topics font font-serif font-maths font-bbd font-type1
-catalogue-version 1.00
+catalogue-version 1.01
++++++ dtk.doc.tar.xz ++++++
Binary files old/doc/latex/dtk/doc/beispiel.pdf and new/doc/latex/dtk/doc/beispiel.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dtk/doc/dtk-extern-test.tex new/doc/latex/dtk/doc/dtk-extern-test.tex
--- old/doc/latex/dtk/doc/dtk-extern-test.tex 2019-04-05 23:13:17.000000000 +0200
+++ new/doc/latex/dtk/doc/dtk-extern-test.tex 2019-11-10 23:07:38.000000000 +0100
@@ -7,6 +7,7 @@
\makeatletter
\edef\dtkFileversion{\@nameuse{ver@dtk-extern}}
\makeatother
+
\begin{document}
\title[Externe Dokumente erzeugen]{\dtkFileversion~-- Externe Dokumente aus \LaTeX\ heraus definieren und das Ergebnis einbinden, }
\Author{Herbert}{Voß}{\Email{herbert(a)dante.de}}
@@ -85,6 +86,9 @@
\end{lstlisting}
\end{minipage}
+\end{document}
+
+
\begin{minipage}{0.35\textwidth}
\begin{externalDocument}[grfOptions={width=\linewidth},compiler=xelatex,
@@ -134,7 +138,6 @@
\begin{verbatim}
- showFilename=false,% show filename in the margin
code=false,% show Source Code
crop=false,% erzeugte PDF "croppen"
compiler=pdflatex,% zu verwendener Compiler
@@ -157,7 +160,6 @@
grfOptions={width=0.48\linewidth},
pages={1,3},
frame,compiler=pdflatex,
- showFilename,
% crop,
force,runs=2,code,docType=latex,
frame,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dtk/dtk-ruecken.tex new/doc/latex/dtk/dtk-ruecken.tex
--- old/doc/latex/dtk/dtk-ruecken.tex 2016-03-11 00:22:57.000000000 +0100
+++ new/doc/latex/dtk/dtk-ruecken.tex 2019-10-20 23:02:00.000000000 +0200
@@ -1,6 +1,6 @@
\documentclass[11pt,a4paper]{article}
\usepackage[T1]{fontenc}
-\usepackage{libertine}
+\usepackage{libertinus}
\oddsidemargin=-1in %
\unitlength=1mm %
\pagestyle{empty}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtk.doc.tlpobj new/tlpkg/tlpobj/dtk.doc.tlpobj
--- old/tlpkg/tlpobj/dtk.doc.tlpobj 2019-04-06 23:32:30.000000000 +0200
+++ new/tlpkg/tlpobj/dtk.doc.tlpobj 2020-03-04 23:50:35.000000000 +0100
@@ -1,9 +1,9 @@
name dtk.doc
category Package
-revision 50789
+revision 54080
shortdesc doc files of dtk
relocated 1
-docfiles size=31
+docfiles size=28
RELOC/doc/latex/dtk/README.md
RELOC/doc/latex/dtk/doc/beispiel.bib
RELOC/doc/latex/dtk/doc/beispiel.pdf
++++++ dtk.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk-author.clo new/tex/latex/dtk/dtk-author.clo
--- old/tex/latex/dtk/dtk-author.clo 2019-04-05 23:13:17.000000000 +0200
+++ new/tex/latex/dtk/dtk-author.clo 2019-08-09 23:03:53.000000000 +0200
@@ -14,7 +14,7 @@
%% version 2005/12/01 or later.
\ProvidesFile{dtk-author.clo}%
- [2017/12/16 v0.1c dtk class options for author mode (RN)]
+ [2016/02/15 v0.1b dtk class options for author mode (RN)]
\newcommand*\keywords[1]{}
\newcommand*\AutorenListe{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk-extern.sty new/tex/latex/dtk/dtk-extern.sty
--- old/tex/latex/dtk/dtk-extern.sty 2019-04-05 23:13:17.000000000 +0200
+++ new/tex/latex/dtk/dtk-extern.sty 2019-10-20 23:02:00.000000000 +0200
@@ -14,9 +14,9 @@
%% version 2005/12/01 or later.
\ProvidesFile{dtk-extern}%
- [2018/12/01 v0.12: dtk package for running external documents (HV)]
+ [2019/10/11 v0.15: dtk package for running external documents (HV)]
-\RequirePackage{shellesc,filecontents,xkeyval,graphicx,marginnote,fancyvrb}
+\RequirePackage{shellesc,xkeyval,graphicx,marginnote,fancyvrb}
\newcounter{dtk@extern@runs}
\newlength\dtk@extern@mpwidth \setlength\dtk@extern@mpwidth{\z@}
@@ -40,6 +40,7 @@
\define@boolkey{dtk}[dtk@extern@]{xindex}[true]{}
\define@key{dtk}{xindexOptions}[]{\def\dtk@extern@xindexOptions{#1}}
\define@boolkey{dtk}[dtk@extern@]{includegraphic}[true]{}
+\define@boolkey{dtk}[dtk@extern@]{inline}[true]{}
\define@boolkey{dtk}[dtk@extern@]{frame}[true]{}
\define@boolkey{dtk}[dtk@extern@]{float}[true]{}
\define@boolkey{dtk}[dtk@extern@]{cleanup}[true]{}
@@ -56,6 +57,7 @@
grfOptions={},% Optionen der einzubindenden Grafik
lstOptions={},% Optionen für das Listing
includegraphic=true,% Grafik einbinden oder User überlassen
+ inline=false,% Grafik nicht in derselben Zeile
runs=1,% Anzahl Compiler-Durchläufe
runsequence={},% Im Moment nicht aktiv
biber=false,% Biber laufen lassen?
@@ -85,7 +87,7 @@
\newcounter{dtk@example@counter}
-\newcommand\ExampleType[5]{%
+\newcommand\extern@ExampleType[5]{%
\ifdtk@extern@usefancyvrb
\@namedef{#1@initText}{\gdef\FancyVerbStartString{#2}\gdef\FancyVerbStopString{#3}}% text
\@namedef{#1@initPreamble}{\gdef\FancyVerbStartString{#4}\gdef\FancyVerbStopString{#5}}% code
@@ -95,13 +97,13 @@
\fi
}
-\ExampleType{latex}% #1
+\extern@ExampleType{latex}% #1
{\string\begin\string{document\string}}% #2
{\string\end\string{document\string}}% #3
{\perCent StartVisiblePreamble}% #4
{\perCent StopVisiblePreamble}% #5
-\ExampleType{context}
+\extern@ExampleType{context}
{\string\starttext}
{\string\stoptext}
{\perCent StartVisiblePreamble}
@@ -116,9 +118,9 @@
\global\setkeys{dtk}{#1}% \begin
\expandafter\IfFileExists\expandafter{\dtkExternDateiname.pdf}{}{\setkeys{dtk}{force}}%
\begingroup
- \(a)nameuse{filecontents*}{\dtkExternDateiname.tex}
+ \filecontents[force,noheader]{\dtkExternDateiname.tex}
}
- {\@nameuse{endfilecontents*}% \end
+ {\endfilecontents% \end
\ifdtk@extern@copyToExampleDir
\ShellEscape{cp\space\dtkExternDateiname.tex \dtk@extern@ExamplesDir/}%
\fi
@@ -187,7 +189,7 @@
\ifdim\dtk@extern@mpwidth>\z@
\hfill\minipage[t]{\dimexpr\linewidth-\dtk@extern@mpwidth-1em\relax}\vspace{0pt}
\else
- \par\begingroup
+ \ifdtk@extern@inline\else\par\fi\begingroup
\fi
\fi
\dtk@extern@align
@@ -210,7 +212,7 @@
\ifdim\dtk@extern@mpwidth>\z@
\endminipage
\else
- \par\endgroup
+ \ifdtk@extern@inline\else\par\fi\endgroup
\fi
\fi
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk-full.clo new/tex/latex/dtk/dtk-full.clo
--- old/tex/latex/dtk/dtk-full.clo 2019-04-05 23:13:17.000000000 +0200
+++ new/tex/latex/dtk/dtk-full.clo 2019-10-28 21:59:14.000000000 +0100
@@ -14,10 +14,10 @@
%% version 2005/12/01 or later.
\ProvidesFile{dtk-full.clo}%
- [2019/01/31 v0.1l dtk class options for full mode (RN)]
+ [2019/10/25 v0.1n dtk class options for full mode (RN)]
\@ifclasslater{scrbook}{2015/09/29}{}{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Die geladene Version der Dokumentenklasse `scrbook' \MessageBreak
(\KOMAScriptVersion) ist zu alt. \MessageBreak
Gefordert ist die Version 2015/09/29 oder jünger. \MessageBreak
@@ -205,14 +205,10 @@
\makeatletter
\ifdim\wd\DTK@tempbox>\z@
\scantokens{\protected@edef\x{%
- \noexpand\sindex[autoren]{#2#1@#1 #2!#3}}}%
+ \noexpand\sindex[autoren]{#2#1@#1 #2!#3}}\@empty}%
\x
\else
- \ifDTK@korr@
- \sindex[autoren]{#2#1@#1 #2!\textcolor{red}{\huge???}}%
- \else
- \sindex[autoren]{#2#1@#1 #2!\relax}%
- \fi
+ \sindex[autoren]{#2#1@#1 #2!\relax}%
\fi
\endgroup
}%
@@ -244,8 +240,7 @@
\filename@parse{#1}%
\edef\jobname{\filename@base}%
\@ifundefined{filename@ext}%
- {\IfFileExists{\jobname.tex}%
- {\edef\DTK@local@inputname{\jobname.tex}}{}}%
+ {\edef\DTK@local@inputname{\filename@base.tex}}%
{\edef\DTK@local@inputname{#1}}%
\let\AtBeginDocument=\AtEmbeddedBeginDocument
\let\AtEndDocument=\AtEmbeddedEndDocument
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk-logos.sty new/tex/latex/dtk/dtk-logos.sty
--- old/tex/latex/dtk/dtk-logos.sty 2019-04-05 23:13:17.000000000 +0200
+++ new/tex/latex/dtk/dtk-logos.sty 2019-10-28 21:59:14.000000000 +0100
@@ -4,7 +4,7 @@
%%
%% LaTeX Class for ``Die TeXnische Komoedie''.
%%
-%% Copyright (C) 2018
+%% Copyright (C) 2019
%% Herbert Voss
%%
%% It may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%
%
% -------------------------------------
-\ProvidesPackage{dtk-logos}[2018/10/19 v. 1.06 Dante Edition: Logos (hv)]
+\ProvidesPackage{dtk-logos}[2019/10/15 v. 1.09 Dante Edition: Logos (hv)]
%
\newif\if@dtk@newengine \@dtk@newenginetrue
\RequirePackage{ifluatex,ifxetex}
@@ -52,13 +52,23 @@
}%
\endgroup
}
+
+
\def\LaTeXTeX{\hologo{(La)TeX}}
+
+\def\AmS{\textsf{AMS}}
+\let\AMS\AmS
+%{\ifluatex\mathversion{XITS}\fi%
+% $\mathcal{A}$\kern-.1667em\lower.5ex\hbox{$\mathcal{M}$}\kern-.125em$\mathcal{S}$}}% $
+\def\amsmath{\AMS\textsf{math}}
\def\AmSLaTeX{\mbox{\textsf{AMS}-\hologo{LaTeX}}}
\def\AmSTeX{\mbox{\textsf{AMS}-\hologo{TeX}}}
\def\biber{\hologo{biber}}
\def\Biber{\Hologo{biber}}
-\def\BibTeX{\hologo{BibTeX}}
-\def\BibTeXacht{\hologo{BibTeX8}}
+\def\BibTeX{\@ifnextchar8\@@BibTeX\@BibTeX}
+\def\@BibTeX{{\hologoLogoSetup{BibTeX}{variant=sc}\hologo{BibTeX}}}
+\def\BibTeXacht{{\hologoLogoSetup{BibTeX8}{variant=sc}\hologo{BibTeX8}}}
+\def\@@BibTeX8{{\hologoLogoSetup{BibTeX8}{variant=sc}\hologo{BibTeX8}}}
\def\ConTeXt{\hologo{ConTeXt}}
\let\context\ConTeXt
\def\emTeX{\hologo{emTeX}}
@@ -108,8 +118,6 @@
\def\XeLaTeX{\hologo{XeLaTeX}}
\def\XeTeX{\hologo{XeTeX}}
%%
-\def\AmS{{\ifluatex\mathversion{XITS}\fi%
- $\mathcal{A}$\kern-.1667em\lower.5ex\hbox{$\mathcal{M}$}\kern-.125em$\mathcal{S}$}}% $
%
\newcommand\BibTool{\textsc{Bib\hskip-.1em
T\hskip-.15emo\hskip-.05emo\hskip-.05eml}\xspace}
@@ -127,6 +135,7 @@
\providecommand\TUGboat{\textsl{TUGboat}}
\let\DANTE\dantelogo
\def\pgf/tikz{\textsf{pgf/Ti\textit{k}Z}}
+\def\pgftikz{\textsf{pgf/Ti\textit{k}Z}}
\def\TeXLive{\TeX{}Live\xspace}
\def\BibLaTeX{Bib\hologo{LaTeX}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk-new-engines.clo new/tex/latex/dtk/dtk-new-engines.clo
--- old/tex/latex/dtk/dtk-new-engines.clo 2019-04-05 23:13:17.000000000 +0200
+++ new/tex/latex/dtk/dtk-new-engines.clo 2019-10-20 23:02:00.000000000 +0200
@@ -18,7 +18,7 @@
\typeout{NEW-ENGINE}
-\RequirePackage{fontspec}
+\RequirePackage[no-math]{fontspec}
\RequirePackage{unicode-math}
\ifluatex
@@ -41,13 +41,22 @@
* File `dtk-fonts.cfg' used.^^J%
*************************************}%
}{%
+ \typeout{*************************************^^J%
+ * Using libertinus-otf *^^J%
+ *************************************}%
\RequirePackage{libertinus-otf}%
\def\DTKrmFontName{Libertinus Serif}%
\def\DTKsfFontName{Libertinus Sans Serif}%
% \setmathfont{XITSMath}[Scale=0.9,math-style=TeX,bold-style=TeX]%
\def\DTKmathFontName{Libertinus Math}%
- \setmonofont{AnonymousPro}[Scale=MatchLowercase,FakeStretch=0.87,
- RawFeature=-tlig]%
+ \setmonofont{AnonymousPro}[
+ Scale = MatchLowercase,FakeStretch=0.87,
+ RawFeature = -tlig,
+ UprightFont =*-Regular,
+ BoldFont = *-Bold,
+ BoldItalicFont = *-BoldItalic,
+ ItalicFont = *-Italic,
+ Extension = .ttf]%
\def\DTKttFontName{Anonymous Pro}%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk-url.sty new/tex/latex/dtk/dtk-url.sty
--- old/tex/latex/dtk/dtk-url.sty 2019-04-05 23:13:17.000000000 +0200
+++ new/tex/latex/dtk/dtk-url.sty 2019-12-04 23:22:32.000000000 +0100
@@ -2,7 +2,7 @@
%%
%% LaTeX Class for ``Die TeXnische Komoedie''.
%%
-%% Copyright (C) 2015-
+%% Copyright (C) 2015-2019
%% Rolf Niepraschk, Herbert Voss
%%
%% It may be distributed and/or modified under the
@@ -14,17 +14,19 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dtk-url}[2016/04/23 v1.2 Urls for DTK (HO,hv)]
-%% 1.1 hv
+\ProvidesPackage{dtk-url}[2019/12/04 v1.5 Urls (qrcode) for DTK (HO,hv,rn)]
\RequirePackage{url}[2006/04/12]
+\RequirePackage{xcolor}
+\RequirePackage{xkeyval}
+\RequirePackage{hvqrurl}
% Konfiguration:
\newcommand*{\DTK@UrlSetup}{\urlstyle{tt}}
\newcommand*{\DTK@UrlCtanSetup}{}
\newcommand*{\DTK@UrlEmailSetup}{}
\newcommand*{\DTK@UrlCtanPrefix}{CTAN:}
-\newcommand*{\DTK@UrlCtanServerPrefix}{http://mirror.ctan.org/}
+\newcommand*{\DTK@UrlCtanServerPrefix}{https://mirror.ctan.org/}
\newcommand*{\DTK(a)UrlFile}{\jobname.urls}
% Schalter \ifDTK@Url@ legt fest, wann die URLs aktiv sein sollen
@@ -180,4 +182,5 @@
{\@percentchar#1}%
}%
}
+
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk.bbx new/tex/latex/dtk/dtk.bbx
--- old/tex/latex/dtk/dtk.bbx 2019-04-05 23:13:17.000000000 +0200
+++ new/tex/latex/dtk/dtk.bbx 2019-08-09 23:03:53.000000000 +0200
@@ -180,6 +180,51 @@
\usebibmacro{finentry}}
%
+\DeclareBibliographyDriver{book}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/translator+others}%
+ \setunit{\labelnamepunct}\newblock
+ \usebibmacro{maintitle+title}%
+ \newunit
+ \usebibmacro{byauthor}%
+ \newunit\newblock
+ \usebibmacro{byeditor+others}%
+ \newunit\newblock
+ \newunit
+ \printfield{volumes}%
+ \newunit\newblock
+ \usebibmacro{series+number}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \usebibmacro{publisher+location+date}%
+ \newunit\newblock
+ \usebibmacro{chapter+pages}%
+ \newunit
+ \printfield{pagetotal}%
+ \newunit\newblock
+ \iftoggle{bbx:isbn}
+ {\printfield{isbn}}
+ {}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newunit\newblock
+ \usebibmacro{addendum+pubstate}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}%
+}
+
+
+
+
+
%\setlength\labelnumberwidth{1.5em}
%\setlength\biblabelsep{1em}
\defbibenvironment{dtk@bib}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtk/dtk.cls new/tex/latex/dtk/dtk.cls
--- old/tex/latex/dtk/dtk.cls 2019-04-05 23:13:17.000000000 +0200
+++ new/tex/latex/dtk/dtk.cls 2019-12-04 23:22:32.000000000 +0100
@@ -2,7 +2,7 @@
%%
%% LaTeX Class for ``Die TeXnische Komoedie''.
%%
-%% Copyright (C) 2015-
+%% Copyright (C) 2015-2019
%% Rolf Niepraschk, Herbert Voss
%%
%% It may be distributed and/or modified under the
@@ -28,11 +28,17 @@
\HyphSubstIfExists{german-x-latest}{%
\HyphSubstLet{german}{german-x-latest}}{}
-\def\DTKversion{2.08a}
-\def\DTKversiondate{2019/01/31}
+\def\DTKversion{2.08g}
+\def\DTKversiondate{2019/12/04}
\ProvidesClass{dtk}[\DTKversiondate v\DTKversion dtk documentclass (RN)]
-\RequirePackage{ifxetex,ifluatex,ifpdf,ifvtex,luatex85}
+\@ifpackagelater{iftex}{2019/10/24}{%
+ \RequirePackage{ifxetex,ifluatex,ifpdf,ifvtex}
+}{%
+ \RequirePackage{iftex}
+}
+\RequirePackage{luatex85}
+
\newcommand*\DTK@engine{}
\ifluatex
@@ -155,6 +161,9 @@
\widowpenalty = 10000 %
\raggedbottom
+\setlength\textfloatsep{10.0pt plus 1pt minus 1pt}
+\setlength\intextsep{6.0pt plus .5pt minus .5pt}
+
\setcounter{secnumdepth}{\numexpr\partnumdepth-1\relax}
\setcounter{tocdepth}{\chapternumdepth}
@@ -166,13 +175,13 @@
\RequirePackage[english,main=ngerman]{babel}
\defineshorthand{"|}{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Shorthand `\string"|' wird nicht unterstützt! Entferne `\string"|'%
}{}%
}
\newcommand*\DTK@FontNameMissing{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Eines der Makros `\string\DTKrmFontName', `\string\DTKsfFontName',
\MessageBreak
`\string\DTKttFontName' oder `\string\DTKmathFontName'
@@ -368,13 +377,13 @@
\@ifundefined{ifDTKrecord}{\newif\ifDTKrecord \DTKrecordfalse}{}
\newcommand*\address[3]{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Das Makro \string\address\space existiert nicht mehr!\MessageBreak
Nimm stattdessen \string\Author%
\string{Vorn.\string}\string{Nachn.\string}\string{Adr.\string}}{}%
}%
\def\author#1{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Das Makro \string\author\space existiert nicht mehr!\MessageBreak
Nimm stattdessen \string\Author%
\string{Vorn.\string}\string{Nachn.\string}\string{Adr.\string}}{}%
@@ -404,7 +413,7 @@
\AfterEndPreamble{% "etoolbox"
\def\bibliography#1{%
- \ClassError{dtk2}{%
+ \ClassError{dtk}{%
Das Makro `\string\bibliography' wird nicht unterstützt!\MessageBreak
Verwende stattdessen `\string\addbibresource\string{#1.bib\string}'
\MessageBreak
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtk.tlpobj new/tlpkg/tlpobj/dtk.tlpobj
--- old/tlpkg/tlpobj/dtk.tlpobj 2019-04-06 23:32:30.000000000 +0200
+++ new/tlpkg/tlpobj/dtk.tlpobj 2020-03-04 23:50:35.000000000 +0100
@@ -1,6 +1,6 @@
name dtk
category Package
-revision 50789
+revision 54080
shortdesc Document class for the journal of DANTE
relocated 1
longdesc The bundle provides a class and style file for typesetting "Die
@@ -22,7 +22,6 @@
catalogue-contact-bugs https://github.com/rolfn/dtk/issues
catalogue-contact-repository https://github.com/rolfn/dtk
catalogue-ctan /usergrps/dante/dtk
-catalogue-date 2019-04-05 18:58:50 +0200
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
catalogue-topics journalpub class
-catalogue-version 2.08a
+catalogue-version 2.08g
++++++ dtl.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/dt2dv.man1.pdf and new/texmf-dist/doc/man/man1/dt2dv.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/dv2dt.man1.pdf and new/texmf-dist/doc/man/man1/dv2dt.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtl.doc.tlpobj new/tlpkg/tlpobj/dtl.doc.tlpobj
--- old/tlpkg/tlpobj/dtl.doc.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/dtl.doc.tlpobj 2019-11-19 01:55:39.000000000 +0100
@@ -1,6 +1,6 @@
name dtl.doc
category TLCore
-revision 50602
+revision 52851
shortdesc doc files of dtl
docfiles size=21
texmf-dist/doc/man/man1/dt2dv.1
++++++ dtxdescribe.doc.tar.xz ++++++
Binary files old/doc/latex/dtxdescribe/dtxdescribe.pdf and new/doc/latex/dtxdescribe/dtxdescribe.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtxdescribe.doc.tlpobj new/tlpkg/tlpobj/dtxdescribe.doc.tlpobj
--- old/tlpkg/tlpobj/dtxdescribe.doc.tlpobj 2019-03-24 02:24:12.000000000 +0100
+++ new/tlpkg/tlpobj/dtxdescribe.doc.tlpobj 2019-07-17 01:53:07.000000000 +0200
@@ -1,8 +1,8 @@
name dtxdescribe.doc
category Package
-revision 50532
+revision 51652
shortdesc doc files of dtxdescribe
relocated 1
-docfiles size=87
+docfiles size=83
RELOC/doc/latex/dtxdescribe/README.txt
RELOC/doc/latex/dtxdescribe/dtxdescribe.pdf
++++++ dtxdescribe.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dtxdescribe/dtxdescribe.sty new/tex/latex/dtxdescribe/dtxdescribe.sty
--- old/tex/latex/dtxdescribe/dtxdescribe.sty 2019-03-22 21:48:45.000000000 +0100
+++ new/tex/latex/dtxdescribe/dtxdescribe.sty 2019-07-16 23:13:53.000000000 +0200
@@ -18,7 +18,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{dtxdescribe}
- [2019/03/22 v1.01 Describe additional object types in dtx source files.]
+ [2019/07/16 v1.02 Describe additional object types in source files.]
@@ -93,6 +93,15 @@
+
+\AtBeginDocument{
+ \@ifpackageloaded{makeidx}{}{
+ \@ifpackageloaded{splitidx}{}{
+ \RequirePackage{makeidx}
+ \makeindex
+ }}
+}
+
\RequirePackage{etoolbox}[2011/01/03]%
\RequirePackage{xparse}
@@ -112,55 +121,60 @@
\RequirePackage{xstring}
\AtBeginDocument{
-\pdfstringdefDisableCommands{
-\def\quad{ }
-\def\\{ }
-\def\pkg#1{#1}
-\def\ctr#1{#1}
-\def\bool#1{#1}
-\def\optn#1{#1}
-\def\env#1{#1}
-\def\cs#1{\textbackslash#1}
-\def\,{ }
-\def\LuaLaTeX{LuaLaTeX}
-\def\XeLaTeX{XeLaTeX}
-\def\TeX{TeX}
-\def\LaTeX{LaTeX}
-\def\LaTeXe{LaTeX2e}
-\def\LuaTeX{LuaTeX}
-\def\LuaLaTeX{LuaLaTeX}
-\def\XeTeX{XeTeX}
-\def\AmS{AMS}
-\def\Dash{ --- }
-\def\dash{ -- }
-\def\Slash{/}
-\def\prog#1{\detokenize{#1}}
-\def\progcode#1{#1}
-\def\filenm#1{\detokenize{#1}}
-\def\brand#1{#1}
-\def\acro#1{#1}
-\def\HTML{HTML}
-\def\ODT{ODT}
-\def\SVG{SVG}
-\def\PNG{PNG}
-\def\GIF{GIF}
-\def\JPG{JPG}
-\def\EPS{EPS}
-\def\PDF{PDF}
-\def\DVI{DVI}
-\def\UTF{UTF}
-\def\URL{URL}
-\def\element#1{#1}
-\def\attribute#1{#1}
-\def\HTML{HTML}
-\def\HTMLfive{HTML5}
-\def\CSS{CSS}
-\def\CSSthree{CSS3}
-\def\EPUB{EPUB}
-\def\TOC{TOC}
-\def\LOF{LOF}
-\def\LOT{LOT}
-}
+ \@ifpackageloaded{hyperref}{
+ \pdfstringdefDisableCommands{%
+ \def\quad{ }%
+ \def\\{ }%
+ \def\pkg#1{#1}%
+ \def\ctr#1{#1}%
+ \def\bool#1{#1}%
+ \def\optn#1{#1}%
+ \def\env#1{#1}%
+ \def\cs#1{\textbackslash#1}%
+ \def\,{ }%
+ \def\LuaLaTeX{LuaLaTeX}%
+ \def\XeLaTeX{XeLaTeX}%
+ \def\TeX{TeX}%
+ \def\LaTeX{LaTeX}%
+ \def\LaTeXe{LaTeX2e}%
+ \def\LuaTeX{LuaTeX}%
+ \def\LuaLaTeX{LuaLaTeX}%
+ \def\XeTeX{XeTeX}%
+ \def\AmS{AMS}%
+ \def\Dash{ --- }%
+ \def\dash{ -- }%
+ \def\Slash{/}%
+ \def\prog#1{\detokenize{#1}}%
+ \def\progcode#1{#1}%
+ \def\filenm#1{\detokenize{#1}}%
+ \def\brand#1{#1}%
+ \def\acro#1{#1}%
+ \def\HTML{HTML}%
+ \def\ODT{ODT}%
+ \def\SVG{SVG}%
+ \def\PNG{PNG}%
+ \def\GIF{GIF}%
+ \def\JPG{JPG}%
+ \def\EPS{EPS}%
+ \def\PDF{PDF}%
+ \def\DVI{DVI}%
+ \def\UTF{UTF}%
+ \def\URL{URL}%
+ \def\element#1{#1}%
+ \def\attribute#1{#1}%
+ \def\HTML{HTML}%
+ \def\HTMLfive{HTML5}%
+ \def\CSS{CSS}%
+ \def\CSSthree{CSS3}%
+ \def\EPUB{EPUB}%
+ \def\TOC{TOC}%
+ \def\LOF{LOF}%
+ \def\LOT{LOT}%
+ }
+ }
+ {
+ \newcommand*{\hyperpage}[1]{#1}
+ }
}
@@ -178,21 +192,88 @@
\end{picture}
}
+\@ifpackageloaded{doc}{
+ \newcommand*{\DTXD@gobble}{2}
+}{
+ \newcommand*{\DTXD@gobble}{0}
+}
+
\setlength{\marginparsep}{1em}
\setlength{\marginparpush}{.7ex}
\setlength{\parindent}{0em}
\setlength{\parskip}{2ex}
+\ifdef{\IndexMin}
+ {\setlength{\IndexMin}{40ex}}
+ {\newlength{\IndexMin}}
+
+\@ifclassloaded{ltxdoc}{}{
+ \def\cmd#1{\cs{\expandafter\cmd@to@cs\string#1}}
+ \def\cmd@to@cs#1#2{\char\number`#2\relax}
+ \DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
+ \providecommand\marg[1]{%
+ {\ttfamily\char`\{}\meta{#1}{\ttfamily\char`\}}}
+ \providecommand\oarg[1]{%
+ {\ttfamily[}\meta{#1}{\ttfamily]}}
+ \providecommand\parg[1]{%
+ {\ttfamily(}\meta{#1}{\ttfamily)}}
+ \providecommand\url{\texttt}
+}
-\setlength{\IndexMin}{40ex}
+\AtBeginDocument{
+ \@ifpackageloaded{doc}{}{
+ \newenvironment*{macro}[1]{%
+ \PackageError{dtxdescribe}
+ {The 'macro' environment is only\MessageBreak
+ available when using the doc package\MessageBreak
+ with a .dtx source file}
+ {This environment only makes sense for .dtx source.}
+ }{}
+ \newenvironment*{environment}[1]{%
+ \PackageError{dtxdescribe}
+ {The 'environment' environment is only\MessageBreak
+ available when using the doc package\MessageBreak
+ with a .dtx source file}
+ {This environment only makes sense for .dtx source.}
+ }{}
+ \def\MacroFont{\fontencoding\encodingdefault
+ \fontfamily\ttdefault
+ \fontseries\mddefault
+ \fontshape\updefault
+ \small}%
+ \@ifundefined{actualchar}{\def\actualchar{@}}{}
+ \@ifundefined{quotechar}{\def\quotechar{"}}{}
+ \@ifundefined{levelchar}{\def\levelchar{!}}{}
+ \@ifundefined{encapchar}{\def\encapchar{|}}{}
+ \@ifundefined{verbatimchar}{\def\verbatimchar{+}}{}
+ \setlength\marginparpush{0pt} \setlength\marginparwidth{8pc}
+ \reversemarginpar
+ \DeclareRobustCommand\meta[1]{%
+ \ensuremath\langle
+ \ifmmode \expandafter \nfss@text \fi
+ {%
+ \meta@font@select
+ \edef\meta@hyphen@restore
+ {\hyphenchar\the\font\the\hyphenchar\font}%
+ \hyphenchar\font\m@ne
+ \language\l@nohyphenation
+ #1\/%
+ \meta@hyphen@restore
+ }\ensuremath\rangle
+ }
+ \def\meta@font@select{\itshape}
+ }
+}
+\providecommand*{\PrintEnvName}{}
\renewcommand*{\PrintEnvName}[1]
{\strut{\scriptsize{}Env}\quad\MacroFont#1\ }
\newcommand*{\DTXD@printtype}[1]
{\raggedleft\strut{\scriptsize\sffamily#1}\quad\MacroFont}
+\providecommand{\usage}{}
\renewcommand{\usage}[1]{\textit{\hyperpage{#1}}}
\let\DTXD@origwrindex\@wrindex
@@ -277,6 +358,7 @@
}
+\providecommand*{\DescribeMacro}{}
\renewcommand*{\DescribeMacro}[2][]{%
\@bsphack%
\@ifundefined{@captype}{% not float?
@@ -305,6 +387,7 @@
\ignorespaces%
}
+\providecommand*{\DescribeEnv}{}
\renewcommand*{\DescribeEnv}[2][]
{\DTXD@margintagindex{#1}{#2}{Env}{environment}{usage}}
@@ -371,6 +454,7 @@
\@bsphack%
\leavevmode%
\marginpar{%
+ \raggedleft%
\ifblank{#1}{}{\raggedleft{\scriptsize[#1]} }
\texttt{#2}%
}%
@@ -395,12 +479,14 @@
}%
}%
\@esphack%
+\ignorespaces%
}
\newcommand*{\DescribeOther}[2][]{%
\@ifundefined{@captype}{% not float?
\@bsphack%
\leavevmode%
\marginpar{%
+ \raggedleft%
\ifblank{#1}{}{\raggedleft{\scriptsize[#1]} }%
#2%
}%
@@ -417,6 +503,7 @@
\DTXD@origwrindex{#1\actualchar[#1]:\levelchar#2\encapchar usage}%
}%
\@esphack%
+\ignorespaces%
}
@@ -573,10 +660,9 @@
\newcommand*{\dtxexampleresultname}{Result:}
-
\NewDocumentEnvironment{dtxexample}{s +O{} m}
{% start dtxexample
-\VerbatimOut[gobble=2,tabsize=4]{dtxexample_cut.tex}%
+\VerbatimOut[gobble=\DTXD(a)gobble,tabsize=4]{dtxexample_cut.tex}%
}% start dtxexample
{% end dtxexample
\endVerbatimOut
@@ -645,11 +731,11 @@
\newcommand*{\fqqquad}{\hspace*{3em}}
\DefineVerbatimEnvironment{sourceverb}{Verbatim}
- {gobble=2,tabsize=4,xleftmargin=2em}
+ {gobble=\DTXD@gobble,tabsize=4,xleftmargin=2em}
\BeforeBeginEnvironment{sourceverb}{\vspace*{-.5\parskip}}
-\DefineVerbatimEnvironment{fsourceverb}{Verbatim}
- {gobble=2,tabsize=4,xleftmargin=2em,frame=lines}
+ \DefineVerbatimEnvironment{fsourceverb}{Verbatim}
+ {gobble=\DTXD@gobble,tabsize=4,xleftmargin=2em,frame=lines}
\BeforeBeginEnvironment{fsourceverb}{\vspace*{-.5\parskip}}
\newenvironment{sourcedisplay}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtxdescribe.tlpobj new/tlpkg/tlpobj/dtxdescribe.tlpobj
--- old/tlpkg/tlpobj/dtxdescribe.tlpobj 2019-03-24 02:24:12.000000000 +0100
+++ new/tlpkg/tlpobj/dtxdescribe.tlpobj 2019-07-17 01:53:07.000000000 +0200
@@ -1,13 +1,15 @@
name dtxdescribe
category Package
-revision 50532
+revision 51652
shortdesc Describe additional object types in dtx source files
relocated 1
longdesc The doc package includes tools for describing macros and
-longdesc environments in LaTeX source dtx format. The package adds
-longdesc additional tools for describing booleans, lengths, counters,
-longdesc keys, packages, classes, options, files, commands, arguments,
-longdesc and other objects. Each item is given a margin tag similar to
+longdesc environments in LaTeX source .dtx format. The dtxdescribe
+longdesc package adds additional tools for describing booleans, lengths,
+longdesc counters, keys, packages, classes, options, files, commands,
+longdesc arguments, and other objects, and also works with the standard
+longdesc document classes as well, for those who do not wish to use the
+longdesc .dtx format. Each item is given a margin tag similar to
longdesc \DescribeEnv, and is listed in the index by itself and also by
longdesc category. Each item may be sorted further by an optional class.
longdesc All index entries except code lines are hyperlinked. The
@@ -26,7 +28,7 @@
catalogue-also doc
catalogue-contact-home http://bdtechconcepts.com
catalogue-ctan /macros/latex/contrib/dtxdescribe
-catalogue-date 2019-03-22 19:35:49 +0100
+catalogue-date 2019-07-16 13:01:49 +0200
catalogue-license lppl1.3
catalogue-topics doc-supp
-catalogue-version 1.01
+catalogue-version 1.02
++++++ dtxgen.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/dtxgen/README new/texmf-dist/doc/support/dtxgen/README
--- old/texmf-dist/doc/support/dtxgen/README 2015-09-21 00:31:59.000000000 +0200
+++ new/texmf-dist/doc/support/dtxgen/README 2019-07-18 22:34:08.000000000 +0200
@@ -1,13 +1,11 @@
-|
--------:|:--------------------------------------
- script:| dtxgen - generate template for LaTeX self-extracting .dtx file
- type:| bash
- author:| Wybo Dekker
- email:| wybo(a)dekkerdocumenten.nl
-version:| 1.07
-license:| Released under the GNU General Public License
-
+ script: dtxgen - generate template for LaTeX self-extracting .dtx file
+ type: bash
+ author: Wybo Dekker
+ email: wybo(a)dekkerdocumenten.nl
+version: 1.08
+license: GNU General Public License
+--------------------------------------------------------------------------------
dtxgen creates a template for a self-extracting .dtx file, based on the model described by
-U{www.texdev.net/2009/10/06/a-model-dtx-file/}{Joseph Wright}. It is useful for
+[Joseph Wright](www.texdev.net/2009/10/06/a-model-dtx-file/). It is useful for
those who plan to create a new Documented LaTeX Source (.dtx) file.
Binary files old/texmf-dist/doc/support/dtxgen/dtxgen.pdf and new/texmf-dist/doc/support/dtxgen/dtxgen.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtxgen.doc.tlpobj new/tlpkg/tlpobj/dtxgen.doc.tlpobj
--- old/tlpkg/tlpobj/dtxgen.doc.tlpobj 2019-02-28 03:33:00.000000000 +0100
+++ new/tlpkg/tlpobj/dtxgen.doc.tlpobj 2019-07-20 01:53:10.000000000 +0200
@@ -1,7 +1,7 @@
name dtxgen.doc
category Package
-revision 38419
+revision 51663
shortdesc doc files of dtxgen
-docfiles size=13
+docfiles size=15
texmf-dist/doc/support/dtxgen/README
texmf-dist/doc/support/dtxgen/dtxgen.pdf
++++++ dtxgen.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/dtxgen/dtxgen new/texmf-dist/scripts/dtxgen/dtxgen
--- old/texmf-dist/scripts/dtxgen/dtxgen 2015-09-21 00:31:59.000000000 +0200
+++ new/texmf-dist/scripts/dtxgen/dtxgen 2019-07-18 22:34:08.000000000 +0200
@@ -1,28 +1,28 @@
#!/bin/bash
-version=1.07
-myname=$(basename "$0")
+Version=1.08
+Myname="${0##*/}"
-<<'DOC'
+:<<'DOC'
= dtxgen - generate template for LaTeX self-extracting .dtx file
= Synopsis
dtxgen [options] basename.[sty,cls]
-Options:
+== Options
-h,--help print short help and exit
-H,--Help print full documentation via less and exit
-V,--version print version and exit
-s,--short short, one-liner, package description
-d,--date initial version's date. Default: current date
--m,--mail your email address. Default: $MAIL
--n,--name your name. Default: $NAME
+-m,--mail your email address. Default: |$EMAIL|
+-n,--name your name. Default: |$NAME|
-c,--class (class packs only) class to be preloaded. Default: article
-q,--quiet run quietly
= Description
dtxgen creates a template for a self-extracting .dtx file, based on the model described by
-U{www.texdev.net/2009/10/06/a-model-dtx-file/}{Joseph Wright}. It is useful for
+[Joseph Wright](www.texdev.net/2009/10/06/a-model-dtx-file/). It is useful for
those who plan to create a new Documented LaTeX Source (.dtx) file.
Usage example:
@@ -94,21 +94,20 @@
install install in the local TeX tree (uses sudo)
zip produce a zip file ready for upload to CTAN
-= Author and copyright
-Author Wybo Dekker
-Email U{Wybo@dekkerdocumenten.nl}{wybo@dekkerdocumenten.nl}
-License Released under the U{www.gnu.org/copyleft/gpl.html}{GNU General Public License}
+= Author
+[Wybo Dekker](wybo(a)dekkerdocumenten.nl)
+
+= Copyright
+Released under the [GNU General Public License](www.gnu.org/copyleft/gpl.html)
DOC
- die() { echo -e "$myname: $Err${*}$Nor" 1>&2; exit 1; }
- help() { sed -n '/^= Synopsis/,/^= /p' "$0"|sed '1s/.*/Usage:/;/^= /d'; exit; }
-helpall() { sed -n '/^<<.DOC.$/,/^DOC$/p' "$0"|sed -n '1d;$d;p'|less; exit; }
-version() { echo $version; exit; }
-install() { which instscript>&/dev/null && instscript --zip --pdf --markdown "$myname"; exit; }
-
-Nor='\e[0m' # reset color ]
-Err='\e[31;1m' # light red ]
-[[ ${BASH_VERSINFO[0]} -ge 4 ]] || die "Need bash version >= 4 (you have $BASH_VERSION)"
+# check executables and versions of bash and getopt
+((BASH_VERSINFO>=4)) || die "Need bash version >= 4"
+for i in getopt make; do
+ command -v "$i" &> /dev/null || die "$i: command not found"
+done
+i=$(getopt -T)
+{ (($?==4)) && [[ -z $i ]]; } || die "Your getopt is not GNU"
# using the label in arg 2, read template from my self, filter it
# through the script in arg 1, and write the output to the file in arg 3.
@@ -116,11 +115,22 @@
function createfile {
file=$3
test "$file" = "" && file=$2
- sed -n "/^<<'$2'/,/^$2/p" "$0" |tail -n +2 |head -n -1 |sed "$1" >"$file"
+ sed -n "/^:<<'$2'/,/^$2/p" "$0" |tail -n +2 |head -n -1 |sed "$1" >"$file"
}
+REd='\e[38;5;9m'
+ die() { local i; for i; do echo -e "$Myname: $REd$i"; done 1>&2; exit 1; }
+helpsrt() { sed -n '/^= Synopsis/,/^= /p' "$0"|sed '1d;$d'; exit; }
+instscr() { instscript --zip --pdf "$Myname"; exit; }
+
+# shellcheck disable=SC2154
+helpall() { sed -n "/^:<<'DOC'$/,/^DOC/p" "$0"|sed -n '1d;$d;p'|
+ less -Ps"$Myname-${Version/./·} documentation - type h for help, q to quit."
+ exit
+ }
+
if ! options=$(getopt \
- -n "$myname" \
+ -n "$Myname" \
-o s:n:m:c:d:hHVqI \
-l short:,name:,mail:,class:,date:,help,Help,version,quiet -- "$@"
); then exit 1; fi
@@ -129,13 +139,14 @@
while [ $# -gt 0 ]; do
case $1 in
(-h|--help) # print short help and exit
- help
+ helpsrt
;;
(-H|--Help) # print full documentation via less and exit
helpall
;;
(-V|--version) # print version and exit
- version
+ echo $Version
+ exit
;;
(-s|--short) # short, one-liner, package description
short=$2
@@ -145,7 +156,7 @@
date=$2
shift 2
;;
- (-m|--mail) # your email address. Default: $MAIL
+ (-m|--mail) # your email address. Default: $EMAIL
mail=$2
shift 2
;;
@@ -161,7 +172,7 @@
quiet=--quiet
shift
;;
- (-I) install
+ (-I) instscr
;;
(--) shift
break
@@ -206,7 +217,7 @@
shrt=$(sed 's/\\[[:alpha:]]\\+{\\([^}]*\\)}/\\1/g;s/\\//g' <<<"$short")
# Any \'s in the short description need to be duplicated for the script:
-short=$(sed 's/\\/\\\\/g' <<<"$short")
+short="${short//\\/\\\\}"
test -z "$mail" && die "author's email not set - use option or environment variable EMAIL"
test -z "$name" && die "author's name not set - use option or environment variable NAME"
@@ -224,20 +235,16 @@
[See]='http://www.latex-project.org/lppl.txt'
)
-readme=()
-
for i in $kopl $base Author E-mail License See; do
- readme+="$(printf "%*s:| %s°" $colw "$i" "${rm[$i]}")"
+ readme+="$(printf "%*s:| %s\\\\n" $colw "$i" "${rm[$i]}")"
done
# make sed script replacing the variables in the templates:
sedscript=''
-for i in readme base year ext mail use typ Typ name date short shrt lcl; do
- eval v="\$$i"
- test $quiet || echo "$i $v"|sed 's/\\\\/\\/g;s=°=\n=g'
- sedscript="${sedscript}s=%$i%=$v=g;"
+for i in base year ext mail use typ Typ name date short shrt lcl readme; do
+ test $quiet || eval "echo -e \"$i \$$i\""|sed 's/\\\\/\\/g'
+ eval "sedscript+=\"s=%$i%=\$$i=g;\""
done
-sedscript+='s=°=\n=g'
createfile "$sedscript" Makefile
createfile "$sedscript" DTX "$base.dtx"
@@ -245,7 +252,7 @@
exit 0
# ---- TEMPLATES: ----
-<<'Makefile'
+:<<'Makefile'
NAME = %base%
SHELL = bash
PWD = $(shell pwd)
@@ -280,7 +287,7 @@
rm $(NAME)
Makefile
-<<'DTX'
+:<<'DTX'
% \iffalse meta-comment
% vim: textwidth=75
%<*internal>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dtxgen.tlpobj new/tlpkg/tlpobj/dtxgen.tlpobj
--- old/tlpkg/tlpobj/dtxgen.tlpobj 2019-02-28 03:33:00.000000000 +0100
+++ new/tlpkg/tlpobj/dtxgen.tlpobj 2019-07-20 01:53:10.000000000 +0200
@@ -1,6 +1,6 @@
name dtxgen
category Package
-revision 38419
+revision 51663
shortdesc Creates a template for a self-extracting .dtx file
longdesc The bash script dtxgen creates a template for a self-extracting
longdesc .dtx file. It is useful for those who plan to create a new
@@ -9,7 +9,7 @@
runfiles size=4
texmf-dist/scripts/dtxgen/dtxgen
catalogue-ctan /support/dtxgen
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-07-18 06:31:32 +0200
catalogue-license gpl
catalogue-topics file-mgmt
-catalogue-version 1.07
+catalogue-version 1.08
++++++ ducksay.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ducksay/README.md new/doc/latex/ducksay/README.md
--- old/doc/latex/ducksay/README.md 2019-01-08 22:54:40.000000000 +0100
+++ new/doc/latex/ducksay/README.md 2020-02-01 23:14:47.000000000 +0100
@@ -9,7 +9,7 @@
This work is "maintained" (as per LPPL maintenance status) by
Jonathan P. Spratte.
-Copyright (C) 2017-2019 by Jonathan P. Spratte
+Copyright (C) 2017-2020 by Jonathan P. Spratte
The package draws ASCII art of animals saying a specified message. The following
macros are available:
Binary files old/doc/latex/ducksay/ducksay.pdf and new/doc/latex/ducksay/ducksay.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ducksay.doc.tlpobj new/tlpkg/tlpobj/ducksay.doc.tlpobj
--- old/tlpkg/tlpobj/ducksay.doc.tlpobj 2019-02-28 03:33:01.000000000 +0100
+++ new/tlpkg/tlpobj/ducksay.doc.tlpobj 2020-02-02 01:58:13.000000000 +0100
@@ -1,8 +1,8 @@
name ducksay.doc
category Package
-revision 49691
+revision 53631
shortdesc doc files of ducksay
relocated 1
-docfiles size=127
+docfiles size=119
RELOC/doc/latex/ducksay/README.md
RELOC/doc/latex/ducksay/ducksay.pdf
++++++ ducksay.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ducksay/ducksay.animals.tex new/tex/latex/ducksay/ducksay.animals.tex
--- old/tex/latex/ducksay/ducksay.animals.tex 2019-01-14 00:31:16.000000000 +0100
+++ new/tex/latex/ducksay/ducksay.animals.tex 2020-02-01 23:14:47.000000000 +0100
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% --------------------------------------------------------------
%%
-%% Copyright (C) 2017-2019 Jonathan P. Spratte
+%% Copyright (C) 2017-2020 Jonathan P. Spratte
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this license or
@@ -32,7 +32,9 @@
%% ducksay.code.v2.tex and
%% ducksay.animals.tex.
%%
-\AddAnimal{duck}%>>>
+\ProvidesFile{ducksay.animals.tex}
+ [\ducksay@date\space v\ducksay@version\space ducksay animals]
+\AddAnimal{duck}%>>=
{ \
\ __
>(' )
@@ -40,42 +42,42 @@
/(
/ `----/
\ ~=- /
- ~^~^~^~^~^~^~^}%<<<
-\AddAnimal{small-duck}%>>>
+ ~^~^~^~^~^~^~^}%=<<
+\AddAnimal{small-duck}%>>=
{ \
\
>()_
- (__)__ _}%<<<
-\AddAnimal{duck-family}%>>>
+ (__)__ _}%=<<
+\AddAnimal{duck-family}%>>=
{ \
\ __
>(' )
)/
/(
/ `----/ -()_ >()_
- __\__~=-_/__ _(__)__(__)__ _}%<<<
-\AddAnimal{cow}%>>>
+ __\__~=-_/__ _(__)__(__)__ _}%=<<
+\AddAnimal{cow}%>>=
{ \ ^__^
\ (oo)\_______
(__)\ )\/\
||----w |
- || ||}%<<<
-\AddAnimal{head-in}%>>>
+ || ||}%=<<
+\AddAnimal{head-in}%>>=
{ \
\ ^__^ /
(oo)\_______/ ________
(__)\ )=( ___|_ \____
||----w | \ \ \____ |
- || || || ||}%<<<
-\AddAnimal{sodomized}%>>>
+ || || || ||}%=<<
+\AddAnimal{sodomized}%>>=
{ \ _
\ (_)
^__^ / \
(oo)\_____/_\ \
(__)\ ) /
||----w ((
- || ||>>}%<<<
-\AddAnimal{tux}%>>>
+ || ||>>}%=<<
+\AddAnimal{tux}%>>=
{ \
\ .--.
|o_o |
@@ -83,44 +85,45 @@
// \ \
(| | )
/'\_ _/`\
- \___)=(___/}%<<<
-\AddAnimal{pig}%>>>
+ \___)=(___/}%=<<
+\AddAnimal{pig}%>>=
+ \ _//| .-~~~-.
\ _/oo } }-@
('')_ } |
`--'| { }--{ }
- //_/ /_/+%<<<
-\AddAnimal{frog}%>>>
+ //_/ /_/+%=<<
+\AddAnimal{frog}%>>=
{ \
\ (.)_(.)
_ ( _ ) _
/ \/`-----'\/ \
__\ ( ( ) ) /__
) /\ \._./ /\ (
- )_/ /|\ /|\ \_(}%<<<
-\AddAnimal{snowman}%>>>
+ )_/ /|\ /|\ \_(}%=<<
+\AddAnimal{snowman}%>>=
{ \
\_[_]_
(")
>-( : )-<
- (__:__)}%<<<
-\AddAnimal[tail-symbol=s]{hedgehog}%>>>
+ (__:__)}%=<<
+\AddAnimal[tail-symbol=s]{hedgehog}%>>=
{ s .\|//||\||.
s |/\/||/|//|/|
/. `|/\\|/||/||
- o__,_|//|/||\||'}%<<<
-\AddAnimal{kangaroo}%>>>
+ o__,_|//|/||\||'}%=<<
+\AddAnimal{kangaroo}%>>=
{ \
\ _,' ___
<__\__/ \
\_ / _\
\,\ / \\
// \\
- ,/' `\_,}%<<<
-\AddAnimal[tail-symbol=s,tail-count=3]{rabbit}%>>>
-{ s / \`\ __
- s | \ `\ /`/ \
- s \_/`\ \-"-/` /\ \
+ ,/' `\_,}%=<<
+\AddAnimal[tail-symbol=s,tail-count=3]{rabbit}%>>=
+{ s
+ s / \`\ __
+ s | \ `\ /`/ \
+ \_/`\ \-"-/` /\ \
| | \ |
(d b) \_/
/ \
@@ -131,19 +134,19 @@
| \ \ / / |
\ \ \ / / /
`"`\ : /'"`
- `""`""`}%<<<
-\AddAnimal{bunny}%>>>
-{ \
- \ /
+ `""`""`}%=<<
+\AddAnimal{bunny}%>>=
+{ \
+ \ /
/\ /
( )
- .( o ).}%<<<
-\AddAnimal{small-rabbit}%>>>
+ .( o ).}%=<<
+\AddAnimal{small-rabbit}%>>=
{ \
\ _//
(')---.
- _/-_( )o}%<<<
-\AddAnimal[tail-symbol=s,tail-count=3]{dragon}%>>>
+ _/-_( )o}%=<<
+\AddAnimal[tail-symbol=s,tail-count=3]{dragon}%>>=
{ s / \ //\
s |\___/| / \// \\
s /0 0 \__ / // | \ \
@@ -159,14 +162,14 @@
(( / )) .----~-.\ \-' .~ \ `. \^-.
///.----..> \ _ -~ `. ^-` ^-_
///-._ _ _ _ _ _ _}^ - - - - ~ ~-- ,.-~
- /.-~}%<<<
-\AddAnimal{dog}%>>>
+ /.-~}%=<<
+\AddAnimal{dog}%>>=
{ \ __
\ .-'\/\
"\ '------.
___/ ( .'_____
- '-----'"""'------"""""'}%<<<
-\AddAnimal{squirrel}%>>>
+ '-----'"""'------"""""'}%=<<
+\AddAnimal{squirrel}%>>=
{ \ ,;:;;,
\ , ;;;;;
.=', ;:;;:,
@@ -174,41 +177,41 @@
@=:__, \,;:;:'
_(\.= ;:;;'
`"_( _/="`
- `"'``}%<<<
-\AddAnimal{snail}%>>>
+ `"'``}%=<<
+\AddAnimal{snail}%>>=
{ \
\ .-""-.
oo ; .-. :
\\__..-: '.__.')._
- "-._.._'.__.-'_.."}%<<<
-\AddAnimal{unicorn}%>>>
-{ \
- \ /((((((\\\\
- ---====((((((((((\\\\\
- (( \\\\\\\
- ( (* _/ \\\\\\\
- \ / \ \\\\\\_ __,,__
- | | | </ "------"" ((\\\\
- o_| / / \ \\\\ \\\\\\\
- | ._ ( \ \\\\\\\\\\\\\\\\
- | / / / \\\\\\\ \\
- .______/\/ / / / \\\
- / __.____/ _/ ___----( /\
- / / / ________/:______,---' \ / \_
- / / \ \ \ \ \_ \
- ( < \ \ > / \ \
- \/ \\_ / / > )
- \_| / / / /
- _// _//
- /_| /_|}%<<<
-\AddAnimal[tail-count=3,tail-symbol=s]{whale}%>>>
+ "-._.._'.__.-'_.."}%=<<
+\AddAnimal{unicorn}%>>=
+{ \
+ \ /((((((\\\\
+ ---====((((((((((\\\\\
+ (( \\\\\\\
+ ( (* _/ \\\\\\\
+ \ / \ \\\\\\_ __,,__
+ | | | </ "-----"" ((\\\\
+ o_| / / \ \\\\ \\\\\\\
+ | ._ ( \ \\\\\\\\\\\\\\\\
+ | / / / \\\\\\\ \\
+ .______/\/ / / / \\\
+ / __.____/ _/ _( /\
+ / / / ________/:_ ___,,--' \ / \_
+ / / \ \ """"""" \ \ \_ \
+ ( < \ \ > / \ \
+ \/ \\_ / / > )
+ \_| / / / /
+ _// _//
+ /_| /_|}%=<<
+\AddAnimal[tail-count=3,tail-symbol=s]{whale}%>>=
{ s |-.
s .-""-._ \ \.--|
s / `-..__) ,-'
| . /
\--.__, .__.,'
- `-.___'._\_.'}%<<<
-\AddAnimal[tail-count=3]{yoda}%>>>
+ `-.___'._\_.'}%=<<
+\AddAnimal[tail-count=3]{yoda}%>>=
{ \
\ ____
\ _.' : `._
@@ -244,8 +247,8 @@
\ / .-" /. .'.' ;_:' ;
:-""-.`./-.' / `.___.'
\ `t ._ /
- "-.t-._:'}%<<<
-\AddAnimal[tail-count=3]{yoda-head}%>>>
+ "-.t-._:'}%=<<
+\AddAnimal[tail-count=3]{yoda-head}%>>=
{ \
\ ____
\ _.' : `._
@@ -261,16 +264,16 @@
.-j/'.; ;"""" / .'\"-.
.' /:`. : : /.".''; `.
.-" / ;`.". : ."." : "-.
- .+"-. : : ".".". ."." ;-._ \}%<<<
-\AddAnimal{small-yoda}%>>>
+ .+"-. : : ".".". ."." ;-._ \}%=<<
+\AddAnimal{small-yoda}%>>=
{ \
\
__.-._
'-._"7'
/'.-c
| /T
- _)_/LI}%<<<
-\AddAnimal{r2d2}%>>>
+ _)_/LI}%=<<
+\AddAnimal{r2d2}%>>=
{ \
\ ,-----.
,'_/_|_\_`.
@@ -283,8 +286,8 @@
| |_________| |
| |\_______/| |
/ \ / \ / \
- `---' `---' `---'}%<<<
-\AddAnimal{vader}%>>>
+ `---' `---' `---'}%=<<
+\AddAnimal{vader}%>>=
{ \ _.-'~~~~~~`-._
\ / || \
/ || \
@@ -298,15 +301,15 @@
/ \ /||||||\ / \
/_ \O========O/ _\
`--...__|`-._ _.-'|__...--'
- | `' |}%<<<
-\AddAnimal[tail-symbol=|,tail-count=1]{crusader}%>>>
+ | `' |}%=<<
+\AddAnimal[tail-symbol=|,tail-count=1]{crusader}%>>=
{ |
\[T]/}
\csname bool_if:cT\endcsname {l_ducksay_version_one_bool}
{\AnimalOptions{crusader}{tail-1=|,rel-align=c}}
\csname bool_if:cT\endcsname {l_ducksay_version_two_bool}
- {\AnimalOptions{crusader}{tail-1=|,body-align=c}}%<<<
-\AddAnimal[tail-count=3]{knight}%>>>
+ {\AnimalOptions{crusader}{tail-1=|,body-align=c}}%=<<
+\AddAnimal[tail-count=3]{knight}%>>=
{ \
\ ,-"""-.
\ | === |
@@ -327,7 +330,89 @@
\\ \ | /
\\ /V|V\
\|/ | \
- '--' `--`}%<<<
+ '--' `--`}%=<<
+\AddAnimal{ghost}%>>=
+{ \
+ \ .-.
+ (o o)
+ | O \
+ \ \
+ `~~~'}%=<<
+\AddAnimal{fairy}%>>=
+{ \
+ \ .oOOb
+ .. .oO O
+ '::; d O
+ ;;;;d ..oO
+ * ::O;;;'OooO
+~"\. dp'(O.o.
+ \op 'oOb
+ obU
+ dop
+ dop
+ PO
+ O 'b
+ l P.
+ / ;
+ '}%=<<
+\AddAnimal[tail-symbol=s]{only-tail}%>>=
+{ s
+ s}%=<<
+\AddAnimal[tail-symbol=s,tail-count=3]{only-tail3}%>>=
+{ s
+ s
+ s}%=<<
+\AddAnimal[tail-symbol=s,tail-count=3]{snake}
+{ s
+ s /^\/^\
+ s _|__| O |
+ /' \_/ \
+ \/ |_________/ \ \
+ \_/ \_______ \ \
+ `| | |\
+ / / _---_ | |
+ / / / __ "-_ ," |
+ | "--" / "-_ "--" ,"
+ "-_____-" "-___-"}
+\AddAnimal{cat}
++ \
+ \ _ ___ .--.
+ \`.|\..----...-'` `-._.-' .-'
+ / ' ` , __.-'
+ )/' _/ \ `-_, /
+ `-'" `"\_ ,_.-;_.-\_ ',
+ _.-'_./ {_.' ; /
+ {_.-``-' {_/+
+\AddAnimal{sleepy-cat}
+{ \
+ \ |\ _,,,---,,_ _._
+ /,`.-'`' -. )'._,'.-,)
+ |,4- ) )-,_. ,\ ( `-.-'
+ '---''(_/--' `-'\_)}
+\AddAnimal{schroedinger-dead}
+{ \
+ \ _.--"""--._
+ | |
+ | -|- |
+ | | |
+ | |
+ | Felix |
+ __|___________|__ _
+ o . . .
+ ~ . o o
+ . ~ .}
+\AddAnimal{schroedinger-alive}
+{ \
+ \ ,_ _
+ |\\__,'/
+ / _ _ | ,--.
+ ( @ @ ) / ,-'
+ \ _T_/-._( (
+ / `. \
+ | _ \ |
+ \ \ , / |
+ || |-_\__ /
+ ((_/`(____,-'}
%%
%%
%% End of file `ducksay.animals.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ducksay/ducksay.code.v1.tex new/tex/latex/ducksay/ducksay.code.v1.tex
--- old/tex/latex/ducksay/ducksay.code.v1.tex 2019-01-14 00:31:16.000000000 +0100
+++ new/tex/latex/ducksay/ducksay.code.v1.tex 2020-02-01 23:14:47.000000000 +0100
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% --------------------------------------------------------------
%%
-%% Copyright (C) 2017-2019 Jonathan P. Spratte
+%% Copyright (C) 2017-2020 Jonathan P. Spratte
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this license or
@@ -32,6 +32,8 @@
%% ducksay.code.v2.tex and
%% ducksay.animals.tex.
%%
+\ProvidesFile{ducksay.code.v1.tex}
+ [\ducksay@date\space v\ducksay@version\space ducksay code version 1]
\cs_new:Npn \ducksay_longest_line:n #1
{
\int_incr:N \l_ducksay_msg_height_int
@@ -131,8 +133,7 @@
\int_set:Nn \l_ducksay_msg_width_int { -\c_max_int }
\int_set:Nn \l_ducksay_msg_height_int { -\c_max_int }
\keys_set:nn { ducksay } { #1 }
- \tl_if_empty:NT \l_ducksay_animal_tl
- { \keys_set:nn { ducksay } { default_animal } }
+ \ducksay_default_or_random_animal:
\ducksay_print:nV { #2 } \l_ducksay_rel_align_tl
\group_end:
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ducksay/ducksay.code.v2.tex new/tex/latex/ducksay/ducksay.code.v2.tex
--- old/tex/latex/ducksay/ducksay.code.v2.tex 2019-01-14 00:31:16.000000000 +0100
+++ new/tex/latex/ducksay/ducksay.code.v2.tex 2020-02-01 23:14:47.000000000 +0100
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% --------------------------------------------------------------
%%
-%% Copyright (C) 2017-2019 Jonathan P. Spratte
+%% Copyright (C) 2017-2020 Jonathan P. Spratte
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this license or
@@ -32,6 +32,8 @@
%% ducksay.code.v2.tex and
%% ducksay.animals.tex.
%%
+\ProvidesFile{ducksay.code.v2.tex}
+ [\ducksay@date\space v\ducksay@version\space ducksay code version 2]
\RequirePackage{array,grabbox}
\msg_new:nnn { ducksay } { justify~unavailable }
{
@@ -50,6 +52,7 @@
\bool_new:N \l_ducksay_eat_arg_box_bool
\bool_new:N \l_ducksay_eat_arg_tab_verb_bool
\bool_new:N \l_ducksay_mirrored_body_bool
+\bool_new:N \l_ducksay_msg_eq_body_width_bool
\coffin_new:N \l_ducksay_body_coffin
\coffin_new:N \l_ducksay_bubble_close_coffin
\coffin_new:N \l_ducksay_bubble_open_coffin
@@ -77,6 +80,7 @@
,wd* .dim_set:N = \l_ducksay_msg_width_dim
,wd* .initial:n = -\c_max_dim
,wd* .value_required:n = true
+ ,wd-eq-body .bool_set:N = \l_ducksay_msg_eq_body_width_bool
,none .bool_set:N = \l_ducksay_no_body_bool
,no-bubble .bool_set:N = \l_ducksay_no_bubble_bool
,body-mirrored .bool_set:N = \l_ducksay_mirrored_body_bool
@@ -91,7 +95,9 @@
,body-align / l .meta:n = { body-to-msg = l , msg-to-body = l }
,body-align / c .meta:n = { body-to-msg = hc , msg-to-body = hc }
,body-align / r .meta:n = { body-to-msg = r , msg-to-body = r }
- ,body-align .initial:n = l
+ ,body-align .initial:n = l
+ ,body-bigger .int_set:N = \l_ducksay_body_bigger_int
+ ,body-bigger .initial:n = \c_zero_int
,msg-align .choice:
,msg-align / l .code:n = { \tl_set:Nn \l_ducksay_msg_align_tl { l } }
,msg-align / c .code:n = { \tl_set:Nn \l_ducksay_msg_align_tl { c } }
@@ -200,7 +206,7 @@
}
\cs_new:Npn \ducksay_calculate_msg_width_from_int:
{
- \hbox_set:Nn \l_ducksay_tmpa_box { \l_ducksay_msg_fount_tl M }
+ \hbox_set:Nn \l_ducksay_tmpa_box { { \l_ducksay_msg_fount_tl M } }
\dim_set:Nn \l_ducksay_msg_width_dim
{ \l_ducksay_msg_width_int \box_wd:N \l_ducksay_tmpa_box }
}
@@ -217,64 +223,79 @@
{
\end { tabular }
}
+\cs_new:Npn \ducksay_width_case_none_int_dim:nnn #1 #2 #3
+ {
+ \dim_compare:nNnTF { \l_ducksay_msg_width_dim } < { \c_zero_dim }
+ {
+ \int_compare:nNnTF { \l_ducksay_msg_width_int } < { \c_zero_int }
+ { #1 }
+ { #2 }
+ }
+ { #3 }
+ }
\cs_new:Npn \ducksay_digest_options:n #1
{
\group_begin:
\keys_set:nn { ducksay } { #1 }
- \tl_if_empty:NT \l_ducksay_animal_tl
- { \keys_set:nn { ducksay } { default_animal } }
- \bool_if:NTF \l_ducksay_eat_arg_box_bool
+ \ducksay_default_or_random_animal:
+ \bool_if:NF \l_ducksay_no_body_bool
{
- \dim_compare:nNnTF { \l_ducksay_msg_width_dim } < { \c_zero_dim }
+ \hcoffin_set:Nn \l_ducksay_body_coffin
{
- \int_compare:nNnTF { \l_ducksay_msg_width_int } < { \c_zero_int }
- {
- \cs_set_eq:NN
- \ducksay_eat_argument:w \ducksay_eat_argument_hbox:w
- }
+ \frenchspacing
+ \l_ducksay_body_fount_tl
+ \begin{tabular} { @{} l @{} }
+ \l_ducksay_animal_tl
+ \ducksay_make_body_bigger:
+ \relax
+ \end{tabular}
+ }
+ \bool_if:NT \l_ducksay_msg_eq_body_width_bool
+ {
+ \bool_lazy_and:nnT
+ { \int_compare_p:nNn \l_ducksay_msg_width_int < \c_zero_int }
+ { \dim_compare_p:nNn \l_ducksay_msg_width_dim < \c_zero_dim }
{
- \cs_set_eq:NN
- \ducksay_eat_argument:w \ducksay_eat_argument_vbox:w
- \ducksay_calculate_msg_width_from_int:
+ \dim_set:Nn \l_ducksay_msg_width_dim
+ { \coffin_wd:N \l_ducksay_body_coffin }
}
}
+ }
+ \bool_if:NTF \l_ducksay_eat_arg_box_bool
+ {
+ \ducksay_width_case_none_int_dim:nnn
+ { \ducksay_eat_argument_hbox:w }
{
- \cs_set_eq:NN \ducksay_eat_argument:w \ducksay_eat_argument_vbox:w
+ \ducksay_calculate_msg_width_from_int:
+ \ducksay_eat_argument_vbox:w
}
+ { \ducksay_eat_argument_vbox:w }
}
{
- \dim_compare:nNnTF { \l_ducksay_msg_width_dim } < { \c_zero_dim }
+ \ducksay_width_case_none_int_dim:nnn
{
- \int_compare:nNnTF { \l_ducksay_msg_width_int } < { \c_zero_int }
+ \tl_if_empty:NT \l_ducksay_msg_tabular_column_tl
{
- \tl_if_empty:NT \l_ducksay_msg_tabular_column_tl
+ \str_case:Vn \l_ducksay_msg_align_tl
{
- \str_case:Vn \l_ducksay_msg_align_tl
+ { l } { \tl_set:Nn \l_ducksay_msg_tabular_column_tl { l } }
+ { c } { \tl_set:Nn \l_ducksay_msg_tabular_column_tl { c } }
+ { r } { \tl_set:Nn \l_ducksay_msg_tabular_column_tl { r } }
+ { j }
{
- { l }
- { \tl_set:Nn \l_ducksay_msg_tabular_column_tl { l } }
- { c }
- { \tl_set:Nn \l_ducksay_msg_tabular_column_tl { c } }
- { r }
- { \tl_set:Nn \l_ducksay_msg_tabular_column_tl { r } }
- { j } {
- \msg_error:nn { ducksay } { justify~unavailable }
- \tl_set:Nn \l_ducksay_msg_tabular_column_tl { l }
- }
+ \msg_error:nn { ducksay } { justify~unavailable }
+ \tl_set:Nn \l_ducksay_msg_tabular_column_tl { l }
}
}
}
- {
- \ducksay_calculate_msg_width_from_int:
- \ducksay_evaluate_message_alignment_fixed_width_tabular:
- }
}
{
+ \ducksay_calculate_msg_width_from_int:
\ducksay_evaluate_message_alignment_fixed_width_tabular:
}
- \cs_set_eq:NN \ducksay_eat_argument:w \ducksay_eat_argument_tabular:w
+ { \ducksay_evaluate_message_alignment_fixed_width_tabular: }
+ \ducksay_eat_argument_tabular:w
}
- \ducksay_eat_argument:w
}
\cs_new:Npn \ducksay_set_bubble_top_kern:
{
@@ -294,6 +315,15 @@
\dim_set:Nn \l_ducksay_bubble_bottom_kern_dim
{ \dim_eval:n { \l_ducksay_bubble_bottom_kern_tl } }
}
+\cs_new:Npn \ducksay_make_body_bigger:
+ {
+ \int_step_function:nN \l_ducksay_body_bigger_int
+ \ducksay_make_body_bigger_aux:n
+ }
+\cs_new:Npn \ducksay_make_body_bigger_aux:n #1
+ {
+ \\
+ }
\cs_new_protected:Npn \ducksay_shipout:
{
\hcoffin_set:Nn \l_ducksay_msg_coffin { \box_use:N \l_ducksay_msg_box }
@@ -411,14 +441,6 @@
}
\bool_if:NF \l_ducksay_no_body_bool
{
- \hcoffin_set:Nn \l_ducksay_body_coffin
- {
- \frenchspacing
- \l_ducksay_body_fount_tl
- \begin{tabular} { @{} l @{} }
- \l_ducksay_animal_tl
- \end{tabular}
- }
\bool_if:NT \l_ducksay_mirrored_body_bool
{
\coffin_scale:Nnn \l_ducksay_body_coffin
@@ -464,10 +486,10 @@
\ducksay_eat_argument_tabular_inner:w
{
\group_begin:
- \tex_everyeof:D { \exp_not:N }
+ \__ducksay_everyeof:w { \exp_not:N }
\exp_after:wN
\group_end:
- \tex_scantokens:D { #1 }
+ \__ducksay_scantokens:w { #1 }
}
}
\NewDocumentCommand \ducksay_eat_argument_tabular_normal:w { +m }
@@ -475,26 +497,24 @@
\cs_new_protected_nopar:Npn \ducksay_eat_argument_hbox:w
{
\bool_if:NTF \l_ducksay_msg_strip_spaces_bool
- { \grabbox }
- { \grabbox* }
- \l_ducksay_msg_box [ \l_ducksay_msg_fount_tl ] \hbox \ducksay_shipout:
+ { \@grabbox }
+ { \@grabbox* }
+ {} \l_ducksay_msg_box \l_ducksay_msg_fount_tl \hbox {} \ducksay_shipout:
}
\cs_new_protected_nopar:Npn \ducksay_eat_argument_vbox:w
{
\ducksay_evaluate_message_alignment_fixed_width_vbox:
\bool_if:NTF \l_ducksay_msg_strip_spaces_bool
- { \grabbox }
- { \grabbox* }
- [
+ { \@grabbox }
+ { \@grabbox* }
+ {
\hsize \l_ducksay_msg_width_dim
\linewidth \hsize
- \l_ducksay_msg_fount_tl
\l_ducksay_msg_align_vbox_tl
\@afterindentfalse
\@afterheading
- ]
- \l_ducksay_msg_box
- \vbox \ducksay_shipout:
+ }
+ \l_ducksay_msg_box \l_ducksay_msg_fount_tl \vbox {} \ducksay_shipout:
}
\cs_generate_variant:Nn \coffin_join:NnnNnnnn { NVnNVnnn }
\cs_generate_variant:Nn \coffin_attach:NnnNnnnn { NVnNVnnn }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ducksay/ducksay.sty new/tex/latex/ducksay/ducksay.sty
--- old/tex/latex/ducksay/ducksay.sty 2019-01-14 00:31:16.000000000 +0100
+++ new/tex/latex/ducksay/ducksay.sty 2020-02-01 23:14:47.000000000 +0100
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% --------------------------------------------------------------
%%
-%% Copyright (C) 2017-2019 Jonathan P. Spratte
+%% Copyright (C) 2017-2020 Jonathan P. Spratte
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this license or
@@ -35,8 +35,8 @@
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{xparse,l3keys2e}
-\def\ducksay(a)version{2.3}
-\def\ducksay@date{2019-01-13}
+\def\ducksay(a)version{2.5}
+\def\ducksay@date{2020-02-01}
\ProvidesExplPackage
{ducksay} {\ducksay@date}
@@ -46,6 +46,7 @@
\int_new:N \l_ducksay_msg_height_int
\int_new:N \l_ducksay_tail_symbol_count_int
\seq_new:N \l_ducksay_msg_lines_seq
+\seq_new:N \l_ducksay_defined_animals_seq
\tl_new:N \l_ducksay_align_tl
\tl_new:N \l_ducksay_msg_align_tl
\tl_new:N \l_ducksay_animal_tl
@@ -57,6 +58,7 @@
\tl_new:N \l_ducksay_tail_symbol_in_tl
\bool_new:N \l_ducksay_version_one_bool
\bool_new:N \l_ducksay_version_two_bool
+\bool_new:N \l_ducksay_random_animal_bool
\box_new:N \l_ducksay_tmpa_box
\regex_const:Nn \c_ducksay_textcolor_regex
{ \cO(?:\\textcolor\{(.*?)\}\{(.*?)\}) }
@@ -66,8 +68,6 @@
{ \cO(?:\\color\{(.*?)\}) }
\msg_new:nnn { ducksay } { load-time-only }
{ The~`#1`~key~is~to~be~used~only~during~package~load~time. }
-\msg_new:nnn { ducksay } { deprecated-key }
- { The~`\l_keys_key_tl`~key~is~deprecated.~Sorry~for~the~inconvenience. }
\keys_define:nn { ducksay }
{
,bubble .tl_set:N = \l_ducksay_bubble_tl
@@ -97,11 +97,19 @@
,tail-2 .initial:x = \c_backslash_str
,no-tail .meta:n = { tail-1 = { ~ }, tail-2 = { ~ } }
,think .meta:n = { tail-1 = { O }, tail-2 = { o } }
+ ,random .bool_set:N = \l_ducksay_random_animal_bool
,say .code:n =
{
\exp_args:Nx \DucksayOptions
{ tail-1 = { \c_backslash_str }, tail-2 = { \c_backslash_str } }
}
+ ,schroedinger .code:n =
+ {
+ \int_compare:nNnTF { \int_rand:n { 2 } } = \c_one_int
+ { \keys_set:nn { ducksay } { animal = schroedinger-dead } }
+ { \keys_set:nn { ducksay } { animal = schroedinger-alive } }
+ }
+ ,schroedinger .value_forbidden:n = true
,version .choice:
,version / 1 .code:n =
{
@@ -114,7 +122,6 @@
\bool_set_true:N \l_ducksay_version_two_bool
}
,version .initial:n = 2
- ,add-think .code:n = \msg_error:nn { ducksay } { deprecated-key }
}
\ProcessKeysOptions { ducksay }
\keys_define:nn { ducksay }
@@ -131,6 +138,9 @@
}
\cs_generate_variant:Nn \tl_replace_once:Nnn { NVn }
\cs_generate_variant:Nn \tl_replace_all:Nnn { NVn }
+\cs_generate_variant:Nn \keys_set:nn { nx }
+\cs_set_eq:NN \__ducksay_everyeof:w \tex_everyeof:D
+\cs_set_eq:NN \__ducksay_scantokens:w \tex_scantokens:D
\cs_new_protected:Npx \ducksay_replace_verb_newline:Nn #1 #2
{
\tl_replace_all:Nnn #1 { \char_generate:nn { 13 } { 12 } } { #2 }
@@ -191,18 +201,31 @@
#2 .code:n =
{
\exp_not:n { \tl_set_eq:NN \l_ducksay_animal_tl }
- \exp_after:wN \exp_not:N \cs:w l_ducksay_animal_#2_tl \cs_end:
+ \exp_not:c { l_ducksay_animal_#2_tl }
\exp_not:n { \exp_args:NV \DucksayOptions }
- \exp_after:wN
- \exp_not:N \cs:w l_ducksay_animal_#2_options_tl \cs_end:
+ \exp_not:c { l_ducksay_animal_#2_options_tl }
}
}
\tl_if_exist:cF { l_ducksay_animal_#2_options_tl }
{ \tl_new:c { l_ducksay_animal_#2_options_tl } }
\IfBooleanT { #4 }
{ \keys_define:nn { ducksay } { default_animal .meta:n = { #2 } } }
+ \seq_if_in:NnF \l_ducksay_defined_animals_seq { #2 }
+ { \seq_push:Nn \l_ducksay_defined_animals_seq { #2 } }
}
\cs_generate_variant:Nn \ducksay_add_animal_inner:nnnn { nnVn }
+\cs_new_protected:Npn \ducksay_default_or_random_animal:
+ {
+ \tl_if_empty:NT \l_ducksay_animal_tl
+ {
+ \bool_if:NTF \l_ducksay_random_animal_bool
+ {
+ \keys_set:nx { ducksay }
+ { \seq_rand_item:N \l_ducksay_defined_animals_seq }
+ }
+ { \keys_set:nn { ducksay } { default_animal } }
+ }
+ }
\NewDocumentCommand \DefaultAnimal { m }
{
\keys_define:nn { ducksay } { default_animal .meta:n = { #1 } }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ducksay.tlpobj new/tlpkg/tlpobj/ducksay.tlpobj
--- old/tlpkg/tlpobj/ducksay.tlpobj 2019-02-28 03:33:01.000000000 +0100
+++ new/tlpkg/tlpobj/ducksay.tlpobj 2020-02-02 01:58:13.000000000 +0100
@@ -1,6 +1,6 @@
name ducksay
category Package
-revision 49691
+revision 53631
shortdesc Draw ASCII art of animals saying a specified message
relocated 1
longdesc The package draws ASCII art of animals saying a specified
@@ -16,7 +16,6 @@
catalogue-contact-bugs https://github.com/Skillmon/ltx_ducksay/issues
catalogue-contact-repository https://github.com/Skillmon/ltx_ducksay
catalogue-ctan /macros/latex/contrib/ducksay
-catalogue-date 2019-01-13 14:34:53 +0100
catalogue-license lppl1.3c
catalogue-topics games graphics
-catalogue-version 2.3
+catalogue-version 2.5
++++++ duckuments.doc.tar.xz ++++++
Binary files old/doc/latex/duckuments/duckuments.pdf and new/doc/latex/duckuments/duckuments.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/duckuments.doc.tlpobj new/tlpkg/tlpobj/duckuments.doc.tlpobj
--- old/tlpkg/tlpobj/duckuments.doc.tlpobj 2019-02-28 03:33:01.000000000 +0100
+++ new/tlpkg/tlpobj/duckuments.doc.tlpobj 2019-10-04 01:54:00.000000000 +0200
@@ -1,9 +1,9 @@
name duckuments.doc
category Package
-revision 49936
+revision 52271
shortdesc doc files of duckuments
relocated 1
-docfiles size=130
+docfiles size=124
RELOC/doc/latex/duckuments/README.md
RELOC/doc/latex/duckuments/duckuments.pdf
RELOC/doc/latex/duckuments/example-image-duck-portrait.tex
++++++ duckuments.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/duckuments/duckuments.sty new/tex/latex/duckuments/duckuments.sty
--- old/tex/latex/duckuments/duckuments.sty 2019-02-04 22:36:40.000000000 +0100
+++ new/tex/latex/duckuments/duckuments.sty 2019-10-03 23:08:57.000000000 +0200
@@ -31,37 +31,15 @@
%% example-image-duck.tex and
%% example-image-duck-portrait.tex
%%
-\RequirePackage{xparse,letltxmacro,l3keys2e}
-\def\duckuments(a)version{0.4c}
-\def\duckuments@date{2019/02/03}
+\RequirePackage{xparse}[2019-05-03]
+\RequirePackage{letltxmacro,l3keys2e}
+\def\duckuments(a)version{0.5}
+\def\duckuments@date{2019-10-03}
\ProvidesExplPackage
{duckuments} {\duckuments@date}
{\duckuments@version} {minimal working duckuments}
-\bool_if:nF
- {
- \sys_if_engine_luatex_p:
- || \sys_if_engine_pdftex_p:
- || \sys_if_engine_xetex_p:
- }
- {%>>>
- \msg_new:nnnn { duckuments } { incompatible }
- {
- The~duckuments~package~is~currently~only~compatible~with~pdfTeX,~
- LuaTeX,~and~XeTeX!
- }
- {
- \ ~_____________________________\\
- \ (Quack!~Sorry~for~that.~Quack!)\\
- \ ~"""""""""""""""""""""""""""""\\
- \ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ \ ~\ ~\ ~\ ~\string\ \\
- \ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ \ ~\ ~\ ~\ ~\ ~>()_\\
- \ \ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ \ ~\ ~\ ~\ ~\ ~\ ~(__)__
- }
- \msg_error:nn { duckuments } { incompatible }
- \endinput
- }%<<<
\file_if_exist:nF { example-image-duck.pdf }
- {%>>>
+ {%>>=
\str_if_eq:VnF \c_sys_jobname_str { example-image-duck }
{
\msg_new:nnnn { duckuments } { missing~file }
@@ -81,9 +59,9 @@
in~the~current~working~directory.
}
}
- }%<<<
+ }%=<<
\file_if_exist:nF { example-image-duck-portrait.pdf }
- {%>>>
+ {%>>=
\str_if_eq:VnF \c_sys_jobname_str { example-image-duck-portrait }
{
\msg_if_exist:nnF { duckuments } { missing~file }
@@ -106,7 +84,7 @@
in~the~current~working~directory.
}
}
- }%<<<
+ }%=<<
\newcommand*\duckuments@randoms{128}
\bool_new:N \l_duckuments_immediate_bool
\bool_new:N \l_duckuments_toc_bool
@@ -115,46 +93,98 @@
\bool_new:N \l_duckuments_blindduck_pars_bool
\seq_new:N \l_duckuments_range_seq
\int_new:N \g_duckuments_blindduck_start_int
-\int_gset:Nn \g_duckuments_blindduck_start_int { \c_one }
+\int_gset:Nn \g_duckuments_blindduck_start_int { \c_one_int }
\int_new:N \g_duckuments_blindduck_end_int
\regex_const:Nn \c_duckuments_example_regex
{
- example-image-duck
+ example-image-duck
|example-image-duck.pdf
|example-image-duck-portrait
|example-image-duck-portrait.pdf
}
\regex_const:Nn \c_duckuments_range_regex { (\d+|\d+-|-\d+|\d+-\d+|-) }
-\int_const:Nn \c_duckuments_blindduck_pars_int { \c_five }
+\int_const:Nn \c_duckuments_blindduck_pars_int { 5 }
+\sys_if_engine_pdftex:T
+ {
+ \cs_new_protected:Npn \duckuments_set_to_pdf_page_count:Nn #1 #2
+ {
+ \group_begin:
+ \pdfximage { #2 }
+ \exp_args:NNNo
+ \group_end:
+ \int_set:Nn #1 { \the \pdflastximagepages }
+ }
+ }
+\sys_if_engine_luatex:T
+ {
+ \cs_new_protected:Npn \duckuments_set_to_pdf_page_count:Nn #1 #2
+ {
+ \group_begin:
+ \saveimageresource { #2 }
+ \exp_args:NNNo
+ \group_end:
+ \int_set:Nn #1 { \lastsavedimageresourcepages }
+ }
+ }
+\sys_if_engine_xetex:T
+ {
+ \cs_new_protected:Npn \duckuments_set_to_pdf_page_count:Nn #1 #2
+ {
+ \int_set:Nn #1 { \XeTeXpdfpagecount " #2 " }
+ }
+ }
+\bool_lazy_any:nTF
+ {
+ { \sys_if_engine_luatex_p: }
+ { \sys_if_engine_pdftex_p: }
+ { \sys_if_engine_xetex_p: }
+ }
+ { \if_false: }
+ { \if_true: }
+ \group_begin:
+ \char_set_catcode_other:N \%
+ \cs_new_protected:Npn \duckuments_set_to_pdf_page_count:Nn #1 #2
+ {
+ \group_begin:
+ \char_set_catcode_other:N \%
+ \char_set_catcode_letter:N \:
+ \char_set_catcode_ignore:n { 32 }
+ \ior_shell_open:Nn \g_tmpa_ior { extractbb ~ -O ~ #2 }
+ \ior_map_inline:Nn \g_tmpa_ior
+ {
+ \__duckuments_set_to_pdf_page_count_aux_a:w ##1 %%Pages: \q_stop
+ }
+ \ior_close:N \g_tmpa_ior
+ \exp_args:NNNo
+ \group_end:
+ \int_set:Nn #1 { \int_use:N \l_tmpa_int }
+ }
+ \cs_new_protected:Npn \__duckuments_set_to_pdf_page_count_aux_a:w
+ #1 %%Pages: #2 \q_stop
+ {
+ \tl_if_empty:nT { #1 }
+ { \__duckuments_set_to_pdf_page_count_aux_b:w #2 \q_stop }
+ }
+ \cs_new_protected:Npn \__duckuments_set_to_pdf_page_count_aux_b:w
+ #1 %%Pages: \q_stop
+ {
+ \int_set:Nn \l_tmpa_int { #1 }
+ \ior_map_break:
+ }
+ \group_end:
+\fi:
\bool_if:nTF
{
\str_if_eq_p:Vn \c_sys_jobname_str { example-image-duck }
|| \str_if_eq_p:Vn \c_sys_jobname_str { example-image-duck-portrait }
}
- { \int_const:Nn \c_duckuments_example_pages_int { 1 } }
+ { \int_const:Nn \c_duckuments_example_pages_int { \c_one_int } }
{
\group_begin:
- \sys_if_engine_pdftex:T
- {
- \pdfximage{example-image-duck.pdf}
- \int_set:Nn \l_tmpa_int { \the\pdflastximagepages }
- \pdfximage{example-image-duck-portrait.pdf}
- \int_set:Nn \l_tmpb_int { \the\pdflastximagepages }
- }
- \sys_if_engine_luatex:T
- {
- \saveimageresource{example-image-duck.pdf}
- \int_set:Nn \l_tmpa_int { \lastsavedimageresourcepages }
- \saveimageresource{example-image-duck-portrait.pdf}
- \int_set:Nn \l_tmpb_int { \lastsavedimageresourcepages }
- }
- \sys_if_engine_xetex:T
- {
- \int_set:Nn \l_tmpa_int
- { \XeTeXpdfpagecount "example-image-duck.pdf" }
- \int_set:Nn \l_tmpb_int
- { \XeTeXpdfpagecount "example-image-duck-portrait.pdf" }
- }
+ \duckuments_set_to_pdf_page_count:Nn \l_tmpa_int
+ { example-image-duck.pdf }
+ \duckuments_set_to_pdf_page_count:Nn \l_tmpb_int
+ { example-image-duck-portrait.pdf }
\int_const:Nn \c_duckuments_example_pages_int
{ \int_min:nn { \l_tmpa_int } { \l_tmpb_int } }
\group_end:
@@ -199,7 +229,7 @@
\ \ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~\ ~(__)__
}
\cs_new:Npn \duckuments_patch_see_duckumentation:
- {%>>>
+ {%>>=
\cs_set:Nn \msg_see_documentation_text:n
{
\\\\
@@ -209,10 +239,10 @@
documentation
}~for~further~information.
}
- }%<<<
+ }%=<<
\duckuments_patch_see_duckumentation:
\keys_define:nn { duckuments }
- {%>>>
+ {%>>=
,immediate .bool_set:N = \l_duckuments_immediate_bool
,immediate .default:n = true
,full .code:n =
@@ -246,20 +276,20 @@
,toc .default:n = true
,unknown .code:n =
{ \msg_error:nnx { duckuments } { option~unknown } { \l_keys_key_tl } }
- }%<<<
+ }%=<<
\ProcessKeysOptions { duckuments }
\keys_define:nn { duckuments }
- {%>>>
+ {%>>=
,toc .undefine:
,toc .bool_set:N = \l_duckuments_toc_bool
,toc .default:n = true
,unknown .code:n = \duckuments_blindduck_range_test:V \l_keys_key_tl
- }%<<<
+ }%=<<
\bool_if:NTF \l_duckuments_immediate_bool
{ \AtEndOfPackage { \duckuments_patch_includegraphics: } }
{ \AtBeginDocument { \duckuments_patch_includegraphics: } }
\NewDocumentCommand \duckument { O{} }
- {%>>>
+ {%>>=
\group_begin:
\keys_set:nn { duckuments } { #1 }
\bool_if:NT \l_duckuments_toc_bool { \tableofcontents }
@@ -274,17 +304,17 @@
\duckuments_list_example:n { enumerate }
\duckuments_list_example:n { description }
\group_end:
- }%<<<
+ }%=<<
\NewDocumentCommand \blindduck { O{} }
- {%>>>
+ {%>>=
\group_begin:
\keys_set:nn { duckuments } { #1 }
\duckuments@blindduck@text
\bool_if:NT \l_duckuments_blindduck_pars_bool { \par }
\group_end:
- }%<<<
+ }%=<<
\NewDocumentCommand \ducklist {s m}
- {%>>>
+ {%>>=
\begin{#2}
\IfBooleanTF { #1 }
{\ducklists@content@starred}
@@ -294,9 +324,9 @@
\ducklists@content
}
\end{#2}
- }%<<<
+ }%=<<
\NewDocumentCommand \ducklistlist { s m }
- {%>>>
+ {%>>=
\IfBooleanTF { #1 }
{ \duckuments@listlist@starred { #2 } }
{
@@ -304,12 +334,12 @@
{ \duckuments@listlist@starred { description } }
{ \duckuments@listlist{#2} }
}
- }%<<<
+ }%=<<
\newcommand*\duckenumerate{\ducklist{enumerate}}
\newcommand*\duckitemize{\ducklist{itemize}}
\newcommand*\duckdescription{\ducklist{description}}
\newcommand*\duckumentsCreateExampleFiles
- {%>>>
+ {%>>=
\iow_new:N \duckuments_example_file_iow
\iow_open:Nn \duckuments_example_file_iow { example-image-duck.tex }
\iow_now:Nn \duckuments_example_file_iow
@@ -340,15 +370,15 @@
\iow_now:Nn \duckuments_example_file_iow
{ \end{document} }
\iow_close:N \duckuments_example_file_iow
- }%<<<
+ }%=<<
\newcommand*\duckumentsDrawRandomDucks
- {%>>>
+ {%>>=
\@ifstar
{\duckumentsDrawRandomDucks@portrait}
{\duckumentsDrawRandomDucks@landscape}%
- }%<<<
+ }%=<<
\newcommand*\duckuments@headings[1]
- {%>>>
+ {%>>=
\ifcase#1\relax
\expandafter\chapter
\or \expandafter\section
@@ -358,9 +388,9 @@
\else \expandafter\@gobble
\fi
{\duckuments@headings@text{#1}}
- }%<<<
+ }%=<<
\newcommand*\duckuments@headings@level[1]
- {%>>>
+ {%>>=
(
\ifcase#1
chapter
@@ -370,20 +400,20 @@
\or paragraph
\fi
)
- }%<<<
+ }%=<<
\newcommand*\duckuments@ifinline[2][]
{ \bool_if:NTF \l_duckuments_math_inline_bool { #2 } { #1 } }
\newcommand*\duckuments@ifdisplay[2][]
{ \bool_if:NTF \l_duckuments_math_display_bool { #2 } { #1 } }
\cs_new_protected_nopar:Npn \duckuments_list_example:n #1
- {%>>>
+ {%>>=
\subsection{Example\ for\ ducks\ (#1)}
\ducklist { #1 }
\subsubsection{Nested\ ducks}
\ducklistlist { #1 }
- }%<<<
+ }%=<<
\NewDocumentCommand \duckuments@enquote { s +m }
- {%>>>
+ {%>>=
\IfBooleanTF { #1 }
{
\cs_if_exist_use:NTF
@@ -395,19 +425,19 @@
\enquote { { #2 } }
{``#2''}
}
- }%<<<
+ }%=<<
\newcommand*\duckumentsDrawRandomDucks@landscape[1][\duckuments@randoms]
- {%>>>
+ {%>>=
\foreach\x in {1,2,...,#1}
{\duckumentsDrawRandomDucks(a)draw{6.47214}{4}{3.23607}{2}}
- }%<<<
+ }%=<<
\newcommand*\duckumentsDrawRandomDucks@portrait[1][\duckuments@randoms]
- {%>>>
+ {%>>=
\foreach\x in {1,2,...,#1}
{\duckumentsDrawRandomDucks(a)draw{1.8541}{3}{.92705}{1.5}}
- }%<<<
+ }%=<<
\newcommand*\duckumentsDrawRandomDucks@draw[4]
- {%>>>
+ {%>>=
\begin{tikzpicture}
\draw[fill=gray!50,use~as~bounding~box] (0,0) rectangle (#1,#2);
\draw[gray,thin] (0,0) -- (#1,#2);
@@ -417,9 +447,9 @@
\node at (#3,#4) {\tikz\randuck;};
\draw[black] (0,0) rectangle (#1,#2);
\end{tikzpicture}
- }%<<<
+ }%=<<
\cs_new_protected_nopar:Npn \duckuments_patch_includegraphics:
- {%>>>
+ {%>>=
\@ifpackageloaded { graphicx }
{
\LetLtxMacro\duckuments@includegraphicsBAK\includegraphics
@@ -427,29 +457,29 @@
{ >{\duckuments_starred:n}s O{} o m }
{
\IfValueTF { ##3 }
- { \duckuments@includegraphicsBAK##1[##2][##3]{##4} }
+ { \duckuments@includegraphicsBAK##1[{##2}][{##3}]{##4} }
{
\regex_match:NnTF \c_duckuments_example_regex { ##4 }
{
- \duckuments_get_random_page:
\duckuments@includegraphicsBAK##1
- [page=\duckuments_random_page:,##2]
+ [{page=\duckuments_random_page:,##2}]
{ ##4 }
}
{
- \duckuments@includegraphicsBAK##1[##2]{##4}
+ \duckuments@includegraphicsBAK##1[{##2}]{##4}
}
}
}
}
{}
- }%<<<
+ }%=<<
\cs_new_protected:Npn \duckuments_blindduck_range_test:n #1
- {%>>>
+ {%>>=
\regex_match:NnTF \c_duckuments_range_regex { #1 }
{
\seq_set_split:Nnn \l_duckuments_range_seq { - } { #1 }
- \int_compare:nNnTF { 1 } = { \seq_count:N \l_duckuments_range_seq }
+ \int_compare:nNnTF
+ { \c_one_int } = { \seq_count:N \l_duckuments_range_seq }
{
\cs_set:Npn \duckuments@blindduck@text
{
@@ -460,13 +490,14 @@
{
\bool_set_true:N \l_duckuments_blindduck_pars_bool
\exp_args:Nx
- \tl_if_empty:nF { \seq_item:Nn \l_duckuments_range_seq { \c_one } }
+ \tl_if_empty:nF
+ { \seq_item:Nn \l_duckuments_range_seq { \c_one_int } }
{
\int_gset:Nn \g_duckuments_blindduck_start_int
- { \seq_item:Nn \l_duckuments_range_seq { \c_one } }
+ { \seq_item:Nn \l_duckuments_range_seq { \c_one_int } }
}
\exp_args:Nx
- \tl_if_empty:nTF { \seq_item:Nn \l_duckuments_range_seq { \c_two } }
+ \tl_if_empty:nTF { \seq_item:Nn \l_duckuments_range_seq { 2 } }
{
\int_gset_eq:NN
\g_duckuments_blindduck_end_int
@@ -474,7 +505,7 @@
}
{
\int_set:Nn \g_duckuments_blindduck_end_int
- { \seq_item:Nn \l_duckuments_range_seq { \c_two } }
+ { \seq_item:Nn \l_duckuments_range_seq { 2 } }
}
\duckuments_blindduck_set_text:xx
{ \int_use:N \g_duckuments_blindduck_start_int }
@@ -485,29 +516,29 @@
\exp_args:NnnV
\msg_error:nnn { duckuments } { option~unknown } \l_keys_key_tl
}
- }%<<<
+ }%=<<
\cs_generate_variant:Nn \duckuments_blindduck_range_test:n { V }
\cs_new:Npn \duckuments_blindduck_set_text:nn #1 #2
- {%>>>
+ {%>>=
\def \duckuments@blindduck@text
{
- \int_step_function:nnnN { #1 } { \c_one } { #2 }
+ \int_step_function:nnnN { #1 } { \c_one_int } { #2 }
\duckuments_blindduck_par_loop:n
\duckuments_blindduck_set_next_start:n { #2 }
}
- }%<<<
+ }%=<<
\cs_generate_variant:Nn \duckuments_blindduck_set_text:nn { xx }
\cs_new:Npn \duckuments_blindduck_set_next_start:n #1
- {%>>>
+ {%>>=
\int_gset:Nn \g_duckuments_blindduck_start_int
- { \int_mod:nn { #1 } { \c_duckuments_blindduck_pars_int } + \c_one }
- }%<<<
+ { \int_mod:nn { #1 } { \c_duckuments_blindduck_pars_int } + \c_one_int }
+ }%=<<
\cs_new:Npn \duckuments_blindduck_single_par:n #1
- {%>>>
+ {%>>=
\bool_if:nTF
{
\int_compare_p:nNn { #1 } > { \c_duckuments_blindduck_pars_int }
- || \int_compare_p:nNn { #1 } < { \c_one }
+ || \int_compare_p:nNn { #1 } < { \c_one_int }
}
{
\msg_error:nnxxxx { duckuments } { out~of~range }
@@ -518,128 +549,24 @@
{
\use:c { duckuments@blindduck@text@ \int_to_roman:n { #1 } }
}
- }%<<<
+ }%=<<
\cs_new:Npn \duckuments_blindduck_par_loop:n #1
- {%>>>
+ {%>>=
\duckuments_blindduck_single_par:n { #1 }
\par
- }%<<<
+ }%=<<
\cs_new_protected:Npn \duckuments_starred:n #1
- {%>>>
+ {%>>=
\IfBooleanTF { #1 }
{ \def\ProcessedArgument{*} }
{ \def\ProcessedArgument{} }
- }%<<<
-\sys_if_engine_xetex:TF
- {
- \int_new:N \g_duckuments_RCiv_i_int
- \int_new:N \g_duckuments_RCiv_j_int
- \int_new:N \g_duckuments_RCiv_keylength_int
- \int_new:N \g_duckuments_tmpa_int
- \int_const:Nn \c_duckuments_RCiv_Slength_int { 256 }
- \tl_new:N \l_duckuments_tmpa_tl
- \tl_new:N \l_duckuments_tmpb_tl
- \cs_new_protected_nopar:Npn \duckuments_RCiv_S_new:n #1
- { \int_new:c { g_duckuments_RCiv_S_ \int_eval:n { #1 } _int } }
- \cs_new_protected_nopar:Npn \duckuments_RCiv_S_set:nn #1 #2
- { \int_gset:cn { g_duckuments_RCiv_S_ \int_eval:n { #1 } _int } { #2 } }
- \cs_new_nopar:Npn \duckuments_RCiv_S_get:n #1
- { \int_use:c { g_duckuments_RCiv_S_ \int_eval:n { #1 } _int } }
- \cs_new_protected_nopar:Npn \duckuments_RCiv_key_new:n #1
- { \int_new:c { g_duckuments_RCiv_key_ \int_eval:n { #1 } _int } }
- \cs_new_protected_nopar:Npn \duckuments_RCiv_key_set:nn #1 #2
- { \int_gset:cn { g_duckuments_RCiv_key_ \int_eval:n { #1 } _int } { #2 } }
- \cs_new_nopar:Npn \duckuments_RCiv_key_get:n #1
- { \int_use:c { g_duckuments_RCiv_key_ \int_eval:n { #1 } _int } }
- \int_step_inline:nnnn { 0 } { 1 } { 255 }
- {
- \duckuments_RCiv_S_new:n { #1 }
- \duckuments_RCiv_S_set:nn { #1 } { #1 }
- }
- \int_step_inline:nnnn { 0 } { 1 } { 4 }
- { \duckuments_RCiv_key_new:n { #1 } }
- \duckuments_RCiv_key_set:nn { 0 } { \c_sys_minute_int }
- \duckuments_RCiv_key_set:nn { 1 } { \c_sys_hour_int }
- \duckuments_RCiv_key_set:nn { 2 } { \c_sys_day_int }
- \duckuments_RCiv_key_set:nn { 3 } { \c_sys_month_int }
- \duckuments_RCiv_key_set:nn { 4 }
- { \int_mod:nn { \c_sys_year_int } { \c_duckuments_RCiv_Slength_int } }
- \int_gset:Nn \g_duckuments_RCiv_keylength_int { 5 }
- \str_map_inline:Nn \c_sys_jobname_str
- {
- \duckuments_RCiv_key_new:n { \g_duckuments_RCiv_keylength_int }
- \duckuments_RCiv_key_set:nn
- { \g_duckuments_RCiv_keylength_int }
- { \int_from_alph:n { #1 } }
- \int_gincr:N \g_duckuments_RCiv_keylength_int
- }
- \cs_new_protected_nopar:Npn \duckuments_swap_S_entries:nn #1 #2
- {
- \int_set_eq:Nc
- \g_duckuments_tmpa_int
- { g_duckuments_RCiv_S_ \int_eval:n { #1 } _int }
- \int_set_eq:cc
- { g_duckuments_RCiv_S_ \int_eval:n { #1 } _int }
- { g_duckuments_RCiv_S_ \int_eval:n { #2 } _int }
- \int_set_eq:cN
- { g_duckuments_RCiv_S_ \int_eval:n { #2 } _int }
- \g_duckuments_tmpa_int
- }
- \int_gset:Nn \g_duckuments_RCiv_keylength_int { 5 }
- \cs_new:Npn \duckuments_gadd_mod:Nnn #1 #2 #3
- { \int_gset:Nn #1 { \int_mod:nn { #1 + ( #2 ) } { #3 } } }
- \cs_new:Npn \duckuments_gadd_mod_Slength:Nn #1 #2
- {
- \duckuments_gadd_mod:Nnn #1
- { #2 } { \c_duckuments_RCiv_Slength_int }
- }
- \int_step_inline:nnnn { 0 } { 1 } { 255 }
- {
- \int_gset:Nn \g_duckuments_tmpa_int
- { \int_mod:nn { #1 } { \g_duckuments_RCiv_keylength_int } }
- \duckuments_gadd_mod_Slength:Nn \g_duckuments_RCiv_j_int
- {
- \duckuments_RCiv_S_get:n { #1 }
- + \duckuments_RCiv_key_get:n { \g_duckuments_tmpa_int }
- }
- \duckuments_swap_S_entries:nn { #1 } { \g_duckuments_RCiv_j_int }
- }
- \int_gzero:N \g_duckuments_RCiv_i_int
- \int_gzero:N \g_duckuments_RCiv_j_int
- \cs_new_protected_nopar:Npn \duckuments_get_random_page:
- {
- \duckuments_gadd_mod_Slength:Nn \g_duckuments_RCiv_i_int { \c_one }
- \duckuments_gadd_mod_Slength:Nn \g_duckuments_RCiv_j_int
- { \duckuments_RCiv_S_get:n { \g_duckuments_RCiv_i_int } }
- \duckuments_swap_S_entries:nn
- { \g_duckuments_RCiv_i_int }
- { \g_duckuments_RCiv_j_int }
- \int_gset:Nn \g_duckuments_tmpa_int
- { \duckuments_RCiv_S_get:n { \g_duckuments_RCiv_i_int } }
- \duckuments_gadd_mod_Slength:Nn \g_duckuments_tmpa_int
- { \duckuments_RCiv_S_get:n { \g_duckuments_RCiv_j_int } }
- \cs_set:Nx \duckuments_random_page:
- {
- \int_eval:n
- {
- \int_mod:nn
- { \duckuments_RCiv_S_get:n { \g_duckuments_tmpa_int } }
- { \c_duckuments_example_pages_int }
- + \c_one
- }
- }
- }
- \cs_new:Npn \duckuments_random_page: { 1 }
- }
- {
- \cs_new:Npn \duckuments_get_random_page: {}
- \cs_new:Npn \duckuments_random_page:
- { \int_rand:nn { 1 } { \c_duckuments_example_pages_int } }
- }
+ }%=<<
+\cs_new:Npn \duckuments_random_page:
+ { \int_rand:n { \c_duckuments_example_pages_int } }
\ExplSyntaxOff
\newcommand*\duckuments@blindduck@text{\duckuments@blindduck@text@i}
\newcommand*\duckuments@blindduck@text@i
- {%>>>
+ {%>>=
There once was a very smart but sadly blind duck. When it was still a small
duckling it was renowned for its good vision. But sadly as the duck grew
older it caught a sickness which caused its eyesight to worsen. It became so
@@ -651,26 +578,26 @@
do its research any longer. It called for its underduckling and said:
\duckuments@enquote{Go, find me the best eye ducktor there is. He shall
heal me from my disease!}%
- }%<<<
+ }%=<<
\newcommand*\duckuments@blindduck@text@ii
- {%>>>
+ {%>>=
\duckuments@enquote{But my duck, how are you supposed to manage your daily
routines without my visual guidance}, replied the underduckling. The smart
duck's face turned grim in anger. \duckuments@enquote{You dare to talk
back?} The underduckling blushed ashamed. How could he have objections
after his duck gave strict orders? The underduckling was so embarrassed
about his own behaviour he had to solve an equation.%
- }%<<<
+ }%=<<
\newcommand*\duckuments@blindduck@text@iii
- {%>>>
+ {%>>=
After the equation was solved and the underduckling prepared his leave for
the next day it fell asleep in a shaky mood. It did not know what the
journey had prepared for him and if he was prepared enough for it. His sleep
was restless. The dreams he had that night were not calm and bright as they
used to be for an innocent underduckling.%
- }%<<<
+ }%=<<
\newcommand*\duckuments@blindduck@text@iv
- {%>>>
+ {%>>=
Before dawn the underduckling woke. He didn't have the feeling of being well
rested. But nonetheless he knew that this was the day he should leave.
Except saying goodbye to his beloved ones there was nothing holding him
@@ -678,34 +605,34 @@
inexperienced underduckling was ever sent on. He bid farewell to his mother,
all his brothers and sisters, and finally from his duck. The bag was
shouldered, the boots were tied, the underduckling left.%
- }%<<<
+ }%=<<
\newcommand*\duckuments@blindduck@text@v
- {%>>>
+ {%>>=
As the underduckling went along he saw a tree. It was so tall he couldn't
even approximate its height. Oh, how small he felt. What should he, a small
duckling whose plumage was still fluffy, achieve in this vast, gigantic
world? He stuck his trembling wings under the straps of his backpack to calm
his shaking limbs. Where should he start his search? How should he survive
in the hostile nature surrounding the sheltered pond of his community?
- }%<<<
+ }%=<<
\newcommand*\duckuments@headings@text[1]
{A friendly duck at level #1 \duckuments@headings@level{#1}}
\newcommand*\ducklists@content
- {%>>>
+ {%>>=
\item First swims father drake
\item Then floats mother duck
\item After her paddles baby duckling
\item And over there bathes uncle canard
- }%<<<
+ }%=<<
\newcommand*\ducklists@content@starred
- {%>>>
+ {%>>=
\item[drake] is the swimming father
\item[duck] is the floating mother
\item[duckling] is the paddling baby
\item[canard] is the bathing uncle
- }%<<<
+ }%=<<
\newcommand*\duckuments@listlist[1]
- {%>>>
+ {%>>=
\begin{#1}
\item swimming father drake
\begin{#1}
@@ -722,9 +649,9 @@
\end{#1}
\item floating mother duck
\end{#1}%
- }%<<<
+ }%=<<
\newcommand*\duckuments@listlist@starred[1]
- {%>>>
+ {%>>=
\begin{#1}
\item[drake] is the swimming father
\begin{#1}
@@ -741,7 +668,7 @@
\end{#1}
\item[duck] is the floating mother
\end{#1}%
- }%<<<
+ }%=<<
%%
%%
%% End of file `duckuments.sty'.
Binary files old/tex/latex/duckuments/example-image-duck-portrait.pdf and new/tex/latex/duckuments/example-image-duck-portrait.pdf differ
Binary files old/tex/latex/duckuments/example-image-duck.pdf and new/tex/latex/duckuments/example-image-duck.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/duckuments.tlpobj new/tlpkg/tlpobj/duckuments.tlpobj
--- old/tlpkg/tlpobj/duckuments.tlpobj 2019-02-28 03:33:01.000000000 +0100
+++ new/tlpkg/tlpobj/duckuments.tlpobj 2019-10-04 01:54:00.000000000 +0200
@@ -1,6 +1,6 @@
name duckuments
category Package
-revision 49936
+revision 52271
shortdesc Create duckified dummy content
relocated 1
longdesc The package provides facilities to create duckified dummy
@@ -14,14 +14,14 @@
longdesc ducklist{enumerate} \duckdescription - ducklist{description}
longdesc \duckumentsCreateExampleFile \duckumentsDrawRandomDucks The
longdesc package works with pdfTeX, LuaTeX, and XeTeX.
-runfiles size=145
+runfiles size=147
RELOC/tex/latex/duckuments/duckuments.sty
RELOC/tex/latex/duckuments/example-image-duck-portrait.pdf
RELOC/tex/latex/duckuments/example-image-duck.pdf
catalogue-also lipsum tikzducks
catalogue-contact-repository https://github.com/Skillmon/ltx_duckuments
catalogue-ctan /macros/latex/contrib/duckuments
-catalogue-date 2019-02-03 22:30:55 +0100
+catalogue-date 2019-10-03 20:32:43 +0200
catalogue-license lppl1.3c
catalogue-topics macro-supp dummy-gen
-catalogue-version 0.4c
+catalogue-version 0.5
++++++ dutchcal.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dutchcal.doc.tlpobj new/tlpkg/tlpobj/dutchcal.doc.tlpobj
--- old/tlpkg/tlpobj/dutchcal.doc.tlpobj 2019-02-28 03:33:02.000000000 +0100
+++ new/tlpkg/tlpobj/dutchcal.doc.tlpobj 2020-03-04 23:50:35.000000000 +0100
@@ -1,6 +1,6 @@
name dutchcal.doc
category Package
-revision 23448
+revision 54080
shortdesc doc files of dutchcal
relocated 1
docfiles size=1
++++++ dutchcal.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dutchcal.tlpobj new/tlpkg/tlpobj/dutchcal.tlpobj
--- old/tlpkg/tlpobj/dutchcal.tlpobj 2019-02-28 03:33:02.000000000 +0100
+++ new/tlpkg/tlpobj/dutchcal.tlpobj 2020-03-04 23:50:35.000000000 +0100
@@ -1,13 +1,13 @@
name dutchcal
category Package
-revision 23448
+revision 54080
shortdesc A reworking of ESSTIX13, adding a bold version
relocated 1
longdesc This package reworks the mathematical calligraphic font
longdesc ESSTIX13, adding a bold version. LaTeX support files are
longdesc included. The new fonts may also be accessed from the most
-longdesc recent version of mathalfa. The fonts themselves are subject to
-longdesc the SIL OPEN FONT LICENSE, version 1.1.
+longdesc recent version of mathalpha. The fonts themselves are subject
+longdesc to the SIL OPEN FONT LICENSE, version 1.1.
execute addMap dutchcal.map
runfiles size=20
RELOC/fonts/afm/public/dutchcal/DutchCalBold.afm
@@ -24,7 +24,6 @@
RELOC/tex/latex/dutchcal/dutchcal.sty
RELOC/tex/latex/dutchcal/udutchcal.fd
catalogue-ctan /fonts/dutchcal
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font font-calligraphic font-type1
catalogue-version 1.0
1
0
Hello community,
here is the log from the commit of package texlive-specs-f for openSUSE:Factory checked in at 2020-05-29 21:17:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-f (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-f.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-f"
Fri May 29 21:17:13 2020 rev:40 rq:806888 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-f/texlive-specs-f.changes 2019-11-07 23:10:16.952118864 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-f.new.3606/texlive-specs-f.changes 2020-05-29 21:24:53.628416723 +0200
@@ -1,0 +2,60 @@
+Mon May 18 08:47:10 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Wed May 6 11:27:35 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Scan *.def files as well for RequirePackage
+
+-------------------------------------------------------------------
+Tue May 5 13:55:07 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- Update to TeXLive 2020
+ * Port patches
+ kpathsea_cnf.dif
+ latexpand_perl.dif
+ luaotfload_varfonts.dif
+ luatex_cnf.dif
+ musixtex_various.dif
+ * Delete patches not needed anymore as files have moved
+ tetex_scripts.dif
+ * Delete patche updmap-map_roboto.dif as fixed upstream
+ * Add new patches to catch moved files
+ texlive-scripts-extra_scripts.dif
+ texlive-scripts_scripts.dif
+ * Add new patch xetex_conf.dif to fit FHS location
+ * Remove TeXLive installer files breaking rpm database
+ texlive-scripts.removes
+
+-------------------------------------------------------------------
New:
----
csvmerge.doc.tar.xz
csvmerge.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-f.spec ++++++
++++ 15479 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-f/texlive-specs-f.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-f.new.3606/texlive-specs-f.spec
++++++ context-french.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-french.doc.tlpobj new/tlpkg/tlpobj/context-french.doc.tlpobj
--- old/tlpkg/tlpobj/context-french.doc.tlpobj 2019-02-28 03:29:48.000000000 +0100
+++ new/tlpkg/tlpobj/context-french.doc.tlpobj 2020-03-10 01:48:31.000000000 +0100
@@ -1,6 +1,6 @@
name context-french.doc
category ConTeXt
-revision 47085
+revision 54215
shortdesc doc files of context-french
relocated 1
docfiles size=113
++++++ context-french.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-french.tlpobj new/tlpkg/tlpobj/context-french.tlpobj
--- old/tlpkg/tlpobj/context-french.tlpobj 2019-02-28 03:29:48.000000000 +0100
+++ new/tlpkg/tlpobj/context-french.tlpobj 2020-03-10 01:48:31.000000000 +0100
@@ -1,14 +1,13 @@
name context-french
category ConTeXt
-revision 47085
+revision 54215
shortdesc Support for writing French in ConTeXt
relocated 1
longdesc Deals with spacing around French punctuation; the package is
-longdesc distributed for ConTeXt Mark iv only.
+longdesc distributed for ConTeXt Mark IV only.
depend context
runfiles size=1
RELOC/tex/context/third/french/t-french.mkiv
catalogue-ctan /macros/context/contrib/context-french
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics french
++++++ context-handlecsv.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/context/third/handlecsv/VERSION new/doc/context/third/handlecsv/VERSION
--- old/doc/context/third/handlecsv/VERSION 2019-04-02 23:10:25.000000000 +0200
+++ new/doc/context/third/handlecsv/VERSION 2019-06-03 23:34:31.000000000 +0200
@@ -1 +1 @@
-2019.03.30
+2019.05.27
Binary files old/doc/context/third/handlecsv/handlecsv.epub and new/doc/context/third/handlecsv/handlecsv.epub differ
Binary files old/doc/context/third/handlecsv/handlecsv.pdf and new/doc/context/third/handlecsv/handlecsv.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-handlecsv.doc.tlpobj new/tlpkg/tlpobj/context-handlecsv.doc.tlpobj
--- old/tlpkg/tlpobj/context-handlecsv.doc.tlpobj 2019-04-03 01:24:52.000000000 +0200
+++ new/tlpkg/tlpobj/context-handlecsv.doc.tlpobj 2019-06-04 01:39:14.000000000 +0200
@@ -1,9 +1,9 @@
name context-handlecsv.doc
category ConTeXt
-revision 50709
+revision 51306
shortdesc doc files of context-handlecsv
relocated 1
-docfiles size=252
+docfiles size=249
RELOC/doc/context/third/handlecsv/VERSION
RELOC/doc/context/third/handlecsv/handlecsv.epub
RELOC/doc/context/third/handlecsv/handlecsv.pdf
++++++ context-handlecsv.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/context/third/handlecsv/t-handlecsv-extra.lua new/tex/context/third/handlecsv/t-handlecsv-extra.lua
--- old/tex/context/third/handlecsv/t-handlecsv-extra.lua 2018-04-09 23:13:49.000000000 +0200
+++ new/tex/context/third/handlecsv/t-handlecsv-extra.lua 2019-06-03 23:34:31.000000000 +0200
@@ -1,14 +1,14 @@
-- %D \module
-- %D [ file=t-handlecsv-extra.lua,
--- %D version=2018.02.26,
+-- %D version=2019.05.27,
-- %D title=HandleCSV extra,
-- %D subtitle=CSV file analysis - extended functions and macros,
-- %D author=Jaroslav Hajtmar,
--- %D date=2018-02-26,
+-- %D date=2019-05-27,
-- %D copyright=Jaroslav Hajtmar,
-- %D license=GNU General Public License]
--
--- %C Copyright (C) 2018 Jaroslav Hajtmar
+-- %C Copyright (C) 2019 Jaroslav Hajtmar
-- %C
-- %C This program is free software: you can redistribute it and/or modify
-- %C it under the terms of the GNU General Public License as published by
@@ -61,6 +61,63 @@
+-- function thirddata.handlecsv.cr_lines(s)
+-- return s:gsub('\r\n?', '\n'):gmatch('(.-)\n')
+-- end
+
+
+function thirddata.handlecsv.file2Array(filename)
+-- read CSV file into line array
+local linesarray={}
+ for line in io.lines (filename) do
+ linesarray[#linesarray+1]=line
+ end
+return linesarray
+end
+
+
+
+function thirddata.handlecsv.writefileinreverseorder(inpfilename,outfilename)
+-- write CSV file <inpfilename> into reverse order CSV file <outfilename>
+ local tLines = thirddata.handlecsv.file2Array(inpfilename)
+ local outfile = io.open(outfilename, "w")
+ local ifrom=#tLines
+ local ito=1
+ if thirddata.handlecsv.gCSVHeader then -- when CSV file is with header, then header line is first line
+ outfile:write(tLines[1])
+ outfile:write("\r\n")
+ ito=2
+ end
+ for i = ifrom, ito, -1 do -- write rest of lines in reverse order
+ outfile:write(tLines[i])
+ outfile:write("\r\n")
+ end
+outfile:flush()
+outfile:close()
+end
+
+
+
+function thirddata.handlecsv.deletefile(filename)
+-- remove file from disk
+ os.remove(filename)
+end
+
+
+function thirddata.handlecsv.varreverseorder(csvfilename)
+-- CSV file <csvfilename> is stored in variable array gTableRows['csvfilename'][row][column]
+-- this function rearrange gTableRows into reverse order
+local templine={}
+for i = 1, math.floor(thirddata.handlecsv.gNumRows[csvfilename]/2) do
+templine=thirddata.handlecsv.gTableRows[csvfilename][i]
+thirddata.handlecsv.gTableRows[csvfilename][i]=thirddata.handlecsv.gTableRows[csvfilename][thirddata.handlecsv.gNumRows[csvfilename]-i+1]
+thirddata.handlecsv.gTableRows[csvfilename][thirddata.handlecsv.gNumRows[csvfilename]-i+1]=templine
+end
+end
+
+
+
+
-- ConTeXt source:
local string2print=[[%
@@ -68,16 +125,24 @@
\def\addleading#1#2#3{\ctxlua{context(thirddata.handlecsv.addleadingcharacters('#1','#2','#3'))}}
\def\addzeros#1#2{\ctxlua{context(thirddata.handlecsv.addleadingzeros('#1','#2'))}}
\def\zeroed#1{\ctxlua{context(thirddata.handlecsv.addzeros('#1'))}}
+% \def\zeroedlineno{\ctxlua{context(string.rep( "0",(tostring(thirddata.handlecsv.numrows())):len() - (tostring(thirddata.handlecsv.linepointer())):len()) .. thirddata.handlecsv.linepointer())}}% from Pablo
\def\zeroedlineno{\zeroed{\lineno}}% from Pablo (and simplified by him)
+\def\writefileinreverseorderfromto#1#2{\ctxlua{thirddata.handlecsv.writefileinreverseorder('#1','#2')}}%
+\def\writecurrfileinreverseorderto#1{\ctxlua{thirddata.handlecsv.writefileinreverseorder(thirddata.handlecsv.gCurrentlyProcessedCSVFile,'#1')}}%
+\def\deletefile#1{\ctxlua{thirddata.handlecsv.deletefile('#1')}}%
+\def\reverseorderof#1{\ctxlua{thirddata.handlecsv.varreverseorder('#1')}}
+\def\reverseorder{\ctxlua{thirddata.handlecsv.varreverseorder(thirddata.handlecsv.gCurrentlyProcessedCSVFile)}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Complete listing macros and commands that can be used (to keep track of all defined macros):
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \addleading{}{}{}, \addzeros{}{}, \zeroed{}, \zeroedlineno (from Pablo)
-%
-
-
+% \writefileinreverseorderfromto{<inpfilename>}{<outfilename>} % create file <outfilename> in reverse order of file <inpfilename>
+% \writecurrfileinreverseorderto{<outfilename>} % create file <outfilename> in reverse order
+% \deletefile{<filename>} % close and delete file <filename>
+% \reverseorderof{<csvfilename>} % reverse order of opened CSV file <csvfilename>
+% \reverseorder % reverse order of currently processed CSV file
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-handlecsv.tlpobj new/tlpkg/tlpobj/context-handlecsv.tlpobj
--- old/tlpkg/tlpobj/context-handlecsv.tlpobj 2019-04-03 01:24:52.000000000 +0200
+++ new/tlpkg/tlpobj/context-handlecsv.tlpobj 2019-06-04 01:39:15.000000000 +0200
@@ -1,12 +1,12 @@
name context-handlecsv
category ConTeXt
-revision 50709
+revision 51306
shortdesc Data merging for automatic document creation
relocated 1
longdesc The package handles csv data merging for automatic document
longdesc creation.
depend context
-runfiles size=21
+runfiles size=22
RELOC/tex/context/third/handlecsv/t-handlecsv-extra.lua
RELOC/tex/context/third/handlecsv/t-handlecsv-tools.lua
RELOC/tex/context/third/handlecsv/t-handlecsv.lua
@@ -15,6 +15,6 @@
catalogue-contact-repository https://github.com/ousia/handlecsv
catalogue-contact-support https://github.com/ousia/handlecsv/issues
catalogue-ctan /macros/context/contrib/context-handlecsv
-catalogue-date 2018-09-25 05:27:36 +0200
+catalogue-date 2019-06-03 05:38:18 +0200
catalogue-license gpl3
catalogue-topics context csv-support
++++++ context-letter.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/context/third/letter/README new/doc/context/third/letter/README
--- old/doc/context/third/letter/README 2011-12-20 02:25:08.000000000 +0100
+++ new/doc/context/third/letter/README 2020-01-23 18:40:40.000000000 +0100
@@ -17,5 +17,17 @@
Letters
-------
+\usemodule[letter]
+
+\startletter
+...
+\stopletter
+
Memos
------
\ No newline at end of file
+-----
+
+\usemodule[memo]
+
+\startmemo
+...
+\stopmemo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/context/third/letter/VERSION new/doc/context/third/letter/VERSION
--- old/doc/context/third/letter/VERSION 2018-03-23 03:04:47.000000000 +0100
+++ new/doc/context/third/letter/VERSION 2020-01-21 22:43:28.000000000 +0100
@@ -1 +1 @@
-2017.08.27
+2020.01.20
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-letter.doc.tlpobj new/tlpkg/tlpobj/context-letter.doc.tlpobj
--- old/tlpkg/tlpobj/context-letter.doc.tlpobj 2019-02-28 03:29:49.000000000 +0100
+++ new/tlpkg/tlpobj/context-letter.doc.tlpobj 2020-01-24 01:57:07.000000000 +0100
@@ -1,6 +1,6 @@
name context-letter.doc
category ConTeXt
-revision 47085
+revision 53499
shortdesc doc files of context-letter
relocated 1
docfiles size=2
++++++ context-letter.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/context/third/letter/base/s-cor-00.lua new/tex/context/third/letter/base/s-cor-00.lua
--- old/tex/context/third/letter/base/s-cor-00.lua 2013-01-10 00:40:24.000000000 +0100
+++ new/tex/context/third/letter/base/s-cor-00.lua 2020-01-20 23:24:36.000000000 +0100
@@ -85,7 +85,7 @@
function correspondence.file(environment,name)
local environment = environment
local name = name
- commands.uselibrary {
+ resolvers.uselibrary {
name = name,
patterns = patterns[environment],
action = action,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/context-letter.tlpobj new/tlpkg/tlpobj/context-letter.tlpobj
--- old/tlpkg/tlpobj/context-letter.tlpobj 2019-02-28 03:29:49.000000000 +0100
+++ new/tlpkg/tlpobj/context-letter.tlpobj 2020-01-24 01:57:07.000000000 +0100
@@ -1,6 +1,6 @@
name context-letter
category ConTeXt
-revision 47085
+revision 53499
shortdesc ConTeXt package for writing letters
relocated 1
longdesc A means of writing 'vanilla' letters and memos is provided,
@@ -77,6 +77,5 @@
RELOC/tex/context/third/letter/style/resume-imp-classic.mkiv
RELOC/tex/context/third/letter/style/resume-imp-default.mkiv
catalogue-ctan /macros/context/contrib/context-letter
-catalogue-date 2018-08-11 15:29:10 +0200
catalogue-license gpl
catalogue-topics letter
++++++ context.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-f/context.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-f.new.3606/context.doc.tar.xz differ: char 122916, line 485
++++++ context.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-f/context.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-f.new.3606/context.tar.xz differ: char 26, line 1
++++++ cooking-units.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cooking-units/README.md new/doc/latex/cooking-units/README.md
--- old/doc/latex/cooking-units/README.md 2018-04-30 19:05:54.000000000 +0200
+++ new/doc/latex/cooking-units/README.md 2020-01-14 22:51:33.000000000 +0100
@@ -55,7 +55,7 @@
-------
This material is subject to the LaTeX Project Public License 1.3c or later. See
- https://ctan.org/license/lppl1.3c
+ https://www.latex-project.org/lppl/
for the details of that license.
Binary files old/doc/latex/cooking-units/cooking-units.pdf and new/doc/latex/cooking-units/cooking-units.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cooking-units.doc.tlpobj new/tlpkg/tlpobj/cooking-units.doc.tlpobj
--- old/tlpkg/tlpobj/cooking-units.doc.tlpobj 2019-02-28 03:29:59.000000000 +0100
+++ new/tlpkg/tlpobj/cooking-units.doc.tlpobj 2020-01-15 01:54:35.000000000 +0100
@@ -1,8 +1,8 @@
name cooking-units.doc
category Package
-revision 48748
+revision 53403
shortdesc doc files of cooking-units
relocated 1
-docfiles size=162
+docfiles size=172
RELOC/doc/latex/cooking-units/README.md
RELOC/doc/latex/cooking-units/cooking-units.pdf
++++++ cooking-units.tar.xz ++++++
++++ 2027 lines of diff (skipped)
++++++ cormorantgaramond.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cormorantgaramond/README new/doc/fonts/cormorantgaramond/README
--- old/doc/fonts/cormorantgaramond/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/cormorantgaramond/README 2020-04-12 23:27:51.000000000 +0200
@@ -0,0 +1,76 @@
+This is the README for the cormorantgaramond package,
+version 3.601 (2020-04-12).
+
+This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
+support for the Cormorant Garamond family of fonts, designed by
+Christian Thalman of Catharsis Fonts.
+
+While this project was heavily inspired by Claude Garamont's
+immortal legacy, Christian did not use any specific font as
+a starting point or direct reference for the designs. Most
+glyphs were drawn from scratch; when he needed guidance on
+a specific character, he searched for the term Garamond and
+skimmed through the results for a general impression.
+
+The family includes light, regular, medium, semi-bold and
+bold weights, with italics.
+
+To install this package on a TDS-compliant
+TeX system download the file
+"tex-archive"/install/fonts/cormorantgaramond.tds.zip,
+where the preferred URL for "tex-archive" is
+http://mirror.ctan.org. Unzip the archive at the root of
+an appropriate texmf tree, likely a personal or local
+tree. If necessary, update the file-name database (e.g.,
+texhash). Update the font-map files by enabling the Map file
+CormorantGaramond.map.
+
+To use, add
+
+\usepackage{CormorantGaramond}
+
+to the preamble of your document. Options include:
+
+oldstyle,osf old-style figures
+lining,nf,lf lining figures
+
+proportional,p varying-width figures
+tabular,t fixed-width figures
+
+The defaults are lining and proportional.
+
+Small caps are available in all weights.
+
+Use options
+
+light, l for light weight instead of regular
+semibold, sb for semi-bold weight instead of bold
+medium for medium weight instead of bold
+
+Slanted variants are not supported; the italic variants will
+be automatically substituted. Font encodings supported are
+OT1, T1, TS1, LY1 and T2A/B/C.
+
+Options scaled=<number> or scale=<number> may be used to adjust
+fontsizes. The type1 option may be used by xelatex or lualatex users
+who prefer to use type1 fonts or to avoid fontspec.
+
+Commands \oldstylenums{...} and \liningnums{...} are defined to allow
+for local use of old-style figures or lining figures, respectively.
+Similarly, \tabularnums{...} and \proportionalnums{...} allow for local
+use of monospaced or varying-width figures, respectively.
+
+Superior numbers (for footnote markers) are available
+using \sufigures or \textsu{...}. Inferior numbers (for
+subscripts) are available using \infigures or \textinf{...}.
+
+The original fonts are available at
+https://fonts.google.com and are licensed
+under the SIL Open Font License, (version 1.1); the text may
+be found in the doc directory.
+
+The type1 versions were created using fontforge. The
+support files were created using autoinst and otftotfm and
+are licensed under the terms of the LaTeX Project Public
+License. The maintainer of this package is Bob Tennent (rdt
+at cs.queensu.ca)
Binary files old/doc/fonts/cormorantgaramond/cormorantgaramond.pdf and new/doc/fonts/cormorantgaramond/cormorantgaramond.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cormorantgaramond/cormorantgaramond.tex new/doc/fonts/cormorantgaramond/cormorantgaramond.tex
--- old/doc/fonts/cormorantgaramond/cormorantgaramond.tex 2016-08-16 23:45:09.000000000 +0200
+++ new/doc/fonts/cormorantgaramond/cormorantgaramond.tex 2019-12-09 22:50:53.000000000 +0100
@@ -1,5 +1,5 @@
\documentclass{article}
-\usepackage[T1]{fontenc}
+\usepackage[T2A,T1]{fontenc}
\usepackage{CormorantGaramond}
\usepackage{lipsum}
\begin{document}
@@ -8,49 +8,56 @@
\textbf{Cormorant Garamond}
\end{center}
-\section{Regular}
+\subsection*{Regular}
\lipsum[1]
-\section{Italic}
+\subsection*{Italic}
\textit{\lipsum[2]}
-\section{Bold}
+\subsection*{Bold}
\textbf{\lipsum[3]}
-\section{Bold Italic}
+\subsection*{Bold Italic}
\textbf{\textit{\lipsum[4]}}
-\section{Small Caps}
+\subsection*{Small Caps}
\textsc{\lipsum[5]}
-\section{Default Numbers}
+\subsection*{Default Numbers}
1234567890
-\section{Oldstyle Numbers}
+\subsection*{Oldstyle Numbers}
\oldstylenums{1234567890}
-\section{Lining Numbers}
+\subsection*{Lining Numbers}
\liningnums{1234567890}
-\section{Tabular Numbers}
+\subsection*{Tabular Numbers}
\tabularnums{1234567890}
-\section{Proportional Numbers}
+\subsection*{Proportional Numbers}
\proportionalnums{1234567890}
-\section{Superior Numbers}
+\subsection*{Superior Numbers}
X\textsu{1234567890}
-\section{Inferior Numbers}
+\subsection*{Inferior Numbers}
X\textinf{1234567890}
+\subsection*{Cyrillic}
+
+{\ifxetex\else\ifluatex\else\fontencoding{T2A}\selectfont\fi\fi
+Съешь ещё этих мягких французских булок да
+выпей чаю!}
+
+
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cormorantgaramond.doc.tlpobj new/tlpkg/tlpobj/cormorantgaramond.doc.tlpobj
--- old/tlpkg/tlpobj/cormorantgaramond.doc.tlpobj 2019-02-28 03:30:03.000000000 +0100
+++ new/tlpkg/tlpobj/cormorantgaramond.doc.tlpobj 2020-04-13 01:54:42.000000000 +0200
@@ -1,9 +1,10 @@
name cormorantgaramond.doc
category Package
-revision 41865
+revision 54696
shortdesc doc files of cormorantgaramond
relocated 1
-docfiles size=15
+docfiles size=42
RELOC/doc/fonts/cormorantgaramond/OFL.txt
+ RELOC/doc/fonts/cormorantgaramond/README
RELOC/doc/fonts/cormorantgaramond/cormorantgaramond.pdf
RELOC/doc/fonts/cormorantgaramond/cormorantgaramond.tex
++++++ cormorantgaramond.tar.xz ++++++
++++ 21034 lines of diff (skipped)
++++++ countriesofeurope.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/countriesofeurope/Changes new/doc/fonts/countriesofeurope/Changes
--- old/doc/fonts/countriesofeurope/Changes 2018-12-28 22:34:41.000000000 +0100
+++ new/doc/fonts/countriesofeurope/Changes 2019-10-04 22:49:55.000000000 +0200
@@ -1,2 +1,3 @@
+0.23 2019-10-03 - added color and Ligature option
0.22 2018-12-27 - added OpenType font and outline option
0.21 2012-04-18 - first CTAN version
\ No newline at end of file
Binary files old/doc/fonts/countriesofeurope/CountriesofEurope.pdf and new/doc/fonts/countriesofeurope/CountriesofEurope.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/countriesofeurope/CountriesofEurope.tex new/doc/fonts/countriesofeurope/CountriesofEurope.tex
--- old/doc/fonts/countriesofeurope/CountriesofEurope.tex 2018-12-28 22:34:41.000000000 +0100
+++ new/doc/fonts/countriesofeurope/CountriesofEurope.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,210 +0,0 @@
-
-%---------------------------
-\listfiles
-
-\documentclass{article}
-\usepackage{ifluatex}
-\ifluatex\else
- \pdfmapfile{+CountriesofEurope.map} % only needed, if the map is not enabled with updmap
-\fi
-\usepackage{lmodern,array,longtable,graphicx,ifthen,ragged2e,libertinus}
-\usepackage[Scale=7.5]{CountriesofEurope}
-
-\makeatletter
-\newcommand\Country[2][]{{%
- \tabular{|>{\Centering}p{2.5cm}|}\hline
- \strut\footnotesize\texttt{\textbackslash#2}\\\hline
- \parbox[c][3.2cm]{2cm}{\EUCountry[#1]{#2}}\\\hline
- \endtabular}}
-
-\makeatother
-
-\newcounter{N}
-
-\begin{document}
-\author{Rolf Niepraschk \and Herbert Voß}
-\title{Package \texttt{CountriesofEurope}}
-\maketitle
-
-
-\begin{sloppypar}
-This package defines the two macros \verb|\CountriesofEuropeFamily| and \verb|\EUCountry[options]{name}|,
-which allow to print one of the european countries as a single character with the given scaling or
-with an individual scaling.
-
-The first one switches
-to the font encoding \verb|U| (Type 1) or \verb|TU| (OpenType) and loads the font and the second
-one does the same but also with
-printing the character which the given name, e.\,g. for Finland: \verb|\EUCountry[Scale=0.2]{Germany}|$\rightarrow$%
-\EUCountry[Scale=0.2]{Germany}.
-\end{sloppypar}
-
-The font can be loaded
-with an optional argument for the scaling factor, which is preset to 1:
-
-\begin{verbatim}
-\usepackage[Scale=10]{CountriesofEurope}% scaled to 10
-\end{verbatim}
-
-The countris itself are available by a macro from the following list. The characters are
-at the position 128--166 in the Type~1 font \verb|CountriesofEurope.pfb| and also available
-with the \verb|\char| primitive. The following table shows the countries in their original size
-with a scaling of 7.5:
-
-\begin{longtable}{cccc}
-\Country{Albania} &
-\Country{Andorra} &
-\Country{Austria} &
-\Country{Belarus} \\
-\Country{Belgium} &
-\Country{Bosnia} &
-\Country{Bulgaria} &
-\Country{Croatia} \\
-\Country{Czechia} &
-\Country{Denmark} &
-\Country{Estonia} &
-\Country{Finland} \\
-\Country{France} &
-\Country{Germany} &
-\Country{GreatBritain} &
-\Country{Greece} \\
-\Country{Hungary} &
-\Country{Iceland} &
-\Country{Ireland} &
-\Country{Italy} \\
-\Country{Latvia} &
-\Country{Liechtenstein} &
-\Country{Lithuania} &
-\Country{Luxembourg} \\
-\Country{Macedonia} &
-\Country{Malta} &
-\Country{Moldova} &
-\Country{Montenegro} \\
-\Country{Netherlands} &
-\Country{Norway} &
-\Country{Poland} &
-\Country{Portugal} \\
-\Country{Romania} &
-\Country{Serbia} &
-\Country{Slovakia} &
-\Country{Slovenia} \\
-\Country{Spain} &
-\Country{Sweden} &
-\Country{Switzerland}
-
-\end{longtable}
-
-\noindent\rule{\textwidth}{.5mm}
-
-
-The countries in the original size with the given bounding box and the text command \verb|\huge|:
-
-% \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[1]CountriesofEurope}{}
-
-\medskip
-
-\begingroup
-\fboxsep=0pt
-\noindent%
-\ifluatex
- \fontspec{CountriesofEurope.otf}
- \huge
- \setcounter{N}{63724}%
- \whiledo{\value{N} > 63686}{%
- \fbox{\symbol{\value{N}}}%
- \addtocounter{N}{-1}}
-\else
- \huge
- \setcounter{N}{128}%
- \whiledo{\value{N} < 167}{%
- \fbox{\symbol{\value{N}}}%
- \stepcounter{N}}
-\fi
-\endgroup
-
-
-\clearpage
-
-All countries can be printed as outline, e.\,g.:
-
-\verb|\EUCountry[Scale=37.5,outline]{Germany}|
-
-\EUCountry[Scale=5,outline]{Germany}
-
-
-
-
-\ifluatex
- \fontspec{CountriesofEurope.otf}
-\else
- \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[1]CountriesofEurope}{}
-\fi
-
-\begin{longtable}{cccc}
-\Country[outline]{Albania} &
-\Country[outline]{Andorra} &
-\Country[outline]{Austria} &
-\Country[outline]{Belarus} \\
-\Country[outline]{Belgium} &
-\Country[outline]{Bosnia} &
-\Country[outline]{Bulgaria} &
-\Country[outline]{Croatia} \\
-\Country[outline]{Czechia} &
-\Country[outline]{Denmark} &
-\Country[outline]{Estonia} &
-\Country[outline]{Finland} \\
-\Country[outline]{France} &
-\Country[outline]{Germany} &
-\Country[outline]{GreatBritain} &
-\Country[outline]{Greece} \\
-\Country[outline]{Hungary} &
-\Country[outline]{Iceland} &
-\Country[outline]{Ireland} &
-\Country[outline]{Italy} \\
-\Country[outline]{Latvia} &
-\Country[outline]{Liechtenstein} &
-\Country[outline]{Lithuania} &
-\Country[outline]{Luxembourg} \\
-\Country[outline]{Macedonia} &
-\Country[outline]{Malta} &
-\Country[outline]{Moldova} &
-\Country[outline]{Montenegro} \\
-\Country[outline]{Netherlands} &
-\Country[outline]{Norway} &
-\Country[outline]{Poland} &
-\Country[outline]{Portugal} \\
-\Country[outline]{Romania} &
-\Country[outline]{Serbia} &
-\Country[outline]{Slovakia} &
-\Country[outline]{Slovenia} \\
-\Country[outline]{Spain} &
-\Country[outline]{Sweden} &
-\Country[outline]{Switzerland}
-
-\end{longtable}
-
-
-\rmfamily
-
-The countries are internally defined as a ligature so that abreviations of the countries can be
-used for printing:
-
-\begin{verbatim}
-\CountriesofEuropeFamily
-ge au
-\end{verbatim}
-
-\ifluatex
- \fontspec{CountriesofEurope.otf}
-\else
- \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[1]CountriesofEurope}{}
-\fi
-\CountriesofEuropeFamily
-ge au
-
-
-
-
-
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/countriesofeurope/README new/doc/fonts/countriesofeurope/README
--- old/doc/fonts/countriesofeurope/README 2018-12-28 22:34:41.000000000 +0100
+++ new/doc/fonts/countriesofeurope/README 2019-10-04 22:49:55.000000000 +0200
@@ -4,7 +4,6 @@
and can be used under the Open Font License.
All other files are copyrighted by Rolf Niepraschk and
-Herbert Voß and can be used under the LaTeX Public Project Licence.
+Herbert Voß and can be used under the LaTeX Project Public Licence.
-v0.22 2018-12-27
hvoss(a)tug.org
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/countriesofeurope/countriesofeurope.bib new/doc/fonts/countriesofeurope/countriesofeurope.bib
--- old/doc/fonts/countriesofeurope/countriesofeurope.bib 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/countriesofeurope/countriesofeurope.bib 2019-10-04 22:49:55.000000000 +0200
@@ -0,0 +1,18 @@
+@ctan{countriesofeurope,
+title = {The Countriesofeurope package},
+subtitle = {A font with the images of the countries of Europe},
+author = {Zimmermann, Ingo and Voß, Herbert and Niepraschk, Rolf},
+url = {http://www.ctan.org/pkg/countriesofeurope},
+urldate = {2019-10-203},
+date = {2019-10-03},
+version = {0.23}
+}
+
+@online{ingofonts,
+title={Fonts and typography that leave a mark},
+author={Ingo Zimmermann},
+url={http://www.ingoFonts.de},
+urldate = {2019-10-03},
+note={for corporate design, promotion, web, publishing. Buy fonts directly from the maker. At ingoFonts you’ll find fonts of all styles,
+ including free test versions of all fonts to download and try out.},
+}
Binary files old/doc/fonts/countriesofeurope/countriesofeurope.pdf and new/doc/fonts/countriesofeurope/countriesofeurope.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/countriesofeurope/countriesofeurope.tex new/doc/fonts/countriesofeurope/countriesofeurope.tex
--- old/doc/fonts/countriesofeurope/countriesofeurope.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/countriesofeurope/countriesofeurope.tex 2019-10-04 22:49:55.000000000 +0200
@@ -0,0 +1,315 @@
+%\listfiles
+%% $Id: countriesofeurope.tex 1095 2019-10-03 06:05:39Z herbert $
+\documentclass[11pt,english,BCOR=10mm,DIV=13,toc=bibliography,parskip=false,
+ headings=small,headinclude=false,footinclude=false,oneside]{pst-doc}
+\usepackage[Scale=7.5]{countriesofeurope}
+\let\pstFV\fileversion
+
+\usepackage{ifluatex}
+\usepackage{dtk-logos}
+\ifluatex\else
+ \pdfmapfile{+countriesofeurope.map} % only needed, if the map is not enabled with updmap
+\fi
+\usepackage{lmodern,array,longtable,graphicx,ifthen,ragged2e,libertinus}
+
+\makeatletter
+\newcommand\Country[2][]{{%
+ \tabular{|>{\Centering}p{2.5cm}|}\hline
+ \strut\footnotesize\texttt{\textbackslash#2}\\\hline
+ \parbox[c][3.2cm]{2cm}{\EUCountry[#1]{#2}}\\\hline
+ \endtabular}}
+
+\makeatother
+
+\newcounter{N}
+
+\renewcommand\bgImage{%
+ \EUCountry[Scale=3,outline,fillcolor=blue!20,linecolor=black]{Germany}}
+
+\usepackage{biblatex}
+\addbibresource{\jobname.bib}
+\begin{document}
+
+\title{Package \texttt{countriesofeurope}}
+\subtitle{Printing all european countries as a character of a font (v.\,0.23)}
+\author{Rolf Niepraschk\\Herbert Voß\\Ingo Zimmermann}
+\docauthor{Herbert Voß}
+\date{\today}
+\maketitle
+
+\section{Introduction}
+
+\begin{sloppypar}
+This package defines the two macros \Lcs{countriesofeuropefamily} (short version is \Lcs{CoEF})
+and \Lcs{EUCountry}\verb|[options]{name}|,
+which allow to print one of the european countries as a single character with the given scaling or
+with an individual scaling.
+
+The first one switches
+to the font encoding \verb|U| (Type 1) or \verb|TU| (OpenType) and loads the font and the second
+one does the same but also with
+printing the character which the given name, e.\,g. for Finland: \verb|\EUCountry[Scale=0.2]{Germany}|$\rightarrow$%
+\EUCountry[Scale=0.2]{Germany}.
+\end{sloppypar}
+
+The font can be loaded
+with an optional argument for the scaling factor, which is preset to 1:
+
+\begin{verbatim}
+\usepackage[Scale=10]{countriesofeurope}% scaled to 10
+\end{verbatim}
+
+
+\section{Default use}
+
+The countris itself are available by a macro from the following list. The characters are
+at the position 128--166 in the Type~1 font \LFile{countriesofeurope.pfb} and also available
+with the \verb|\char| primitive. The following table shows the countries in their original size
+with a scaling of 7.5:
+
+\begin{longtable}{cccc}
+\Country{Albania} &
+\Country{Andorra} &
+\Country{Austria} &
+\Country{Belarus} \\
+\Country{Belgium} &
+\Country{Bosnia} &
+\Country{Bulgaria} &
+\Country{Croatia} \\
+\Country{Czechia} &
+\Country{Denmark} &
+\Country{Estonia} &
+\Country{Finland} \\
+\Country{France} &
+\Country{Germany} &
+\Country{GreatBritain} &
+\Country{Greece} \\
+\Country{Hungary} &
+\Country{Iceland} &
+\Country{Ireland} &
+\Country{Italy} \\
+\Country{Latvia} &
+\Country{Liechtenstein} &
+\Country{Lithuania} &
+\Country{Luxembourg} \\
+\Country{Macedonia} &
+\Country{Malta} &
+\Country{Moldova} &
+\Country{Montenegro} \\
+\Country{Netherlands} &
+\Country{Norway} &
+\Country{Poland} &
+\Country{Portugal} \\
+\Country{Romania} &
+\Country{Serbia} &
+\Country{Slovakia} &
+\Country{Slovenia} \\
+\Country{Spain} &
+\Country{Sweden} &
+\Country{Switzerland}
+
+\end{longtable}
+
+
+\noindent\rule{\textwidth}{.5mm}
+
+The countries in the original size with the given bounding box and the text command \verb|\huge|:
+
+% \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[1]countriesofeurope}{}
+
+\medskip
+
+\begingroup
+\fboxsep=0pt
+\noindent%
+\ifluatex
+ \fontspec[Scale=1]{countriesofeurope.otf}
+ \huge
+ \setcounter{N}{63724}%
+ \whiledo{\value{N} > 63686}{%
+ \fbox{\symbol{\value{N}}}%
+ \addtocounter{N}{-1}}
+\else
+ \huge
+ \setcounter{N}{128}%
+ \whiledo{\value{N} < 167}{%
+ \fbox{\symbol{\value{N}}}%
+ \stepcounter{N}}
+\fi
+\endgroup
+
+\rmfamily
+
+\section{Outline font}
+
+All countries can be printed as outline, e.\,g.:
+
+\verb|\EUCountry[Scale=37.5,outline]{Germany}|
+
+\EUCountry[Scale=5,outline]{Germany}
+
+
+
+
+\begingroup
+\ifluatex
+ \CoEF
+\else
+ \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[1]countriesofeurope}{}
+\fi
+
+\begin{longtable}{cccc}
+\Country[outline]{Albania} &
+\Country[outline]{Andorra} &
+\Country[outline]{Austria} &
+\Country[outline]{Belarus} \\
+\Country[outline]{Belgium} &
+\Country[outline]{Bosnia} &
+\Country[outline]{Bulgaria} &
+\Country[outline]{Croatia} \\
+\Country[outline]{Czechia} &
+\Country[outline]{Denmark} &
+\Country[outline]{Estonia} &
+\Country[outline]{Finland} \\
+\Country[outline]{France} &
+\Country[outline]{Germany} &
+\Country[outline]{GreatBritain} &
+\Country[outline]{Greece} \\
+\Country[outline]{Hungary} &
+\Country[outline]{Iceland} &
+\Country[outline]{Ireland} &
+\Country[outline]{Italy} \\
+\Country[outline]{Latvia} &
+\Country[outline]{Liechtenstein} &
+\Country[outline]{Lithuania} &
+\Country[outline]{Luxembourg} \\
+\Country[outline]{Macedonia} &
+\Country[outline]{Malta} &
+\Country[outline]{Moldova} &
+\Country[outline]{Montenegro} \\
+\Country[outline]{Netherlands} &
+\Country[outline]{Norway} &
+\Country[outline]{Poland} &
+\Country[outline]{Portugal} \\
+\Country[outline]{Romania} &
+\Country[outline]{Serbia} &
+\Country[outline]{Slovakia} &
+\Country[outline]{Slovenia} \\
+\Country[outline]{Spain} &
+\Country[outline]{Sweden} &
+\Country[outline]{Switzerland}
+
+\end{longtable}
+
+\endgroup
+
+
+\section{Ligatures}
+\rmfamily
+
+The countries are internally defined as a ligature so that abreviations of the countries can be
+used for printing.
+%
+%\begin{verbatim}
+%\CoEF ge au
+%\end{verbatim}
+%
+These Ligatures are enabled by default!
+
+%\begin{verbatim}
+%\defaultfontfeatures+[\countriesofeuropefamily]{Ligatures=Common}
+%\end{verbatim}
+
+%leads to
+
+\begingroup
+\ifluatex
+ \CoEF
+% \defaultfontfeatures+[\countriesofeuropefamily]{Ligatures=Common}
+\else
+ \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[1]countriesofeurope}{}
+\fi
+\verb|{\CoEF ge GE}| $\rightarrow$ {\CoEF ge GE}
+\endgroup
+
+
+
+
+\def\TAB#1{\tabular[b]{@{}l@{}}#1\endtabular}
+\begin{longtable}{ll ll}\toprule
+\emph{Ligature} & \emph{Output} & \emph{Ligature} & \emph{Output}\\\midrule
+\endfirsthead
+\midrule
+\emph{Ligature} & \emph{Output} & \emph{Ligature} & \emph{Output}\\\midrule
+\endhead
+AL & \CoEF AL & AN & \CoEF AN \\\hline
+AU & \CoEF AU & BELA & \CoEF BELA \\\hline
+BELG & \CoEF BELG & BO & \CoEF BO\\\hline
+BU & \CoEF BU & CR & \CoEF CR\\\hline
+CZ & \CoEF CZ & \TAB{DAN\\DAE} & \CoEF DAN\\\hline
+EST & \CoEF EST & FI & \CoEF FI \\\hline
+FR & \CoEF FR & GE & \CoEF GE \\
+\TAB{EN\\GREA\\BR} & \CoEF BR & GRI & \CoEF GRI \\\hline
+HU & \CoEF HU & IC & \CoEF IC \\\hline
+IR & \CoEF IR & IT & \CoEF IT \\\hline
+LA & \CoEF LA & LIE & \CoEF LIE\\\hline
+LIT & \CoEF LIT & LU & \CoEF LU \\\hline
+MAC & \CoEF MAC & MAL & \CoEF MAL\\\hline
+MOL & \CoEF MOL & MON & \CoEF MON \\\hline
+NE & \CoEF NE & NO & \CoEF NO\\\hline
+POL & \CoEF POL & POR & \CoEF POR \\\hline
+RO & \CoEF RO & SE & \CoEF SE \\\hline
+SLOVA& \CoEF SLOVA& SLOVE& \CoEF SLOVE \\\hline
+SP & \CoEF SP & \TAB{SWE\\SV} & \CoEF SWE\\\hline
+SWI & \CoEF SWI & & \\\bottomrule
+\end{longtable}
+
+
+%\defaultfontfeatures[\countriesofeuropefamily]{Ligatures=NoCommon}
+
+
+%The Ligatures can also be enabled by
+
+%\begin{verbatim}
+%\usepackage[Ligatures=Common]{countriesofeurope}
+%\end{verbatim}
+
+
+\rmfamily
+\section{Color options}
+
+
+
+With the optional arguments \Lkeyword{fillcolor} and \Lkeyword{linecolor} the countries can printed with
+different colors. The option \Lkeyword{fillcolor} is only valiD, if the option \Lkeyword{outline} is
+set, too.
+
+
+
+\verb|\EUCountry[Scale=37.5,outline,fillcolor=blue!20,linecolor=blue]{Germany}|
+\ifluatex
+ \fontspec{countriesofeurope.otf}
+\else
+ \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[1]countriesofeurope}{}
+\fi
+
+
+\fbox{\EUCountry[Scale=5,outline,fillcolor=blue!20,linecolor=blue]{Germany}}
+
+
+
+\rmfamily
+\bgroup
+\raggedright
+\nocite{*}
+%\bibliographystyle{plain}
+\printbibliography
+\egroup
+
+\printindex
+
+
+
+
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/countriesofeurope.doc.tlpobj new/tlpkg/tlpobj/countriesofeurope.doc.tlpobj
--- old/tlpkg/tlpobj/countriesofeurope.doc.tlpobj 2019-02-28 03:30:12.000000000 +0100
+++ new/tlpkg/tlpobj/countriesofeurope.doc.tlpobj 2020-03-24 01:57:10.000000000 +0100
@@ -1,10 +1,11 @@
name countriesofeurope.doc
category Package
-revision 49525
+revision 54512
shortdesc doc files of countriesofeurope
relocated 1
-docfiles size=23
+docfiles size=30
RELOC/doc/fonts/countriesofeurope/Changes
- RELOC/doc/fonts/countriesofeurope/CountriesofEurope.pdf
- RELOC/doc/fonts/countriesofeurope/CountriesofEurope.tex
RELOC/doc/fonts/countriesofeurope/README
+ RELOC/doc/fonts/countriesofeurope/countriesofeurope.bib
+ RELOC/doc/fonts/countriesofeurope/countriesofeurope.pdf
+ RELOC/doc/fonts/countriesofeurope/countriesofeurope.tex
++++++ countriesofeurope.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/countriesofeurope/CountriesofEurope.afm new/fonts/afm/public/countriesofeurope/CountriesofEurope.afm
--- old/fonts/afm/public/countriesofeurope/CountriesofEurope.afm 2018-12-28 22:34:41.000000000 +0100
+++ new/fonts/afm/public/countriesofeurope/CountriesofEurope.afm 1970-01-01 01:00:00.000000000 +0100
@@ -1,114 +0,0 @@
-StartFontMetrics 2.0
-Comment Generated by FontForge 20090914
-Comment Creation Date: Mon Apr 16 13:36:09 2012
-FontName CountriesofEurope
-FullName Countries of Europe
-FamilyName Countries of Europe
-Weight Roman
-Notice (Copyright (c) 2012 by Ingo Zimmermann. Font may be used under the OFL.)
-ItalicAngle 0
-IsFixedPitch false
-UnderlinePosition -100
-UnderlineThickness 50
-Version 001.001
-EncodingScheme AdobeStandardEncoding
-FontBBox -101 -226 955 1299
-CapHeight 757
-XHeight 507
-Ascender 379
-Descender -135
-StartCharMetrics 92
-C 32 ; WX 500 ; N space ; B 0 0 0 0 ;
-C 65 ; WX 643 ; N A ; B -28 -4 522 756 ;
-C 66 ; WX 615 ; N B ; B 0 -4 472 756 ;
-C 67 ; WX 556 ; N C ; B -30 -11 461 762 ;
-C 68 ; WX 651 ; N D ; B 0 -3 527 755 ;
-C 69 ; WX 527 ; N E ; B 0 0 394 752 ;
-C 70 ; WX 499 ; N F ; B 0 -4 394 752 ;
-C 71 ; WX 654 ; N G ; B -30 -6 502 762 ;
-C 72 ; WX 671 ; N H ; B 0 -4 509 756 ;
-C 73 ; WX 265 ; N I ; B 0 -4 103 756 ;
-C 74 ; WX 291 ; N J ; B -71 -15 139 756 ;
-C 75 ; WX 618 ; N K ; B 0 -4 523 757 ;
-C 76 ; WX 459 ; N L ; B 0 0 364 756 ;
-C 77 ; WX 804 ; N M ; B 0 -4 642 755 ;
-C 78 ; WX 711 ; N N ; B 0 -4 549 756 ;
-C 79 ; WX 671 ; N O ; B -30 -11 547 762 ;
-C 80 ; WX 588 ; N P ; B 0 -4 464 752 ;
-C 81 ; WX 703 ; N Q ; B -30 -4 665 762 ;
-C 82 ; WX 620 ; N R ; B 0 -5 496 754 ;
-C 83 ; WX 589 ; N S ; B -20 -11 456 758 ;
-C 84 ; WX 493 ; N T ; B -101 -4 408 752 ;
-C 85 ; WX 671 ; N U ; B 0 -11 519 756 ;
-C 86 ; WX 632 ; N V ; B -40 -4 513 759 ;
-C 87 ; WX 935 ; N W ; B -60 -4 830 759 ;
-C 88 ; WX 622 ; N X ; B -60 -5 508 759 ;
-C 89 ; WX 574 ; N Y ; B -60 -4 479 759 ;
-C 90 ; WX 545 ; N Z ; B -34 0 440 752 ;
-C 97 ; WX 500 ; N a ; B -20 -7 357 507 ;
-C 98 ; WX 514 ; N b ; B 0 -8 400 756 ;
-C 99 ; WX 376 ; N c ; B -30 -8 271 506 ;
-C 100 ; WX 512 ; N d ; B -30 -8 369 756 ;
-C 101 ; WX 496 ; N e ; B -30 -6 386 507 ;
-C 102 ; WX 315 ; N f ; B 0 -4 230 759 ;
-C 103 ; WX 512 ; N g ; B -30 -225 369 507 ;
-C 104 ; WX 519 ; N h ; B 0 -4 380 756 ;
-C 105 ; WX 237 ; N i ; B -7 -3 98 682 ;
-C 106 ; WX 247 ; N j ; B -81 -222 104 682 ;
-C 107 ; WX 474 ; N k ; B 0 -7 390 756 ;
-C 108 ; WX 234 ; N l ; B 0 -4 90 757 ;
-C 109 ; WX 770 ; N m ; B 0 -4 631 505 ;
-C 110 ; WX 509 ; N n ; B 0 -4 370 507 ;
-C 111 ; WX 492 ; N o ; B -30 -8 381 507 ;
-C 112 ; WX 514 ; N p ; B 0 -226 400 507 ;
-C 113 ; WX 512 ; N q ; B -30 -226 369 507 ;
-C 114 ; WX 329 ; N r ; B 0 -4 243 507 ;
-C 115 ; WX 449 ; N s ; B -20 -7 325 507 ;
-C 116 ; WX 310 ; N t ; B 0 -4 225 640 ;
-C 117 ; WX 506 ; N u ; B 0 -10 371 504 ;
-C 118 ; WX 481 ; N v ; B -50 -4 395 505 ;
-C 119 ; WX 768 ; N w ; B -50 -4 682 505 ;
-C 120 ; WX 504 ; N x ; B -42 -6 410 507 ;
-C 121 ; WX 513 ; N y ; B 0 -225 370 501 ;
-C 122 ; WX 448 ; N z ; B -21 0 324 500 ;
-C -1 ; WX 174 ; N Albania ; B 18 0 163 275 ;
-C -1 ; WX 59 ; N Andorra ; B 25 1 48 26 ;
-C -1 ; WX 514 ; N Austria ; B 6 1 485 251 ;
-C -1 ; WX 554 ; N Belarus ; B 22 -35 540 462 ;
-C -1 ; WX 253 ; N Belgium ; B 10 0 229 190 ;
-C -1 ; WX 311 ; N Bosnia ; B 10 0 287 250 ;
-C -1 ; WX 463 ; N Bulgaria ; B 19 0 443 330 ;
-C -1 ; WX 436 ; N Croatia ; B 23 0 415 370 ;
-C -1 ; WX 455 ; N Czechia ; B 23 0 439 233 ;
-C -1 ; WX 404 ; N Denmark ; B 29 -3 403 299 ;
-C -1 ; WX 342 ; N Estonia ; B 20 -3 317 208 ;
-C -1 ; WX 580 ; N Finland ; B 14 -42 569 974 ;
-C -1 ; WX 938 ; N France ; B 9 -142 918 800 ;
-C -1 ; WX 578 ; N Germany ; B 23 -23 556 715 ;
-C -1 ; WX 533 ; N GreatBritain ; B 4 -134 520 955 ;
-C -1 ; WX 749 ; N Greece ; B 10 -30 737 647 ;
-C -1 ; WX 444 ; N Hungary ; B 16 1 428 295 ;
-C -1 ; WX 452 ; N Iceland ; B 24 -1 438 343 ;
-C -1 ; WX 320 ; N Ireland ; B 13 0 296 335 ;
-C -1 ; WX 876 ; N Italy ; B 13 -29 863 953 ;
-C -1 ; WX 425 ; N Latvia ; B 24 6 404 236 ;
-C -1 ; WX 65 ; N Liechtenstein ; B 40 1 48 22 ;
-C -1 ; WX 347 ; N Lithuania ; B 13 1 325 257 ;
-C -1 ; WX 89 ; N Luxembourg ; B 32 1 79 72 ;
-C -1 ; WX 221 ; N Macedonia ; B 25 1 203 160 ;
-C -1 ; WX 47 ; N Malta ; B 1 3 32 30 ;
-C -1 ; WX 282 ; N Moldova ; B 7 -5 269 262 ;
-C -1 ; WX 154 ; N Montenegro ; B 19 0 146 154 ;
-C -1 ; WX 259 ; N Netherlands ; B 6 0 238 266 ;
-C -1 ; WX 959 ; N Norway ; B 9 -29 955 1299 ;
-C -1 ; WX 655 ; N Poland ; B 23 0 628 523 ;
-C -1 ; WX 325 ; N Portugal ; B 20 5 318 487 ;
-C -1 ; WX 668 ; N Romania ; B 17 0 650 466 ;
-C -1 ; WX 347 ; N Serbia ; B 14 0 335 408 ;
-C -1 ; WX 371 ; N Slovakia ; B 23 0 360 190 ;
-C -1 ; WX 233 ; N Slovenia ; B 12 0 217 152 ;
-C -1 ; WX 943 ; N Spain ; B 24 -118 939 746 ;
-C -1 ; WX 538 ; N Sweden ; B 15 -60 524 1274 ;
-C -1 ; WX 331 ; N Switzerland ; B 19 -12 312 178 ;
-EndCharMetrics
-EndFontMetrics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/countriesofeurope/countriesofeurope.afm new/fonts/afm/public/countriesofeurope/countriesofeurope.afm
--- old/fonts/afm/public/countriesofeurope/countriesofeurope.afm 1970-01-01 01:00:00.000000000 +0100
+++ new/fonts/afm/public/countriesofeurope/countriesofeurope.afm 2019-10-04 22:49:55.000000000 +0200
@@ -0,0 +1,114 @@
+StartFontMetrics 2.0
+Comment Generated by FontForge 20090914
+Comment Creation Date: Mon Apr 16 13:36:09 2012
+FontName CountriesofEurope
+FullName Countries of Europe
+FamilyName Countries of Europe
+Weight Roman
+Notice (Copyright (c) 2012 by Ingo Zimmermann. Font may be used under the OFL.)
+ItalicAngle 0
+IsFixedPitch false
+UnderlinePosition -100
+UnderlineThickness 50
+Version 001.001
+EncodingScheme AdobeStandardEncoding
+FontBBox -101 -226 955 1299
+CapHeight 757
+XHeight 507
+Ascender 379
+Descender -135
+StartCharMetrics 92
+C 32 ; WX 500 ; N space ; B 0 0 0 0 ;
+C 65 ; WX 643 ; N A ; B -28 -4 522 756 ;
+C 66 ; WX 615 ; N B ; B 0 -4 472 756 ;
+C 67 ; WX 556 ; N C ; B -30 -11 461 762 ;
+C 68 ; WX 651 ; N D ; B 0 -3 527 755 ;
+C 69 ; WX 527 ; N E ; B 0 0 394 752 ;
+C 70 ; WX 499 ; N F ; B 0 -4 394 752 ;
+C 71 ; WX 654 ; N G ; B -30 -6 502 762 ;
+C 72 ; WX 671 ; N H ; B 0 -4 509 756 ;
+C 73 ; WX 265 ; N I ; B 0 -4 103 756 ;
+C 74 ; WX 291 ; N J ; B -71 -15 139 756 ;
+C 75 ; WX 618 ; N K ; B 0 -4 523 757 ;
+C 76 ; WX 459 ; N L ; B 0 0 364 756 ;
+C 77 ; WX 804 ; N M ; B 0 -4 642 755 ;
+C 78 ; WX 711 ; N N ; B 0 -4 549 756 ;
+C 79 ; WX 671 ; N O ; B -30 -11 547 762 ;
+C 80 ; WX 588 ; N P ; B 0 -4 464 752 ;
+C 81 ; WX 703 ; N Q ; B -30 -4 665 762 ;
+C 82 ; WX 620 ; N R ; B 0 -5 496 754 ;
+C 83 ; WX 589 ; N S ; B -20 -11 456 758 ;
+C 84 ; WX 493 ; N T ; B -101 -4 408 752 ;
+C 85 ; WX 671 ; N U ; B 0 -11 519 756 ;
+C 86 ; WX 632 ; N V ; B -40 -4 513 759 ;
+C 87 ; WX 935 ; N W ; B -60 -4 830 759 ;
+C 88 ; WX 622 ; N X ; B -60 -5 508 759 ;
+C 89 ; WX 574 ; N Y ; B -60 -4 479 759 ;
+C 90 ; WX 545 ; N Z ; B -34 0 440 752 ;
+C 97 ; WX 500 ; N a ; B -20 -7 357 507 ;
+C 98 ; WX 514 ; N b ; B 0 -8 400 756 ;
+C 99 ; WX 376 ; N c ; B -30 -8 271 506 ;
+C 100 ; WX 512 ; N d ; B -30 -8 369 756 ;
+C 101 ; WX 496 ; N e ; B -30 -6 386 507 ;
+C 102 ; WX 315 ; N f ; B 0 -4 230 759 ;
+C 103 ; WX 512 ; N g ; B -30 -225 369 507 ;
+C 104 ; WX 519 ; N h ; B 0 -4 380 756 ;
+C 105 ; WX 237 ; N i ; B -7 -3 98 682 ;
+C 106 ; WX 247 ; N j ; B -81 -222 104 682 ;
+C 107 ; WX 474 ; N k ; B 0 -7 390 756 ;
+C 108 ; WX 234 ; N l ; B 0 -4 90 757 ;
+C 109 ; WX 770 ; N m ; B 0 -4 631 505 ;
+C 110 ; WX 509 ; N n ; B 0 -4 370 507 ;
+C 111 ; WX 492 ; N o ; B -30 -8 381 507 ;
+C 112 ; WX 514 ; N p ; B 0 -226 400 507 ;
+C 113 ; WX 512 ; N q ; B -30 -226 369 507 ;
+C 114 ; WX 329 ; N r ; B 0 -4 243 507 ;
+C 115 ; WX 449 ; N s ; B -20 -7 325 507 ;
+C 116 ; WX 310 ; N t ; B 0 -4 225 640 ;
+C 117 ; WX 506 ; N u ; B 0 -10 371 504 ;
+C 118 ; WX 481 ; N v ; B -50 -4 395 505 ;
+C 119 ; WX 768 ; N w ; B -50 -4 682 505 ;
+C 120 ; WX 504 ; N x ; B -42 -6 410 507 ;
+C 121 ; WX 513 ; N y ; B 0 -225 370 501 ;
+C 122 ; WX 448 ; N z ; B -21 0 324 500 ;
+C -1 ; WX 174 ; N Albania ; B 18 0 163 275 ;
+C -1 ; WX 59 ; N Andorra ; B 25 1 48 26 ;
+C -1 ; WX 514 ; N Austria ; B 6 1 485 251 ;
+C -1 ; WX 554 ; N Belarus ; B 22 -35 540 462 ;
+C -1 ; WX 253 ; N Belgium ; B 10 0 229 190 ;
+C -1 ; WX 311 ; N Bosnia ; B 10 0 287 250 ;
+C -1 ; WX 463 ; N Bulgaria ; B 19 0 443 330 ;
+C -1 ; WX 436 ; N Croatia ; B 23 0 415 370 ;
+C -1 ; WX 455 ; N Czechia ; B 23 0 439 233 ;
+C -1 ; WX 404 ; N Denmark ; B 29 -3 403 299 ;
+C -1 ; WX 342 ; N Estonia ; B 20 -3 317 208 ;
+C -1 ; WX 580 ; N Finland ; B 14 -42 569 974 ;
+C -1 ; WX 938 ; N France ; B 9 -142 918 800 ;
+C -1 ; WX 578 ; N Germany ; B 23 -23 556 715 ;
+C -1 ; WX 533 ; N GreatBritain ; B 4 -134 520 955 ;
+C -1 ; WX 749 ; N Greece ; B 10 -30 737 647 ;
+C -1 ; WX 444 ; N Hungary ; B 16 1 428 295 ;
+C -1 ; WX 452 ; N Iceland ; B 24 -1 438 343 ;
+C -1 ; WX 320 ; N Ireland ; B 13 0 296 335 ;
+C -1 ; WX 876 ; N Italy ; B 13 -29 863 953 ;
+C -1 ; WX 425 ; N Latvia ; B 24 6 404 236 ;
+C -1 ; WX 65 ; N Liechtenstein ; B 40 1 48 22 ;
+C -1 ; WX 347 ; N Lithuania ; B 13 1 325 257 ;
+C -1 ; WX 89 ; N Luxembourg ; B 32 1 79 72 ;
+C -1 ; WX 221 ; N Macedonia ; B 25 1 203 160 ;
+C -1 ; WX 47 ; N Malta ; B 1 3 32 30 ;
+C -1 ; WX 282 ; N Moldova ; B 7 -5 269 262 ;
+C -1 ; WX 154 ; N Montenegro ; B 19 0 146 154 ;
+C -1 ; WX 259 ; N Netherlands ; B 6 0 238 266 ;
+C -1 ; WX 959 ; N Norway ; B 9 -29 955 1299 ;
+C -1 ; WX 655 ; N Poland ; B 23 0 628 523 ;
+C -1 ; WX 325 ; N Portugal ; B 20 5 318 487 ;
+C -1 ; WX 668 ; N Romania ; B 17 0 650 466 ;
+C -1 ; WX 347 ; N Serbia ; B 14 0 335 408 ;
+C -1 ; WX 371 ; N Slovakia ; B 23 0 360 190 ;
+C -1 ; WX 233 ; N Slovenia ; B 12 0 217 152 ;
+C -1 ; WX 943 ; N Spain ; B 24 -118 939 746 ;
+C -1 ; WX 538 ; N Sweden ; B 15 -60 524 1274 ;
+C -1 ; WX 331 ; N Switzerland ; B 19 -12 312 178 ;
+EndCharMetrics
+EndFontMetrics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/countriesofeurope/CountriesofEurope.enc new/fonts/enc/dvips/countriesofeurope/CountriesofEurope.enc
--- old/fonts/enc/dvips/countriesofeurope/CountriesofEurope.enc 2018-12-28 22:34:41.000000000 +0100
+++ new/fonts/enc/dvips/countriesofeurope/CountriesofEurope.enc 1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-
-/CountriesofEurope [
-%00
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%10
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%20
- /space /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%30
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%40
- /.notdef /A /B /C /D /E /F /G
- /H /I /J /K /L /M /N /O
-%50
- /P /Q /R /S /T /U /V /W
- /X /Y /Z /.notdef /.notdef /.notdef /.notdef /.notdef
-%60
- /.notdef /a /b /c /d /e /f /g
- /h /i /j /k /l /m /n /o
-%70
- /p /q /r /s /t /u /v /w
- /x /y /z /.notdef /.notdef /.notdef /.notdef /.notdef
-%80
- /Albania /Andorra /Austria /Belarus /Belgium /Bosnia /Bulgaria /Croatia
- /Czechia /Denmark /Estonia /Finland /France /Germany /GreatBritain /Greece
-%90
- /Hungary /Iceland /Ireland /Italy /Latvia /Liechtenstein /Lithuania /Luxembourg
- /Macedonia /Malta /Moldova /Montenegro /Netherlands /Norway /Poland /Portugal
-%A0
- /Romania /Serbia /Slovakia /Slovenia /Spain /Sweden /Switzerland /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%B0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%C0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%D0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%E0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-%F0
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
- /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-] def
-% Command line: 'otftotfm CountriesofEurope.otf foo'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/countriesofeurope/countriesofeurope.enc new/fonts/enc/dvips/countriesofeurope/countriesofeurope.enc
--- old/fonts/enc/dvips/countriesofeurope/countriesofeurope.enc 1970-01-01 01:00:00.000000000 +0100
+++ new/fonts/enc/dvips/countriesofeurope/countriesofeurope.enc 2019-10-04 22:49:55.000000000 +0200
@@ -0,0 +1,52 @@
+
+/countriesofeurope [
+%00
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%10
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%20
+ /space /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%30
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%40
+ /.notdef /A /B /C /D /E /F /G
+ /H /I /J /K /L /M /N /O
+%50
+ /P /Q /R /S /T /U /V /W
+ /X /Y /Z /.notdef /.notdef /.notdef /.notdef /.notdef
+%60
+ /.notdef /a /b /c /d /e /f /g
+ /h /i /j /k /l /m /n /o
+%70
+ /p /q /r /s /t /u /v /w
+ /x /y /z /.notdef /.notdef /.notdef /.notdef /.notdef
+%80
+ /Albania /Andorra /Austria /Belarus /Belgium /Bosnia /Bulgaria /Croatia
+ /Czechia /Denmark /Estonia /Finland /France /Germany /GreatBritain /Greece
+%90
+ /Hungary /Iceland /Ireland /Italy /Latvia /Liechtenstein /Lithuania /Luxembourg
+ /Macedonia /Malta /Moldova /Montenegro /Netherlands /Norway /Poland /Portugal
+%A0
+ /Romania /Serbia /Slovakia /Slovenia /Spain /Sweden /Switzerland /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%B0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%C0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%D0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%E0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+%F0
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+] def
+% Command line: 'otftotfm countriesofeurope.otf foo'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/countriesofeurope/CountriesofEurope.map new/fonts/map/dvips/countriesofeurope/CountriesofEurope.map
--- old/fonts/map/dvips/countriesofeurope/CountriesofEurope.map 2018-12-28 22:34:41.000000000 +0100
+++ new/fonts/map/dvips/countriesofeurope/CountriesofEurope.map 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-CountriesofEurope CountriesofEurope "CountriesofEurope ReEncodeFont" <CountriesofEurope.enc <CountriesofEurope.pfb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/countriesofeurope/countriesofeurope.map new/fonts/map/dvips/countriesofeurope/countriesofeurope.map
--- old/fonts/map/dvips/countriesofeurope/countriesofeurope.map 1970-01-01 01:00:00.000000000 +0100
+++ new/fonts/map/dvips/countriesofeurope/countriesofeurope.map 2019-10-04 22:49:55.000000000 +0200
@@ -0,0 +1 @@
+countriesofeurope countriesofeurope "countriesofeurope ReEncodeFont" <countriesofeurope.enc <countriesofeurope.pfb
Binary files old/fonts/opentype/public/countriesofeurope/CountriesofEurope.otf and new/fonts/opentype/public/countriesofeurope/CountriesofEurope.otf differ
Binary files old/fonts/opentype/public/countriesofeurope/countriesofeurope.otf and new/fonts/opentype/public/countriesofeurope/countriesofeurope.otf differ
Binary files old/fonts/tfm/public/countriesofeurope/CountriesofEurope.tfm and new/fonts/tfm/public/countriesofeurope/CountriesofEurope.tfm differ
Binary files old/fonts/tfm/public/countriesofeurope/countriesofeurope.tfm and new/fonts/tfm/public/countriesofeurope/countriesofeurope.tfm differ
Binary files old/fonts/type1/public/countriesofeurope/CountriesofEurope.pfb and new/fonts/type1/public/countriesofeurope/CountriesofEurope.pfb differ
Binary files old/fonts/type1/public/countriesofeurope/countriesofeurope.pfb and new/fonts/type1/public/countriesofeurope/countriesofeurope.pfb differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/countriesofeurope/CountriesofEurope.sty new/tex/latex/countriesofeurope/CountriesofEurope.sty
--- old/tex/latex/countriesofeurope/CountriesofEurope.sty 2018-12-28 22:34:41.000000000 +0100
+++ new/tex/latex/countriesofeurope/CountriesofEurope.sty 1970-01-01 01:00:00.000000000 +0100
@@ -1,159 +0,0 @@
-%% This is file `CountriesofEurope.sty',
-%%
-%% Copyright (C) 2016-
-%% Rolf Niepraschk, Herbert Voss
-%%
-%% It 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.
-
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{CountriesofEurope}%
- [2018/12/27 v0.22 CountriesofEurope Font (hv,RN)]
-
-\RequirePackage{ifxetex,ifluatex,xkeyval,graphicx}
-
-\newcommand*\CountriesofEurope@scale{1}
-\RequirePackage{xkeyval}
-\DeclareOptionX{Scale}{\renewcommand*\CountriesofEurope@scale{#1}}
-\ProcessOptionsX\relax
-
-\newif\ifCoE@outline
-
-\def\CoE@boolkey#1#2{\csname CoE@#2\ifx\relax#1\relax true\else#1\fi\endcsname}
-
-\define@key{CoE}{Scale}[1]{\def\CoE@Scale{#1}}
-\define@key{CoE}{outline}[true]{\lowercase{\CoE@boolkey{#1}}{outline}}
-%
-\def\setCoEkeys#1{\edef\x{\noexpand\setkeys{CoE}{#1}}\x}
-
-\setCoEkeys{outline=false,Scale=1}
-
-\newif\if@CoE@newengine \@CoE@newenginefalse
-\ifxetex\@CoE@newenginetrue
-\else
- \ifluatex\@CoE@newenginetrue\fi
-\fi
-
-\if@CoE@newengine
- \def\set@Outline{\pdfextension literal direct { 1 Tr 0 w }\relax}
- \def\unset@Outline{\pdfextension literal direct { 0 Tr 0 w }\relax}
-\else
- \def\set@Outline{\pdfliteral direct { 1 Tr 0 w }\relax}
- \def\unset@Outline{\pdfliteral direct { 0 Tr 0 w }\relax}
-\fi
-
-\newcommand\EUCountry[2][]{{%
- \expandafter\setCoEkeys\expandafter{#1}%
- \CountriesofEuropeFamily\scalebox{\CoE@Scale}{%
- \ifCoE@outline\set@Outline\fi
- \csname#2\endcsname
- \ifCoE@outline\unset@Outline\fi
- }}}
-
-\if@CoE@newengine
- \RequirePackage{fontspec}
- \newfontface\CountriesofEuropeFamily{CountriesofEurope.otf}[Scale=\CountriesofEurope@scale]
- \let\CoEF\CountriesofEuropeFamily
- \DeclareTextCommand{\Albania}{TU}{\char"F8EC}% 63724
- \DeclareTextCommand{\Andorra}{TU}{\char"F8EB}
- \DeclareTextCommand{\Austria}{TU}{\char"F8EA}
- \DeclareTextCommand{\Belarus}{TU}{\char"F8E9}
- \DeclareTextCommand{\Belgium}{TU}{\char"F8E8}
- \DeclareTextCommand{\Bosnia}{TU}{\char"F8E7}
- \DeclareTextCommand{\Bulgaria}{TU}{\char"F8E6}
- \DeclareTextCommand{\Croatia}{TU}{\char"F8E5}
- \DeclareTextCommand{\Czechia}{TU}{\char"F8E4}
- \DeclareTextCommand{\Denmark}{TU}{\char"F8E3}
- \DeclareTextCommand{\Estonia}{TU}{\char"F8E2}
- \DeclareTextCommand{\Finland}{TU}{\char"F8E1}
- \DeclareTextCommand{\France}{TU}{\char"F8E0}
- \DeclareTextCommand{\Germany}{TU}{\char"F8DF}
- \DeclareTextCommand{\GreatBritain}{TU}{\char"F8DE}
- \DeclareTextCommand{\Greece}{TU}{\char"F8DD}
- \DeclareTextCommand{\Hungary}{TU}{\char"F8DC}
- \DeclareTextCommand{\Iceland}{TU}{\char"F8DB}
- \DeclareTextCommand{\Ireland}{TU}{\char"F8DA}
- \DeclareTextCommand{\Italy}{TU}{\char"F8D9}
- \DeclareTextCommand{\Latvia}{TU}{\char"F8D8}
- \DeclareTextCommand{\Liechtenstein}{TU}{\char"F8D7}
- \DeclareTextCommand{\Lithuania}{TU}{\char"F8D6}
- \DeclareTextCommand{\Luxembourg}{TU}{\char"F8D5}
- \DeclareTextCommand{\Macedonia}{TU}{\char"F8D4}
- \DeclareTextCommand{\Malta}{TU}{\char"F8D3}
- \DeclareTextCommand{\Moldova}{TU}{\char"F8D2}
- \DeclareTextCommand{\Montenegro}{TU}{\char"F8D1}
- \DeclareTextCommand{\Netherlands}{TU}{\char"F8D0}
- \DeclareTextCommand{\Norway}{TU}{\char"F8CF}
- \DeclareTextCommand{\Poland}{TU}{\char"F8CE}
- \DeclareTextCommand{\Portugal}{TU}{\char"F8CD}
- \DeclareTextCommand{\Romania}{TU}{\char"F8CC}
- \DeclareTextCommand{\Serbia}{TU}{\char"F8CB}
- \DeclareTextCommand{\Slovakia}{TU}{\char"F8CA}
- \DeclareTextCommand{\Slovenia}{TU}{\char"F8C9}
- \DeclareTextCommand{\Spain}{TU}{\char"F8C8}
- \DeclareTextCommand{\Sweden}{TU}{\char"F8C7}
- \DeclareTextCommand{\Switzerland}{TU}{\char"F8C6}% 63686
-\else
-\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
- \DeclareFontFamily{U}{CountriesofEurope}{}
- \DeclareFontShape{U}{CountriesofEurope}{m}{n}{<->s*[\CountriesofEurope@scale]CountriesofEurope}{}
- \providecommand\CountriesofEuropeFamily{\usefont{U}{CountriesofEurope}{m}{n}}
- \DeclareTextCommand{\Albania}{U}{\char128}
- \DeclareTextCommand{\Andorra}{U}{\char129}
- \DeclareTextCommand{\Austria}{U}{\char130}
- \DeclareTextCommand{\Belarus}{U}{\char131}
- \DeclareTextCommand{\Belgium}{U}{\char132}
- \DeclareTextCommand{\Bosnia}{U}{\char133}
- \DeclareTextCommand{\Bulgaria}{U}{\char134}
- \DeclareTextCommand{\Croatia}{U}{\char135}
- \DeclareTextCommand{\Czechia}{U}{\char136}
- \DeclareTextCommand{\Denmark}{U}{\char137}
- \DeclareTextCommand{\Estonia}{U}{\char138}
- \DeclareTextCommand{\Finland}{U}{\char139}
- \DeclareTextCommand{\France}{U}{\char140}
- \DeclareTextCommand{\Germany}{U}{\char141}
- \DeclareTextCommand{\GreatBritain}{U}{\char142}
- \DeclareTextCommand{\Greece}{U}{\char143}
- \DeclareTextCommand{\Hungary}{U}{\char144}
- \DeclareTextCommand{\Iceland}{U}{\char145}
- \DeclareTextCommand{\Ireland}{U}{\char146}
- \DeclareTextCommand{\Italy}{U}{\char147}
- \DeclareTextCommand{\Latvia}{U}{\char148}
- \DeclareTextCommand{\Liechtenstein}{U}{\char149}
- \DeclareTextCommand{\Lithuania}{U}{\char150}
- \DeclareTextCommand{\Luxembourg}{U}{\char151}
- \DeclareTextCommand{\Macedonia}{U}{\char152}
- \DeclareTextCommand{\Malta}{U}{\char153}
- \DeclareTextCommand{\Moldova}{U}{\char154}
- \DeclareTextCommand{\Montenegro}{U}{\char155}
- \DeclareTextCommand{\Netherlands}{U}{\char156}
- \DeclareTextCommand{\Norway}{U}{\char157}
- \DeclareTextCommand{\Poland}{U}{\char158}
- \DeclareTextCommand{\Portugal}{U}{\char159}
- \DeclareTextCommand{\Romania}{U}{\char160}
- \DeclareTextCommand{\Serbia}{U}{\char161}
- \DeclareTextCommand{\Slovakia}{U}{\char162}
- \DeclareTextCommand{\Slovenia}{U}{\char163}
- \DeclareTextCommand{\Spain}{U}{\char164}
- \DeclareTextCommand{\Sweden}{U}{\char165}
- \DeclareTextCommand{\Switzerland}{U}{\char166}
-\fi
-% otftotfm --encoding=CountriesofEurope.enc --no-map CountriesofEurope.otf CountriesofEurope
-
-\endinput
-
-
-%80
- \Albania \Andorra \Austria \Belarus \Belgium \Bosnia \Bulgaria \Croatia
- \Czechia \Denmark \Estonia \Finland \France \Germania \GreatBritain \Greece
-%90
- \Hungary \Iceland \Ireland \Italy \Latvia \Liechtenstein \Lithuania \Luxembourg
- \Macedonia \Malta \Moldova \Montenegro \Netherlands \Norway \Poland \Portugal
-%A0
- \Romania \Serbia \Slovakia \Slovenia \Spain \Sweden \Switzerland
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/countriesofeurope/countriesofeurope.sty new/tex/latex/countriesofeurope/countriesofeurope.sty
--- old/tex/latex/countriesofeurope/countriesofeurope.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/countriesofeurope/countriesofeurope.sty 2019-10-04 22:49:55.000000000 +0200
@@ -0,0 +1,183 @@
+%% This is file `CountriesofEurope.sty',
+%%
+%% Copyright (C) 2016-
+%% Rolf Niepraschk, Herbert Voss
+%%
+%% It 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.
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{countriesofeurope}%
+ [2018/12/29 v0.23 countriesofeurope Font (hv,RN)]
+\PassOptionsToPackage{rgb}{xcolor}
+\RequirePackage{ifxetex,ifluatex,xkeyval,graphicx,xcolor}
+
+\newcommand*\countriesofeurope@scale{1}
+\newcommand*\countriesofeurope@ligatures{ResetAll}
+\RequirePackage{xkeyval}
+\DeclareOptionX{Scale}{\renewcommand*\countriesofeurope@scale{#1}}
+\DeclareOptionX{Ligatures}{\renewcommand*\countriesofeurope@ligatures{#1}}
+\ProcessOptionsX\relax
+
+\newif\ifCoE@outline
+
+\def\CoE@boolkey#1#2{\csname CoE@#2\ifx\relax#1\relax true\else#1\fi\endcsname}
+
+\define@key{CoE}{Scale}[1]{\def\CoE@Scale{#1}}
+\define@key{CoE}{outline}[true]{\lowercase{\CoE@boolkey{#1}}{outline}}
+\define@key{CoE}{fillcolor}[]{\def\CoE@fillcolor{#1}}
+\define@key{CoE}{linecolor}[black]{\def\CoE@linecolor{#1}}
+%
+\def\setCoEkeys#1{\edef\x{\noexpand\setkeys{CoE}{#1}}\x}
+
+\setCoEkeys{outline=false,Scale=1,fillcolor=,linecolor=black}
+
+\def\getPDFsyntax#1,#2,#3\@nil#4{\gdef#4{#1 #2 #3}}
+\def\getPDFcolor#1#2{\extractcolorspecs{#1}\Col@A\Col@B\relax
+ \expandafter\getPDFsyntax\Col@B\@nil#2\relax
+}
+
+\newif\if@CoE@newengine \@CoE@newenginefalse
+\ifxetex\@CoE@newenginetrue
+\else
+ \ifluatex\@CoE@newenginetrue\fi
+\fi
+
+\if@CoE@newengine
+ \def\set@Outline{%
+ \ifx\CoE@fillcolor\@empty
+ \pdfextension literal direct { 1 Tr 0 w }\relax
+ \else
+ \getPDFcolor{\CoE@linecolor}\CoE@pdf@linecolor
+ \getPDFcolor{\CoE@fillcolor}\CoE@pdf@fillcolor
+ \pdfextension literal direct{ \CoE@pdf@fillcolor\space rg \CoE@pdf@linecolor\space RG 2 Tr 0 w }\relax
+ \fi}
+ \def\unset@Outline{\pdfextension literal direct{ 0 Tr 0 w }\relax}%
+\else
+ \def\set@Outline{%
+ \ifx\relax\CoE@fillcolor\relax
+ \pdfliteral direct { 1 Tr 0 w }\relax
+ \else
+ \getPDFcolor{\CoE@linecolor}\CoE@pdf@linecolor
+ \getPDFcolor{\CoE@fillcolor}\CoE@pdf@fillcolor
+ \pdfliteral direct{ \CoE@pdf@fillcolor\space rg \CoE@pdf@linecolor\space RG 2 Tr 0 w }\relax
+ \fi}%
+ \def\unset@Outline{\pdfliteral direct{ 0 Tr 0 w }\relax}%
+\fi
+
+\newcommand\EUCountry[2][]{{%
+ \expandafter\setCoEkeys\expandafter{#1}%
+ \countriesofeuropefamily\scalebox{\CoE@Scale}{%
+ \ifCoE@outline\set@Outline\fi%
+ \csname#2\endcsname%
+ \ifCoE@outline\unset@Outline\fi%
+ }}}
+
+\if@CoE@newengine
+ \RequirePackage{fontspec}
+ \newfontface\countriesofeuropefamily{countriesofeurope.otf}%
+ [Scale=\countriesofeurope@scale,Ligatures=\countriesofeurope@ligatures]
+ \let\CoEF\countriesofeuropefamily
+ \DeclareTextCommand{\Albania}{TU}{\char"F8EC}% 63724
+ \DeclareTextCommand{\Andorra}{TU}{\char"F8EB}
+ \DeclareTextCommand{\Austria}{TU}{\char"F8EA}
+ \DeclareTextCommand{\Belarus}{TU}{\char"F8E9}
+ \DeclareTextCommand{\Belgium}{TU}{\char"F8E8}
+ \DeclareTextCommand{\Bosnia}{TU}{\char"F8E7}
+ \DeclareTextCommand{\Bulgaria}{TU}{\char"F8E6}
+ \DeclareTextCommand{\Croatia}{TU}{\char"F8E5}
+ \DeclareTextCommand{\Czechia}{TU}{\char"F8E4}
+ \DeclareTextCommand{\Denmark}{TU}{\char"F8E3}
+ \DeclareTextCommand{\Estonia}{TU}{\char"F8E2}
+ \DeclareTextCommand{\Finland}{TU}{\char"F8E1}
+ \DeclareTextCommand{\France}{TU}{\char"F8E0}
+ \DeclareTextCommand{\Germany}{TU}{\char"F8DF}
+ \DeclareTextCommand{\GreatBritain}{TU}{\char"F8DE}
+ \DeclareTextCommand{\Greece}{TU}{\char"F8DD}
+ \DeclareTextCommand{\Hungary}{TU}{\char"F8DC}
+ \DeclareTextCommand{\Iceland}{TU}{\char"F8DB}
+ \DeclareTextCommand{\Ireland}{TU}{\char"F8DA}
+ \DeclareTextCommand{\Italy}{TU}{\char"F8D9}
+ \DeclareTextCommand{\Latvia}{TU}{\char"F8D8}
+ \DeclareTextCommand{\Liechtenstein}{TU}{\char"F8D7}
+ \DeclareTextCommand{\Lithuania}{TU}{\char"F8D6}
+ \DeclareTextCommand{\Luxembourg}{TU}{\char"F8D5}
+ \DeclareTextCommand{\Macedonia}{TU}{\char"F8D4}
+ \DeclareTextCommand{\Malta}{TU}{\char"F8D3}
+ \DeclareTextCommand{\Moldova}{TU}{\char"F8D2}
+ \DeclareTextCommand{\Montenegro}{TU}{\char"F8D1}
+ \DeclareTextCommand{\Netherlands}{TU}{\char"F8D0}
+ \DeclareTextCommand{\Norway}{TU}{\char"F8CF}
+ \DeclareTextCommand{\Poland}{TU}{\char"F8CE}
+ \DeclareTextCommand{\Portugal}{TU}{\char"F8CD}
+ \DeclareTextCommand{\Romania}{TU}{\char"F8CC}
+ \DeclareTextCommand{\Serbia}{TU}{\char"F8CB}
+ \DeclareTextCommand{\Slovakia}{TU}{\char"F8CA}
+ \DeclareTextCommand{\Slovenia}{TU}{\char"F8C9}
+ \DeclareTextCommand{\Spain}{TU}{\char"F8C8}
+ \DeclareTextCommand{\Sweden}{TU}{\char"F8C7}
+ \DeclareTextCommand{\Switzerland}{TU}{\char"F8C6}% 63686
+\else
+\RequirePackage[T1]{fontenc}
+\RequirePackage{textcomp}
+ \DeclareFontFamily{U}{countriesofeurope}{}
+ \DeclareFontShape{U}{countriesofeurope}{m}{n}{<->s*[\countriesofeurope@scale]countriesofeurope}{}
+ \providecommand\countriesofeuropefamily{\usefont{U}{countriesofeurope}{m}{n}}
+ \DeclareTextCommand{\Albania}{U}{\char128}
+ \DeclareTextCommand{\Andorra}{U}{\char129}
+ \DeclareTextCommand{\Austria}{U}{\char130}
+ \DeclareTextCommand{\Belarus}{U}{\char131}
+ \DeclareTextCommand{\Belgium}{U}{\char132}
+ \DeclareTextCommand{\Bosnia}{U}{\char133}
+ \DeclareTextCommand{\Bulgaria}{U}{\char134}
+ \DeclareTextCommand{\Croatia}{U}{\char135}
+ \DeclareTextCommand{\Czechia}{U}{\char136}
+ \DeclareTextCommand{\Denmark}{U}{\char137}
+ \DeclareTextCommand{\Estonia}{U}{\char138}
+ \DeclareTextCommand{\Finland}{U}{\char139}
+ \DeclareTextCommand{\France}{U}{\char140}
+ \DeclareTextCommand{\Germany}{U}{\char141}
+ \DeclareTextCommand{\GreatBritain}{U}{\char142}
+ \DeclareTextCommand{\Greece}{U}{\char143}
+ \DeclareTextCommand{\Hungary}{U}{\char144}
+ \DeclareTextCommand{\Iceland}{U}{\char145}
+ \DeclareTextCommand{\Ireland}{U}{\char146}
+ \DeclareTextCommand{\Italy}{U}{\char147}
+ \DeclareTextCommand{\Latvia}{U}{\char148}
+ \DeclareTextCommand{\Liechtenstein}{U}{\char149}
+ \DeclareTextCommand{\Lithuania}{U}{\char150}
+ \DeclareTextCommand{\Luxembourg}{U}{\char151}
+ \DeclareTextCommand{\Macedonia}{U}{\char152}
+ \DeclareTextCommand{\Malta}{U}{\char153}
+ \DeclareTextCommand{\Moldova}{U}{\char154}
+ \DeclareTextCommand{\Montenegro}{U}{\char155}
+ \DeclareTextCommand{\Netherlands}{U}{\char156}
+ \DeclareTextCommand{\Norway}{U}{\char157}
+ \DeclareTextCommand{\Poland}{U}{\char158}
+ \DeclareTextCommand{\Portugal}{U}{\char159}
+ \DeclareTextCommand{\Romania}{U}{\char160}
+ \DeclareTextCommand{\Serbia}{U}{\char161}
+ \DeclareTextCommand{\Slovakia}{U}{\char162}
+ \DeclareTextCommand{\Slovenia}{U}{\char163}
+ \DeclareTextCommand{\Spain}{U}{\char164}
+ \DeclareTextCommand{\Sweden}{U}{\char165}
+ \DeclareTextCommand{\Switzerland}{U}{\char166}
+\fi
+% otftotfm --encoding=countriesofeurope.enc --no-map countriesofeurope.otf countriesofeurope
+
+\endinput
+
+
+%80
+ \Albania \Andorra \Austria \Belarus \Belgium \Bosnia \Bulgaria \Croatia
+ \Czechia \Denmark \Estonia \Finland \France \Germania \GreatBritain \Greece
+%90
+ \Hungary \Iceland \Ireland \Italy \Latvia \Liechtenstein \Lithuania \Luxembourg
+ \Macedonia \Malta \Moldova \Montenegro \Netherlands \Norway \Poland \Portugal
+%A0
+ \Romania \Serbia \Slovakia \Slovenia \Spain \Sweden \Switzerland
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/countriesofeurope.tlpobj new/tlpkg/tlpobj/countriesofeurope.tlpobj
--- old/tlpkg/tlpobj/countriesofeurope.tlpobj 2019-02-28 03:30:12.000000000 +0100
+++ new/tlpkg/tlpobj/countriesofeurope.tlpobj 2020-03-24 01:57:10.000000000 +0100
@@ -1,6 +1,6 @@
name countriesofeurope
category Package
-revision 49525
+revision 54512
shortdesc A font with the images of the countries of Europe
relocated 1
longdesc The bundle provides a font "CountriesOfEurope" (in Adobe Type 1
@@ -8,17 +8,16 @@
longdesc for its use. The font provides glyphs with a filled outline of
longdesc the shape of each country; each glyph is at the same
longdesc cartographic scale.
-execute addMap CountriesofEurope.map
+execute addMap countriesofeurope.map
runfiles size=72
- RELOC/fonts/afm/public/countriesofeurope/CountriesofEurope.afm
- RELOC/fonts/enc/dvips/countriesofeurope/CountriesofEurope.enc
- RELOC/fonts/map/dvips/countriesofeurope/CountriesofEurope.map
- RELOC/fonts/opentype/public/countriesofeurope/CountriesofEurope.otf
- RELOC/fonts/tfm/public/countriesofeurope/CountriesofEurope.tfm
- RELOC/fonts/type1/public/countriesofeurope/CountriesofEurope.pfb
- RELOC/tex/latex/countriesofeurope/CountriesofEurope.sty
+ RELOC/fonts/afm/public/countriesofeurope/countriesofeurope.afm
+ RELOC/fonts/enc/dvips/countriesofeurope/countriesofeurope.enc
+ RELOC/fonts/map/dvips/countriesofeurope/countriesofeurope.map
+ RELOC/fonts/opentype/public/countriesofeurope/countriesofeurope.otf
+ RELOC/fonts/tfm/public/countriesofeurope/countriesofeurope.tfm
+ RELOC/fonts/type1/public/countriesofeurope/countriesofeurope.pfb
+ RELOC/tex/latex/countriesofeurope/countriesofeurope.sty
catalogue-ctan /fonts/countriesofeurope
-catalogue-date 2018-12-28 07:23:42 +0100
-catalogue-license lppl
+catalogue-license ofl lppl
catalogue-topics font font-type1 font-novelty
-catalogue-version 0.22
+catalogue-version 0.23
++++++ covington.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/covington/README new/doc/latex/covington/README
--- old/doc/latex/covington/README 2018-12-10 23:57:48.000000000 +0100
+++ new/doc/latex/covington/README 2020-01-02 23:11:37.000000000 +0100
@@ -3,7 +3,7 @@
LaTeX macros for Linguistics
-Copyright 1991--2018 Michael A. Covington
+Copyright 1991--2020 Michael A. Covington
Robin Fairbairns
Juergen Spitzmueller
@@ -31,6 +31,27 @@
== CHANGES ==
+* Version 2.4 (2020-01-02):
+ - Fix definition of covexercise if no subsection counter exists.
+
+* Version 2.3 (2019-06-21):
+ - Add preamble option to subexamples environment.
+ - Allow to use covington together with the drs package.
+ - Documentation fixes and restructuring.
+
+* Version 2.2 (2019-06-04):
+ - Add new option owncounter that makes covington use an own counter for examples
+ (rather than the equation counter).
+ - Add starred \exampleno* command that outputs the current example number value
+ without stepping it.
+ - Add macros \covexamplefs and \covexamplenofs for global setting of example text
+ markup.
+
+* Version 2.1 (2019-05-12):
+ - Add new option noglossbreaks that tries to prevent page breaks within glosses.
+ - Add \glosspreamble command and preamble gloss macro option for arbitrary text
+ preceding glosses.
+
* Version 2.0 (2018-12-10):
- Add new gloss macros (\digloss and \trigloss) for a more convenient,
flexible and robust gloss insertion.
Binary files old/doc/latex/covington/covington.pdf and new/doc/latex/covington/covington.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/covington/covington.tex new/doc/latex/covington/covington.tex
--- old/doc/latex/covington/covington.tex 2018-12-10 23:57:48.000000000 +0100
+++ new/doc/latex/covington/covington.tex 2020-01-02 23:11:37.000000000 +0100
@@ -94,8 +94,8 @@
%
% Titling
%
-\def\pversion{Version 2.0}
-\def\pdate{December 10, 2018}
+\def\pversion{Version 2.4}
+\def\pdate{January 2, 2020}
\title{\textbf{The \cvt\ Package\\Macros for Linguistics}}
\author{Michael A. Covington \and J\"urgen Spitzm\"uller\thanks{Current maintainer.
@@ -118,7 +118,7 @@
\clearpage
-\section{Introduction}
+\section{Introduction}\label{sec:intro}
This is the documentation for \MakeLowercase{\pversion}
of \cvt\ (\pdate), which is a \LaTeX\ package providing macros
@@ -138,23 +138,40 @@
This applies to the \jenv{example}, \jenv{examples}, \jenv{subexamples} and \jenv{exercise} environments,
which are by default not touched if they are already defined before \cvt\ is loaded.
See sec.~\ref{sec:ex}, \ref{sec:exs}, \ref{sec:subexs} and \ref{sec:exercises} for details.
+
\item{\joption{keeplayout}:} Do not tweak the layout.
\Cvt\ sets \jfcsmacro{raggedbottom} and redefines the value of the \jfcsmacro{textfloatsep} length.
This just follows the preferences of the original package author and is not necessary
for the package's functionality. Yet for backwards compatibility reasons, we cannot change this.
Thus, we provide the option described here to opt out this presetting.
+
+\item{\joption{noglossbreaks}:} If this option is set, \cvt\ will try hard to prevent page breaks within glosses.
+
+ If this option is not set, page breaks can occur between interlinearized text and free translation of a gloss, as
+ well as between gloss preamble and interlinearized text, which is usually not what you will want.
+ Nonetheless the option is not set by default. This is for backwards compatibility reasons (in order to not change
+ page breaking of existing documents). Note that page breaks might still occur in some cases even if the option is set.
+ In order to prevent them definitely, you can put the gloss in a parbox or minipage.
+
+\item{\joption{owncounter}:} Use an own counter for numbered examples.
+
+ By default, \cvt\ uses \LaTeX's equation counter for example numbering, so that if you use equations and numbered examples
+ in the same paper, you get a single continuous series of numbers. While some people (including the original author of this package)
+ consider this a feature, others might prefer to number equations and linguistic examples separately. If you count to the latter sort,
+ use this option.
\end{description}
%
+Please note the following package-related caveats:
+\begin{itemize}
+ \item If you are using \cvt\ and the \textsf{uga} (University of Georgia thesis style) package together, you should load \textsf{uga} before \cvt.
+ \item If you are using \cvt\ with \textsf{beamer-article}, you should load \textsf{beamer-article} before \cvt.
+ \item If you are using \cvt\ with the \textsf{drs} package, you should load \textsf{drs} before \cvt. See sec.~\ref{sec:drs}.
+\end{itemize}
+%
In what follows we presume that you know how to use \LaTeX\ and have
-access to \LaTeX\ manuals. Note that \cvt\ does not
-provide any special fonts or character sets. However, it can be used in
-combination with other style sheets that do.
-
-If you are using \cvt\ and \texttt{uga.sty} (UGa thesis style)
-together, you should load \texttt{uga} before \cvt.
+access to \LaTeX\ manuals.
-
\section{Stacked diacritics}\label{sec:accents}
\LaTeX\ provides a generous range of diacritics that can be placed on or below any
@@ -224,15 +241,13 @@
\begin{flushleft}
This is a sentence. \hfill (\exampleno)
\end{flushleft}
-The example counter is actually the same as \LaTeX's equation counter,
-so that if you use equations and numbered examples in the same
-paper, you get a single continuous series of numbers. If you want to
-output the number without stepping it, use \jfcsmacro{theequation}.
+If you want to output the (current) number without stepping it, the starred form \jcsmacro{exampleno*} will do that.
Normally, however, you do not need to manually place \jcsmacro{exampleno} yourselves,
as in the example above. For the common case where example numbers in parentheses are
placed left to the example, \cvt\ provides more convenient solutions. These are described in turn.
+
\subsection[The \texttt{example} environment]{The \jenv{example} environment}\label{sec:ex}
The \jenv{example} environment (alias \jenv{covexample}) displays a single example
@@ -283,7 +298,7 @@
\item[(b)] This is the second sentence.
\end{itemize}
\end{example}
-However, the \jenv{examples} and \jenv{subexamples} environments, described in turn, are usually more
+However, the \jenv{subexamples} environment, described in sec.~\ref{sec:subexs}, is usually more
convenient for this task.
\subsection[The \texttt{examples} environment]{The \jenv{examples} environment}\label{sec:exs}
@@ -341,26 +356,41 @@
\item This is the first sentence.\label{sbex}
\item This is the second sentence.
\end{subexamples}
+%
Again, \cvt\ checks if there is already an \jenv{subexamples} environment defined,
and if this is the case, \cvt\ does not define its own one. The alias environment \jenv{covsubexamples}
is always available as a fallback. If you use the package option \joption{force}, \cvt\ will override
existing \jenv{subexamples} environments. The package will issue a warning if \jenv{subexamples} is already defined.
-
-\subsection{Customizing the numbering}\label{sec:custno}
-
-You can change the display of the example number by redefining (via \jfcsmacro{renewcommand*}) the macro
-\jcsmacro{covexnumber} which has the following default definition:
-\begin{lstlisting}[moretexcs={covexnumber}]
-\newcommand*\covexnumber[1]{(#1)}
+\medskip
+\noindent The \jenv{subexamples} environment provides the following option:
+\begin{description}
+ \item[\joption{preamble=\{\jparam{arbitrary text}\}}] Arbitrary text that is inserted in the first line
+ (after the main number and before the first sub-example, which then follows in a new line).
+ This might be useful, for instance, to give context information, to specify the language or the source
+ in case of cited sub-examples. You can globally set the markup of this preamble text (see sec.~\ref{sec:custno}).
+\end{description}
+%
+For instance,
+\begin{lstlisting}
+\begin{subexamples}[preamble={Here are two sentences}]
+\item This is the first sentence.
+\item This is the second sentence.
+\end{subexamples}
\end{lstlisting}
-
-In the same vein, you can customize the display of the subexample letter by redefining (also via \jfcsmacro{renewcommand*})
-the macro \jcsmacro{covsubexnumber} which has the following default definition:
-\begin{lstlisting}[moretexcs={covsubexnumber}]
-\newcommand*\covsubexnumber[1]{(#1)}
+or, respectively:
+\begin{lstlisting}
+\begin{covsubexamples}[preamble={Here are two sentences}]
+\item This is the first sentence.
+\item This is the second sentence.
+\end{covsubexamples}
\end{lstlisting}
-
+prints as:
+\begin{subexamples}[preamble={Here are two sentences}]
+ \item This is the first sentence.
+ \item This is the second sentence.
+\end{subexamples}
+%
The distance between example number and subnumber (letter) can be changed via the length \jcsmacro{examplenumbersep}
(which is preset to \texttt{0pt}). The distance between example subnumber and text can be changed via the length
\jcsmacro{subexamplenumbersep} (preset to \texttt{0pt} as well). In both cases, a positive value will increase, a negative
@@ -383,6 +413,44 @@
\egroup
+\subsection{Customizing number display and example markup}\label{sec:custno}
+
+You can change the display of the example number by redefining (via \jfcsmacro{renewcommand*}) the macro
+\jcsmacro{covexnumber}, which has the following default definition:
+\begin{lstlisting}[moretexcs={covexnumber}]
+\newcommand*\covexnumber[1]{(#1)}
+\end{lstlisting}
+%
+with the variable \texttt{\#1} representing the number.
+
+In the same vein, you can customize the display of the subexample letter by redefining
+the macro \jcsmacro{covsubexnumber}, which has the following default definition:
+\begin{lstlisting}[moretexcs={covsubexnumber}]
+\newcommand*\covsubexnumber[1]{(#1)}
+\end{lstlisting}
+%
+To remove the parentheses from the subexample letter, for instance, to this:
+\begin{lstlisting}[moretexcs={covsubexnumber}]
+\renewcommand*\covsubexnumber[1]{#1}
+\end{lstlisting}
+%
+\noindent You can also customize the markup of the example sentences by redefining the macro
+\jcsmacro{covexamplefs} (which is empty by default). To have all example sentences italicized, for instance, do:
+\begin{lstlisting}[moretexcs={covexamplefs}]
+\renewcommand*{\covexamplefs}{\itshape}
+\end{lstlisting}
+%
+Note that this does, deliberately, not include the numbers, since those are controlled by another font setting macro,
+\jcsmacro{covexamplenofs}, which defaults to \jfcsmacro{normalfont}. Of course you are free to redefine this as well,
+if you wish do to so.
+
+Finally, you can customize the markup of the sub-example preamble text by redefining the macro
+\jcsmacro{subexpreamblefs}, which also defaults to \jfcsmacro{normalfont}. To have it italicized, analogously do:
+\begin{lstlisting}[moretexcs={\subexpreamblefs}]
+\renewcommand*{\subexpreamblefs}{\itshape}
+\end{lstlisting}
+
+
\subsection{Referring to examples}\label{sec:ref}
References to examples and sub-examples can be made the usual way via the \jcsmacro{ref} command
@@ -442,10 +510,35 @@
quotation marks (using the language-sensitive \textsf{csquotes} \cite{csquotes} macros if
this package is loaded). This can be customized, though, via the macro options or globally
(for the latter, see sec.~\ref{sec:glossfc}).
+ \item By default, page breaks might occur within glosses. In order to prevent it, the option
+ \joption{noglossbreaks} (see sec.~\ref{sec:intro}) will help in many cases.
+ If it doesn't, you can wrap the whole gloss into a minipage or parbox.
+ \item The words do not have to be typed lining up; \TeX\ counts and aligns them.
+ \item On the other hand, multiple blanks are ignored, so you can, but do not need to,
+ use the space key to line up the words to your liking in the \TeX\ file.
+ The example above could thus also have been input like this, with no change to the output:
+\begin{lstlisting}[moretexcs={digloss}]
+\digloss{Dit is een Nederlands voorbeeld}
+ {This is a Dutch example}
+ {This is an example in Dutch.}
+\end{lstlisting}
+ \item If the words in the two languages do not correspond one-to-one, you can use curly brackets
+ to group words and a pair of empty curly brackets to mark null forms.
+ For example, to print
+ \digloss{Dit is een voorbeeldje in het Nederlands}
+ {This is a {little example} in {} Dutch}
+ {This is a little example in Dutch.}
+ you would type:
+\begin{lstlisting}[moretexcs={digloss}]
+\digloss{Dit is een voorbeeldje in het Nederlands}
+ {This is a {little example} in {} Dutch}
+ {This is a little example in Dutch.}
+\end{lstlisting}
\end{itemize}
\medskip
-\noindent The following \joption{\jparam{options}} (key-value pairs) are provided for either macro:
+\noindent The following \joption{\jparam{options}} (key-value pairs) are provided for the two gloss macro:%
+\footnote{Please consult sec.~\ref{sec:glossex} below for examples that showcase these options.}
\begin{description}
\item[\joption{ex=\jparam{true|false}}] Default: \emph{false}. Wraps the gloss in an example environment
@@ -456,14 +549,22 @@
first line of the gloss. This can be useful when no translation, but an aligned number or something similar,
is to be inserted right to the gloss (please refer to sec.~\ref{sec:glossex} for an example).
\item[\joption{fsi=\{\jparam{font settings}\}}] Adjusts the font settings of the first gloss line.
- Valid values are \LaTeX\ font switches such as \jfcsmacro{textit}, \jfcsmacro{bfseries} etc.
+ Valid values are \LaTeX\ font switches such as \jfcsmacro{itshape}, \jfcsmacro{bfseries} etc.
\item[\joption{fsii=\{\jparam{font settings}\}}] Adjusts the font settings of the second gloss line.
- Valid values are \LaTeX\ font switches such as \jfcsmacro{textit}, \jfcsmacro{bfseries} etc.
+ Valid values are \LaTeX\ font switches such as \jfcsmacro{itshape}, \jfcsmacro{bfseries} etc.
\item[\joption{fsiii=\{\jparam{font settings}\}}] Adjusts the font settings of the third gloss line.
- Valid values are \LaTeX\ font switches such as \jfcsmacro{textit}, \jfcsmacro{bfseries} etc.
+ Valid values are \LaTeX\ font switches such as \jfcsmacro{itshape}, \jfcsmacro{bfseries} etc.
+ \item[\joption{preamble=\{\jparam{arbitrary text}\}}] Arbitrary text that is inserted on an own line
+ before the interlinearized gloss. This might be useful, for instance, to give context information,
+ to specify the language or the source in case of cited glosses.
+
+ The advantages over just adding a line manually above the gloss are that you can globally set the
+ markup (see sec.~\ref{sec:glossfc}), and that such lines are kept on the same page than the gloss
+ with the option \joption{noglossbreaks} (at least as long as preamble does not exceed one line).
+ Furthermore, this option is the only way to add such text when the \joption{ex} option is used.
\end{description}
%
-If given as the argument to a \jcsmacro{digloss} or \jcsmacro{trigloss} macro, the options will only apply to
+If given as optional arguments to a \jcsmacro{digloss} or \jcsmacro{trigloss} macro, the options will only apply to
this very gloss. If you want to make a permanent change, you can use the macro
\begin{itemize}
\item \jcsmacro{setglossoptions\{\jparam{options}\}}
@@ -471,22 +572,6 @@
and pass either of the above options to it. This will apply to all subsequent glosses (until further global
change and unless the setting is altered locally via macro option).
-Notice, finally, that the words do not have to be typed lining up; instead, \TeX\
-counts them. If the words in the two languages do not correspond
-one-to-one, you can use curly brackets to group words.
-For example, to print
-\digloss{Dit is een voorbeeldje in het Nederlands}
- {This is a {little example} in {} Dutch}
- {This is a little example in Dutch.}
-you would type:
-\begin{lstlisting}[moretexcs={digloss}]
-\digloss{Dit is een voorbeeldje in het Nederlands}
- {This is a {little example} in {} Dutch}
- {This is a little example in Dutch.}
-\end{lstlisting}
-%
-Please consult sec.~\ref{sec:glossex} below for more examples.
-
\subsection{Glossing with low-level commands}\label{sec:glosscmds}
The gloss macros described above build on low-level commands\footnote{The commands are adapted
@@ -527,10 +612,18 @@
and a smarter way to insert a translation line. Other than \jcsmacro{glt}, it marks up
(by default: enquotes) the translation line. Also, it does not add an empty line if the
translation is empty. This command has been introduced in \cvt\ 2.0.
+ \item[\jcsmacro{glosspreamble\{\jparam{arbitrary text}\}}] lets you enter text that is printed immediately
+ before the interlinearized gloss (on a line of its own). This might be useful, for instance,
+ to give context information, to specify the language or the source in case of cited glosses.
+ The advantages over just adding a line manually above the gloss are that you can globally set the markup
+ (see sec.~\ref{sec:glossfc}) and that such lines are kept on the same page than the gloss with the option
+ \joption{noglossbreaks}. Note, however, that page breaks might occur if this text spans multiple lines.
+ In this case, you can wrap the whole gloss into a minipage.
+ This command has been introduced in \cvt\ 2.1.
\item[\jcsmacro{glend}] ends the special \jfenv{flushleft}-like environment.
\end{description}
%
-Using the low-level commands, the examples given above would be
+Using the low-level commands, the examples given in the previous section would be
coded as follows:
\begin{lstlisting}[moretexcs={gll,glt,glend}]
\gll Dit is een Nederlands voorbeeld.
@@ -605,10 +698,16 @@
If not, a fallback quotation (using English single quotation marks) is used. The usage of
\textsf{csquotes} is highly recommended!
+The markup of the preamble line (which is not marked up at all by default) can be customized
+by redefining the macro:
+\begin{lstlisting}[moretexcs={glosslinetrans,covenquote}]
+\newcommand*\glosslinepreamble[1]{#1}
+\end{lstlisting}
+
\subsection{Examples}\label{sec:glossex}
-This section gives some further examples. First, a sentence with three lines aligned,
+This section gives some further examples. First, a sentence with three lines aligned,
instead of just two:
\trigloss[fsii={\normalfont\scshape}]
{Hoc est aliud exemplum}
@@ -638,7 +737,8 @@
{This has number}
{\hfill (\exampleno)}
\end{lstlisting}
-Finally we'll put a glossed sentence inside the \texttt{example}
+%
+Third, we'll put a glossed sentence inside the \texttt{example}
environment, which is a very common way of using it:
\digloss[ex]{Hoc habet numerum praepositum}
{This has number preposed}
@@ -657,6 +757,25 @@
{This one has a number in front of it.}
\end{example}
\end{lstlisting}
+%
+And finally, an example that uses the \emph{Leipzig glossing rules} (\cite{leipzig},
+cited example: p.~2) and also exemplifies the use of \joption{preamble}:
+\digloss[ex, preamble={Lezgian (Haspelmath 1993:207)}]
+ {Gila abur-u-n ferma hami�alu\v{g} g�\v{g}�na amuq'-da-\v{c}.}
+ {now they-\textsc{obl-gen} farm forever behind stay-\textsc{fut-neg}}
+ {Now their farm will not stay behind forever.}
+This has been input as follows:
+\begin{lstlisting}[moretexcs={digloss},basicstyle={\footnotesize\ttfamily}]
+\digloss[ex,preamble={Lezgian (Haspelmath 1993:207)}]
+ {Gila abur-u-n ferma hami�alu\v{g} g�\v{g}�na amuq'-da-\v{c}.}
+ {now they-\textsc{obl-gen} farm forever behind stay-\textsc{fut-neg}}
+ {Now their farm will not stay behind forever.}
+\end{lstlisting}
+%
+Of course, you would use \jfcsmacro{cite} in a real document for the citation.
+Also, if you adhere to the \emph{Leipzig glossing rules}, you might want to check out the \textsf{leipzig}
+\LaTeX\ package \cite{leipzig-ltx} that facilitates the use of the gloss abbreviations that have
+been entered and marked-up manually here.
\section{Phrase structure rules}
@@ -676,7 +795,7 @@
\fs{case:nom \\ person:P}
\end{lstlisting}
-The feature structure can appear anywhere --- in continuous text, in a
+The feature structure can appear anywhere -- in continuous text, in a
displayed environment such as \jfenv{flushleft}, or inside a
phrase-structure rule, or even inside another feature structure.
@@ -702,84 +821,122 @@
\end{lstlisting}
-\section{Discourse Representation Structures}
+\section{Discourse Representation Structures}\label{sec:drs}
-Several macros in \cvt\ facilitate display of discourse
-Representation Structures (\textsc{drs}es) in the box notation introduced by
-Hans Kamp. The simplest one is \jcsmacro{drs}, which takes two arguments:
+Several macros in \cvt\ facilitate display of \emph{Discourse Representation Structures}
+(\textsc{drs}es) in the box notation introduced by Hans Kamp \cite{kamp}.
+The simplest one is \jcsmacro{drs}, which takes two arguments:
a list of discourse variables joined by \verb"~", and a list of \textsc{drs}
-conditions separated by \verb"\\". Nesting is permitted. Note that the
-\jcsmacro{drs} macro itself does not give you a displayed environment; you
+conditions separated by \verb"\\". Nesting is permitted.
+
+Note that the \jcsmacro{drs} macro itself does not give you a displayed environment; you
must use \jfenv{flushleft} or the like to display the \textsc{drs}.
-Here are some examples:
-\begin{minipage}{.5\textwidth}
+\medskip
+\noindent Here are some examples:
+
\begin{lstlisting}[moretexcs={drs}]
\begin{flushleft}
- \drs{X}{donkey(X)\\green(X)}
+ \drs{X}
+ {
+ donkey(X)\\
+ green(X)
+ }
\end{flushleft}
\end{lstlisting}
-\end{minipage}\hfill
-\begin{minipage}{.4\textwidth}
+%
+prints as:
\begin{flushleft}
-\drs{X}{donkey(X)\\green(X)}
+\drs{X}
+ {
+ donkey(X)\\
+ green(X)
+ }
\end{flushleft}
-\end{minipage}
\medskip
-\begin{minipage}{.5\textwidth}
\begin{lstlisting}[moretexcs={drs}]
\begin{flushleft}
\drs{X}
- {named(X,`Pedro') \\
- \drs{Y}{donkey(Y)\\owns(X,Y)}~~
- {\large $\Rightarrow$}~
- \drs{~}{feeds(X,Y)}
- }
-\end{flushleft}
-\end{lstlisting}
-\end{minipage}\hfill
-\begin{minipage}{.4\textwidth}
- \begin{flushleft}
- \drs{X}
- {named(X,`Pedro') \\
- \drs{Y}{donkey(Y)\\owns(X,Y)}~~
- {\large $\Rightarrow$}~
- \drs{~}{feeds(X,Y)}
- }
- \end{flushleft}
-\end{minipage}
+ {
+ named(X,`Pedro')\\
+ \drs{Y}
+ {
+ donkey(Y)\\
+ owns(X,Y)
+ }
+ ~~{\large $\Rightarrow$}~
+ \drs{~}
+ {feeds(X,Y)}
+ }
+\end{flushleft}
+\end{lstlisting}
+%
+comes out as:
+\begin{flushleft}
+ \drs{X}
+ {
+ named(X,`Pedro')\\
+ \drs{Y}
+ {
+ donkey(Y)\\
+ owns(X,Y)
+ }
+ ~~{\large $\Rightarrow$}~
+ \drs{~}
+ {feeds(X,Y)}
+ }
+\end{flushleft}
+%
+Note that the alignment of the input is fairly free, so you can also write the
+two arguments of \jcsmacro{drs} in one line, like:
+\begin{lstlisting}[moretexcs={drs}]
+\drs{X}{donkey(X)\\green(X)}
+\end{lstlisting}
\medskip
-
-\noindent To display a sentence above the \textsc{drs}, use \jcsmacro{sdrs}, as in:
-
+\noindent To display a sentence above the \textsc{drs}, use \jcsmacro{sdrs}, which has one
+extra argument for this purpose, as in:
\begin{lstlisting}[moretexcs={sdrs}]
\begin{flushleft}
- \sdrs{A donkey is green.}{X}{donkey(X)\\green(X)}
+ \sdrs{A donkey is green.}
+ {X}
+ {donkey(X)\\green(X)}
\end{flushleft}
\end{lstlisting}
which prints as:
-
+%
\begin{flushleft}
- \sdrs{A donkey is green.}{X}{donkey(X)\\green(X)}
+ \sdrs{A donkey is green.}{X}{donkey(X)\\green(X)}
\end{flushleft}
-
+%
Some \textsc{drs} connectives are also provided (normally for forming
\textsc{drs}es that are to be nested within other \textsc{drs}es).
-The macro \jcsmacro{negdrs} forms a \textsc{drs} preceded by a negation symbol:
+The macro \jcsmacro{negdrs} forms a \textsc{drs} preceded by a negation symbol, so
\begin{lstlisting}[moretexcs={negdrs}]
-\negdrs{X}{donkey(X)\\green(X)}
+\negdrs{X}
+ {
+ donkey(X)\\
+ green(X)
+ }
\end{lstlisting}
+%
+comes out as
+%
\begin{flushleft}
\negdrs{X}{donkey(X)\\green(X)}
\end{flushleft}
Finally, \jcsmacro{ifdrs} forms a pair of \textsc{drs}es joined by a big arrow,
like this:
\begin{lstlisting}[moretexcs={ifdrs}]
-\ifdrs{X}{donkey(X)\\hungry(X)}
- {~}{feeds(Pedro,X)}
+\ifdrs{X}
+ {
+ donkey(X)\\
+ hungry(X)
+ }
+ {~}
+ {feeds(Pedro,X)}
\end{lstlisting}
\begin{flushleft}
\ifdrs{X}{donkey(X)\\hungry(X)}
@@ -787,7 +944,24 @@
\end{flushleft}
If you have an ``if''-structure appearing among ordinary predicates
inside a \textsc{drs}, you may prefer to use \jcsmacro{alifdrs}, which is just like
-\jcsmacro{ifdrs} but shifted slightly to the left for better alignment.
+\jcsmacro{ifdrs} but shifted slightly to the left for better alignment:
+\begin{flushleft}
+\alifdrs{X}{donkey(X)\\hungry(X)}
+ {~}{feeds(Pedro,X)}
+\end{flushleft}
+
+\medskip
+\noindent Note that for more extended \textsc{drs} representations, dedicated packages are meanwhile available,
+most notably the \textsf{drs} \cite{drs} and the \textsf{sdrt} \cite{sdrt} package.
+Both packages actually draw on \cvt, add some additional features and, in some cases, tweak the layout to
+(what strikes those package authors) the better. If the rather basic \textsc{drs} macros provided by \cvt\
+do not suit you, please check if one of those packages does.
+
+Note, though, that while \textsf{sdrt} introduces new (capitalized) macro naming which lets the package peacefully
+coexist with \cvt, \textsf{drs} simply re-uses \cvt's macro names, which makes the two packages incompatible.
+In order to fix this, \cvt\ checks whether the \textsc{drs} macros are already defined when it is loaded; if so, it does not define its own ones.
+So if you want to use the \textsc{drs} macros of the \textsf{drs} package together with \cvt's non-\textsc{drs} features, you can do so,
+provided that \textsf{drs} is loaded \emph{before} \cvt. In that case, \cvt's own \textsc{drs} macros are disabled.
\section{Exercises}\label{sec:exercises}
@@ -912,7 +1086,7 @@
\begin{flushleft}
\lstinline[moretexcs={either,psr}]"\psr{A}{B~\either{C}{D}~E} " $=$ \psr{A}{B~\either{C}{D}~E}
\end{flushleft}
-
+%
That's all there is for now.
Suggestions for improving \cvt\ are welcome, and bug
reports are actively solicited (via \url{https://github.com/jspitz/covington}). Please note, however, that this is free
@@ -921,6 +1095,37 @@
\section{Release history}
+\subsection*{2.4 (2020 January 2)}
+
+\begin{itemize}
+ \item Fix definition of covexercise theorem when no subsection counter is defined.
+\end{itemize}
+
+\subsection*{2.3 (2019 June 21)}
+
+\begin{itemize}
+ \item Add preamble option to subexamples environment. See sec.~\ref{sec:subexs}.
+ \item Allow to use \cvt\ together with the \textsf{drs} package.
+ \item Documentation fixes and restructuring.
+\end{itemize}
+
+\subsection*{2.2 (2019 June 4)}
+
+\begin{itemize}
+ \item Add new option \joption{owncounter} that makes \cvt\ use an own counter for examples (rather than the equation counter).
+ \item Add starred \jcsmacro{exampleno*} command that outputs the current example number value without stepping it.
+ See sec.~\ref{sec:exno}.
+ \item Add macros \jcsmacro{covexamplefs} and \jcsmacro{covexamplenofs} for global setting of example text markup.
+ See sec.~\ref{sec:custno}.
+\end{itemize}
+
+\subsection*{2.1 (2019 May 12)}
+
+\begin{itemize}
+ \item Add new option \joption{noglossbreaks} that tries to prevent page breaks within glosses.
+ \item Add \jcsmacro{glosspreamble} command and \joption{preamble} gloss macro option for arbitrary text preceding glosses.
+\end{itemize}
+
\subsection*{2.0 (2018 December 10)}
\begin{itemize}
@@ -1044,11 +1249,25 @@
\end{itemize}
\begin{thebibliography}{99}
+ \bibitem{leipzig} Bickel, Balthasar, Bernard Comrie, and Martin Haspelmath:
+ \emph{The Leipzig glossing rules: Conventions for interlinear morpheme
+ by morpheme glosses}. Revised version of February 2008. Department
+ of Linguistics, Max Plank Institute for Evolutionary Anthropology.
+ \url{http://www.eva.mpg.de/lingua/resources/glossing-rules.php}.
+ \bibitem{drs} Dimitriadis, Alexis: \emph{drs -- Typeset Discourse Representation Structures (DRS)}.
+ June 10, 2010. \url{https://ctan.org/pkg/drs}.
+ \bibitem{sdrt} Isambert, Paul: \emph{sdrt -- Macros for Segmented Discourse Representation Theory}.
+ May 13, 2007. \url{https://ctan.org/pkg/sdrt}.
+ \bibitem{kamp} Kamp, Hans: A Theory of Truth and Semantic Representation.
+ In Jeroen A.\,G. Groenendijk, Theo M.\,V. Janssen, and Martin J.\,B. Stokhof (eds.):
+ Formal Methods in the Study of Language. Amsterdam: Mathematics Center, 1981, 277--322.
\bibitem{csquotes} Lehman, Philipp and Joseph Wright:
- \emph{csquotes -- Context sensitive quotation facilities}. April 4, 2018.
- \url{http://www.ctan.org/pkg/csquotes}.
+ \emph{csquotes: Context sensitive quotation facilities}. April 4, 2018.
+ \url{https://www.ctan.org/pkg/csquotes}.
\bibitem{pakin} Pakin, Scott: The Comprehensive \LaTeX\ Symbol List.
- November 30, 2015. \url{http://www.ctan.org/pkg/comprehensive}.
+ November 30, 2015. \url{https://www.ctan.org/pkg/comprehensive}.
+ \bibitem{leipzig-ltx} Weber, Nathalie: \emph{leipzig: Typeset and index linguistic
+ gloss abbreviations}. June 16, 2017. \url{https://ctan.org/pkg/leipzig}.
\end{thebibliography}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/covington.doc.tlpobj new/tlpkg/tlpobj/covington.doc.tlpobj
--- old/tlpkg/tlpobj/covington.doc.tlpobj 2019-02-28 03:30:14.000000000 +0100
+++ new/tlpkg/tlpobj/covington.doc.tlpobj 2020-01-03 01:54:38.000000000 +0100
@@ -1,9 +1,9 @@
name covington.doc
category Package
-revision 49376
+revision 53303
shortdesc doc files of covington
relocated 1
-docfiles size=146
+docfiles size=133
RELOC/doc/latex/covington/README
RELOC/doc/latex/covington/covington.pdf
RELOC/doc/latex/covington/covington.tex
++++++ covington.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/covington/covington.sty new/tex/latex/covington/covington.sty
--- old/tex/latex/covington/covington.sty 2018-12-10 23:57:48.000000000 +0100
+++ new/tex/latex/covington/covington.sty 2020-01-02 23:11:37.000000000 +0100
@@ -42,14 +42,18 @@
%%% Metadata
%%%
-\def\filedate{2018/12/10}
-\def\fileversion{2.0}
+\def\filedate{2020/01/02}
+\def\fileversion{2.4}
\def\filename{covington.sty}
% Force redefinition of environments?
\newif\ifforceredef\forceredeffalse
% Tweak text layout?
\newif\iftweaklayout\tweaklayouttrue
+% Prevent page breaks in glosses
+\newif\ifnoglossbreaks\noglossbreaksfalse
+% Use own example counter
+\newif\ifownexcounter\ownexcounterfalse
\@ifundefined{ProvidesPackage}{%
\typeout{* covington.sty : Covington's linguistic macros, \fileversion\ \filedate *}
@@ -58,6 +62,8 @@
[\filedate\space v\fileversion\space Covington's linguistic macros]
\DeclareOption{force}{\forceredeftrue}
\DeclareOption{keeplayout}{\tweaklayoutfalse}
+\DeclareOption{noglossbreaks}{\noglossbreakstrue}
+\DeclareOption{owncounter}{\ownexcountertrue}
\ProcessOptions
}
@@ -126,9 +132,12 @@
%%% Example numbering
%%%
-% Example numbering uses the same counter as LaTeX's equation numbering.
+% Example numbering uses the same counter as LaTeX's equation numbering
+% by default.
% Thus, you can use \label and \ref to refer to numbered examples in
% exactly the same way as with equations.
+% As of v. 2.2, it is also possible to use an own counter and thus separate
+% equations from linguistic examples.
% \exampleno increments the counter and gives you its current value.
% You can use it anywhere to generate an example number.
@@ -140,12 +149,23 @@
% This is a sentence. \hfill (\exampleno)
% \end{flushleft}
-\newcommand{\exampleno}{\refstepcounter{equation}\theequation}
+\ifownexcounter
+ \newcounter{covex}
+ \newcommand{\@exampleno}{\refstepcounter{covex}\thecovex}
+\else
+ \newcommand{\@exampleno}{\refstepcounter{equation}\theequation}
+\fi
+\newcommand*\@@exampleno{\ifownexcounter\thecovex\else\theequation\fi}
+\newcommand*\exampleno{\@ifstar{\@@exampleno}{\@exampleno}}
%%%
%%% The 'example' environment
%%%
+% Font setting possibility for example sentences
+\newcommand*\covexamplefs{}
+\newcommand*\covexamplenofs{\normalfont}
+
% example is an environment for displaying a single numbered
% example, preceded by its number. Example of use:
%
@@ -212,7 +232,7 @@
%
% New in 1.8 (2018-12-07): Allow to redefine label (\covexnumber)
-\newcounter{equationsave} % used in trick with equation number
+\newcounter{covexsave} % used in trick with example number
\newlength\examplenumbersep
\setlength\examplenumbersep{0pt}
@@ -221,17 +241,23 @@
\newenvironment{covexamples}% % define "example" environment
{%
-\begin{list}{\covexnumber{\theequation}}%
+\begin{list}{\covexamplenofs\covexnumber{\@@exampleno}}%
{%
\addtolength{\labelwidth}{\examplenumbersep}%
\addtolength{\leftmargin}{\examplenumbersep}%
-\setcounter{equationsave}{\arabic{equation}}%
-\usecounter{equation}% % sets it to zero, unwantedly
-\setcounter{equation}{\arabic{equationsave}}% % restores previous value
+\ifownexcounter
+ \setcounter{covexsave}{\arabic{covex}}%
+ \usecounter{covex}% % sets it to zero, unwantedly
+ \setcounter{covex}{\arabic{covexsave}}% % restores previous value
+\else
+ \setcounter{covexsave}{\arabic{equation}}%
+ \usecounter{equation}% % sets it to zero, unwantedly
+ \setcounter{equation}{\arabic{covexsave}}% % restores previous value
+\fi
\setlength{\listparindent}{0pt}%
\def\makelabel##1{##1\hfil}% % put labels flushleft in space available
}%
-\raggedright}% % text is flushleft, not justified
+\raggedright\covexamplefs}% % text is flushleft, not justified
{\end{list}}
\@ifundefined{examples}{%
@@ -268,27 +294,34 @@
\newcommand*\covsubexnumber[1]{(#1)}
-\newenvironment{covsubexamples}% % define "subexamples" environment
+% 2019-06-21 (v. 2.3): optional preceding subexample text
+\define@key{cov@subex}{preamble}{\def\cov@sxp{#1}}
+\newcommand*\subexpreamblefs{\normalfont}
+
+\newenvironment{covsubexamples}[1][]% % define "subexamples" environment
{%
- \begin{covexample}
+ \ifx#1\empty\else\setkeys{cov@subex}{#1}\fi%
+ \begin{covexample}%
+ \@ifundefined{cov@sxp}{}{\subexpreamblefs\cov@sxp}% insert preamble if given
\begin{enumerate}
\addtolength{\labelsep}{\subexamplenumbersep}%
\renewcommand\theenumi{\alph{enumi}}
- \renewcommand\labelenumi{\covsubexnumber{\theenumi}}
- \renewcommand\p@enumi{\theequation\,}%
+ \renewcommand\labelenumi{\covexamplenofs\covsubexnumber{\theenumi}}
+ \renewcommand\p@enumi{\@@exampleno\,}%
\setlength{\listparindent}{0pt}%
\def\makelabel##1{##1\hfil}% % put labels flushleft in space available
}%
{%
+ \let\cov@sxp\relax
\end{enumerate}
\end{covexample}
}
\@ifundefined{subexamples}{%
- \newenvironment{subexamples}{\begin{covsubexamples}}{\end{covsubexamples}}
+ \newenvironment{subexamples}[1][]{\begin{covsubexamples}[#1]}{\end{covsubexamples}}
}{%
\ifforceredef
- \renewenvironment{subexamples}{\begin{covsubexamples}}{\end{covsubexamples}}
+ \renewenvironment{subexamples}[1][]{\begin{covsubexamples}[#1]}{\end{covsubexamples}}
\cov@warning{The subexamples environment was already defined. Redefining it.}
\else
\cov@warning{The subexamples environment was already defined.^^J
@@ -357,27 +390,38 @@
{\def\cov@selfnt{\selectfont}}
% Thanks to Hans-Peter Kolb for this macro.
-\def\gll % Introduces 2-line text-and-gloss.
- {\begin{flushleft}
-\vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
-\def\baselinestretch{1}%
-\cov@selfnt%
-\vskip-\baselineskip%
- \bgroup
- \catcode`\^^M=12
- \twosent
- }
+% Try to prevent page breaks in glosses if noglossbreaks option is set
+\def\cov@nopagebreak{}
+\ifnoglossbreaks
+\def\cov@nopagebreak{\let\reserved@e\vadjust\let\reserved@f\nobreak}
+\fi
-\def\glll % Introduces 3-line text-and-gloss.
- {\begin{flushleft}
-\vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
-\def\baselinestretch{1}%
-\cov@selfnt%
-\vskip-\baselineskip%
- \bgroup
- \catcode`\^^M=12
- \threesent
- }
+% 2019-05-07: optional preceding gloss text (non-interlinearized)
+\newcommand*\glosslinepreamble[1]{#1}
+\def\cov@glp{}
+\newcommand*\glosspreamble[1]{\def\cov@glp{#1}}
+
+\def\gll{% % Introduces 2-line text-and-gloss.
+ \begin{flushleft}
+ \vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
+ \def\baselinestretch{1}%
+ \cov@selfnt%
+ \vskip-\baselineskip%
+ \bgroup
+ \catcode`\^^M=12
+ \twosent
+}
+
+\def\glll{% % Introduces 3-line text-and-gloss.
+ \begin{flushleft}
+ \vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
+ \def\baselinestretch{1}%
+ \cov@selfnt%
+ \vskip-\baselineskip%
+ \bgroup
+ \catcode`\^^M=12
+ \threesent
+}
% The following two \x.. versions introduce special forms of glossing
@@ -386,27 +430,27 @@
% Inspired by this post of David Carlisle to the mentioned stackexchange thread:
% http://tex.stackexchange.com/a/169744/19291
% These macros require the gloss lines to be ended explicitly with \xgle
-\def\xgll % Introduces 2-line text-and-gloss.
- {\begin{flushleft}
-\vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
-\def\baselinestretch{1}%
-\cov@selfnt%
-\vskip-\baselineskip%
- \bgroup
- \ignorespaces\xtwosent
- }
-
-\def\xglll % Introduces 3-line text-and-gloss.
- {\begin{flushleft}
-\vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
-\def\baselinestretch{1}%
-\cov@selfnt%
-\vskip-\baselineskip%
- \bgroup
- \ignorespaces\xthreesent
- }
+\def\xgll{% % Introduces 2-line text-and-gloss.
+ \begin{flushleft}
+ \vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
+ \def\baselinestretch{1}%
+ \cov@selfnt%
+ \vskip-\baselineskip%
+ \bgroup
+ \ignorespaces\xtwosent
+}
+
+\def\xglll{% % Introduces 3-line text-and-gloss.
+ \begin{flushleft}
+ \vskip\baselineskip% % Added 1992 Nov 8 to force single spacing
+ \def\baselinestretch{1}%
+ \cov@selfnt%
+ \vskip-\baselineskip%
+ \bgroup
+ \ignorespaces\xthreesent
+}
-\def\glt{{\hskip -\glossglue}\unhbox\gline\smallskip\newline} % \newline was \\
+\def\glt{{\hskip -\glossglue}\cov@nopagebreak\unhbox\gline\smallskip\cov@nopagebreak\newline} % \newline was \\
% Introduces translation.
% Required even if no translation follows.
@@ -414,7 +458,10 @@
% Alternative to glt, when one wants to
% put a number but no translation.
-\def\glend{\end{flushleft}} % Ends the gloss environment.
+\def\glend{%
+ \end{flushleft}%
+ \def\cov@glp{}%
+} % Ends the gloss environment.
% The following TeX code is adapted, with permission, from:
% gloss.tex: Macros for vertically aligning words in consecutive sentences.
@@ -488,11 +535,13 @@
\gdef\twosent#1^^M#2^^M% #1 = first line, #2 = second line
{\getwords(\lineone,\eachwordone)#1 ^^M%
\getwords(\linetwo,\eachwordtwo)#2 ^^M%
+ \ifx\cov@glp\empty\else\glosslinepreamble{\cov@glp}\cov@nopagebreak\newline\fi%
\loop\lastword{\eachwordone}{\lineone}{\wordone}%
\lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
\global\setbox\gline=\hbox{\unhbox\gline
\hskip\glossglue
- \vtop{\box\wordone % vtop was vbox
+ \vtop{% vtop was vbox
+ \box\wordone
\nointerlineskip
\box\wordtwo
}%
@@ -507,12 +556,14 @@
{\getwords(\lineone,\eachwordone)#1 ^^M%
\getwords(\linetwo,\eachwordtwo)#2 ^^M%
\getwords(\linethree,\eachwordthree)#3 ^^M%
+ \ifx\cov@glp\empty\else\glosslinepreamble{\cov@glp}\cov@nopagebreak\newline\fi%
\loop\lastword{\eachwordone}{\lineone}{\wordone}%
\lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
\lastword{\eachwordthree}{\linethree}{\wordthree}%
\global\setbox\gline=\hbox{\unhbox\gline
\hskip\glossglue
- \vtop{\box\wordone % vtop was vbox
+ \vtop{% vtop was vbox
+ \box\wordone
\nointerlineskip
\box\wordtwo
\nointerlineskip
@@ -546,11 +597,13 @@
\gdef\xtwosent#1\xgle#2\xgle% #1 = first line, #2 = second line
{\xgetwords(\lineone,\eachwordone)#1 \xgle%
\xgetwords(\linetwo,\eachwordtwo)#2 \xgle%
+ \ifx\cov@glp\empty\else\glosslinepreamble{\cov@glp}\cov@nopagebreak\newline\fi%
\loop\lastword{\eachwordone}{\lineone}{\wordone}%
\lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
- \global\setbox\gline=\hbox{\unhbox\gline
- \hskip\glossglue
- \vtop{\box\wordone % vtop was vbox
+ \global\setbox\gline=\hbox{\unhbox\gline%
+ \hskip\glossglue%
+ \vtop{% vtop was vbox
+ \box\wordone
\nointerlineskip
\box\wordtwo
}%
@@ -565,12 +618,14 @@
{\xgetwords(\lineone,\eachwordone)#1 \xgle%
\xgetwords(\linetwo,\eachwordtwo)#2 \xgle%
\xgetwords(\linethree,\eachwordthree)#3 \xgle%
+ \ifx\cov@glp\empty\else\glosslinepreamble{\cov@glp}\cov@nopagebreak\newline\fi%
\loop\lastword{\eachwordone}{\lineone}{\wordone}%
\lastword{\eachwordtwo}{\linetwo}{\wordtwo}%
\lastword{\eachwordthree}{\linethree}{\wordthree}%
\global\setbox\gline=\hbox{\unhbox\gline
\hskip\glossglue
- \vtop{\box\wordone % vtop was vbox
+ \vtop{% vtop was vbox
+ \box\wordone
\nointerlineskip
\box\wordtwo
\nointerlineskip
@@ -647,6 +702,11 @@
\define@key{gcovington}{fsii}{\def\glosslinetwo{#1}}
\define@key{gcovington}{fsiii}{\def\glosslinethree{#1}}
%
+% 4. Gloss preamble text
+\def\cov@gglp{}
+\define@key{covington}{preamble}{\def\cov@lglp{#1}}
+\define@key{gcovington}{preamble}{\def\cov@gglp{#1}}
+%
% General setting option
\newcommand*\setglossoptions[1]{\setkeys{gcovington}{#1}}
%
@@ -669,6 +729,8 @@
\@ifundefined{lglosslineone}{}{\def\glosslineone{\lglosslineone}}%
\@ifundefined{lglosslinetwo}{}{\def\glosslinetwo{\lglosslinetwo}}%
\@ifundefined{lglosslinethree}{}{\def\glosslinethree{\lglosslinethree}}%
+ \@ifundefined{cov@lglp}{}{\def\cov@gglp{\cov@lglp}}%
+ \ifx\cov@gglp\empty\else\def\cov@glp{\cov@gglp}\fi%
\xgll #2\xgle
#3\xgle
\ifgtright
@@ -683,6 +745,7 @@
\let\lglosslineone\relax%
\let\lglosslinetwo\relax%
\let\lglosslinethree\relax%
+ \let\cov@lglp\relax%
}
% 2. \trigloss[<opts>]{<line 1>}{<line 2>}{<line 3>}{<translation>}
@@ -704,6 +767,8 @@
\@ifundefined{lglosslineone}{}{\def\glosslineone{\lglosslineone}}%
\@ifundefined{lglosslinetwo}{}{\def\glosslinetwo{\lglosslinetwo}}%
\@ifundefined{lglosslinethree}{}{\def\glosslinethree{\lglosslinethree}}%
+ \@ifundefined{cov@lglp}{}{\def\cov@gglp{\cov@lglp}}%
+ \ifx\cov@gglp\empty\else\def\cov@glp{\cov@gglp}\fi%
\xglll #2\xgle
#3\xgle
#4\xgle
@@ -829,8 +894,11 @@
%
% Example: \negdrs{X}{donkey(X)\\green(X)}
+% 2019-06-21 (v. 2.3): Do not define the macros if already defined.
+% This allows to use covington with the drs package.
+
-\newcommand{\drs}[2]
+\providecommand{\drs}[2]
{
{
\cov@emphasized
@@ -850,24 +918,24 @@
}
}
-\newcommand{\sdrs}[3]
+\providecommand{\sdrs}[3]
{\begin{tabular}{l}
\mbox{\cov@emphasized #1} \\
~ \\
\drs{#2}{#3}
\end{tabular}}
-\newcommand{\ifdrs}[4]
+\providecommand{\ifdrs}[4]
{
\mbox{\drs{#1}{#2}~~{\large $\Rightarrow$}~\drs{#3}{#4}}
}
-\newcommand{\alifdrs}[4]
+\providecommand{\alifdrs}[4]
{
\mbox{$\!\!\!$\drs{#1}{#2}~~{\large $\Rightarrow$}~\drs{#3}{#4}}
}
-\newcommand{\negdrs}[2]
+\providecommand{\negdrs}[2]
{
\mbox{{\large $\neg$}\drs{#1}{#2}}
}
@@ -883,7 +951,7 @@
%
% New in 1.1 (2016-07-06):
% We provide a covexercise environment and only (re)define
-% example if it does not yet exist or if redefinition is
+% exercise if it does not yet exist or if redefinition is
% forced by the "force" option. This prevents clashes
% with packages/classes that roll their own exercise environment.
@@ -900,7 +968,11 @@
% large curly brackets. Good for alternatives
% within sentences or PS-rules.
-\newtheorem{covexercise}{Exercise}[subsection]
+\ifcsname c@subsection\endcsname
+ \newtheorem{covexercise}{Exercise}[subsection]
+\else
+ \newtheorem{covexercise}{Exercise}
+\fi
% Exercise numbering resets to 0 not only at the start of
% a subsection, but also at the start of a section or chapter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/covington.tlpobj new/tlpkg/tlpobj/covington.tlpobj
--- old/tlpkg/tlpobj/covington.tlpobj 2019-02-28 03:30:14.000000000 +0100
+++ new/tlpkg/tlpobj/covington.tlpobj 2020-01-03 01:54:38.000000000 +0100
@@ -1,6 +1,6 @@
name covington
category Package
-revision 49376
+revision 53303
shortdesc Linguistic support
relocated 1
longdesc Numerous minor LaTeX enhancements for linguistics, including
@@ -13,7 +13,6 @@
catalogue-contact-bugs https://github.com/jspitz/covington/issues
catalogue-contact-repository https://github.com/jspitz/covington
catalogue-ctan /macros/latex/contrib/covington
-catalogue-date 2018-12-10 10:20:35 +0100
catalogue-license lppl1.3
catalogue-topics linguistic
-catalogue-version 2.0
+catalogue-version 2.4
++++++ cqubeamer.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cqubeamer.doc.tlpobj new/tlpkg/tlpobj/cqubeamer.doc.tlpobj
--- old/tlpkg/tlpobj/cqubeamer.doc.tlpobj 2019-02-28 03:30:14.000000000 +0100
+++ new/tlpkg/tlpobj/cqubeamer.doc.tlpobj 2020-03-24 01:57:10.000000000 +0100
@@ -1,6 +1,6 @@
name cqubeamer.doc
category Package
-revision 47630
+revision 54512
shortdesc doc files of cqubeamer
relocated 1
docfiles size=787
++++++ cqubeamer.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cqubeamer.tlpobj new/tlpkg/tlpobj/cqubeamer.tlpobj
--- old/tlpkg/tlpobj/cqubeamer.tlpobj 2019-02-28 03:30:15.000000000 +0100
+++ new/tlpkg/tlpobj/cqubeamer.tlpobj 2020-03-24 01:57:11.000000000 +0100
@@ -1,6 +1,6 @@
name cqubeamer
category Package
-revision 47630
+revision 54512
shortdesc LaTeX Beamer Template for Chongqing University
relocated 1
longdesc This package provides a LaTeX beamer template designed for
@@ -14,7 +14,6 @@
catalogue-contact-bugs https://github.com/CQUtug/CQUBeamer
catalogue-contact-repository https://github.com/Godblesswz/CQUBeamerTemplate
catalogue-ctan /macros/xetex/latex/cqubeamer
-catalogue-date 2018-05-12 04:59:36 +0200
-catalogue-license mitcc-by-4
+catalogue-license mit cc-by-4
catalogue-topics presentation xetex doc-templ chinese
catalogue-version 1.0
++++++ cquthesis.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cquthesis/Makefile new/doc/latex/cquthesis/Makefile
--- old/doc/latex/cquthesis/Makefile 2018-03-06 23:52:46.000000000 +0100
+++ new/doc/latex/cquthesis/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,92 +0,0 @@
-# Makefile for CQUThesis
-# Adapted from Thuthesis Makefile
-
-# Compiling method: latexmk/xelatex/pdflatex
-METHOD = latexmk
-# Set opts for latexmk if you use it
-LATEXMKOPTS = -xelatex -quiet -halt-on-error -interaction=nonstopmode
-# Basename of thesis
-THESISMAIN = main
-
-
-PACKAGE=cquthesis
-SOURCES=$(PACKAGE).ins $(PACKAGE).dtx
-THESISCONTENTS=$(THESISMAIN).tex contents/*.tex $(FIGURES)
-# NOTE: update this to reflect your local file types.
-# 注意:下列内容可能需要根据你的实际情况调整
-FIGURES=$(wildcard figures/*.eps figures/*.pdf figures/*.jpg figures/*.jpeg figures/*.png)
-BIBFILE=ref/refs.bib
-SHUJICONTENTS=$(SHUJIMAIN).tex
-CLSFILES=dtx-style.sty $(PACKAGE).cls $(PACKAGE).cfg
-
-# make deletion work on Windows
-ifdef SystemRoot
- RM = del /Q
- OPEN = start
-else
- RM = rm -f
- OPEN = open
-endif
-
-.PHONY: all clean cleanall cls check doc distclean thesis viewthesis viewdoc FORCE_MAKE
-
-all: doc thesis
-
-cls: $(CLSFILES)
-
-doc: $(PACKAGE).pdf
-
-$(CLSFILES): $(SOURCES)
- latex $(PACKAGE).ins
-
-viewdoc: doc
- $(OPEN) $(PACKAGE).pdf
-
-viewthesis: thesis
- $(OPEN) $(THESISMAIN).pdf
-
-thesis: $(THESISMAIN).pdf
-
-ifeq ($(METHOD),latexmk)
-
-$(PACKAGE).pdf: $(CLSFILES)
- xelatex $(PACKAGE).dtx
- makeindex -s gind.ist -o $(PACKAGE).ind $(PACKAGE).idx
- makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo
- xelatex $(PACKAGE).dtx
- xelatex $(PACKAGE).dtx
- xelatex $(PACKAGE).dtx
-
-$(THESISMAIN).pdf: $(CLSFILES)
- $(METHOD) $(LATEXMKOPTS) $(THESISMAIN)
-
-else ifneq (,$(filter $(METHOD),xelatex pdflatex))
-
-$(PACKAGE).pdf: $(CLSFILES)
- $(METHOD) $(PACKAGE).dtx
- makeindex -s gind.ist -o $(PACKAGE).ind $(PACKAGE).idx
- makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo
- $(METHOD) $(PACKAGE).dtx
- $(METHOD) $(PACKAGE).dtx
- $(METHOD) $(PACKAGE).dtx
-
-$(THESISMAIN).pdf: $(CLSFILES) $(THESISCONTENTS) $(THESISMAIN).bbl
- $(METHOD) $(THESISMAIN)
- $(METHOD) $(THESISMAIN)
-
-$(THESISMAIN).bbl: $(BIBFILE)
- $(METHOD) $(THESISMAIN)
- -bibtex $(THESISMAIN)
- $(RM) $(THESISMAIN).pdf
-
-else
-$(error Unknown METHOD: $(METHOD))
-
-endif
-
-clean:
- latexmk -c $(PACKAGE).dtx $(THESISMAIN)
- -@$(RM) *~
-
-cleanall: clean
- -@$(RM) $(PACKAGE).pdf $(THESISMAIN).pdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cquthesis/README new/doc/latex/cquthesis/README
--- old/doc/latex/cquthesis/README 2018-03-06 23:52:46.000000000 +0100
+++ new/doc/latex/cquthesis/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-# CQUThesis v1.30 (2018/02/23)
-[![CI Building State](https://api.travis-ci.org/nanmu42/CQUThesis.svg?branch=master)](http…
-[![CTAN release](https://img.shields.io/ctan/v/cquthesis.svg?label=CTAN)](https://w…
-[![GitHub release](https://img.shields.io/github/release/nanmu42/cquthesis.svg?label=…
-[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.3…
-[![DOI](https://zenodo.org/badge/58866503.svg)](https://zenodo.org/badge/latestdoi/58866503)
-
-**CQUThesis** stands for Chongqing University Thesis Template for LaTeX, bearing the ability to support bachelor, master, doctor dissertations with grace and speed.
-
-![CQUThesis-Poster](https://cloud.githubusercontent.com/assets/8143068/15363773/68c6b380-1d4c-11e6-9627-4d892facb333.png)
-
-# Deployment
-## Download
-Version | Link | Description
---- | --- | ---
-Dev. |[Click Here](https://github.com/nanmu42/cquthesis/zipball/master) | Recommend with new features and bug fixes
-Pre-release | [Github Link](https://github.com/nanmu42/CQUThesis/releases) | Accumulation of commits from Dev.
-Release |[CTAN Page](https://www.ctan.org/pkg/cquthesis)| Scheduled updates for CTAN, MikTeX and TeX Live
-
-## Installation
-Unzip all files to a new folder as your future work folder:
-* Windows users may easily double-click on `makewin.bat`;
-* Linux or Mac users may start the terminal:
-```
-cd path/to/cquthesis
-make thesis
-```
-If everything goes smoothly, CQUThesis is ready for work, with typeseting example named `main.pdf` in your work folder.
-
-# Question, Contribution and Contact
-Feel free to raise any question, and any possible contribution is highly appreciated.
-* [Github Issues](https://github.com/nanmu42/CQUThesis/issues);
-* Join [CQU TeX QQ Group](http://jq.qq.com/?_wv=1027&k=2HvYu95)
-
-Writing in English or Chinese is needed.
-
-# Acknowledgements
-The author would like to acknowledge these contributors for their efforts and, essentially, beautiful mind:
-
-* [The CTeX Community](https://github.com/CTeX-org/ctex-kit)
-* [XUE, Ruini](https://github.com/xueruini/thuthesis)
-* [USTC TeX User Group](https://github.com/ustctug/gbt-7714-2015)
-
-# About the Author
-Zhennan Li (i at nanmu dot me) proudly presents this work for you.
-
-# License
-This whole project 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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cquthesis/README-Chinese.md new/doc/latex/cquthesis/README-Chinese.md
--- old/doc/latex/cquthesis/README-Chinese.md 2018-03-06 23:52:46.000000000 +0100
+++ new/doc/latex/cquthesis/README-Chinese.md 2019-10-13 00:06:46.000000000 +0200
@@ -1,8 +1,8 @@
-# 嗨,这里是CQUThesis! v1.30 (2018/02/23)
+# 嗨,这里是CQUThesis!
[![CI Building State](https://api.travis-ci.org/nanmu42/CQUThesis.svg?branch=master)](http…
[![CTAN release](https://img.shields.io/ctan/v/cquthesis.svg?label=CTAN)](https://w…
[![GitHub release](https://img.shields.io/github/release/nanmu42/cquthesis.svg?label=…
-[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.3…
+[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.4…
[![DOI](https://zenodo.org/badge/58866503.svg)](https://zenodo.org/badge/latestdoi/58866503)
CQUThesis表示的是**C**hong**Q**ing **U**niversity **Thesis**.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cquthesis/README.md new/doc/latex/cquthesis/README.md
--- old/doc/latex/cquthesis/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/cquthesis/README.md 2019-10-13 00:06:46.000000000 +0200
@@ -0,0 +1,52 @@
+# About CQUThesis
+[![CI Building State](https://api.travis-ci.org/nanmu42/CQUThesis.svg?branch=master)](http…
+[![CTAN release](https://img.shields.io/ctan/v/cquthesis.svg?label=CTAN)](https://w…
+[![GitHub release](https://img.shields.io/github/release/nanmu42/cquthesis.svg?label=…
+[![GitHub commits](https://img.shields.io/github/commits-since/nanmu42/CQUThesis/v1.4…
+[![DOI](https://zenodo.org/badge/58866503.svg)](https://zenodo.org/badge/latestdoi/58866503)
+
+**CQUThesis** stands for Chongqing University Thesis Template for LaTeX, bearing the ability to support bachelor, master, doctor dissertations with grace and speed.
+
+![CQUThesis-Poster](https://cloud.githubusercontent.com/assets/8143068/15363773/68c6b380-1d4c-11e6-9627-4d892facb333.png)
+
+# Deployment
+## Download
+Version | Link | Description
+--- | --- | ---
+Dev. |[Click Here](https://github.com/nanmu42/cquthesis/zipball/master) | Recommend with new features and bug fixes
+Pre-release | [Github Link](https://github.com/nanmu42/CQUThesis/releases) | Accumulation of commits from Dev.
+Release |[CTAN Page](https://www.ctan.org/pkg/cquthesis)| Scheduled updates for CTAN, MikTeX and TeX Live
+
+## Installation
+Unzip all files to a new folder as your future work folder:
+* Windows users may easily double-click on `makewin.bat`;
+* Linux or Mac users may start the terminal:
+```
+cd path/to/cquthesis
+make thesis
+```
+If everything goes smoothly, CQUThesis is ready for work, with typeseting example named `main.pdf` in your work folder.
+
+# Question, Contribution and Contact
+Feel free to raise any question, and any possible contribution is highly appreciated.
+* [Github Issues](https://github.com/nanmu42/CQUThesis/issues);
+* Join [CQU TeX QQ Group](http://jq.qq.com/?_wv=1027&k=2HvYu95)
+
+Writing in English or Chinese is needed.
+
+# Acknowledgements
+The author would like to acknowledge these contributors for their efforts and, essentially, beautiful mind:
+
+* [The CTeX Community](https://github.com/CTeX-org/ctex-kit)
+* [XUE, Ruini](https://github.com/xueruini/thuthesis)
+* [USTC TeX User Group](https://github.com/ustctug/gbt-7714-2015)
+
+# About the Author
+Zhennan Li (i at nanmu dot me) proudly presents this work for you.
+
+# License
+This whole project 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.
Binary files old/doc/latex/cquthesis/cquthesis.pdf and new/doc/latex/cquthesis/cquthesis.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cquthesis/dtx-style.sty new/doc/latex/cquthesis/dtx-style.sty
--- old/doc/latex/cquthesis/dtx-style.sty 2018-03-06 23:52:46.000000000 +0100
+++ new/doc/latex/cquthesis/dtx-style.sty 2019-10-13 00:06:46.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2016-2018 by Zhennan Li <i(a)nanmu.me>
+%% Copyright (C) 2016-2019 by Zhennan Li <i(a)nanmu.me>
%% This file 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
@@ -23,8 +23,6 @@
\RequirePackage[bottom,perpage,hang,]{footmisc}
\RequirePackage{hypdoc}
\RequirePackage[UTF8,scheme=chinese]{ctex}
-\RequirePackage{newpxtext}
-\RequirePackage{newpxmath}
\RequirePackage[
top=2.5cm, bottom=2.5cm,
left=4cm, right=2cm,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cquthesis.doc.tlpobj new/tlpkg/tlpobj/cquthesis.doc.tlpobj
--- old/tlpkg/tlpobj/cquthesis.doc.tlpobj 2019-02-28 03:30:15.000000000 +0100
+++ new/tlpkg/tlpobj/cquthesis.doc.tlpobj 2019-10-13 01:55:12.000000000 +0200
@@ -1,13 +1,12 @@
name cquthesis.doc
category Package
-revision 46863
+revision 52355
shortdesc doc files of cquthesis
relocated 1
-docfiles size=304
+docfiles size=315
RELOC/doc/latex/cquthesis/CONTRIBUTORS.md
- RELOC/doc/latex/cquthesis/Makefile
- RELOC/doc/latex/cquthesis/README
RELOC/doc/latex/cquthesis/README-Chinese.md
+ RELOC/doc/latex/cquthesis/README.md
RELOC/doc/latex/cquthesis/contents/ack.tex
RELOC/doc/latex/cquthesis/contents/analysis.tex
RELOC/doc/latex/cquthesis/contents/appendix.tex
++++++ cquthesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cquthesis/cquthesis.cfg new/tex/latex/cquthesis/cquthesis.cfg
--- old/tex/latex/cquthesis/cquthesis.cfg 2018-03-06 23:52:46.000000000 +0100
+++ new/tex/latex/cquthesis/cquthesis.cfg 2019-10-13 00:06:46.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2016-2018 by Zhennan Li <i(a)nanmu.me>
+%% Copyright (C) 2016-2019 by Zhennan Li <i(a)nanmu.me>
%% This file 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
@@ -22,7 +22,7 @@
%% This is the configuration file of the cquthesis package with LaTeX2e.
%%
\ProvidesFile{cquthesis.cfg}
-[2018/02/23 v1.30 Chongqing University Thesis Template]
+[2019/10/12 v1.40 Chongqing University Thesis Template]
\def\cqueqshortname {式}
\def\cqu@denotation@name {主要符号对照表}
\def\shorttablename {表}
@@ -133,7 +133,7 @@
{More than 10 footnotes in a single page are not supported.}{}
\fi
}{}{}
-\theoremsymbol{\ensuremath{\square}}
+\theoremsymbol{\ensuremath{\ding{110}}}
\newtheorem*{proof}{证明}
\theoremstyle{plain}
\theoremsymbol{}
@@ -151,9 +151,9 @@
\newtheorem{problem}{问题}[chapter]
\newtheorem{conjecture}{猜想}[chapter]
\sisetup{%
-list-final-separator = {和},
-list-pair-separator = {和},
-range-phrase = {$ \sim $},
+list-final-separator = { 和 },
+list-pair-separator = { 和 },
+range-phrase = {~},
}%\sisetup
\AtBeginDocument{%
\def\figureautorefname{图}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cquthesis/cquthesis.cls new/tex/latex/cquthesis/cquthesis.cls
--- old/tex/latex/cquthesis/cquthesis.cls 2018-03-06 23:52:46.000000000 +0100
+++ new/tex/latex/cquthesis/cquthesis.cls 2019-10-13 00:06:46.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2016-2018 by Zhennan Li <i(a)nanmu.me>
+%% Copyright (C) 2016-2019 by Zhennan Li <i(a)nanmu.me>
%% This file 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
@@ -21,7 +21,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{cquthesis}
-[2018/02/23 v1.30 Chongqing University Thesis Template]
+[2019/10/12 v1.40 Chongqing University Thesis Template]
\hyphenation{Cqu-Thesis}
\newcommand{\cquthesis}{\textsc{CquThesis}}
\def\version{1.30}
@@ -106,7 +106,6 @@
\RequirePackage{fontspec}
\RequirePackage{amsmath}
\RequirePackage[defaultsups]{newtxtext}
-\RequirePackage{newtxmath}
\RequirePackage{pifont}
\RequirePackage{CJKfntef}
\RequirePackage{newfloat}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cquthesis.tlpobj new/tlpkg/tlpobj/cquthesis.tlpobj
--- old/tlpkg/tlpobj/cquthesis.tlpobj 2019-02-28 03:30:16.000000000 +0100
+++ new/tlpkg/tlpobj/cquthesis.tlpobj 2019-10-13 01:55:13.000000000 +0200
@@ -1,6 +1,6 @@
name cquthesis
category Package
-revision 46863
+revision 52355
shortdesc LaTeX Thesis Template for Chongqing University
relocated 1
longdesc CQUThesis stands for Chongqing University Thesis Template for
@@ -17,7 +17,7 @@
catalogue-contact-development https://github.com/nanmu42/CQUThesis/blob/master/CONTRIBUTORS.md
catalogue-contact-repository https://github.com/nanmu42/CQUThesis
catalogue-ctan /macros/latex/contrib/cquthesis
-catalogue-date 2018-05-06 17:51:43 +0200
+catalogue-date 2019-10-12 15:19:03 +0200
catalogue-license lppl1.3
catalogue-topics dissertation class chinese
-catalogue-version 1.30
+catalogue-version 1.40
++++++ crimson.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crimson.doc.tlpobj new/tlpkg/tlpobj/crimson.doc.tlpobj
--- old/tlpkg/tlpobj/crimson.doc.tlpobj 2019-02-28 03:30:16.000000000 +0100
+++ new/tlpkg/tlpobj/crimson.doc.tlpobj 2020-03-24 01:57:11.000000000 +0100
@@ -1,6 +1,6 @@
name crimson.doc
category Package
-revision 43525
+revision 54512
shortdesc doc files of crimson
relocated 1
docfiles size=12
++++++ crimson.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crimson.tlpobj new/tlpkg/tlpobj/crimson.tlpobj
--- old/tlpkg/tlpobj/crimson.tlpobj 2019-02-28 03:30:16.000000000 +0100
+++ new/tlpkg/tlpobj/crimson.tlpobj 2020-03-24 01:57:11.000000000 +0100
@@ -1,6 +1,6 @@
name crimson
category Package
-revision 43525
+revision 54512
shortdesc Crimson fonts with LaTeX support
relocated 1
longdesc This package provides LaTeX, pdfLaTeX, XeLaTeX, and LuaLaTeX
@@ -114,6 +114,5 @@
RELOC/tex/latex/crimson/crimson.sty
catalogue-also crimsonpro
catalogue-ctan /fonts/crimson
-catalogue-date 2018-12-22 13:05:48 +0100
-catalogue-license ofllppl
+catalogue-license ofl lppl
catalogue-topics font font-serif font-t1enc font-proportional font-otf font-type1
++++++ crimsonpro.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/crimsonpro/README new/doc/fonts/crimsonpro/README
--- old/doc/fonts/crimsonpro/README 2018-12-22 22:53:22.000000000 +0100
+++ new/doc/fonts/crimsonpro/README 2019-10-23 23:47:49.000000000 +0200
@@ -1,5 +1,5 @@
This is the README for the CrimsonPro package,
-version 2018-12-18.
+version 2019-10-21.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
support for the CrimsonPro family of fonts (version 1.001),
Binary files old/doc/fonts/crimsonpro/crimsonpro-samples.pdf and new/doc/fonts/crimsonpro/crimsonpro-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/crimsonpro/crimsonpro-samples.tex new/doc/fonts/crimsonpro/crimsonpro-samples.tex
--- old/doc/fonts/crimsonpro/crimsonpro-samples.tex 2018-12-22 22:53:22.000000000 +0100
+++ new/doc/fonts/crimsonpro/crimsonpro-samples.tex 2019-10-23 23:47:49.000000000 +0200
@@ -1,6 +1,6 @@
\documentclass{article}
-\usepackage[LY1]{fontenc}
-\usepackage{CrimsonPro}
+\usepackage[T1]{fontenc}
+\usepackage[sb,m]{CrimsonPro}
\usepackage{lipsum}
\begin{document}
\sloppy
@@ -18,8 +18,6 @@
\textbf{\textit{\lipsum[4]}}
-\rm
-
\section*{Default Numbers}
1234567890
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crimsonpro.doc.tlpobj new/tlpkg/tlpobj/crimsonpro.doc.tlpobj
--- old/tlpkg/tlpobj/crimsonpro.doc.tlpobj 2019-02-28 03:30:17.000000000 +0100
+++ new/tlpkg/tlpobj/crimsonpro.doc.tlpobj 2020-03-24 01:57:12.000000000 +0100
@@ -1,9 +1,9 @@
name crimsonpro.doc
category Package
-revision 49568
+revision 54512
shortdesc doc files of crimsonpro
relocated 1
-docfiles size=12
+docfiles size=24
RELOC/doc/fonts/crimsonpro/OFL.txt
RELOC/doc/fonts/crimsonpro/README
RELOC/doc/fonts/crimsonpro/crimsonpro-samples.pdf
++++++ crimsonpro.tar.xz ++++++
++++ 15057 lines of diff (skipped)
++++++ crossreftools.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crossreftools.doc.tlpobj new/tlpkg/tlpobj/crossreftools.doc.tlpobj
--- old/tlpkg/tlpobj/crossreftools.doc.tlpobj 2019-02-28 03:30:28.000000000 +0100
+++ new/tlpkg/tlpobj/crossreftools.doc.tlpobj 2020-03-04 23:50:31.000000000 +0100
@@ -1,6 +1,6 @@
name crossreftools.doc
category Package
-revision 49589
+revision 54080
shortdesc doc files of crossreftools
relocated 1
docfiles size=100
++++++ crossreftools.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/crossreftools.tlpobj new/tlpkg/tlpobj/crossreftools.tlpobj
--- old/tlpkg/tlpobj/crossreftools.tlpobj 2019-02-28 03:30:28.000000000 +0100
+++ new/tlpkg/tlpobj/crossreftools.tlpobj 2020-03-04 23:50:31.000000000 +0100
@@ -1,6 +1,6 @@
name crossreftools
category Package
-revision 49589
+revision 54080
shortdesc Expandable extraction of cleveref data
relocated 1
longdesc This package extracts information from cross-referencing
@@ -9,9 +9,7 @@
runfiles size=4
RELOC/tex/latex/crossreftools/crossreftools.sty
catalogue-also cleveref
-catalogue-contact-home http://www.ich-rede-mich-um-kopf-und-kragen.de
catalogue-ctan /macros/latex/contrib/crossreftools
-catalogue-date 2019-01-03 16:16:07 +0100
catalogue-license lppl1.3
catalogue-topics label-ref
catalogue-version 0.9
++++++ csbulletin.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csbulletin/README new/doc/latex/csbulletin/README
--- old/doc/latex/csbulletin/README 2019-01-13 00:06:52.000000000 +0100
+++ new/doc/latex/csbulletin/README 2020-03-20 22:27:05.000000000 +0100
@@ -1,5 +1,5 @@
=============================================================================
-Package: csbulletin Version 1.2 12 January 2019
+Package: csbulletin 10 January 2020
=============================================================================
The package provides the class for articles for the CSTUG Bulletin
Binary files old/doc/latex/csbulletin/csbulletin.pdf and new/doc/latex/csbulletin/csbulletin.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csbulletin/csbulletin.tex new/doc/latex/csbulletin/csbulletin.tex
--- old/doc/latex/csbulletin/csbulletin.tex 2019-01-13 00:06:52.000000000 +0100
+++ new/doc/latex/csbulletin/csbulletin.tex 2020-03-20 22:27:05.000000000 +0100
@@ -1,9 +1,8 @@
%% $Id$
\documentclass{csbulletin}
-\DeclareRobustCommand\version{\unskip~v.\,1.2}
+\DeclareRobustCommand\version{\unskip~2020/01/10}
\let\pkg\textsc
-\usepackage[utf8]{inputenc}
\usepackage[pdftitle=LaTeX\ Class\ for\ CSTUG\ Bulletin, pdfauthor={Zdenek\ Wagner, Vit\ Novotny},
pdfkeywords=CSTUG\ Bulletin,bookmarks=false]{hyperref}
@@ -23,6 +22,7 @@
ve stylu pro Zpravodaj, autoři se tedy mohou podívat přímo do zdrojového kódu tohoto manuálu a
napsat svůj článek obdobně.
\end{abstract}
+\klicovaslova: \LaTeX, styl, dokumentová třída, Zpravodaj \CSTUG, dokumentace
\section{English introduction}
\begin{otherlanguage}{english}
@@ -51,7 +51,8 @@
\begin{itemize}
\item Balíček \pkg{csbulacronym} definuje běžné akronymy robustním způsobem pomocí \cmd{DeclareRobustCommand} a
-některé speciální akronymy, jako je např. makro \cmd{cstug} pro \cstug. Soubor je dodáván společně s~třídou \pkg{csbulletin}. Definice se používají i mimo Zpravodaj, proto jsou v~samostatném souboru.
+některé speciální akronymy, jako je např. makro \cmd{cstug} pro \cstug. Soubor je dodáván společně s~třídou
+\pkg{csbulletin}. Definice se používají i mimo Zpravodaj, proto jsou v~samostatném souboru.
\item \pkg{fontenc} s~parametrem T1
@@ -104,11 +105,14 @@
kurzívou na konci článku. Poté použijte makro \cmd{maketitle}.
Abstrakt článku v~jazyce článku zapište v~prostředí \texttt{abstract}. Ve výjimečných případech lze
-abstrakt vynechat.
+abstrakt vynechat. Za prostředí \texttt{abstract} volitelně uveďte jedno a více klíčových slov
+oddělených čárkou a předznamenaných příkazem \cmd{klicovaslova:}, \cmd{klucoveslova:} nebo
+\cmd{keywords:} podle jazyka článku.
Na konci článku uveďte anglický souhrn v~prostředí \texttt{summary}. Anglický název bude vzat
z~příkazu \cmd{EnglishTitle}, přepnutí jazyka se též provede automaticky. Anglický souhrn nemusí být
-přesným překladem abstraktu.
+přesným překladem abstraktu. Na závěr prostředí \texttt{summary} volitelně uveďte jedno a více
+anglických klíčových slov oddělených čárkou a předznamenaných příkazem \cmd{keywords:}.
Redakce se postará o~jazykovou korekturu anglického souhrnu. V~případě, že jej autor nedodá,
postará se o~překlad redakce.
@@ -139,6 +143,7 @@
sdružení uživatelů \TeX u). You can see the structure of a document by looking to the source file
of this manual. The package can be used and distributed according to the \LaTeX\ Project Public
License.
+ \keywords: \LaTeX, style, document class, \CSTUG{} Bulletin, documentation
\end{summary}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csbulletin.doc.tlpobj new/tlpkg/tlpobj/csbulletin.doc.tlpobj
--- old/tlpkg/tlpobj/csbulletin.doc.tlpobj 2019-02-28 03:30:32.000000000 +0100
+++ new/tlpkg/tlpobj/csbulletin.doc.tlpobj 2020-03-20 23:58:20.000000000 +0100
@@ -1,9 +1,9 @@
name csbulletin.doc
category Package
-revision 49681
+revision 54433
shortdesc doc files of csbulletin
relocated 1
-docfiles size=72
+docfiles size=73
RELOC/doc/latex/csbulletin/LICENSE.txt
RELOC/doc/latex/csbulletin/README
RELOC/doc/latex/csbulletin/csbulletin.pdf
++++++ csbulletin.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csbulletin/csbulacronym.sty new/tex/latex/csbulletin/csbulacronym.sty
--- old/tex/latex/csbulletin/csbulacronym.sty 2017-02-21 01:27:57.000000000 +0100
+++ new/tex/latex/csbulletin/csbulacronym.sty 2020-03-20 22:27:05.000000000 +0100
@@ -1,4 +1,4 @@
-\ProvidesPackage{csbulacronym}[2008/04/27 Acronyms for CSTUG bulletin]
+\ProvidesPackage{csbulacronym}[2020/01/10 Acronyms for CSTUG bulletin]
\PackageInfo{csbulacronym}{$Id$}
%==================================================== TeX logos
@@ -39,8 +39,6 @@
\DeclareRobustCommand\PiCTeX{\PiC\kern-.11em\TeX}
\DeclareRobustCommand\SliTeX{{\rm S\kern-.06em{\sc l\kern-.035emi}\kern-.06em\TeX}}
\let\SLiTeX\SliTeX
-\let\Protected@TeX\TeX
-\DeclareRobustCommand\TeX{\Protected@TeX}
\DeclareRobustCommand\WPtoLaTeX{%
W\kern-.06em\hbox{P}\kern-.2em\lower.7ex\hbox{2}\kern-.07em\LaTeX}
\let\Protected@LaTeX\LaTeX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csbulletin/csbulletin.cls new/tex/latex/csbulletin/csbulletin.cls
--- old/tex/latex/csbulletin/csbulletin.cls 2019-01-13 00:06:52.000000000 +0100
+++ new/tex/latex/csbulletin/csbulletin.cls 2020-03-20 22:27:05.000000000 +0100
@@ -1,4 +1,4 @@
-\ProvidesClass{csbulletin}[2019/01/12 CSTUG Bulletin class]
+\ProvidesClass{csbulletin}[2020/01/10 CSTUG Bulletin class]
\ClassInfo{csbulletin}{$Id$}
% Switch
@@ -79,7 +79,7 @@
\ifpdf
\IfFileExists{microtype.sty}{\RequirePackage
- [protrusion=false,expansion=true,stretch=8,shrink=24,step=4]{microtype}}{}
+ [protrusion=true,expansion=true,stretch=8,shrink=24,step=4]{microtype}}{}
\fi
\IfFileExists{array.sty}{\RequirePackage{array}}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csbulletin/csbulobalka.sty new/tex/latex/csbulletin/csbulobalka.sty
--- old/tex/latex/csbulletin/csbulobalka.sty 2019-01-13 00:06:52.000000000 +0100
+++ new/tex/latex/csbulletin/csbulobalka.sty 2020-03-20 22:27:05.000000000 +0100
@@ -1,4 +1,4 @@
-\ProvidesPackage{csbulobalka}[2017/02/17 Obalka + tiraz]
+\ProvidesPackage{csbulobalka}[2020/01/10 Obalka + tiraz]
\PackageInfo{csbulobalka}{$Id$}
%
% 3/4/2003 pridal jsem vetveni pro novou adresu sdruzeni (PS)
@@ -258,7 +258,9 @@
Tisk: & WOW, s.\,r.\,o., Praha 1, Washingtonova 25\\
\else
\ifnum\the\rok>2015
+\ifnum\the\rok<2019
Tisk: & ASMETI, Kl\'{a}\v{s}tern\'{i} 1187, 735\,11 Orlov\'{a} \\
+\fi
\else
Tisk a distribuce: &
KONVOJ, spol. s r.\,o., Berkova 22, 612\,00 Brno,\\
@@ -315,7 +317,7 @@
\tir@ni www server sdru\v zen\'i:\\
%\pdfurl{http://www.cstug.cz/}{\path|http://www.cstug.cz/|}
-\texttt{http://www.cstug.cz}
+\texttt{https://www.cstug.cz}
\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csbulletin.tlpobj new/tlpkg/tlpobj/csbulletin.tlpobj
--- old/tlpkg/tlpobj/csbulletin.tlpobj 2019-02-28 03:30:32.000000000 +0100
+++ new/tlpkg/tlpobj/csbulletin.tlpobj 2020-03-20 23:58:20.000000000 +0100
@@ -1,6 +1,6 @@
name csbulletin
category Package
-revision 49681
+revision 54433
shortdesc LaTeX class for articles submitted to the CSTUG Bulletin (Zpravodaj)
relocated 1
longdesc The package provides the class for articles for the CSTUG
@@ -14,7 +14,5 @@
RELOC/tex/latex/csbulletin/csbulobalka.sty
RELOC/tex/latex/csbulletin/csbulv1.cls
catalogue-ctan /macros/latex/contrib/csbulletin
-catalogue-date 2019-01-12 11:49:08 +0100
catalogue-license lppl1.3
catalogue-topics journalpub class
-catalogue-version 1.2
++++++ cslatex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/cslatex.man1.pdf and new/texmf-dist/doc/man/man1/cslatex.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/pdfcslatex.man1.pdf and new/texmf-dist/doc/man/man1/pdfcslatex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cslatex.doc.tlpobj new/tlpkg/tlpobj/cslatex.doc.tlpobj
--- old/tlpkg/tlpobj/cslatex.doc.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/cslatex.doc.tlpobj 2020-03-14 01:42:05.000000000 +0100
@@ -1,6 +1,6 @@
name cslatex.doc
category Package
-revision 50602
+revision 54276
shortdesc doc files of cslatex
docfiles size=14
texmf-dist/doc/man/man1/cslatex.1
++++++ cslatex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cslatex.tlpobj new/tlpkg/tlpobj/cslatex.tlpobj
--- old/tlpkg/tlpobj/cslatex.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/cslatex.tlpobj 2020-03-14 01:42:05.000000000 +0100
@@ -1,16 +1,18 @@
name cslatex
category Package
-revision 50602
+revision 54276
shortdesc LaTeX support for Czech/Slovak typesetting
depend latex
depend cm
depend csplain
depend hyphen-base
+depend l3kernel
depend latex-fonts
+depend unicode-data
depend tex-ini-files
depend cslatex.ARCH
-execute AddFormat name=cslatex engine=pdftex options="-etex cslatex.ini" fmttriggers=cm,csplain,hyphen-base,latex-fonts,latex
-execute AddFormat name=pdfcslatex engine=pdftex options="-etex cslatex.ini" fmttriggers=cm,csplain,hyphen-base,latex-fonts,latex,tex-ini-files
+execute AddFormat name=cslatex engine=pdftex options="-etex cslatex.ini" fmttriggers=cm,csplain,hyphen-base,l3kernel,latex-fonts,latex,unicode-data
+execute AddFormat name=pdfcslatex engine=pdftex options="-etex cslatex.ini" fmttriggers=cm,csplain,hyphen-base,l3kernel,latex-fonts,latex,unicode-data,tex-ini-files
runfiles size=46
texmf-dist/tex/cslatex/base/cslatex.ini
texmf-dist/tex/cslatex/base/czech.sty
@@ -52,6 +54,5 @@
texmf-dist/tex/cslatex/cspsfonts/xl2pzc.fd
catalogue-contact-home http://petr.olsak.net/cstex/
catalogue-ctan /macros/cstex/base/cslatex.tar.gz
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license gpl
catalogue-topics czech slovak format
++++++ csplain.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/base/csplain.ini new/texmf-dist/tex/csplain/base/csplain.ini
--- old/texmf-dist/tex/csplain/base/csplain.ini 2019-03-19 22:27:38.000000000 +0100
+++ new/texmf-dist/tex/csplain/base/csplain.ini 2020-02-13 23:09:47.000000000 +0100
@@ -274,6 +274,9 @@
* More hyphen patterns preloaded in pdftex: (pdf)csplain
* Only three hyphen patterns preloaded in xetex: pdfcsplain
+ Feb. 2020
+* hyphen.lan: skip loading patters when missing file
+
COPYRIGHT
=========
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/base/hyphen.lan new/texmf-dist/tex/csplain/base/hyphen.lan
--- old/texmf-dist/tex/csplain/base/hyphen.lan 2019-03-19 22:27:38.000000000 +0100
+++ new/texmf-dist/tex/csplain/base/hyphen.lan 2020-02-13 23:09:47.000000000 +0100
@@ -3,6 +3,7 @@
% Created by Oldrich Ulrych, January 5, 1993
% General changes by Petr Olsak November 2012
% More default preloaded patterns March 2019
+% Skip loading patterns when missing file Feb. 2020
% See the end of this file for more inforamtion
@@ -10,7 +11,8 @@
\input il2code % extra codes for czech / slovak letters in ISO-8859-2 encoding
-\def\loadpatterns #1#2 #3 #4#5#6#7#8#9{\ifx#1\undefined \else \global\chardef#1=#2
+\def\loadpatterns #1#2 #3 #4#5#6 #7#8#9{\ifx#1\undefined \else
+ \ishyphen{#7}{#3}\iftrue \global\chardef#1=#2
\begingroup \language=#2 \def\doaccents{\def\csaccentsmessage{}\csaccents}
\let\global=\relax
\message{Loading #4 encoding, \string#1=#2 (#3).} #5
@@ -18,15 +20,20 @@
\expandafter \gdef \csname lan:#2\endcsname {#3}
\expandafter \gdef \csname #3lang\endcsname {\langpatterntest#9%
\language=#9\relax \initlanguage{#3}\frenchspacing
- \lefthyphenmin=#6\righthyphenmin=#7%
+ \sethyphenmins#6%
\message{#3 hyphenation used (\string\language=\the\language).
\string\frenchspacing\space is set on.}}
\ifx#8\relax \else
\expandafter\gdef\expandafter#8\expandafter{#8\let#9#1}\fi
\xdef\pattlist{\pattlist #1=#2 }
\global\advance\numpatterns by1
- \fi
+ \fi\fi
}
+\def\sethyphenmins#1#2{\lefthyphenmin=#1\righthyphenmin=#2\relax}
+\def\ishyphen#1#2#3{\openin7=#1 \ifeof7
+ \message{Warning: Hyphenation (#2) cannot be loaded, missing "#1" file.}
+ \else \closein7 }
+
\def\langpatterntest#1{\ifx\undefined#1\langpatterntestA#1\fi}
\def\langpatterntestA#1{%
\errmessage{Pattern \noexpand#1 ins't supported in ISO-8859-2.
@@ -190,117 +197,117 @@
\def\patt{hyphenation patterns }
\loadpatterns \enPatt 0 en {US English \patt in ASCII}
- {\input hyphen.ex }23 \relax \enPatt
+ {\input hyphen.ex }23 {hyphen.tex} \relax \enPatt
\loadpatterns \enusPatt 100 enus {US English extended \patt in ASCII}
- {\input hyph-en-us }23 \relax \enusPatt
+ {\input hyph-en-us }23 {hyph-en-us} \relax \enusPatt
\loadpatterns \engbPatt 101 engb {UK English \patt in ASCII}
- {\input hyph-en-gb }23 \relax \engbPatt
+ {\input hyph-en-gb }23 {hyph-en-gb} \relax \engbPatt
\loadpatterns \itPatt 102 it {Italian \patt in ASCII}
- {\lccode`\'=`\' \input hyph-it }22 \relax \itPatt
+ {\lccode`\'=`\' \input hyph-it }22 {hyph-it} \relax \itPatt
\loadpatterns \iaPatt 103 ia {Interlingua \patt in ASCII}
- {\input hyph-ia }22 \relax \iaPatt
+ {\input hyph-ia }22 {hyph-ia} \relax \iaPatt
\loadpatterns \idPatt 104 id {Indonesian \patt in ASCII}
- {\input hyph-id }23 \relax \idPatt
+ {\input hyph-id }23 {hyph-id} \relax \idPatt
\loadpatterns \csILtwo 5 cs {Czech \patt in ISO-8859-2}
- {\doaccents \input czhyphen.tex \input czhyphen.ex }23 \iltwolangs \csPatt
+ {\doaccents \input czhyphen.tex \input czhyphen.ex }23 {czhyphen} \iltwolangs \csPatt
\loadpatterns \skILtwo 6 sk {Slovak \patt in ISO-8859-2}
- {\doaccents \input skhyphen.tex \input skhyphen.ex }23 \iltwolangs \skPatt
+ {\doaccents \input skhyphen.tex \input skhyphen.ex }23 {skhyphen} \iltwolangs \skPatt
\begingroup \ifx\Cork\undefined \input t1code \input conv-utf8-ec \fi
\loadpatterns \csCork 15 cs {Czech \patt in Cork}
- {\input hyph-cs.tex }23 \corklangs \csPatt
+ {\input hyph-cs.tex }23 {hyph-cs} \corklangs \csPatt
\loadpatterns \skCork 16 sk {Slovak \patt in Cork}
- {\input hyph-sk.tex }23 \corklangs \skPatt
+ {\input hyph-sk.tex }23 {hyph-sk} \corklangs \skPatt
\loadpatterns \deCork 21 de {German \patt in Cork}
- {\input hyph-de-1996 }22 \corklangs \dePatt
+ {\input hyph-de-1996 }22 {hyph-de-1996} \corklangs \dePatt
\loadpatterns \frCork 22 fr {French \patt in Cork}
- {\lccode`\'=`\' \input hyph-fr }23 \corklangs \frPatt
+ {\lccode`\'=`\' \input hyph-fr }23 {hyph-fr} \corklangs \frPatt
\loadpatterns \plCork 23 pl {Polish \patt in Cork}
- {\input hyph-pl }22 \corklangs \plPatt
+ {\input hyph-pl }22 {hyph-pl} \corklangs \plPatt
\loadpatterns \cyCork 24 cy {Welsh \patt in Cork}
- {\input hyph-cy }23 \corklangs \cyPatt
+ {\input hyph-cy }23 {hyph-cy} \corklangs \cyPatt
\loadpatterns \daCork 25 da {Danish \patt in Cork}
- {\input hyph-da }22 \corklangs \daPatt
+ {\input hyph-da }22 {hyph-da} \corklangs \daPatt
\loadpatterns \esCork 26 es {Spanish \patt in Cork}
- {\input hyph-es }22 \corklangs \esPatt
+ {\input hyph-es }22 {hyph-es} \corklangs \esPatt
\loadpatterns \slCork 28 sl {Slovenian \patt in Cork}
- {\input hyph-sl }22 \corklangs \slPatt
+ {\input hyph-sl }22 {hyph-sl} \corklangs \slPatt
\loadpatterns \fiCork 29 fi {Finnish \patt in Cork}
- {\input hyph-fi }22 \corklangs \fiPatt
+ {\input hyph-fi }22 {hyph-fi} \corklangs \fiPatt
\loadpatterns \huCork 30 hu {Hungarian \patt in Cork}
- {\input hyph-hu }22 \corklangs \huPatt
+ {\input hyph-hu }22 {hyph-hu} \corklangs \huPatt
\loadpatterns \trCork 31 tr {Turkish \patt in Cork}
- {\input hyph-tr }22 \corklangs \trPatt
+ {\input hyph-tr }22 {hyph-tr} \corklangs \trPatt
\loadpatterns \etCork 32 et {Estonian \patt in Cork}
- {\input hyph-et }23 \corklangs \etPatt
+ {\input hyph-et }23 {hyph-et} \corklangs \etPatt
\loadpatterns \euCork 33 eu {Basque \patt in Cork}
- {\input hyph-eu }22 \corklangs \euPatt
+ {\input hyph-eu }22 {hyph-eu} \corklangs \euPatt
\loadpatterns \gaCork 34 ga {Irish \patt in Cork}
- {\input hyph-ga }23 \corklangs \gaPatt
+ {\input hyph-ga }23 {hyph-ga} \corklangs \gaPatt
\loadpatterns \nbCork 35 nb {Norwegian Bokmal \patt in Cork}
- {\input hyph-nb }22 \corklangs \nbPatt
+ {\input hyph-nb }22 {hyph-nb} \corklangs \nbPatt
\loadpatterns \nnCork 36 nn {Norwegian Nynorsk \patt in Cork}
- {\input hyph-nn }22 \corklangs \nnPatt
+ {\input hyph-nn }22 {hyph-nn} \corklangs \nnPatt
\loadpatterns \nlCork 37 nl {Dutch \patt in Cork}
- {\input hyph-nl }22 \corklangs \nlPatt
+ {\input hyph-nl }22 {hyph-nl} \corklangs \nlPatt
\loadpatterns \ptCork 38 pt {Portuguese \patt in Cork}
- {\lccode`\-=`\- \input hyph-pt }23 \corklangs \ptPatt
+ {\lccode`\-=`\- \input hyph-pt }23 {hyph-pt} \corklangs \ptPatt
\loadpatterns \roCork 39 ro {Romanian \patt in Cork}
- {\input hyph-ro }22 \corklangs \roPatt
+ {\input hyph-ro }22 {hyph-ro} \corklangs \roPatt
\loadpatterns \hrCork 40 hr {Croatian \patt in Cork}
- {\input hyph-hr }22 \corklangs \hrPatt
+ {\input hyph-hr }22 {hyph-hr} \corklangs \hrPatt
\loadpatterns \zhCork 41 zh {Unaccented Pinyin Syllables \patt in Cork}
- {\lccode`\'=`\' \input hyph-zh-latn-pinyin.ec }11 \corklangs \zhPatt
+ {\lccode`\'=`\' \input hyph-zh-latn-pinyin.ec }11 {hyph-zh-latn-pinyin.ec} \corklangs \zhPatt
\loadpatterns \isCork 42 is {Icelandic \patt in Cork}
- {\input hyph-is }22 \corklangs \isPatt
+ {\input hyph-is }22 {hyph-is} \corklangs \isPatt
\loadpatterns \hsbCork 43 hsb {EC Upper Sorbian \patt in Cork}
- {\input hyph-hsb }22 \corklangs \hsbPatt
+ {\input hyph-hsb }22 {hyph-hsb} \corklangs \hsbPatt
\loadpatterns \afCork 44 af {Afrikaans \patt in Cork}
- {\lccode`\-=`\- \lccode`\'=`\' \input hyph-af }22 \corklangs \afPatt
+ {\lccode`\-=`\- \lccode`\'=`\' \input hyph-af }22 {hyph-af} \corklangs \afPatt
\loadpatterns \glCork 45 gl {Galician \patt in Cork}
- {\input hyph-gl }22 \corklangs \glPatt
+ {\input hyph-gl }22 {hyph-gl} \corklangs \glPatt
\loadpatterns \kmrCork 46 kmr {Kurmanji \patt in Cork}
- {\input hyph-kmr }22 \corklangs \kmrPatt
+ {\input hyph-kmr }22 {hyph-kmr} \corklangs \kmrPatt
\loadpatterns \tkCork 47 tk {Turkmen \patt in Cork}
- {\lccode`\-=`\- \input hyph-tk }22 \corklangs \tkPatt
+ {\lccode`\-=`\- \input hyph-tk }22 {hyph-tk} \corklangs \tkPatt
\loadpatterns \laCork 48 la {Latin \patt in Cork}
- {\lccode`\'=`\' \input hyph-la }22 \corklangs \laPatt
+ {\lccode`\'=`\' \input hyph-la }22 {hyph-la} \corklangs \laPatt
\endgroup
@@ -308,172 +315,172 @@
\ifx\UnicodeLcUc y \input uni-lcuc \let\robustpatterns=\relax \fi
\loadpatterns \csUnicode 115 cs {Czech \patt in Unicode}
- {\robustpatterns \input hyph-cs.tex }23 \unicodelangs \csPatt
+ {\robustpatterns \input hyph-cs.tex }23 {hyph-cs} \unicodelangs \csPatt
\loadpatterns \skUnicode 116 sk {Slovak \patt in Unicode}
- {\robustpatterns \input hyph-sk.tex }23 \unicodelangs \skPatt
+ {\robustpatterns \input hyph-sk.tex }23 {hyph-sk} \unicodelangs \skPatt
\loadpatterns \deUnicode 121 de {German \patt in Unicode}
- {\robustpatterns \input hyph-de-1996 }22 \unicodelangs \dePatt
+ {\robustpatterns \input hyph-de-1996 }22 {hyph-de-1996} \unicodelangs \dePatt
\loadpatterns \frUnicode 122 fr {French \patt in Unicode}
- {\robustpatterns \lccode`\'=`\' \input hyph-fr }23 \unicodelangs \frPatt
+ {\robustpatterns \lccode`\'=`\' \input hyph-fr }23 {hyph-fr} \unicodelangs \frPatt
\loadpatterns \plUnicode 123 pl {Polish \patt in Unicode}
- {\robustpatterns \input hyph-pl }22 \unicodelangs \plPatt
+ {\robustpatterns \input hyph-pl }22 {hyph-pl} \unicodelangs \plPatt
\loadpatterns \cyUnicode 124 cy {Welsh \patt in Unicode}
- {\robustpatterns \input hyph-cy }23 \unicodelangs \cyPatt
+ {\robustpatterns \input hyph-cy }23 {hyph-cy} \unicodelangs \cyPatt
\loadpatterns \daUnicode 125 da {Danish \patt in Unicode}
- {\robustpatterns \input hyph-da }22 \unicodelangs \daPatt
+ {\robustpatterns \input hyph-da }22 {hyph-da} \unicodelangs \daPatt
\loadpatterns \esUnicode 126 es {Spanish \patt in Unicode}
- {\robustpatterns \input hyph-es }22 \unicodelangs \esPatt
+ {\robustpatterns \input hyph-es }22 {hyph-es} \unicodelangs \esPatt
\loadpatterns \slUnicode 128 sl {Slovenian \patt in Unicode}
- {\robustpatterns \input hyph-sl }22 \unicodelangs \slPatt
+ {\robustpatterns \input hyph-sl }22 {hyph-sl} \unicodelangs \slPatt
\loadpatterns \fiUnicode 129 fi {Finnish \patt in Unicode}
- {\robustpatterns \input hyph-fi }22 \unicodelangs \fiPatt
+ {\robustpatterns \input hyph-fi }22 {hyph-fi} \unicodelangs \fiPatt
\loadpatterns \huUnicode 130 hu {Hungarian \patt in Unicode}
- {\robustpatterns input hyph-hu }22 \unicodelangs \huPatt
+ {\robustpatterns input hyph-hu }22 {hyph-hu} \unicodelangs \huPatt
\loadpatterns \trUnicode 131 tr {Turkish \patt in Unicode}
- {\robustpatterns \input hyph-tr }22 \unicodelangs \trPatt
+ {\robustpatterns \input hyph-tr }22 {hyph-tr} \unicodelangs \trPatt
\loadpatterns \etUnicode 132 et {Estonian \patt in Unicode}
- {\robustpatterns \input hyph-et }23 \unicodelangs \etPatt
+ {\robustpatterns \input hyph-et }23 {hyph-et} \unicodelangs \etPatt
\loadpatterns \euUnicode 133 eu {Basque \patt in Unicode}
- {\robustpatterns \input hyph-eu }22 \unicodelangs \euPatt
+ {\robustpatterns \input hyph-eu }22 {hyph-eu} \unicodelangs \euPatt
\loadpatterns \gaUnicode 134 ga {Irish \patt in Unicode}
- {\robustpatterns \input hyph-ga }23 \unicodelangs \gaPatt
+ {\robustpatterns \input hyph-ga }23 {hyph-ga} \unicodelangs \gaPatt
\loadpatterns \nbUnicode 135 nb {Norwegian Bokmal \patt in Unicode}
- {\robustpatterns \input hyph-nb }22 \unicodelangs \nbPatt
+ {\robustpatterns \input hyph-nb }22 {hyph-nb} \unicodelangs \nbPatt
\loadpatterns \nnUnicode 136 nn {Norwegian Nynorsk \patt in Unicode}
- {\robustpatterns \input hyph-nn }22 \unicodelangs \nnPatt
+ {\robustpatterns \input hyph-nn }22 {hyph-nn} \unicodelangs \nnPatt
\loadpatterns \nlUnicode 137 nl {Dutch \patt in Unicode}
- {\robustpatterns \input hyph-nl }22 \unicodelangs \nlPatt
+ {\robustpatterns \input hyph-nl }22 {hyph-nl} \unicodelangs \nlPatt
\loadpatterns \ptUnicode 138 pt {Portuguese \patt in Unicode}
- {\robustpatterns \lccode`\-=`\- \input hyph-pt }23 \unicodelangs \ptPatt
+ {\robustpatterns \lccode`\-=`\- \input hyph-pt }23 {hyph-pt} \unicodelangs \ptPatt
\loadpatterns \roUnicode 139 ro {Romanian \patt in Unicode}
- {\robustpatterns \input hyph-ro }22 \unicodelangs \roPatt
+ {\robustpatterns \input hyph-ro }22 {hyph-ro} \unicodelangs \roPatt
\loadpatterns \hrUnicode 140 hr {Croatian \patt in Unicode}
- {\robustpatterns \input hyph-hr }22 \unicodelangs \hrPatt
+ {\robustpatterns \input hyph-hr }22 {hyph-hr} \unicodelangs \hrPatt
\loadpatterns \zhUnicode 141 zh {Unaccented Pinyin Syllables \patt in Unicode}
- {\robustpatterns \lccode`\'=`\' \input hyph-zh-latn-pinyin }11 \unicodelangs \zhPatt
+ {\robustpatterns \lccode`\'=`\' \input hyph-zh-latn-pinyin }11 {hyph-zh-latn-pinyin} \unicodelangs \zhPatt
\loadpatterns \isUnicode 142 is {Icelandic \patt in Unicode}
- {\robustpatterns \input hyph-is }22 \unicodelangs \isPatt
+ {\robustpatterns \input hyph-is }22 {hyph-is} \unicodelangs \isPatt
\loadpatterns \hsbUnicode 143 hsb {EC Upper Sorbian \patt in Unicode}
- {\robustpatterns \input hyph-hsb }22 \unicodelangs \hsbPatt
+ {\robustpatterns \input hyph-hsb }22 {hyph-hsb} \unicodelangs \hsbPatt
\loadpatterns \afUnicode 144 af {Afrikaans \patt in Unicode}
{\robustpatterns \lccode`\-=`\- \lccode`\'=`\'
- \input hyph-af }22 \corklangs \afPatt
+ \input hyph-af }22 {hyph-af} \corklangs \afPatt
\loadpatterns \glUnicode 145 gl {Galician \patt in Unicode}
- {\robustpatterns \input hyph-gl }22 \corklangs \glPatt
+ {\robustpatterns \input hyph-gl }22 {hyph-gl} \corklangs \glPatt
\loadpatterns \kmrUnicode 146 kmr {Kurmanji \patt in Unicode}
- {\robustpatterns \input hyph-kmr }22 \corklangs \kmrPatt
+ {\robustpatterns \input hyph-kmr }22 {hyph-kmr} \corklangs \kmrPatt
\loadpatterns \tkUnicode 147 tk {Turkmen \patt in Unicode}
- {\robustpatterns \lccode`\-=`\- \input hyph-tk }22 \corklangs \tkPatt
+ {\robustpatterns \lccode`\-=`\- \input hyph-tk }22 {hyph-tk} \corklangs \tkPatt
\loadpatterns \laUnicode 148 la {Latin \patt in Unicode}
- {\robustpatterns \lccode`\'=`\' \input hyph-la }22 \unicodelangs \laPatt
+ {\robustpatterns \lccode`\'=`\' \input hyph-la }22 {hyph-la} \unicodelangs \laPatt
\loadpatterns \elmUnicode 201 elm {Modern Monotonic Greek \patt in Unicode}
{\lccode`\'=`\' \lccode"2019="2019 \lccode"02BC="02BC \lccode"1FBD="1FBD \lccode"1FBF="1FBF
- \robustpatterns \input hyph-el-monoton }11 \unicodelangs \elmPatt
+ \robustpatterns \input hyph-el-monoton }11 {hyph-el-monoton} \unicodelangs \elmPatt
\loadpatterns \elpUnicode 202 elp {Modern Polytonic Greek \patt in Unicode}
{\lccode`\'=`\' \lccode"2019="2019 \lccode"02BC="02BC \lccode"1FBD="1FBD \lccode"1FBF="1FBF
- \robustpatterns \input hyph-el-polyton }11 \unicodelangs \elpPatt
+ \robustpatterns \input hyph-el-polyton }11 {hyph-el-polyton} \unicodelangs \elpPatt
\loadpatterns \grcUnicode 203 grc {Ancient Greek \patt in Unicode}
{\lccode`\'=`\' \lccode"2019="2019 \lccode"02BC="02BC \lccode"1FBD="1FBD \lccode"1FBF="1FBF
- \robustpatterns \input hyph-grc }11 \unicodelangs \grcPatt
+ \robustpatterns \input hyph-grc }11 {hyph-grc} \unicodelangs \grcPatt
\loadpatterns \caUnicode 204 ca {Catalan \patt in Unicode}
- {\robustpatterns \lccode`\'=`\' \input hyph-ca }22 \unicodelangs \caPatt
+ {\robustpatterns \lccode`\'=`\' \input hyph-ca }22 {hyph-ca} \unicodelangs \caPatt
\loadpatterns \copUnicode 205 cop {Coptic \patt in Unicode}
- {\robustpatterns \lccode`\'=`\' \input hyph-cop }11 \unicodelangs \copPatt
+ {\robustpatterns \lccode`\'=`\' \input hyph-cop }11 {hyph-cop} \unicodelangs \copPatt
\loadpatterns \mnUnicode 206 mn {Mongolian \patt in Unicode}
- {\robustpatterns \lccode`\'=`\' \input hyph-mn-cyrl }22 \unicodelangs \mnPatt
+ {\robustpatterns \lccode`\'=`\' \input hyph-mn-cyrl }22 {hyph-mn-cyrl} \unicodelangs \mnPatt
\loadpatterns \saUnicode 207 sa {Sanskrit \patt in Unicode}
{\robustpatterns \lccode"200C="200C \lccode"200D="200D
- \input hyph-sa }15 \unicodelangs \saPatt
+ \input hyph-sa }15 {hyph-sa} \unicodelangs \saPatt
\loadpatterns \ruUnicode 208 ru {Russian \patt in Unicode}
- {\robustpatterns \lccode`\-=`\- \input hyph-ru }22 \unicodelangs \ruPatt
+ {\robustpatterns \lccode`\-=`\- \input hyph-ru }22 {hyph-ru} \unicodelangs \ruPatt
\loadpatterns \ukUnicode 209 uk {Ukrainian \patt in Unicode}
{\robustpatterns \lccode`\'=`\' \lccode`\-=`\-
- \input hyph-uk }22 \unicodelangs \ukPatt
+ \input hyph-uk }22 {hyph-uk} \unicodelangs \ukPatt
\loadpatterns \hyUnicode 210 hy {Armenian \patt in Unicode}
- {\robustpatterns \input hyph-hy }12 \unicodelangs \hyPatt
+ {\robustpatterns \input hyph-hy }12 {hyph-hy} \unicodelangs \hyPatt
\loadpatterns \asUnicode 211 as {Assamesse \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-as }11 \unicodelangs \asPatt
+ \robustpatterns \input hyph-as }11 {hyph-as} \unicodelangs \asPatt
\loadpatterns \hiUnicode 212 hi {Hindi \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-hi }11 \unicodelangs \hiPatt
+ \robustpatterns \input hyph-hi }11 {hyph-hi} \unicodelangs \hiPatt
\loadpatterns \knUnicode 213 kn {Kannada \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-kn }11 \unicodelangs \knPatt
+ \robustpatterns \input hyph-kn }11 {hyph-kn} \unicodelangs \knPatt
%\loadpatterns \loUnicode 214 lo {Lao \patt in Unicode}
-% {\robustpatterns \input hyph-lo }11 \unicodelangs \loPatt
+% {\robustpatterns \input hyph-lo }11 {hyph-lo} \unicodelangs \loPatt
\loadpatterns \lvUnicode 215 lv {Latvian \patt in Unicode}
- {\robustpatterns \input hyph-lv }22 \unicodelangs \lvPatt
+ {\robustpatterns \input hyph-lv }22 {hyph-lv} \unicodelangs \lvPatt
\loadpatterns \ltUnicode 216 lt {Lithuanian \patt in Unicode}
- {\robustpatterns \input hyph-lt }22 \unicodelangs \ltPatt
+ {\robustpatterns \input hyph-lt }22 {hyph-lt} \unicodelangs \ltPatt
\loadpatterns \mlUnicode 217 ml {Malayalam \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-ml }11 \unicodelangs \mlPatt
+ \robustpatterns \input hyph-ml }11 {hyph-ml} \unicodelangs \mlPatt
\loadpatterns \mrUnicode 218 mr {Marathi \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-mr }11 \unicodelangs \mrPatt
+ \robustpatterns \input hyph-mr }11 {hyph-mr} \unicodelangs \mrPatt
\loadpatterns \orUnicode 219 or {Oriya \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-or }11 \unicodelangs \orPatt
+ \robustpatterns \input hyph-or }11 {hyph-or} \unicodelangs \orPatt
\loadpatterns \paUnicode 220 pa {Panjabi \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-pa }11 \unicodelangs \paPatt
+ \robustpatterns \input hyph-pa }11 {hyph-pa} \unicodelangs \paPatt
\loadpatterns \taUnicode 221 ta {Tamil \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-ta }11 \unicodelangs \taPatt
+ \robustpatterns \input hyph-ta }11 {hyph-ta} \unicodelangs \taPatt
\loadpatterns \teUnicode 222 te {Telugu \patt in Unicode}
{\lccode"200C="200C \lccode"200D="200D
- \robustpatterns \input hyph-te }11 \unicodelangs \tePatt
+ \robustpatterns \input hyph-te }11 {hyph-te} \unicodelangs \tePatt
\message{\the\numpatterns\space patterns preloaded: \pattlist}
\message{Defaults: \string\language=\the\language,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/base/lua-hyphen.lan new/texmf-dist/tex/csplain/base/lua-hyphen.lan
--- old/texmf-dist/tex/csplain/base/lua-hyphen.lan 2019-03-19 22:27:38.000000000 +0100
+++ new/texmf-dist/tex/csplain/base/lua-hyphen.lan 2019-05-01 00:33:28.000000000 +0200
@@ -4,7 +4,7 @@
\global\chardef\enPatt=0
\gdef\pattlist{\enPatt=0}
\gdef\langlist{en(USpreloaded)}
-\gdef\enlang{\uselang{en}\enPatt23\nonfrenchspacing} % \lefthyph=2 \righthyph=3
+\gdef\enlang{\dolangua{en}\enPatt23\nonfrenchspacing} % \lefthyph=2 \righthyph=3
\input uni-lcuc % \lccodes, \uccodes in unicode
@@ -14,7 +14,7 @@
\def\next{\expandafter\noexpand\csname #1lang\endcsname}
\expandafter\xdef \csname #1lang\endcsname {%
\noexpand\loadpattrs #2 #4
- \gdef\next{\noexpand\uselang{#1}#3#5}%
+ \gdef\next{\noexpand\dolangua{#1}#3#5}%
\next
}
\xdef\langlist{\langlist\space #1(#2)}
@@ -25,11 +25,11 @@
luatexhyphen.loadlanguage("#1",#2)
}%
}
-\def\uselang#1#2#3#4{\language=#2\lefthyphenmin=#3\righthyphenmin=#4\relax
- \frenchspacing % \nonfrenchspacing can be set in \setlanguage{lan}
- \setlanguage{#1}%
+\def\dolangua#1#2#3#4{\language=#2\lefthyphenmin=#3\righthyphenmin=#4\relax
+ \frenchspacing % \nonfrenchspacing can be set in \initlanguage{lan}
+ \initlanguage{#1}%
}
-\def\setlanguage#1{}
+\def\initlanguage#1{}
\preplang enus usenglishmax \enusPatt 100 23
\preplang engb ukenglish \engbPatt 101 23
@@ -113,19 +113,19 @@
\global\chardef\csPatt=115
\gdef\lan:115{cs}
\gdef\cslang{\loadpattrs czech 115
- \gdef\cslang{\uselang{cs}\csPatt23}%
+ \gdef\cslang{\dolangua{cs}\csPatt23}%
\cslang}
\xdef\langlist{\langlist\space #1(#2)}
-and \uselang{cs}\csPatt23 does:
+and \dolangua{cs}\csPatt23 does:
\language=\csPatt \lefthyphenmin=2 \righthyphenmin=3
- \frenchspacing \setlanguage{cs}
+ \frenchspacing \initlanguage{cs}
-finally \setlanguage{cs} does nothing by default. But user can redefine
+finally \initlanguage{cs} does nothing by default. But user can redefine
it and specify another features for selected lanuages here. For example:
-\def\setlanguage#1{\csname set#1lang\endcsname}
+\def\initlanguage#1{\csname set#1lang\endcsname}
\def\setenuslang {\nonfrenchspacing}
\def\setcslang {...czech specific}
\def\setpllang {...polish specific}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/fonts/cs-ebgaramond.tex new/texmf-dist/tex/csplain/fonts/cs-ebgaramond.tex
--- old/texmf-dist/tex/csplain/fonts/cs-ebgaramond.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/tex/csplain/fonts/cs-ebgaramond.tex 2019-05-01 00:33:28.000000000 +0200
@@ -0,0 +1,173 @@
+% The file cs-ebgaramond.tex (C) Petr Krajník, 2019
+% Use "\input cs-ebgaramond" to set the EB Garamond font family in text mode
+
+\ifx\ffdecl\undefined \input ff-mac \fi
+
+\ffdecl [EB Garamond]
+ {\bmed \bsemi \bext \linn \oldn \tabn \propn \caps \swash}
+ {\rm \bf \it \bi} {+exchars} {TX} {8t 7t U}
+\ffvars {Regular}{\boldV}{Italic}{\boldV Italic}
+
+% Default font settings
+\def\resetbold{\ffsetV{bold}{Bold}\ffsetX}
+\def\resetnum {\tabn\linn} % Tabular lining numbers
+\def\resetfeat{\ffsetV{feat}{}\ffsetX}
+
+% Bold variants
+\def\bmed {\ffsetV{bold}{Medium}\ffsetX}
+\def\bsemi{\ffsetV{bold}{SemiBold}\ffsetX}
+\def\bext {\ffsetV{bold}{ExtraBold}\ffsetX}
+\resetbold %% Default bold is Bold
+
+\ismacro\fotenc{U}\iftrue
+
+ % Figures
+ \def\tabn{\ffsetV{tabn}{;+tnum}\ffsetX} \def\propn{\ffsetV{tabn}{;+pnum}\ffsetX}
+ \def\linn{\ffsetV{numb}{;+lnum}\ffsetX} \def\oldn {\ffsetV{numb}{;+onum}\ffsetX}
+ \resetnum
+
+ % Features
+ \def\caps {\ffsetV{feat}{;+smcp}\ffsetX}
+ \def\swash{\ffsetV{feat}{;+swsh}\ffsetX}
+ \resetfeat
+
+ \def\ffnamegen{"[EBGaramond-\ffvarV]:\fontfeatures\tabnV\numbV\featV"}
+ \useff{+kern;+liga}\fam % Load default \tenrm, \tenbf, \tenit and \tenbi
+
+\else %% Classic TeX Fonts
+
+ \ismacro\fotenc{8t}\iftrue \def\ffenc{t1}\fi
+ \ismacro\fotenc{7t}\iftrue \def\ffenc{ot1}\fi
+
+ % Figures
+ \def\tabn{\ffsetV{tabn}{t}\ffsetX} \def\propn{\ffsetV{tabn}{}\ffsetX}
+ \def\linn{\ffsetV{numb}{lf}\ffsetX} \def\oldn {\ffsetV{numb}{osf}\ffsetX}
+ \resetnum
+
+ % Features
+ \def\caps {\ffsetV{feat}{-sc}\ffsetX}
+ \def\swash{\ffsetV{feat}{-swash}\ffsetX}
+ \resetfeat
+
+ \def\ffnamegen{EBGaramond-\ffvarV-\tabnV\numbV\featV-\ffenc}
+ \ffsetX\fam % Load default \tenrm, \tenbf, \tenit and \tenbi
+
+ \input exchars % 7c encoding implemented by exchars macro
+ \def\setexfamilyG #1 #2 {% Set EBGaramond Family: #1 = figures; #2 = features
+ \setexfont {EBGaramond-Regular-#1#2-\ffenc} TS1 EBGaramond-Regular-#1-ts1
+ \setexfont {EBGaramond-Medium-#1#2-\ffenc} TS1 EBGaramond-Medium-#1-ts1
+ \setexfont {EBGaramond-SemiBold-#1#2-\ffenc} TS1 EBGaramond-SemiBold-#1-ts1
+ \setexfont {EBGaramond-Bold-#1#2-\ffenc} TS1 EBGaramond-Bold-#1-ts1
+ \setexfont {EBGaramond-ExtraBold-#1#2-\ffenc} TS1 EBGaramond-ExtraBold-#1-ts1
+ \setexfont {EBGaramond-Italic-#1#2-\ffenc} TS1 EBGaramond-Italic-#1-ts1
+ \setexfont {EBGaramond-MediumItalic-#1#2-\ffenc} TS1 EBGaramond-MediumItalic-#1-ts1
+ \setexfont {EBGaramond-SemiBoldItalic-#1#2-\ffenc} TS1 EBGaramond-SemiBoldItalic-#1-ts1
+ \setexfont {EBGaramond-BoldItalic-#1#2-\ffenc} TS1 EBGaramond-BoldItalic-#1-ts1
+ \setexfont {EBGaramond-ExtraBoldItalic-#1#2-\ffenc} TS1 EBGaramond-ExtraBoldItalic-#1-ts1
+ }
+ \setexfamilyG lf {} \setexfamilyG lf -sc \setexfamilyG lf -swash
+ \setexfamilyG tlf {} \setexfamilyG tlf -sc \setexfamilyG tlf -swash
+ \setexfamilyG osf {} \setexfamilyG osf -sc \setexfamilyG osf -swash
+ \setexfamilyG tosf {} \setexfamilyG tosf -sc \setexfamilyG tosf -swash
+
+ \ifx\mubyte\undefined \else \mubyte\euro ^^e2^^82^^ac\endmubyte \fi
+ \let\euro=\exeuro
+
+\fi
+\tenrm % don't remember to initialize the family with normal font.
+
+\ifx\loadmathfonts\relax \endinput \fi
+\ifx\mathpreloaded X\else \input tx-math \fi
+
+\endinput
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+This file implements EBGaramond font support for plainTeX.
+
+ Requirements
+--------------
+This file needs three packages from CTAN.
+The "ebgaramond" package for the base font files.
+And also ffmac and tx-math macro from the "csplain" package.
+
+ Supported switches
+--------------------
+\bmed......Set default bold to Medium.
+\bsemi.....Set default bold to SemiBold.
+\bext......Set default bold to BoldExtended.
+\linn......Lining numbers. All numbers are on the baseline.
+\oldn......Old style numbers.
+\tabn......Tabular numbers. All number have the same width.
+\propn.....Proportional numbers.
+\caps......Small Caps.
+\swash.....Swash on some glyphs.
+
+We can reset feature groups to font default by:
+\resetbold...Reset default bold.
+\resetnum....Reset number options.
+\resetfeat...Reset features.
+
+ Omitted features
+-----------------
+I decided to omit upper and lower indexes as we can do this
+via TeXs math mode. Additionally that features doesn't worked
+with the whole T1 encoding and so their usage was very limited.
+
+Also omitted is the "titling" style (OpenType "case" font feature),
+because I haven't noticed any change over the original font.
+Maybe this is bug in the font OTF sources...
+
+In T1 code there is no space for additional "st" and other
+discretionary ligatures that are set with the \swash switch.
+To match T1 visual style the "dlig" font feature was omitted
+in Unicode fonts. Users of Unicode TeX can turn it on with
+\useff{+dlig} if they want. Then it matches the 7t encoding.
+
+ Math support
+--------------
+Default math uses the TX-Math macro which uses italic
+instead of math italic to match the text font. The results
+are good and usable, but far from perfect...
+
+There is also math package for this font "ebgaramond-maths".
+Unfortunately it replaces only math italic font, and only a part,
+so we get only a better Greek alphabet. Symbols as vector arrow
+are missing, so this will not work anymore and other problems.
+If you want a better matching Greek glyphs you can still use it.
+
+ \input cs-ebgaramond
+ \ffalias {txr}{EBGaramond-Regular-lf-ot1}
+ \ffalias{txmi}{EBGaramond12-Italic--oml-ebgaramond} % ebgaramond-maths
+
+But be warned about problems and missing glyphs.
+In the future I will try to make a math font macro for this font.
+
+If we use Unicode TeX we can use Uni-Math and Garamond-Math.otf font
+from "Garamond-Math" package that perfectly matches. But the math font
+is under development and can have bugs or other problems.
+ But tests showed that it works very nice!
+
+ \let\loadmathfonts=\relax
+ \input cs-ebgaramond
+ \def\unimathfont{[Garamond-Math]}
+ \input uni-math
+
+"ebgaramond-math" is also a CTAN package.
+
+ Limitations
+-------------
+One limitation is, that if we use \tabn\linn\caps
+we get old style tabular lining numbers and not lining tabular normal numbers.
+This problem/inconsistency came from the base *.otf files.
+
+The TS1 fonts has many holes.
+
+Some imperfections in math mode due the used TX-Math font.
+
+
+%%%%%%%%%%%%%% History of versions:
+
+Apr.2019 First version of this font file.
+
+%%%%%%%%%%%%%% EOF cs-ebgaramond.tex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/fonts/exchars.tex new/texmf-dist/tex/csplain/fonts/exchars.tex
--- old/texmf-dist/tex/csplain/fonts/exchars.tex 2016-05-10 23:27:39.000000000 +0200
+++ new/texmf-dist/tex/csplain/fonts/exchars.tex 2019-05-01 00:33:28.000000000 +0200
@@ -77,15 +77,15 @@
\declexfamily cs-qagr Adventor {\setexfamilyB qag r b ri bi cs }
\declexfamily cs-qbkr Bonum {\setexfamilyB qbk r b ri bi cs }
\declexfamily cs-qhvr Heros {\setexfamilyB qhv r b ri bi cs }
-\declexfamily cs-qcsr Pagella {\setexfamilyB qcs r b ri bi cs }
-\declexfamily cs-qplr Schola {\setexfamilyB qpl r b ri bi cs }
+\declexfamily cs-qcsr Schola {\setexfamilyB qcs r b ri bi cs }
+\declexfamily cs-qplr Pagella {\setexfamilyB qpl r b ri bi cs }
\declexfamily cs-qcrr Cursor {\setexfamilyB qcr r b ri bi cs }
\declexfamily ec-qtmr Termes {\setexfamilyB qtm r b ri bi ec }
\declexfamily ec-qagr Adventor {\setexfamilyB qag r b ri bi ec }
\declexfamily ec-qbkr Bonum {\setexfamilyB qbk r b ri bi ec }
\declexfamily ec-qhvr Heros {\setexfamilyB qhv r b ri bi ec }
-\declexfamily ec-qcsr Pagella {\setexfamilyB qcs r b ri bi ec }
-\declexfamily ec-qplr Schola {\setexfamilyB qpl r b ri bi ec }
+\declexfamily ec-qcsr Schola {\setexfamilyB qcs r b ri bi ec }
+\declexfamily ec-qplr Pagella {\setexfamilyB qpl r b ri bi ec }
\declexfamily ec-qcrr Cursor {\setexfamilyB qcr r b ri bi ec }
\declexfamily cs-lmr10 LMfonts {\setexfamilyB lm r10 bx10 ri10 bxi10 cs }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/fonts/luafonts.tex new/texmf-dist/tex/csplain/fonts/luafonts.tex
--- old/texmf-dist/tex/csplain/fonts/luafonts.tex 2016-05-12 23:32:17.000000000 +0200
+++ new/texmf-dist/tex/csplain/fonts/luafonts.tex 2019-05-01 00:33:28.000000000 +0200
@@ -9,8 +9,8 @@
\ifeof15 \else \closein15 %%%%%%%%%%%%% ltluatex exists
\expandafter\ifx\csname e@alloc@attribute@count\endcsname \relax
- \csname newcount\expandafter \endcsname \csname e@alloc@attribute@count\endcsname \fi
-\csname e@alloc@attribute@count\endcsname=-1
+ \csname newcount\expandafter \endcsname \csname e@alloc@attribute@count\endcsname
+ \csname e@alloc@attribute@count\endcsname=-1 \fi
\message{processing ltluatex.lua (3)}
\directlua{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/fonts/uni-math.tex new/texmf-dist/tex/csplain/fonts/uni-math.tex
--- old/texmf-dist/tex/csplain/fonts/uni-math.tex 2016-06-07 01:01:45.000000000 +0200
+++ new/texmf-dist/tex/csplain/fonts/uni-math.tex 2019-05-01 00:33:28.000000000 +0200
@@ -1,8 +1,8 @@
% uni-math.tex
-%%%%%%%%%%%%%%%%%%
-% Petr Olsak 2016
+%%%%%%%%%%%%%%%%%%%%%%%%
+% Petr Olsak 2016, 2019
-\def\unimathversion{May 2016} % Warning: this is at beta testing state
+\def\unimathversion{Mar. 2019} % Warning: this is at beta testing state
% Macros for loading Unicode math fonts in XeTeX or LuaTeX
@@ -26,7 +26,11 @@
\fi\fi % lua code to re-define \font primitive
\def\umathname#1#2{"#1:\mfontfeatures#2"}
-\def\mfontfeatures{mode=base;script=math;}
+\ifx\directlua\undefined
+ \def\mfontfeatures{script=math;} % XeTeX
+\else
+ \def\mfontfeatures{mode=base;script=math;} % LuaTeX
+\fi
\ifx\unimathfont\relax\else % \relax ... font will be declared later
\ifx\unimathfont\undefined \def\unimathfont{??}\fi
@@ -37,12 +41,15 @@
\message{uni-math WARNING: \string\unimathfont{\unimathfont} isn't loadable.}
\bgroup
\toks0={Examples:^^J
- \def\unimathfont{[xits-math]} ... XITS MATH^^J
+ \def\unimathfont{[XITSMath-Regular]} ... XITS MATH^^J
\def\unimathfont{[latinmodern-math]} ... Latin Modern Math^^J
\def\unimathfont{[texgyretermes-math]} ... TeXGyre Termes Math^^J
\def\unimathfont{[texgyrebonum-math]} ... TeXGyre Bonum Math^^J
\def\unimathfont{[texgyrepagella-math]} ... TeXGyre Pagella Math^^J
\def\unimathfont{[texgyreschola-math]} ... TeXGyre Schola Math^^J
+ \def\unimathfont{[texgyredejavu-math]} ... TeXGyre DeJaVu Math^^J
+ \def\unimathfont{[LibertinusMath-Regular]} ... Libertinus Math^^J
+ \def\unimathfont{[FiraMath-Regular]} ... Fira Math^^J
\def\unimathfont{[Asana-Math]} ... Asana Math^^J
\let\unimathfont=\relax ... Don't load the font right now.^^J
Note brackets if direct file name is used. Don't use quotes "...".
@@ -170,7 +177,7 @@
\chardef\ncharsnA="1D5A0 \chardef\ncharsna="1D5BA
\chardef\ncharbsA="1D5D4 \chardef\ncharbsa="1D5EE
\chardef\ncharsiA="1D608 \chardef\ncharsia="1D622
-\chardef\ncharsxA="1D63C \chardef\ncharbsx="1D656
+\chardef\ncharsxA="1D63C \chardef\ncharsxa="1D656
\chardef\ncharttA="1D670 \chardef\nchartta="1D68A
\protected\def\rmvariables {\umathrange{A-Z}\ncharrmA \umathrange{a-z}\ncharrma}
@@ -264,7 +271,7 @@
}
\catcode`#=14
\everypar={\setbox0=\lastbox \par \p}
- \input MathClass.txt
+ \input MathClass-15.txt
\endgroup
\begingroup % \input unicode-math-table.tex:
@@ -314,7 +321,91 @@
\def\overrightarrow {\Umathaccent 7 1 "020D7 }
\def\overleftrightarrow {\Umathaccent 7 1 "020E1 }
-\let\loadmathfonts=\relax % we need no more 8bit math fonts
+% corrections:
+
+\mathchardef\ldotp="612E
+\let\|=\Vert
+
+\let\setminus=\smallsetminus
+\let\diamond=\smwhtdiamond
+\let\bullet=\smblkcircle
+\let\circ=\vysmwhtcircle
+\let\bigcirc=\mdlgwhtcircle
+\let\to=\rightarrow
+\let\le=\leq
+\let\ge=\geq
+\let\neq=\ne
+\protected\def\triangle{\mathord{\bigtriangleup}}
+\let\emptyset=\varnothing
+\let\hbar=\hslash
+\let\land=\wedge
+\let\lor=\vee
+\let\owns=\ni
+\let\gets=\leftarrow
+\let\mathring=\ocirc
+\let\lnot=\neg
+\let\longdivision=\longdivisionsign
+\let\backepsilon=\upbackepsilon
+\let\eth=\matheth
+\let\dbkarow=\dbkarrow
+\let\drbkarow=\drbkarrow
+\let\hksearow=\hksearrow
+\let\hkswarow=\hkswarrow
+
+\let\varepsilon=\epsilon
+\let\upalpha=\mupalpha
+\let\upbeta=\mupbeta
+\let\upgamma=\mupgamma
+\let\updelta=\mupdelta
+\let\upepsilon=\mupvarepsilon
+\let\upvarepsilon=\mupvarepsilon
+\let\upzeta=\mupzeta
+\let\upeta=\mupeta
+\let\uptheta=\muptheta
+\let\upiota=\mupiota
+\let\upkappa=\mupkappa
+\let\uplambda=\muplambda
+\let\upmu=\mupmu
+\let\upnu=\mupnu
+\let\upxi=\mupxi
+\let\upomicron=\mupomicron
+\let\uppi=\muppi
+\let\uprho=\muprho
+\let\upvarrho=\mupvarrho
+\let\upvarsigma=\mupvarsigma
+\let\upsigma=\mupsigma
+\let\uptau=\muptau
+\let\upupsilon=\mupupsilon
+\let\upvarphi=\mupvarphi
+\let\upchi=\mupchi
+\let\uppsi=\muppsi
+\let\upomega=\mupomega
+\let\upvartheta=\mupvartheta
+\let\upphi=\mupphi
+\let\upvarpi=\mupvarpi
+
+\protected\def\not#1{%
+ \expandafter\ifx \csname not!\string#1\endcsname \relax
+ \mathrel{\mathord{\rlap{\kern1pt/}}\mathord{#1}}%
+ \else \csname not!\string#1\endcsname
+ \fi
+}
+\def\negationof#1#2{\expandafter\let \csname not!\string#1\endcsname =#2}
+\negationof = \neq
+\negationof < \nless
+\negationof > \ngtr
+\negationof \gets \nleftarrow
+\negationof \simeq \nsime
+\negationof \equal \ne
+\negationof \le \nleq
+\negationof \ge \ngeq
+\negationof \greater \ngtr
+\negationof \forksnot \forks
+\negationof \in \notin
+
+% we need no more 8bit math fonts
+
+\let\loadmathfonts=\relax
\endinput
@@ -335,7 +426,18 @@
by:
\def\boldmath{%
- \loadumathfamily 1 {[xits-mathbold]}{} % Base font
+ \loadumathfamily 1 {[xitsmath-bold]}{} % Base font
+ \loadmathfamily 4 rsfs % script
+ \setmathdimens
+}
+
+XITSmath-bold needs correction: the norm symbol ||x|| is missing here. So, you
+can define:
+
+\def\boldmath{%
+ \loadumathfamily 1 {[xitsmath-bold]}{} % Base font
\loadmathfamily 4 rsfs % script
+ \loadumathfamily 5 {[xitsmath-regular]}{}
+ \def\|{\Udelimiter 0 5 "02016 }% % norm delimiter from family 5
\setmathdimens
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/opmac/fontfam-global.tex new/texmf-dist/tex/csplain/opmac/fontfam-global.tex
--- old/texmf-dist/tex/csplain/opmac/fontfam-global.tex 2016-06-07 01:01:45.000000000 +0200
+++ new/texmf-dist/tex/csplain/opmac/fontfam-global.tex 2019-05-01 00:33:28.000000000 +0200
@@ -46,6 +46,11 @@
\setfontfam [Heuristica] {\caps} {\rm \it \bf \bi \tt} {} {TX} (8t U) {\input cs-heuristica}
\setfontfam [Baskervald X] {\caps} {\rm \it \bf \bi} {} {TX} (8t U) {\input cs-baskerx}
\famalias{baskervald}{baskervaldx}
+\setfontfam [EB Garamond] {\bmed \bsemi \bext \linn \oldn \tabn \propn \caps \swash}
+ {\rm \it \bf \bi} {} {TX} (8t 7t U) {\input cs-ebgaramond}
+\famalias{gramanond}{ebgaramond}
+
+
\setfontfam [Linux Libertine] {\mono \sans \caps} {\rm \it \bf \bi} {} {TX} (U sU) {\input cs-libertine}
\famalias{libertine}{linuxlibertine} \famalias{linlibertine}{linuxlibertine}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/opmac/opmac-xetex.tex new/texmf-dist/tex/csplain/opmac/opmac-xetex.tex
--- old/texmf-dist/tex/csplain/opmac/opmac-xetex.tex 2016-03-12 00:39:54.000000000 +0100
+++ new/texmf-dist/tex/csplain/opmac/opmac-xetex.tex 2020-02-13 23:09:47.000000000 +0100
@@ -53,9 +53,10 @@
% \pdfcolorstack is implemented by \special{color push <text>} and \special{color pop}
-\def\colorstackpush#1{\colorspecialinit \special{color push cmyk #1}}
+\def\formatcmyk#1{cmyk #1} \def\formatrgb#1{rgb #1} \def\pdfblackcolor{gray 0}
+\def\colorstackpush#1{\colorspecialinit \special{color push #1}}
\def\colorstackpop{\special{color pop}}
-\def\colorstackset#1{\colorspecialinit \special{color pop}\special{color push cmyk #1}}
+\def\colorstackset#1{\colorspecialinit \special{color pop}\special{color push #1}}
\def\colorspecialinit{\special{color push gray 0}\gdef\colorspecialinit{}}
%\def\special#1{\message{special:{#1}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/csplain/opmac/opmac.tex new/texmf-dist/tex/csplain/opmac/opmac.tex
--- old/texmf-dist/tex/csplain/opmac/opmac.tex 2019-03-13 21:56:52.000000000 +0100
+++ new/texmf-dist/tex/csplain/opmac/opmac.tex 2020-04-12 23:29:46.000000000 +0200
@@ -5,7 +5,7 @@
%% The history of versions is at the end of this file, after \endpinput
\ifx\OPmacversion\undefined \else \endinput \fi
-\def\OPmacversion{Mar. 2019}
+\def\OPmacversion{Apr. 2020}
\immediate\write16{This is OPmac (Olsak's Plain macros), version <\OPmacversion>}
%%%%%%%%%%%%%% Basic macros, sec. 3.1 in opmac-d.pdf
@@ -861,32 +861,38 @@
\def\White{\setcmykcolor{0 0 0 0}}
\def\Grey{\setcmykcolor{0 0 0 0.5}}
\def\LightGrey{\setcmykcolor{0 0 0 0.2}}
-\def\Black{\setcmykcolor{0 0 0 1}}
+\def\Black{\setcolor{\pdfblackcolor}}
-\def\setcmykcolor#1{\global\let\ensureblacko=\ensureblackoA
+\def\setcmykcolor#1{\setcolor{\formatcmyk{#1}}}
+\def\setrgbcolor#1{\setcolor{\formatrgb{#1}}}
+\def\formatcmyk#1{#1 k #1 K}
+\def\formatrgb#1{#1 rg #1 RG}
+
+\def\setcolor#1{\global\let\ensureblacko=\ensureblackoA
\iflocalcolor \edef\currentcolor{#1}\colorstackpush\currentcolor \aftergroup\colorstackpop
\else \xdef\currentcolor{#1}\colorstackset\currentcolor \fi
}
-\def\pdfblackcolor{0 0 0 1}
-\xdef\currentcolor{\pdfblackcolor}
+
+\def\pdfblackcolor{0 g 0 G}
+\edef\currentcolor{\pdfblackcolor}
\def\ensureblacko#1{#1}
\def\ensureblackoA#1{\colorstackpush\pdfblackcolor #1\colorstackpop}
\ifx\pdfcolorstackinit\undefined
- \def\colorstackpush#1{\pdfliteral{#1 k #1 K}}
+ \def\colorstackpush#1{\pdfliteral{#1}}
\def\colorstackpop{\colorstackpush\currentcolor}
\let\colorstackset=\colorstackpush
\else
- \mathchardef\colorstackcnt=\pdfcolorstackinit page {0 g 0 G}
- \def\colorstackpush#1{\pdfcolorstack\colorstackcnt push{#1 k #1 K}}
+ \mathchardef\colorstackcnt=0 % Implicit stack usage
+ \def\colorstackpush#1{\pdfcolorstack\colorstackcnt push{#1}}
\def\colorstackpop{\pdfcolorstack\colorstackcnt pop}
- \def\colorstackset#1{\pdfcolorstack\colorstackcnt set{#1 k #1 K}}
+ \def\colorstackset#1{\pdfcolorstack\colorstackcnt set{#1}}
\fi
-\addprotect\setcmykcolor \addprotect\localcolor \addprotect\longlocalcolor
+\addprotect\setcolor \addprotect\localcolor \addprotect\longlocalcolor
\ifpdftex\else
- \def\setcmykcolor#1{} \def\pdfliteral#1{}
+ \def\setcolor#1{} \def\pdfliteral#1{}
\fi
\def\draft{\addto\prepghook{\draftbox{\tenbf DRAFT}\nointerlineskip}}
@@ -1166,20 +1172,21 @@
\def\scantabdata#1{\let\next=\scantabdata
\ifx\relax#1\let\next=\relax
\else\ifx|#1\addtabvrule
- \else\isinlist{123456789}#1\iftrue \def\next{\scantabdataC#1}%
- \else \expandafter\ifx\csname tabdeclare#1\endcsname \relax
- \expandafter\ifx\csname paramtabdeclare#1\endcsname \relax
- \opwarning{tab-declarator "#1" unknown, ignored}%
- \else \def\next{\expandafter \scantabdataB \csname paramtabdeclare#1\endcsname}\fi
- \else \def\next{\expandafter\scantabdataA \csname tabdeclare#1\endcsname}%
- \fi\fi\fi\fi \next
+ \else\ifx(#1\def\next{\scantabdataE}%
+ \else\isinlist{123456789}#1\iftrue \def\next{\scantabdataC#1}%
+ \else \expandafter\ifx\csname tabdeclare#1\endcsname \relax
+ \expandafter\ifx\csname paramtabdeclare#1\endcsname \relax
+ \opwarning{tab-declarator "#1" unknown, ignored}%
+ \else \def\next{\expandafter\scantabdataB\csname paramtabdeclare#1\endcsname}\fi
+ \else \def\next{\expandafter\scantabdataA \csname tabdeclare#1\endcsname}%
+ \fi\fi\fi\fi\fi \next
}
\def\scantabdataA#1{\addtabitem \expandafter\addtabdata\expandafter{#1\tabstrutA}\scantabdata}
\def\scantabdataB#1#2{\addtabitem\expandafter\addtabdata\expandafter{#1{#2}\tabstrutA}\scantabdata}
\def\scantabdataC {\def\tmpb{}\afterassignment\scantabdataD \tmpnum=}
\def\scantabdataD#1{\loop \ifnum\tmpnum>0 \advance\tmpnum by-1 \addto\tmpb{#1}\repeat
- \expandafter\scantabdata\tmpb
-}
+ \expandafter\scantabdata\tmpb}
+\def\scantabdataE#1){\addtabdata{#1}\scantabdata}
\def\tabdeclarec{\tabiteml\hfil##\unsskip\hfil\tabitemr}
\def\tabdeclarel{\tabiteml##\unsskip\hfil\tabitemr}
\def\tabdeclarer{\tabiteml\hfil##\unsskip\tabitemr}
@@ -1223,16 +1230,11 @@
\vbox to\tmpdim{}\ddlinedata \crcr \noalign{\gdef\tabstrutA{\tabstrut}}}
\def\mspan{\omit \tabdata={\tabstrut}\let\tmpa=\relax \afterassignment\mspanA \mscount=}
-\def\mspanA[#1]{\loop \ifnum\mscount>1 \csname span\endcsname \omit \advance\mscount by-1 \repeat
- \mspanB#1\relax}
-\def\mspanB#1{\ifx\relax#1\def\tmpa{\def\tmpa####1}%
- \expandafter\tmpa\expandafter{\the\tabdata\ignorespaces}\expandafter\tmpa\else
- \ifx |#1\ifx\tmpa\vrule\addtabdata{\kern\vvkern}\fi \addtabdata{\vrule}\let\tmpa=\vrule
- \else \let\tmpa=\relax
- \ifx c#1\addtabdata{\tabiteml\hfil\ignorespaces##1\unsskip\hfil\tabitemr}\fi
- \ifx l#1\addtabdata{\tabiteml\ignorespaces##1\unsskip\hfil\tabitemr}\fi
- \ifx r#1\addtabdata{\tabiteml\hfil\ignorespaces##1\unsskip\tabitemr}\fi
- \fi \expandafter\mspanB \fi}
+\def\mspanA[#1]#2{\loop \ifnum\mscount>1 \csname span\endcsname \omit \advance\mscount -1 \repeat
+ \colnum=0 \def\tmpa{}\tabdata={}\scantabdata#1\relax
+ \setbox0=\vbox{\halign\expandafter{\the\tabdata\cr#2\cr}\global\setbox8=\lastbox}%
+ \setbox0=\hbox{\unhbox8 \unskip \global\setbox8=\lastbox}%
+ \unhbox8 \ignorespaces}
\newdimen\drulewidth \drulewidth=0.4pt
\let\orihrule=\hrule \let\orivrule=\vrule
@@ -1311,19 +1313,17 @@
\newcount\fnotenumlocal
\newif\iflocfnum \locfnumtrue
-\long\def\fnote#1{\global\advance \fnotenum by1 \leavevmode
+\long\def\fnoteG#1#2{\global\advance \fnotenum by1
+ \ifx\relax#1\relax\else\leavevmode\fi
\iflocfnum \openref\wref\Xfnote{}%
\isdefined{fn:\the\fnotenum}\iftrue
\else\opwarning{unknown \noexpand\fnote mark. TeX me again}\fi\fi
- \fnmarkx{\fnotehook\typobase\typoscale[800/800]\vfootnote\fnmarkx{#1}}%
-}
-\def\fnotemark#1{{\advance\fnotenum by#1\relax
- \isdefined{fn:\the\fnotenum}\iftrue\thefnote
- \else$^?$\opwarning{unknown \string\fnotemark. TeX me again}\fi}%
-}
-\long\def\fnotetext#1{\global\advance \fnotenum by1 \openref\wref\Xfnote{}%
- {\everypar={}\fnotehook\typobase\typoscale[800/800]\vfootnote\fnmarkx{#1}}%
+ #1{\everypar={}\fnotehook\typobase\typoscale[800/800]\vfootnote\fnmarkx{#2}}%
}
+\def\fnote{\fnoteG\fnmarkx}
+\def\fnotetext{\fnoteG{}}
+
+\def\fnotemark#1{{\advance\fnotenum by#1\relax \fnmarkx}}
\def\fnmarkx{\isdefined{fn:\the\fnotenum}\iftrue\thefnote\else$^?$\fi}
\def\thefnote{$^{\locfnum}$}
\def\locfnum{\csname fn:\the\fnotenum\endcsname}
@@ -1337,7 +1337,7 @@
\newdimen\mnoteskip \mnoteskip=0pt
\long\def\mnote#1{\ifvmode \hbox{\vbox to\ht\strutbox{}\mnoteA{#1}}\nobreak\vskip-\baselineskip
- \else \strut\vadjust{\kern-\dp\strutbox \mnoteA{#1}\kern\dp\strutbox}%
+ \else \lower\dp\strutbox\hbox{}\vadjust{\kern-\dp\strutbox \mnoteA{#1}\kern\dp\strutbox}%
\fi
}
\long\def\mnoteA#1{\global\advance \mnotenum by1
@@ -1857,6 +1857,12 @@
\boxlines added.
\titskip introduced.
\fnote corrected: \iflocfnum\openref.
+May 2019 \table declarator () added.
+Jun. 2019 \mspan improved.
+Jul. 2019 \fnoteG introduced, \fnotemark bug fixed (if \runningfnotes).
+ \colorstackcnt=0 used, \setrgbcolor, \formatcmyk, \formatrgb introduced.
+Apr. 2020 \mnote: \strut -> \lower\dp\strutbox\hbox{}
+ \mspan: \cr#2\crcr -> \cr#2\cr (empty text must be formated too)
%%%%%%%%%%%%%% End of opmac.tex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csplain.tlpobj new/tlpkg/tlpobj/csplain.tlpobj
--- old/tlpkg/tlpobj/csplain.tlpobj 2019-03-25 02:25:11.000000000 +0100
+++ new/tlpkg/tlpobj/csplain.tlpobj 2020-04-13 01:54:51.000000000 +0200
@@ -1,6 +1,6 @@
name csplain
category Package
-revision 50572
+revision 54699
shortdesc Plain TeX multilanguage support
longdesc CSplain is a small extension of basic Plain TeX macros, the
longdesc formats csplain and pdfcsplain can be generated. It supports:
@@ -20,6 +20,7 @@
depend tex
depend cm
depend cs
+depend hyph-utf8
depend hyphen-base
depend plain
depend enctex
@@ -27,12 +28,12 @@
depend luatex
depend luatex85
depend csplain.ARCH
-execute AddFormat name=csplain engine=pdftex options="-etex -enc csplain-utf8.ini" fmttriggers=cm,cs,hyphen-base,plain,enctex
-execute AddFormat name=pdfcsplain engine=pdftex options="-etex -enc csplain-utf8.ini" fmttriggers=cm,cs,hyphen-base,plain,enctex,tex-ini-files
-execute AddFormat name=luacsplain engine=luatex options="-etex csplain.ini" fmttriggers=cm,cs,hyphen-base,plain,tex-ini-files,luatex,luatex85
-execute AddFormat name=pdfcsplain engine=xetex options="-etex csplain.ini" fmttriggers=cm,cs,hyphen-base,plain
-execute AddFormat name=pdfcsplain engine=luatex options="-etex csplain.ini" fmttriggers=cm,cs,hyphen-base,plain,tex-ini-files,luatex,luatex85
-runfiles size=213
+execute AddFormat name=csplain engine=pdftex options="-etex -enc csplain-utf8.ini" fmttriggers=cm,cs,hyph-utf8,hyphen-base,plain,enctex
+execute AddFormat name=pdfcsplain engine=pdftex options="-etex -enc csplain-utf8.ini" fmttriggers=cm,cs,hyph-utf8,hyphen-base,plain,enctex,tex-ini-files
+execute AddFormat name=luacsplain engine=luatex options="-etex csplain.ini" fmttriggers=cm,cs,hyph-utf8,hyphen-base,plain,tex-ini-files,luatex,luatex85
+execute AddFormat name=pdfcsplain engine=xetex options="-etex csplain.ini" fmttriggers=cm,cs,hyph-utf8,hyphen-base,plain
+execute AddFormat name=pdfcsplain engine=luatex options="-etex csplain.ini" fmttriggers=cm,cs,hyph-utf8,hyphen-base,plain,tex-ini-files,luatex,luatex85
+runfiles size=216
texmf-dist/tex/csplain/base/csenc-k.tex
texmf-dist/tex/csplain/base/csenc-p.tex
texmf-dist/tex/csplain/base/csenc-u.tex
@@ -76,6 +77,7 @@
texmf-dist/tex/csplain/fonts/cs-bonum.tex
texmf-dist/tex/csplain/fonts/cs-charter.tex
texmf-dist/tex/csplain/fonts/cs-cursor.tex
+ texmf-dist/tex/csplain/fonts/cs-ebgaramond.tex
texmf-dist/tex/csplain/fonts/cs-heros.tex
texmf-dist/tex/csplain/fonts/cs-heuristica.tex
texmf-dist/tex/csplain/fonts/cs-iwona.tex
@@ -115,6 +117,5 @@
texmf-dist/tex/csplain/opmac/pdfuni.tex
catalogue-contact-home http://petr.olsak.net/csplain-e.html
catalogue-ctan /macros/cstex/base/csplain.tar.gz
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license other-free
catalogue-topics czech slovak format
++++++ csquotes.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csquotes/README.md new/doc/latex/csquotes/README.md
--- old/doc/latex/csquotes/README.md 2016-02-02 00:01:46.000000000 +0100
+++ new/doc/latex/csquotes/README.md 2019-12-07 00:10:42.000000000 +0100
@@ -16,7 +16,7 @@
## License
-Copyright (c) 2003-2011 Philipp Lehman, 2015 Joseph Wright.
+Copyright (c) 2003-2011 Philipp Lehman, 2015-2019 Joseph Wright.
Permission is granted to copy, distribute and/or modify this
software under the terms of the LaTeX Project Public License (LPPL),
version 1.3c or any later version.
Binary files old/doc/latex/csquotes/csquotes.pdf and new/doc/latex/csquotes/csquotes.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csquotes/csquotes.tex new/doc/latex/csquotes/csquotes.tex
--- old/doc/latex/csquotes/csquotes.tex 2018-05-02 19:53:44.000000000 +0200
+++ new/doc/latex/csquotes/csquotes.tex 2019-12-07 00:10:42.000000000 +0100
@@ -18,8 +18,8 @@
url={http://www.ctan.org/pkg/csquotes/},
author={Philipp Lehman, Joseph Wright},
email={joseph.wright(a)morningstar2.co.uk},
- revision={v5.2d},
- date={2018/04/13}}
+ revision={v5.2j},
+ date={2019-12-06}}
\hypersetup{%
pdftitle={The csquotes Package},
@@ -110,7 +110,7 @@
\subsection{License}
-Copyright © 2003--2011 Philipp Lehman, 2015--2018 Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c or any later version.\fnurl{http://www.latex-project.org/lppl/}
+Copyright © 2003--2011 Philipp Lehman, 2015--2019 Joseph Wright. Permission is granted to copy, distribute and\slash or modify this software under the terms of the \lppl, version 1.3c or any later version.\fnurl{http://www.latex-project.org/lppl/}
\subsection{Contributions}
@@ -136,32 +136,36 @@
\optitem[tryonce]{autostyle}{\opt{true}, \opt{false}, \opt{try}, \opt{once}, \opt{tryonce}}
-This option controls multilingual support. It requires either the \sty{babel} package or the \sty{polyglossia} package.\footnote{Note that \sty{polyglossia} support is currently in a preliminary state because \sty{polyglossia} is lacking a proper interface for other packages. In practice, this means that \sty{csquotes} can detect the language (\eg \texttt{english}) but not the language variant (\eg \texttt{british}).} \kvopt{autostyle}{true} continuously adapts the quote style to the current document language; \opt{once} will only adapt the style once so that it matches the main language of the document. \kvopt{autostyle}{try} and \opt{tryonce} are similar to \opt{true} and \opt{once} if multilingual support is available but will not issue any warnings if not (\ie if neither \sty{babel} nor \sty{polyglossia} have been loaded). The short form \opt{autostyle} is equivalent to \kvopt{autostyle}{true}. See also \secref{bas:set}.
+This option controls multilingual support. It requires either the \sty{babel} package or the \sty{polyglossia} package.\footnote{Note that \sty{polyglossia} support requires \sty{polyglossia}~v1.45 (2019/10/27) or above. With older \sty{polyglossia} versions language variants will not be detected as expected.} \kvopt{autostyle}{true} continuously adapts the quote style to the current document language; \opt{once} will only adapt the style once so that it matches the main language of the document. \kvopt{autostyle}{try} and \opt{tryonce} are similar to \opt{true} and \opt{once} if multilingual support is available but will not issue any warnings if not (\ie if neither \sty{babel} nor \sty{polyglossia} have been loaded). The short form \opt{autostyle} is equivalent to \kvopt{autostyle}{true}. See also \secref{bas:set}.
\begin{table}
-\tablesetup
-\begin{tabularx}{\columnwidth}{@{}P@{}X@{}}
- \toprule
- \multicolumn{1}{@{}H}{Option key} & \multicolumn{1}{@{}H}{Possible values} \\
- \cmidrule(r){1-1}\cmidrule{2-2}
- austrian & quotes, guillemets \\
- croatian & quotes, guillemets, guillemets\*\\
- czech & quotes, guillemets \\
- danish & quotes, guillemets, topquotes \\
- english & american, british\\
- french & quotes, quotes\*, guillemets, guillemets\*\\
- galician & quotes, guillemets \\
- german & quotes, guillemets, swiss \\
- italian & guillemets, quotes \\
- latvian & \\
- norwegian & guillemets, quotes \\
- portuguese & portuguese, brazilian \\
- spanish & spanish, mexican \\
- swedish & quotes, guillemets, guillemets\*\\
- \bottomrule
-\end{tabularx}
-\caption[Language Options]{Language Options Defined by Default}
-\label{tab:lng}
+ \tablesetup
+ \begin{tabularx}{\columnwidth}{@{}P@{}X@{}}
+ \toprule
+ \multicolumn{1}{@{}H}{Option key} & \multicolumn{1}{@{}H}{Possible values} \\
+ \cmidrule(r){1-1}\cmidrule{2-2}
+ austrian & quotes, guillemets \\
+ croatian & quotes, guillemets, guillemets\* \\
+ czech & quotes, guillemets \\
+ danish & quotes, guillemets, topquotes \\
+ english & american, british \\
+ estonian & \\
+ french & quotes, quotes\*, guillemets, guillemets\* \\
+ galician & quotes, guillemets \\
+ german & quotes, guillemets, swiss \\
+ hungarian & \\
+ italian & guillemets, quotes \\
+ latvian & \\
+ norwegian & guillemets, quotes \\
+ polish & guillemets, guillemets\* \\
+ portuguese & portuguese, brazilian \\
+ serbian & quotes, guillemets, german \\
+ spanish & spanish, mexican \\
+ swedish & quotes, guillemets, guillemets\* \\
+ \bottomrule
+ \end{tabularx}
+ \caption[Language Options]{Language Options Defined by Default}
+ \label{tab:lng}
\end{table}
\varitem{language}{\prm{variant}}
@@ -629,31 +633,32 @@
If available, this package will load the configuration file \path{csquotes.cfg}. You may use this file to define new quote styles and aliases or redefine existing ones.
\begin{table}
-\tablesetup
-\begin{tabularx}{\columnwidth}{@{}P@{}X@{}}
- \toprule
- \multicolumn{1}{@{}H}{Quote style} & \multicolumn{1}{@{}H}{Style variants} \\
- \cmidrule(r){1-1}\cmidrule{2-2}
- austrian & quotes, guillemets \\
- croatian & quotes, guillemets, guillemets\*\\
- czech & quotes, guillemets \\
- danish & quotes, guillemets \\
- dutch & -- \\
- english & american, british\\
- finnish & -- \\
- french & quotes, quotes\*, guillemets, guillemets\*\\
- german & quotes, guillemets, swiss \\
- greek & -- \\
- italian & guillemets, quotes \\
- norwegian & guillemets, quotes \\
- portuguese & portuguese, brazilian \\
- russian & -- \\
- spanish & spanish, mexican \\
- swedish & quotes, guillemets, guillemets\*\\
- \bottomrule
-\end{tabularx}
-\caption[Styles and Variants]{Quote Styles and Style Variants Defined by Default}
-\label{tab:sty}
+ \tablesetup
+ \begin{tabularx}{\columnwidth}{@{}P@{}X@{}}
+ \toprule
+ \multicolumn{1}{@{}H}{Quote style} & \multicolumn{1}{@{}H}{Style variants} \\
+ \cmidrule(r){1-1}\cmidrule{2-2}
+ austrian & quotes, guillemets \\
+ croatian & quotes, guillemets, guillemets\* \\
+ czech & quotes, guillemets \\
+ danish & quotes, guillemets \\
+ dutch & -- \\
+ english & american, british \\
+ finnish & -- \\
+ french & quotes, quotes\*, guillemets, guillemets\* \\
+ german & quotes, guillemets, swiss \\
+ greek & -- \\
+ italian & guillemets, quotes \\
+ norwegian & guillemets, quotes \\
+ portuguese & portuguese, brazilian \\
+ russian & -- \\
+ serbian & quotes, guillemets, german \\
+ spanish & spanish, mexican \\
+ swedish & quotes, guillemets, guillemets\* \\
+ \bottomrule
+ \end{tabularx}
+ \caption[Styles and Variants]{Quote Styles and Style Variants Defined by Default}
+ \label{tab:sty}
\end{table}
\subsection{Defining Quote Styles}
@@ -686,46 +691,31 @@
\end{ltxsyntax}
\begin{table}
-\tablesetup
-\begin{tabularx}{\columnwidth}{@{}Q@{}X@{}Q@{}X@{}}
- \toprule
- \multicolumn{1}{@{}H}{Alias} & \multicolumn{1}{@{}H}{Backend style or alias} &
- \multicolumn{1}{@{}H}{Alias} & \multicolumn{1}{@{}H}{Backend style or alias} \\
- \cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule(r){3-3}\cmidrule{4-4}
- american & english/american &
- newzealand & english/british \\
- australian & english/british &
- ngerman & german \\
- austrian & austrian/quotes &
- norsk & norwegian \\
- brazil & brazilian &
- norwegian & norwegian/guillemets \\
- brazilian & portuguese/brazilian &
- nswissgerman & swissgerman \\
- british & english/british &
- nynorsk & norwegian \\
- canadian & english/american &
- portuges & portuguese \\
- croatian & croatian/quotes &
- portuguese & portuguese/portuguese \\
- danish & danish/quotes &
- spanish & spanish/spanish \\
- english & english/american &
- swedish & swedish/quotes \\
- french & french/quotes &
- swiss & german/swiss \\
- german & german/quotes &
- swissgerman & german/swiss \\
- italian & italian/guillemets &
- UKenglish & british \\
- mexican & spanish/mexican &
- USenglish & american \\
- naustrian & austrian &
- \\
- \bottomrule
-\end{tabularx}
-\caption[Language Aliases]{Language Aliases Defined by Default}
-\label{tab:als}
+ \tablesetup
+ \begin{tabularx}{\columnwidth}{@{}Q@{}X@{}Q@{}X@{}}
+ \toprule
+ \multicolumn{1}{@{}H}{Alias} & \multicolumn{1}{@{}H}{Backend style or alias} &
+ \multicolumn{1}{@{}H}{Alias} & \multicolumn{1}{@{}H}{Backend style or alias} \\
+ \cmidrule(r){1-1}\cmidrule(r){2-2}\cmidrule(r){3-3}\cmidrule{4-4}
+ american & english/american & newzealand & english/british \\
+ australian & english/british & ngerman & german \\
+ austrian & austrian/quotes & norsk & norwegian \\
+ brazil & brazilian & norwegian & norwegian/guillemets \\
+ brazilian & portuguese/brazilian & nswissgerman & swissgerman \\
+ british & english/british & nynorsk & norwegian \\
+ canadian & english/american & portuges & portuguese \\
+ croatian & croatian/quotes & portuguese & portuguese/portuguese \\
+ danish & danish/quotes & serbian & serbian/quotes \\
+ english & english/american & spanish & spanish/spanish \\
+ french & french/quotes & swedish & swedish/quotes \\
+ german & german/quotes & swiss & german/swiss \\
+ italian & italian/guillemets & swissgerman & german/swiss \\
+ mexican & spanish/mexican & UKenglish & british \\
+ naustrian & austrian & USenglish & american \\
+ \bottomrule
+ \end{tabularx}
+ \caption[Language Aliases]{Language Aliases Defined by Default}
+ \label{tab:als}
\end{table}
\subsection{Defining Package Options}
@@ -1051,7 +1041,7 @@
You may redefine the above hooks to change the format of the printed output. For example, if you prefer replacements to be indicated by «[\textellipsis text]» rather than «[\textellipsis\unkern] [text]», redefine \cmd{mktextelpins} accordingly:
\begin{ltxcode}
-\newcommand{<<\mktextelpins>>}[1]{[\textellipsis #1]}
+\renewcommand{<<\mktextelpins>>}[1]{[\textellipsis #1]}
\end{ltxcode}
%
The \cmd{unkern} in the default definitions is required because \cmd{textellipsis} adds asymmetric kerning by default. The kerning after the final dot is similar to the spacing between the dots, which is fine if \cmd{textellipsis} is followed by any text, but undesirable if it is enclosed in brackets.
@@ -1553,8 +1543,33 @@
\begin{changelog}
+\begin{release}{5.2j}{2019-12-04}
+\item Fix issue with some combinations of language and document class
+\item Added support for Latin quotations
+\end{release}
+
+
+\begin{release}{5.2i}{2019-12-02}
+\item Fix issue with \cmd{csq@mainlang}
+\end{release}
+
+\begin{release}{5.2h}{2019-11-15}
+\item Fix issue with \cmd{langname}
+\end{release}
+
+\begin{release}{5.2g}{2019-11-14}
+\item Fix issue with \cmd{languagename}
+\end{release}
+
+\begin{release}{5.2f}{2019-11-11}
+\item Added language option \opt{serbian}\see{opt:opt}
+\item Improved \sty{polyglossia} support\see{opt:opt}
+\end{release}
+
\begin{release}{5.2d}{2018-04-13}
\item Update for \LaTeX{} kernel changes in 2018
+\item Added language option \opt{estonian}\see{opt:opt}
+\item Added language option \opt{polish}\see{opt:opt}
\end{release}
\begin{release}{5.2c}{2018-02-11}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csquotes.doc.tlpobj new/tlpkg/tlpobj/csquotes.doc.tlpobj
--- old/tlpkg/tlpobj/csquotes.doc.tlpobj 2019-02-28 03:30:33.000000000 +0100
+++ new/tlpkg/tlpobj/csquotes.doc.tlpobj 2019-12-07 01:54:24.000000000 +0100
@@ -1,6 +1,6 @@
name csquotes.doc
category Package
-revision 47564
+revision 53041
shortdesc doc files of csquotes
relocated 1
docfiles size=103
++++++ csquotes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csquotes/csq-compat.def new/tex/latex/csquotes/csq-compat.def
--- old/tex/latex/csquotes/csq-compat.def 2018-05-02 19:53:44.000000000 +0200
+++ new/tex/latex/csquotes/csq-compat.def 2019-12-07 00:10:42.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{csq-compat.def}
- [2018/04/113 v5.2d csquotes backwards compatibility (JAW)]
+ [2019-12-06 v5.2j csquotes backwards compatibility (JAW)]
\def\csq@getversion#1{%
\expandafter\csq@getversion@i
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csquotes/csquotes.def new/tex/latex/csquotes/csquotes.def
--- old/tex/latex/csquotes/csquotes.def 2018-05-02 19:53:44.000000000 +0200
+++ new/tex/latex/csquotes/csquotes.def 2019-12-07 00:10:42.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{csquotes.def}
- [2018/04/13 v5.2d csquotes generic definitions (JAW)]
+ [2019-12-06 v5.2j csquotes generic definitions (JAW)]
% Set defaults
@@ -159,6 +159,11 @@
{\guillemotright}
{\textquotedblleft}
{\textquotedblright}
+\DeclareQuoteStyle{hungarian}
+ {\quotedblbase}
+ {\textquotedblright}
+ {\guillemotright}
+ {\guillemotleft}
\DeclareQuoteStyle{icelandic}
{\quotedblbase}
{\textquotedblleft}
@@ -227,6 +232,24 @@
{\guillemotright}
{\quotedblbase}
{\textquotedblleft}
+\DeclareQuoteStyle[quotes]{serbian}% verified
+ {\quotedblbase}
+ {\textquotedblright}
+ [0.05em]
+ {\textquoteright}
+ {\textquoteright}
+\DeclareQuoteStyle[guillemets]{serbian}% verified
+ {\guillemotright}
+ {\guillemotleft}
+ [0.025em]
+ {\textquoteright}
+ {\textquoteright}
+\DeclareQuoteStyle[german]{serbian}% verified
+ {\quotedblbase}
+ {\textquotedblleft}
+ [0.05em]
+ {\textquoteright}
+ {\textquoteright}
\DeclareQuoteStyle[mexican]{spanish}
{\textquotedblleft}
{\textquotedblright}
@@ -296,9 +319,16 @@
\DeclareQuoteAlias[guillemets]{polish}{polish}
\DeclareQuoteAlias[brazilian]{portuguese}{brazilian}
\DeclareQuoteAlias[portuguese]{portuguese}{portuguese}
+\DeclareQuoteAlias[quotes]{serbian}{serbian}
\DeclareQuoteAlias[mexican]{spanish}{mexican}
\DeclareQuoteAlias[spanish]{spanish}{spanish}
\DeclareQuoteAlias[quotes]{swedish}{swedish}
+\DeclareQuoteAlias{italian}{latin/italianguillemets}
+\DeclareQuoteAlias[italianguillemets]{latin}{latin}
+\DeclareQuoteAlias{german}{latin/germanquotes}
+\DeclareQuoteAlias[guillemets]{german}{latin/germanguillemets}
+\DeclareQuoteAlias{british}{latin/britishquotes}
+\DeclareQuoteAlias{american}{latin/americanquotes}
% Babel aliases
@@ -307,12 +337,14 @@
\DeclareQuoteAlias{brazilian}{brazil}
\DeclareQuoteAlias{british}{UKenglish}
\DeclareQuoteAlias{british}{ukenglish}
+\DeclareQuoteAlias{hungarian}{magyar}
\DeclareQuoteAlias{german}{ngerman}
\DeclareQuoteAlias{austrian}{naustrian}
\DeclareQuoteAlias{swissgerman}{nswissgerman}
\DeclareQuoteAlias{norwegian}{norsk}
\DeclareQuoteAlias{norwegian}{nynorsk}
\DeclareQuoteAlias{portuguese}{portuges}
+\DeclareQuoteAlias{serbian}{serbianc}
% Language options
@@ -325,6 +357,7 @@
\DeclareQuoteOption{german}
\DeclareQuoteOption{icelandic}
\DeclareQuoteOption{italian}
+\DeclareQuoteOption{latin}
\DeclareQuoteOption{latvian}
\DeclareQuoteOption{norwegian}
\DeclareQuoteOption{polish}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csquotes/csquotes.sty new/tex/latex/csquotes/csquotes.sty
--- old/tex/latex/csquotes/csquotes.sty 2018-05-02 19:53:44.000000000 +0200
+++ new/tex/latex/csquotes/csquotes.sty 2019-12-07 00:10:42.000000000 +0100
@@ -1,5 +1,5 @@
% Copyright (c) 2003-2011 Philipp Lehman.
-% (c) 2015-2018 Joseph Wright.
+% (c) 2015-2019 Joseph Wright.
%
% Permission is granted to copy, distribute and/or modify this
% software under the terms of the LaTeX Project Public License
@@ -12,7 +12,7 @@
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{csquotes}
- [2018/04/13 v5.2d context-sensitive quotations (JAW)]
+ [2019-12-06 v5.2j context-sensitive quotations (JAW)]
%% Compatibility and requirements
@@ -207,6 +207,9 @@
\protected\def\csq@warning#1{%
\PackageWarning{csquotes}{#1}}
+\protected\def\csq@warning@noline#1{%
+ \PackageWarningNoLine{csquotes}{#1}}
+
\protected\def\csq@info#1{%
\iftoggle{csq@quiet}
{}
@@ -779,32 +782,46 @@
\def\csq@resetstyle{%
\ifnum\csq@reset=\@ne
- \ifx\csq@currentstyle\languagename
- \else
- \ifcsundef{csq@qstyle@\languagename}
- {\csq@warn@style\languagename
- \csq@setstyle{fallback}}
- {\csq@setstyle{\languagename}}%
- \fi
+ \ifundef\babelname
+ {\ifundef\languagename
+ {\csq@warn@multilang{Cannot detect current language}}
+ {\csq@resetstyle@i{\languagename}}}%
+ {\csq@resetstyle@i{\babelname}}%
+ \fi}
+
+\def\csq@resetstyle@i#1{%
+ \ifx\csq@currentstyle#1\relax
+ \else
+ \ifcsundef{csq@qstyle@#1}
+ {\csq@warn@style#1
+ \csq@setstyle{fallback}}
+ {\csq@setstyle{#1}}%
\fi}
\def\csq@savelang{%
\ifdef\csq@mainlang
{}
- {\edef\csq@mainlang{\languagename}}}
+ {\ifdef\babelname
+ {\edef\csq@mainlang{\babelname}}
+ {\ifdef\languagename
+ {\edef\csq@mainlang{\languagename}}
+ {\csq@warn@multilang{Cannot detect main document language}}}}}
+
+\newcommand*{\csq@otherlang@star}{\csuse{otherlanguage*}}
+\newcommand*{\csq@otherlang@star@end}{\csuse{endotherlanguage*}}
\def\csq@resetlang{%
\ifdef\csq@mainlang
- {\csuse{otherlanguage*}{\csq@mainlang}%
+ {\expandafter\csq@otherlang@star\expandafter{\csq@mainlang}%
\let\csq@resetlang\relax}
{}}
\protected\long\def\csq@switchlang#1{%
\ifdef\csq@mainlang
{\begingroup
- \csuse{otherlanguage*}{\csq@mainlang}%
+ \expandafter\csq@otherlang@star\expandafter{\csq@mainlang}%
#1%
- \csuse{endotherlanguage*}%
+ \csq@otherlang@star@end
\endgroup}
{#1}}
@@ -812,9 +829,9 @@
\def\csq@lang#1{%
\csq@savelang
- \lowercase{\csuse{otherlanguage*}{#1}}}
+ \lowercase{\csq@otherlang@star{#1}}}
\def\csq@endlang{%
- \csuse{endotherlanguage*}}
+ \csq@otherlang@star@end}
\def\csq@nolang#1{%
\begingroup
@@ -1139,10 +1156,10 @@
{\csq@getpunct{%
\ifboolexpr{ bool {inner} and bool {hmode} }
{\csq@bquote@ii}
- {\ifbool{csdisplay}
- {\csq@bquote@i}
- {\iftoggle{csq@parbox}\csq@bquote@ii\csq@bquote@i}}%
- {#1}{#2}{#3}{#4}{#5}{#6}}}}
+ {\ifbool{csdisplay}
+ {\csq@bquote@i}
+ {\iftoggle{csq@parbox}\csq@bquote@ii\csq@bquote@i}}%
+ {#1}{#2}{#3}{#4}{#5}{#6}}}}
% {<init>}{<endinit>}{<citehook>}{<cite>}{<punct>}{<text>}{<apunct>}<tpunct>
@@ -1325,8 +1342,8 @@
{\ifdimgreater\lastskip\z@
{\unskip\unspace}
{\ifnumgreater\lastpenalty\z@
- {\unpenalty\unspace}
- {}}}
+ {\unpenalty\unspace}
+ {}}}
{}}
% {<punct>}{<cite>}
@@ -1762,8 +1779,8 @@
\def\@inpenc@undefined@##1{\def\inputencodingname{##1}}%
\@inpenc@undefined
\ifdefstring\inputencodingname{utf8}
- {\aftergroup\@firstoftwo}
- {\aftergroup\@secondoftwo}%
+ {\aftergroup\@firstoftwo}
+ {\aftergroup\@secondoftwo}%
\endgroup}}}
{\def\csq@ifutfenc{%
\csq@ifucs
@@ -2138,7 +2155,7 @@
\def\openinnerquote{\csq@pdf@oiqmark}%
\def\closeinnerquote{\csq@pdf@ciqmark}}
-%% Author interface to internal marks
+%% Author interface to internal marks
\newrobustcmd*{\initoquote}{%
\csq@resetstyle
@@ -2250,7 +2267,14 @@
\@ifpackageloaded{polyglossia}
{\@ifpackagelater{polyglossia}{2009/11/20}
{\let\@frenchquotespace\@empty}
- {}}
+ {}%
+ \@ifpackagelater{polyglossia}{2019/10/27}
+ {}
+ {\csq@warning@noline{%
+ Outdated 'polyglossia' version detected.\MessageBreak
+ csquotes works best with 'polyglossia' v1.45\MessageBreak
+ (2019/10/27) or above, but you are using\MessageBreak
+ '\csuse{ver(a)polyglossia.sty}'}}}
{}}
% German
@@ -2392,19 +2416,21 @@
{\csq@info{Checking for multilingual support..}%
\@ifpackageloaded{polyglossia}
{\csq@info{... found 'polyglossia' package}%
- \def\csq@main@language{\xpg@main@language}%
- \csq@hook@multilang}
+ \ifundef\mainbabelname
+ {\def\csq@main@language{\xpg@main@language}}
+ {\def\csq@main@language{\mainbabelname}}%
+ \csq@hook@multilang}
{\@ifpackageloaded{babel}
- {\csq@info{... found 'babel' package}%
+ {\csq@info{... found 'babel' package}%
\def\csq@main@language{\bbl@main@language}%
\csq@hook@multilang}
- {\csq@info{... none found}%
+ {\csq@info{... none found}%
\csq@hook@nomultilang}}}
{\@ifpackageloaded{polyglossia}
{}
{\@ifpackageloaded{babel}
- {}
- {\csq@hook@nomultilang}}}%
+ {}
+ {\csq@hook@nomultilang}}}%
\undef\csq@hook@multilang
\undef\csq@hook@nomultilang
\@ifpackageloaded{hyperref}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csquotes.tlpobj new/tlpkg/tlpobj/csquotes.tlpobj
--- old/tlpkg/tlpobj/csquotes.tlpobj 2019-02-28 03:30:34.000000000 +0100
+++ new/tlpkg/tlpobj/csquotes.tlpobj 2019-12-07 01:54:24.000000000 +0100
@@ -1,6 +1,6 @@
name csquotes
category Package
-revision 47564
+revision 53041
shortdesc Context sensitive quotation facilities
relocated 1
longdesc This package provides advanced facilities for inline and
@@ -17,13 +17,14 @@
longdesc well as the optional active quotes are freely configurable. The
longdesc package is dependent on e-TeX, and requires the author's
longdesc etoolbox package.
-runfiles size=23
+depend etoolbox
+runfiles size=25
RELOC/tex/latex/csquotes/csq-compat.def
RELOC/tex/latex/csquotes/csquotes.cfg
RELOC/tex/latex/csquotes/csquotes.def
RELOC/tex/latex/csquotes/csquotes.sty
catalogue-ctan /macros/latex/contrib/csquotes
-catalogue-date 2018-04-13 09:47:11 +0200
+catalogue-date 2019-12-06 17:13:27 +0100
catalogue-license lppl1.3c
catalogue-topics quote-marks etex
-catalogue-version 5.2d
+catalogue-version 5.2j
++++++ css-colors.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/css-colors.doc.tlpobj new/tlpkg/tlpobj/css-colors.doc.tlpobj
--- old/tlpkg/tlpobj/css-colors.doc.tlpobj 2019-02-28 03:30:34.000000000 +0100
+++ new/tlpkg/tlpobj/css-colors.doc.tlpobj 2020-03-24 01:57:17.000000000 +0100
@@ -1,6 +1,6 @@
name css-colors.doc
category Package
-revision 43961
+revision 54512
shortdesc doc files of css-colors
relocated 1
docfiles size=521
++++++ css-colors.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/css-colors.tlpobj new/tlpkg/tlpobj/css-colors.tlpobj
--- old/tlpkg/tlpobj/css-colors.tlpobj 2019-02-28 03:30:35.000000000 +0100
+++ new/tlpkg/tlpobj/css-colors.tlpobj 2020-03-24 01:57:18.000000000 +0100
@@ -1,6 +1,6 @@
name css-colors
category Package
-revision 43961
+revision 54512
shortdesc Named colors for web-safe design
relocated 1
longdesc This package defines web-safe colors for use with D.P.
@@ -9,7 +9,6 @@
runfiles size=2
RELOC/tex/latex/css-colors/css-colors.sty
catalogue-ctan /macros/latex/contrib/css-colors
-catalogue-date 2018-01-06 12:14:59 +0100
-catalogue-license lpplgpl
+catalogue-license lppl gpl
catalogue-topics colour
catalogue-version 1.02
++++++ cstex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/cstex/opmac-d.tex new/doc/cstex/opmac-d.tex
--- old/doc/cstex/opmac-d.tex 2019-03-13 21:57:13.000000000 +0100
+++ new/doc/cstex/opmac-d.tex 2020-02-13 23:10:16.000000000 +0100
@@ -8,7 +8,7 @@
% UTF-8 encTeX has a conflict with DocByTeX
\chyph
-\def\projectversion{Mar. 2019}
+\def\projectversion{July 2019}
\def\headtitle{OPmac}
\widowpenalty=10000
@@ -1647,39 +1647,62 @@
\inext{Blue}{\empty}{+-}
-Makro \db setcmykcolor "{<CMYK barva>}" nastav� po�adovanou barvu.
+OPmac preferuje barevn� model CMYK, proto je v��e pou�ito k definici barev
+makro \db setcmykcolor. Je ov�em mo�n� pou��t tak� \db setrgbcolor, co� na RGB
+za��zen�ch (monitorech) d� skoro jist� j�sav�j�� barvy. M��ete tedy marka
+pro jednotliv� barvy p�edefinovat, nap�. "\def\Red{\setrgbcolor{1 0 0}}",
+ale je vhodn� oba barevn� modely v jednom dokumentu nem�chat. Tisk�rny
+p�ij�maj� jedin� CMYK, ide�ln� i s konkr�tn�m barevn�m profilem.
+
+\inext{setcmykcolor}{setrgbcolor}{++}
+
+Makra \db formatcmyk a \db formatrgb p�ipravuj� argument s po�adovanou
+barvou do form�tu podle PDF standardu, tj. nap�. "1 1 0 0 k 1 1 0 0 K"
+v p��pad� CMYK a barvy modr�.
+Pov�imn�te si, �e se sou�asn�
+pracuje s barvou textu "<c> <m> <y> <k> k" i s barvou tenk�ch linek
+"<c> <m> <y> <k> K".
+Pon�kud jin� standard je pak pou�it v souboru
+"opmac-xetex.tex" p�i pou�it� Xe\TeX{}u.
+Ve "\write" p��kazech se sice
+makra "\formatcmyk" a "\setcmykcolor" expanduj�, ale expanze se zastav�
+u "\setcolor", proto�e toto makro je deklarov�no pomoc� "\addprotect".
+
+\inext{formatcmyk}{\empty}{+-}
+
+Makro \db setcolor "{<barva>}" nastav� po�adovanou barvu.
Nejprve p�epne makro "\ensureblacko" do aktivn�ho stavu. V tomto stavu makro
setrv� pr�v� tehdy, kdy� je v dokumentu pou�it aspo� jednou p�ep�na� barvy.
-D�le makro "\setcmykcolor" nastav� p�i
+D�le makro "\setcolor" nastav� p�i
"\localcolorfalse" barvu p��mo a p�i "\localocolortrue" barvu vlo�� do
z�sobn�ku a pomoc� "\aftergroup" zajist� n�vrat k p�vodn� hodnot�.
-Nav�c nastav� na odpov�daj�c� hodnotu makro \db currentcolor.
+Nav�c nastav� na odpov�daj�c� hodnotu makro "\currentcolor".
-\inext{setcmykcolor}{^^B\cbrace}{++}
+\inext{setcolor}{^^B\cbrace}{++}
-Makro "\currentcolor" je nastaveno na v�choz� hodnotu \db pdfblackcolor
+Makro \db currentcolor je nastaveno na v�choz� hodnotu \db pdfblackcolor
\inext{pdfblackcolor}{currentcolor}{++}
Makro \db ensureblacko "{<sazba>}" je pou�ito pro sazbu z�hlav� a z�pat� ve
v�stupn� rutin� v~makru "\opmacoutput". Implicitn� se "\ensureblacko{<sazba>}" chov�
stejn� jako samotn� "<sazba>", ale po pou�it� p�ep�na�e barvy
-"\setcmykcolor" za�ne fungovat jako \db ensureblackoA, co� zajist� bravu
+"\setcolor" za�ne fungovat jako \db ensureblackoA, co� zajist� bravu
"<sazby>" v~�ern�m. Je to provedeno tak, �e je na za��tku "<sazby>"
alokov�na nov� �rove� z�sobn�ku barev s v�choz� �ernou barvou a na konci
"<sazby>" je tato �rove� z�sobn�ku ukon�ena.
\inext{ensureblacko}{\empty}{+-}
-Makra \db colorstackpush "{<CMYK barva>}" a \db colorstackpop implementuj�
+Makra \db colorstackpush "{<barva>}" a \db colorstackpop implementuj�
pr�ci se z�sobn�kem barev za pou�it� odpov�daj�c�ch \TeX{}ov�ch primitiv�.
+Je pou�it implicitn� inicializovan� z�sobn�k \db colorstackcnt k s ��slem nula
+(d�kuji P. Krajn�kovi za tip).
Nen�-li p��tomen pdf\TeX{} ve verzi aspo� 1.40, je barva nastavena pomoc�
"\pdfliteral" (co� v komplikovan�j��ch p��padech p�i p�echodu na dal��
str�nky nefunguje spr�vn�), jinak je pou�it "\pdfcolorstack", kter� je
-inicializov�n pomoc� "\pdfcolorstackinit". Pov�imn�te si, �e se sou�asn�
-pracuje s barvou textu "<c> <m> <y> <k> k" i s barvou tenk�ch linek
-"<c> <m> <y> <k> K".
-Kone�n� makro \db colorstackset "{<CMYK barva>}" nastavuje barvu p��mo s
+inicializov�n pomoc� "\pdfcolorstackinit".
+Kone�n� makro \db colorstackset "{<barva>}" nastavuje barvu p��mo s
um�st�n�m t�to bravy na vrchol z�sobn�ku m�sto bravy p�edchoz�.
\inext{pdfcolorstack}{\empty}{+-}
@@ -2081,12 +2104,12 @@
\inext{scantabdata}{^^B\cbrace}{++}
-Pomocn� makra \db scantabdataA a \db scantabdataB
+Pomocn� makra \db scantabdataA, \db scantabdataB a \db scantabdataE
�e�� p��pady, kdy deklar�tor nem� nebo m� parametr. D�le makra
\db scantabdataC a \db scantabdataD se staraj� o p��padn� opakov�n� �seku
deklarace.
-\inext{scantabdataA}{^^B\cbrace}{++}
+\inext{scantabdataA}{scantabdataE}{++}
OPmac p�eddefinuje �ty�i "<deklar�tory>" pro sloupce tabulky, sice "<znaky>"
"c", "l", "r", "p" v~makrech \db tabdeclarec, \db tabdeclarel, \db
@@ -2173,9 +2196,10 @@
Makro \db mspan "<��slo>[<deklarace>]{<text>}" p�ekon� "<��slo>" sloupc� a
d�le "<text>" v tomto prostoru form�tuje podle "<deklarace>". K tomu ��elu
-provede "\multispan" pomoc� "\loop" v \db mspanA a d�le p�iprav� t�lo
-form�tovac�ho makra postupn�m �ten�m deklarace pomoc� \db mspanB. V z�v�ru
-je toto t�lo pou�ito v~makru "\tmpa", kter� je nakonec spu�t�no.
+provede "\multispan" pomoc� "\loop" v \db mspanA a d�le
+vytvo�� lok�ln� tabulku "\halign" s jedn�m sloupcem podle deklarace. Na
+konci makra "\mspanA" pot�ebujeme z�skat vznikl� "\hbox" a rozbalit ho
+pomoc� "\unhbox".
\inext{mspan}{\empty}{+-}
@@ -2267,33 +2291,35 @@
\subsec Pozn�mky pod �arou a na okraji str�nek
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-Makro \db fnote p�edpokl�d�, �e spr�vn� ��slo pozn�mky na dan� str�nce je
+Makro "\fnote" p�edpokl�d�, �e spr�vn� ��slo pozn�mky na dan� str�nce je
p�ipraveno v makru "\fn:<��slo>", kde "<��slo>" je celkov� ��slo pozn�mky nap���
cel�m dokumentem sledovan� glob�ln�m ��ta�em \db fnotenum.
-Makro ohl�s� svou existenci do REF souboru z�znamem "\Xfnote" (bez
+
+\inext{fnotenum}{\empty}{+-}
+
+Makro "\fnote" ohl�s� svou existenci do REF souboru z�znamem "\Xfnote" (bez
parametru). D�le vytiskne zna�ku pomoc� "\fnmarkx" a ve skupin� p�ejde na
men�� sazbu a zavol� plain\TeX{}ov� makro "\vfootnote", kter� vlo�� sazbu
pomoc� tzv. insertu (TBN, kapitola~6.7). Plain\TeX{}ov� nastaven� t�to
-t��dy insertu nen� makrem OPmac nijak m�n�no.
+t��dy insertu nen� makrem OPmac nijak m�n�no. To v�e je �e�eno v intern�m makru
+\db fnoteG "{<zna�ka>}{<text>}".
-\inext{fnotenum}{^^B\cbrace}{++}
+\inext{fnoteG}{^^B\cbrace}{++}
+
+Kone�n� makro \db fnote je implementov�no pomoc� "\fnoteG" se zna�kou
+"\fnmarkx" zat�mco makro \db fnotetext d�l� to sam�, ale zna�ka v textu je
+pr�zdn�.
+
+\inext{fnote}{fnotetext}{++}
Makro \db fnotemark p�i�te lok�ln� k "\fnotenum" sv�j parametr a vytiskne
odpov�daj�c� zna�ku. Cel� pr�ce makra prob�h� ve skupin�, tak�e po ukon�en�
makra se "\fnotenum" vr�t� do sv� p�vodn� hodnoty.
-
-\inext{fnotemark}{^^B\cbrace}{++}
-
-Makro \db fnotetext teprve zvedne ��ta� "\fnotenum" glob�ln� a vytiskne
-pozn�mku pomoc� plain\TeX{}ov�ho "\vfootnote".
-
-\inext{fnotetext}{^^B\cbrace}{++}
-
Makro \db fnmarkx vytiskne otazn�k nebo \db thefnote. P�edpokl�d� se, �e si
u�ivatel p�edefinuje "\thefnote" k obrazu sv�mu. Lok�ln� ��slo pozn�mky na
str�nce m� p�ipraveno v makru \db locfnum.
-\inext{fnmarkx}{\empty}{+-}
+\inext{fnotemark}{\empty}{+-}
P�i �ten� REF souboru se pro ka�dou stranu p�e�te nejprve "\Xpage", co�
je makro, kter� pronuluje \db fnotenumlocal.
Binary files old/doc/cstex/opmac-u-en.pdf and new/doc/cstex/opmac-u-en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/cstex/opmac-u-en.tex new/doc/cstex/opmac-u-en.tex
--- old/doc/cstex/opmac-u-en.tex 2019-03-22 16:55:47.000000000 +0100
+++ new/doc/cstex/opmac-u-en.tex 2019-06-04 23:24:07.000000000 +0200
@@ -789,11 +789,14 @@
To avoid the problems with narrow left-right aligned paragraphs you can write
"p{<size>\raggedright}", then the paragraph will be only left aligned.
+You can use "(<text>)" in the "<declaration>" then this text is applied in
+each line of table. For example "r(\kern10pt)l" adds more 10 pt space
+between "r" and "l" rows.
+
An arbitrary part of the "<declaration>" can be repeated by a "<number>"
prefixed. For example ``"3c"'' means ``"ccc"'' or ``"c 3{|c}"'' means
``"c|c|c|c"''. Note that spaces in the <declaration> are ignored and you
-can use them in
-order to more legibility.
+can use them in order to more legibility.
The command "\cr" used in the "<data>" part of the table (the end row
separator) is generally known.
@@ -830,9 +833,9 @@
If there is an item which spans to more than one column in the table then you can use
"\multispan{<number>}" macro from plain \TeX{} or "\mspan<number>[<declaration>]{<text>}"
from OPmac, which spans <number> columns and formats the <text> by the
-<declaration>. The <declaration> must include exactly one letter ``"c"'' or
-``"l"'' or ``"r"'' and may include characters ``"|"''
-for vertical rules. If your table includes vertical rules and you want to
+<declaration>. The <declaration> must include a declaration of right one column
+with the same syntax as comon "\table" <declaration>.
+If your table includes vertical rules and you want to
create continuous vertical rules by "\mspan", then use rules in
only after ``"c"'', ``"l"'' or ``"r"'' letter in "\mspan" <declaration>. The
exception is only in the case when "\mspan" includes first
Binary files old/doc/cstex/opmac-u.pdf and new/doc/cstex/opmac-u.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/cstex/opmac-u.tex new/doc/cstex/opmac-u.tex
--- old/doc/cstex/opmac-u.tex 2019-03-22 16:55:47.000000000 +0100
+++ new/doc/cstex/opmac-u.tex 2019-06-04 23:24:07.000000000 +0200
@@ -985,6 +985,10 @@
hned za <rozměr> přidat třeba "\raggedright" a odstavec bude formátován
s~nezarovnaným pravým okrajem, například "p{42mm\raggedright}".
+Pokud v <deklaraci> použijete "(<text>)", je tento text aplikován v každém
+řádku tabulky v~místě odpovídajícím umístění v <deklaraci>. Například "r(\kern10pt)l"
+vloží mezi sloupce "r" a "l" dodatečnou desetibodovou mezeru.
+
V <deklaraci> je možné místo opakování stejného deklarátoru použít číslo
následované deklarátorem, tedy třeba "4c" je totéž jako "cccc". Opakovat se
mohou celé úseky <deklarace>, pokud za číslem pokračuje úsek ve svorkách.
@@ -1060,12 +1064,12 @@
Chcete-li přesáhnout jedním údajem více sloupců tabulky, můžete použít
plain\TeX{}ové makro "\multispan{<číslo>}" nebo makro z OPmac
"\mspan<číslo>[<deklarace>]{<text>}", které přesáhne <číslo> sloupců a <text>
-v tomto prostoru formátuje podle <deklarace>, která obsahuje právě jedno
-písmeno "c", "l" nebo "r" (označující způsob formátování) a dále může obsahovat
-jeden nebo více znaků "|" (označující svislé čáry). Máte-li v tabulce svislé čáry
+v tomto prostoru formátuje podle <deklarace>, která obsahuje deklaraci právě
+jednoho sloupce podle stejných pravidel jako je <deklarace> "\table".
+Máte-li v~tabulce svislé čáry
a chcete, aby svislé čáry z "\mspan" na ně navazovaly, pak použijte v
"\mspan" čáry před údajem "c", "l" nebo "r" jedině v případě, že "\mspan" zasahuje do
-prvního sloupce. V ostatních případech používejte čáry výhradně na konci
+prvního sloupce. V~ostatních případech používejte čáry výhradně na konci
<deklarace>, protože každý sloupec (s výjimkou prvního) přidává případné
svislé čáry jen na svůj konec.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cstex.doc.tlpobj new/tlpkg/tlpobj/cstex.doc.tlpobj
--- old/tlpkg/tlpobj/cstex.doc.tlpobj 2019-03-24 02:24:10.000000000 +0100
+++ new/tlpkg/tlpobj/cstex.doc.tlpobj 2020-02-14 01:54:47.000000000 +0100
@@ -1,6 +1,6 @@
name cstex.doc
category Package
-revision 50527
+revision 53767
shortdesc doc files of cstex
relocated 1
docfiles size=1156
++++++ csvsimple.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csvsimple/CHANGES new/doc/latex/csvsimple/CHANGES
--- old/doc/latex/csvsimple/CHANGES 2016-07-02 00:04:23.000000000 +0200
+++ new/doc/latex/csvsimple/CHANGES 2019-05-05 20:07:04.000000000 +0200
@@ -1,7 +1,7 @@
-%% The LaTeX package csvsimple - version 1.20 (2016/07/01)
+%% The LaTeX package csvsimple - version 1.21 (2019/04/09)
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2008-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2008-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -102,3 +102,8 @@
'filter strcmp', 'filter not strcmp'
- code optimizations
- documentation revised
+
+version 1.21 (2019/04/09):
+- spurious blank in sorting code removed
+- package 'pgfrcs' added as required package
+- (#3): introduction augmented with additional hints for first time users
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csvsimple/README new/doc/latex/csvsimple/README
--- old/doc/latex/csvsimple/README 2016-07-02 00:04:23.000000000 +0200
+++ new/doc/latex/csvsimple/README 2019-05-05 20:07:04.000000000 +0200
@@ -1,7 +1,7 @@
-%% The LaTeX package csvsimple - version 1.20 (2016/07/01)
+%% The LaTeX package csvsimple - version 1.21 (2019/04/09)
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2008-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2008-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
Binary files old/doc/latex/csvsimple/csvsimple-example.pdf and new/doc/latex/csvsimple/csvsimple-example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csvsimple/csvsimple-example.tex new/doc/latex/csvsimple/csvsimple-example.tex
--- old/doc/latex/csvsimple/csvsimple-example.tex 2016-07-02 00:04:23.000000000 +0200
+++ new/doc/latex/csvsimple/csvsimple-example.tex 2019-05-05 20:07:04.000000000 +0200
@@ -1,8 +1,8 @@
-%% The LaTeX package csvsimple - version 1.20 (2016/07/01)
+%% The LaTeX package csvsimple - version 1.21 (2019/04/09)
%% csvsimple-example.tex: an example for csvsimple
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2008-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2008-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
Binary files old/doc/latex/csvsimple/csvsimple.pdf and new/doc/latex/csvsimple/csvsimple.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/csvsimple/csvsimple.tex new/doc/latex/csvsimple/csvsimple.tex
--- old/doc/latex/csvsimple/csvsimple.tex 2016-07-02 00:04:23.000000000 +0200
+++ new/doc/latex/csvsimple/csvsimple.tex 2019-05-05 20:07:04.000000000 +0200
@@ -1,10 +1,10 @@
% \LaTeX-Main\
% !TeX encoding=UTF-8
-%% The LaTeX package csvsimple - version 1.20 (2016/07/01)
+%% The LaTeX package csvsimple - version 1.21 (2019/04/09)
%% csvsimple.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2008-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2008-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -124,8 +124,8 @@
pdfkeywords={csv file, comma separated values, key value syntax}
}
-\def\version{1.20}%
-\def\datum{2016/07/01}%
+\def\version{1.21}%
+\def\datum{2019/04/09}%
\makeindex
@@ -166,20 +166,35 @@
The |csvsimple| package is applied to the processing of
CSV\footnote{CSV file: file with comma separated values.} files.
This processing is controlled by key value assignments according to the
-syntax of |pgfkeys| \cite{tantau:2015a}. Sample applications of the package
+syntax of |pgfkeys| \cite{tantau:tikz}. Sample applications of the package
are tabular lists, serial letters, and charts.
-An alternative to |csvsimple| is the |datatool| package \cite{talbot:2016a}
+An alternative to |csvsimple| is the |datatool| package \cite{talbot:datatool}
which provides considerably more functions and allows sorting of data by \LaTeX.
|csvsimple| has a different approach for the user interface and
is deliberately restricted to some basic functions with fast
-processing speed. Sorting is not supported directly but can be done
-with external tools, see Section~\ref{sec:Sorting} on page~\pageref{sec:Sorting}.
+processing speed.
+
+Mind the following restrictions:
+\begin{itemize}
+\item Sorting is not supported directly but can be done
+ with external tools, see \Fullref{sec:Sorting}.
+\item Values are expected to be comma separated, but the package
+ provides support for other separators, see \Fullref{sec:separators}.
+\item Values are expected to be not quoted or quoted with
+ curly braces |{}| of \TeX\ groups. Other quotes like doublequotes
+ are not supported directly, but can be achieved
+ with external tools, see \Fullref{sec:importeddata}.
+\item Every data line is expected to contain the same amount of values.
+ Unfeasible data lines are silently ignored by default, but this can
+ be configured, see \Fullref{sec:consistency}.
+\end{itemize}
+
\subsection{Loading the Package}
The package |csvsimple| loads the packages
-|pgfkeys| \cite{tantau:2015a},
-|etoolbox| \cite{lehmann:2015a},
+|pgfkeys| \cite{tantau:tikz},
+|etoolbox| \cite{lehmannwright:etoolbox},
and |ifthen| \cite{carlisle:2014c}.
|csvsimple| itself is loaded in the usual manner in the preamble:
\begin{dispListing}
@@ -191,6 +206,8 @@
and
|booktabs| \cite{fear:2016a}.
+
+\clearpage
\subsection{First Steps}
Every line of a processable CSV file has to contain an identical amount of
comma\footnote{See \refKey{/csv/separator} for other separators than comma.} separated values. The curly braces |{}| of \TeX\ groups can be used
@@ -211,7 +228,7 @@
\csvlisting{grade}
-
+\smallskip
The most simple way to display a CSV file in tabular form is the processing
with the \refCom{csvautotabular} command.
@@ -237,6 +254,7 @@
\end{dispExample}
+\clearpage
|\csvreader| is controlled by a plenty of options. For example, for table
applications line breaks are easily inserted by
\refKey{/csv/late after line}. This defines a macro execution just before
@@ -253,6 +271,7 @@
\end{tabular}
\end{dispExample}
+\smallskip
An even more comfortable and preferrable way to create a table is setting
appropriate option keys. Note, that this gives you the possibility to create a
|pgfkeys| style which contains the whole table creation.
@@ -265,7 +284,7 @@
{\thecsvrow & \firstname~\name & \matnumber}%
\end{dispExample}
-\clearpage
+\smallskip
The next example shows such a style definition with the convenience macro
\refCom{csvstyle}. Here, we see again the automated assignment of header
entries to column names by \refKey{/csv/head to column names}.
@@ -284,6 +303,7 @@
\end{dispExample}
+\clearpage
Another way to address columns is to use their roman numbers.
The direct addressing is done by |\csvcoli|, |\csvcolii|, |\csvcoliii|, \ldots:
@@ -295,6 +315,7 @@
{\thecsvrow & \csvcolii~\csvcoli & \csvcoliii}%
\end{dispExample}
+\smallskip
And yet another method to assign macros to columns is to use arabic numbers
for the assignment:
@@ -306,7 +327,7 @@
{\thecsvrow & \firstname~\name & \matnumber}%
\end{dispExample}
-\clearpage
+\smallskip
For recurring applications, the |pgfkeys| syntax allows to create own styles
for a consistent and centralized design. The following example is easily
modified to obtain more or less option settings.
@@ -327,6 +348,7 @@
\end{dispExample}
+\clearpage
Alternatively, column names can be set by \refCom{csvnames}
and style definitions by \refCom{csvstyle}.
With this, the last example is rewritten as follows:
@@ -344,7 +366,7 @@
{\thecsvrow & \firstname~\name & \grade}%
\end{dispExample}
-\clearpage
+\smallskip
The data lines of a CSV file can also be filtered. In the following example,
a certificate is printed only for students with grade unequal to 5.0.
@@ -640,7 +662,7 @@
\end{docCommand}
-\begin{docCommand}[doc updated=2016-00-00]{csvlinetotablerow}{}
+\begin{docCommand}[doc updated=2016-07-01]{csvlinetotablerow}{}
Typesets the current processed data line with |&| between the entries.
%Most users will never apply this command.
\end{docCommand}
@@ -757,8 +779,7 @@
\end{dispExample}
Additional command definition keys are provided for the supported tables,
-see section \ref{subsec:tabsupport} from page
-\pageref{subsec:tabsupport}.
+see Section~\ref{subsec:tabsupport} from page~\pageref{subsec:tabsupport}.
\subsection{Header Processing and Column Name Assignment}%
@@ -797,11 +818,11 @@
\clearpage
-\subsection{Consistency Check}%
+\subsection{Consistency Check}\label{sec:consistency}%
\begin{docCsvKey}{check column count}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
- This key defines, if the number of entries in a data line is checked against
- an expected value.\\
+ This key defines, wether the number of entries in a data line is checked against
+ an expected value or not.\\
If |true|, every non consistent line is ignored without announcement.\\
If |false|, every line is accepted and may produce an error during
further processing.
@@ -834,7 +855,7 @@
\clearpage
\subsection{Filtering}%
-\begin{docCsvKey}[][doc new=2016-00-00]{filter test}{=\meta{condition}}{no default}
+\begin{docCsvKey}[][doc new=2016-07-01]{filter test}{=\meta{condition}}{no default}
Only data lines which fulfill a logical \meta{condition} are accepted.
For the \meta{condition}, every single test normally employed like
\begin{dispListing}
@@ -844,7 +865,7 @@
\begin{dispListing}
filter test=\iftest{some testing},
\end{dispListing}
- For |\iftest|, tests from the |etoolbox| package \cite{lehmann:2015a} like
+ For |\iftest|, tests from the |etoolbox| package \cite{lehmannwright:etoolbox} like
|\ifnumcomp|, |\ifdimgreater|, etc. and from \Fullref{sec:stringtests} can be used.
\begin{dispExample}
@@ -873,10 +894,10 @@
\end{docCsvKey}
-\begin{docCsvKey}[][doc new=2016-00-00]{filter expr}{=\meta{condition}}{no default}
+\begin{docCsvKey}[][doc new=2016-07-01]{filter expr}{=\meta{condition}}{no default}
Only data lines which fulfill a logical \meta{condition} are accepted.
For the \meta{condition}, every boolean expression
- from the |etoolbox| package \cite{lehmann:2015a} is feasible.
+ from the |etoolbox| package \cite{lehmannwright:etoolbox} is feasible.
To preprocess the data line before testing the \meta{condition},
the option key \refKey{/csv/before filter} can be used.
\begin{dispExample}
@@ -893,7 +914,7 @@
\end{docCsvKey}
\clearpage
-\begin{docCsvKey}[][doc new=2016-00-00]{filter ifthen}{=\meta{condition}}{no default}
+\begin{docCsvKey}[][doc new=2016-07-01]{filter ifthen}{=\meta{condition}}{no default}
Only data lines which fulfill a logical \meta{condition} are accepted.
For the \meta{condition}, every term from the |ifthen| \cite{carlisle:2014c} package
is feasible.
@@ -949,7 +970,7 @@
\enlargethispage*{2cm}
-\begin{docCsvKey}[][doc new=2016-00-00]{full filter}{=\meta{code}}{no default}
+\begin{docCsvKey}[][doc new=2016-07-01]{full filter}{=\meta{code}}{no default}
Technically, this key is an alias for \refKey{/csv/before filter}.
Philosophically, \refKey{/csv/before filter} computes something before
a filter condition is set, but \refKey{/csv/full filter} should implement
@@ -1147,7 +1168,7 @@
\end{docCsvKey}
\clearpage
-\subsection{Separators}%
+\subsection{Separators}\label{sec:separators}%
\begin{docCsvKey}{separator}{=\meta{sign}}{no default, initially |comma|}
\catcode `|=12
Sets the \meta{sign} which is treates as separator between the data values
@@ -1277,7 +1298,7 @@
This allows to access an external tool for sorting.
\emph{Which tool} is your choice.
-\csvsorter\ \cite{sturm:2014j}
+\csvsorter\ \cite{sturm:csvsorter}
was written as a companion tool for |csvsimple|.
It is an open source Java command-line tool for sorting CSV files, available at\\
\url{http://T-F-S.github.io/csvsorter/}\quad or\quad
@@ -1289,7 +1310,7 @@
following options.
\begin{enumerate}\bfseries
-\item To use the sorting options, you have to install \csvsorter\ \cite{sturm:2014j} before!\\
+\item To use the sorting options, you have to install \csvsorter\ \cite{sturm:csvsorter} before!\\
|csvsimple| v1.12 or newer needs \csvsorter\ v0.94 of newer!
\item You have to give permission to call external tools during
compilation, i.\,e.\ the command-line options for |latex| have to include
@@ -1436,7 +1457,7 @@
\section{String Tests}\label{sec:stringtests}%
The following string tests are complementing the string tests
-from the |etoolbox| \cite{lehmann:2015a} package. They all do the same, i.e.,
+from the |etoolbox| \cite{lehmannwright:etoolbox} package. They all do the same, i.e.,
comparing expanded strings for equality.
\begin{itemize}
\item\refCom{ifcsvstrcmp} is the most efficient method, because it uses
@@ -1449,7 +1470,7 @@
\end{itemize}
\medskip
-\begin{docCommand}[doc new=2016-00-00]{ifcsvstrcmp}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}}
+\begin{docCommand}[doc new=2016-07-01]{ifcsvstrcmp}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}}
Compares two strings and executes \meta{true} if they are equal, and \meta{false} otherwise.
The comparison is done using |\pdfstrcmp|, if compilation is done with pdf\LaTeX.
The comparison is done using |\pdf@strcmp|, if the package |pdftexcmds| is
@@ -1459,18 +1480,18 @@
\end{docCommand}
-\begin{docCommand}[doc new=2016-00-00]{ifcsvnotstrcmp}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}}
+\begin{docCommand}[doc new=2016-07-01]{ifcsvnotstrcmp}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}}
Compares two strings and executes \meta{true} if they are \emph{not} equal, and \meta{false} otherwise.
The implementation uses \refCom{ifcsvstrcmp}.
\end{docCommand}
-\begin{docCommand}[doc new=2016-00-00]{ifcsvstrequal}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}}
+\begin{docCommand}[doc new=2016-07-01]{ifcsvstrequal}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}}
Compares two strings and executes \meta{true} if they are equal, and \meta{false} otherwise.
The strings are expanded with |\edef| in the test.
\end{docCommand}
-\begin{docCommand}[doc new=2016-00-00]{ifcsvprostrequal}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}}
+\begin{docCommand}[doc new=2016-07-01]{ifcsvprostrequal}{\marg{stringA}\marg{stringB}\marg{true}\marg{false}}
Compares two strings and executes \meta{true} if they are equal, and \meta{false} otherwise.
The strings are expanded with |\protected@edef| in the test, i.e. parts of the
strings which are protected stay unexpanded.
@@ -1734,10 +1755,10 @@
\csvlisting{data_numbers}
-The |siunitx| \cite{wright:2016a} package provides a new column type |S|
+The |siunitx| \cite{wright:siuntix} package provides a new column type |S|
which can align material using a number of different strategies.
The following example demonstrates the application with CSV reading.
-The package documentation \cite{wright:2016a} contains a huge amount
+The package documentation \cite{wright:siuntix} contains a huge amount
of formatting options.
\begin{dispExample}
@@ -1758,7 +1779,7 @@
the line reading code of |csvsimple| which actually is present at the
first column. To avoid this problem, the content of the first column
could be formatted not by the table format definition, but by using a
-suitable |\tablenum| formatting directly, see |siunitx| \cite{wright:2016a}.
+suitable |\tablenum| formatting directly, see |siunitx| \cite{wright:siuntix}.
Another and very nifty workaround suggested by Enrico Gregorio is to
add an invisible dummy column with |c@{}| as first column:
@@ -1863,7 +1884,7 @@
\clearpage
-\subsection{Imported CSV data}\label{importeddata}%
+\subsection{Imported CSV data}\label{sec:importeddata}%
If data is imported from other applications, there is not always a choice
to format in comma separated values with curly brackets.
@@ -1998,12 +2019,12 @@
% Actually, it is not a good idea to include the references like this!
% Do not follow this bad example ...
\begin{tcbverbatimwrite}{\jobname.bib}
-@manual{tantau:2015a,
+@manual{tantau:tikz,
author = {Till Tantau},
title = {The TikZ and PGF Packages},
- subtitle = {Manual for version 3.0.1a},
+ subtitle = {Manual for version 3.1.2},
url = {http://mirrors.ctan.org/graphics/pgf/base/doc/pgfmanual.pdf},
- date = {2015-08-29},
+ date = {2019-04-04},
}
@manual{carlisle:2014c,
@@ -2015,19 +2036,20 @@
}
-@manual{talbot:2016a,
- author = {Nicola L. C. Talbot},
- title = {User Manual for the datatool bundle version 2.25},
- url = {http://mirrors.ctan.org/macros/latex/contrib/datatool/datatool-user.pdf},
- date = {2016-01-18},
+@manual{talbot:datatool,
+ author = {Nicola L. C. Talbot},
+ title = {User Manual for the datatool bundle version 2.31},
+ url = {http://mirrors.ctan.org/macros/latex/contrib/datatool/datatool-user.pdf},
+ date = {2018-12-07},
+ language = {english}
}
-@manual{sturm:2014j,
+@manual{sturm:csvsorter,
author = {Thomas F. Sturm},
title = {The CSV-Sorter program},
- subtitle = {Manual for version 0.94 beta},
+ subtitle = {Manual for version 0.95 beta},
url = {http://T-F-S.github.io/csvsorter/csvsorter.pdf},
- date = {2014-07-14},
+ date = {2018-01-11},
language = {english}
}
@@ -2048,19 +2070,19 @@
language = {english}
}
-@manual{wright:2016a,
+@manual{wright:siuntix,
author = {Joseph Wright},
title = {siunitx --- A comprehensive (SI) units package},
url = {http://mirror.ctan.org/macros/latex/contrib/siunitx/siunitx.pdf},
- date = {2016-03-01},
+ date = {2018-05-17},
language = {english}
}
-@manual{lehmann:2015a,
+@manual{lehmannwright:etoolbox,
author = {Philipp Lehman and Joseph Wright},
title = {The etoolbox Package},
url = {http://mirror.ctan.org/macros/latex/contrib/etoolbox/etoolbox.pdf},
- date = {2015-08-02},
+ date = {2018-08-19},
}
\end{tcbverbatimwrite}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csvsimple.doc.tlpobj new/tlpkg/tlpobj/csvsimple.doc.tlpobj
--- old/tlpkg/tlpobj/csvsimple.doc.tlpobj 2019-02-28 03:30:38.000000000 +0100
+++ new/tlpkg/tlpobj/csvsimple.doc.tlpobj 2019-05-06 01:38:21.000000000 +0200
@@ -1,9 +1,9 @@
name csvsimple.doc
category Package
-revision 41597
+revision 51010
shortdesc doc files of csvsimple
relocated 1
-docfiles size=243
+docfiles size=246
RELOC/doc/latex/csvsimple/CHANGES
RELOC/doc/latex/csvsimple/README
RELOC/doc/latex/csvsimple/amountsort.xml
++++++ csvsimple.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/csvsimple/csvsimple.sty new/tex/latex/csvsimple/csvsimple.sty
--- old/tex/latex/csvsimple/csvsimple.sty 2016-07-02 00:04:23.000000000 +0200
+++ new/tex/latex/csvsimple/csvsimple.sty 2019-05-05 20:07:04.000000000 +0200
@@ -1,8 +1,8 @@
-%% The LaTeX package csvsimple - version 1.20 (2016/07/01)
+%% The LaTeX package csvsimple - version 1.21 (2019/04/09)
%% csvsimple.sty: Simple LaTeX CSV file processing
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2008-2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2008-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,9 +18,9 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{csvsimple}[2016/07/01 version 1.20 LaTeX CSV file processing]
+\ProvidesPackage{csvsimple}[2019/04/09 version 1.21 LaTeX CSV file processing]
-\RequirePackage{pgfkeys,ifthen,etoolbox,shellesc}
+\RequirePackage{pgfrcs,pgfkeys,ifthen,etoolbox,shellesc}
%---- general
@@ -148,7 +148,7 @@
\def\csv@preprocessor@csvsorter#1#2#3{%
\begingroup%
- \typeout{<sort \csv@passivquotes#2\csv@passivquotes\space by \csv@passivquotes#1\csv@passivquotes>}
+ \typeout{<sort \csv@passivquotes#2\csv@passivquotes\space by \csv@passivquotes#1\csv@passivquotes>}%
\immediate\openout\csv@out=\csv@csvsorter@token%
\immediate\write\csv@out{\string\makeatletter\string\csv@error{Call of CSV-Sorter failed! Use '-shell-escape' option or check log file '\csv@csvsorter@log'.}{}}%
\immediate\closeout\csv@out%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/csvsimple.tlpobj new/tlpkg/tlpobj/csvsimple.tlpobj
--- old/tlpkg/tlpobj/csvsimple.tlpobj 2019-02-28 03:30:39.000000000 +0100
+++ new/tlpkg/tlpobj/csvsimple.tlpobj 2019-05-06 01:38:22.000000000 +0200
@@ -1,19 +1,20 @@
name csvsimple
category Package
-revision 41597
+revision 51010
shortdesc Simple CSV file processing
relocated 1
longdesc The package provides a simple LaTeX interface for the
longdesc processing of files with comma separated values (CSV); it
longdesc relies on the key value syntax supported by pgfkeys to simplify
-longdesc usage. Filtering and table generation is especially supported;
+longdesc usage. Filtering and table generation are especially supported;
longdesc however, this lightweight tool offers no support for data
-longdesc sorting or data base storage.
+longdesc sorting or data base storage. The package depends on etoolbox,
+longdesc ifthen, pgfrcs, pgfkeys, and shellesc.
runfiles size=7
RELOC/tex/latex/csvsimple/csvsimple.sty
catalogue-also csvtools datatool
catalogue-ctan /macros/latex/contrib/csvsimple
-catalogue-date 2016-07-01 18:34:08 +0200
+catalogue-date 2019-04-28 12:45:29 +0200
catalogue-license lppl1.3
catalogue-topics data-import data-disp csv-support
-catalogue-version 1.20
+catalogue-version 1.21
++++++ ctan-o-mat.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ctan-o-mat.1 new/texmf-dist/doc/man/man1/ctan-o-mat.1
--- old/texmf-dist/doc/man/man1/ctan-o-mat.1 2017-11-25 21:59:19.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ctan-o-mat.1 2019-07-08 19:37:34.000000000 +0200
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -54,16 +54,20 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
-.if !\nF .nr F 0
-.if \nF>0 \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{\
+. if \nF \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
-. if !\nF==2 \{\
-. nr % 0
-. nr F 2
+. if !\nF==2 \{\
+. nr % 0
+. nr F 2
+. \}
. \}
.\}
+.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
Binary files old/texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf and new/texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat new/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat
--- old/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat 2019-07-08 19:37:34.000000000 +0200
@@ -0,0 +1,21 @@
+#/bin/sh
+##-----------------------------------------------------------------------------
+## This file is part of ctan-o-mat.
+## This program is distributed under BSD-like license. See file LICENSE
+##
+## (c) 2016-2017 Gerd Neugebauer
+##
+## Net: gene(a)gerd-neugebauer.de
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of a 3-clause BSD-like license as stated in the
+## file LICENSE contained in this distribution.
+##
+## You should have received a copy of the LICENSE along with this
+## program; if not, see the repository under http://***.
+##
+##-----------------------------------------------------------------------------
+
+exec perl "$0.pl" "$@"
+
+#
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.bat new/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.bat
--- old/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.bat 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.bat 2019-07-08 19:37:34.000000000 +0200
@@ -0,0 +1,21 @@
+@echo off
+@rem --------------------------------------------------------------------------
+@rem This file is part of ctan-o-mat.
+@rem This program is distributed under BSD-like license. See file LICENSE
+@rem
+@rem (c) 2016-2017 Gerd Neugebauer
+@rem
+@rem Net: gene(a)gerd-neugebauer.de
+@rem
+@rem This program is free software; you can redistribute it and/or modify
+@rem it under the terms of a 3-clause BSD-like license as stated in the
+@rem file LICENSE contained in this distribution.
+@rem
+@rem You should have received a copy of the LICENSE along with this
+@rem program; if not, see the repository under http://***.
+@rem
+@rem --------------------------------------------------------------------------
+
+"perl ctan-o-mat.pl %*"
+
+@rem --------------------------------------------------------------------------
Binary files old/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.pdf and new/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctan-o-mat.doc.tlpobj new/tlpkg/tlpobj/ctan-o-mat.doc.tlpobj
--- old/tlpkg/tlpobj/ctan-o-mat.doc.tlpobj 2019-02-28 03:30:39.000000000 +0100
+++ new/tlpkg/tlpobj/ctan-o-mat.doc.tlpobj 2019-07-09 01:53:26.000000000 +0200
@@ -1,12 +1,15 @@
name ctan-o-mat.doc
category Package
-revision 46938
+revision 51578
shortdesc doc files of ctan-o-mat
-docfiles size=16
+docfiles size=26
texmf-dist/doc/man/man1/ctan-o-mat.1
texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf
texmf-dist/doc/support/ctan-o-mat/LICENSE
texmf-dist/doc/support/ctan-o-mat/README.md
+ texmf-dist/doc/support/ctan-o-mat/ctan-o-mat
+ texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.bat
+ texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.pdf
texmf-dist/doc/support/ctan-o-mat/ctan-o-mat.pkg
texmf-dist/doc/support/ctan-o-mat/lib/md2ltx.pl
texmf-dist/doc/support/ctan-o-mat/makefile
++++++ ctan-o-mat.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/ctan-o-mat/ctan-o-mat new/texmf-dist/scripts/ctan-o-mat/ctan-o-mat
--- old/texmf-dist/scripts/ctan-o-mat/ctan-o-mat 2018-03-13 00:04:35.000000000 +0100
+++ new/texmf-dist/scripts/ctan-o-mat/ctan-o-mat 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-#/bin/sh
-##-----------------------------------------------------------------------------
-## This file is part of ctan-o-mat.
-## This program is distributed under BSD-like license. See file LICENSE
-##
-## (c) 2016-2017 Gerd Neugebauer
-##
-## Net: gene(a)gerd-neugebauer.de
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of a 3-clause BSD-like license as stated in the
-## file LICENSE contained in this distribution.
-##
-## You should have received a copy of the LICENSE along with this
-## program; if not, see the repository under http://***.
-##
-##-----------------------------------------------------------------------------
-
-exec perl "$0.pl" "$@"
-
-#
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctan-o-mat.tlpobj new/tlpkg/tlpobj/ctan-o-mat.tlpobj
--- old/tlpkg/tlpobj/ctan-o-mat.tlpobj 2019-02-28 03:30:39.000000000 +0100
+++ new/tlpkg/tlpobj/ctan-o-mat.tlpobj 2019-07-09 01:53:26.000000000 +0200
@@ -1,6 +1,6 @@
name ctan-o-mat
category Package
-revision 46938
+revision 51578
shortdesc Upload or validate a package for CTAN
longdesc This program can be used to automate the upload of a package to
longdesc CTAN. The description of the package is contained in a
@@ -16,8 +16,7 @@
longdesc validation retrieves the known attributes and the basic
longdesc constraints from the server.
depend ctan-o-mat.ARCH
-runfiles size=6
- texmf-dist/scripts/ctan-o-mat/ctan-o-mat
+runfiles size=5
texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
catalogue-contact-bugs https://github.com/ge-ne/ctan-o-mat/issues
catalogue-contact-home https://github.com/ge-ne/ctan-o-mat
++++++ ctanbib.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/ctanbib.man1.pdf and new/texmf-dist/doc/man/man1/ctanbib.man1.pdf differ
Binary files old/texmf-dist/doc/support/ctanbib/ctanbib-doc.pdf and new/texmf-dist/doc/support/ctanbib/ctanbib-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/ctanbib/ctanbib-doc.tex new/texmf-dist/doc/support/ctanbib/ctanbib-doc.tex
--- old/texmf-dist/doc/support/ctanbib/ctanbib-doc.tex 2019-03-11 23:03:21.000000000 +0100
+++ new/texmf-dist/doc/support/ctanbib/ctanbib-doc.tex 2019-09-21 23:52:54.000000000 +0200
@@ -18,6 +18,7 @@
\section{Introduction}
This package provides script named \package{ctanbib} which can be used for retrieving of the bibliographic information for packages hosted on CTAN.
+
\section{Usage}
@@ -26,6 +27,8 @@
\noindent\package{ctanbib [options] $\langle$packagename$\rangle$ > filename.bib}
+The \texttt{curl} utility needs to be installed on the user's system in order to support the package info download.
+
\section{Available options}
@@ -96,6 +99,11 @@
\section{Changelog}
\begin{changelog}
+ \change{2019-09-21}{Try to find the author in full CTAN author list if the author cannot be found in the package info}
+ \change{2019-09-16}{Use the CTAN API 2.0 to fetch the package info}
+ \change{2019-05-04}{Version 0.1c released}
+ \change{2019-05-04}{Use the \texttt{curl} command to download the package info}
+ \change{2019-05-04}{Added information about the need to have the \texttt{curl} command installed}
\change{2019-03-11}{Version 0.1b released}
\change{2018-09-10}{Added support for institutional names}
\change{2018-09-10}{Escape TeX commands in the title and subtitle}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctanbib.doc.tlpobj new/tlpkg/tlpobj/ctanbib.doc.tlpobj
--- old/tlpkg/tlpobj/ctanbib.doc.tlpobj 2019-03-12 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/ctanbib.doc.tlpobj 2019-09-22 01:55:47.000000000 +0200
@@ -1,6 +1,6 @@
name ctanbib.doc
category Package
-revision 50340
+revision 52145
shortdesc doc files of ctanbib
docfiles size=17
texmf-dist/doc/man/man1/ctanbib.1
++++++ ctanbib.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/ctanbib/ctanbib new/texmf-dist/scripts/ctanbib/ctanbib
--- old/texmf-dist/scripts/ctanbib/ctanbib 2019-03-11 23:03:21.000000000 +0100
+++ new/texmf-dist/scripts/ctanbib/ctanbib 2019-09-21 23:52:54.000000000 +0200
@@ -27,7 +27,7 @@
]])
os.exit(1)
elseif arg[1]=="--version" or arg[1]=="-v" then
- print "ctanbib version v0.1b"
+ print "ctanbib version 0.1d"
os.exit(1)
elseif arg[1]=="--ctan" or arg[1]=="-c" then
table.remove(arg, 1)
@@ -35,7 +35,8 @@
end
local pkgname = arg[1]
-local url = "https://www.ctan.org/xml/pkg/" .. pkgname
+local url = "https://www.ctan.org/xml/2.0/pkg/" .. pkgname .. "?author-name=true"
+local authors_url = "https://ctan.org/xml/2.0/authors"
-- change that for different title scheme
local titleformat = "The %s package"
@@ -56,7 +57,8 @@
local load_xml = function(url)
- local command = io.popen("wget -qO- ".. url,"r")
+ -- local command = io.popen("wget -qO- ".. url,"r")
+ local command = io.popen("curl -sS ".. url,"r")
local info = command:read("*all")
command:close()
@@ -75,18 +77,52 @@
end)
end
+-- we need to use this method temporarily because of a bug in
+-- CTAN API
+local author_list
+local fetch_author_list = function()
+ if author_list then return author_list end
+ local authors = load_xml(authors_url)
+ author_list = {}
+ for _, author in ipairs(authors:query_selector("author")) do
+ -- save all authors under they ID
+ local id = author:get_attribute("id")
+ author_list[id] = author
+ end
+ return author_list
+end
+
+local process_author = function(author)
+ local current = {}
+ current[#current+1] = author:get_attribute("familyname")
+ current[#current+1] = author:get_attribute("givenname")
+ -- the author is an organization
+ if #current == 1 then
+ return "{" .. current[1] .. "}"
+ elseif #current > 1 then
+ return table.concat(current, ", ")
+ end
+ return nil -- no author
+end
+
+-- get the author name and surname
+local get_author = function(author)
+ local name = process_author(author)
+ if name then return name end
+ -- if the package XML doesn't contain author name,
+ -- we need to fetch the authors list from CTAN and find
+ -- it here
+ local author_list = fetch_author_list()
+ local id = author:get_attribute("id")
+ -- try to find the author id in list of authors
+ -- if everything fails, just return an empty group
+ return process_author(author_list[id]) or "{}"
+end
+
local get_authors = function(a)
local retrieved_authors = {}
for _, author in ipairs(a) do
- local current = {}
- current[#current+1] = author:get_attribute("familyname")
- current[#current+1] = author:get_attribute("givenname")
- -- the author is an organization
- if #current == 1 then
- table.insert(retrieved_authors, "{" .. current[1] .. "}")
- else
- table.insert(retrieved_authors, table.concat(current, ", "))
- end
+ table.insert(retrieved_authors, get_author(author))
end
return table.concat(retrieved_authors," and ")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctanbib.tlpobj new/tlpkg/tlpobj/ctanbib.tlpobj
--- old/tlpkg/tlpobj/ctanbib.tlpobj 2019-03-12 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/ctanbib.tlpobj 2019-09-22 01:55:47.000000000 +0200
@@ -1,6 +1,6 @@
name ctanbib
category Package
-revision 50340
+revision 52145
shortdesc Export CTAN entries to bib format
longdesc This package provides a Lua script which can be used for
longdesc retrieving bibliographic information in BibLaTeX format for
@@ -12,7 +12,7 @@
catalogue-contact-bugs https://github.com/michal-h21/ctanbib/issues
catalogue-contact-repository https://github.com/michal-h21/ctanbib
catalogue-ctan /support/ctanbib
-catalogue-date 2019-03-11 20:15:45 +0100
+catalogue-date 2019-09-21 20:28:25 +0200
catalogue-license lppl1.3
catalogue-topics bibtex-gen ctan luatex use-lua
-catalogue-version 0.1b
+catalogue-version 0.1d
++++++ ctex.doc.tar.xz ++++++
Binary files old/doc/latex/ctex/ctex.pdf and new/doc/latex/ctex/ctex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctex.doc.tlpobj new/tlpkg/tlpobj/ctex.doc.tlpobj
--- old/tlpkg/tlpobj/ctex.doc.tlpobj 2019-04-08 01:39:33.000000000 +0200
+++ new/tlpkg/tlpobj/ctex.doc.tlpobj 2019-11-08 01:55:55.000000000 +0100
@@ -1,8 +1,8 @@
name ctex.doc
category Package
-revision 50843
+revision 52683
shortdesc doc files of ctex
relocated 1
-docfiles size=261
+docfiles size=262
RELOC/doc/latex/ctex/README.md
RELOC/doc/latex/ctex/ctex.pdf
++++++ ctex.tar.xz ++++++
++++ 1908 lines of diff (skipped)
++++++ ctie.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ctie.1 new/texmf-dist/doc/man/man1/ctie.1
--- old/texmf-dist/doc/man/man1/ctie.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ctie.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH CTIE 1 "7 April 2010" "Web2C 2019"
+.TH CTIE 1 "7 April 2010" "Web2C 2020"
.\"=====================================================================
.SH NAME
ctie \- merge or apply CWEB change files
Binary files old/texmf-dist/doc/man/man1/ctie.man1.pdf and new/texmf-dist/doc/man/man1/ctie.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ctie.doc.tlpobj new/tlpkg/tlpobj/ctie.doc.tlpobj
--- old/tlpkg/tlpobj/ctie.doc.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/ctie.doc.tlpobj 2020-03-04 23:50:31.000000000 +0100
@@ -1,6 +1,6 @@
name ctie.doc
category TLCore
-revision 50602
+revision 54070
shortdesc doc files of ctie
docfiles size=6
texmf-dist/doc/man/man1/ctie.1
++++++ curve2e.doc.tar.xz ++++++
++++ 1761 lines of diff (skipped)
++++++ curve2e.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/curve2e/curve2e-v161.sty new/tex/latex/curve2e/curve2e-v161.sty
--- old/tex/latex/curve2e/curve2e-v161.sty 2019-03-30 22:26:00.000000000 +0100
+++ new/tex/latex/curve2e/curve2e-v161.sty 2020-01-18 22:21:16.000000000 +0100
@@ -6,12 +6,9 @@
%%
%% curve2e.dtx (with options: `v161')
%%
-%% Copyright (C) 2005--2019 Claudio Beccari all rights reserved.
+%% Copyright (C) 2005--2020 Claudio Beccari all rights reserved.
%% License information appended
%%
-
-
-
\NeedsTeXFormat{LaTeX2e}[2016/01/01]
\ProvidesPackage{curve2e-v161}%
[2019/02/07 v.1.61 Extension package for pict2e]
@@ -889,16 +886,15 @@
%%
-%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
%% this license is at: http://www.latex-project.org/lppl.txt
%%
-%% This work is "author-maintained"
+%% This work is "maintained"
%%
%% This work consists of file curve2e.dtx, and the derived files
%% curve2e.sty and curve2e.pdf, plus the auxiliary derived files
-%% README.txt and manifest.txt.
+%% README.txt and curve2e-v161.sty.
%%
%%
%% End of file `curve2e-v161.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/curve2e/curve2e.sty new/tex/latex/curve2e/curve2e.sty
--- old/tex/latex/curve2e/curve2e.sty 2019-03-30 22:26:00.000000000 +0100
+++ new/tex/latex/curve2e/curve2e.sty 2020-04-12 00:22:35.000000000 +0200
@@ -6,20 +6,17 @@
%%
%% curve2e.dtx (with options: `package')
%%
-%% Copyright (C) 2005--2019 Claudio Beccari all rights reserved.
+%% Copyright (C) 2005--2020 Claudio Beccari all rights reserved.
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2019/01/01]
\ProvidesPackage{curve2e}%
- [2019-03-29 v.2.0.1 Extension package for pict2e]
-
-
-
+ [2020-04-02 v.2.2.6 Extension package for pict2e]
\IfFileExists{xfp.sty}{%
- \RequirePackage{color}
- \RequirePackageWithOptions{pict2e}[2014/01/01]
- \@ifl@aded{sty}{xparse}{}{\RequirePackage{xparse}}
- \@ifl@aded{sty}{xfp}{}{\RequirePackage{xfp}}%
+ \RequirePackage{color}
+ \RequirePackageWithOptions{pict2e}[2014/01/01]
+ \@ifl@aded{sty}{xparse}{}{\RequirePackage{xparse}}
+ \@ifl@aded{sty}{xfp}{}{\RequirePackage{xfp}}%
}{%
\RequirePackage{curve2e-v161}%
\PackageWarningNoLine{curve2e}{%
@@ -35,6 +32,15 @@
***************************************\MessageBreak}%
\endinput
}
+\ExplSyntaxOn
+\AtBeginDocument{%
+\ProvideExpandableDocumentCommand\fptest{m m m}{%
+ \fp_compare:nTF{#1}{#2}{#3}}
+\ProvideExpandableDocumentCommand\fpdowhile{m m}{%
+ \fp_do_while:nn{#1}{#2}}
+}
+\ExplSyntaxOff
+
\def\TRON{\tracingcommands\tw@ \tracingmacros\tw@}%
\def\TROF{\tracingcommands\z@ \tracingmacros\z@}%
\ifx\undefined\@tdA \newdimen\@tdA \fi
@@ -48,7 +54,8 @@
\@wholewidth#1\@halfwidth.5\@wholewidth\ignorespaces}%
\newcommand\defaultlinethickness[1]{\defaultlinewidth=#1\relax
\def\thicklines{\linethickness{\defaultlinewidth}}%
-\def\thinlines{\linethickness{.5\defaultlinewidth}}\thinlines \ignorespaces}%
+\def\thinlines{\linethickness{.5\defaultlinewidth}}\thinlines
+ \ignorespaces}%
\def\LIne(#1){{\GetCoord(#1)\@tX\@tY
\moveto(0,0)
\pIIe@lineto{\@tX\unitlength}{\@tY\unitlength}\strokepath}\ignorespaces
@@ -63,86 +70,133 @@
\edef\sc@lelen{\fpeval{1 / abs(\d@mX)}}\relax
\@linelen=\sc@lelen\@linelen
\fi
- \moveto(0,0)
- \pIIe@lineto{\d@mX\@linelen}{\d@mY\@linelen}%
+ \moveto(0,0)\pIIe@lineto{\d@mX\@linelen}{\d@mY\@linelen}%
\strokepath
\fi
\endgroup\ignorespaces}%
-\ifx\Dashline\undefined
- \def\Dashline{\@ifstar{\Dashline@@}{\Dashline@}}
+\let\originalmoveto\moveto
+\let\originallineto\lineto
+\let\originalcurveto\curveto
+
+\def\moveto(#1){\GetCoord(#1)\MTx\MTy
+ \originalmoveto(\MTx,\MTy)\ignorespaces}
+\def\lineto(#1){\GetCoord(#1)\LTx\LTy
+ \originallineto(\LTx,\LTy)\ignorespaces}
+\def\curveto(#1)(#2)(#3){\GetCoord(#1)\CTpx\CTpy
+ \GetCoord(#2)\CTsx\CTsy\GetCoord(#3)\CTx\CTy
+ \originalcurveto(\CTpx,\CTpy)(\CTsx,\CTsy)(\CTx,\CTy)\ignorespaces}
+
+\def\IsPolar#1:#2?{\def\@TempOne{#2}\unless\ifx\@TempOne\empty
+ \expandafter\@firstoftwo\else
+ \expandafter\@secondoftwo\fi}
- \def\Dashline@(#1)(#2)#3{%
- \bgroup
- \countdef\NumA3254\countdef\NumB3252\relax
- \GetCoord(#1)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttA
- \GetCoord(#2)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttB
- \SubVect\V@ttA from\V@ttB to\V@ttC
- \ModOfVect\V@ttC to\DlineMod
- \DivideFN\DlineMod by#3 to\NumD
- \NumA=\fpeval{trunc(\NumD,0)}\relax
- \unless\ifodd\NumA\advance\NumA\@ne\fi
- \NumB=\NumA \divide\NumB\tw@
- \DividE\DlineMod\p@ by\NumA\p@ to\D@shMod
- \DividE\p@ by\NumA\p@ to \@tempa
- \MultVect\V@ttC by\@tempa,0 to\V@ttB
- \MultVect\V@ttB by 2,0 to\V@ttC
- \advance\NumB\@ne
- \edef\@mpt{\noexpand\egroup
- \noexpand\multiput(\V@ttA)(\V@ttC){\number\NumB}%
- {\noexpand\LIne(\V@ttB)}}%
- \@mpt\ignorespaces}%
+\ifx\Dashline\undefined
+ \def\Dashline{\@ifstar{\Dashline@}{\Dashline@}}% bckwd compatibility
\let\Dline\Dashline
- \def\Dashline@@(#1)(#2)#3{\put(#1){\Dashline@(0,0)(#2){#3}}}
+ \def\Dashline@(#1)(#2)#3{\put(#1){%
+ \GetCoord(#1)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttA
+ \GetCoord(#2)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttB
+ \IsPolar#2:?{% Polar
+ \Dashline@@(0,0)(\V@ttB){#3}}%
+ {% Cartesian
+ \SubVect\V@ttA from\V@ttB to\V@ttC
+ \Dashline@@(0,0)(\V@ttC){#3}%
+ }
+}}
+
+ \def\Dashline@@(#1)(#2)#3{%
+ \countdef\NumA3254\countdef\NumB3252\relax
+ \GetCoord(#1)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttA
+ \GetCoord(#2)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttB
+ \SubVect\V@ttA from\V@ttB to\V@ttC
+ \ModOfVect\V@ttC to\DlineMod
+ \DivideFN\DlineMod by#3 to\NumD
+ \NumA=\fpeval{trunc(\NumD,0)}\relax
+ \unless\ifodd\NumA\advance\NumA\@ne\fi
+ \NumB=\NumA \divide\NumB\tw@
+ \DividE\DlineMod\p@ by\NumA\p@ to\D@shMod
+ \DividE\p@ by\NumA\p@ to \@tempa
+ \Multvect{\V@ttC}{\@tempa,0}\V@ttB
+ \Multvect{\V@ttB}{2,0}\V@ttC
+ \advance\NumB\@ne
+ \put(\V@ttA){\multiput(0,0)(\V@ttC){\NumB}{\LIne(\V@ttB)}}
+ \ignorespaces}
\fi
\ifx\Dotline\undefined
- \def\Dotline{\@ifstar{\Dotline@@}{\Dotline@}}
- \def\Dotline@(#1)(#2)#3{%
- \bgroup
- \countdef\NumA 3254\relax \countdef\NumB 3255\relax
- \GetCoord(#1)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttA
- \GetCoord(#2)\@tA\@tB \MakeVectorFrom\@tA\@tB to\V@ttB
- \SubVect\V@ttA from\V@ttB to\V@ttC
- \ModOfVect\V@ttC to\DotlineMod
- \DivideFN\DotlineMod by#3 to\NumD
- \NumA=\fpeval{trunc(\NumD,0)}\relax
- \DivVect\V@ttC by\NumA,0 to\V@ttB
- \advance\NumA\@ne
- \edef\@mpt{\noexpand\egroup
- \noexpand\multiput(\V@ttA)(\V@ttB){\number\NumA}%
- {\noexpand\makebox(0,0){\noexpand\circle*{0.5}}}}%
- \@mpt\ignorespaces}%
-
- \def\Dotline@@(#1)(#2)#3{\put(#1){\Dotline@(0,0)(#2){#3}}}%
+ \providecommand\Dotline{}
+ \RenewDocumentCommand\Dotline{R(){0,0} R(){1,0} m O{1mm}}{%
+ \put(#1){\edef\Diam{\fpeval{{#4}/\unitlength}}%
+ \IsPolar#2:?{\CopyVect#2to\DirDot}%
+ {\SubVect#1from#2to\DirDot}%
+ \countdef\NumA=3254\relax
+ \ModAndAngleOfVect\DirDot to\ModDirDot and\AngDirDot
+ \edef\NumA{\fpeval{trunc(\ModDirDot/{#3},0)}}%
+ \edef\ModDirDot{\fpeval{\ModDirDot/\NumA}}%
+ \multiput(0,0)(\AngDirDot:\ModDirDot){\inteval{\NumA+1}}%
+ {\makebox(0,0){\circle*{\Diam}}}}\ignorespaces}
\fi
\AtBeginDocument{\@ifpackageloaded{eso-pic}{%
\renewcommand\LenToUnit[1]{\strip@pt\dimexpr#1*\p@/\unitlength}}{}}%
-\def\GetCoord(#1)#2#3{%
-\expandafter\SplitNod@\expandafter(#1)#2#3\ignorespaces}
-\def\SplitNod@(#1)#2#3{\isnot@polar#1:!!(#1)#2#3}%
-\def\isnot@polar#1:#2!!{\def\@tempOne{#2}\ifx\@tempOne\empty
-\expandafter\@firstoftwo\else
-\expandafter\@secondoftwo\fi
-{\SplitNod@@}{\SplitPolar@@}}
-
-\def\SplitNod@@(#1,#2)#3#4{\edef#3{#1}\edef#4{#2}}%
-\def\SplitPolar@@(#1:#2)#3#4{\DirFromAngle#1to\@DirA
-\ScaleVect\@DirA by#2to\@DirA
-\expandafter\SplitNod@@\expandafter(\@DirA)#3#4}
+\def\GetCoord(#1)#2#3{\bgroup\edef\x{\egroup\noexpand\IsPolar#1:?}\x
+{% Polar
+ \bgroup\edef\x{\egroup\noexpand\SplitPolar(#1)}\x\SCt@X\SCt@Y}%
+{% Cartesian
+ \bgroup\edef\x{\egroup\noexpand\SplitCartesian(#1)}\x\SCt@X\SCt@Y}%
+ \edef#2{\SCt@X}\edef#3{\SCt@Y}\ignorespaces}
+
+\def\SplitPolar(#1:#2)#3#4{%
+ \edef#3{\fpeval{#2 * cosd#1}}\edef#4{\fpeval{#2 * sind#1}}}
+
+\def\SplitCartesian(#1,#2)#3#4{\edef#3{#1}\edef#4{#2}}
\let\originalput\put
\def\put(#1){\bgroup\GetCoord(#1)\@tX\@tY
\edef\x{\noexpand\egroup\noexpand\originalput(\@tX,\@tY)}\x}
-
-\let\originalmultiput\multiput
-\let\original@multiput\@multiput
-
-\long\def\@multiput(#1)#2#3{\bgroup\GetCoord(#1)\@mptX\@mptY
-\edef\x{\noexpand\egroup\noexpand\original@multiput(\@mptX,\@mptY)}%
-\x{#2}{#3}\ignorespaces}
-
-\gdef\multiput(#1)#2{\bgroup\GetCoord(#1)\@mptX\@mptY
-\edef\x{\noexpand\egroup\noexpand\originalmultiput(\@mptX,\@mptY)}\x(}%)
+\RenewDocumentCommand{\multiput}{O{0,0} d() d() m m o }{%
+ \IfNoValueTF{#2}{\PackageError{curve2e}%
+ {\string\multiput\space initial point coordinates missing}%
+ {Nothing done}
+ }%
+ {\IfNoValueTF{#3}{\PackageError{curve2e}
+ {\string\multiput\space Increment components missing}%
+ {Nothing done}
+ }%
+ {\put(#1){\let\c@multicnt\@multicnt
+ \CopyVect #2 to \R
+ \CopyVect#3 to\D
+ \@multicnt=#4\relax
+ \@whilenum \@multicnt > \z@\do{%
+ \put(\R){#5}%
+ \IfValueTF{#6}{#6}{\AddVect#3 and\R to \R}%
+ \advance\@multicnt\m@ne
+ }%
+ }%
+ }%
+ }\ignorespaces
+}
+\NewDocumentCommand{\xmultiput}{O{0,0} d() d() m m o }{%
+\IfNoValueTF{#2}{\PackageError{curve2e}{%
+ \string\Xmultiput\space initial point coordinates missing}%
+ {Nothing done}}%
+ {\IfNoValueTF{#3}{\PackageError{curve2e}{%
+ \string\Xmultiput\space Increment components missing}%
+ {Nothing done}}%
+ {\put(#1)%
+ {\let\c@multicnt\@multicnt
+ \CopyVect #2 to \R
+ \CopyVect #3 to \D
+ \@multicnt=\@ne
+ \fpdowhile{\value{multicnt} < \inteval{#4+1}}% Test
+ {%
+ \put(\R){#5}
+ \IfValueTF{#6}{#6}{%
+ \AddVect#3 and\R to \R}
+ \advance\@multicnt\@ne
+ }
+ }
+ }}\ignorespaces
+}
\def\vector(#1)#2{%
\begingroup
\GetCoord(#1)\d@mX\d@mY
@@ -188,7 +242,7 @@
\def\VVECTOR(#1)(#2){{\SubVect#1from#2to\@tempb
\ScaleVect\@tempb by0.5to\@tempb
\AddVect\@tempb and#1to\@tempb
-\VECTOR(\@tempb)(#2)\VECTOR(\@tempb)(#1)\ignorespaces}}
+\VECTOR(\@tempb)(#2)\VECTOR(\@tempb)(#1)}\ignorespaces}
\let\lp@r( \let\rp@r)
\renewcommand*\polyline[1][\beveljoin]{\p@lylin@[#1]}
@@ -223,77 +277,59 @@
\endgroup
\ignorespaces}}
-\def\GraphGrid(#1,#2){\bgroup\textcolor{red}{\linethickness{.1\p@}%
+\def\@picture(#1,#2)(#3,#4){%
+ \edef\pict@urcorner{#1,#2}% New statement
+ \edef\pict@llcorner{#3,#4}% New statement
+ \@picht#2\unitlength
+ \setbox\@picbox\hb@xt@#1\unitlength\bgroup
+ \hskip -#3\unitlength
+ \lower #4\unitlength\hbox\bgroup
+ \ignorespaces}
+\def\Gr@phGrid(#1,#2){\bgroup\textcolor{red}{\linethickness{.1\p@}%
\RoundUp#1modulo10to\@GridWd \RoundUp#2modulo10to\@GridHt
\@tempcnta=\@GridWd \divide\@tempcnta10\relax \advance\@tempcnta\@ne
\multiput(0,0)(10,0){\@tempcnta}{\line(0,1){\@GridHt}}%
\@tempcnta=\@GridHt \divide\@tempcnta10\advance\@tempcnta\@ne
\multiput(0,0)(0,10){\@tempcnta}{\line(1,0){\@GridWd}}\thinlines}%
\egroup\ignorespaces}
-\def\RoundUp#1modulo#2to#3{\expandafter\(a)tempcnta\Integer#1.??%
-\count254\@tempcnta\divide\count254by#2\relax
-\multiply\count254by#2\relax
-\count252\@tempcnta\advance\count252-\count254
-\ifnum\count252>0\advance\count252-#2\relax
-\advance\@tempcnta-\count252\fi\edef#3{\number\@tempcnta}\ignorespaces}%
+
+\NewDocumentCommand\AutoGrid{d() d()}{\bgroup%
+\put(\pict@llcorner){\expandafter\Gr@phGrid\expandafter(\pict@urcorner)}%
+\egroup\ignorespaces}
+
+\NewDocumentCommand\GraphGrid{r() d()}{%
+\IfValueTF{#2}{\put(#1){\Gr@phGrid(#2)}}%
+ {\put(0,0){\Gr@phGrid(#1)}}}
+
+\def\RoundUp#1modulo#2to#3{\edef#3{\fpeval{(ceil(#1/#2,0))*#2}}}%
\def\Integer#1.#2??{#1}%
-\def\DividE#1by#2to#3{%
- \edef#3{\fpeval{#1 / #2}}\relax
-}
+\def\DividE#1by#2to#3{\edef#3{\fpeval{#1 / #2}}}
\let\DivideFN\DividE
\def\MultiplY#1by#2to#3{\edef#3{\fpeval{#1 * #2}}}\relax
\let\MultiplyFN\MultiplY
\unless\ifdefined\Numero
- \def\Numero#1#2{\bgroup\dimen3254=#2\relax
- \edef\x{\noexpand\egroup\noexpand\edef\noexpand#1{%
- \strip@pt\dimen3254}}\x\ignorespaces}%
+ \def\Numero#1#2{\edef#1{\fpeval{round(#2,6)}}\ignorespaces}%
\fi
\def\SinOf#1to#2{\edef#2{\fpeval{round(sind#1,6)}}}\relax
\def\CosOf#1to#2{\edef#2{\fpeval{round(cosd#1,6)}}}\relax
-\def\ArgOfVect#1to#2{\bgroup\GetCoord(#1){\t@X}{\t@Y}%
-\def\s@gno{}%
-\ifdim\t@X\p@=\z@
- \ifdim\t@Y\p@=\z@
- \def\ArcTan{0}% vettore nullo
- \else
- \def\ArcTan{90}% vettore verticale
- \ifdim\t@Y\p@<\z@\def\ArcTan{-90}\fi
- \fi
-\else
- \ifdim\t@Y\p@=\z@% vettore orizzontale
- \ifdim\t@X\p@<\z@
- \def\ArcTan{180}%
- \else
- \def\ArcTan{0}%
- \fi
- \else % vettore qualsiasi
- \edef\ArcTan{\fpeval{atand(\t@Y / \t@X)}}\relax
- \ifdim\t@X\p@<\z@% vettore nei quadranti di sinistra
- \ifdim\t@Y\p@<\z@
- \edef\ArcTan{\fpeval{\ArcTan - 180}}\relax
- \else
- \edef\ArcTan{\fpeval{\ArcTan + 180}}\relax
- \fi
- \fi
- \fi
-\fi
-\edef\x{\noexpand\egroup\noexpand\edef\noexpand#2{\ArcTan}}%
-\x\ignorespaces}
+\def\ArgOfVect#1to#2{\GetCoord(#1){\t@X}{\t@Y}%
+\fptest{\t@X=\z@ && \t@Y=\z@}{\edef#2{0}%
+\PackageWarning{curve2e}{Null vector}{Check your data\MessageBreak
+Computations go on, but the results may be meaningless}}{%
+\edef#2{\fpeval{round(atand(\t@Y,\t@X),6)}}}\ignorespaces}
\def\MakeVectorFrom#1#2to#3{\edef#3{#1,#2}\ignorespaces}%
\def\CopyVect#1to#2{\edef#2{#1}\ignorespaces}%
\def\ModOfVect#1to#2{\GetCoord(#1)\t@X\t@Y
-\edef#2{\fpeval{sqrt(\t@X*\t@X + \t@Y*\t@Y)}}\relax
+\edef#2{\fpeval{round(sqrt(\t@X*\t@X + \t@Y*\t@Y),6)}}%
\ignorespaces}%
\def\DirOfVect#1to#2{\GetCoord(#1)\t@X\t@Y
\ModOfVect#1to\@tempa
-\unless\ifdim\@tempa\p@=\z@
- \DividE\t@X\p@ by\@tempa to\t@X
- \DividE\t@Y\p@ by\@tempa to\t@Y
-\fi
-\MakeVectorFrom\t@X\t@Y to#2\ignorespaces}%
+\fptest{\@tempa=\z@}{}{%
+ \edef\t@X{\fpeval{round(\t@X/\@tempa,6)}}%
+ \edef\t@Y{\fpeval{round(\t@Y/\@tempa,6)}}%
+}\MakeVectorFrom\t@X\t@Y to#2\ignorespaces}%
\def\ModAndDirOfVect#1to#2and#3{%
-\GetCoord(#1)\t@X\t@Y
\ModOfVect#1to#2%
\DirOfVect#1to#3\ignorespaces}%
\def\DistanceAndDirOfVect#1minus#2to#3and#4{%
@@ -304,42 +340,54 @@
\def\YpartOfVect#1to#2{%
\GetCoord(#1)\@tempa#2\ignorespaces}%
\def\DirFromAngle#1to#2{%
-\CosOf#1to\t@X
-\SinOf#1to\t@Y
+\edef\t@X{\fpeval{round(cosd#1,6)}}%
+\edef\t@Y{\fpeval{round(sind#1,6)}}%
\MakeVectorFrom\t@X\t@Y to#2\ignorespaces}%
\def\ScaleVect#1by#2to#3{\GetCoord(#1)\t@X\t@Y
-\edef\t@X{\fpeval{#2 * \t@X}}\relax
-\edef\t@Y{\fpeval{#2 * \t@Y}}\relax
+\edef\t@X{\fpeval{#2 * \t@X}}%
+\edef\t@Y{\fpeval{#2 * \t@Y}}%
\MakeVectorFrom\t@X\t@Y to#3\ignorespaces}%
\def\ConjVect#1to#2{\GetCoord(#1)\t@X\t@Y
\edef\t@Y{-\t@Y}%
\MakeVectorFrom\t@X\t@Y to#2\ignorespaces}%
\def\AddVect#1and#2to#3{\GetCoord(#1)\tu@X\tu@Y
\GetCoord(#2)\td@X\td@Y
-\edef\t@X{\fpeval{\tu@X + \td@X}}\relax
-\edef\t@Y{\fpeval{\tu@Y + \td@Y}}\relax
+\edef\t@X{\fpeval{\tu@X + \td@X}}%
+\edef\t@Y{\fpeval{\tu@Y + \td@Y}}%
\MakeVectorFrom\t@X\t@Y to#3\ignorespaces}%
\def\SubVect#1from#2to#3{\GetCoord(#1)\tu@X\tu@Y
\GetCoord(#2)\td@X\td@Y
-\edef\t@X{\fpeval{\td@X - \tu@X}}\relax
-\edef\t@Y{\fpeval{\td@Y - \tu@Y}}\relax
+\edef\t@X{\fpeval{\td@X - \tu@X}}%
+\edef\t@Y{\fpeval{\td@Y - \tu@Y}}%
\MakeVectorFrom\t@X\t@Y to#3\ignorespaces}%
-\def\MultVect#1by{\@ifstar{\@ConjMultVect#1by}{\@MultVect#1by}}%
-\def\@MultVect#1by#2to#3{\GetCoord(#1)\tu@X\tu@Y
-\GetCoord(#2)\td@X\td@Y
-\edef\t@X{\fpeval{\tu@X * \td@X - \tu@Y * \td@Y}}\relax
-\edef\t@Y{\fpeval{\tu@Y * \td@X + \tu@X * \td@Y}}\relax
-\MakeVectorFrom\t@X\t@Y to#3\ignorespaces}%
-\def\@ConjMultVect#1by#2to#3{\GetCoord(#1)\tu@X\tu@Y
-\GetCoord(#2)\td@X\td@Y
-\edef\t@X{\fpeval{\tu@X * \td@X + \tu@Y * \td@Y}}\relax
-\edef\t@Y{\fpeval{\tu@Y * \td@X - \tu@X * \td@Y}}\relax
-\MakeVectorFrom\t@X\t@Y to#3\ignorespaces}
-\def\DivVect#1by#2to#3{\ModAndDirOfVect#2to\@Mod and\@Dir
-\edef\@Mod{\fpeval{1 / \@Mod}}\relax
+\def\ModAndAngleOfVect#1to#2and#3{\ModOfVect#1to#2\relax
+\ArgOfVect#1to#3\ignorespaces}
+\newcount\MV@C
+\NewDocumentCommand\Multvect{m s m s m}{%
+\MV@C=0
+\ModAndAngleOfVect#1to\MV@uM and\MV@uA
+\ModAndAngleOfVect#3to\MV@dM and\MV@dA
+\IfBooleanT{#2}{\MV@C=1}\relax
+\IfBooleanT{#4}{\MV@C=1}\relax
+\unless\ifnum\MV@C=0\edef\MV@dA{-\MV@dA}\fi
+\edef\MV@rM{\fpeval{round((\MV@uM * \MV@dM),6)}}%
+\edef\MV@rA{\fpeval{round((\MV@uA + \MV@dA),6)}}%
+\GetCoord(\MV@rA:\MV@rM)\t@X\t@Y
+\MakeVectorFrom\t@X\t@Y to#5}
+\def\MultVect#1by{\@ifstar{\let\MV@c\@ne\@MultVect#1by}%
+ {\let\MV@c\empty\@MultVect#1by}}
+
+\def\@MultVect#1by#2to#3{%
+ \unless\ifx\MV@c\empty\Multvect{#1}{#2}*{#3}\else
+ \Multvect{#1}{#2}{#3}\fi}
+\def\DivVect#1by#2to#3{\Divvect{#1}{#2}{#3}}
+
+\NewDocumentCommand\Divvect{ m m m }{%
+\ModAndDirOfVect#2to\@Mod and\@Dir
+\edef\@Mod{\fpeval{1 / \@Mod}}%
\ConjVect\@Dir to\@Dir
\ScaleVect#1by\@Mod to\@tempa
-\MultVect\@tempa by\@Dir to#3\ignorespaces}%
+\Multvect{\@tempa}{\@Dir}#3\ignorespaces}%
\def\Arc(#1)(#2)#3{\begingroup
\@tdA=#3\p@
\unless\ifdim\@tdA=\z@
@@ -363,14 +411,13 @@
\CopyVect#2to\@pPun
\CopyVect#1to\@Cent \GetCoord(\@pPun)\@pPunX\@pPunY
\@@Arc\strokepath\ignorespaces}%
-\def\@@Arc{%
-\pIIe@moveto{\@pPunX\unitlength}{\@pPunY\unitlength}%
+\def\@@Arc{\pIIe@moveto{\@pPunX\unitlength}{\@pPunY\unitlength}%
\ifdim\@tdA>180\p@
\advance\@tdA-180\p@
\Numero\@gradi\@tdA
\SubVect\@pPun from\@Cent to\@V
\AddVect\@V and\@Cent to\@sPun
- \MultVect\@V by0,-1.3333333to\@V
+ \Multvect{\@V}{0,-1.3333333to}\@V
\if\Segno-\ScaleVect\@V by-1to\@V\fi
\AddVect\@pPun and\@V to\@pcPun
\AddVect\@sPun and\@V to\@scPun
@@ -385,7 +432,7 @@
\ifdim\@tdA>\z@
\DirFromAngle\@gradi to\@Dir \if\Segno-\ConjVect\@Dir to\@Dir \fi
\SubVect\@Cent from\@pPun to\@V
- \MultVect\@V by\@Dir to\@V
+ \Multvect{\@V}{\@Dir}\@V
\AddVect\@Cent and\@V to\@sPun
\@tdA=.5\@tdA \Numero\@gradi\@tdA
\DirFromAngle\@gradi to\@Phimezzi
@@ -403,10 +450,10 @@
\fi
\SubVect\@sPun from\@pPun to\@V
\DirOfVect\@V to\@V
- \MultVect\@Phimezzi by\@V to\@Phimezzi
+ \Multvect{\@Phimezzi}{\@V}\@Phimezzi
\AddVect\@sPun and\@Phimezzi to\@scPun
\ScaleVect\@V by-1to\@V
- \MultVect\@mPhimezzi by\@V to\@mPhimezzi
+ \Multvect{\@mPhimezzi}{\@V}\@mPhimezzi
\AddVect\@pPun and\@mPhimezzi to\@pcPun
\GetCoord(\@pcPun)\@pcPunX\@pcPunY
\GetCoord(\@scPun)\@scPunX\@scPunY
@@ -445,16 +492,16 @@
\@tdD=57.29578\@tdD \Numero\DeltaGradi\@tdD
\@tdD=\ifx\Segno--\fi\@gradi\p@ \Numero\@tempa\@tdD
\DirFromAngle\@tempa to\@Dir
-\MultVect\@V by\@Dir to\@sPun
+\Multvect{\@V}{\@Dir}\@sPun
\edef\@tempA{\ifx\Segno-\m@ne\else\@ne\fi}%
-\MultVect\@sPun by 0,\@tempA to\@vPun
+\Multvect{\@sPun}{0,\@tempA}\@vPun
\DirOfVect\@vPun to\@Dir
\AddVect\@sPun and #1 to \@sPun
\GetCoord(\@sPun)\@tdX\@tdY
\@tdD\ifx\Segno--\fi\DeltaGradi\p@
\@tdD=.5\@tdD \Numero\DeltaGradi\@tdD
\DirFromAngle\DeltaGradi to\@Dird
-\MultVect\@Dir by*\@Dird to\@Dir
+\Multvect{\@Dir}*{\@Dird}\@Dir%
\GetCoord(\@Dir)\@xnum\@ynum
\put(\@tdX,\@tdY){\vector(\@xnum,\@ynum){0}}%
\@tdE =\ifx\Segno--\fi\DeltaGradi\p@
@@ -480,34 +527,34 @@
\@tdD=\DeltaGradi\p@ \@tdD=57.29578\@tdD \Numero\DeltaGradi\@tdD
\@tdD=\if\Segno--\fi\@gradi\p@ \Numero\@tempa\@tdD
\DirFromAngle\@tempa to\@Dir
-\MultVect\@V by\@Dir to\@sPun% corrects the end point
+\Multvect{\@V}{\@Dir}\@sPun% corrects the end point
\edef\@tempA{\if\Segno--\fi1}%
-\MultVect\@sPun by 0,\@tempA to\@vPun
+\Multvect{\@sPun}{0,\@tempA}\@vPun
\DirOfVect\@vPun to\@Dir
\AddVect\@sPun and #1 to \@sPun
\GetCoord(\@sPun)\@tdX\@tdY
\@tdD\if\Segno--\fi\DeltaGradi\p@
\@tdD=.5\@tdD \Numero\@tempB\@tdD
\DirFromAngle\@tempB to\@Dird
-\MultVect\@Dir by*\@Dird to\@Dir
+\Multvect{\@Dir}*{\@Dird}\@Dir
\GetCoord(\@Dir)\@xnum\@ynum
-\put(\@tdX,\@tdY){\vector(\@xnum,\@ynum){0}}% end point arrowt ip
+\put(\@tdX,\@tdY){\vector(\@xnum,\@ynum){0}}% end point arrow tip
\@tdE =\DeltaGradi\p@
\advance\@tdA -2\@tdE \Numero\@gradi\@tdA
\CopyVect#1to\@Cent \GetCoord(\@pPun)\@pPunX\@pPunY
\SubVect\@Cent from\@pPun to \@V
\edef\@tempa{\if\Segno-\else-\fi\@ne}%
-\MultVect\@V by0,\@tempa to\@vPun
+\Multvect{\@V}{0,\@tempa}\@vPun
\@tdE\if\Segno--\fi\DeltaGradi\p@
\Numero\@tempB{0.5\@tdE}%
\DirFromAngle\@tempB to\@Dird
-\MultVect\@vPun by\@Dird to\@vPun% corrects the starting point
+\Multvect{\@vPun}{\@Dird}\@vPun% corrects the starting point
\DirOfVect\@vPun to\@Dir\GetCoord(\@Dir)\@xnum\@ynum
\put(\@pPunX,\@pPunY){\vector(\@xnum,\@ynum){0}}% starting point arrow tip
\edef\@tempa{\if\Segno--\fi\DeltaGradi}%
\DirFromAngle\@tempa to \@Dir
\SubVect\@Cent from\@pPun to\@V
-\MultVect\@V by\@Dir to\@V
+\Multvect{\@V}{\@Dir}\@V
\AddVect\@Cent and\@V to\@pPun
\GetCoord(\@pPun)\@pPunX\@pPunY
\@@Arc
@@ -552,6 +599,7 @@
\StartCurveAt#1WithDir{#3}\relax
\CbezierTo#2WithDir#4AndDists#5And{#6}\CurveFinish}
+
\def\@isTension#1;#2!!{\def\@tempA{#1}%
\def\@tempB{#2}\unless\ifx\@tempB\empty\strip@semicolon#2\fi}
@@ -562,12 +610,14 @@
\expandafter\DirOfVect\@tempA to\@Duno
\bgroup\unless\ifx\@tempB\empty\GetCoord(\@tempB)\@Tzero\@Tuno\fi
\DistanceAndDirOfVect\@Puno minus\@Pzero to\@Chord and\@DirChord
-\MultVect\@Dzero by*\@DirChord to \@Dpzero
-\MultVect\@Duno by*\@DirChord to \@Dpuno
+\Multvect{\@Dzero}*{\@DirChord}\@Dpzero
+\Multvect{\@Duno}*{\@DirChord}\@Dpuno
\GetCoord(\@Dpzero)\@DXpzero\@DYpzero
\GetCoord(\@Dpuno)\@DXpuno\@DYpuno
\DivideFN\@Chord by2 to\@semichord
-\ifdim\@DXpzero\p@=\z@
+\fptest{\@DYpuno=0 && \@DYpzero=0}{\GetCoord(\@Puno)\@tX\@tY
+ \pIIe@lineto{\@tX\unitlength}{\@tY\unitlength}}%
+{\ifdim\@DXpzero\p@=\z@
\@tdA=1.333333\p@
\Numero\@KCzero{\@semichord\@tdA}%
\fi
@@ -614,11 +664,11 @@
\GetCoord(\@CPuno)\@XCPuno\@YCPuno
\pIIe@curveto{\@XCPzero\unitlength}{\@YCPzero\unitlength}%
{\@XCPuno\unitlength}{\@YCPuno\unitlength}%
- {\@XPuno\unitlength}{\@YPuno\unitlength}\egroup
+ {\@XPuno\unitlength}{\@YPuno\unitlength}}\egroup
\CopyVect\@Puno to\@Pzero
\CopyVect\@Duno to\@Dzero
\ignorespaces}%
-\def\Curve{\@ifstar{\let\fillstroke\fillpath\Curve@}%
+\def\Curve{\@killglue\@ifstar{\let\fillstroke\fillpath\Curve@}%
{\let\fillstroke\strokepath\Curve@}}
\def\Curve@(#1)<#2>{%
@@ -651,7 +701,7 @@
\def\QurveTo#1WithDir#2{%
\edef\@Puno{#1}\DirOfVect#2to\@Duno\bgroup
\DistanceAndDirOfVect\@Puno minus\@Pzero to\@Chord and\@DirChord
-\MultVect\@Dzero by*\@Duno to \@Scalar
+\Multvect{\@Dzero}*{\@Duno}\@Scalar
\YpartOfVect\@Scalar to \@YScalar
\ifdim\@YScalar\p@=\z@
\PackageWarning{curve2e}%
@@ -661,8 +711,8 @@
a dotted line.\MessageBreak}%
\Dotline(\@Pzero)(\@Puno){2}\relax
\else
-\MultVect\@Dzero by*\@DirChord to \@Dpzero
-\MultVect\@Duno by*\@DirChord to \@Dpuno
+\Multvect{\@Dzero}*{\@DirChord}\@Dpzero
+\Multvect{\@Duno}*{\@DirChord}\@Dpuno
\GetCoord(\@Dpzero)\@DXpzero\@DYpzero
\GetCoord(\@Dpuno)\@DXpuno\@DYpuno
\MultiplyFN\@DXpzero by\@DXpuno to\@XXD
@@ -706,16 +756,15 @@
\ignorespaces}
%%
-%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
%% this license is at: http://www.latex-project.org/lppl.txt
%%
-%% This work is "author-maintained"
+%% This work is "maintained"
%%
%% This work consists of file curve2e.dtx, and the derived files
%% curve2e.sty and curve2e.pdf, plus the auxiliary derived files
-%% README.txt and manifest.txt.
+%% README.txt and curve2e-v161.sty.
%%
%%
%% End of file `curve2e.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/curve2e.tlpobj new/tlpkg/tlpobj/curve2e.tlpobj
--- old/tlpkg/tlpobj/curve2e.tlpobj 2019-04-01 02:24:55.000000000 +0200
+++ new/tlpkg/tlpobj/curve2e.tlpobj 2020-04-16 01:56:55.000000000 +0200
@@ -1,6 +1,6 @@
name curve2e
category Package
-revision 50663
+revision 54758
shortdesc Extensions for package pict2e
relocated 1
longdesc The package extends the drawing capacities of the pict2e that
@@ -14,7 +14,6 @@
RELOC/tex/latex/curve2e/curve2e-v161.sty
RELOC/tex/latex/curve2e/curve2e.sty
catalogue-ctan /macros/latex/contrib/curve2e
-catalogue-date 2019-03-30 09:54:39 +0100
catalogue-license lppl1.3c
catalogue-topics graphics graphics-in-tex graphics-curve
-catalogue-version 2.0.1
+catalogue-version 2.2.6
++++++ cweb.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/ctangle.man1.pdf and new/texmf-dist/doc/man/man1/ctangle.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/ctwill-refsort.man1.pdf and new/texmf-dist/doc/man/man1/ctwill-refsort.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/ctwill-twinx.man1.pdf and new/texmf-dist/doc/man/man1/ctwill-twinx.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ctwill.1 new/texmf-dist/doc/man/man1/ctwill.1
--- old/texmf-dist/doc/man/man1/ctwill.1 2019-03-10 23:18:24.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ctwill.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,6 +1,6 @@
-.\" Automatically generated by Pandoc 2.7
+.\" Automatically generated by Pandoc 2.9.1.1
.\"
-.TH "CTWILL" "1" "March 10, 2019" "Web2c 2019" "General Commands Manual"
+.TH "CTWILL" "1" "December 7, 2019" "Web2c 2020" "General Commands Manual"
.hy
.SH NAME
.PP
@@ -238,7 +238,7 @@
.PD 0
.P
.PD
-As of 2019, \f[B]ctwill\f[R] and its utilities \f[B]ctwill-refsort\f[R] and
-\f[B]ctwill-twinx\f[R] have been fully integrated with the extended CWEBbin
-system that serves as the basis for CWEB in TeX\ Live; see the project
+\f[B]ctwill\f[R] and its utilities \f[B]ctwill-refsort\f[R] and \f[B]ctwill-twinx\f[R]
+have been fully integrated with the CWEBbin extension that serves as the
+basis for CWEB in TeX\ Live; see the project
page (https://github.com/ascherer/cwebbin).
Binary files old/texmf-dist/doc/man/man1/ctwill.man1.pdf and new/texmf-dist/doc/man/man1/ctwill.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/cweave.man1.pdf and new/texmf-dist/doc/man/man1/cweave.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/cweb.1 new/texmf-dist/doc/man/man1/cweb.1
--- old/texmf-dist/doc/man/man1/cweb.1 2019-03-10 23:18:24.000000000 +0100
+++ new/texmf-dist/doc/man/man1/cweb.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,10 +1,10 @@
-.\" Automatically generated by Pandoc 2.7
+.\" Automatically generated by Pandoc 2.9.1.1
.\"
-.TH "CWEB" "1" "January 27, 2019" "Web2c 2019" "General Commands Manual"
+.TH "CWEB" "1" "December 7, 2019" "Web2c 2020" "General Commands Manual"
.hy
.SH NAME
.PP
-ctangle, cweave \[en] translate CWEB to TeX
+ctangle, cweave \[en] translate CWEB to C/C++ and/or TeX
.SH SYNOPSIS
.PP
\f[B]ctangle\f[R] [\f[I]options\f[R]] \f[I]webfile\f[R][.w]
@@ -164,7 +164,5 @@
.PD 0
.P
.PD
-As of 2019, the CWEB system in TeX\ Live is based on the CWEBbin
-extension that collects ideas and improvements from numerous
-contributors; see the project
+CWEB in TeX\ Live is based on the CWEBbin extension; see the project
page (https://github.com/ascherer/cwebbin).
Binary files old/texmf-dist/doc/man/man1/cweb.man1.pdf and new/texmf-dist/doc/man/man1/cweb.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cweb.doc.tlpobj new/tlpkg/tlpobj/cweb.doc.tlpobj
--- old/tlpkg/tlpobj/cweb.doc.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/cweb.doc.tlpobj 2020-03-14 01:42:05.000000000 +0100
@@ -1,6 +1,6 @@
name cweb.doc
category Package
-revision 50602
+revision 54276
shortdesc doc files of cweb
docfiles size=136
texmf-dist/doc/man/man1/ctangle.1
++++++ cweb.tar.xz ++++++
++++ 2597 lines of diff (skipped)
++++++ cyrillic-bin.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/rubibtex.man1.pdf and new/texmf-dist/doc/man/man1/rubibtex.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/rumakeindex.man1.pdf and new/texmf-dist/doc/man/man1/rumakeindex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cyrillic-bin.doc.tlpobj new/tlpkg/tlpobj/cyrillic-bin.doc.tlpobj
--- old/tlpkg/tlpobj/cyrillic-bin.doc.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/cyrillic-bin.doc.tlpobj 2020-01-27 01:40:46.000000000 +0100
@@ -1,6 +1,6 @@
name cyrillic-bin.doc
category TLCore
-revision 50602
+revision 53559
shortdesc doc files of cyrillic-bin
docfiles size=12
texmf-dist/doc/man/man1/rubibtex.1
++++++ cyrillic-bin.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texlive/rubibtex.sh new/texmf-dist/scripts/texlive/rubibtex.sh
--- old/texmf-dist/scripts/texlive/rubibtex.sh 2013-04-08 17:51:20.000000000 +0200
+++ new/texmf-dist/scripts/texlive/rubibtex.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,110 +0,0 @@
-#!/bin/sh
-
-# rubibtex, based on the original version contained in the t2 bundle.
-# Thomas Esser, Public Domain.
-
-progname=rubibtex
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
-job=$1
-backup="$tmpdir/orig.aux"
-
-case $job in
- "")
- echo "usage: $progname file" >&2
- exit 1
-esac
-
-if test ! -f "$job.aux"; then
- echo "$progname: file \`$job.aux' does not exist." >&2
- exit 1
-fi
-
-trap '
- rm -rf "$tmpdir"
- exit 1
-' 1 2 3 7 13 15
-(umask 077; mkdir "$tmpdir") \
- || { echo "$progname: could not create directory \`$tmpdir'" >&2; exit 1; }
-
-cat <"$job.aux" >"$backup" || {
- echo "$progname: could not create backup of file \`$job.aux' as \`$backup'." >&2
- rm -rf "$tmpdir"
- exit 1
-}
-
-sed '
- /^\\citation/ {
- s/\\IeC {\\CYRA }/�/g
- s/\\IeC {\\CYRB }/�/g
- s/\\IeC {\\CYRV }/�/g
- s/\\IeC {\\CYRG }/�/g
- s/\\IeC {\\CYRD }/�/g
- s/\\IeC {\\CYRE }/�/g
- s/\\IeC {\\CYRYO }/�/g
- s/\\IeC {\\CYRZH }/�/g
- s/\\IeC {\\CYRZ }/�/g
- s/\\IeC {\\CYRI }/�/g
- s/\\IeC {\\CYRISHRT }/�/g
- s/\\IeC {\\CYRK }/�/g
- s/\\IeC {\\CYRL }/�/g
- s/\\IeC {\\CYRM }/�/g
- s/\\IeC {\\CYRN }/�/g
- s/\\IeC {\\CYRO }/�/g
- s/\\IeC {\\CYRP }/�/g
- s/\\IeC {\\CYRR }/�/g
- s/\\IeC {\\CYRS }/�/g
- s/\\IeC {\\CYRT }/�/g
- s/\\IeC {\\CYRU }/�/g
- s/\\IeC {\\CYRF }/�/g
- s/\\IeC {\\CYRH }/�/g
- s/\\IeC {\\CYRC }/�/g
- s/\\IeC {\\CYRCH }/�/g
- s/\\IeC {\\CYRSH }/�/g
- s/\\IeC {\\CYRSHCH }/�/g
- s/\\IeC {\\CYRHRDSN }/�/g
- s/\\IeC {\\CYRERY }/�/g
- s/\\IeC {\\CYRSFTSN }/�/g
- s/\\IeC {\\CYREREV }/�/g
- s/\\IeC {\\CYRYU }/�/g
- s/\\IeC {\\CYRYA }/�/g
- s/\\IeC {\\cyra }/�/g
- s/\\IeC {\\cyrb }/�/g
- s/\\IeC {\\cyrv }/�/g
- s/\\IeC {\\cyrg }/�/g
- s/\\IeC {\\cyrd }/�/g
- s/\\IeC {\\cyre }/�/g
- s/\\IeC {\\cyryo }/�/g
- s/\\IeC {\\cyrzh }/�/g
- s/\\IeC {\\cyrz }/�/g
- s/\\IeC {\\cyri }/�/g
- s/\\IeC {\\cyrishrt }/�/g
- s/\\IeC {\\cyrk }/�/g
- s/\\IeC {\\cyrl }/�/g
- s/\\IeC {\\cyrm }/�/g
- s/\\IeC {\\cyrn }/�/g
- s/\\IeC {\\cyro }/�/g
- s/\\IeC {\\cyrp }/�/g
- s/\\IeC {\\cyrr }/�/g
- s/\\IeC {\\cyrs }/�/g
- s/\\IeC {\\cyrt }/�/g
- s/\\IeC {\\cyru }/�/g
- s/\\IeC {\\cyrf }/�/g
- s/\\IeC {\\cyrh }/�/g
- s/\\IeC {\\cyrc }/�/g
- s/\\IeC {\\cyrch }/�/g
- s/\\IeC {\\cyrsh }/�/g
- s/\\IeC {\\cyrshch }/�/g
- s/\\IeC {\\cyrhrdsn }/�/g
- s/\\IeC {\\cyrery }/�/g
- s/\\IeC {\\cyrsftsn }/�/g
- s/\\IeC {\\cyrerev }/�/g
- s/\\IeC {\\cyryu }/�/g
- s/\\IeC {\\cyrya }/�/g
- }
-' <"$backup" >"$job.aux"
-
-bibtex "$job"
-
-cat "$backup" > "$job.aux"
-rm -rf "$tmpdir"
-exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texlive/rumakeindex.sh new/texmf-dist/scripts/texlive/rumakeindex.sh
--- old/texmf-dist/scripts/texlive/rumakeindex.sh 2013-04-08 17:51:20.000000000 +0200
+++ new/texmf-dist/scripts/texlive/rumakeindex.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-BASE=`basename "$1" .idx`
-IDX=$BASE.idx
-IND=$BASE.ind
-ILG=$BASE.ilg
-
-sed '
-/^\\indexentry{/ {
-s/\\IeC {\\CYRA }/�/g
-s/\\IeC {\\cyra }/�/g
-s/\\IeC {\\CYRB }/�/g
-s/\\IeC {\\cyrb }/�/g
-s/\\IeC {\\CYRV }/�/g
-s/\\IeC {\\cyrv }/�/g
-s/\\IeC {\\CYRG }/�/g
-s/\\IeC {\\cyrg }/�/g
-s/\\IeC {\\CYRD }/�/g
-s/\\IeC {\\cyrd }/�/g
-s/\\IeC {\\CYRE }/�/g
-s/\\IeC {\\cyre }/�/g
-s/\\IeC {\\CYRYO }/�/g
-s/\\IeC {\\cyryo }/�/g
-s/\\IeC {\\CYRZH }/�/g
-s/\\IeC {\\cyrzh }/�/g
-s/\\IeC {\\CYRZ }/�/g
-s/\\IeC {\\cyrz }/�/g
-s/\\IeC {\\CYRI }/�/g
-s/\\IeC {\\cyri }/�/g
-s/\\IeC {\\CYRISHRT }/�/g
-s/\\IeC {\\cyrishrt }/�/g
-s/\\IeC {\\CYRK }/�/g
-s/\\IeC {\\cyrk }/�/g
-s/\\IeC {\\CYRL }/�/g
-s/\\IeC {\\cyrl }/�/g
-s/\\IeC {\\CYRM }/�/g
-s/\\IeC {\\cyrm }/�/g
-s/\\IeC {\\CYRN }/�/g
-s/\\IeC {\\cyrn }/�/g
-s/\\IeC {\\CYRO }/�/g
-s/\\IeC {\\cyro }/�/g
-s/\\IeC {\\CYRP }/�/g
-s/\\IeC {\\cyrp }/�/g
-s/\\IeC {\\CYRR }/�/g
-s/\\IeC {\\cyrr }/�/g
-s/\\IeC {\\CYRS }/�/g
-s/\\IeC {\\cyrs }/�/g
-s/\\IeC {\\CYRT }/�/g
-s/\\IeC {\\cyrt }/�/g
-s/\\IeC {\\CYRU }/�/g
-s/\\IeC {\\cyru }/�/g
-s/\\IeC {\\CYRF }/�/g
-s/\\IeC {\\cyrf }/�/g
-s/\\IeC {\\CYRH }/�/g
-s/\\IeC {\\cyrh }/�/g
-s/\\IeC {\\CYRC }/�/g
-s/\\IeC {\\cyrc }/�/g
-s/\\IeC {\\CYRCH }/�/g
-s/\\IeC {\\cyrch }/�/g
-s/\\IeC {\\CYRSH }/�/g
-s/\\IeC {\\cyrsh }/�/g
-s/\\IeC {\\CYRSHCH }/�/g
-s/\\IeC {\\cyrshch }/�/g
-s/\\IeC {\\CYRHRDSN }/�/g
-s/\\IeC {\\cyrhrdsn }/�/g
-s/\\IeC {\\CYRERY }/�/g
-s/\\IeC {\\cyrery }/�/g
-s/\\IeC {\\CYRSFTSN }/�/g
-s/\\IeC {\\cyrsftsn }/�/g
-s/\\IeC {\\CYREREV }/�/g
-s/\\IeC {\\cyrerev }/�/g
-s/\\IeC {\\CYRYU }/�/g
-s/\\IeC {\\cyryu }/�/g
-s/\\IeC {\\CYRYA }/�/g
-s/\\IeC {\\cyrya }/�/g
-}' $IDX | makeindex -t $ILG | tr '������������������������������������������������������������������' \
- '�����������ų�����������������������������������������������������' > $IND
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texlive-extra/rubibtex.sh new/texmf-dist/scripts/texlive-extra/rubibtex.sh
--- old/texmf-dist/scripts/texlive-extra/rubibtex.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/scripts/texlive-extra/rubibtex.sh 2020-01-27 00:58:37.000000000 +0100
@@ -0,0 +1,110 @@
+#!/bin/sh
+
+# rubibtex, based on the original version contained in the t2 bundle.
+# Thomas Esser, Public Domain.
+
+progname=rubibtex
+tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$
+job=$1
+backup="$tmpdir/orig.aux"
+
+case $job in
+ "")
+ echo "usage: $progname file" >&2
+ exit 1
+esac
+
+if test ! -f "$job.aux"; then
+ echo "$progname: file \`$job.aux' does not exist." >&2
+ exit 1
+fi
+
+trap '
+ rm -rf "$tmpdir"
+ exit 1
+' 1 2 3 7 13 15
+(umask 077; mkdir "$tmpdir") \
+ || { echo "$progname: could not create directory \`$tmpdir'" >&2; exit 1; }
+
+cat <"$job.aux" >"$backup" || {
+ echo "$progname: could not create backup of file \`$job.aux' as \`$backup'." >&2
+ rm -rf "$tmpdir"
+ exit 1
+}
+
+sed '
+ /^\\citation/ {
+ s/\\IeC {\\CYRA }/�/g
+ s/\\IeC {\\CYRB }/�/g
+ s/\\IeC {\\CYRV }/�/g
+ s/\\IeC {\\CYRG }/�/g
+ s/\\IeC {\\CYRD }/�/g
+ s/\\IeC {\\CYRE }/�/g
+ s/\\IeC {\\CYRYO }/�/g
+ s/\\IeC {\\CYRZH }/�/g
+ s/\\IeC {\\CYRZ }/�/g
+ s/\\IeC {\\CYRI }/�/g
+ s/\\IeC {\\CYRISHRT }/�/g
+ s/\\IeC {\\CYRK }/�/g
+ s/\\IeC {\\CYRL }/�/g
+ s/\\IeC {\\CYRM }/�/g
+ s/\\IeC {\\CYRN }/�/g
+ s/\\IeC {\\CYRO }/�/g
+ s/\\IeC {\\CYRP }/�/g
+ s/\\IeC {\\CYRR }/�/g
+ s/\\IeC {\\CYRS }/�/g
+ s/\\IeC {\\CYRT }/�/g
+ s/\\IeC {\\CYRU }/�/g
+ s/\\IeC {\\CYRF }/�/g
+ s/\\IeC {\\CYRH }/�/g
+ s/\\IeC {\\CYRC }/�/g
+ s/\\IeC {\\CYRCH }/�/g
+ s/\\IeC {\\CYRSH }/�/g
+ s/\\IeC {\\CYRSHCH }/�/g
+ s/\\IeC {\\CYRHRDSN }/�/g
+ s/\\IeC {\\CYRERY }/�/g
+ s/\\IeC {\\CYRSFTSN }/�/g
+ s/\\IeC {\\CYREREV }/�/g
+ s/\\IeC {\\CYRYU }/�/g
+ s/\\IeC {\\CYRYA }/�/g
+ s/\\IeC {\\cyra }/�/g
+ s/\\IeC {\\cyrb }/�/g
+ s/\\IeC {\\cyrv }/�/g
+ s/\\IeC {\\cyrg }/�/g
+ s/\\IeC {\\cyrd }/�/g
+ s/\\IeC {\\cyre }/�/g
+ s/\\IeC {\\cyryo }/�/g
+ s/\\IeC {\\cyrzh }/�/g
+ s/\\IeC {\\cyrz }/�/g
+ s/\\IeC {\\cyri }/�/g
+ s/\\IeC {\\cyrishrt }/�/g
+ s/\\IeC {\\cyrk }/�/g
+ s/\\IeC {\\cyrl }/�/g
+ s/\\IeC {\\cyrm }/�/g
+ s/\\IeC {\\cyrn }/�/g
+ s/\\IeC {\\cyro }/�/g
+ s/\\IeC {\\cyrp }/�/g
+ s/\\IeC {\\cyrr }/�/g
+ s/\\IeC {\\cyrs }/�/g
+ s/\\IeC {\\cyrt }/�/g
+ s/\\IeC {\\cyru }/�/g
+ s/\\IeC {\\cyrf }/�/g
+ s/\\IeC {\\cyrh }/�/g
+ s/\\IeC {\\cyrc }/�/g
+ s/\\IeC {\\cyrch }/�/g
+ s/\\IeC {\\cyrsh }/�/g
+ s/\\IeC {\\cyrshch }/�/g
+ s/\\IeC {\\cyrhrdsn }/�/g
+ s/\\IeC {\\cyrery }/�/g
+ s/\\IeC {\\cyrsftsn }/�/g
+ s/\\IeC {\\cyrerev }/�/g
+ s/\\IeC {\\cyryu }/�/g
+ s/\\IeC {\\cyrya }/�/g
+ }
+' <"$backup" >"$job.aux"
+
+bibtex "$job"
+
+cat "$backup" > "$job.aux"
+rm -rf "$tmpdir"
+exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texlive-extra/rumakeindex.sh new/texmf-dist/scripts/texlive-extra/rumakeindex.sh
--- old/texmf-dist/scripts/texlive-extra/rumakeindex.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/scripts/texlive-extra/rumakeindex.sh 2020-01-27 00:58:37.000000000 +0100
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+BASE=`basename "$1" .idx`
+IDX=$BASE.idx
+IND=$BASE.ind
+ILG=$BASE.ilg
+
+sed '
+/^\\indexentry{/ {
+s/\\IeC {\\CYRA }/�/g
+s/\\IeC {\\cyra }/�/g
+s/\\IeC {\\CYRB }/�/g
+s/\\IeC {\\cyrb }/�/g
+s/\\IeC {\\CYRV }/�/g
+s/\\IeC {\\cyrv }/�/g
+s/\\IeC {\\CYRG }/�/g
+s/\\IeC {\\cyrg }/�/g
+s/\\IeC {\\CYRD }/�/g
+s/\\IeC {\\cyrd }/�/g
+s/\\IeC {\\CYRE }/�/g
+s/\\IeC {\\cyre }/�/g
+s/\\IeC {\\CYRYO }/�/g
+s/\\IeC {\\cyryo }/�/g
+s/\\IeC {\\CYRZH }/�/g
+s/\\IeC {\\cyrzh }/�/g
+s/\\IeC {\\CYRZ }/�/g
+s/\\IeC {\\cyrz }/�/g
+s/\\IeC {\\CYRI }/�/g
+s/\\IeC {\\cyri }/�/g
+s/\\IeC {\\CYRISHRT }/�/g
+s/\\IeC {\\cyrishrt }/�/g
+s/\\IeC {\\CYRK }/�/g
+s/\\IeC {\\cyrk }/�/g
+s/\\IeC {\\CYRL }/�/g
+s/\\IeC {\\cyrl }/�/g
+s/\\IeC {\\CYRM }/�/g
+s/\\IeC {\\cyrm }/�/g
+s/\\IeC {\\CYRN }/�/g
+s/\\IeC {\\cyrn }/�/g
+s/\\IeC {\\CYRO }/�/g
+s/\\IeC {\\cyro }/�/g
+s/\\IeC {\\CYRP }/�/g
+s/\\IeC {\\cyrp }/�/g
+s/\\IeC {\\CYRR }/�/g
+s/\\IeC {\\cyrr }/�/g
+s/\\IeC {\\CYRS }/�/g
+s/\\IeC {\\cyrs }/�/g
+s/\\IeC {\\CYRT }/�/g
+s/\\IeC {\\cyrt }/�/g
+s/\\IeC {\\CYRU }/�/g
+s/\\IeC {\\cyru }/�/g
+s/\\IeC {\\CYRF }/�/g
+s/\\IeC {\\cyrf }/�/g
+s/\\IeC {\\CYRH }/�/g
+s/\\IeC {\\cyrh }/�/g
+s/\\IeC {\\CYRC }/�/g
+s/\\IeC {\\cyrc }/�/g
+s/\\IeC {\\CYRCH }/�/g
+s/\\IeC {\\cyrch }/�/g
+s/\\IeC {\\CYRSH }/�/g
+s/\\IeC {\\cyrsh }/�/g
+s/\\IeC {\\CYRSHCH }/�/g
+s/\\IeC {\\cyrshch }/�/g
+s/\\IeC {\\CYRHRDSN }/�/g
+s/\\IeC {\\cyrhrdsn }/�/g
+s/\\IeC {\\CYRERY }/�/g
+s/\\IeC {\\cyrery }/�/g
+s/\\IeC {\\CYRSFTSN }/�/g
+s/\\IeC {\\cyrsftsn }/�/g
+s/\\IeC {\\CYREREV }/�/g
+s/\\IeC {\\cyrerev }/�/g
+s/\\IeC {\\CYRYU }/�/g
+s/\\IeC {\\cyryu }/�/g
+s/\\IeC {\\CYRYA }/�/g
+s/\\IeC {\\cyrya }/�/g
+}' $IDX | makeindex -t $ILG | tr '������������������������������������������������������������������' \
+ '�����������ų�����������������������������������������������������' > $IND
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cyrillic-bin.tlpobj new/tlpkg/tlpobj/cyrillic-bin.tlpobj
--- old/tlpkg/tlpobj/cyrillic-bin.tlpobj 2019-03-27 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/cyrillic-bin.tlpobj 2020-01-27 01:40:46.000000000 +0100
@@ -1,8 +1,8 @@
name cyrillic-bin
category TLCore
-revision 50602
+revision 53559
shortdesc Cyrillic bibtex and makeindex
depend cyrillic-bin.ARCH
runfiles size=2
- texmf-dist/scripts/texlive/rubibtex.sh
- texmf-dist/scripts/texlive/rumakeindex.sh
+ texmf-dist/scripts/texlive-extra/rubibtex.sh
+ texmf-dist/scripts/texlive-extra/rumakeindex.sh
++++++ dad.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dad.doc.tlpobj new/tlpkg/tlpobj/dad.doc.tlpobj
--- old/tlpkg/tlpobj/dad.doc.tlpobj 2019-02-28 03:31:01.000000000 +0100
+++ new/tlpkg/tlpobj/dad.doc.tlpobj 2020-03-09 00:28:36.000000000 +0100
@@ -1,6 +1,6 @@
name dad.doc
category Package
-revision 47027
+revision 54191
shortdesc doc files of dad
relocated 1
docfiles size=76
++++++ dad.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dad.tlpobj new/tlpkg/tlpobj/dad.tlpobj
--- old/tlpkg/tlpobj/dad.tlpobj 2019-02-28 03:31:01.000000000 +0100
+++ new/tlpkg/tlpobj/dad.tlpobj 2020-03-09 00:28:36.000000000 +0100
@@ -1,14 +1,13 @@
name dad
category Package
-revision 47027
+revision 54191
shortdesc Simple typesetting system for mixed Arabic/Latin documents
relocated 1
longdesc This package allows simple typesetting in Arabic script,
longdesc intended for mixed Arabic/Latin script usage in situations
-longdesc where heavy-duty solutions are discouraged. The system
-longdesc operates with both Unicode and transliterated input, allowing
-longdesc the user to choose the most appropriate approach for every
-longdesc situation.
+longdesc where heavy-duty solutions are discouraged. The system operates
+longdesc with both Unicode and transliterated input, allowing the user
+longdesc to choose the most appropriate approach for every situation.
execute addMap dad.map
runfiles size=2588
RELOC/fonts/afm/public/dad/Dad-bold.afm
@@ -31,7 +30,6 @@
RELOC/tex/lualatex/dad/T1dad.fd
RELOC/tex/lualatex/dad/dad.sty
catalogue-ctan /language/arabic/dad
-catalogue-date 2018-03-19 16:37:57 +0100
catalogue-license lppl
catalogue-topics arabic luatex font-type1
catalogue-version 1.2
++++++ dashundergaps.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dashundergaps/README.md new/doc/latex/dashundergaps/README.md
--- old/doc/latex/dashundergaps/README.md 2018-06-24 23:57:27.000000000 +0200
+++ new/doc/latex/dashundergaps/README.md 2020-01-23 18:53:38.000000000 +0100
@@ -12,11 +12,11 @@
https://github.com/FrankMittelbach/fmitex/
-The license is LPPL.
+The license is LPPL 1.3c.
-----
-Copyright (C) 2018 Frank Mittelbach<br />
+Copyright (C) 2018-2020 Frank Mittelbach<br />
<https://latex-project.org/> <br />
All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dashundergaps/changes.txt new/doc/latex/dashundergaps/changes.txt
--- old/doc/latex/dashundergaps/changes.txt 2018-11-19 22:55:47.000000000 +0100
+++ new/doc/latex/dashundergaps/changes.txt 2020-02-11 23:09:42.000000000 +0100
@@ -1,3 +1,21 @@
+2020-02-11 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * dashundergaps.dtx: Expand argument up front to work around
+ ulem restrictions when possible (gh/10)
+
+2020-01-22 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * dashundergaps.dtx (subsection{Loading and fixing/changing \pkg{ulem}}):
+ Adjusted definition to new ulem release
+
+ * Some release cleanup.
+
+2019-07-14 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * dashundergaps.dtx (subsection{The main implementation part}):
+ As the code doesn't run with expl3 versions prior to mid 2018, we
+ check against that (github/7).
+
2018-11-09 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
* dashundergaps.dtx v2.0d
Binary files old/doc/latex/dashundergaps/dashundergaps-code.pdf and new/doc/latex/dashundergaps/dashundergaps-code.pdf differ
Binary files old/doc/latex/dashundergaps/dashundergaps-doc.pdf and new/doc/latex/dashundergaps/dashundergaps-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/dashundergaps/l3doc-TUB.cls new/doc/latex/dashundergaps/l3doc-TUB.cls
--- old/doc/latex/dashundergaps/l3doc-TUB.cls 2018-11-19 22:55:47.000000000 +0100
+++ new/doc/latex/dashundergaps/l3doc-TUB.cls 2020-01-23 18:53:38.000000000 +0100
@@ -891,7 +891,7 @@
\tl_greplace_all:Nno \g__codedoc_base_name_tl
{ ~ } { \c_catcode_other_space_tl }
\seq_get:NN #1 \l__codedoc_tmpa_tl
- \str_if_eq_x:nnTF { \l__codedoc_tmpa_tl } { \scan_stop: }
+ \str_if_eq:eeTF { \l__codedoc_tmpa_tl } { \scan_stop: }
{
\seq_gclear:N \g__codedoc_variants_seq
\__codedoc_names_typeset_auxii:x { \g__codedoc_base_name_tl }
@@ -954,7 +954,7 @@
#1
{
\l__codedoc_tmpa_tl
- \str_if_eq_x:nnF { \l__codedoc_tmpb_tl } { \scan_stop: }
+ \str_if_eq:eeF { \l__codedoc_tmpb_tl } { \scan_stop: }
{ : \l__codedoc_tmpb_tl }
\bool_if:NT \l__codedoc_macro_TF_bool { TF }
}
@@ -2098,7 +2098,7 @@
\tl_if_empty:nTF {#3}
{ { } { } { } }
{
- \str_if_eq_x:nnTF {#3} { TeX }
+ \str_if_eq:eeTF {#3} { TeX }
{
{ TeX~and~LaTeX2e }
{ \string\TeX{}~and~\string\LaTeXe{} }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dashundergaps.doc.tlpobj new/tlpkg/tlpobj/dashundergaps.doc.tlpobj
--- old/tlpkg/tlpobj/dashundergaps.doc.tlpobj 2019-02-28 03:31:07.000000000 +0100
+++ new/tlpkg/tlpobj/dashundergaps.doc.tlpobj 2020-02-12 01:54:47.000000000 +0100
@@ -1,9 +1,9 @@
name dashundergaps.doc
category Package
-revision 49198
+revision 53756
shortdesc doc files of dashundergaps
relocated 1
-docfiles size=270
+docfiles size=284
RELOC/doc/latex/dashundergaps/README.md
RELOC/doc/latex/dashundergaps/changes.txt
RELOC/doc/latex/dashundergaps/dashundergaps-code.pdf
++++++ dashundergaps.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/dashundergaps/dashundergaps.sty new/tex/latex/dashundergaps/dashundergaps.sty
--- old/tex/latex/dashundergaps/dashundergaps.sty 2018-11-19 22:55:47.000000000 +0100
+++ new/tex/latex/dashundergaps/dashundergaps.sty 2020-02-11 23:09:42.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2018 Frank Mittelbach
+%% Copyright 2018-2020 Frank Mittelbach
%%
%% This file was generated from file(s) of the LaTeX `dashundergaps Bundle'.
%% --------------------------------------------------------------------------
@@ -32,25 +32,23 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: dashundergaps.dtx (C) Copyright 2018 Frank Mittelbach
+%% File: dashundergaps.dtx (C) Copyright 2018-2020 Frank Mittelbach
-\def\dashundergapsdate {2018/11/18}
-\def\dashundergapsversion{v2.0d}
+\def\dashundergapsdate {2020-02-11} % don't forget to also adjust build.lua!
+\def\dashundergapsversion{v2.0g}
\RequirePackage[normalem]{ulem}
-\def\dotuline{\bgroup
+\protected\def\dotuline{\leavevmode\bgroup
\UL@setULdepth
+ \ifx\UL@on\UL@onin \advance\ULdepth2\p@\fi
\markoverwith{\begingroup
- \advance\ULdepth0.08ex
\lower\ULdepth\hbox{\normalfont \kern.1em .\kern.04em}%
\endgroup}%
\ULon}
-\MakeRobust\dotuline
-\def\uwave{\bgroup
+\protected\def\uwave{\leavevmode\bgroup
\UL@setULdepth
\advance\ULdepth 0.6\p@
\markoverwith{\lower\ULdepth\hbox{\sixly \char58}}\ULon}
-\MakeRobust\uwave
\def\fmdug@ublank{\bgroup\let\UL@leadtype\@empty\ULon}
\def\UL@dischyp{\global\setbox\UL@hyphenbox\hbox
{\ifnum \hyphenchar\font<\z@ \string-\else \char\hyphenchar\font \fi}%
@@ -64,12 +62,27 @@
\let\fmdug@box\box
\RequirePackage{xparse,l3keys2e}
+\@ifpackagelater{expl3}{2018-06-24}
+ {}
+ {%
+ \PackageError{dashundergaps}{Support package l3kernel too old}
+ {%
+ Please install an up to date version of l3kernel\MessageBreak
+ using your TeX package manager or from CTAN.\MessageBreak
+ \MessageBreak
+ Loading dashundergaps will abort!%
+ }%
+ \endinput
+ }
\ProvidesExplPackage{dashundergaps}
{\dashundergapsdate}
{\dashundergapsversion}
{Dashing and underlining phantom text}
-\DeclareDocumentCommand \gap { som } { \__fmdug_gap:nnn {#1}{#2}{#3} }
+\DeclareDocumentCommand \gap { som }
+ {
+ \protected@edef\next{#3}
+ \__fmdug_gap:nno {#1}{#2}{ \next } }
\NewDocumentCommand \dashundergapssetup { m }
{ \keys_set:nn {fmdug} {#1} \ignorespaces }
\DeclareDocumentCommand \TeacherModeOn {}
@@ -249,6 +262,7 @@
{ \l__fmdug_gapnum_format_tl }
\group_end:
}
+\cs_generate_variant:Nn \__fmdug_gap:nnn {nno}
\cs_new:Npn \__fmdug_display_total_gaps: {
\vfill \centering
\bfseries Total~ Gaps:~ \thetotalgapnumber
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/dashundergaps.tlpobj new/tlpkg/tlpobj/dashundergaps.tlpobj
--- old/tlpkg/tlpobj/dashundergaps.tlpobj 2019-02-28 03:31:08.000000000 +0100
+++ new/tlpkg/tlpobj/dashundergaps.tlpobj 2020-02-12 01:54:47.000000000 +0100
@@ -1,6 +1,6 @@
name dashundergaps
category Package
-revision 49198
+revision 53756
shortdesc Produce gaps that are underlined, dotted or dashed
relocated 1
longdesc The package provides commands (\underline, \dotuline and
@@ -10,11 +10,8 @@
longdesc a 'fill-in block' for student evaluation sheets.
runfiles size=3
RELOC/tex/latex/dashundergaps/dashundergaps.sty
-catalogue-contact-bugs https://github.com/FrankMittelbach/fmitex/issues
-catalogue-contact-home https://www.latex-project.org
catalogue-contact-repository https://github.com/FrankMittelbach/fmitex
catalogue-ctan /macros/latex/contrib/dashundergaps
-catalogue-date 2018-11-18 22:46:59 +0100
-catalogue-license lppl
+catalogue-license lppl1.3c
catalogue-topics underline line-patt
-catalogue-version 2.0d
+catalogue-version 2.0g
++++++ datatool.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datatool/CHANGES new/doc/latex/datatool/CHANGES
--- old/doc/latex/datatool/CHANGES 2018-12-07 23:50:44.000000000 +0100
+++ new/doc/latex/datatool/CHANGES 2019-09-28 23:32:49.000000000 +0200
@@ -1,3 +1,26 @@
+v2.32 (2019-09-27):
+
+ * datagidx.sty:
+
+ - added check for new 2019/10/01 LaTeX kernel when defining
+ \datagidxstripaccents.
+
+ ** Pre version 2.32 accent stripping in \newterm won't work with new LaTeX kernel. **
+
+ * datatool-base.sty:
+
+ - added \ifdtlcompareskipcs
+ (see https://www.dickimaw-books.com/bugtracker.php?action=view&key=99)
+
+ - bug fix (\dtlcompare not finding word breaks)
+ (https://www.dickimaw-books.com/bugtracker.php?action=view&key=100)
+
+ - bug fix (error if first command in assignment list is equal to \relax)
+ (https://www.dickimaw-books.com/bugtracker.php?action=view&key=106)
+
+ - bug fix (removed \relax from definitions of \DTLiffirstrow and \DTLiflastrow)
+ (https://www.dickimaw-books.com/bugtracker.php?action=view&key=130)
+
v2.31 (2018-12-07):
* datatool-base.sty:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datatool/README new/doc/latex/datatool/README
--- old/doc/latex/datatool/README 2018-12-07 23:50:44.000000000 +0100
+++ new/doc/latex/datatool/README 2019-09-28 23:32:49.000000000 +0200
@@ -1,6 +1,6 @@
-LaTeX Bundle : datatool v2.31
+LaTeX Bundle : datatool v2.32
-Last Modified : 2018-12-07
+Last Modified : 2019-09-27
Author : Nicola Talbot
Binary files old/doc/latex/datatool/datatool-code.pdf and new/doc/latex/datatool/datatool-code.pdf differ
Binary files old/doc/latex/datatool/datatool-user.pdf and new/doc/latex/datatool/datatool-user.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datatool/datatool-user.tex new/doc/latex/datatool/datatool-user.tex
--- old/doc/latex/datatool/datatool-user.tex 2018-12-07 23:50:44.000000000 +0100
+++ new/doc/latex/datatool/datatool-user.tex 2019-09-28 23:32:49.000000000 +0200
@@ -103,11 +103,11 @@
\MakeShortVerb{"}
- \title{User Manual for datatool bundle version~2.31}
+ \title{User Manual for datatool bundle version~2.32}
\author{Nicola L.C. Talbot\\
\url{http://www.dickimaw-books.com/}}
- \date{2018-12-07}
+ \date{2019-09-27}
\maketitle
\pagenumbering{roman}
@@ -122,7 +122,7 @@
\item[\url{datatool-code.pdf}]
Advanced users wishing to know more about the inner workings of
all the packages provided in the \styfmt{datatool} bundle should
- read \qt{Documented Code for datatool v2.31}
+ read \qt{Documented Code for datatool v2.32}
\item[INSTALL] Installation instructions.
@@ -130,6 +130,13 @@
\item[README] Package summary.
\end{description}
+Additional online resources:
+\begin{itemize}
+\item \styfmt{datatool} FAQ:
+\href{https://www.dickimaw-books.com/faqs/datatoolfaq.html}{dickimaw-books.com/faqs/datatoolfaq.html}
+\item Bug tracker: \href{https://www.dickimaw-books.com/bugtracker.php}{dickimaw-books.com/bugtracker.php}
+\item \styfmt{datatool} performance: \href{https://www.dickimaw-books.com/gallery/datatool-performance.shtml}{dickimaw-books.com/gallery/datatool-performance.shtml}
+\end{itemize}
\begin{important}
There's an old adage, ``use the right tool for the right job.''
@@ -2266,7 +2273,26 @@
\begin{definition}[\DescribeMacro\dtlicompare]
\cs{dtlicompare}\marg{register}\marg{A}\marg{B}
\end{definition}
-A case-insensitive comparison.
+A case-insensitive comparison. The two above commands work in much
+the same way except that the first compares character codes and the
+second compares the lowercase character codes. If control sequences
+are found then the comparison is determined by the conditional:
+\begin{definition}[\DescribeMacro\ifdtlcompareskipcs]
+\cs{ifdtlcompareskipcs}
+\end{definition}
+This is switched on with:
+\begin{definition}[\DescribeMacro\dtlcompareskipcstrue]
+\cs{dtlcompareskipcstrue}
+\end{definition}
+and switched off with:
+\begin{definition}[\DescribeMacro\dtlcompareskipcsfalse]
+\cs{dtlcompareskipcsfalse}
+\end{definition}
+The default setting is false (off). If true control sequences will
+be skipped. If false control sequences will considered as having the
+code 0.
+
+There are also two comparison commands designed for indexes:
\begin{definition}[\DescribeMacro\dtlwordindexcompare]
\cs{dtlwordindexcompare}\marg{register}\marg{A}\marg{B}
\end{definition}
@@ -2276,7 +2302,7 @@
\cs{dtlletterindexcompare}\marg{register}\marg{A}\marg{B}
\end{definition}
English letter-ordering comparison for indexes.
-Those last two commands are described in more detail in
+These last two commands are described in more detail in
\sectionref{sec:sort}.
For example:
@@ -6782,9 +6808,8 @@
name and text fields are set to \verb|mac\'edoine|.
\begin{important}
-The first letter must be grouped if it's an accent or ligature or a
-character outside the range \texttt{a}\ldots\texttt{z} or
-\texttt{A}\ldots\texttt{Z}.
+The first letter must be grouped if it's an accent or ligature
+command.
\end{important}
\item This example must have the sort and label fields set manually
@@ -6793,29 +6818,32 @@
\newterm[label=elite,sort=elite]{{\'e}lite}
\end{verbatim}
-\item The same applies if you are using the \sty{inputenc} package:
+\item This used to also apply when using the \sty{inputenc} package
+with older versions of \styfmt{datatool-base} and \styfmt{mfirstuc}.
+However now it's no longer necessary for accents:
\begin{verbatim}
-\newterm[label=elite,sort=elite]{{é}lite}
+\newterm{élite}
+\end{verbatim}
+
+\item Commands such as \ics{oe} aren't dealt with, so you must
+manually set the label and sort key:
+\begin{verbatim}
+\newterm[label=manoeuvre,sort=manoeuvre]{man\oe uvre}
\end{verbatim}
\item The same applies to plural terms set explicitly:
\begin{verbatim}
\newterm
[%
- plural={{œ}sophagi},%
+ plural={{\oe}sophagi},%
label={oesophagus},%
sort={oesophagus}%
]
- {{œ}sophagus}
-\end{verbatim}
-
-\item Commands such as \ics{oe} aren't dealt with, so you must
-manually set the label and sort key:
-\begin{verbatim}
-\newterm[label=manoeuvre,sort=manoeuvre]{man\oe uvre}
+ {{\oe}sophagus}
\end{verbatim}
-\item The same applies if you are using the \sty{inputenc} package:
+\item The same applies if you are using the \sty{inputenc} package
+to enter ligatures:
\begin{verbatim}
\newterm[label=manoeuvre,sort=manoeuvre]{manœuvre}
\end{verbatim}
Binary files old/doc/latex/datatool/samples/sample-autokeys.pdf and new/doc/latex/datatool/samples/sample-autokeys.pdf differ
Binary files old/doc/latex/datatool/samples/sample-barchart.pdf and new/doc/latex/datatool/samples/sample-barchart.pdf differ
Binary files old/doc/latex/datatool/samples/sample-datatooltk.pdf and new/doc/latex/datatool/samples/sample-datatooltk.pdf differ
Binary files old/doc/latex/datatool/samples/sample-dict.pdf and new/doc/latex/datatool/samples/sample-dict.pdf differ
Binary files old/doc/latex/datatool/samples/sample-europecv-bib.pdf and new/doc/latex/datatool/samples/sample-europecv-bib.pdf differ
Binary files old/doc/latex/datatool/samples/sample-gidx.pdf and new/doc/latex/datatool/samples/sample-gidx.pdf differ
Binary files old/doc/latex/datatool/samples/sample-glossary.pdf and new/doc/latex/datatool/samples/sample-glossary.pdf differ
Binary files old/doc/latex/datatool/samples/sample-index.pdf and new/doc/latex/datatool/samples/sample-index.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datatool/samples/sample-index.tex new/doc/latex/datatool/samples/sample-index.tex
--- old/doc/latex/datatool/samples/sample-index.tex 2013-01-16 00:01:04.000000000 +0100
+++ new/doc/latex/datatool/samples/sample-index.tex 2019-09-28 23:32:49.000000000 +0200
@@ -70,12 +70,10 @@
% other encodings.)
\newterm{macramé}
- % Take care if the first letter starts with an accent.
- % The initial accented letter must be grouped to ensure it works
- % with \makefirstuc, but this will make the default label '{e}lite'
- % rather than 'elite', so let's override the default:
+\newterm{élite}
-\newterm[label=elite]{{é}lite}
+ % Terms with ligatures need to have the label set explicitly:
+\newterm[label=manoeuvre]{manœuvre}
% Sometimes the default sort may not suit your requirements. In
% which case you can override it:
@@ -676,7 +674,8 @@
\gls{ma},
\gls{macabre},
\gls{macrame},
-\gls{macedoine}.
+\gls{macedoine},
+\gls{manoeuvre}.
\Gls{elite},
\gls{deem},
Binary files old/doc/latex/datatool/samples/sample-mail-merge.pdf and new/doc/latex/datatool/samples/sample-mail-merge.pdf differ
Binary files old/doc/latex/datatool/samples/sample-piechart.pdf and new/doc/latex/datatool/samples/sample-piechart.pdf differ
Binary files old/doc/latex/datatool/samples/sample-sort.pdf and new/doc/latex/datatool/samples/sample-sort.pdf differ
Binary files old/doc/latex/datatool/samples/sample-student-scores.pdf and new/doc/latex/datatool/samples/sample-student-scores.pdf differ
Binary files old/doc/latex/datatool/samples/sample-two-per-row.pdf and new/doc/latex/datatool/samples/sample-two-per-row.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datatool.doc.tlpobj new/tlpkg/tlpobj/datatool.doc.tlpobj
--- old/tlpkg/tlpobj/datatool.doc.tlpobj 2019-02-28 03:31:09.000000000 +0100
+++ new/tlpkg/tlpobj/datatool.doc.tlpobj 2019-11-07 18:45:46.000000000 +0100
@@ -1,6 +1,6 @@
name datatool.doc
category Package
-revision 49344
+revision 52663
shortdesc doc files of datatool
relocated 1
docfiles size=812
++++++ datatool.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/databar.sty new/tex/latex/datatool/databar.sty
--- old/tex/latex/datatool/databar.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/databar.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `databar.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databar}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{databar}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{dataplot}
\newif\ifDTLcolorbarchart
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/databib.sty new/tex/latex/datatool/databib.sty
--- old/tex/latex/datatool/databib.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/databib.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `databib.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{databib}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{databib}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{datatool}
\newcommand*{\dtlbib@style}{plain}
\define(a)choicekey{databib.sty}{style}{plain,abbrv,alpha}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/datagidx.sty new/tex/latex/datatool/datagidx.sty
--- old/tex/latex/datatool/datagidx.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/datagidx.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datagidx.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datagidx}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datagidx}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{datatool}
\RequirePackage{etoolbox}
\RequirePackage{xkeyval}
@@ -2221,15 +2221,31 @@
\def\{{\expandafter\@gobble\string\{}%
\def\}{\expandafter\@gobble\string\}}%
}
-\newcommand*{\datagidxstripaccents}{%
- \let\add@accent@\@secondoftwo
- \let\@text@composite@x\@secondoftwo
- \let\@tabacckludge\@secondoftwo
- \expandafter\def\csname \encodingdefault-cmd\endcsname##1##2##3{##3}%
- \expandafter\def\csname OT1-cmd\endcsname##1##2##3{##3}%
- \expandafter\def\csname T1-cmd\endcsname##1##2##3{##3}%
- \expandafter\def\csname PD1-cmd\endcsname##1##2##3{##3}%
- \def\IeC##1{\@gobbletwo##1}%
+\@ifl@t@r\fmtversion{2019/10/01}
+{%
+ \newcommand*{\datagidxstripaccents}{%
+ \let\add@accent@\@secondoftwo
+ \let\@text@composite@x\@secondoftwo
+ \let\@tabacckludge\@secondoftwo
+ \expandafter\def\csname \encodingdefault-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname OT1-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname T1-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname PD1-cmd\endcsname##1##2##3{##3}%
+ \def\IeC##1{\@gobbletwo##1}%
+ \let\UTFviii@two@octets\UTFviii@two@octets@combine
+ }%
+}
+{%
+ \newcommand*{\datagidxstripaccents}{%
+ \let\add@accent@\@secondoftwo
+ \let\@text@composite@x\@secondoftwo
+ \let\@tabacckludge\@secondoftwo
+ \expandafter\def\csname \encodingdefault-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname OT1-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname T1-cmd\endcsname##1##2##3{##3}%
+ \expandafter\def\csname PD1-cmd\endcsname##1##2##3{##3}%
+ \def\IeC##1{\@gobbletwo##1}%
+ }%
}
\providecommand{\newterm}{\datagidx@newterm}
\@onlypreamble\newterm
@@ -3215,16 +3231,7 @@
{%
\ifcsdef{datagidx@prev@loc@\Label}%
{%
- \protected@edef\@prev@location{%
- \csname datagidx@prev@loc@\Label\endcsname}%
- \@onelevel@sanitize\@prev@location
- \protected@edef\@cur@location{\CurrentLocation}%
- \@onelevel@sanitize\@cur@location
- \ifdefequal{\@prev@location}{\@cur@location}%
- {}%
- {%
- \global\let\@datagidx@dorerun@warn\@data@rerun@warn
- }%
+ \dtlgidx@checklocationchange
}%
{%
\global\let\@datagidx@dorerun@warn\@data@rerun@warn
@@ -3248,6 +3255,18 @@
{}%
}%
}
+\newcommand*{\dtlgidx@checklocationchange}{%
+ \protected@edef\@prev@location{%
+ \csname datagidx@prev@loc@\Label\endcsname}%
+ \@onelevel@sanitize\@prev@location
+ \protected@edef\@cur@location{\CurrentLocation}%
+ \@onelevel@sanitize\@cur@location
+ \ifdefequal{\@prev@location}{\@cur@location}%
+ {}%
+ {%
+ \global\let\@datagidx@dorerun@warn\@data@rerun@warn
+ }%
+}
\newcommand{\datagidx@doifdisplayed}[1]{%
\DTLifnull{\Location}%
{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/datapie.sty new/tex/latex/datatool/datapie.sty
--- old/tex/latex/datatool/datapie.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/datapie.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datapie.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datapie}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datapie}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{xkeyval}
\newif\ifDTLcolorpiechart
\DTLcolorpiecharttrue
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/dataplot.sty new/tex/latex/datatool/dataplot.sty
--- old/tex/latex/datatool/dataplot.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/dataplot.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `dataplot.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{dataplot}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{dataplot}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{tikz}
\RequirePackage{datatool}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/datatool-base.sty new/tex/latex/datatool/datatool-base.sty
--- old/tex/latex/datatool/datatool-base.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/datatool-base.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datatool-base.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-base}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datatool-base}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{etoolbox}
\RequirePackage{amsmath}
\RequirePackage{xkeyval}
@@ -1435,8 +1435,7 @@
\dtl@split@str##2\@nil
}%
}%
- \def\dtl@split@str##1#2\@nil{%
- \def#4{##1}}%
+ \def\dtl@split@str##1#2\@nil{\def#4{##1}}%
\dtl@splitstr#1#2\@nil
}
\newcommand{\DTLsubstituteall}[3]{%
@@ -1698,6 +1697,8 @@
#4%
}%
}
+\newif\ifdtlcompareskipcs
+\dtlcompareskipcsfalse
\newcommand*{\dtlcompare}[3]{%
\dtl@subnobrsp{#2}{\@dtl@argA}%
\dtl@subnobrsp{#3}{\@dtl@argB}%
@@ -1717,87 +1718,123 @@
#1=1\relax
}%
{%
- \DTLsubstituteall{\@dtl@argA}{ }{\space }%
- \DTLsubstituteall{\@dtl@argB}{ }{\space }%
+ \dtl@setwordbreaksnohyphens{\@dtl@argA}{\@dtl@wordbreak}%
+ \let\@dtl@argA\dtl@string
+ \dtl@setwordbreaksnohyphens{\@dtl@argB}{\@dtl@wordbreak}%
+ \let\@dtl@argB\dtl@string
\expandafter\dtl@getfirst\@dtl@argA\end@dtl@getfirst
\let\dtl@firstA=\dtl@first
\let\dtl@restA=\dtl@rest
\expandafter\dtl@getfirst\@dtl@argB\end@dtl@getfirst
\let\dtl@firstB=\dtl@first
\let\dtl@restB=\dtl@rest
- \expandafter\dtl@ifsingleorUTFviii\expandafter{\dtl@firstA}{%
- \expandafter\dtl@ifsingleorUTFviii\expandafter{\dtl@firstB}{%
- \expandafter\dtl@setcharcode\expandafter{\dtl@firstA}{\dtl@codeA}%
- \expandafter\dtl@setcharcode\expandafter{\dtl@firstB}{\dtl@codeB}%
- \ifnum\dtl@codeA=-1\relax
- \ifnum\dtl@codeB=-1\relax
- \edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
- \dtl@donext
- \else
- \edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}%
- {\expandonce\dtl@restA}%
- {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
- \dtl@donext
- \fi
- \else
- \ifnum\dtl@codeB=-1\relax
- \edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}%
- {\expandonce\dtl@firstA\expandonce\dtl@restA}%
- {\expandonce\dtl@restB}}%
- \dtl@donext
- \else
- \ifnum\dtl@codeA<\dtl@codeB
- #1=-1\relax
- \else
- \ifnum\dtl@codeA>\dtl@codeB
- #1=1\relax
+ \expandafter\dtl@ifsingleorUTFviii\expandafter{\dtl@firstA}%
+ {%
+ \expandafter\dtl@ifsingleorUTFviii\expandafter{\dtl@firstB}%
+ {%
+ \expandafter\dtl@setcharcode\expandafter{\dtl@firstA}{\dtl@codeA}%
+ \expandafter\dtl@setcharcode\expandafter{\dtl@firstB}{\dtl@codeB}%
+ \let\dtl@donextcompare\@firstofone
+ \ifdtlcompareskipcs
+ \ifnum\dtl@codeA=0\relax
+ \ifnum\dtl@codeB=0\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \else
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\@dtl@argB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \fi
\else
- \ifdefempty{\dtl@restA}%
- {%
- \ifdefempty{\dtl@restB}%
- {%
- #1=0\relax
- }%
- {%
- #1=-1\relax
- }%
- }%
- {%
- \ifdefempty{\restB}%
- {%
- #1=1\relax
- }%
- {%
- \protected@edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}{\dtl@restA}{\dtl@restB}}%
- \dtl@donext
- }%
- }%
+ \ifnum\dtl@codeB=0\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}{\expandonce\@dtl@argA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \fi
\fi
\fi
- \fi
- \fi
- }{%
- \edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}%
- {\expandonce\dtl@firstA\expandonce\dtl@restA}%
- {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
- \dtl@donext
- }}{%
- \edef\dtl@donext{%
- \noexpand\dtlcompare
- {\noexpand#1}%
- {\expandonce\dtl@firstA\expandonce\dtl@restA}%
- {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
- \dtl@donext
+ \dtl@donextcompare
+ {%
+ \ifnum\dtl@codeA=-1\relax
+ \ifnum\dtl@codeB=-1\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \else
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}%
+ {\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
+ \dtl@donext
+ \fi
+ \else
+ \ifnum\dtl@codeB=-1\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@restB}}%
+ \dtl@donext
+ \else
+ \ifnum\dtl@codeA<\dtl@codeB
+ #1=-1\relax
+ \else
+ \ifnum\dtl@codeA>\dtl@codeB
+ #1=1\relax
+ \else
+ \ifdefempty{\dtl@restA}%
+ {%
+ \ifdefempty{\dtl@restB}%
+ {%
+ #1=0\relax
+ }%
+ {%
+ #1=-1\relax
+ }%
+ }%
+ {%
+ \ifdefempty{\dtl@restB}%
+ {%
+ #1=1\relax
+ }%
+ {%
+ \protected@edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}{\dtl@restA}{\dtl@restB}}%
+ \dtl@donext
+ }%
+ }%
+ \fi
+ \fi
+ \fi
+ \fi
+ }%
+ }%
+ {%
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
+ \dtl@donext
+ }%
+ }%
+ {%
+ \edef\dtl@donext{%
+ \noexpand\dtlcompare
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
+ \dtl@donext
}%
}%
}%
@@ -2216,63 +2253,92 @@
{%
\expandafter\dtl@setlccharcode\expandafter{\dtl@firstA}{\dtl@codeA}%
\expandafter\dtl@setlccharcode\expandafter{\dtl@firstB}{\dtl@codeB}%
- \ifnum\dtl@codeA=-1\relax
- \ifnum\dtl@codeB=-1\relax
- \edef\dtl@donext{%
- \noexpand\dtlicompare{\noexpand#1}%
- {\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
- \dtl@donext
+ \let\dtl@donextcompare\@firstofone
+ \ifdtlcompareskipcs
+ \ifnum\dtl@codeA=0\relax
+ \ifnum\dtl@codeB=0\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \else
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}{\expandonce\dtl@restA}{\expandonce\@dtl@argB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \fi
\else
- \edef\dtl@donext{%
- \noexpand\dtlicompare
- {\noexpand#1}%
- {\expandonce\dtl@restA}%
- {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
- \dtl@donext
+ \ifnum\dtl@codeB=0\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}{\expandonce\@dtl@argA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \let\dtl@donextcompare\@gobble
+ \fi
\fi
- \else
- \ifnum\dtl@codeB=-1\relax
- \edef\dtl@donext{%
- \noexpand\dtlicompare
- {\noexpand#1}%
- {\expandonce\dtl@firstA\expandonce\dtl@restA}%
- {\expandonce\dtl@restB}}%
- \dtl@donext
+ \fi
+ \dtl@donextcompare
+ {%
+ \ifnum\dtl@codeA=-1\relax
+ \ifnum\dtl@codeB=-1\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare{\noexpand#1}%
+ {\expandonce\dtl@restA}{\expandonce\dtl@restB}}%
+ \dtl@donext
+ \else
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}%
+ {\expandonce\dtl@restA}%
+ {\expandonce\dtl@firstB\expandonce\dtl@restB}}%
+ \dtl@donext
+ \fi
\else
- \ifnum\dtl@codeA<\dtl@codeB
- #1=-1\relax
+ \ifnum\dtl@codeB=-1\relax
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}%
+ {\expandonce\dtl@firstA\expandonce\dtl@restA}%
+ {\expandonce\dtl@restB}}%
+ \dtl@donext
\else
- \ifnum\dtl@codeA>\dtl@codeB
- #1=1\relax
+ \ifnum\dtl@codeA<\dtl@codeB
+ #1=-1\relax
\else
- \ifdefempty{\dtl@restA}%
- {%
- \ifdefempty{\dtl@restB}%
- {%
- #1=0\relax
- }%
+ \ifnum\dtl@codeA>\dtl@codeB
+ #1=1\relax
+ \else
+ \ifdefempty{\dtl@restA}%
{%
- #1=-1\relax
- }%
- }%
- {%
- \ifdefempty{\restB}%
- {%
- #1=1\relax
+ \ifdefempty{\dtl@restB}%
+ {%
+ #1=0\relax
+ }%
+ {%
+ #1=-1\relax
+ }%
}%
{%
- \edef\dtl@donext{%
- \noexpand\dtlicompare
- {\noexpand#1}%
- {\expandonce\dtl@restA}%
- {\expandonce\dtl@restB}}%
- \dtl@donext
+ \ifdefempty{\dtl@restB}%
+ {%
+ #1=1\relax
+ }%
+ {%
+ \edef\dtl@donext{%
+ \noexpand\dtlicompare
+ {\noexpand#1}%
+ {\expandonce\dtl@restA}%
+ {\expandonce\dtl@restB}}%
+ \dtl@donext
+ }%
}%
- }%
+ \fi
\fi
\fi
\fi
- \fi
+ }%
}%
{%
\edef\dtl@donext{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/datatool-fp.sty new/tex/latex/datatool/datatool-fp.sty
--- old/tex/latex/datatool/datatool-fp.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/datatool-fp.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datatool-fp.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-fp}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datatool-fp}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{fp}
\RequirePackage{datatool-base}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/datatool-pgfmath.sty new/tex/latex/datatool/datatool-pgfmath.sty
--- old/tex/latex/datatool/datatool-pgfmath.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/datatool-pgfmath.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datatool-pgfmath.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool-pgfmath}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datatool-pgfmath}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{pgfrcs,pgfkeys,pgfmath}
\ProcessOptionsX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/datatool.sty new/tex/latex/datatool/datatool.sty
--- old/tex/latex/datatool/datatool.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/datatool.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `datatool.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datatool}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{datatool}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{ifthen}
\RequirePackage{xfor}
@@ -637,7 +637,7 @@
{%
{%
\dtlgetrow{#1}{#2}%
- \@dtl@assign{#3}{#1}%
+ \@dtl@assign{#3}{#1}%
}%
}%
{%
@@ -1330,7 +1330,7 @@
\gdef\DTLiffirstrow##1##2{%
\expandafter\ifnum
\csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname
- =1\relax
+ =1 %space intended
##1%
\else
##2%
@@ -1341,7 +1341,7 @@
\gdef\DTLiflastrow##1##2{%
\expandafter\ifnum
\csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname
- =\csname dtlrows@#2\endcsname\relax
+ =\csname dtlrows@#2\endcsname
##1%
\else
##2%
@@ -1380,10 +1380,7 @@
\expandafter\global
\csname @dtl@next\romannumeral\dtlforeachlevel\endcsname
= \dtlafterrow
- \ifx\relax#3\relax
- \else
- \@dtl@assign{#3}{#2}%
- \fi
+ \ifblank{#3}{}{\@dtl@assign{#3}{#2}}%
\ifthenelse{#1}%
{%
\refstepcounter{DTLrow\romannumeral\dtlforeachlevel}%
@@ -1484,7 +1481,7 @@
\gdef\DTLiffirstrow##1##2{%
\expandafter\ifnum
\csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname
- =1\relax
+ =1 % space intended
##1%
\else
##2%
@@ -1495,7 +1492,7 @@
\gdef\DTLiflastrow##1##2{%
\expandafter\ifnum
\csname c@DTLrow\romannumeral\dtlforeachlevel\endcsname
- =\csname dtlrows@#2\endcsname\relax
+ =\csname dtlrows@#2\endcsname
##1%
\else
##2%
@@ -1522,11 +1519,11 @@
\expandafter\global
\csname @dtl@cur\romannumeral\dtlforeachlevel\endcsname
= \expandafter{\dtl@thisrow}%
- \ifx\relax#3\relax
- \else
+ \ifblank{#3}{}
+ {%
\dtlcurrentrow=\expandafter{\dtl@thisrow}%
\@dtl@assign{#3}{#2}%
- \fi
+ }%
\ifthenelse{#1}%
{%
\refstepcounter{DTLrow\romannumeral\dtlforeachlevel}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datatool/person.sty new/tex/latex/datatool/person.sty
--- old/tex/latex/datatool/person.sty 2018-12-07 23:50:44.000000000 +0100
+++ new/tex/latex/datatool/person.sty 2019-09-28 23:32:49.000000000 +0200
@@ -7,7 +7,7 @@
%% datatool.dtx (with options: `person.sty,package')
%%
%% datatool.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{person}[2018/12/07 v2.31 (NLCT)]
+\ProvidesPackage{person}[2019/09/27 v2.32 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{datatool}
\newcounter{people}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datatool.tlpobj new/tlpkg/tlpobj/datatool.tlpobj
--- old/tlpkg/tlpobj/datatool.tlpobj 2019-02-28 03:31:12.000000000 +0100
+++ new/tlpkg/tlpobj/datatool.tlpobj 2019-11-07 18:45:47.000000000 +0100
@@ -1,6 +1,6 @@
name datatool
category Package
-revision 49344
+revision 52663
shortdesc Tools to load and manipulate data
relocated 1
longdesc The tools comprise six packages: datatool.sty: databases may be
@@ -30,6 +30,10 @@
longdesc document, thus avoiding cumbersome use of "he/she", etc. The
longdesc drawing packages make use of PGF/TikZ for their output. The
longdesc bundle supersedes and replaces the author's csvtools bundle.
+depend fp
+depend substr
+depend xfor
+depend xkeyval
runfiles size=119
RELOC/bibtex/bst/datatool/databib.bst
RELOC/tex/latex/datatool/databar.sty
@@ -43,7 +47,7 @@
RELOC/tex/latex/datatool/datatool.sty
RELOC/tex/latex/datatool/person.sty
catalogue-ctan /macros/latex/contrib/datatool
-catalogue-date 2018-12-07 19:56:10 +0100
+catalogue-date 2019-09-27 21:27:57 +0200
catalogue-license lppl1.3
catalogue-topics data-import data-disp data-manip
-catalogue-version 2.31
+catalogue-version 2.32
++++++ datetime2.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2/CHANGES new/doc/latex/datetime2/CHANGES
--- old/doc/latex/datetime2/CHANGES 2018-07-21 00:07:31.000000000 +0200
+++ new/doc/latex/datetime2/CHANGES 2020-03-03 23:57:40.000000000 +0100
@@ -1,3 +1,17 @@
+1.5.6 (2020-03-02):
+
+ * removed spurious space in \DTMsetregional
+
+1.5.5 (2019-11-11):
+
+ * added check for \TrackIfKnownLanguage (provided by tracklang v1.3.9)
+
+ * added \DTMfinaldot and starred versions of \DTMdate and \DTMDate
+
+1.5.4 (2019-10-21):
+
+ * renamed scratch variables to avoid conflict
+
1.5.3 (2018-07-20):
* Bug fix: removed unwanted \relax inserted in negative time zones
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/datetime2/README new/doc/latex/datetime2/README
--- old/doc/latex/datetime2/README 2018-07-21 00:07:31.000000000 +0200
+++ new/doc/latex/datetime2/README 2020-03-03 23:57:40.000000000 +0100
@@ -1,8 +1,15 @@
-LaTeX Package : datetime2 v1.5.3
-
-Last Modified : 2018-07-20
+LaTeX Package : datetime2 v1.5.6 (2020-03-02)
Author : Nicola Talbot
+ https://www.dickimaw-books.com/contact
+
+LICENCE
+
+This material is subject to the LaTeX Project Public License.
+See http://www.ctan.org/license/lppl1.3
+for the details of that license.
+
+Copyright 2015-2020 Nicola Talbot
Provides commands for formatting dates, times and time zones.
Language and regional support is provided by independently
@@ -11,8 +18,5 @@
The datetime2 package replaces the datetime package, which is now
obsolete.
-This material is subject to the LaTeX Project Public License.
-See http://www.ctan.org/license/lppl1.3 for the details of that license.
-
http://www.dickimaw-books.com/
Binary files old/doc/latex/datetime2/datetime2.pdf and new/doc/latex/datetime2/datetime2.pdf differ
Binary files old/doc/latex/datetime2/samples/datetime2-sample-babel.pdf and new/doc/latex/datetime2/samples/datetime2-sample-babel.pdf differ
Binary files old/doc/latex/datetime2/samples/datetime2-sample-calc.pdf and new/doc/latex/datetime2/samples/datetime2-sample-calc.pdf differ
Binary files old/doc/latex/datetime2/samples/datetime2-sample-filedate.pdf and new/doc/latex/datetime2/samples/datetime2-sample-filedate.pdf differ
Binary files old/doc/latex/datetime2/samples/datetime2-sample-hyperref.pdf and new/doc/latex/datetime2/samples/datetime2-sample-hyperref.pdf differ
Binary files old/doc/latex/datetime2/samples/datetime2-sample-journal.pdf and new/doc/latex/datetime2/samples/datetime2-sample-journal.pdf differ
Binary files old/doc/latex/datetime2/samples/datetime2-sample-styles.pdf and new/doc/latex/datetime2/samples/datetime2-sample-styles.pdf differ
Binary files old/doc/latex/datetime2/samples/datetime2-sample-xe.pdf and new/doc/latex/datetime2/samples/datetime2-sample-xe.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2.doc.tlpobj new/tlpkg/tlpobj/datetime2.doc.tlpobj
--- old/tlpkg/tlpobj/datetime2.doc.tlpobj 2019-02-28 03:31:14.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2.doc.tlpobj 2020-03-04 23:50:32.000000000 +0100
@@ -1,9 +1,9 @@
name datetime2.doc
category Package
-revision 48236
+revision 54080
shortdesc doc files of datetime2
relocated 1
-docfiles size=265
+docfiles size=266
RELOC/doc/latex/datetime2/CHANGES
RELOC/doc/latex/datetime2/README
RELOC/doc/latex/datetime2/datetime2.pdf
++++++ datetime2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2/datetime2-calc.sty new/tex/latex/datetime2/datetime2-calc.sty
--- old/tex/latex/datetime2/datetime2-calc.sty 2018-07-21 00:07:31.000000000 +0200
+++ new/tex/latex/datetime2/datetime2-calc.sty 2020-03-03 23:57:40.000000000 +0100
@@ -7,7 +7,7 @@
%% datetime2.dtx (with options: `datetime2-calc.sty,package')
%%
%% datetime2.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2020 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datetime2-calc}[2018/07/20 v1.5.3 (NLCT)]
+\ProvidesPackage{datetime2-calc}[2020/03/02 v1.5.6 (NLCT)]
\RequirePackage{pgfkeys}
\RequirePackage{pgfcalendar}
\newcount\@dtm@julianday
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/datetime2/datetime2.sty new/tex/latex/datetime2/datetime2.sty
--- old/tex/latex/datetime2/datetime2.sty 2018-07-21 00:07:31.000000000 +0200
+++ new/tex/latex/datetime2/datetime2.sty 2020-03-03 23:57:40.000000000 +0100
@@ -7,7 +7,7 @@
%% datetime2.dtx (with options: `datetime2.sty,package')
%%
%% datetime2.dtx
-%% Copyright 2018 Nicola Talbot
+%% Copyright 2020 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{datetime2}[2018/07/20 v1.5.3 (NLCT) date and time formats]
+\ProvidesPackage{datetime2}[2020/03/02 v1.5.6 (NLCT) date and time formats]
\RequirePackage{tracklang}
\RequirePackage{etoolbox}
\RequirePackage{xkeyval}[2006/11/18]
@@ -129,10 +129,10 @@
\define(a)boolkey{datetime2.sty}[DTM]{showzoneminutes}[true]{}
\DTMshowzoneminutestrue
\newcommand*{\DTMifcaseregional}[3]{#1}
-\define(a)choicekey{datetime2.sty}{useregional}[\val\nr]%
+\define@choicekey{datetime2.sty}{useregional}[\@dtm@useregional@val\@dtm@useregional@nr]%
{false,text,numeric,num}[text]%
{%
- \ifcase\nr\relax
+ \ifcase\@dtm@useregional@nr\relax
\renewcommand*{\DTMifcaseregional}[3]{##1}%
\or
\renewcommand*{\DTMifcaseregional}[3]{##2}%
@@ -185,12 +185,28 @@
\DeclareOptionX*{%
\ifcsundef{@tracklang@add@\CurrentOption}%
{%
- \PackageError{datetime2}{`\CurrentOption' is not a recognised dialect.
- \MessageBreak Perhaps you have misspelt it or the
- \MessageBreak named dialect may be unsupported or
- \MessageBreak perhaps you forgot to use the `style' key}%
- {Any options that aren't described in the manual are assumed
- \MessageBreak to be language or dialect names.}%
+ \ifundef\TrackIfKnownLanguage
+ {%
+ \PackageError{datetime2}{Unrecognised dialect `\CurrentOption'.
+ If you are using a valid ISO language code
+ please update tracklang.sty to at least v1.3.9}%
+ {Any options that aren't described in the manual are assumed
+ \MessageBreak to be language or dialect names.}%
+ }%
+ {%
+ \TrackIfKnownLanguage{\CurrentOption}%
+ {\renewcommand*{\DTMifcaseregional}[3]{#2}}%
+ {%
+ \PackageError{datetime2}{`\CurrentOption' is not a recognised dialect
+ \MessageBreak and doesn't contain a known language code.
+ \MessageBreak Perhaps you have misspelt it or the
+ \MessageBreak named dialect may be unsupported or
+ \MessageBreak perhaps you forgot the `<key>=' part
+ \MessageBreak for example, `style=\CurrentOption'}%
+ {Any options that aren't described in the manual are assumed
+ \MessageBreak to be language or dialect names.}%
+ }%
+ }%
}%
{%
\TrackPredefinedDialect{\CurrentOption}%
@@ -476,14 +492,29 @@
\number#1\dtm@yearmonthsep\DTMtwodigits{#2}\dtm@monthdaysep\DTMtwodigits{#3}%
}%
\newcommand*{\DTMDisplaydate}{\DTMdisplaydate}
-\newrobustcmd*{\DTMdate}[1]{%
+\newcommand*{\DTMfinaldot}{.}
+\newrobustcmd*{\DTMdate}{\@ifstar\@sDTMdate\@DTMdate}
+\newcommand*{\@DTMdate}[1]{%
\expandafter\@dtm@parsedate#1\@dtm@endparsedate
\DTMdisplaydate{\@dtm@year}{\@dtm@month}{\@dtm@day}{\@dtm@dow}%
}
-\newrobustcmd*{\DTMDate}[1]{%
+\newcommand*{\@sDTMdate}[1]{%
+ {%
+ \let\DTMfinaldot\empty
+ \@DTMdate{#1}%
+ }%
+}
+\newrobustcmd*{\DTMDate}{\@ifstar\@sDTMDate\@DTMDate}
+\newcommand*{\@DTMDate}[1]{%
\expandafter\@dtm@parsedate#1\@dtm@endparsedate
\DTMDisplaydate{\@dtm@year}{\@dtm@month}{\@dtm@day}{\@dtm@dow}%
}
+\newcommand*{\@sDTMDate}[1]{%
+ {%
+ \let\DTMfinaldot\empty
+ \@DTMDate{#1}%
+ }%
+}
\newcommand*{\DTMcurrenttime}{%
\DTMdisplaytime
{\@dtm@currenthour}%
@@ -900,9 +931,9 @@
\DTMsetstyle{default}%
}%
{%
- \ifcsdef{date\languagename}
+ \ifcsdef{date\languagename}%
{%
- \csuse{date\languagename}
+ \csuse{date\languagename}%
}%
{%
\ForEachTrackedDialect{\@dtm@thisdialect}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/datetime2.tlpobj new/tlpkg/tlpobj/datetime2.tlpobj
--- old/tlpkg/tlpobj/datetime2.tlpobj 2019-02-28 03:31:15.000000000 +0100
+++ new/tlpkg/tlpobj/datetime2.tlpobj 2020-03-04 23:50:33.000000000 +0100
@@ -1,6 +1,6 @@
name datetime2
category Package
-revision 48236
+revision 54080
shortdesc Formats for dates, times and time zones
relocated 1
longdesc This package provides commands for formatting dates, times and
@@ -19,7 +19,6 @@
RELOC/tex/latex/datetime2/datetime2.sty
catalogue-contact-home http://www.dickimaw-books.com/faqs/datetime2faq.html
catalogue-ctan /macros/latex/contrib/datetime2
-catalogue-date 2018-07-20 14:37:08 +0200
catalogue-license lppl1.3
catalogue-topics date-time multilingual
-catalogue-version 1.5.3
+catalogue-version 1.5.6
1
0
Hello community,
here is the log from the commit of package texlive-specs-e for openSUSE:Factory checked in at 2020-05-29 21:17:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-e (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-e.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-e"
Fri May 29 21:17:07 2020 rev:40 rq:806887 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-e/texlive-specs-e.changes 2019-11-07 23:10:10.124110792 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-e.new.3606/texlive-specs-e.changes 2020-05-29 21:24:12.504292775 +0200
@@ -1,0 +2,60 @@
+Mon May 18 08:47:10 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Wed May 6 11:27:35 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Scan *.def files as well for RequirePackage
+
+-------------------------------------------------------------------
+Tue May 5 13:55:07 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- Update to TeXLive 2020
+ * Port patches
+ kpathsea_cnf.dif
+ latexpand_perl.dif
+ luaotfload_varfonts.dif
+ luatex_cnf.dif
+ musixtex_various.dif
+ * Delete patches not needed anymore as files have moved
+ tetex_scripts.dif
+ * Delete patche updmap-map_roboto.dif as fixed upstream
+ * Add new patches to catch moved files
+ texlive-scripts-extra_scripts.dif
+ texlive-scripts_scripts.dif
+ * Add new patch xetex_conf.dif to fit FHS location
+ * Remove TeXLive installer files breaking rpm database
+ texlive-scripts.removes
+
+-------------------------------------------------------------------
New:
----
checkend.doc.tar.xz
checkend.tar.xz
chemplants.doc.tar.xz
chemplants.tar.xz
chicagoa.tar.xz
chklref.doc.tar.xz
chklref.tar.xz
chordbox.doc.tar.xz
chordbox.tar.xz
circledsteps.doc.tar.xz
circledsteps.tar.xz
circuit-macros.doc.tar.xz
circuit-macros.tar.xz
clara.doc.tar.xz
clara.tar.xz
clojure-pamphlet.doc.tar.xz
clojure-pamphlet.tar.xz
cmupint.doc.tar.xz
cmupint.tar.xz
codeanatomy.doc.tar.xz
codeanatomy.tar.xz
compare.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-e.spec ++++++
++++ 18198 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-e/texlive-specs-e.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-e.new.3606/texlive-specs-e.spec
++++++ checkcites.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/checkcites/README new/texmf-dist/doc/support/checkcites/README
--- old/texmf-dist/doc/support/checkcites/README 2017-08-26 00:26:15.000000000 +0200
+++ new/texmf-dist/doc/support/checkcites/README 2019-09-03 23:15:51.000000000 +0200
@@ -1,10 +1,10 @@
-checkcites.lua -- Version 2.0 from August 25, 2017.
-===================================================
+checkcites.lua -- Version 2.4 from September 3, 2019.
+=====================================================
License
-------
-Copyright (c) 2012, 2017 Enrico Gregorio, Paulo Roberto Massa Cereda
+Copyright (c) 2012, 2019 Enrico Gregorio, Paulo Roberto Massa Cereda
- Enrico dot Gregorio at univr dot it
- cereda at users dot sf dot net
Binary files old/texmf-dist/doc/support/checkcites/checkcites-doc.pdf and new/texmf-dist/doc/support/checkcites/checkcites-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/checkcites/checkcites-doc.tex new/texmf-dist/doc/support/checkcites/checkcites-doc.tex
--- old/texmf-dist/doc/support/checkcites/checkcites-doc.tex 2017-08-26 00:26:15.000000000 +0200
+++ new/texmf-dist/doc/support/checkcites/checkcites-doc.tex 2019-09-03 23:15:51.000000000 +0200
@@ -1,3 +1,7 @@
+% arara: pdflatex
+% arara: pdflatex
+% arara: pdflatex
+% arara: clean: { extensions: [ listing, out, aux, log, toc ] }
\documentclass[12pt,a4paper]{article}
\usepackage[T1]{fontenc}
@@ -16,7 +20,7 @@
\newcommand{\checkcites}{\texttt{checkcites}}
\newcommand{\email}[1]{\small\texttt{#1}}
-\newcommand{\version}{Version 2.0 from August 25, 2017.}
+\newcommand{\version}{Version 2.4 from September 3, 2019.}
\newenvironment{infoblock}[1]
{\par\addvspace{\medskipamount}
@@ -62,9 +66,10 @@
modern \TeX\ distribution.
\begin{infoblock}{Attention!}
-\checkcites\ is known to run with the most recent \verb|texlua| and
-\verb|lua| interpreters. Unfortunately, the code is incompatible with
-interpreters prior to the Lua 5.1 language specification.
+From version 2.1 on, \checkcites\ relies on specific libraries available
+in the \verb|texlua| ecosystem and thus is not be supported in vanilla
+\verb|lua| interpreters. Please make sure to use this script with an
+updated \verb|texlua| interpreter in order to ensure the correct behaviour.
\end{infoblock}
\section{How the script works}
@@ -222,8 +227,8 @@
| _| | -_| _| '_| _| | _| -_|_ -|
|___|_|_|___|___|_,_|___|_|_| |___|___|
-checkcites.lua -- a reference checker script (v2.0)
-Copyright (c) 2012, 2017, Enrico Gregorio, Paulo Roberto Massa Cereda
+checkcites.lua -- a reference checker script (v2.4)
+Copyright (c) 2012, 2019, Enrico Gregorio, Paulo Roberto Massa Cereda
--------------------------------------------------------------------------
I am sorry, but you have not provided any command line argument, including
@@ -258,8 +263,8 @@
| _| | -_| _| '_| _| | _| -_|_ -|
|___|_|_|___|___|_,_|___|_|_| |___|___|
-checkcites.lua -- a reference checker script (v2.0)
-Copyright (c) 2012, 2017, Enrico Gregorio, Paulo Roberto Massa Cereda
+checkcites.lua -- a reference checker script (v2.1)
+Copyright (c) 2012, 2019, Enrico Gregorio, Paulo Roberto Massa Cereda
Usage: checkcites.lua [ [ --all | --unused | --undefined ] [ --backend
<arg> ] <file> [ <file 2> ... <file n> ] | --help | --version ]
@@ -267,6 +272,7 @@
-a,--all list all unused and undefined references
-u,--unused list only unused references in your bibliography files
-U,--undefined list only undefined references in your TeX source file
+-c,--crossrefs enable cross-reference checks (disabled by default)
-b,--backend <arg> set the backend-based file lookup policy
-h,--help print the help message
-v,--version print the script version
@@ -318,8 +324,8 @@
| _| | -_| _| '_| _| | _| -_|_ -|
|___|_|_|___|___|_,_|___|_|_| |___|___|
-checkcites.lua -- a reference checker script (v2.0)
-Copyright (c) 2012, 2017, Enrico Gregorio, Paulo Roberto Massa Cereda
+checkcites.lua -- a reference checker script (v2.4)
+Copyright (c) 2012, 2019, Enrico Gregorio, Paulo Roberto Massa Cereda
Great, I found 4 citations in 1 file. I also found 1 bibliography file. Let
me check this file and extract the references. Please wait a moment.
@@ -459,8 +465,8 @@
| _| | -_| _| '_| _| | _| -_|_ -|
|___|_|_|___|___|_,_|___|_|_| |___|___|
-checkcites.lua -- a reference checker script (v2.0)
-Copyright (c) 2012, 2017, Enrico Gregorio, Paulo Roberto Massa Cereda
+checkcites.lua -- a reference checker script (v2.4)
+Copyright (c) 2012, 2019, Enrico Gregorio, Paulo Roberto Massa Cereda
Great, I found 4 citations in 1 file. I also found 1 bibliography file. Let
me check this file and extract the references. Please wait a moment.
@@ -487,7 +493,18 @@
\end{verbatim}
\end{terminal}
-That is all, folks!
+If you rely on cross-references in your bibliography file, \checkcites\ might complain about
+unused entries. We can try the experimental feature available from version 2.3 on that attempts
+to check cross-references through the \verb|--crossrefs| command line flag:
+
+\begin{terminal}
+\begin{verbatim}
+$ checkcites --crossrefs document.aux
+\end{verbatim}
+\end{terminal}
+
+This feature is disabled by default and it is known to work with both \verb|bibtex| and \verb|biber|
+backends. Please report if you find an issue. That is all, folks!
\section{License}
\label{sec:license}
@@ -498,8 +515,4 @@
donation, the best way to do this is donating to the
\href{http://www.tug.org/}{TeX Users Group}.
-\begin{infoblock}{Official code repository}
-\url{http://github.com/cereda/checkcites}
-\end{infoblock}
-
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/checkcites.doc.tlpobj new/tlpkg/tlpobj/checkcites.doc.tlpobj
--- old/tlpkg/tlpobj/checkcites.doc.tlpobj 2019-02-28 03:25:15.000000000 +0100
+++ new/tlpkg/tlpobj/checkcites.doc.tlpobj 2019-09-04 01:54:57.000000000 +0200
@@ -1,8 +1,8 @@
name checkcites.doc
category Package
-revision 45131
+revision 52022
shortdesc doc files of checkcites
-docfiles size=61
+docfiles size=78
texmf-dist/doc/support/checkcites/README
texmf-dist/doc/support/checkcites/checkcites-doc.pdf
texmf-dist/doc/support/checkcites/checkcites-doc.tex
++++++ checkcites.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/checkcites/checkcites.lua new/texmf-dist/scripts/checkcites/checkcites.lua
--- old/texmf-dist/scripts/checkcites/checkcites.lua 2017-08-26 00:26:15.000000000 +0200
+++ new/texmf-dist/scripts/checkcites/checkcites.lua 2019-09-03 23:15:51.000000000 +0200
@@ -1,7 +1,7 @@
#!/usr/bin/env texlua
-- -----------------------------------------------------------------
-- checkcites.lua
--- Copyright 2012, 2017, Enrico Gregorio, Paulo Roberto Massa Cereda
+-- Copyright 2012, 2019, Enrico Gregorio, Paulo Roberto Massa Cereda
--
-- This work may be distributed and/or modified under the conditions
-- of the LaTeX Project Public License, either version 1.3 of this
@@ -145,6 +145,19 @@
return lines
end
+-- Gets a pluralized word based on a counter.
+-- @param i Counter.
+-- @param a Word in singular.
+-- @param b Word in plural.
+-- @return Either the first or second word based on the counter.
+local function plural(i, a, b)
+ if i == 1 then
+ return a
+ else
+ return b
+ end
+end
+
-- Normalizes the string, removing leading and trailing spaces.
-- @param str String.
-- @return Normalized string without leading and trailing spaces.
@@ -167,15 +180,28 @@
return false
end
+-- Checks if the key is allowed.
+-- @param v The key itself.
+-- @return Boolean value if the key is allowed.
+local function allowed(key)
+ local keys = { 'string', 'comment' }
+ for _, v in ipairs(keys) do
+ if string.lower(key) == v then
+ return false
+ end
+ end
+ return true
+end
+
-- Extracts the biblographic key.
-- @param lines Lines of a file.
-- @return Table containing bibliographic keys.
local function extract(lines)
local result = {}
for _, line in ipairs(lines) do
- local hit = string.match(line,
- '^%s*%(a)%w+%s*{%s*(.+),')
- if hit then
+ local key, hit = string.match(line,
+ '^%s*%(a)(%w+%s*){%s*(.+),')
+ if key and allowed(key) then
if not exists(result, hit) then
hit = normalize(hit)
table.insert(result, hit)
@@ -185,29 +211,91 @@
return result
end
--- Gets a pluralized word based on a counter.
--- @param i Counter.
--- @param a Word in singular.
--- @param b Word in plural.
--- @return Either the first or second word based on the counter.
-local function plural(i, a, b)
- if i == 1 then
- return a
+-- Extracts the cross-references found
+-- in lines of the bibligraphy file.
+-- @param lines Line of a file.
+-- @return Table containing cross-references.
+local function crossref(lines)
+ local result, lookup, key, hit = {}, ''
+ for _, line in ipairs(lines) do
+ key, hit = string.match(line,
+ '^%s*%(a)(%w+%s*){%s*(.+),')
+ if key and allowed(key) then
+ lookup = normalize(hit)
+ else
+ key, hit = string.match(line,
+ '^%s*(%w+)%s*=%s*(.+)$')
+ if key then
+ key = string.lower(key)
+ if key == 'crossref' then
+ if string.sub(hit, -1) == ',' then
+ hit = string.sub(hit, 2, -3)
+ else
+ hit = string.sub(hit, 2, -2)
+ end
+ result[lookup] = hit
+ end
+ end
+ end
+ end
+ return result
+end
+
+-- Adds the extension if the file does not have it.
+-- @param file File.
+-- @param extension Extension.
+-- @return File with proper extension.
+local function sanitize(file, extension)
+ extension = '.' .. extension
+ if string.sub(file, -#extension) ~= extension then
+ file = file .. extension
+ end
+ return file
+end
+
+-- Checks if a file exists.
+-- @param file File.
+-- @return Boolean value indicating if the file exists.
+local function valid(file)
+ local handler = io.open(file, 'r')
+ if handler then
+ handler:close()
+ return true
else
- return b
+ return false
end
end
+-- Wraps a string based on a line width.
+-- @param str String.
+-- @param size Line width.
+-- @return Wrapped string.
+local function wrap(str, size)
+ local parts = split(str, '[^%s]+')
+ local r, l = '', ''
+ for _, v in ipairs(parts) do
+ if (#l + #v) > size then
+ r = r .. '\n' .. l
+ l = v
+ else
+ l = normalize(l .. ' ' .. v)
+ end
+ end
+ r = normalize(r .. '\n' .. l)
+ return r
+end
+
-- Backend namespace
local backends = {}
-- Gets data from auxiliary files (BibTeX).
-- @param lines Lines of a file.
+-- @param rec Recursive switch.
-- @return Boolean indicating if an asterisk was found.
-- @return Table containing the citations.
-- @return Table containing the bibliography files.
-backends.bibtex = function(lines)
- local citations, bibliography = {}, {}
+backends.bibtex = function(lines, rec)
+ local citations, bibliography, invalid = {}, {}, {}
local asterisk, parts, hit = false
for _, line in ipairs(lines) do
hit = string.match(line, '^%s*\\citation{(.+)}$')
@@ -234,18 +322,52 @@
table.insert(bibliography, v)
end
end
+ else
+ hit = string.match(line, '^%s*\\(a)input{(.+)}$')
+ if rec and hit then
+ hit = sanitize(hit, 'aux')
+ if not valid(hit) then
+ table.insert(invalid, hit)
+ else
+ local a, b, c = backends.bibtex(read(hit), false)
+ asterisk = asterisk or a
+ for _, v in ipairs(b) do
+ if not exists(citations, v) then
+ table.insert(citations, v)
+ end
+ end
+ for _, v in ipairs(c) do
+ if not exists(bibliography, v) then
+ table.insert(bibliography, v)
+ end
+ end
+ end
+ end
end
end
end
+ if #invalid ~= 0 then
+ print()
+ print(wrap('Warning: there ' .. plural(#invalid,
+ 'is an invalid reference ', 'are ' ..
+ 'invalid references ') .. 'to the ' ..
+ 'following auxiliary ' .. plural(#invalid,
+ 'file ', 'files ') .. 'that could not ' ..
+ 'be resolved at runtime:', 74))
+ for _, v in ipairs(invalid) do
+ print('=> ' .. v)
+ end
+ end
return asterisk, citations, bibliography
end
-- Gets data from auxiliary files (Biber).
-- @param lines Lines of a file.
+-- @param _ To be discarded with biber.
-- @return Boolean indicating if an asterisk was found.
-- @return Table containing the citations.
-- @return Table containing the bibliography files.
-backends.biber = function(lines)
+backends.biber = function(lines, _)
local citations, bibliography = {}, {}
local asterisk, parts, hit = false
for _, line in ipairs(lines) do
@@ -294,28 +416,16 @@
-- Repeats the provided char a certain number of times.
-- @param c Char.
--- @param w Number of times.
+-- @param size Number of times.
-- @return String with a char repeated a certain number of times.
-local function pad(c, w)
+local function pad(c, size)
local r = c
- while #r < w do
+ while #r < size do
r = r .. c
end
return r
end
--- Adds the extension if the file does not have it.
--- @param file File.
--- @param extension Extension.
--- @return File with proper extension.
-local function sanitize(file, extension)
- extension = '.' .. extension
- if string.sub(file, -#extension) ~= extension then
- file = file .. extension
- end
- return file
-end
-
-- Flattens a table of tables into only one table.
-- @param t Table.
-- @return Flattened table.
@@ -331,6 +441,21 @@
return result
end
+-- Organizes a key/value table of tables into only one table.
+-- @param t Table.
+-- @return Flattened key/value table.
+local function organize(t)
+ local result = {}
+ for _, v in ipairs(t) do
+ for j, k in pairs(v) do
+ if not result[j] then
+ result[j] = k
+ end
+ end
+ end
+ return result
+end
+
-- Applies a function to elements of a table.
-- @param c Table.
-- @param f Function.
@@ -343,23 +468,13 @@
return result
end
--- Wraps a string based on a line width.
--- @param str String.
--- @param size Line width.
--- @return Wrapped string.
-local function wrap(str, size)
- local parts = split(str, '[^%s]+')
- local r, l = '', ''
- for _, v in ipairs(parts) do
- if (#l + #v) > size then
- r = r .. '\n' .. l
- l = v
- else
- l = normalize(l .. ' ' .. v)
- end
- end
- r = normalize(r .. '\n' .. l)
- return r
+-- Search the TeX tree for the file.
+-- @param library The library reference.
+-- @param file The filename.
+-- @param extension The extension.
+-- @return String pointing to the file location.
+local function lookup(library, file, extension)
+ return library.find_file(file, extension)
end
-- Prints the script header.
@@ -370,8 +485,8 @@
print("|___|_|_|___|___|_,_|___|_|_| |___|___|")
print()
print(wrap('checkcites.lua -- a reference ' ..
- 'checker script (v2.0)', 74))
- print(wrap('Copyright (c) 2012, 2017, ' ..
+ 'checker script (v2.4)', 74))
+ print(wrap('Copyright (c) 2012, 2019, ' ..
'Enrico Gregorio, Paulo ' ..
'Roberto Massa Cereda', 74))
end
@@ -383,7 +498,7 @@
-- @param citations Citations.
-- @param references References.
-- @return Integer representing the status.
-operations.unused = function(citations, references)
+operations.unused = function(citations, references, crossrefs)
print()
print(pad('-', 74))
print(wrap('Report of unused references in your TeX ' ..
@@ -391,6 +506,20 @@
'bibliography files, but not cited in ' ..
'the TeX source file)', 74))
print(pad('-', 74))
+
+ local z = {}
+ for _, citation in ipairs(citations) do
+ if crossrefs[citation] then
+ table.insert(z, crossrefs[citation])
+ end
+ end
+
+ for _, i in ipairs(z) do
+ if not exists(i, citations) then
+ table.insert(citations, i)
+ end
+ end
+
local r = difference(references, citations)
print()
print(wrap('Unused references in your TeX document: ' ..
@@ -409,7 +538,7 @@
-- @param citations Citations.
-- @param references References.
-- @return Integer value indicating the status.
-operations.undefined = function(citations, references)
+operations.undefined = function(citations, references, crossrefs)
print()
print(pad('-', 74))
print(wrap('Report of undefined references in your TeX ' ..
@@ -417,6 +546,20 @@
'TeX source file, but not present in the ' ..
'bibliography files)', 74))
print(pad('-', 74))
+
+ local z = {}
+ for _, citation in ipairs(citations) do
+ if crossrefs[citation] then
+ table.insert(z, crossrefs[citation])
+ end
+ end
+
+ for _, i in ipairs(z) do
+ if not exists(i, citations) then
+ table.insert(citations, i)
+ end
+ end
+
local r = difference(citations, references)
print()
print(wrap('Undefined references in your TeX document: ' ..
@@ -435,10 +578,10 @@
-- @param citations Citations.
-- @param references References.
-- @return Integer value indicating the status.
-operations.all = function(citations, references)
+operations.all = function(citations, references, crossrefs)
local x, y
- x = operations.unused(citations, references)
- y = operations.undefined(citations, references)
+ x = operations.unused(citations, references, crossrefs)
+ y = operations.undefined(citations, references, crossrefs)
if x + y > 0 then
return 1
else
@@ -446,36 +589,37 @@
end
end
--- Checks if a file exists.
--- @param file File.
--- @return Boolean value indicating if the file exists.
-local function valid(file)
- local handler = io.open(file, 'r')
- if handler then
- handler:close()
- return true
- else
- return false
- end
-end
-
-- Filters a table of files, keeping the inexistent ones.
-- @param files Table.
+-- @param lib Search library.
+-- @param enabled Boolean switch to enable lookup.
+-- @param extension Extension for lookup.
-- @return Table of inexistent files.
-local function validate(files)
- local result = {}
+-- @return Table of existent files.
+local function validate(files, lib, enabled, extension)
+ local bad, good = {}, {}
for _, v in ipairs(files) do
if not valid(v) then
- table.insert(result, v)
+ if enabled and lookup(lib, v, extension) then
+ table.insert(good, lookup(lib, v, extension))
+ else
+ table.insert(bad, v)
+ end
+ else
+ table.insert(good, v)
end
end
- return result
+ return bad, good
end
-- Main function.
-- @param args Command line arguments.
-- @return Integer value indicating the status
local function checkcites(args)
+
+ local kpse = require('kpse')
+ kpse.set_program_name('texlua')
+
header()
local parameters = {
@@ -484,6 +628,7 @@
{ short = 'U', long = 'undefined', argument = false },
{ short = 'v', long = 'version', argument = false },
{ short = 'h', long = 'help', argument = false },
+ { short = 'c', long = 'crossrefs', argument = false },
{ short = 'b', long = 'backend', argument = true }
}
@@ -525,8 +670,8 @@
if keys['version'] or keys['help'] then
if keys['version'] then
print()
- print(wrap('checkcites.lua, version 2.0 (dated August ' ..
- '25, 2017)', 74))
+ print(wrap('checkcites.lua, version 2.4 (dated September ' ..
+ '3, 2019)', 74))
print(pad('-', 74))
print(wrap('You can find more details about this ' ..
@@ -552,6 +697,7 @@
print('-a,--all list all unused and undefined references')
print('-u,--unused list only unused references in your bibliography files')
print('-U,--undefined list only undefined references in your TeX source file')
+ print('-c,--crossrefs enable cross-reference checks (disabled by default)')
print('-b,--backend <arg> set the backend-based file lookup policy')
print('-h,--help print the help message')
print('-v,--version print the script version')
@@ -611,16 +757,16 @@
return sanitize(a, (backend == 'bibtex'
and 'aux') or 'bcf') end)
- local vld = validate(auxiliary)
- if #vld ~= 0 then
+ local invalid, _ = validate(auxiliary, kpse, false, 'aux')
+ if #invalid ~= 0 then
print()
print(pad('-', 74))
print(wrap('I am sorry, but I was unable to ' ..
- 'locate ' .. plural(#vld, 'this file',
+ 'locate ' .. plural(#invalid, 'this file',
'these files') .. ' (the extension ' ..
'is automatically set based on the ' ..
'"' .. backend .. '" backend):', 74))
- for _, v in ipairs(vld) do
+ for _, v in ipairs(invalid) do
print('=> ' .. v)
end
@@ -631,13 +777,13 @@
'" to files if not provided.', 74))
print()
- print(wrap('Please make sure the ' .. plural(#vld,
+ print(wrap('Please make sure the ' .. plural(#invalid,
'path is', 'paths are') .. ' ' ..
- 'correct and the ' .. plural(#vld,
+ 'correct and the ' .. plural(#invalid,
'file exists', 'files exist') .. '. ' ..
'There is nothing I can do at the moment. ' ..
'Refer to the user documentation for ' ..
- 'details on the file lookup. If ' .. plural(#vld,
+ 'details on the file lookup. If ' .. plural(#invalid,
'this is not the file', 'these are not the ' ..
'files') .. ' you were expecting, ' ..
'double-check your source file or ' ..
@@ -647,7 +793,7 @@
end
local lines = flatten(apply(auxiliary, read))
- local asterisk, citations, bibliography = backends[backend](lines)
+ local asterisk, citations, bibliography = backends[backend](lines, true)
print()
print(wrap('Great, I found ' .. tostring(#citations) .. ' ' ..
@@ -671,27 +817,27 @@
bibliography = apply(bibliography, function(a)
return sanitize(a, 'bib') end)
- vld = validate(bibliography)
- if #vld ~= 0 then
+ invalid, bibliography = validate(bibliography, kpse, true, 'bib')
+ if #invalid ~= 0 then
print()
print(pad('-', 74))
print(wrap('I am sorry, but I was unable to locate ' ..
- plural(#vld, 'this file', 'these files') .. ' ' ..
+ plural(#invalid, 'this file', 'these files') .. ' ' ..
'(the extension is automatically set to ' ..
'".bib", if not provided):', 74))
- for _, v in ipairs(vld) do
+ for _, v in ipairs(invalid) do
print('=> ' .. v)
end
print()
- print(wrap('Please make sure the ' .. plural(#vld,
+ print(wrap('Please make sure the ' .. plural(#invalid,
'path is', 'paths are') .. ' ' ..
- 'correct and the ' .. plural(#vld,
+ 'correct and the ' .. plural(#invalid,
'file exists', 'files exist') .. '. ' ..
'There is nothing I can do at the moment. ' ..
'Refer to to the user documentation ' ..
'for details on bibliography lookup. If ' ..
- plural(#vld, 'this is not the file',
+ plural(#invalid, 'this is not the file',
'these are not the files') .. ' you were ' ..
'expecting (wrong bibliography), double-check ' ..
'your source file. The script will end ' ..
@@ -702,6 +848,9 @@
local references = flatten(apply(bibliography, function(a)
return extract(read(a)) end))
+ local crossrefs = (keys['crossrefs'] and organize(apply(bibliography,
+ function(a) return crossref(read(a)) end))) or {}
+
print()
print(wrap('Fantastic, I found ' .. tostring(#references) ..
' ' .. plural(#references, 'reference',
@@ -711,11 +860,10 @@
plural(((check == 'all' and 2) or 1), 'report is',
'reports are') .. ' generated.', 74))
- return operations[check](citations, references)
+ return operations[check](citations, references, crossrefs)
end
-- Call and exit
os.exit(checkcites(arg))
-- EOF
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/checkcites.tlpobj new/tlpkg/tlpobj/checkcites.tlpobj
--- old/tlpkg/tlpobj/checkcites.tlpobj 2019-02-28 03:25:15.000000000 +0100
+++ new/tlpkg/tlpobj/checkcites.tlpobj 2019-09-04 01:54:57.000000000 +0200
@@ -1,17 +1,17 @@
name checkcites
category Package
-revision 45131
+revision 52022
shortdesc Check citation commands in a document
longdesc The package provides a lua script written for the sole purpose
longdesc of detecting undefined and unused references from LaTeX
longdesc auxiliary or bibliography files.
depend checkcites.ARCH
-runfiles size=6
+runfiles size=7
texmf-dist/scripts/checkcites/checkcites.lua
catalogue-contact-bugs https://github.com/cereda/checkcites/issues
catalogue-contact-repository https://github.com/cereda/checkcites
catalogue-ctan /support/checkcites
-catalogue-date 2017-08-25 17:01:28 +0200
+catalogue-date 2019-09-03 13:10:18 +0200
catalogue-license lppl1.3
catalogue-topics debug-supp
-catalogue-version 2.0
+catalogue-version 2.4
++++++ chemfig.doc.tar.xz ++++++
++++ 6996 lines of diff (skipped)
++++++ chemfig.tar.xz ++++++
++++ 4382 lines of diff (skipped)
++++++ chemformula.doc.tar.xz ++++++
++++ 3756 lines of diff (skipped)
++++++ chemformula.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chemformula/chemformula.sty new/tex/latex/chemformula/chemformula.sty
--- old/tex/latex/chemformula/chemformula.sty 2017-03-23 22:28:12.000000000 +0100
+++ new/tex/latex/chemformula/chemformula.sty 2020-03-07 22:40:05.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-2017 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
@@ -30,9 +30,9 @@
\usetikzlibrary{arrows.meta}
\ExplSyntaxOn
-\tl_const:Nn \c_chemformula_date_tl {2017/03/23}
+\tl_const:Nn \c_chemformula_date_tl {2020/03/07}
\tl_const:Nn \c_chemformula_version_number_tl {4.15}
-\tl_const:Nn \c_chemformula_version_suffix_tl {e}
+\tl_const:Nn \c_chemformula_version_suffix_tl {j}
\tl_const:Nx \c_chemformula_version_tl
{ \c_chemformula_version_number_tl \c_chemformula_version_suffix_tl }
\tl_const:Nn \c_chemformula_info_tl
@@ -146,20 +146,20 @@
% --------------------------------------------------------------------------
% variants of kernel functions:
-\cs_generate_variant:Nn \keys_set:nn { nV }
-\cs_generate_variant:Nn \tl_if_blank:nF { V }
-\cs_generate_variant:Nn \tl_if_in:nnT { x , nV }
-\cs_generate_variant:Nn \tl_if_eq:nnT { V, x }
-\cs_generate_variant:Nn \tl_if_eq:nnTF { o }
-\cs_generate_variant:Nn \tl_set:Nn { cV }
-\cs_generate_variant:Nn \tl_replace_all:Nnn { NV }
-\cs_generate_variant:Nn \tl_replace_once:Nnn { Nxx }
-\cs_generate_variant:Nn \tl_set_rescan:Nnn { NnV }
-\cs_generate_variant:Nn \prop_item:Nn { NV }
-\cs_generate_variant:Nn \prop_if_in:NnT { Nx }
-\cs_generate_variant:Nn \dim_set:Nn { NV }
-\cs_generate_variant:Nn \skip_set:Nn { cV }
-\cs_generate_variant:Nn \str_if_eq:nnT { V }
+\cs_generate_variant:Nn \keys_set:nn {nV}
+\cs_generate_variant:Nn \tl_if_blank:nF {V}
+\cs_generate_variant:Nn \tl_if_in:nnT {x,nV}
+\cs_generate_variant:Nn \tl_if_eq:nnT {V,x}
+\cs_generate_variant:Nn \tl_if_eq:nnTF {o}
+\cs_generate_variant:Nn \tl_set:Nn {cV}
+\cs_generate_variant:Nn \tl_replace_all:Nnn {NV}
+\cs_generate_variant:Nn \tl_replace_once:Nnn {Nxx}
+\cs_generate_variant:Nn \tl_set_rescan:Nnn {NnV}
+\cs_generate_variant:Nn \prop_item:Nn {NV}
+\cs_generate_variant:Nn \prop_if_in:NnT {Nx}
+\cs_generate_variant:Nn \dim_set:Nn {NV}
+\cs_generate_variant:Nn \skip_set:Nn {cV}
+\cs_generate_variant:Nn \str_if_eq:nnT {V}
% --------------------------------------------------------------------------
% VARIABLES
@@ -181,6 +181,8 @@
\seq_new:N \l__chemformula_tmpa_seq
+\bool_new:N \l__chemformula_tmpa_bool
+
% booleans:
% these are official:
\bool_new:N \l_chemformula_inside_ch_bool
@@ -340,6 +342,7 @@
\tl_set:Nn \l__chemformula_kroegervink_neutral_tl {$\times$}
\tl_new:N \l__chemformula_adduct_penalty_tl
\tl_set:Nn \l__chemformula_adduct_penalty_tl {300}
+\tl_new:N \l__chemformula_catcodes_tl
% property lists:
\prop_new:N \l__chemformula_arrows_code_prop
@@ -363,36 +366,91 @@
\box_new:N \l__chemformula_subscript_box
% --------------------------------------------------------------------------
+% catcode stuff
+\cs_new_protected:Npn \__chemformula_save_catcodes:
+ {
+ \cs_gset_protected:Npx \__chemformula_restore:
+ {
+ \char_set_catcode:nn { 95 } { \char_value_catcode:n { 95 } }% _
+ \char_set_catcode:nn { 58 } { \char_value_catcode:n { 58 } }% :
+ \char_set_catcode:nn { 94 } { \char_value_catcode:n { 94 } }% ^
+ \char_set_catcode:nn { 123 } { \char_value_catcode:n { 123 } }% {
+ \char_set_catcode:nn { 125 } { \char_value_catcode:n { 125 } }% }
+ \char_set_catcode:nn { 35 } { \char_value_catcode:n { 35 } }% #
+ \char_set_catcode:nn { 33 } { \char_value_catcode:n { 33 } }% !
+ \char_set_catcode:nn { 34 } { \char_value_catcode:n { 34 } }% "
+ \char_set_catcode:nn { 60 } { \char_value_catcode:n { 60 } }% <
+ \char_set_catcode:nn { 62 } { \char_value_catcode:n { 62 } }% >
+ \char_set_catcode:nn { 126 } { \char_value_catcode:n { 126 } }% ~
+ }
+ }
+
+\cs_gset_protected:Npn \__chemformula_basic_catcodes:
+ {
+ % expl3 catcodes:
+ \char_set_catcode_letter:N \_
+ \char_set_catcode_letter:N \:
+ % I've forgotten why I put this here:
+ \char_set_catcode_math_superscript:N \^
+ % disable some of the specials (needed for sub- and superscripts):
+ \char_set_catcode_letter:N \#
+ % make the naming work with babel languages like French that make
+ % ! active:
+ \char_set_catcode_other:N \!
+ % make the naming work with babel languages like Spanish that make
+ % < and > active:
+ \char_set_catcode_other:N \>
+ \char_set_catcode_other:N \<
+ % ensure " is other:
+ \char_set_catcode_other:N \"
+ % spaces are spaces:
+ \char_set_catcode_space:N \
+ }
+
+\cs_new_protected:Npn \__chemformula_sanitize:Nn #1#2
+ {
+ \tl_set_rescan:Nnn #1
+ {
+ \__chemformula_basic_catcodes:
+ % disable some of the specials (needed for sub- and superscripts):
+ \char_set_catcode_letter:N \{
+ \char_set_catcode_letter:N \}
+ }
+ {#2}
+ }
+\cs_generate_variant:Nn \__chemformula_sanitize:Nn {NV}
+
+% --------------------------------------------------------------------------
% general and helper functions:
\cs_new_protected:Npn \chemformula_tikz:nn #1#2
{
\group_begin:
\chemformula_tikzexternaldisable:
- \tikz [ #1 ] {#2}
+ \tikz [#1] {#2}
\group_end:
}
-\cs_generate_variant:Nn \chemformula_tikz:nn { xn,nf }
+\cs_generate_variant:Nn \chemformula_tikz:nn {xn,nf}
\cs_new_protected:Npn \chemformula_draw:nn #1#2
- { \draw [ #1 ] #2 ; }
-\cs_generate_variant:Nn \chemformula_draw:nn { xn,nx,xx,xf,Vn }
+ { \draw [#1] #2 ; }
+\cs_generate_variant:Nn \chemformula_draw:nn {xn,nx,xx,xf,Vn}
\cs_new_protected:Npn \chemformula_node:nn #1#2
- { \node [ #1 ] {#2} ; }
-\cs_generate_variant:Nn \chemformula_node:nn { x }
+ { \node [#1] {#2} ; }
+\cs_generate_variant:Nn \chemformula_node:nn {x}
\cs_new_protected:Npn \chemformula_node:nnn #1#2#3
- { \node [ #1 ] ( #2 ) {#3} ; }
-\cs_generate_variant:Nn \chemformula_node:nnn { nx }
+ { \node [#1] (#2) {#3} ; }
+\cs_generate_variant:Nn \chemformula_node:nnn {nx}
\cs_new_protected:Npn \chemformula_allow_break:
- { \tex_penalty:D \c_zero }
+ { \tex_penalty:D \c_zero_int }
\cs_new_protected:Npn \chemformula_leave_vmode:
{ \hbox_unpack:N \c_empty_box }
\cs_new_protected:Npn \chemformula_nobreak:
- { \tex_penalty:D \c_ten_thousand }
+ { \tex_penalty:D 10000 \scan_stop: }
\cs_new_protected:Npn \chemformula_skip_nobreak:N #1
{
@@ -428,7 +486,7 @@
% prevent externalisation of tikz parts of the formulae:
\AtBeginDocument { \providecommand \tikzexternaldisable {} }
-\keys_define:nn { chemformula }
+\keys_define:nn {chemformula}
{
tikz-external-disable .bool_set:N =
\l__chemformula_tikzexternaldisable_bool
@@ -636,7 +694,7 @@
{
\bool_if:NTF \l__chemformula_kroegervink_bool
{ \chemformula_kroegervink_negative: }
- { ' }
+ {'}
}
\keys_define:nn {chemformula}
@@ -826,9 +884,10 @@
\cs_new_protected:Npn \__chemformula_arrow_draw:nnn #1#2#3
{
\chemformula_nobreak:
+ % \__chemformula_sanitize:Nn \l__chemformula_tmpc_tl {#1}
% prepare arrow code for drawing:
\tl_set_rescan:Nnn \l__chemformula_tmpc_tl
- { \char_set_catcode_letter:N \_ } {#1}
+ { \__chemformula_basic_catcodes: } {#1}
% determine length of the arrow
\hbox_set:Nn \l__chemformula_arrow_arg_i_box
{ \tl_use:N \l__chemformula_arrow_label_style_tl #2 }
@@ -873,14 +932,31 @@
\c_zero_skip
\l__chemformula_arrow_penalty_tl
}
-\cs_generate_variant:Nn \__chemformula_arrow_draw:nnn { V }
+\cs_generate_variant:Nn \__chemformula_arrow_draw:nnn {V}
\prg_new_conditional:Npnn \chemformula_if_is_arrow:n #1 {p,T,F,TF}
{
- \seq_if_in:NnTF \l__chemformula_arrows_type_seq {#1}
+ \__chemformula_sanitize:Nn \l__chemformula_tmpa_tl {#1}
+ \seq_if_in:NVTF \l__chemformula_arrows_type_seq \l__chemformula_tmpa_tl
{ \prg_return_true: }
{ \prg_return_false: }
}
+\prg_generate_conditional_variant:Nnn \chemformula_if_is_arrow:n {V} {T,F,TF}
+
+\cs_new_protected:Npn \chemformula_define_arrow:nn #1#2
+ {
+ \__chemformula_sanitize:Nn \l__chemformula_tmpa_tl {#1}
+ \__chemformula_sanitize:Nn \l__chemformula_tmpb_tl {#2}
+ \seq_if_in:NVF \l__chemformula_arrows_type_seq \l__chemformula_tmpa_tl
+ {
+ \seq_put_right:NV
+ \l__chemformula_arrows_type_seq
+ \l__chemformula_tmpa_tl
+ }
+ \prop_put:NVV \l__chemformula_arrows_code_prop
+ \l__chemformula_tmpa_tl
+ \l__chemformula_tmpb_tl
+ }
% commands to declare arrows (can also be used by users):
% #1: symbol, #2: code
@@ -888,36 +964,23 @@
{
\chemformula_if_is_arrow:nTF {#1}
{ \msg_error:nnn {chemformula} {new-arrow} {#1} }
- {
- % store type in the sequence and code in the property list
- \seq_put_right:Nn \l__chemformula_arrows_type_seq {#1}
- \prop_put:Nnn \l__chemformula_arrows_code_prop {#1} {#2}
- }
+ { \chemformula_define_arrow:nn {#1} {#2} }
}
\NewDocumentCommand \DeclareChemArrow {mm}
- {
- \chemformula_if_is_arrow:nF {#1}
- { \seq_put_right:Nn \l__chemformula_arrows_type_seq {#1} }
- % store type in the sequence and code in the property list
- \prop_put:Nnn \l__chemformula_arrows_code_prop {#1} {#2}
- }
+ { \chemformula_define_arrow:nn {#1} {#2} }
\NewDocumentCommand \RenewChemArrow {mm}
{
\chemformula_if_is_arrow:nTF {#1}
- { \prop_put:Nnn \l__chemformula_arrows_code_prop {#1} {#2} }
+ { \chemformula_define_arrow:nn {#1} {#2} }
{ \msg_error:nnn {chemformula} {renew-arrow} {#1} }
}
\NewDocumentCommand \ProvideChemArrow {mm}
{
\chemformula_if_is_arrow:nF {#1}
- {
- % store type in the sequence and code in the property list
- \seq_put_right:Nn \l__chemformula_arrows_type_seq {#1}
- \prop_put:Nnn \l__chemformula_arrows_code_prop {#1} {#2}
- }
+ { \chemformula_define_arrow:nn {#1} {#2} }
}
\NewDocumentCommand \ShowChemArrow {m}
@@ -1018,7 +1081,7 @@
\draw[chemarrow] (cf_arrow_mid) ++ (.6ex,.4ex) -- ++(-.4ex,-.8ex) ;
}
% net reaction:
-\NewChemArrow {==} { \node at ([yshift=-.2ex]cf_arrow_mid) { = } ; }
+\NewChemArrow {==} { \node at ([yshift=-.2ex]cf_arrow_mid) {=} ; }
% quasi equilibria:
\NewChemArrow{<=o>}{
\draw[chemarrow,-left~cf]
@@ -1069,7 +1132,6 @@
\tl_set:Nn \l__chemmacros_tmpa_tl {#1}
\tl_trim_spaces:N \l__chemmacros_tmpa_tl
\seq_set_split:NnV \l__chemformula_input_seq {~} \l__chemmacros_tmpa_tl
- % \seq_show:N \l__chemformula_input_seq
% remove empty items in order to avoid unnecessary processing:
\seq_remove_all:Nn \l__chemformula_input_seq {}
% disable \xspace:
@@ -1084,7 +1146,9 @@
\seq_map_function:NN
\l__chemformula_input_seq
\__chemformula_input:n
- \__chemformula_prepare_output:N \l__chemformula_input_tl
+ \__chemformula_prepare_output:NV
+ \l__chemformula_input_tl
+ \l__chemformula_catcodes_tl
\chemformula_write:V \l__chemformula_input_tl
}
\group_end:
@@ -1096,7 +1160,7 @@
{ \text { \chemformula_font_inner: #1} }
{ { \chemformula_font_inner: #1 } }
}
-\cs_generate_variant:Nn \chemformula_write:n { V }
+\cs_generate_variant:Nn \chemformula_write:n {V}
% internal version of \ch command:
\cs_new_protected:Npn \chemformula_ch:nn #1#2
@@ -1109,10 +1173,9 @@
\__chemformula_ch_newline:w #2 \\ \q_no_value \q_stop
\group_align_safe_end:
\tl_use:N \g__chemformula_output_tl
-% \tl_show:N \g__chemformula_output_tl
\tl_gclear:N \g__chemformula_output_tl
}
-\cs_generate_variant:Nn \chemformula_ch:nn { V , nV , VV }
+\cs_generate_variant:Nn \chemformula_ch:nn {V,nV,VV}
% Trickery to use \ch inside align environment:
% bypass \\:
@@ -1130,7 +1193,7 @@
}
}
-\cs_new_protected:Npn \__chemformula_ch_newline_skip:w [ #1 ]
+\cs_new_protected:Npn \__chemformula_ch_newline_skip:w [#1]
{
\tl_gput_right:Nn \g__chemformula_output_tl { [#1] }
\__chemformula_ch_newline:w
@@ -1142,7 +1205,7 @@
\__chemformula_ch_intertext:w #1 \intertext{} \q_no_value \q_stop
\quark_if_no_value:nF {#2}
{
- \tl_gput_right:Nn \g__chemformula_output_tl { & }
+ \tl_gput_right:Nn \g__chemformula_output_tl {&}
\__chemformula_ch_align:w #2 \q_stop
}
}
@@ -1188,7 +1251,9 @@
\__chemformula_input_compound_no_check:NV
\l__chemformula_compound_tl
\l__chemformula_chemformula_tmpa_tl
- \__chemformula_prepare_output:N \l__chemformula_compound_tl
+ \__chemformula_prepare_output:NV
+ \l__chemformula_compound_tl
+ \l__chemformula_catcodes_tl
\chemformula_write:V \l__chemformula_compound_tl
}
\group_end:
@@ -1251,7 +1316,7 @@
}
\tl_set:NV #1 \l__chemformula_tmpa_tl
}
-\cs_generate_variant:Nn \__chemformula_generate_arrows:Nn { NV }
+\cs_generate_variant:Nn \__chemformula_generate_arrows:Nn {NV}
\cs_new_protected:Npn \__chemformula_detect_arrows:n #1
{
@@ -1277,8 +1342,6 @@
\cs_new_protected:Npn \chemformula_chwritebelow:nn #1#2
{
- % \tl_set:Nn \l_tmpa_tl {#1} \show \l_tmpa_tl
- % \tl_set:Nn \l_tmpa_tl {#2} \show \l_tmpa_tl
\c_math_toggle_token
\underset
{
@@ -1313,15 +1376,15 @@
\cs_new_protected:Npn \__chemformula_generate_name:Nn #1#2
{
\__chemformula_sanitize:Nn \l__chemformula_tmpa_tl {#2}
- \tl_if_in:VnT \l__chemformula_tmpa_tl { ! }
+ \tl_if_in:VnT \l__chemformula_tmpa_tl {!}
{
\tl_replace_all:Nnn \l__chemformula_tmpa_tl
- { ! }
+ {!}
{ \__chemformula_name_compound:w }
}
\tl_set:NV #1 \l__chemformula_tmpa_tl
}
-\cs_generate_variant:Nn \__chemformula_generate_name:Nn { NV }
+\cs_generate_variant:Nn \__chemformula_generate_name:Nn {NV}
\cs_new_protected:Npn \__chemformula_detect_name:n #1
{
@@ -1478,17 +1541,18 @@
\cs_new_protected:Npn \chemformula_bond:n #1
{
\chemformula_skip_nobreak:N \l__chemformula_bond_space_dim
+ \hbox_set:Nn \l__chemformula_tmpa_box {K}
+ \dim_set:Nn \l__chemformula_tmpa_dim { \box_ht:N \l__chemformula_tmpa_box }
\chemformula_tikz:nn
{
inner~sep = 0pt ,
outer~sep = 0pt ,
- text~height = 1em ,
+ text~height = \l__chemformula_tmpa_dim ,
baseline = (chemformula-bond-ground.base)
}
{
- \draw node[ draw=none, minimum~height=1em, minimum~width=0 ]
- (chemformula-bond-ground) at (0pt,0pt) {};
- \draw (chemformula-bond-ground) ++ (0pt,-.1716em)
+ \coordinate (chemformula-bond-ground) at (0pt,0pt) ;
+ \draw (chemformula-bond-ground) ++ (0pt,.5\l__chemformula_tmpa_dim)
coordinate (chemformula-bond-start) ;
\draw (chemformula-bond-start) ++(\l__chemformula_bond_dim ,0pt)
coordinate (chemformula-bond-end) ;
@@ -1654,7 +1718,7 @@
{ \ensuremath {#1} }
{ \ensuremath { \text {#1} } }
}
-\cs_generate_variant:Nn \__chemformula_number_style:n { V }
+\cs_generate_variant:Nn \__chemformula_number_style:n {V}
\cs_new_protected:Npn \chemformula_charge_style:n #1
{
@@ -1662,7 +1726,7 @@
{ \ensuremath {#1} }
{ \ensuremath { \text {#1} } }
}
-\cs_generate_variant:Nn \chemformula_charge_style:n { V }
+\cs_generate_variant:Nn \chemformula_charge_style:n {V}
% subscripts
% remove double or nested sub- and superscripts
@@ -1703,10 +1767,8 @@
}
}
}
-\cs_generate_variant:Nn \__chemformula_subscript:n { V }
+\cs_generate_variant:Nn \__chemformula_subscript:n {V}
-% TODO: add hook for cleanup?
-% similar to ChemCompoundProperty?
\prop_new:N \l__chemformula_clean_subscript_prop
\seq_new:N \l__chemformula_clean_subscript_seq
@@ -1727,10 +1789,10 @@
{ \chemformula_plus: }
\chemformula_add_subscript_cleanup:nn
{ \chemformula_adduct: }
- { . }
+ {.}
\chemformula_add_subscript_cleanup:nn
{ \chemformula_star_adduct: }
- { * }
+ {*}
\cs_new_protected:Npn \__chemformula_clean_subscript:
{
@@ -1740,14 +1802,6 @@
{##1}
{ \prop_item:Nn \l__chemformula_clean_subscript_prop {##1} }
}
- % \tl_replace_all:Nnn \l__chemformula_subscript_tl
- % { \chemformula_single_bond: } { \chemformula_minus: }
- % \tl_replace_all:Nnn \l__chemformula_subscript_tl
- % { \chemformula_triple_bond: } { \chemformula_plus: }
- % \tl_replace_all:Nnn \l__chemformula_subscript_tl
- % { \chemformula_adduct: } { . }
- % \tl_replace_all:Nnn \l__chemformula_subscript_tl
- % { \chemformula_star_adduct: } { * }
}
\cs_generate_variant:Nn \tl_replace_all:Nnn {Nnx}
@@ -1786,7 +1840,7 @@
}
\group_end:
}
-\cs_generate_variant:Nn \__chemformula_subscript_write:n { V }
+\cs_generate_variant:Nn \__chemformula_subscript_write:n {V}
\cs_new_protected:Npn \__chemformula_measure_subscript:n #1
{
@@ -1796,7 +1850,7 @@
{ -\box_wd:N \l__chemformula_tmpa_box }
\box_clear:N \l__chemformula_tmpa_box
}
-\cs_generate_variant:Nn \__chemformula_measure_subscript:n { V }
+\cs_generate_variant:Nn \__chemformula_measure_subscript:n {V}
% superscripts
% remove double or nested sub- and superscripts
@@ -1834,111 +1888,45 @@
}
}
}
-\cs_generate_variant:Nn \__chemformula_superscript:n { V }
-
-% TODO: add hook for cleanup?
-% \prop_new:N \l__chemformula_clean_superscript_prop
-% \seq_new:N \l__chemformula_clean_superscript_seq
-
-% \cs_new_protected:Npn \chemformula_add_superscript_cleanup:nnn #1#2#3
-% {
-% \seq_put_right:Nn \l__chemformula_clean_superscript_seq {#1}
-% \prop_put:Nnn \l__chemformula_clean_superscript_prop {#1}
-% { \bool_if:NTF \l__chemformula_kroegervink_bool {#2} {#3} }
-% }
-
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_single_bond: }
-% { \chemformula_minus: }
-% { \chemformula_minus: }
-% \chemformula_add_superscript_cleanup:nnn
-% { - }
-% { \chemformula_minus: }
-% { \chemformula_minus: }
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_triple_bond: }
-% { \chemformula_plus: }
-% { \chemformula_plus: }
-% \chemformula_add_superscript_cleanup:nnn
-% { + }
-% { \chemformula_plus: }
-% { \chemformula_plus: }
-% \chemformula_add_superscript_cleanup:nnn
-% { . }
-% { \chemformula_radical_or_decimal: }
-% { \chemformula_kroegervink_positive: }
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_adduct: }
-% { \chemformula_radical_or_decimal: }
-% { \chemformula_kroegervink_positive: }
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_radical_or_decimal: }
-% { \chemformula_radical_or_decimal: }
-% { \chemformula_kroegervink_positive: }
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_star_adduct: }
-% { * }
-% { \chemformula_kroegervink_positive: }
-% \chemformula_add_superscript_cleanup:nnn
-% { * }
-% { * }
-% { \chemformula_kroegervink_positive: }
-% \chemformula_add_superscript_cleanup:nnn
-% { ' }
-% { ' }
-% { \chemformula_kroegervink_negative: }
-% \chemformula_add_superscript_cleanup:nnn
-% { \chemformula_prime: }
-% { \chemformula_prime: }
-% { \chemformula_kroegervink_negative: }
-% \chemformula_add_superscript_cleanup:nnn
-% { , }
-% { \chemformula_decimal: }
-% { , }
+\cs_generate_variant:Nn \__chemformula_superscript:n {V}
% rename this function into treatment instead of cleanup
\cs_new_protected:Npn \__chemformula_clean_superscript:
{
- % \seq_map_inline:Nn \l__chemformula_clean_superscript_seq
- % {
- % \tl_replace_all:Nnx \l__chemformula_superscript_tl
- % {##1}
- % { \prop_item:Nn \l__chemformula_clean_superscript_prop {##1} }
- % }
\tl_replace_all:Nnn \l__chemformula_superscript_tl
{ \chemformula_single_bond: } { \chemformula_minus: }
\tl_replace_all:Nnn \l__chemformula_superscript_tl
- { - } { \chemformula_minus: }
+ {-} { \chemformula_minus: }
\tl_replace_all:Nnn \l__chemformula_superscript_tl
{ \chemformula_triple_bond: } { \chemformula_plus: }
\tl_replace_all:Nnn \l__chemformula_superscript_tl
- { + } { \chemformula_plus: }
+ {+} { \chemformula_plus: }
\tl_replace_all:Nnn \l__chemformula_superscript_tl
{ \chemformula_adduct: } { \chemformula_radical_or_decimal: }
\bool_if:NTF \l__chemformula_kroegervink_bool
{
\tl_replace_all:Nnn \l__chemformula_superscript_tl
- { ' } { \chemformula_kroegervink_negative: }
+ {'} { \chemformula_kroegervink_negative: }
\tl_replace_all:Nnn \l__chemformula_superscript_tl
- { \chemformula_adduct: } { . }
+ { \chemformula_adduct: } {.}
\tl_replace_all:Nnn \l__chemformula_superscript_tl
- { \chemformula_star_adduct: } { * }
+ { \chemformula_star_adduct: } {*}
\tl_replace_all:Nnn \l__chemformula_superscript_tl
- { \chemformula_radical_or_decimal: } { . }
+ { \chemformula_radical_or_decimal: } {.}
\tl_replace_all:Nnn \l__chemformula_superscript_tl
{ \chemformula_prime: } { \chemformula_kroegervink_negative: }
\tl_replace_all:Nnn \l__chemformula_superscript_tl
- { * } { \chemformula_kroegervink_positive: }
+ {*} { \chemformula_kroegervink_positive: }
\tl_replace_all:Nnn \l__chemformula_superscript_tl
- { . } { \chemformula_kroegervink_positive: }
+ {.} { \chemformula_kroegervink_positive: }
}
{
\tl_replace_all:Nnn \l__chemformula_superscript_tl
- { \chemformula_star_adduct: } { * }
+ { \chemformula_star_adduct: } {*}
\tl_replace_all:Nnn \l__chemformula_superscript_tl
- { . } { \chemformula_radical_or_decimal: }
+ {.} { \chemformula_radical_or_decimal: }
\tl_replace_all:Nnn \l__chemformula_superscript_tl
- { , } { \chemformula_decimal: }
+ {,} { \chemformula_decimal: }
}
}
@@ -1988,7 +1976,7 @@
}
\group_end:
}
-\cs_generate_variant:Nn \__chemformula_superscript_write:n { V }
+\cs_generate_variant:Nn \__chemformula_superscript_write:n {V}
\cs_new_protected:Npn \__chemformula_measure_superscript:n #1
{
@@ -1998,7 +1986,7 @@
{ -\box_wd:N \l__chemformula_tmpa_box }
\box_clear:N \l__chemformula_tmpa_box
}
-\cs_generate_variant:Nn \__chemformula_measure_superscript:n { V }
+\cs_generate_variant:Nn \__chemformula_measure_superscript:n {V}
% typeset both sub- and superscripts
\cs_new_protected:Npn \__chemformula_use_sub_and_superscript:
@@ -2127,7 +2115,7 @@
{#1}
\tl_if_in:VnTF \l__chemformula_tmpa_tl { @ }
{
- \bool_set_true:N \l__chemformula_options_bool
+ \bool_set_false:N \l__chemformula_options_bool
\bool_set_true:N \l__chemformula_is_option_bool
\tl_remove_all:Nn \l__chemformula_tmpa_tl { @ }
\exp_last_unbraced:Nno
@@ -2182,7 +2170,7 @@
\cs_new_protected:Npn \__chemformula_print_stoich:n #1
{ \chemformula_parse_stoich:n {#1} }
-\cs_generate_variant:Nn \__chemformula_print_stoich:n { V }
+\cs_generate_variant:Nn \__chemformula_print_stoich:n {V}
\cs_new_protected:Npn \chemformula_parse_stoich:n #1
{ \__chemformula_parse_stoich:w #1 \q_nil }
@@ -2292,7 +2280,6 @@
% input compounds
\cs_new_protected:Npn \__chemformula_input_compound:Nn #1#2
{
- % \tl_show:n {#1}
\tl_if_blank:VTF \l__chemformula_stoich_tl
{
% TODO
@@ -2303,13 +2290,14 @@
\__chemformula_input_options:n {#2}
\bool_if:NT \l__chemformula_is_option_bool
{
- \tl_put_right:Nn #1
+ \bool_set_true:N \l__chemformula_options_bool
+ \tl_put_right:Nx #1
{
\group_begin:
% open group
- \keys_set:nV
+ \keys_set:nn
{chemformula}
- \l__chemformula_internal_options_tl
+ { \exp_not:V \l__chemformula_internal_options_tl }
}
}
\bool_if:nT
@@ -2342,7 +2330,7 @@
\tl_clear:N \l__chemformula_stoich_tl
}
}
-\cs_generate_variant:Nn \__chemformula_input_compound:Nn { NV }
+\cs_generate_variant:Nn \__chemformula_input_compound:Nn {NV}
% TODO: this is redundant at the moment
\bool_new:N \g__chemformula_compound_group_open_bool
@@ -2376,84 +2364,42 @@
\selectfont
}
\bool_if:NT \l__chemformula_fontspec_bool
- { \chemformula_font: }
+ { \cs_if_exist_use:N \chemformula_font: }
\tl_use:N \l__chemformula_format_tl
\tl_if_eq:onTF { \f@series } {bx}
{ \cs_set_eq:NN \chemformula_bm:n \bm }
{ \cs_set:Nn \chemformula_bm:n {##1} }
}
-\cs_new_protected:Npn \chemformula_font: {}
+% \cs_new_protected:Npn \chemformula_font: {}
\cs_new_protected:Npn \__chemformula_fontspec:n #1
{
- \tl_if_in:nnTF {#1} { [ }
+ \tl_if_in:nnTF {#1} {[}
{ \__chemformula_fontspec_aux:w #1 \q_stop }
{ \__chemformula_fontspec_aux:w [] #1 \q_stop }
}
\cs_new_protected:Npn \__chemformula_fontspec_aux:w [#1]#2 \q_stop
- { \newfontfamily \chemformula_font: [ #1 ] {#2} }
-
-\cs_new_protected:Npn \__chemformula_save_catcodes:
- {
- \cs_gset_protected:Npx \__chemformula_restore:
- {
- \char_set_catcode:nn { 95 } { \char_value_catcode:n { 95 } }% _
- \char_set_catcode:nn { 58 } { \char_value_catcode:n { 58 } }% :
- \char_set_catcode:nn { 94 } { \char_value_catcode:n { 94 } }% ^
- \char_set_catcode:nn { 123 } { \char_value_catcode:n { 123 } }% {
- \char_set_catcode:nn { 125 } { \char_value_catcode:n { 125 } }% }
- \char_set_catcode:nn { 35 } { \char_value_catcode:n { 35 } }% #
- \char_set_catcode:nn { 33 } { \char_value_catcode:n { 33 } }% !
- \char_set_catcode:nn { 34 } { \char_value_catcode:n { 34 } }% "
- \char_set_catcode:nn { 60 } { \char_value_catcode:n { 60 } }% <
- \char_set_catcode:nn { 62 } { \char_value_catcode:n { 62 } }% >
- }
- }
-
-\cs_new_protected:Npn \__chemformula_sanitize:Nn #1#2
- {
- \tl_set_rescan:Nnn #1
- {
- % expl3 catcodes:
- \char_set_catcode_letter:N \_
- \char_set_catcode_letter:N \:
- % I've forgotten why I put this here:
- \char_set_catcode_math_superscript:N \^
- % disable some of the specials (needed for sub- and superscripts):
- \char_set_catcode_letter:N \{
- \char_set_catcode_letter:N \}
- % this one seems not necessary any more:
- % \char_set_catcode_letter:N \\
- \char_set_catcode_letter:N \#
- % make the naming work with babel languages like French that make
- % ! active:
- \char_set_catcode_other:N \!
- % make the naming work with babel languages like Spanish that make
- % < and > active:
- \char_set_catcode_other:N \>
- \char_set_catcode_other:N \<
- % ensure " is other:
- \char_set_catcode_other:N \"
- }
- {#2}
- }
-\cs_generate_variant:Nn \__chemformula_sanitize:Nn { NV }
+ { \newfontfamily \chemformula_font: [#1] {#2} }
-\cs_new_protected:Npn \__chemformula_prepare_output:N #1
+\cs_new_protected:Npn \__chemformula_prepare_output:Nn #1#2
{
\tl_set_rescan:NnV #1
{
\__chemformula_restore:
- \ExplSyntaxOn
- \makeatletter
+ #2
+ % we /need/ those:
+ \char_set_catcode_letter:N \@
+ \char_set_catcode_letter:N \_
+ \char_set_catcode_letter:N \:
}
#1
}
-
+\cs_generate_variant:Nn \__chemformula_prepare_output:Nn {NV}
+
\cs_new_protected:Npn \__chemformula_reset:Nn #1#2
{ \tl_set_rescan:Nnn #1 { \__chemformula_restore: } {#2} }
-\cs_generate_variant:Nn \__chemformula_reset:Nn { NV }
+\cs_generate_variant:Nn \__chemformula_reset:Nn {NV}
\prg_new_protected_conditional:Npnn \__chemformula_if_only_parens:n #1 {T,F,TF}
{
@@ -2547,6 +2493,7 @@
% start with formatting:
\tl_put_right:Nn #1
{
+ \tl_use:N \l__chemformula_format_tl
\group_begin:
\l__chemformula_atom_format_tl
}
@@ -2588,7 +2535,7 @@
}
\tl_clear:N \l__chemformula_tmpa_tl
}
-\cs_generate_variant:Nn \__chemformula_input_compound_no_check:Nn { NV }
+\cs_generate_variant:Nn \__chemformula_input_compound_no_check:Nn {NV}
% --------------------------------------------------------------------------
% clean up chemmacros commands:
@@ -2598,7 +2545,7 @@
{ \mode_if_math:TF { \text {##1} } {##1} }
\cs_set:Npn \chemmacros_xspace: {}
}
-\cs_generate_variant:Nn \__chemformula_clean_chemmacros:n { V }
+\cs_generate_variant:Nn \__chemformula_clean_chemmacros:n {V}
% --------------------------------------------------------------------------
% input "and" sign
@@ -2797,7 +2744,7 @@
}
\bool_set_false:N \l__chemformula_is_arrow_bool
}
-\cs_generate_variant:Nn \__chemformula_input_arrow:n { o,V }
+\cs_generate_variant:Nn \__chemformula_input_arrow:n {o,V}
% --------------------------------------------------------------------------
% input compound name
@@ -2854,30 +2801,23 @@
\__chemformula_read_escape_single:w #1 \q_nil
}
}
-\cs_generate_variant:Nn \__chemformula_input_escape_text:n { V }
+\cs_generate_variant:Nn \__chemformula_input_escape_text:n {V}
\cs_new_protected:Npn \__chemformula_read_escape_text:n #1
{
\tl_set_rescan:Nnn \l__chemformula_tmpa_tl
{
- \char_set_catcode_letter:N \_
- \char_set_catcode_other:N \:
-
+ % \char_set_catcode_letter:N \_
+ % \char_set_catcode_other:N \:
+ \char_set_catcode_space:N \~
}
{#1}
\tl_replace_all:Nnn \l__chemformula_tmpa_tl
{ \_ } { chemformulaplaceholder }
\tl_replace_all:Nnn \l__chemformula_tmpa_tl
- { _ } { \sb }
+ {_} { \sb }
\tl_replace_all:Nnn \l__chemformula_tmpa_tl
{ chemformulaplaceholder } { \_ }
- % those cause trouble with chemmacros' \ox:
- % \tl_put_left:Nn \l__chemformula_tmpa_tl
- % { \chemformula_group_begin: }
- % \tl_put_right:Nn \l__chemformula_tmpa_tl
- % { \chemformula_group_end: }
- % TODO: waum ist das auskommentiert
- % \__chemformula_reset:NV \l__chemformula_tmpa_tl \l__chemformula_tmpa_tl
\tl_put_right:NV \l__chemformula_input_tl \l__chemformula_tmpa_tl
}
@@ -2933,10 +2873,9 @@
\tl_replace_all:Nnn \l__chemformula_tmpa_tl
{ \_ } { chemformulaplaceholder }
\tl_replace_all:Nnn \l__chemformula_tmpa_tl
- { _ } { \sb }
+ {_} { \sb }
\tl_replace_all:Nnn \l__chemformula_tmpa_tl
{ chemformulaplaceholder } { \_ }
- % \__chemformula_reset:NV \l__chemformula_tmpa_tl \l__chemformula_tmpa_tl
\tl_put_left:Nn \l__chemformula_tmpa_tl
{ \chemformula_group_begin: }
\tl_put_right:Nn \l__chemformula_tmpa_tl
@@ -3072,7 +3011,8 @@
\bool_set_false:N \l__chemformula_fss_bool
\bool_set_false:N \l__chemformula_fontspec_bool
\tl_set:Nn \l__chemformula_format_tl {#1} ,
- atom-format .tl_set:N = \l__chemformula_atom_format_tl
+ atom-format .tl_set:N = \l__chemformula_atom_format_tl ,
+ set-catcodes .tl_set:N = \l__chemformula_catcodes_tl
}
% --------------------------------------------------------------------------
@@ -3114,13 +3054,13 @@
\cs_new_protected:Npn \chemformula_get_lewis_sequence:Nn #1#2
{
\tl_set:Nn \l__chemformula_tmpa_tl {#2}
- \tl_replace_all:Nnn \l__chemformula_tmpa_tl { : } { \scan_stop: : , }
+ \tl_replace_all:Nnn \l__chemformula_tmpa_tl {:} { \scan_stop: : , }
\tl_replace_all:NVn \l__chemformula_tmpa_tl \c__chemformula_colon_tl
{ \scan_stop: : , }
- \tl_replace_all:Nnn \l__chemformula_tmpa_tl { . } { \scan_stop: . , }
- \tl_replace_all:Nnn \l__chemformula_tmpa_tl { | } { \scan_stop: | , }
- \tl_replace_all:Nnn \l__chemformula_tmpa_tl { o } { \scan_stop: o , }
- \seq_set_split:NnV #1 { , } \l__chemformula_tmpa_tl
+ \tl_replace_all:Nnn \l__chemformula_tmpa_tl {.} { \scan_stop: . , }
+ \tl_replace_all:Nnn \l__chemformula_tmpa_tl {|} { \scan_stop: | , }
+ \tl_replace_all:Nnn \l__chemformula_tmpa_tl {o} { \scan_stop: o , }
+ \seq_set_split:NnV #1 {,} \l__chemformula_tmpa_tl
}
\cs_new_protected:Npn \chemformula_lewis_get_angle_and_spec:n #1
@@ -3149,26 +3089,26 @@
\l__chemformula_tmpa_tl
{ \tl_use:N \l__chemformula_tmpa_tl }
}
-\cs_generate_variant:Nn \__chemformula_lewis_set_elspec_type:n { V }
+\cs_generate_variant:Nn \__chemformula_lewis_set_elspec_type:n {V}
% available types:
\cs_new_protected:Npn \chemformula_declare_lewis_elspec_type:nn #1#2
{ \prop_put:Nnn \l__chemformula_lewis_elspec_types_prop {#1} {#2} }
\chemformula_declare_lewis_elspec_type:nn
- { | }
+ {|}
{ \__chemformula_lewis_elspec_pair_line: }
\chemformula_declare_lewis_elspec_type:nn
- { : }
+ {:}
{ \__chemformula_lewis_elspec_pair_dots: }
\chemformula_declare_lewis_elspec_type:nn
- { . }
+ {.}
{ \__chemformula_lewis_elspec_single: }
\chemformula_declare_lewis_elspec_type:nn
- { o }
+ {o}
{ \__chemformula_lewis_elspec_empty: }
\chemformula_declare_lewis_elspec_type:nn
@@ -3561,9 +3501,17 @@
takes an argument
2017/03/23 - version 4.15e - small bug fix (issue #5)
- implement \shortintertext bypass
+2019/09/23 - version 4.15f - add missing definition for temporary variable
+2019/09/27 - version 4.15g - bug fix in fontspec option
+2019/10/13 - version 4.15h - new (undocumented) option `set-catcodes'
+ - fix behaviour with category codes
+ (https://tex.stackexchange.com/q/511592/)
+ - fix bug: local format changes are now applied
+ again
+2020/02/01 - version 4.15i - fix issue #12
+2020/03/07 - version 4.15j - make sure that < and > have catcode 12 when read
+ as arrows -- again...
% --------------------------------------------------------------------------
-% TODO
+% IDEAS:
- Addukte: Zahlen nach * und . automatisch erkennen?
-- make escaped text/math /truely/ escaped, i.e., behave as if it's been input
- /outside/ of \ch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chemformula.tlpobj new/tlpkg/tlpobj/chemformula.tlpobj
--- old/tlpkg/tlpobj/chemformula.tlpobj 2019-02-28 03:25:19.000000000 +0100
+++ new/tlpkg/tlpobj/chemformula.tlpobj 2020-03-08 01:33:31.000000000 +0100
@@ -1,17 +1,17 @@
name chemformula
category Package
-revision 43583
+revision 54158
shortdesc Command for typesetting chemical formulas and reactions
relocated 1
longdesc The package provides a command to typeset chemical formulas and
longdesc reactions in support of other chemistry packages (such as
longdesc chemmacros). The package used to be distributed as a part of
longdesc chemmacros.
-runfiles size=33
+depend units
+runfiles size=32
RELOC/tex/latex/chemformula/chemformula.sty
catalogue-contact-repository https://github.com/cgnieder/chemformula/
catalogue-ctan /macros/latex/contrib/chemformula
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license lppl1.3
-catalogue-topics chemistry
-catalogue-version 4.15e
+catalogue-topics chemistry expl3
+catalogue-version 4.15j
++++++ chemgreek.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/chemgreek/README new/doc/latex/chemgreek/README
--- old/doc/latex/chemgreek/README 2016-12-20 23:56:46.000000000 +0100
+++ new/doc/latex/chemgreek/README 2020-01-17 22:52:40.000000000 +0100
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the CHEMGREEK package v1.1 2016/12/20
+the CHEMGREEK package v1.1a 2020/01/16
typeset chemical compounds and reactions
@@ -8,7 +8,7 @@
Web: http://www.mychemistry.eu/forums/forum/chemgreek/
E-Mail: contact(a)mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2011-2016 Clemens Niederberger
+Copyright 2015--2020 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/chemgreek/chemgreek_en.pdf and new/doc/latex/chemgreek/chemgreek_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/chemgreek/chemgreek_en.tex new/doc/latex/chemgreek/chemgreek_en.tex
--- old/doc/latex/chemgreek/chemgreek_en.tex 2016-12-20 23:56:46.000000000 +0100
+++ new/doc/latex/chemgreek/chemgreek_en.tex 2020-01-17 22:52:40.000000000 +0100
@@ -1,4 +1,4 @@
-% arara: pdflatex: { shell: on }
+% arara: pdflatex: { shell: on , interaction: nonstopmode }
% !arara: biber
% !arara: pdflatex
% !arara: pdflatex
@@ -16,7 +16,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2015 Clemens Niederberger
+% Copyright 2015--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chemgreek.doc.tlpobj new/tlpkg/tlpobj/chemgreek.doc.tlpobj
--- old/tlpkg/tlpobj/chemgreek.doc.tlpobj 2019-02-28 03:25:19.000000000 +0100
+++ new/tlpkg/tlpobj/chemgreek.doc.tlpobj 2020-01-18 01:54:30.000000000 +0100
@@ -1,9 +1,9 @@
name chemgreek.doc
category Package
-revision 42758
+revision 53437
shortdesc doc files of chemgreek
relocated 1
-docfiles size=187
+docfiles size=181
RELOC/doc/latex/chemgreek/README
RELOC/doc/latex/chemgreek/chemgreek_en.pdf
RELOC/doc/latex/chemgreek/chemgreek_en.tex
++++++ chemgreek.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chemgreek/chemgreek.sty new/tex/latex/chemgreek/chemgreek.sty
--- old/tex/latex/chemgreek/chemgreek.sty 2016-12-20 23:56:46.000000000 +0100
+++ new/tex/latex/chemgreek/chemgreek.sty 2020-01-17 22:52:40.000000000 +0100
@@ -6,13 +6,13 @@
% --------------------------------------------------------------------------
% Clemens Niederberger
% --------------------------------------------------------------------------
-% https://github.org/cgnieder/chemgreek/
+% https://github.com/cgnieder/chemgreek/
% contact(a)mychemistry.eu
% --------------------------------------------------------------------------
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011-2016 Clemens Niederberger
+% Copyright 2015--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,9 +28,10 @@
% --------------------------------------------------------------------------
\RequirePackage{expl3,xparse,amstext}
\ExplSyntaxOn
-\tl_const:Nn \c_chemgreek_date_tl {2016/12/20}
-\tl_const:Nn \c_chemgreek_version_tl {1.1}
-\tl_const:Nn \c_chemgreek_info_tl {interface for upright greek letters for use in chemistry}
+\tl_const:Nn \c_chemgreek_date_tl {2020/01/16}
+\tl_const:Nn \c_chemgreek_version_tl {1.1a}
+\tl_const:Nn \c_chemgreek_info_tl
+ {interface~ for~ upright~ Greek~ letters~ for~ use~ in~ chemistry}
\ProvidesExplPackage{chemgreek}
{\c_chemgreek_date_tl}
@@ -186,13 +187,16 @@
\cs_generate_variant:Nn \msg_warning:nnnn { nnnV }
\cs_generate_variant:Nn \quark_if_no_value:nTF { V }
+\tl_new:N \l__chemgreek_lower_tl
+\tl_new:N \l__chemgreek_upper_tl
+
% ----------------------------------------------------------------------------
% helper function to retrieve upper- and lowercase entries while the mapping
% happens:
-\cs_new_protected:Npn \__chemgreek_get_upper_lower:w #1 / #2 \q_stop
+\cs_new_protected:Npn \__chemgreek_get_upper_lower:ww #1 / #2 \q_stop
{
- \tl_set:Nn \l__chemgreek_tmpa_tl {#1}
- \tl_set:Nn \l__chemgreek_tmpb_tl {#2}
+ \tl_set:Nn \l__chemgreek_lower_tl {#1}
+ \tl_set:Nn \l__chemgreek_upper_tl {#2}
}
% ----------------------------------------------------------------------------
@@ -270,13 +274,13 @@
\clist_map_inline:nn {#2}
{
\int_incr:N \l__chemgreek_tmpa_int
- \__chemgreek_get_upper_lower:w ##1 \q_stop
+ \__chemgreek_get_upper_lower:ww ##1 \q_stop
\prop_put:cxV { l__chemgreek_lowercase_mapping_#1_prop }
{ \tl_item:Nn \c__chemgreek_alphabet_tl { \l__chemgreek_tmpa_int } }
- \l__chemgreek_tmpa_tl
+ \l__chemgreek_lower_tl
\prop_put:cxV { l__chemgreek_uppercase_mapping_#1_prop }
{ \tl_item:Nn \c__chemgreek_alphabet_tl { \l__chemgreek_tmpa_int } }
- \l__chemgreek_tmpb_tl
+ \l__chemgreek_upper_tl
}
}
@@ -429,27 +433,27 @@
\cs_set_protected:cpx
{
chem
- \str_upper_case:f { \tl_head:n {##1} }
- \str_lower_case:f { \tl_tail:n {##1} }
+ \str_uppercase:f { \tl_head:n {##1} }
+ \str_lowercase:f { \tl_tail:n {##1} }
}
{ \prop_item:cn { l__chemgreek_uppercase_mapping_#1_prop } {##1} }
\cs_set_eq:cc
{
chemgreek_
- \str_upper_case:f { \tl_head:n {##1} }
- \str_lower_case:f { \tl_tail:n {##1} }
+ \str_uppercase:f { \tl_head:n {##1} }
+ \str_lowercase:f { \tl_tail:n {##1} }
:
}
{
chem
- \str_upper_case:f { \tl_head:n {##1} }
- \str_lower_case:f { \tl_tail:n {##1} }
+ \str_uppercase:f { \tl_head:n {##1} }
+ \str_lowercase:f { \tl_tail:n {##1} }
}
- \cs_set_protected:cpx { chem \str_lower_case:f {##1} }
+ \cs_set_protected:cpx { chem \str_lowercase:f {##1} }
{ \prop_item:cn { l__chemgreek_lowercase_mapping_#1_prop } {##1} }
\cs_set_eq:cc
- { chemgreek_ \str_lower_case:f {##1} : }
- { chem \str_lower_case:f {##1} }
+ { chemgreek_ \str_lowercase:f {##1} : }
+ { chem \str_lowercase:f {##1} }
}
\msg_info:nnn {chemgreek} {mapping-activated} {#1}
}
@@ -460,12 +464,12 @@
{
\tl_set:Nx \l__chemgreek_tmpa_tl
{
- \str_upper_case:f { \tl_head:n {#2} }
- \str_lower_case:f { \tl_tail:n {#2} }
+ \str_uppercase:f { \tl_head:n {#2} }
+ \str_lowercase:f { \tl_tail:n {#2} }
}
\str_if_eq:nVTF {#2} \l__chemgreek_tmpa_tl
{
- \tl_set:Nx \l__chemgreek_tmpa_tl { \str_lower_case:f {#2} }
+ \tl_set:Nx \l__chemgreek_tmpa_tl { \str_lowercase:f {#2} }
\prop_item:cV
{ l__chemgreek_uppercase_mapping_#1_prop }
\l__chemgreek_tmpa_tl
@@ -523,14 +527,14 @@
\iow_log:x
{
. \c_space_tl \c_space_tl \c_space_tl \c_space_tl \c_space_tl
- \str_lower_case:f {##1} ~ => ~
+ \str_lowercase:f {##1} ~ => ~
\prop_item:cn { l__chemgreek_lowercase_mapping_#1_prop } {##1}
}
\iow_log:x
{
. \c_space_tl \c_space_tl \c_space_tl \c_space_tl \c_space_tl
- \str_upper_case:f { \tl_head:n {##1} }
- \str_lower_case:f { \tl_tail:n {##1} }
+ \str_uppercase:f { \tl_head:n {##1} }
+ \str_lowercase:f { \tl_tail:n {##1} }
\c_space_tl => ~
\prop_item:cn { l__chemgreek_uppercase_mapping_#1_prop } {##1}
}
@@ -544,12 +548,12 @@
{
\tl_map_inline:Nn \c__chemgreek_alphabet_tl
{
- \use:c { chem \str_lower_case:f {##1} }
+ \use:c { chem \str_lowercase:f {##1} }
\use:c
{
chem
- \str_upper_case:f { \tl_head:n {##1} }
- \str_lower_case:f { \tl_tail:n {##1} }
+ \str_uppercase:f { \tl_head:n {##1} }
+ \str_lowercase:f { \tl_tail:n {##1} }
}
\c_space_tl
}
@@ -571,8 +575,8 @@
\chemgreek_drop_symbol:n {##1}
\chemgreek_drop_symbol:n
{
- \str_upper_case:f { \tl_head:n {##1} }
- \str_lower_case:f { \tl_tail:n {##1} }
+ \str_uppercase:f { \tl_head:n {##1} }
+ \str_lowercase:f { \tl_tail:n {##1} }
}
}
}
@@ -586,30 +590,30 @@
{
\int_to_symbols:nnn {#1} {24}
{
- { 1 } { \chemalpha }
- { 2 } { \chembeta }
- { 3 } { \chemgamma }
- { 4 } { \chemdelta }
- { 5 } { \chemepsilon }
- { 6 } { \chemzeta }
- { 7 } { \chemeta }
- { 8 } { \chemiota }
- { 9 } { \chemtheta }
- { 10 } { \chemkappa }
- { 11 } { \chemlambda }
- { 12 } { \chemmu }
- { 13 } { \chemnu }
- { 14 } { \chemxi }
- { 15 } { \chemomikron }
- { 16 } { \chempi }
- { 17 } { \chemrho }
- { 18 } { \chemsigma }
- { 19 } { \chemtau }
- { 20 } { \chemupsilon }
- { 21 } { \chemphi }
- { 22 } { \chemchi }
- { 23 } { \chempsi }
- { 24 } { \chemomega }
+ { 1 } { \chemgreek_alpha: }
+ { 2 } { \chemgreek_beta: }
+ { 3 } { \chemgreek_gamma: }
+ { 4 } { \chemgreek_delta: }
+ { 5 } { \chemgreek_epsilon: }
+ { 6 } { \chemgreek_zeta: }
+ { 7 } { \chemgreek_eta: }
+ { 8 } { \chemgreek_iota: }
+ { 9 } { \chemgreek_theta: }
+ { 10 } { \chemgreek_kappa: }
+ { 11 } { \chemgreek_lambda: }
+ { 12 } { \chemgreek_mu: }
+ { 13 } { \chemgreek_nu: }
+ { 14 } { \chemgreek_xi: }
+ { 15 } { \chemgreek_omikron: }
+ { 16 } { \chemgreek_pi: }
+ { 17 } { \chemgreek_rho: }
+ { 18 } { \chemgreek_sigma: }
+ { 19 } { \chemgreek_tau: }
+ { 20 } { \chemgreek_upsilon: }
+ { 21 } { \chemgreek_phi: }
+ { 22 } { \chemgreek_chi: }
+ { 23 } { \chemgreek_psi: }
+ { 24 } { \chemgreek_omega: }
}
}
@@ -617,30 +621,30 @@
{
\int_to_symbols:nnn {#1} {24}
{
- { 1 } { \chemAlpha }
- { 2 } { \chemBeta }
- { 3 } { \chemGamma }
- { 4 } { \chemDelta }
- { 5 } { \chemEpsilon }
- { 6 } { \chemZeta }
- { 7 } { \chemEta }
- { 8 } { \chemIota }
- { 9 } { \chemTheta }
- { 10 } { \chemKappa }
- { 11 } { \chemLambda }
- { 12 } { \chemMu }
- { 13 } { \chemNu }
- { 14 } { \chemXi }
- { 15 } { \chemOmikron }
- { 16 } { \chemPi }
- { 17 } { \chemRho }
- { 18 } { \chemSigma }
- { 19 } { \chemTau }
- { 20 } { \chemUpsilon }
- { 21 } { \chemPhi }
- { 22 } { \chemChi }
- { 23 } { \chemPsi }
- { 24 } { \chemOmega }
+ { 1 } { \chemgreek_Alpha: }
+ { 2 } { \chemgreek_Beta: }
+ { 3 } { \chemgreek_Gamma: }
+ { 4 } { \chemgreek_Delta: }
+ { 5 } { \chemgreek_Epsilon: }
+ { 6 } { \chemgreek_Zeta: }
+ { 7 } { \chemgreek_Eta: }
+ { 8 } { \chemgreek_Iota: }
+ { 9 } { \chemgreek_Theta: }
+ { 10 } { \chemgreek_Kappa: }
+ { 11 } { \chemgreek_Lambda: }
+ { 12 } { \chemgreek_Mu: }
+ { 13 } { \chemgreek_Nu: }
+ { 14 } { \chemgreek_Xi: }
+ { 15 } { \chemgreek_Omikron: }
+ { 16 } { \chemgreek_Pi: }
+ { 17 } { \chemgreek_Rho: }
+ { 18 } { \chemgreek_Sigma: }
+ { 19 } { \chemgreek_Tau: }
+ { 20 } { \chemgreek_Upsilon: }
+ { 21 } { \chemgreek_Phi: }
+ { 22 } { \chemgreek_Chi: }
+ { 23 } { \chemgreek_Psi: }
+ { 24 } { \chemgreek_Omega: }
}
}
@@ -649,88 +653,88 @@
% default:
\chemgreek_new_mapping:nnn {default} { }
{
- \ensuremath{\alpha} / \ensuremath{\mathrm{A}} , % 1
- \ensuremath{\beta} / \ensuremath{\mathrm{B}} , % 2
- \ensuremath{\gamma} / \ensuremath{\Gamma} , % 3
- \ensuremath{\delta} / \ensuremath{\Delta} , % 4
- \ensuremath{\epsilon} / \ensuremath{\mathrm{E}} , % 5
- \ensuremath{\zeta} / \ensuremath{\mathrm{Z}} , % 6
- \ensuremath{\eta} / \ensuremath{\mathrm{H}} , % 7
- \ensuremath{\theta} / \ensuremath{\Theta} , % 8
- \ensuremath{\iota} / \ensuremath{\mathrm{I}} , % 9
- \ensuremath{\kappa} / \ensuremath{\mathrm{K}} , % 10
- \ensuremath{\lambda} / \ensuremath{\Lambda} , % 11
- \ensuremath{\mu} / \ensuremath{\mathrm{M}} , % 12
- \ensuremath{\nu} / \ensuremath{\mathrm{N}} , % 13
- \ensuremath{\xi} / \ensuremath{\Xi} , % 14
- \ensuremath{o} / \ensuremath{\mathrm{O}} , % 15
- \ensuremath{\pi} / \ensuremath{\Pi} , % 16
- \ensuremath{\rho} / \ensuremath{\mathrm{P}} , % 17
- \ensuremath{\sigma} / \ensuremath{\Sigma} , % 18
- \ensuremath{\tau} / \ensuremath{\mathrm{T}} , % 19
- \ensuremath{\upsilon} / \ensuremath{\Upsilon} , % 20
- \ensuremath{\phi} / \ensuremath{\Phi} , % 21
- \ensuremath{\chi} / \ensuremath{\mathrm{X}} , % 22
- \ensuremath{\psi} / \ensuremath{\Psi}, % 23
- \ensuremath{\omega} / \ensuremath{\Omega} % 24
+ \ensuremath {\alpha} / \ensuremath {\mathrm{A}} , % 1
+ \ensuremath {\beta} / \ensuremath {\mathrm{B}} , % 2
+ \ensuremath {\gamma} / \ensuremath {\Gamma} , % 3
+ \ensuremath {\delta} / \ensuremath {\Delta} , % 4
+ \ensuremath {\epsilon} / \ensuremath {\mathrm{E}} , % 5
+ \ensuremath {\zeta} / \ensuremath {\mathrm{Z}} , % 6
+ \ensuremath {\eta} / \ensuremath {\mathrm{H}} , % 7
+ \ensuremath {\theta} / \ensuremath {\Theta} , % 8
+ \ensuremath {\iota} / \ensuremath {\mathrm{I}} , % 9
+ \ensuremath {\kappa} / \ensuremath {\mathrm{K}} , % 10
+ \ensuremath {\lambda} / \ensuremath {\Lambda} , % 11
+ \ensuremath {\mu} / \ensuremath {\mathrm{M}} , % 12
+ \ensuremath {\nu} / \ensuremath {\mathrm{N}} , % 13
+ \ensuremath {\xi} / \ensuremath {\Xi} , % 14
+ \ensuremath {o} / \ensuremath {\mathrm{O}} , % 15
+ \ensuremath {\pi} / \ensuremath {\Pi} , % 16
+ \ensuremath {\rho} / \ensuremath {\mathrm{P}} , % 17
+ \ensuremath {\sigma} / \ensuremath {\Sigma} , % 18
+ \ensuremath {\tau} / \ensuremath {\mathrm{T}} , % 19
+ \ensuremath {\upsilon} / \ensuremath {\Upsilon} , % 20
+ \ensuremath {\phi} / \ensuremath {\Phi} , % 21
+ \ensuremath {\chi} / \ensuremath {\mathrm{X}} , % 22
+ \ensuremath {\psi} / \ensuremath {\Psi}, % 23
+ \ensuremath {\omega} / \ensuremath {\Omega} % 24
}
% default-variant:
\chemgreek_new_mapping:nnn {var-default} { }
{
- \ensuremath{\alpha} / \ensuremath{\mathrm{A}} , % 1
- \ensuremath{\beta} / \ensuremath{\mathrm{B}} , % 2
- \ensuremath{\gamma} / \ensuremath{\Gamma} , % 3
- \ensuremath{\delta} / \ensuremath{\Delta} , % 4
- \ensuremath{\varepsilon} / \ensuremath{\mathrm{E}} , % 5
- \ensuremath{\zeta} / \ensuremath{\mathrm{Z}} , % 6
- \ensuremath{\eta} / \ensuremath{\mathrm{H}} , % 7
- \ensuremath{\vartheta} / \ensuremath{\Theta} , % 8
- \ensuremath{\iota} / \ensuremath{\mathrm{I}} , % 9
- \ensuremath{\kappa} / \ensuremath{\mathrm{K}} , % 10
- \ensuremath{\lambda} / \ensuremath{\Lambda} , % 11
- \ensuremath{\mu} / \ensuremath{\mathrm{M}} , % 12
- \ensuremath{\nu} / \ensuremath{\mathrm{N}} , % 13
- \ensuremath{\xi} / \ensuremath{\Xi} , % 14
- \ensuremath{o} / \ensuremath{\mathrm{O}} , % 15
- \ensuremath{\varpi} / \ensuremath{\Pi} , % 16
- \ensuremath{\varrho} / \ensuremath{\mathrm{P}} , % 17
- \ensuremath{\varsigma} / \ensuremath{\Sigma} , % 18
- \ensuremath{\tau} / \ensuremath{\mathrm{T}} , % 19
- \ensuremath{\upsilon} / \ensuremath{\Upsilon} , % 20
- \ensuremath{\varphi} / \ensuremath{\Phi} , % 21
- \ensuremath{\chi} / \ensuremath{\mathrm{X}} , % 22
- \ensuremath{\psi} / \ensuremath{\Psi} , % 23
- \ensuremath{\omega} / \ensuremath{\Omega} % 24
+ \ensuremath {\alpha} / \ensuremath {\mathrm{A}} , % 1
+ \ensuremath {\beta} / \ensuremath {\mathrm{B}} , % 2
+ \ensuremath {\gamma} / \ensuremath {\Gamma} , % 3
+ \ensuremath {\delta} / \ensuremath {\Delta} , % 4
+ \ensuremath {\varepsilon} / \ensuremath {\mathrm{E}} , % 5
+ \ensuremath {\zeta} / \ensuremath {\mathrm{Z}} , % 6
+ \ensuremath {\eta} / \ensuremath {\mathrm{H}} , % 7
+ \ensuremath {\vartheta} / \ensuremath {\Theta} , % 8
+ \ensuremath {\iota} / \ensuremath {\mathrm{I}} , % 9
+ \ensuremath {\kappa} / \ensuremath {\mathrm{K}} , % 10
+ \ensuremath {\lambda} / \ensuremath {\Lambda} , % 11
+ \ensuremath {\mu} / \ensuremath {\mathrm{M}} , % 12
+ \ensuremath {\nu} / \ensuremath {\mathrm{N}} , % 13
+ \ensuremath {\xi} / \ensuremath {\Xi} , % 14
+ \ensuremath {o} / \ensuremath {\mathrm{O}} , % 15
+ \ensuremath {\varpi} / \ensuremath {\Pi} , % 16
+ \ensuremath {\varrho} / \ensuremath {\mathrm{P}} , % 17
+ \ensuremath {\varsigma} / \ensuremath {\Sigma} , % 18
+ \ensuremath {\tau} / \ensuremath {\mathrm{T}} , % 19
+ \ensuremath {\upsilon} / \ensuremath {\Upsilon} , % 20
+ \ensuremath {\varphi} / \ensuremath {\Phi} , % 21
+ \ensuremath {\chi} / \ensuremath {\mathrm{X}} , % 22
+ \ensuremath {\psi} / \ensuremath {\Psi} , % 23
+ \ensuremath {\omega} / \ensuremath {\Omega} % 24
}
% mathdesign:
\chemgreek_new_mapping:nnn {mathdesign} {mathdesign}
{
- \ensuremath{\alphaup} / \ensuremath{\mathrm{A}} , % 1
- \ensuremath{\betaup} / \ensuremath{\mathrm{B}} , % 2
- \ensuremath{\gammaup} / \ensuremath{\Gammaup} , % 3
- \ensuremath{\deltaup} / \ensuremath{\Deltaup} , % 4
- \ensuremath{\epsilonup} / \ensuremath{\mathrm{E}} , % 5
- \ensuremath{\zetaup} / \ensuremath{\mathrm{Z}} , % 6
- \ensuremath{\etaup} / \ensuremath{\mathrm{H}} , % 7
- \ensuremath{\thetaup} / \ensuremath{\Thetaup} , % 8
- \ensuremath{\iotaup} / \ensuremath{\mathrm{I}} , % 9
- \ensuremath{\kappaup} / \ensuremath{\mathrm{K}} , % 10
- \ensuremath{\lambdaup} / \ensuremath{\Lambdaup} , % 11
- \ensuremath{\muup} / \ensuremath{\mathrm{M}} , % 12
- \ensuremath{\nuup} / \ensuremath{\mathrm{N}} , % 13
- \ensuremath{\xiup} / \ensuremath{\Xiup} , % 14
- \ensuremath{\mathrm{o}} / \ensuremath{\mathrm{O}} , % 15
- \ensuremath{\piup} / \ensuremath{\Piup} , % 16
- \ensuremath{\rhoup} / \ensuremath{\mathrm{R}} , % 17
- \ensuremath{\sigmaup} / \ensuremath{\Sigmaup} , % 18
- \ensuremath{\tauup} / \ensuremath{\mathrm{T}} , % 19
- \ensuremath{\upsilonup} / \ensuremath{\Upsilonup} , % 20
- \ensuremath{\phiup} / \ensuremath{\Phiup} , % 21
- \ensuremath{\chiup} / \ensuremath{\mathrm{X}} , % 22
- \ensuremath{\psiup} / \ensuremath{\Psiup} , % 23
- \ensuremath{\omegaup} / \ensuremath{\Omegaup} % 24
+ \ensuremath {\alphaup} / \ensuremath {\mathrm{A}} , % 1
+ \ensuremath {\betaup} / \ensuremath {\mathrm{B}} , % 2
+ \ensuremath {\gammaup} / \ensuremath {\Gammaup} , % 3
+ \ensuremath {\deltaup} / \ensuremath {\Deltaup} , % 4
+ \ensuremath {\epsilonup} / \ensuremath {\mathrm{E}} , % 5
+ \ensuremath {\zetaup} / \ensuremath {\mathrm{Z}} , % 6
+ \ensuremath {\etaup} / \ensuremath {\mathrm{H}} , % 7
+ \ensuremath {\thetaup} / \ensuremath {\Thetaup} , % 8
+ \ensuremath {\iotaup} / \ensuremath {\mathrm{I}} , % 9
+ \ensuremath {\kappaup} / \ensuremath {\mathrm{K}} , % 10
+ \ensuremath {\lambdaup} / \ensuremath {\Lambdaup} , % 11
+ \ensuremath {\muup} / \ensuremath {\mathrm{M}} , % 12
+ \ensuremath {\nuup} / \ensuremath {\mathrm{N}} , % 13
+ \ensuremath {\xiup} / \ensuremath {\Xiup} , % 14
+ \ensuremath {\mathrm{o}} / \ensuremath {\mathrm{O}} , % 15
+ \ensuremath {\piup} / \ensuremath {\Piup} , % 16
+ \ensuremath {\rhoup} / \ensuremath {\mathrm{R}} , % 17
+ \ensuremath {\sigmaup} / \ensuremath {\Sigmaup} , % 18
+ \ensuremath {\tauup} / \ensuremath {\mathrm{T}} , % 19
+ \ensuremath {\upsilonup} / \ensuremath {\Upsilonup} , % 20
+ \ensuremath {\phiup} / \ensuremath {\Phiup} , % 21
+ \ensuremath {\chiup} / \ensuremath {\mathrm{X}} , % 22
+ \ensuremath {\psiup} / \ensuremath {\Psiup} , % 23
+ \ensuremath {\omegaup} / \ensuremath {\Omegaup} % 24
}
% textgreek:
@@ -765,88 +769,88 @@
% upgreek:
\chemgreek_new_mapping:nnn {upgreek} {upgreek}
{
- \ensuremath{\upalpha} / \ensuremath{\mathrm{A}} , % 1
- \ensuremath{\upbeta} / \ensuremath{\mathrm{B}} , % 2
- \ensuremath{\upgamma} / \ensuremath{\Upgamma} , % 3
- \ensuremath{\updelta} / \ensuremath{\Updelta} , % 4
- \ensuremath{\upepsilon} / \ensuremath{\mathrm{E}} , % 5
- \ensuremath{\upzeta} / \ensuremath{\mathrm{Z}} , % 6
- \ensuremath{\upeta} / \ensuremath{\mathrm{H}} , % 7
- \ensuremath{\uptheta} / \ensuremath{\Uptheta} , % 8
- \ensuremath{\upiota} / \ensuremath{\mathrm{I}} , % 9
- \ensuremath{\upkappa} / \ensuremath{\mathrm{K}} , % 10
- \ensuremath{\uplambda} / \ensuremath{\Uplambda} , % 11
- \ensuremath{\upmu} / \ensuremath{\mathrm{M}} , % 12
- \ensuremath{\upnu} / \ensuremath{\mathrm{N}} , % 13
- \ensuremath{\upxi} / \ensuremath{\Upxi} , % 14
- \ensuremath{\mathrm{o}} / \ensuremath{\mathrm{O}} , % 15
- \ensuremath{\uppi} / \ensuremath{\Uppi} , % 16
- \ensuremath{\uprho} / \ensuremath{\mathrm{R}} , % 17
- \ensuremath{\upsigma} / \ensuremath{\Upsigma} , % 18
- \ensuremath{\uptau} / \ensuremath{\mathrm{T}} , % 19
- \ensuremath{\upupsilon} / \ensuremath{\Upupsilon} , % 20
- \ensuremath{\upphi} / \ensuremath{\Upphi} , % 21
- \ensuremath{\upchi} / \ensuremath{\mathrm{X}} , % 22
- \ensuremath{\uppsi} / \ensuremath{\Uppsi} , % 23
- \ensuremath{\upomega} / \ensuremath{\Upomega} % 24
+ \ensuremath {\upalpha} / \ensuremath {\mathrm{A}} , % 1
+ \ensuremath {\upbeta} / \ensuremath {\mathrm{B}} , % 2
+ \ensuremath {\upgamma} / \ensuremath {\Upgamma} , % 3
+ \ensuremath {\updelta} / \ensuremath {\Updelta} , % 4
+ \ensuremath {\upepsilon} / \ensuremath {\mathrm{E}} , % 5
+ \ensuremath {\upzeta} / \ensuremath {\mathrm{Z}} , % 6
+ \ensuremath {\upeta} / \ensuremath {\mathrm{H}} , % 7
+ \ensuremath {\uptheta} / \ensuremath {\Uptheta} , % 8
+ \ensuremath {\upiota} / \ensuremath {\mathrm{I}} , % 9
+ \ensuremath {\upkappa} / \ensuremath {\mathrm{K}} , % 10
+ \ensuremath {\uplambda} / \ensuremath {\Uplambda} , % 11
+ \ensuremath {\upmu} / \ensuremath {\mathrm{M}} , % 12
+ \ensuremath {\upnu} / \ensuremath {\mathrm{N}} , % 13
+ \ensuremath {\upxi} / \ensuremath {\Upxi} , % 14
+ \ensuremath {\mathrm{o}} / \ensuremath {\mathrm{O}} , % 15
+ \ensuremath {\uppi} / \ensuremath {\Uppi} , % 16
+ \ensuremath {\uprho} / \ensuremath {\mathrm{R}} , % 17
+ \ensuremath {\upsigma} / \ensuremath {\Upsigma} , % 18
+ \ensuremath {\uptau} / \ensuremath {\mathrm{T}} , % 19
+ \ensuremath {\upupsilon} / \ensuremath {\Upupsilon} , % 20
+ \ensuremath {\upphi} / \ensuremath {\Upphi} , % 21
+ \ensuremath {\upchi} / \ensuremath {\mathrm{X}} , % 22
+ \ensuremath {\uppsi} / \ensuremath {\Uppsi} , % 23
+ \ensuremath {\upomega} / \ensuremath {\Upomega} % 24
}
% kpfonts:
\chemgreek_new_mapping:nnn {kpfonts} {kpfonts}
{
- \ensuremath{\alphaup} / \ensuremath{\mathrm{A}} , % 1
- \ensuremath{\betaup} / \ensuremath{\mathrm{B}} , % 2
- \ensuremath{\gammaup} / \ensuremath{\Gammaup} , % 3
- \ensuremath{\deltaup} / \ensuremath{\Deltaup} , % 4
- \ensuremath{\epsilonup} / \ensuremath{\mathrm{E}} , % 5
- \ensuremath{\zetaup} / \ensuremath{\mathrm{Z}} , % 6
- \ensuremath{\etaup} / \ensuremath{\mathrm{H}} , % 7
- \ensuremath{\thetaup} / \ensuremath{\Thetaup} , % 8
- \ensuremath{\iotaup} / \ensuremath{\mathrm{I}} , % 9
- \ensuremath{\kappaup} / \ensuremath{\mathrm{K}} , % 10
- \ensuremath{\lambdaup} / \ensuremath{\Lambdaup} , % 11
- \ensuremath{\muup} / \ensuremath{\mathrm{M}} , % 12
- \ensuremath{\nuup} / \ensuremath{\mathrm{N}} , % 13
- \ensuremath{\xiup} / \ensuremath{\Xiup} , % 14
- \ensuremath{\mathrm{o}} / \ensuremath{\mathrm{O}} , % 15
- \ensuremath{\piup} / \ensuremath{\Piup} , % 16
- \ensuremath{\rhoup} / \ensuremath{\mathrm{R}} , % 17
- \ensuremath{\sigmaup} / \ensuremath{\Sigmaup} , % 18
- \ensuremath{\tauup} / \ensuremath{\mathrm{T}} , % 19
- \ensuremath{\upsilonup} / \ensuremath{\Upsilonup} , % 20
- \ensuremath{\phiup} / \ensuremath{\Phiup} , % 21
- \ensuremath{\chiup} / \ensuremath{\mathrm{X}} , % 22
- \ensuremath{\psiup} / \ensuremath{\Psiup} , % 23
- \ensuremath{\omegaup} / \ensuremath{\Omegaup} % 24
+ \ensuremath {\alphaup} / \ensuremath {\mathrm{A}} , % 1
+ \ensuremath {\betaup} / \ensuremath {\mathrm{B}} , % 2
+ \ensuremath {\gammaup} / \ensuremath {\Gammaup} , % 3
+ \ensuremath {\deltaup} / \ensuremath {\Deltaup} , % 4
+ \ensuremath {\epsilonup} / \ensuremath {\mathrm{E}} , % 5
+ \ensuremath {\zetaup} / \ensuremath {\mathrm{Z}} , % 6
+ \ensuremath {\etaup} / \ensuremath {\mathrm{H}} , % 7
+ \ensuremath {\thetaup} / \ensuremath {\Thetaup} , % 8
+ \ensuremath {\iotaup} / \ensuremath {\mathrm{I}} , % 9
+ \ensuremath {\kappaup} / \ensuremath {\mathrm{K}} , % 10
+ \ensuremath {\lambdaup} / \ensuremath {\Lambdaup} , % 11
+ \ensuremath {\muup} / \ensuremath {\mathrm{M}} , % 12
+ \ensuremath {\nuup} / \ensuremath {\mathrm{N}} , % 13
+ \ensuremath {\xiup} / \ensuremath {\Xiup} , % 14
+ \ensuremath {\mathrm{o}} / \ensuremath {\mathrm{O}} , % 15
+ \ensuremath {\piup} / \ensuremath {\Piup} , % 16
+ \ensuremath {\rhoup} / \ensuremath {\mathrm{R}} , % 17
+ \ensuremath {\sigmaup} / \ensuremath {\Sigmaup} , % 18
+ \ensuremath {\tauup} / \ensuremath {\mathrm{T}} , % 19
+ \ensuremath {\upsilonup} / \ensuremath {\Upsilonup} , % 20
+ \ensuremath {\phiup} / \ensuremath {\Phiup} , % 21
+ \ensuremath {\chiup} / \ensuremath {\mathrm{X}} , % 22
+ \ensuremath {\psiup} / \ensuremath {\Psiup} , % 23
+ \ensuremath {\omegaup} / \ensuremath {\Omegaup} % 24
}
% newtx:
\chemgreek_new_mapping:nnn {newtx} {newtxmath}
{
- \ensuremath{\upalpha} / \ensuremath{\mathrm{A}} , % 1
- \ensuremath{\upbeta} / \ensuremath{\mathrm{B}} , % 2
- \ensuremath{\upgamma} / \ensuremath{\upGamma} , % 3
- \ensuremath{\updelta} / \ensuremath{\upDelta} , % 4
- \ensuremath{\upepsilon} / \ensuremath{\mathrm{E}} , % 5
- \ensuremath{\upzeta} / \ensuremath{\mathrm{Z}} , % 6
- \ensuremath{\upeta} / \ensuremath{\mathrm{H}} , % 7
- \ensuremath{\uptheta} / \ensuremath{\upTheta} , % 8
- \ensuremath{\upiota} / \ensuremath{\mathrm{I}} , % 9
- \ensuremath{\upkappa} / \ensuremath{\mathrm{K}} , % 10
- \ensuremath{\uplambda} / \ensuremath{\upLambda} , % 11
- \ensuremath{\upmu} / \ensuremath{\mathrm{M}} , % 12
- \ensuremath{\upnu} / \ensuremath{\mathrm{N}} , % 13
- \ensuremath{\upxi} / \ensuremath{\upXi} , % 14
- \ensuremath{\mathrm{o}} / \ensuremath{\mathrm{O}} , % 15
- \ensuremath{\uppi} / \ensuremath{\upPi} , % 16
- \ensuremath{\uprho} / \ensuremath{\mathrm{R}} , % 17
- \ensuremath{\upsigma} / \ensuremath{\upSigma} , % 18
- \ensuremath{\uptau} / \ensuremath{\mathrm{T}} , % 19
- \ensuremath{\upupsilon} / \ensuremath{\upUpsilon} , % 20
- \ensuremath{\upphi} / \ensuremath{\upPhi} , % 21
- \ensuremath{\upchi} / \ensuremath{\mathrm{X}} , % 22
- \ensuremath{\uppsi} / \ensuremath{\upPsi} , % 23
- \ensuremath{\upomega} / \ensuremath{\upOmega} % 24
+ \ensuremath {\upalpha} / \ensuremath {\mathrm{A}} , % 1
+ \ensuremath {\upbeta} / \ensuremath {\mathrm{B}} , % 2
+ \ensuremath {\upgamma} / \ensuremath {\upGamma} , % 3
+ \ensuremath {\updelta} / \ensuremath {\upDelta} , % 4
+ \ensuremath {\upepsilon} / \ensuremath {\mathrm{E}} , % 5
+ \ensuremath {\upzeta} / \ensuremath {\mathrm{Z}} , % 6
+ \ensuremath {\upeta} / \ensuremath {\mathrm{H}} , % 7
+ \ensuremath {\uptheta} / \ensuremath {\upTheta} , % 8
+ \ensuremath {\upiota} / \ensuremath {\mathrm{I}} , % 9
+ \ensuremath {\upkappa} / \ensuremath {\mathrm{K}} , % 10
+ \ensuremath {\uplambda} / \ensuremath {\upLambda} , % 11
+ \ensuremath {\upmu} / \ensuremath {\mathrm{M}} , % 12
+ \ensuremath {\upnu} / \ensuremath {\mathrm{N}} , % 13
+ \ensuremath {\upxi} / \ensuremath {\upXi} , % 14
+ \ensuremath {\mathrm{o}} / \ensuremath {\mathrm{O}} , % 15
+ \ensuremath {\uppi} / \ensuremath {\upPi} , % 16
+ \ensuremath {\uprho} / \ensuremath {\mathrm{R}} , % 17
+ \ensuremath {\upsigma} / \ensuremath {\upSigma} , % 18
+ \ensuremath {\uptau} / \ensuremath {\mathrm{T}} , % 19
+ \ensuremath {\upupsilon} / \ensuremath {\upUpsilon} , % 20
+ \ensuremath {\upphi} / \ensuremath {\upPhi} , % 21
+ \ensuremath {\upchi} / \ensuremath {\mathrm{X}} , % 22
+ \ensuremath {\uppsi} / \ensuremath {\upPsi} , % 23
+ \ensuremath {\upomega} / \ensuremath {\upOmega} % 24
}
% fourier:
@@ -866,28 +870,28 @@
\chemgreek_new_mapping:nnn {fourier} {fourier}
{
- \__chemgreek_lfourier:n {alpha} / \ensuremath{\mathrm{A}} , % 1
- \__chemgreek_lfourier:n {beta} / \ensuremath{\mathrm{B}} , % 2
+ \__chemgreek_lfourier:n {alpha} / \ensuremath {\mathrm{A}} , % 1
+ \__chemgreek_lfourier:n {beta} / \ensuremath {\mathrm{B}} , % 2
\__chemgreek_lfourier:n {gamma} / \__chemgreek_ufourier:n {Gamma} , % 3
\__chemgreek_lfourier:n {delta} / \__chemgreek_ufourier:n {Delta} , % 4
- \__chemgreek_lfourier:n {epsilon} / \ensuremath{\mathrm{E}} , % 5
- \__chemgreek_lfourier:n {zeta} / \ensuremath{\mathrm{Z}} , % 6
- \__chemgreek_lfourier:n {eta} / \ensuremath{\mathrm{H}} , % 7
+ \__chemgreek_lfourier:n {epsilon} / \ensuremath {\mathrm{E}} , % 5
+ \__chemgreek_lfourier:n {zeta} / \ensuremath {\mathrm{Z}} , % 6
+ \__chemgreek_lfourier:n {eta} / \ensuremath {\mathrm{H}} , % 7
\__chemgreek_lfourier:n {theta} / \__chemgreek_ufourier:n {Theta} , % 8
- \__chemgreek_lfourier:n {iota} / \ensuremath{\mathrm{I}} , % 9
- \__chemgreek_lfourier:n {kappa} / \ensuremath{\mathrm{K}} , % 10
+ \__chemgreek_lfourier:n {iota} / \ensuremath {\mathrm{I}} , % 9
+ \__chemgreek_lfourier:n {kappa} / \ensuremath {\mathrm{K}} , % 10
\__chemgreek_lfourier:n {lambda} / \__chemgreek_ufourier:n {Lambda} , % 11
- \__chemgreek_lfourier:n {mu} / \ensuremath{\mathrm{M}} , % 12
- \__chemgreek_lfourier:n {nu} / \ensuremath{\mathrm{N}} , % 13
+ \__chemgreek_lfourier:n {mu} / \ensuremath {\mathrm{M}} , % 12
+ \__chemgreek_lfourier:n {nu} / \ensuremath {\mathrm{N}} , % 13
\__chemgreek_lfourier:n {xi} / \__chemgreek_ufourier:n {Xi} , % 14
- \ensuremath {\mathrm{o}} / \ensuremath{\mathrm{O}} , % 15
+ \ensuremath {\mathrm{o}} / \ensuremath {\mathrm{O}} , % 15
\__chemgreek_lfourier:n {pi} / \__chemgreek_ufourier:n {Pi} , % 16
- \__chemgreek_lfourier:n {rho} / \ensuremath{\mathrm{R}} , % 17
+ \__chemgreek_lfourier:n {rho} / \ensuremath {\mathrm{R}} , % 17
\__chemgreek_lfourier:n {sigma} / \__chemgreek_ufourier:n {Sigma} , % 18
- \__chemgreek_lfourier:n {tau} / \ensuremath{\mathrm{T}} , % 19
+ \__chemgreek_lfourier:n {tau} / \ensuremath {\mathrm{T}} , % 19
\__chemgreek_lfourier:n {upsilon} / \__chemgreek_ufourier:n {Upsilon} , % 20
\__chemgreek_lfourier:n {phi} / \__chemgreek_ufourier:n {Phi} , % 21
- \__chemgreek_lfourier:n {chi} / \ensuremath{\mathrm{X}} , % 22
+ \__chemgreek_lfourier:n {chi} / \ensuremath {\mathrm{X}} , % 22
\__chemgreek_lfourier:n {psi} / \__chemgreek_ufourier:n {Psi} , % 23
\__chemgreek_lfourier:n {omega} / \__chemgreek_ufourier:n {Omega} % 24
}
@@ -960,30 +964,30 @@
\chemgreek_new_mapping:nnn {pxgreeks} {pxgreeks}
{
- \ensuremath{\alphaup} / \ensuremath{\mathrm{A}} , % 1
- \ensuremath{\betaup} / \ensuremath{\mathrm{B}} , % 2
- \ensuremath{\gammaup} / \__chemgreek_upxgreeks:n {Gamma} , % 3
- \ensuremath{\deltaup} / \__chemgreek_upxgreeks:n {Delta} , % 4
- \ensuremath{\epsilonup} / \ensuremath{\mathrm{E}} , % 5
- \ensuremath{\zetaup} / \ensuremath{\mathrm{Z}} , % 6
- \ensuremath{\etaup} / \ensuremath{\mathrm{H}} , % 7
- \ensuremath{\thetaup} / \__chemgreek_upxgreeks:n {Theta} , % 8
- \ensuremath{\iotaup} / \ensuremath{\mathrm{I}} , % 9
- \ensuremath{\kappaup} / \ensuremath{\mathrm{K}} , % 10
- \ensuremath{\lambdaup} / \__chemgreek_upxgreeks:n {Lambda} , % 11
- \ensuremath{\muup} / \ensuremath{\mathrm{M}} , % 12
- \ensuremath{\nuup} / \ensuremath{\mathrm{N}} , % 13
- \ensuremath{\xiup} / \__chemgreek_upxgreeks:n {Xi} , % 14
- \ensuremath{\omicronup} / \ensuremath{\mathrm{O}} , % 15
- \ensuremath{\piup} / \__chemgreek_upxgreeks:n {Pi} , % 16
- \ensuremath{\rhoup} / \ensuremath{\mathrm{R}} , % 17
- \ensuremath{\sigmaup} / \__chemgreek_upxgreeks:n {Sigma} , % 18
- \ensuremath{\tauup} / \ensuremath{\mathrm{T}} , % 19
- \ensuremath{\upsilonup} / \__chemgreek_upxgreeks:n {Upsilon} , % 20
- \ensuremath{\phiup} / \__chemgreek_upxgreeks:n {Phi} , % 21
- \ensuremath{\chiup} / \ensuremath{\mathrm{X}} , % 22
- \ensuremath{\psiup} / \__chemgreek_upxgreeks:n {Psi} , % 23
- \ensuremath{\omegaup} / \__chemgreek_upxgreeks:n {Omega} % 24
+ \ensuremath {\alphaup} / \ensuremath {\mathrm{A}} , % 1
+ \ensuremath {\betaup} / \ensuremath {\mathrm{B}} , % 2
+ \ensuremath {\gammaup} / \__chemgreek_upxgreeks:n {Gamma} , % 3
+ \ensuremath {\deltaup} / \__chemgreek_upxgreeks:n {Delta} , % 4
+ \ensuremath {\epsilonup} / \ensuremath {\mathrm{E}} , % 5
+ \ensuremath {\zetaup} / \ensuremath {\mathrm{Z}} , % 6
+ \ensuremath {\etaup} / \ensuremath {\mathrm{H}} , % 7
+ \ensuremath {\thetaup} / \__chemgreek_upxgreeks:n {Theta} , % 8
+ \ensuremath {\iotaup} / \ensuremath {\mathrm{I}} , % 9
+ \ensuremath {\kappaup} / \ensuremath {\mathrm{K}} , % 10
+ \ensuremath {\lambdaup} / \__chemgreek_upxgreeks:n {Lambda} , % 11
+ \ensuremath {\muup} / \ensuremath {\mathrm{M}} , % 12
+ \ensuremath {\nuup} / \ensuremath {\mathrm{N}} , % 13
+ \ensuremath {\xiup} / \__chemgreek_upxgreeks:n {Xi} , % 14
+ \ensuremath {\omicronup} / \ensuremath {\mathrm{O}} , % 15
+ \ensuremath {\piup} / \__chemgreek_upxgreeks:n {Pi} , % 16
+ \ensuremath {\rhoup} / \ensuremath {\mathrm{R}} , % 17
+ \ensuremath {\sigmaup} / \__chemgreek_upxgreeks:n {Sigma} , % 18
+ \ensuremath {\tauup} / \ensuremath {\mathrm{T}} , % 19
+ \ensuremath {\upsilonup} / \__chemgreek_upxgreeks:n {Upsilon} , % 20
+ \ensuremath {\phiup} / \__chemgreek_upxgreeks:n {Phi} , % 21
+ \ensuremath {\chiup} / \ensuremath {\mathrm{X}} , % 22
+ \ensuremath {\psiup} / \__chemgreek_upxgreeks:n {Psi} , % 23
+ \ensuremath {\omegaup} / \__chemgreek_upxgreeks:n {Omega} % 24
}
% ----------------------------------------------------------------------------
@@ -1025,25 +1029,25 @@
\cs_set_eq:cc
{
chem
- \str_upper_case:f { \tl_head:n {#1} }
- \str_lower_case:f { \tl_tail:n {#1} }
+ \str_uppercase:f { \tl_head:n {#1} }
+ \str_lowercase:f { \tl_tail:n {#1} }
}
{
text
- \str_upper_case:f { \tl_head:n {#1} }
- \str_lower_case:f { \tl_tail:n {#1} }
+ \str_uppercase:f { \tl_head:n {#1} }
+ \str_lowercase:f { \tl_tail:n {#1} }
}
\cs_set_eq:cc
{
chemgreek_
- \str_upper_case:f { \tl_head:n {#1} }
- \str_lower_case:f { \tl_tail:n {#1} }
+ \str_uppercase:f { \tl_head:n {#1} }
+ \str_lowercase:f { \tl_tail:n {#1} }
:
}
{
text
- \str_upper_case:f { \tl_head:n {#1} }
- \str_lower_case:f { \tl_tail:n {#1} }
+ \str_uppercase:f { \tl_head:n {#1} }
+ \str_lowercase:f { \tl_tail:n {#1} }
}
\cs_set_eq:cc {chem#1} {text#1}
\cs_set_eq:cc { chemgreek_ #1 : } {text#1}
@@ -1103,6 +1107,5 @@
2016/02/10 - v1.0e - one missed \prop_get:Nn
2016/20/12 - v1.1 - fix wrong alphabet order (issue #5)
- fix errors in fontspec mapping (issue #4)
-
-TODO:
+2020/01/16 - v1.1a - adapt to renaming of string case changing functions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chemgreek.tlpobj new/tlpkg/tlpobj/chemgreek.tlpobj
--- old/tlpkg/tlpobj/chemgreek.tlpobj 2019-02-28 03:25:20.000000000 +0100
+++ new/tlpkg/tlpobj/chemgreek.tlpobj 2020-01-18 01:54:30.000000000 +0100
@@ -1,6 +1,6 @@
name chemgreek
category Package
-revision 42758
+revision 53437
shortdesc Upright Greek letters in chemistry
relocated 1
longdesc The package provides upright Greek letters in support of other
@@ -10,7 +10,6 @@
RELOC/tex/latex/chemgreek/chemgreek.sty
catalogue-contact-repository https://github.com/cgnieder/chemgreek/
catalogue-ctan /macros/latex/contrib/chemgreek
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license lppl1.3
catalogue-topics chemistry
-catalogue-version 1.1
+catalogue-version 1.1a
++++++ chemmacros.doc.tar.xz ++++++
++++ 7386 lines of diff (skipped)
++++++ chemmacros.tar.xz ++++++
++++ 2349 lines of diff (skipped)
++++++ chemnum.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/chemnum/README new/doc/latex/chemnum/README
--- old/doc/latex/chemnum/README 2016-04-14 23:45:57.000000000 +0200
+++ new/doc/latex/chemnum/README 2019-10-02 23:15:52.000000000 +0200
@@ -1,16 +1,14 @@
--------------------------------------------------------------------------
-chemnum v1.2 2016/04/14
+chemnum v1.2c 2019/10/02
a comprehensive approach for the numbering of chemical compounds
--------------------------------------------------------------------------
Clemens Niederberger
-Web:
- v0.* https://bitbucket.org/cgnieder/chemnum/
- v1.* https://github.com/cgnieder/chemnum
+Web: https://github.com/cgnieder/chemnum
E-Mail: contact(a)mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2011-2016 Clemens Niederberger
+Copyright 2011--2019 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -32,5 +30,3 @@
- chemnum_en.tex, chemnum_en.pdf
- README
--------------------------------------------------------------------------
-Version 1 is a complete re-write from scratch of the `chemnum' package.
---------------------------------------------------------------------------
Binary files old/doc/latex/chemnum/chemnum_en.pdf and new/doc/latex/chemnum/chemnum_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/chemnum/chemnum_en.tex new/doc/latex/chemnum/chemnum_en.tex
--- old/doc/latex/chemnum/chemnum_en.tex 2016-04-14 23:45:57.000000000 +0200
+++ new/doc/latex/chemnum/chemnum_en.tex 2019-10-02 23:15:52.000000000 +0200
@@ -1,8 +1,36 @@
-% arara: pdflatex: { shell: on }
-%! arara: pdflatex: { shell: on }
-% arara: biber
-% arara: pdflatex
-% arara: pdflatex
+% --------------------------------------------------------------------------
+% the CHEMNUM package
+%
+% a comprehensive approach for the numbering of chemical compounds
+%
+% --------------------------------------------------------------------------
+% Clemens Niederberger
+% --------------------------------------------------------------------------
+% https://github.org/cgnieder/chemnum/
+% contact(a)mychemistry.eu
+% --------------------------------------------------------------------------
+% If you have any ideas, questions, suggestions or bugs to report, please
+% feel free to contact me.
+% --------------------------------------------------------------------------
+% Copyright 2011--2019 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.
+% --------------------------------------------------------------------------
+% !arara: pdflatex: { shell: on , interaction: nonstopmode }
+% !arara: pdflatex: { shell: on , interaction: nonstopmode }
+% !arara: biber
+% arara: pdflatex: { interaction: nonstopmode }
+% arara: pdflatex: { interaction: nonstopmode }
\documentclass[load-preamble+,ngerman,british,american]{cnltx-doc}
\usepackage[utf8]{inputenc}
\usepackage{chemnum}
@@ -47,7 +75,7 @@
keyis,
marginnote, midrule,
NewDocumentCommand,
- schemestart,schemestop,setatomsep,
+ schemestart,schemestop,setchemfig,
theffbibliography, toprule
} ,
index-setup = { othercode=\footnotesize,level=\addsec },
@@ -60,11 +88,13 @@
\usepackage{chemformula}
\setchemformula{format=\libertineLF}
\usepackage{chemfig,relsize}
-\setatomsep{1.78500 em}
-\setbondstyle{line width = 0.06642 em}
+\setchemfig{
+ atom sep = 1.78500 em ,
+ bond style = {line width = 0.06642 em}
+}
\renewcommand*\printatom[1]{\textsmaller{\ensuremath{\mathsf{#1}}}}
-\usepackage{array,booktabs}
+\usepackage{array,booktabs,csquotes}
\usepackage{graphicx}
@@ -112,57 +142,6 @@
\pkg{chemgreek}~\cite{pkg:chemgreek} and the \pkg{psfrag}~\cite{pkg:psfrag}
package.
-\section{News}\label{sec:news}
-The \chemnum\ package has been my first attempt to create a comprehensive
-labeling package for chemical compounds. However, it had and has more than
-one weakness and its code was -- to be frank -- a mess. Version~1 is now a
-complete re-write of \chemnum\ where I tried to achieve several points:
-\begin{itemize}
- \item A cleaner code internally.
- \item A cleaner user interface, \ie, more user macros for different tasks, a
- unified naming of the commands and a less redundant naming of the
- options.
- \item Extended functionality such as sorting and compressing of sublabel
- lists and sorting and merging of main label lists.
-\end{itemize}
-
-Although the syntax seems more or less the same at first sight quite a number
-of changes have been made that make version~1 incompatible with version~0.
-While I thought a while about maintaining backwards compatibility version~0
-was known to be in an experimental stage where everything was allowed to be
-changed at any time. So users \emph{could} know there was a risk. I have a
-feeling that many users nevertheless didn't realize this and may be bothered
-by this incompatibility. So I am well aware that the update will
-inconvenience some users. However, since version~0 won't be updated any more
-it made more sense to make a breaking update once.
-
-The same is not true for version~1. The syntax and commands described in this
-manual will not be changed as easily and from this version on I will take care
-of backwards compatibility.
-
-For those people wanting to keep older versions: they are are still available
-from websites such as \website{ctanhg.scharrer-online.de} or
-\securewebsite{bitbucket.org/cgnieder/chemnum}. You can also email me for an
-older version.
-
-Many commands have got a new name! The most important ones are:
-\begin{itemize}
- \item \cs*{cmpdref}; this is now called \cs{replacecmpd}.
- \item \cs*{cmpdinit}; this is now called \cs{initcmpd}.
- \item \cs*{cmpdreset}; this is now called \cs{resetcmpd}.
- \item \cs*{cmpdsetup}; this is now called \cs{setchemnum}.
-\end{itemize}
-However, there are many more changes. Basically all options have new names
-and often do their thing slightly different from the way things have been
-before.
-
-Please note that this overall change does not mean that version~1 is version~0
-declared stable. It is very likely that version~1 will now have quite a
-number of bugs to be fixed and probably missing features, too. So I'd be very
-glad to receive feedback either on \chemnum's homepage
-\securewebsite{github.com/cgnieder/chemnum} or via email to
-\email{contact(a)mychemistry.eu}.
-
\section{Overview over the Available Commands}\label{sec:overv-over-avail}
This section lists all available commands with a brief description. Commands
@@ -198,7 +177,7 @@
section~\ref{sec:deta-comp-labels}.
\command{replacecmpd}[\code{+}\oarg{options}\marg{\ac{id}}]
A command for replacing tags in \ac{eps} files, see
- section~\ref{sec:replacing-tags-aceps} for details.
+ section~\ref{sec:replacing-tags-eps-ps} for details.
\command{initcmpd}[\oarg{options}\marg{list of \acp{id}}]
Initiate compound labels. This command can only be used in the preamble.
It is desribed in section~\ref{sec:deta-comp-labels}.
@@ -329,7 +308,7 @@
More than one label can be put inside \cs{cmpd}, separated by commas. Then
a list like \cmpd{a, b, c, e, g.two} is printed.
\end{example}
-The Harvard comma (see section~\ref{sec:lang-depend-sett}) in \code{, and}
+The Harvard comma (see section~\ref{sec:lang-depend-sett}) in \enquote{\code{, and}}
between \cmpd{e} and \cmpd{g.two} suggests that there are options to customize
the list, see section~\ref{sec:formatting-labels} for more on this.
@@ -608,10 +587,14 @@
\keybool{merge}\Module{both (l)}\Default{false}
If set to true a list of labels is merged, \ie,
``\cmpd{q.five,a,q.two}'' becomes ``\cmpd[merge=true]{q.five,a,q.two}''.
- \keyval{pre-label-code}{code}\Module{cmpd (g)}\Default
+ \keyval{pre-label-code}{code}\Module{both (g)}\Default
Code to be inserted before a label.
- \keyval{post-label-code}{code}\Module{cmpd (g)}\Default
+ \keyval{post-label-code}{code}\Module{both (g)}\Default
Code to be inserted after a label.
+ \keyval{pre-main-label-code}{code}\Module{both (g)}\Default
+ \sinceversion{1.2a}Code to be inserted before a main label.
+ \keyval{post-main-label-code}{code}\Module{both (g)}\Default
+ \sinceversion{1.2a}Code to be inserted after a main label.
\keyval{main-sub-sep}{code}\Module{both (l)}\Default{.}
The separator symbol that is used in \cs{cmpd} to separate the \meta{main
\ac{id}} from a \meta{sub \ac{id}}.
@@ -855,9 +838,9 @@
the separators to your language have a look at
section~\ref{sec:lang-depend-sett}.
-\section{Replacing Tags in \ac{eps} or \ac{ps} Files}\label{sec:replacing-tags-aceps}
+\section{Replacing Tags in \ac{eps} or \ac{ps} Files}\label{sec:replacing-tags-eps-ps}
-Although it is quite possible to create rection schemes within \LaTeX\
+Although it is quite possible to create reaction schemes within \LaTeX\
directly -- for example with the \pkg{chemfig} package~\cite{pkg:chemfig} --
many people prefer to use a program such as \textsc{ChemDraw} for it. In
order to be able to use the labels with such schemes as well the following
@@ -865,11 +848,18 @@
\begin{itemize}
\item Create the scheme and place temporary tags like \code{TMP1},
\code{TMP2} and so on where you want the compound labels to be.
- \item Export the scheme as \ac{eps} or \ac{ps} figure where you make sure
- that the tags are embedded as text strings.
+ \item Export the scheme as \ac{eps} or \ac{ps} figure \emph{where you make
+ sure that the tags are embedded as text strings}. If the tags are not
+ present as text strings they cannot be replaced. This is a common source
+ of user problems.
\item Include the \ac{eps} with \cs*{includegraphics}. Right before that
use \cs{replacecmpd} once for every temporary tag.
\end{itemize}
+\emph{For the actual replacement please make sure that you compile with
+ \code{shell-escape} enabled. If you compile with \code{pdflatex} you
+ probably also need \pkg{auto-pst-pdf}~\cite{pkg:auto-pst-pdf} loaded. In
+ subsequent runs load it with option \code{off} when you turned off
+ \code{shell-escape}.}
\begin{commands}
\command{replacecmpd}[\code{+}\oarg{options}\marg{\ac{id}}]
@@ -894,7 +884,7 @@
figure~\ref{fig:scheme-tmp-tags-replaced}.
\begin{example}[compile,exe-with={--shell-escape},runs=1,float=htbp,caption={A scheme with
temporary tags replaced with labels.\label{fig:scheme-tmp-tags-replaced}}]
- % code for figure 2
+ % code for figure 2 -- compiled with shell-escape enabled
\documentclass{standalone}
\usepackage{graphicx,auto-pst-pdf,chemnum}
\begin{document}
@@ -971,7 +961,7 @@
\begin{example}[compile,exe-with={--shell-escape},runs=1,float=htbp,caption={A scheme with
arbitrary tags replaced with labels.\label{fig:scheme-bla-tags-replaced}}]
- % code for figure 4
+ % code for figure 4 -- compiled with shell-escape enabled
\documentclass{standalone}
\usepackage{graphicx,auto-pst-pdf,chemnum}
\begin{document}
@@ -1025,6 +1015,11 @@
translation.
\begin{table}[htbp]
+ \newcommand*\showlanguageentry[1]{%
+ #1
+ & \visualizespaces{\GetTranslationFor{#1}{chemnum-sep-two}}
+ & \visualizespaces{\GetTranslationFor{#1}{chemnum-sep-last-two}}
+ }
\centering
\caption{Available languages}
\label{tab:languages}
@@ -1034,45 +1029,19 @@
\bfseries chemnum-sep-two &
\bfseries chemnum-sep-last-two \\
\midrule
- English
- & \visualizespaces{\GetTranslationFor{English}{chemnum-sep-two}}
- & \visualizespaces{\GetTranslationFor{English}{chemnum-sep-last-two}} \\
- American
- & \visualizespaces{\GetTranslationFor{American}{chemnum-sep-two}}
- & \visualizespaces{\GetTranslationFor{American}{chemnum-sep-last-two}} \\
- German
- & \visualizespaces{\GetTranslationFor{German}{chemnum-sep-two}}
- & \visualizespaces{\GetTranslationFor{German}{chemnum-sep-last-two}} \\
- French
- & \visualizespaces{\GetTranslationFor{French}{chemnum-sep-two}}
- & \visualizespaces{\GetTranslationFor{French}{chemnum-sep-last-two}} \\
- Spanish
- & \visualizespaces{\GetTranslationFor{Spanish}{chemnum-sep-two}}
- & \visualizespaces{\GetTranslationFor{Spanish}{chemnum-sep-last-two}} \\
- Italian
- & \visualizespaces{\GetTranslationFor{Italian}{chemnum-sep-two}}
- & \visualizespaces{\GetTranslationFor{Italian}{chemnum-sep-last-two}} \\
- Catalan
- & \visualizespaces{\GetTranslationFor{Catalan}{chemnum-sep-two}}
- & \visualizespaces{\GetTranslationFor{Catalan}{chemnum-sep-last-two}} \\
- Portuguese
- & \visualizespaces{\GetTranslationFor{Portuguese}{chemnum-sep-two}}
- & \visualizespaces{\GetTranslationFor{Portuguese}{chemnum-sep-last-two}} \\
- Dutch
- & \visualizespaces{\GetTranslationFor{Dutch}{chemnum-sep-two}}
- & \visualizespaces{\GetTranslationFor{Dutch}{chemnum-sep-last-two}} \\
- Danish
- & \visualizespaces{\GetTranslationFor{Danish}{chemnum-sep-two}}
- & \visualizespaces{\GetTranslationFor{Danish}{chemnum-sep-last-two}} \\
- Swedish
- & \visualizespaces{\GetTranslationFor{Swedish}{chemnum-sep-two}}
- & \visualizespaces{\GetTranslationFor{Swedish}{chemnum-sep-last-two}} \\
- Finnish
- & \visualizespaces{\GetTranslationFor{Finnish}{chemnum-sep-two}}
- & \visualizespaces{\GetTranslationFor{Finnish}{chemnum-sep-last-two}} \\
- Norwegian
- & \visualizespaces{\GetTranslationFor{Norwegian}{chemnum-sep-two}}
- & \visualizespaces{\GetTranslationFor{Norwegian}{chemnum-sep-last-two}} \\
+ \showlanguageentry{English} \\
+ \showlanguageentry{American} \\
+ \showlanguageentry{German} \\
+ \showlanguageentry{French} \\
+ \showlanguageentry{Spanish} \\
+ \showlanguageentry{Italian} \\
+ \showlanguageentry{Catalan} \\
+ \showlanguageentry{Portuguese} \\
+ \showlanguageentry{Dutch} \\
+ \showlanguageentry{Danish} \\
+ \showlanguageentry{Swedish} \\
+ \showlanguageentry{Finnish} \\
+ \showlanguageentry{Norwegian} \\
\bottomrule
\end{tabular}
\end{table}
@@ -1173,6 +1142,55 @@
\NewDocumentCommand\subcmpdshowref{mm}{\chemnumshowref{#2}}
\end{sourcecode}
-\end{document}
+\section{From Version~0 to Version~1}\label{sec:news}
+The \chemnum\ package has been my first attempt to create a comprehensive
+labeling package for chemical compounds. However, it had and has more than
+one weakness and its code was -- to be frank -- a mess. Version~1 is now a
+complete re-write of \chemnum\ where I tried to achieve several points:
+\begin{itemize}
+ \item A cleaner code internally.
+ \item A cleaner user interface, \ie, more user macros for different tasks, a
+ unified naming of the commands and a less redundant naming of the
+ options.
+ \item Extended functionality such as sorting and compressing of sublabel
+ lists and sorting and merging of main label lists.
+\end{itemize}
+Although the syntax seems more or less the same at first sight quite a number
+of changes have been made that make version~1 incompatible with version~0.
+While I thought a while about maintaining backwards compatibility version~0
+was known to be in an experimental stage where everything was allowed to be
+changed at any time. So users \emph{could} know there was a risk. I have a
+feeling that many users nevertheless didn't realize this and may be bothered
+by this incompatibility. So I am well aware that the update will
+inconvenience some users. However, since version~0 won't be updated any more
+it made more sense to make a breaking update once.
+The same is not true for version~1. The syntax and commands described in this
+manual will not be changed as easily and from this version on I will take care
+of backwards compatibility.
+
+For those people wanting to keep older versions: they are are still available
+from websites such as \website{ctanhg.scharrer-online.de} or
+\securewebsite{bitbucket.org/cgnieder/chemnum}. You can also email me for an
+older version.
+
+Many commands have got a new name! The most important ones are:
+\begin{itemize}
+ \item \cs*{cmpdref}; this is now called \cs{replacecmpd}.
+ \item \cs*{cmpdinit}; this is now called \cs{initcmpd}.
+ \item \cs*{cmpdreset}; this is now called \cs{resetcmpd}.
+ \item \cs*{cmpdsetup}; this is now called \cs{setchemnum}.
+\end{itemize}
+However, there are many more changes. Basically all options have new names
+and often do their thing slightly different from the way things have been
+before.
+
+Please note that this overall change does not mean that version~1 is version~0
+declared stable. It is very likely that version~1 will now have quite a
+number of bugs to be fixed and probably missing features, too. So I'd be very
+glad to receive feedback either on \chemnum's homepage
+\securewebsite{github.com/cgnieder/chemnum} or via email to
+\email{contact(a)mychemistry.eu}.
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chemnum.doc.tlpobj new/tlpkg/tlpobj/chemnum.doc.tlpobj
--- old/tlpkg/tlpobj/chemnum.doc.tlpobj 2019-02-28 03:25:20.000000000 +0100
+++ new/tlpkg/tlpobj/chemnum.doc.tlpobj 2019-10-03 01:55:13.000000000 +0200
@@ -1,9 +1,9 @@
name chemnum.doc
category Package
-revision 40522
+revision 52256
shortdesc doc files of chemnum
relocated 1
-docfiles size=263
+docfiles size=272
RELOC/doc/latex/chemnum/README
RELOC/doc/latex/chemnum/chemnum_en.pdf
RELOC/doc/latex/chemnum/chemnum_en.tex
++++++ chemnum.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chemnum/chemnum.sty new/tex/latex/chemnum/chemnum.sty
--- old/tex/latex/chemnum/chemnum.sty 2016-04-14 23:45:57.000000000 +0200
+++ new/tex/latex/chemnum/chemnum.sty 2019-10-02 23:15:52.000000000 +0200
@@ -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--2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -26,32 +26,41 @@
%
% The Current Maintainer of this work is Clemens Niederberger.
% --------------------------------------------------------------------------
-\def\chemnumdate{2016/04/14}
-\def\chemnumversion{1.2}
-\def\chemnuminfo{a comprehensive approach for the numbering of chemical compounds}
+\RequirePackage{expl3,xparse,l3keys2e}
-\RequirePackage{expl3}[2016/03/28]
-\RequirePackage{xparse,l3keys2e}
+\ExplSyntaxOn
+\tl_const:Nn \c_chemnum_date_tl {2019/10/02}
+\tl_const:Nn \c_chemnum_version_number_tl {1.2}
+\tl_const:Nn \c_chemnum_version_suffix_tl {c}
+\tl_const:Nx \c_chemnum_version_tl
+ { \c_chemnum_version_number_tl \c_chemnum_version_suffix_tl }
+\tl_const:Nn \c_chemnum_info_tl
+ {a~ comprehensive~ approach~ for~ the~ numbering~ of~ chemical~ compounds}
% ----------------------------------------------------------------------------
% provide the package:
-\ProvidesExplPackage{chemnum}
- {\chemnumdate}
- {\chemnumversion}
- {\chemnuminfo\space (CN)}
+\ProvidesExplPackage
+ {chemnum}
+ {\c_chemnum_date_tl}
+ {\c_chemnum_version_tl}
+ {\c_chemnum_info_tl \c_space_tl (CN)}
% ----------------------------------------------------------------------------
% required packages:
% language support:
-\RequirePackage{translations}[2015/11/07]
+\RequirePackage{translations}
+
% greek alphabet for the labels matching to chemmacros' selection:
-\RequirePackage{chemgreek}[2016/02/10]
+\RequirePackage{chemgreek}
\RequirePackage{psfrag}
% ----------------------------------------------------------------------------
% messages:
\msg_new:nnn {chemnum} {missing-label}
- { The~ key~ `#1'~ has~ no~ label~ associated~ \msg_line_context: }
+ {
+ The~ key~ `#1' \tl_if_blank:nF {#2} {~ of~`#2'} ~ has~ no~ label~
+ associated~ \msg_line_context:
+ }
\msg_new:nnn {chemnum} {erroneous-argument-combination}
{
@@ -210,6 +219,8 @@
\int_new:N \l__chemnum_tmpb_int
\int_new:N \l__chemnum_tmpc_int
+\str_new:N \l__chemnum_tmpa_str
+
% ----------------------------------------------------------------------------
% variables:
\prop_new:N \l__chemnum_label_formats_prop
@@ -227,6 +238,7 @@
\seq_new:N \g__chemnum_defined_compounds_seq
\seq_new:N \g__chemnum_compound_defined_subcompounds_seq
+\tl_const:Nn \c_chemnum_nothing_here_tl {??}
\tl_new:N \l__chemnum_label_format_tl
\tl_set:Nn \l__chemnum_label_format_tl {\bfseries}
\tl_new:N \l__chemnum_local_label_format_tl
@@ -367,13 +379,13 @@
sub-counter-format .groups:n = {compound,general} ,
% label:
pre-label-code .tl_set:N = \l__chemnum_pre_label_default_tl ,
- pre-label-code .groups:n = {compound} ,
+ pre-label-code .groups:n = {compound,general} ,
post-label-code .tl_set:N = \l__chemnum_post_label_default_tl ,
- post-label-code .groups:n = {compound} ,
+ post-label-code .groups:n = {compound,general} ,
pre-main-label-code .tl_set:N = \l__chemnum_pre_main_label_default_tl ,
- pre-main-label-code .groups:n = {compound} ,
+ pre-main-label-code .groups:n = {compound,general} ,
post-main-label-code .tl_set:N = \l__chemnum_post_main_label_default_tl ,
- post-main-label-code .groups:n = {compound} ,
+ post-main-label-code .groups:n = {compound,general} ,
main-sub-sep .tl_set:N = \l__chemnum_compound_separator_tl ,
main-sub-sep .groups:n = {general,list} ,
list-label-sep .tl_set:N = \l__chemnum_main_separator_tl ,
@@ -512,14 +524,15 @@
% if the `chemnum' package is removed from the preamble
\AtBeginDocument
{
- \if@filesw
- \iow_now:Nn \@auxout
- {
- \providecommand\chemnum@cmpd[8]{} ^^J
- \providecommand\chemnum@subcmpd[4]{} ^^J
- \providecommand\chemnum@check{}
- }
- \fi
+ \legacy_if:nT {@filesw}
+ {
+ \iow_now:Nn \@auxout
+ {
+ \providecommand\chemnum@cmpd[8]{} ^^J
+ \providecommand\chemnum@subcmpd[4]{} ^^J
+ \providecommand\chemnum@check{}
+ }
+ }
}
% we use this one to trigger a LaTeX rerun warning -- to be precise the
@@ -528,7 +541,11 @@
{ \AtEndDocument { \def \chemnum@check { \@tempswatrue } } }
% add the rerun check at the end:
-\AtEndDocument { \if@filesw \iow_now:Nn \@auxout { \chemnum@check } \fi }
+\AtEndDocument
+ {
+ \legacy_if:nT {@filesw}
+ { \iow_now:Nn \@auxout { \chemnum@check } }
+ }
% ----------------------------------------------------------------------------
% initiating new compounds
@@ -624,8 +641,8 @@
\int_gincr:N \g__chemnum_main_int
\stepcounter{cmpdmain}
}
- \seq_if_exist:cF { g__chemnum_#1_initiated_subcompounds_seq }
- { \seq_new:c { g__chemnum_#1_initiated_subcompounds_seq } }
+ \seq_if_exist:cF {g__chemnum_#1_initiated_subcompounds_seq}
+ { \seq_new:c {g__chemnum_#1_initiated_subcompounds_seq} }
}
% #1: main ID
@@ -643,11 +660,11 @@
\chemnum_subcompound_set_property:nnnn {#1} {#2} {ID} {#2}
\chemnum_subcompound_set_property:nnnn {#1} {#2} {main-compound} {#1}
\chemnum_subcompound_set_property:nnnx {#1} {#2} {number}
- { \int_use:c { g__chemnum_compound_#1_subcompound_int } }
+ { \int_use:c {g__chemnum_compound_#1_subcompound_int} }
\chemnum_subcompound_set_property:nnnx {#1} {#2} {counter-representation}
{
\__chemnum_label_format:cV
- { g__chemnum_compound_#1_subcompound_int }
+ {g__chemnum_compound_#1_subcompound_int}
\l__chemnum_default_subcounter_representation_tl
}
}
@@ -661,26 +678,41 @@
\cs_new_protected:Npn \chemnum_initialize_subcompound:nn #1#2
{
- \int_if_exist:cF { g__chemnum_compound_#1_subcompound_int }
- { \int_new:c { g__chemnum_compound_#1_subcompound_int } }
- \int_gincr:c { g__chemnum_compound_#1_subcompound_int }
- \seq_if_exist:cF { g__chemnum_compound_#1_subcompounds_seq }
- { \seq_new:c { g__chemnum_compound_#1_subcompounds_seq } }
- \prop_if_exist:cF { g__chemnum_compound_#1_subcompounds_prop }
- { \prop_new:c { g__chemnum_compound_#1_subcompounds_prop } }
- \seq_if_in:cnF { g__chemnum_compound_#1_subcompounds_seq } {#2}
- { \seq_gput_right:cn { g__chemnum_compound_#1_subcompounds_seq } {#2} }
+ \int_if_exist:cF {g__chemnum_compound_#1_subcompound_int}
+ { \int_new:c {g__chemnum_compound_#1_subcompound_int} }
+ \int_gincr:c {g__chemnum_compound_#1_subcompound_int}
+ \seq_if_exist:cF {g__chemnum_compound_#1_subcompounds_seq}
+ { \seq_new:c {g__chemnum_compound_#1_subcompounds_seq} }
+ \prop_if_exist:cF {g__chemnum_compound_#1_subcompounds_prop}
+ { \prop_new:c {g__chemnum_compound_#1_subcompounds_prop} }
+ \seq_if_in:cnF {g__chemnum_compound_#1_subcompounds_seq} {#2}
+ { \seq_gput_right:cn {g__chemnum_compound_#1_subcompounds_seq} {#2} }
\seq_gput_right:Nn \g__chemnum_compound_defined_subcompounds_seq {#1#2}
- \prop_gput:cnx { g__chemnum_compound_#1_subcompounds_prop } {#2}
+ \prop_gput:cnx {g__chemnum_compound_#1_subcompounds_prop} {#2}
{
- \int_use:c { g__chemnum_compound_#1_subcompound_int } :
+ \int_use:c {g__chemnum_compound_#1_subcompound_int} :
\__chemnum_label_format:cV
- { g__chemnum_compound_#1_subcompound_int }
+ {g__chemnum_compound_#1_subcompound_int}
\l__chemnum_default_subcounter_representation_tl
}
}
% ----------------------------------------------------------------------------
+
+\cs_new:Npn \__chemnum_nothing_here:n #1
+ {
+ \c_chemnum_nothing_here_tl
+ \msg_warning:nnn {chemnum} {missing-label} {#1}
+ }
+
+\cs_new:Npn \__chemnum_nothing_here:nn #1#2
+ {
+ \c_chemnum_nothing_here_tl
+ \msg_warning:nnnn {chemnum} {missing-label} {#1} {#2}
+ }
+\cs_generate_variant:Nn \__chemnum_nothing_here:nn {x}
+
+% ----------------------------------------------------------------------------
\cs_new_protected:Npn \chemnum_log_main:n #1
{
\bool_if:NT \l__chemnum_log_bool
@@ -716,7 +748,7 @@
\prg_new_protected_conditional:Npnn \chemnum_subcompound_if_initiated:nn #1#2
{ T,F,TF }
{
- \seq_if_in:cnTF { g__chemnum_#1_initiated_subcompounds_seq } {#2}
+ \seq_if_in:cnTF {g__chemnum_#1_initiated_subcompounds_seq} {#2}
{ \prg_return_true: }
{ \prg_return_false: }
}
@@ -745,12 +777,12 @@
% #2: property to be defined
\cs_new_protected:Npn \chemnum_compound_declare_property:nn #1#2
{
- \seq_if_exist:cF { g__chemnum_compound_#1_properties_seq }
- { \seq_new:c { g__chemnum_compound_#1_properties_seq } }
- \prop_if_exist:cF { g__chemnum_compound_#1_prop }
- { \prop_new:c { g__chemnum_compound_#1_prop } }
- \seq_if_in:cnF { g__chemnum_compound_#1_properties_seq } {#2}
- { \seq_gput_right:cn { g__chemnum_compound_#1_properties_seq } {#2} }
+ \seq_if_exist:cF {g__chemnum_compound_#1_properties_seq }
+ { \seq_new:c {g__chemnum_compound_#1_properties_seq} }
+ \prop_if_exist:cF {g__chemnum_compound_#1_prop}
+ { \prop_new:c {g__chemnum_compound_#1_prop} }
+ \seq_if_in:cnF {g__chemnum_compound_#1_properties_seq} {#2}
+ { \seq_gput_right:cn {g__chemnum_compound_#1_properties_seq} {#2} }
}
% #1: ID
@@ -766,8 +798,8 @@
% #3: value of property
\cs_new_protected:Npn \chemnum_compound_set_property:nnn #1#2#3
{
- \seq_if_in:cnTF { g__chemnum_compound_#1_properties_seq } {#2}
- { \prop_gput:cnn { g__chemnum_compound_#1_prop } {#2} {#3} }
+ \seq_if_in:cnTF {g__chemnum_compound_#1_properties_seq} {#2}
+ { \prop_gput:cnn {g__chemnum_compound_#1_prop} {#2} {#3} }
{ \msg_error:nnn {chemnum} {property-undefined} {#1} {#2} }
}
\cs_generate_variant:Nn \chemnum_compound_set_property:nnn { nnV , nnx }
@@ -776,15 +808,15 @@
% #2: property to be updated
\cs_new_protected:Npn \chemnum_compound_update_property:nn #1#2
{
- \seq_if_in:cnTF { g__chemnum_compound_#1_properties_seq } {#2}
+ \seq_if_in:cnTF {g__chemnum_compound_#1_properties_seq} {#2}
{
- \prop_get:cnN { g__chemnum_compound_#1_prop } {previous-#2}
+ \prop_get:cnN {g__chemnum_compound_#1_prop} {previous-#2}
\l__chemnum_tmpa_tl
- \prop_get:cnN { g__chemnum_compound_#1_prop } {#2}
+ \prop_get:cnN {g__chemnum_compound_#1_prop} {#2}
\l__chemnum_tmpb_tl
\tl_if_eq:NNF \l__chemnum_tmpb_tl \l__chemnum_tmpa_tl
{
- \prop_gput:cnV { g__chemnum_compound_#1_prop }
+ \prop_gput:cnV {g__chemnum_compound_#1_prop}
{previous-#2}
\l__chemnum_tmpb_tl
}
@@ -795,7 +827,7 @@
% #1: ID
\cs_new_protected:Npn \chemnum_compound_update_properties:n #1
{
- \seq_map_inline:cn { g__chemnum_compound_#1_properties_seq }
+ \seq_map_inline:cn {g__chemnum_compound_#1_properties_seq}
{ \chemnum_compound_update_property:nn {#1} {##1} }
}
@@ -804,8 +836,8 @@
% #3: property to be defined
\cs_new_protected:Npn \chemnum_subcompound_declare_property:nnn #1#2#3
{
- \seq_if_in:cnF { g__chemnum_compound_#1_#2_properties_seq } {#3}
- { \seq_gput_right:cn { g__chemnum_compound_#1_#2_properties_seq } {#3} }
+ \seq_if_in:cnF {g__chemnum_compound_#1_#2_properties_seq} {#3}
+ { \seq_gput_right:cn {g__chemnum_compound_#1_#2_properties_seq} {#3} }
}
% #1: main ID
@@ -813,11 +845,11 @@
% #3: properties to be defined
\cs_new_protected:Npn \chemnum_subcompound_declare_properties:nnn #1#2#3
{
- \seq_if_exist:cF { g__chemnum_compound_#1_#2_properties_seq }
- { \seq_new:c { g__chemnum_compound_#1_#2_properties_seq } }
- \prop_if_exist:cF { g__chemnum_compound_#1_#2_properties_prop }
- { \prop_new:c { g__chemnum_compound_#1_#2_properties_prop } }
- \clist_map_inline:nn { #3 }
+ \seq_if_exist:cF {g__chemnum_compound_#1_#2_properties_seq}
+ { \seq_new:c {g__chemnum_compound_#1_#2_properties_seq} }
+ \prop_if_exist:cF {g__chemnum_compound_#1_#2_properties_prop}
+ { \prop_new:c {g__chemnum_compound_#1_#2_properties_prop} }
+ \clist_map_inline:nn {#3}
{ \chemnum_subcompound_declare_property:nnn {#1} {#2} {##1} }
}
@@ -827,8 +859,8 @@
% #4: value of property
\cs_new_protected:Npn \chemnum_subcompound_set_property:nnnn #1#2#3#4
{
- \seq_if_in:cnTF { g__chemnum_compound_#1_#2_properties_seq } {#3}
- { \prop_gput:cnn { g__chemnum_compound_#1_#2_properties_prop } {#3} {#4} }
+ \seq_if_in:cnTF {g__chemnum_compound_#1_#2_properties_seq} {#3}
+ { \prop_gput:cnn {g__chemnum_compound_#1_#2_properties_prop} {#3} {#4} }
{ \msg_error:nnn {chemnum} {property-undefined} {#1.#2} {#3} }
}
\cs_generate_variant:Nn \chemnum_subcompound_set_property:nnnn { nnnV , nnnx }
@@ -838,15 +870,15 @@
% #3: property to be updated
\cs_new_protected:Npn \chemnum_subcompound_update_property:nnn #1#2#3
{
- \seq_if_in:cnTF { g__chemnum_compound_#1_#2_properties_seq }
+ \seq_if_in:cnTF {g__chemnum_compound_#1_#2_properties_seq}
{
- \prop_get:cnN { g__chemnum_compound_#1_#2_properties_prop } {previous-#3}
+ \prop_get:cnN {g__chemnum_compound_#1_#2_properties_prop} {previous-#3}
\l__chemnum_tmpa_tl
- \prop_get:cnN { g__chemnum_compound_#1_#2_properties_prop } {#3}
+ \prop_get:cnN {g__chemnum_compound_#1_#2_properties_prop} {#3}
\l__chemnum_tmpb_tl
\tl_if_eq:NNF \l__chemnum_tmpb_tl \l__chemnum_tmpa_tl
{
- \prop_gput:cnV { g__chemnum_compound_#1_#2_properties_prop }
+ \prop_gput:cnV {g__chemnum_compound_#1_#2_properties_prop}
{previous-#3}
\l__chemnum_tmpb_tl
}
@@ -858,7 +890,7 @@
% #2: sub ID
\cs_new_protected:Npn \chemnum_subcompound_update_properties:nn #1#2
{
- \seq_map_inline:cn { g__chemnum_compound_#1_#2_properties_seq }
+ \seq_map_inline:cn {g__chemnum_compound_#1_#2_properties_seq}
{ \chemnum_subcompound_update_property:nnn {#1} {#2} {##1} }
}
@@ -869,14 +901,14 @@
\cs_new_protected:Npn \chemnum_get_compound_property_or:nnn #1#2#3
{
- \prop_get:cnNTF { g__chemnum_compound_#1_prop } {#2}
+ \prop_get:cnNTF {g__chemnum_compound_#1_prop} {#2}
\l__chemnum_tmpa_tl
{ \tl_use:N \l__chemnum_tmpa_tl }
{#3}
}
\cs_new:Npn \chemnum_expandable_get_compound_property:nn #1#2
- { \prop_item:cn { g__chemnum_compound_#1_prop } {#2} }
+ { \prop_item:cn {g__chemnum_compound_#1_prop} {#2} }
\cs_generate_variant:Nn \chemnum_expandable_get_compound_property:nn { V }
% #1: main ID
@@ -887,14 +919,14 @@
\cs_new_protected:Npn \chemnum_get_subcompound_property_or:nnnn #1#2#3#4
{
- \prop_get:cnNTF { g__chemnum_compound_#1_#2_properties_prop } {#3}
+ \prop_get:cnNTF {g__chemnum_compound_#1_#2_properties_prop} {#3}
\l__chemnum_tmpa_tl
{ \tl_use:N \l__chemnum_tmpa_tl }
{#4}
}
\cs_new:Npn \chemnum_expandable_get_subcompound_property:nnn #1#2#3
- { \prop_item:cn { g__chemnum_compound_#1_#2_properties_prop } {#3} }
+ { \prop_item:cn {g__chemnum_compound_#1_#2_properties_prop} {#3} }
% ----------------------------------------------------------------------------
\DeclareExpandableDocumentCommand \cmpdproperty { mm }
@@ -911,7 +943,7 @@
\cs_new_protected:Npn \chemnum_initiate_subcompound:nn #1#2
{
\chemnum_subcompound_if_initiated:nnF {#1} {#2}
- { \seq_gput_right:cn { g__chemnum_#1_initiated_subcompounds_seq } {#2} }
+ { \seq_gput_right:cn {g__chemnum_#1_initiated_subcompounds_seq} {#2} }
}
% ----------------------------------------------------------------------------
@@ -927,13 +959,11 @@
% #8: label format
\cs_new_protected:Npn \__chemnum_write_compound_to_auxfile_x:nnnnnnnn #1#2#3#4#5#6#7#8
{
- \if@filesw
- \token_if_eq_meaning:NNT \@nodocument \relax
- {
- \iow_now:Nx \@auxout
- { \exp_not:N \chemnum@cmpd {#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8} }
- }
- \fi
+ \legacy_if:nT {@filesw}
+ {
+ \iow_now:Nx \@auxout
+ { \exp_not:N \chemnum@cmpd {#1}{#2}{#3}{#4}{#5}{#6}{#7}{#8} }
+ }
}
\cs_generate_variant:Nn \__chemnum_write_compound_to_auxfile_x:nnnnnnnn { nnnVVVVV }
@@ -955,13 +985,11 @@
% #3: counter representation
\cs_new_protected:Npn \__chemnum_write_subcompound_to_auxfile_x:nnnn #1#2#3#4
{
- \if@filesw
- \token_if_eq_meaning:NNT \@nodocument \relax
- {
- \iow_now:Nx \@auxout
- { \exp_not:N \chemnum@subcmpd {#1}{#2}{#3}{#4} }
- }
- \fi
+ \legacy_if:nT {@filesw}
+ {
+ \iow_now:Nx \@auxout
+ { \exp_not:N \chemnum@subcmpd {#1}{#2}{#3}{#4} }
+ }
}
\cs_new_protected:Npn \chemnum_save_subcompound_to_auxfile:nn #1#2
@@ -989,21 +1017,21 @@
\cs_new_protected:Npn \chemnum@cmpd #1#2#3#4#5#6#7#8
{
% \chemnum_initialize_compound:n {#1}
- \prop_if_exist:cF { g__chemnum_compound_#1_prop }
- { \prop_new:c { g__chemnum_compound_#1_prop } }
- \prop_gput:cnn { g__chemnum_compound_#1_prop }
+ \prop_if_exist:cF {g__chemnum_compound_#1_prop}
+ { \prop_new:c {g__chemnum_compound_#1_prop} }
+ \prop_gput:cnn {g__chemnum_compound_#1_prop}
{previous-number} {#2}
- \prop_gput:cnn { g__chemnum_compound_#1_prop }
+ \prop_gput:cnn {g__chemnum_compound_#1_prop}
{previous-counter-representation} {#3}
- \prop_gput:cnn { g__chemnum_compound_#1_prop }
+ \prop_gput:cnn {g__chemnum_compound_#1_prop}
{previous-pre-label-code} {#4}
- \prop_gput:cnn { g__chemnum_compound_#1_prop }
+ \prop_gput:cnn {g__chemnum_compound_#1_prop}
{previous-post-label-code} {#5}
- \prop_gput:cnn { g__chemnum_compound_#1_prop }
+ \prop_gput:cnn {g__chemnum_compound_#1_prop}
{previous-pre-main-label-code} {#6}
- \prop_gput:cnn { g__chemnum_compound_#1_prop }
+ \prop_gput:cnn {g__chemnum_compound_#1_prop}
{previous-post-main-label-code} {#7}
- \prop_gput:cnn { g__chemnum_compound_#1_prop }
+ \prop_gput:cnn {g__chemnum_compound_#1_prop}
{previous-label-format} {#8}
}
@@ -1013,15 +1041,15 @@
% #4: counter representation
\cs_new_protected:Npn \chemnum@subcmpd #1#2#3#4
{
- \prop_if_exist:cF { g__chemnum_compound_#1_#2_properties_prop }
- { \prop_new:c { g__chemnum_compound_#1_#2_properties_prop } }
- \seq_if_exist:cF { g__chemnum_compound_#1_subcompounds_seq }
- { \seq_new:c { g__chemnum_compound_#1_subcompounds_seq } }
- \seq_if_in:cnF { g__chemnum_compound_#1_subcompounds_seq } {#2}
- { \seq_gput_right:cn { g__chemnum_compound_#1_subcompounds_seq } {#2} }
- \prop_gput:cnn { g__chemnum_compound_#1_#2_properties_prop }
+ \prop_if_exist:cF {g__chemnum_compound_#1_#2_properties_prop}
+ { \prop_new:c {g__chemnum_compound_#1_#2_properties_prop} }
+ \seq_if_exist:cF {g__chemnum_compound_#1_subcompounds_seq}
+ { \seq_new:c {g__chemnum_compound_#1_subcompounds_seq} }
+ \seq_if_in:cnF {g__chemnum_compound_#1_subcompounds_seq} {#2}
+ { \seq_gput_right:cn {g__chemnum_compound_#1_subcompounds_seq} {#2} }
+ \prop_gput:cnn {g__chemnum_compound_#1_#2_properties_prop}
{previous-number} {#3}
- \prop_gput:cnn { g__chemnum_compound_#1_#2_properties_prop }
+ \prop_gput:cnn {g__chemnum_compound_#1_#2_properties_prop}
{previous-counter-representation} {#4}
}
@@ -1060,7 +1088,6 @@
% #3: sub ID
\cs_new_protected:Npn \chemnum_declare_subcompound:nnn #1#2#3
{
- % \keys_set:nn {chemnum} {#1}
\chemnum_subcompound_if_initiated:nnF {#2} {#3}
{
\bool_if:NT \g__chemnum_initiate_sub_bool
@@ -1170,8 +1197,11 @@
\chemnum_get_compound_property:nn {#1} {previous-label-format}
{
\chemnum_get_compound_property_or:nnn {#1}
- { previous-counter-representation }
- { ?? \__chemnum_rerun: }
+ {previous-counter-representation}
+ {
+ \__chemnum_nothing_here:n {#1}
+ \__chemnum_rerun:
+ }
}
\group_end:
\chemnum_get_compound_property:nn {#1} {previous-post-main-label-code}
@@ -1189,7 +1219,10 @@
{
\chemnum_get_subcompound_property_or:nnnn {#1} {#2}
{previous-counter-representation}
- { ?? \__chemnum_rerun: }
+ {
+ \__chemnum_nothing_here:nn {#2} {#1}
+ \__chemnum_rerun:
+ }
}
\group_end:
}
@@ -1265,7 +1298,7 @@
{
\tl_clear:N \l__chemnum_tmpa_tl
\tl_set:Nx \l__chemnum_tmpa_tl
- { \seq_use:cn { g__chemnum_compound_##4_subcompounds_seq } { , } }
+ { \seq_use:cn {g__chemnum_compound_##4_subcompounds_seq} {,} }
\tl_if_blank:VF \l__chemnum_tmpa_tl
{
\chemnum_write_sublist:NNnnV ##1 ##2 {##3} {##4}
@@ -1294,8 +1327,8 @@
{
\bool_if:NTF #2
{
- \chemnum_hyper_link:nn {#4}
- { \chemnum_compound_read:n {#4} }
+ \bool_if:NF \l__chemnum_sub_only_bool
+ { \chemnum_hyper_link:nn {#4} { \chemnum_compound_read:n {#4} } }
\bool_if:NT #1
{ \msg_error:nn {chemnum} {erroneous-argument-combination} }
}
@@ -1353,10 +1386,18 @@
}
% ----------------------------------------------------------------------------
-\cs_set_protected:Npn \chemnum_show_key_def:n #1
- { \marginpar { \fbox { \normalfont \ttfamily #1 } } }
+\cs_new_protected:Npn \chemnum_print_label_id:n #1
+ {
+ \group_begin:
+ \str_set:Nn \l__chemnum_tmpa_str {#1}
+ \str_use:N \l__chemnum_tmpa_str
+ \group_end:
+ }
+
+\cs_new_protected:Npn \chemnum_show_label_margin:n #1
+ { \marginpar { \fbox {#1} } }
-\cs_set_protected:Npn \chemnum_show_key_ref:n #1
+\cs_new_protected:Npn \chemnum_show_label_inline:n #1
{
\group_begin:
\hbox_unpack:N \c_empty_box % this is \leavevmode
@@ -1366,18 +1407,38 @@
\hbox_overlap_right:n
{
\tex_vrule:D \tex_raise:D .75em
- \hbox:n
- { \underbar { \normalfont \footnotesize \ttfamily #1 } }
+ \hbox:n { \underbar {#1} }
}
}
\group_end:
}
-% ----------------------------------------------------------------------------
+\NewDocumentCommand \cmpdprintlabelid {m}
+ { \chemnum_print_label_id:n {#1} }
+
+\NewDocumentCommand \cmpdshowlabelmargin {m}
+ { \chemnum_show_label_margin:n {#1} }
+
+\NewDocumentCommand \cmpdshowlabelinline {m}
+ { \chemnum_show_label_inline:n {#1} }
+
\NewDocumentCommand \chemnumshowdef {m}
- { \chemnum_show_key_def:n {#1} }
+ {
+ \cmpdshowlabelmargin
+ {
+ \normalfont \ttfamily
+ \cmpdprintlabelid {#1}
+ }
+ }
+
\NewDocumentCommand \chemnumshowref {m}
- { \chemnum_show_key_ref:n {#1} }
+ {
+ \cmpdshowlabelinline
+ {
+ \normalfont \ttfamily \footnotesize
+ \cmpdprintlabelid {#1}
+ }
+ }
\NewDocumentCommand \cmpdshowdef {m} { \chemnumshowdef {#1} }
\NewDocumentCommand \cmpdshowref {m} { \chemnumshowref {#1} }
@@ -1396,7 +1457,7 @@
\l__chemnum_tmpc_seq
\l__chemnum_sub_separator_tl
{#5}
- \seq_remove_duplicates:N \l__chemnum_tmpc_seq
+ \seq_remove_duplicates:N \l__chemnum_tmpc_seq
\seq_map_inline:Nn \l__chemnum_tmpc_seq
{
\bool_if:NF #2
@@ -1467,29 +1528,34 @@
\seq_clear:N #7
\bool_if:NF #1
{
- \seq_map_inline:cn { g__chemnum_compound_#5_subcompounds_seq }
+ \seq_if_exist:cTF {g__chemnum_compound_#5_subcompounds_seq}
{
- \seq_if_in:NnT #3 {##1}
+ \seq_map_inline:Nn #3
{
- \seq_put_right:Nn #6
- { \chemnum_write_subcompound:NNnnn #1 #2 {#4} {#5} {##1} }
- \bool_if:NTF #2
+ \seq_if_in:cnTF {g__chemnum_compound_#5_subcompounds_seq} {##1}
{
- \seq_put_right:Nx #7
+ \seq_put_right:Nn #6
+ { \chemnum_write_subcompound:NNnnn #1 #2 {#4} {#5} {##1} }
+ \bool_if:NTF #2
{
- \chemnum_expandable_get_subcompound_property:nnn
- {#5} {##1} {previous-number}
+ \seq_put_right:Nx #7
+ {
+ \chemnum_expandable_get_subcompound_property:nnn
+ {#5} {##1} {previous-number}
+ }
}
- }
- {
- \seq_put_right:Nx #7
{
- \chemnum_expandable_get_subcompound_property:nnn
- {#5} {##1} {number}
+ \seq_put_right:Nx #7
+ {
+ \chemnum_expandable_get_subcompound_property:nnn
+ {#5} {##1} {number}
+ }
}
}
+ { \__chemnum_nothing_here:nn {##1} {#5} }
}
}
+ { \__chemnum_nothing_here:xn { \seq_use:Nnnn #3 {,~} {,~} {,~} } {#5} }
}
}
@@ -1917,8 +1983,8 @@
}
\NewDocumentCommand \initcmpd {O{}m}
- { \chemnum_init:nn {#1} {#2} }
-\@onlypreamble\cmpdinit
+ { \AtBeginDocument { \chemnum_init:nn {#1} {#2} } }
+\@onlypreamble\initcmpd
% ----------------------------------------------------------------------------
% resetting compound numbering
@@ -2008,4 +2074,10 @@
\prop_item:Nn)
2016/04/14 v1.2 - changes to how compounds are saved to auxfile
- hyperref support: backlinks to first appearance of label
-
+2016/05/11 v1.2a - pre- and post-label options now belong both to the
+ `compound' and the `general' groups
+2016/10/22 v1.2b - enable label keys to be printed (with `show-keys') if they
+ contain underscores or similar tokens
+ - easier customization possibilities of the `show-keys'
+ functions
+2019/10/02 v1.2c - fix issues #5, #7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chemnum.tlpobj new/tlpkg/tlpobj/chemnum.tlpobj
--- old/tlpkg/tlpobj/chemnum.tlpobj 2019-02-28 03:25:21.000000000 +0100
+++ new/tlpkg/tlpobj/chemnum.tlpobj 2019-10-03 01:55:13.000000000 +0200
@@ -1,17 +1,17 @@
name chemnum
category Package
-revision 40522
+revision 52256
shortdesc A method of numbering chemical compounds
relocated 1
longdesc The package defines a \label- and \ref-like commands for
-longdesc compound numbers. The package requires LaTeX 3 packages expl3
-longdesc (from the l3kernel bundle) and xparse (from the l3packages
-longdesc bundle).
-runfiles size=18
+longdesc compound numbers. The package requires LaTeX3 packages expl3
+longdesc (from the l3kernel bundle) as well as xparse and l3keys2e (from
+longdesc the l3packages bundle).
+runfiles size=19
RELOC/tex/latex/chemnum/chemnum.sty
catalogue-also chemcompounds chemcono
catalogue-ctan /macros/latex/contrib/chemnum
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-10-02 17:51:21 +0200
catalogue-license lppl1.3
catalogue-topics chemistry expl3
-catalogue-version 1.2
+catalogue-version 1.2c
++++++ chess-problem-diagrams.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/chess-problem-diagrams/README new/doc/latex/chess-problem-diagrams/README
--- old/doc/latex/chess-problem-diagrams/README 2016-01-08 23:22:49.000000000 +0100
+++ new/doc/latex/chess-problem-diagrams/README 2020-01-02 23:10:48.000000000 +0100
@@ -1,5 +1,5 @@
diagram --- A package for typesetting chessproblems
-Version v1.12 / Stefan Hoening 2015
+Version v1.15 / Stefan Hoening 1994-2019
CONTENTS
Binary files old/doc/latex/chess-problem-diagrams/diagram.pdf and new/doc/latex/chess-problem-diagrams/diagram.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chess-problem-diagrams.doc.tlpobj new/tlpkg/tlpobj/chess-problem-diagrams.doc.tlpobj
--- old/tlpkg/tlpobj/chess-problem-diagrams.doc.tlpobj 2019-02-28 03:25:29.000000000 +0100
+++ new/tlpkg/tlpobj/chess-problem-diagrams.doc.tlpobj 2020-01-03 01:54:38.000000000 +0100
@@ -1,8 +1,8 @@
name chess-problem-diagrams.doc
category Package
-revision 39317
+revision 53302
shortdesc doc files of chess-problem-diagrams
relocated 1
-docfiles size=87
+docfiles size=89
RELOC/doc/latex/chess-problem-diagrams/README
RELOC/doc/latex/chess-problem-diagrams/diagram.pdf
++++++ chess-problem-diagrams.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chess-problem-diagrams/diagram.sty new/tex/latex/chess-problem-diagrams/diagram.sty
--- old/tex/latex/chess-problem-diagrams/diagram.sty 2016-01-08 23:22:49.000000000 +0100
+++ new/tex/latex/chess-problem-diagrams/diagram.sty 2020-01-02 23:10:48.000000000 +0100
@@ -36,7 +36,7 @@
%%
%%
-\ProvidesPackage{diagram}[2016/01/06]
+\ProvidesPackage{diagram}[2019/12/28]
\newcommand*{\DefaultDiagramSize}{}
\DeclareOption{10pt}{\renewcommand*{\DefaultDiagramSize}{\diagramx}}
\DeclareOption{11pt}{\renewcommand*{\DefaultDiagramSize}{\diagramxi}}
@@ -114,6 +114,9 @@
\newcounter{cpd@blackPieces}
\newcounter{cpd@neutralPieces}
+\newcounter{cpd@row}
+\newcounter{cpd@line}
+
\newcommand{\cpd@stepcounterWhite}{\stepcounter{cpd@whitePieces}}
\newcommand{\cpd@stepcounterBlack}{\stepcounter{cpd@blackPieces}}
\newcommand{\cpd@stepcounterNeutral}{\stepcounter{cpd@neutralPieces}}
@@ -183,6 +186,7 @@
\newtoks\fieldframe@tk\fieldframe@tk={\relax}
\newtoks\gridlines@tk\gridlines@tk={\relax}
\newtoks\pieces@tk\pieces@tk={\relax}
+\newtoks\fen@tk\fen@tk={\relax}
\newtoks\fieldtext@tk\fieldtext@tk={\relax}
\newtoks\text@tk\text@tk={\relax}
\newtoks\stipulation@tk\stipulation@tk={\relax}
@@ -214,6 +218,7 @@
\newif\if@judgement\@judgementfalse
\newif\if@comment\@commentfalse
\newif\if@pieces\@piecesfalse
+\newboolean{@cpd@fen}\setboolean{@cpd@fen}{false}%
\newif\if@fieldtext\@fieldtextfalse
\newif\if@nofields\@nofieldsfalse
\newif\if@gridlines\@gridlinesfalse
@@ -257,17 +262,23 @@
\newif\if@sindex\@sindexfalse
\newif\if@tindex\@tindexfalse
\newif\ifds@label
+\newcommand{\cpd@begindiagram@hook}{}
+\newcommand{\cpd@enddiagram@hook}{}
\def\diagram{%
\begingroup%
\@ifnextchar [{\@diagram}{\@diagram[\@ight x\@ight]}%
}
-\def\@diagram[#1x#2]{%
- \lines@max=#1%
- \rows@max=#2%
+\def\@cpd@initsize#1#2{%
\setcounter{cpd@linesmax}{#1}%
\setcounter{cpd@rowsmax}{#2}%
\setcounter{cpd@maxsquare}{\value{cpd@rowsmax}*\value{cpd@linesmax}}%
+}
+
+\def\@diagram[#1x#2]{%
+ \lines@max=#1%
+ \rows@max=#2%
+ \@cpd@initsize{#1}{#2}%
\pl@ne=\z@%
\current@plane=\z@%
\let\put@sqs=\put@sqs@normal%
@@ -276,13 +287,16 @@
}
\def\stereodiagram{%
\begingroup%
+ \inner(a)frame=0.6pt%
\@stereotrue%
+ \@cpd@initsize{8}{8}%
\let\put@sqs=\put@sqs@stereo%
\let\read@plane=\read@plane@stereo%
\@start@diagram%
}
\def\spacediagram{%
\begingroup%
+ \inner(a)frame=0.6pt%
\@spacetrue%
\@ifnextchar [{\@spacediagram}{\@spacediagram[5x5x5]}%
}
@@ -291,6 +305,7 @@
\lines@max=#1%
\rows@max=#2%
\planes@max=#3%
+ \@cpd@initsize{#1}{#2}%
\let\put@sqs=\put@sqs@space%
\let\read@plane=\read@plane@space%
\@start@diagram%
@@ -302,6 +317,7 @@
\let\month=\ds@month%
\let\year=\ds@year%
\let\label=\ds@label%
+ \cpd@begindiagram@hook%
\ignorespaces%
}
@@ -468,6 +484,7 @@
}%
}}% End of \dia@box
\do@dia@job%
+ \cpd@enddiagram@hook%
\endgroup%
}
@@ -732,6 +749,16 @@
\pieces@tk={#1}\@piecestrue%
\ignorespaces%
}
+\newcommand{\fen}[2][]{%
+ \ifthenelse{\equal{#1}{}}%
+ {}% Do nothing
+ {%
+ \setboolean{cpd@checkPieceCounts}{true}%
+ \@parseWhiteAndBlackCount#1+\e@list
+ }%
+ \fen@tk={#2}\setboolean{@cpd@fen}{true}%
+ \ignorespaces%
+}
\def\fieldtext#1{%
\fieldtext@tk={#1}\@fieldtexttrue%
\ignorespaces%
@@ -1557,6 +1584,18 @@
\fi%
\l@@k%
}
+\def\cpd@fen@setpiece{%
+ \ifnum\pl@ne=\current@plane%
+ \cpd@stepcounterPieces%
+ \set@current@square@index{\value{cpd@line}}{\value{cpd@row}}%
+ \get@current@square@value%
+ \ifthenelse{\value{cpd@current@square@value}=\m@ne}
+ {\set@current@square@value{\the\help@a}}%
+ {\ifthenelse{\value{cpd@current@square@value}=144}%
+ {\set@current@square@value{\the\help@a+18}}%
+ {\errmessage{Trying to set a piece to an occupied square}}}%
+ \fi%
+}
\def\set@nofield, {%
\ifnum\pl@ne=\current@plane%
\set@current@square@index\lin@\r@w%
@@ -1590,6 +1629,95 @@
\fi%
\nextpr@c%
}
+\def\@cpd@handle@fen#1{%
+ \ifx#1/\relax%
+ \ifthenelse{\value{cpd@line}=8}%
+ {%
+ \setcounter{cpd@line}{0}%
+ \addtocounter{cpd@row}{\m@ne}%
+ }%
+ {%
+ \errmessage{FEN: there is now row to end here}%
+ }%
+ \else\ifx#1K\relax%
+ \let\cpd@stepcounterPieces\cpd@stepcounterWhite%
+ \help@a=5%
+ \cpd@fen@setpiece%
+ \addtocounter{cpd@line}{\@ne}%
+ \else\ifx#1Q\relax%
+ \let\cpd@stepcounterPieces\cpd@stepcounterWhite%
+ \help@a=4%
+ \cpd@fen@setpiece%
+ \addtocounter{cpd@line}{\@ne}%
+ \else\ifx#1R\relax%
+ \let\cpd@stepcounterPieces\cpd@stepcounterWhite%
+ \help@a=3%
+ \cpd@fen@setpiece%
+ \addtocounter{cpd@line}{\@ne}%
+ \else\ifx#1B\relax%
+ \let\cpd@stepcounterPieces\cpd@stepcounterWhite%
+ \help@a=2%
+ \cpd@fen@setpiece%
+ \addtocounter{cpd@line}{\@ne}%
+ \else\ifx#1N\relax%
+ \let\cpd@stepcounterPieces\cpd@stepcounterWhite%
+ \help@a=1%
+ \cpd@fen@setpiece%
+ \addtocounter{cpd@line}{\@ne}%
+ \else\ifx#1P\relax%
+ \let\cpd@stepcounterPieces\cpd@stepcounterWhite%
+ \help@a=0%
+ \cpd@fen@setpiece%
+ \addtocounter{cpd@line}{\@ne}%
+ \else\ifx#1k\relax%
+ \let\cpd@stepcounterPieces\cpd@stepcounterBlack%
+ \help@a=17%
+ \cpd@fen@setpiece%
+ \addtocounter{cpd@line}{\@ne}%
+ \else\ifx#1q\relax%
+ \let\cpd@stepcounterPieces\cpd@stepcounterBlack%
+ \help@a=16%
+ \cpd@fen@setpiece%
+ \addtocounter{cpd@line}{\@ne}%
+ \else\ifx#1r\relax%
+ \let\cpd@stepcounterPieces\cpd@stepcounterBlack%
+ \help@a=15%
+ \cpd@fen@setpiece%
+ \addtocounter{cpd@line}{\@ne}%
+ \else\ifx#1b\relax%
+ \let\cpd@stepcounterPieces\cpd@stepcounterBlack%
+ \help@a=14%
+ \cpd@fen@setpiece%
+ \addtocounter{cpd@line}{\@ne}%
+ \else\ifx#1n\relax%
+ \let\cpd@stepcounterPieces\cpd@stepcounterBlack%
+ \help@a=13%
+ \cpd@fen@setpiece%
+ \addtocounter{cpd@line}{\@ne}%
+ \else\ifx#1p\relax%
+ \let\cpd@stepcounterPieces\cpd@stepcounterBlack%
+ \help@a=12%
+ \cpd@fen@setpiece%
+ \addtocounter{cpd@line}{\@ne}%
+ \else\ifx1#1\relax%
+ \addtocounter{cpd@line}{1}%
+ \else\ifx2#1\relax%
+ \addtocounter{cpd@line}{2}%
+ \else\ifx3#1\relax%
+ \addtocounter{cpd@line}{3}%
+ \else\ifx4#1\relax%
+ \addtocounter{cpd@line}{4}%
+ \else\ifx5#1\relax%
+ \addtocounter{cpd@line}{5}%
+ \else\ifx6#1\relax%
+ \addtocounter{cpd@line}{6}%
+ \else\ifx7#1\relax%
+ \addtocounter{cpd@line}{7}%
+ \else\ifx8#1\relax%
+ \addtocounter{cpd@line}{8}%
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+}
+\def\@cpd@parse@fen#1{\@cpd@handle@fen#1\l@@klist}
\def\p@rsepieces#1, {\getc@lor#1\e@list\l@@klist}
\def\p@rsetext#1, {\get@text#1\e@list\l@@klist}
\def\set@text{%
@@ -1805,6 +1933,14 @@
% Now we should clear the board
\clear@board%
% Let us now parse the list of pieces
+ \ifthenelse{\boolean{@cpd@fen}}{%
+ \ifthenelse{\value{cpd@rowsmax}=8}{}{\errmessage{FEN is only allowed for 8x8 boards.}}
+ \ifthenelse{\value{cpd@linesmax}=8}{}{\errmessage{FEN is only allowed for 8x8 boards.}}
+ \setcounter{cpd@row}{7}%
+ \setcounter{cpd@line}{0}%
+ \let\@action\@cpd@parse@fen%
+ \@parseTokenlist\fen@tk\e@list%
+ }{}%
\if@pieces%
\let\@action\p@rsepieces%
\let\piece@job\l@@k\let\plane@job\set@piece%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chess-problem-diagrams.tlpobj new/tlpkg/tlpobj/chess-problem-diagrams.tlpobj
--- old/tlpkg/tlpobj/chess-problem-diagrams.tlpobj 2019-02-28 03:25:29.000000000 +0100
+++ new/tlpkg/tlpobj/chess-problem-diagrams.tlpobj 2020-01-03 01:54:38.000000000 +0100
@@ -1,15 +1,14 @@
name chess-problem-diagrams
category Package
-revision 39317
+revision 53302
shortdesc A package for typesetting chess problem diagrams
relocated 1
longdesc This package provides macros to typeset chess problem diagrams
longdesc including fairy chess problems (mostly using rotated images of
longdesc pieces) and other boards.
-runfiles size=14
+runfiles size=15
RELOC/tex/latex/chess-problem-diagrams/diagram.sty
catalogue-ctan /macros/latex/contrib/chess-problem-diagrams
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.2
catalogue-topics games
-catalogue-version 1.12
+catalogue-version 1.15
++++++ chessboard.doc.tar.xz ++++++
++++ 3974 lines of diff (skipped)
++++++ chessboard.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chessboard/UF-chessboard-documentation.sty new/tex/latex/chessboard/UF-chessboard-documentation.sty
--- old/tex/latex/chessboard/UF-chessboard-documentation.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/chessboard/UF-chessboard-documentation.sty 2019-06-24 23:06:01.000000000 +0200
@@ -0,0 +1,220 @@
+\ProvidesFile{UF-xskak-documentation.sty}[2008/01/09 local style for documentations]
+\DeclareOption{codemargin}{\AtEndOfPackage{%
+ \advance\oddsidemargin by 0.5in\relax
+ \advance\marginparwidth by 1in\relax}}
+\ProcessOptions
+\newcommand\filetype[1] {\upshape\texttt{#1}} %e.g. \filetype{.pdf}
+\newcommand\programm[1] {\upshape\textsf{#1}} %e.g. \programm{afm2tfm}
+\newcommand\chessfontname[1]{\upshape\textsf{#1}} %e.g. chessfontname{maya}
+\newcommand\konzept[1] {\upshape\textsf{#1}} %e.g. \konzept{nfss}
+\newcommand\packagename[1] {\upshape\textsf{#1}}
+
+\newcommand\skaksty{the package \packagename{skak}\xspace}
+\newcommand\Skaksty{The package \packagename{skak}\xspace}
+
+\newcommand\xskak{the package \packagename{xskak}\xspace}
+\newcommand\Xskak{The package \packagename{xskak}\xspace}
+
+\newcommand\chessfss{the package \packagename{chessfss}\xspace}
+\newcommand\Chessfss{The package \packagename{chessfss}\xspace}
+
+\newcommand\pchessboard{the package \packagename{chessboard}\xspace}
+\newcommand\Pchessboard{The package \packagename{chessboard}\xspace}
+
+
+\newcommand\mynobreakpar{\par\nobreak\@afterheading}
+\newcommand\key[1]{\texttt{#1}}
+\newcommand\obsoletekey[1]{\key{#1}\index{#1 (obsolete)}}
+\providecommand\gobble[1]{}
+\newcommand\keyoarg{\oarg{key=value list}}
+\newcommand\keymarg{\marg{key=value list}}
+\newcommand\keylist{\textit{key=value list}\xspace}
+\newcommand\keylists{\textit{key=value lists}\xspace}
+\newcommand\keyvalue{\textit{key=value}\xspace}
+
+\AtBeginDocument{%
+ \renewcommand*\lstlistlistingname{Examples}
+ \renewcommand*\lstlistingname{Example}
+}
+
+%
+\setcounter{secnumdepth}{4}
+\renewcommand{\theparagraph}{\alph{paragraph})}
+
+
+%% standard needed packages
+\RequirePackage[english]{babel}
+\RequirePackage{microtype}
+
+\RequirePackage{array}
+\RequirePackage{booktabs}
+\RequirePackage{xspace}
+\RequirePackage{ifluatex}
+
+%% fonts
+\ifluatex
+\else
+\RequirePackage[scaled=0.85]{luximono}
+\RequirePackage{fourier}
+\RequirePackage[scaled=0.86]{helvet}
+\fi
+%\addtokomafont{sectioning}{\rmfamily}
+\renewcommand*\descfont{\rmfamily\bfseries}
+
+%% colors
+\RequirePackage{xcolor}
+\colorlet{hellgelb}{yellow!15}
+
+
+% Quotes
+\RequirePackage[babel]{csquotes}
+\MakeAutoQuote {«}{»}
+
+
+%% index
+\RequirePackage{makeidx}
+\makeindex % number of columns set after doc
+
+\begin{filecontents}{\jobname.mst}
+actual '='
+quote '!'
+level '>'
+preamble
+"\n \\begin{theindex} \n \\makeatletter\\scan@allowedfalse\n"
+postamble
+"\n\n \\end{theindex}\n"
+item_x1 "\\efill \n \\subitem "
+item_x2 "\\efill \n \\subsubitem "
+delim_0 "\\pfill "
+delim_1 "\\pfill "
+delim_2 "\\pfill "
+% The next lines will produce some warnings when
+% running Makeindex as they try to cover two different
+% versions of the program:
+lethead_prefix "{\\bfseries\\hfil "
+lethead_suffix "\\hfil}\\nopagebreak\n"
+lethead_flag 1
+heading_prefix "{\\bfseries\\hfil "
+heading_suffix "\\hfil}\\nopagebreak\n"
+headings_flag 1
+%%
+%%
+\end{filecontents}
+
+
+%% codes and examples
+\begin{filecontents}{UFlstlocal.cfg}
+\ProvidesFile{UFlstlocal.cfg}[2005/07/01 lokale Listingsdefinitionen (UF)]
+
+\RequirePackage{xcolor}
+
+
+\colorlet{UFkeyscolor}{black}
+\colorlet{UFidentifiercolor}{black}
+\colorlet{UFcommentscolor}{red}
+\colorlet{UFstringcolor}{green!50}
+\colorlet{UFbackgroundcolor}{yellow!10}
+
+\lstdefinestyle{inline}{%
+ basicstyle=\ttfamily,
+ keywordstyle={}}
+
+
+\lstdefinestyle{UFdocu}{% mehr oder weniger kopiert aus showexpl.cfg
+ language=[LaTeX]TeX,%
+ float=hbp,%
+ basicstyle=\ttfamily,%
+ identifierstyle=\color{UFidentifiercolor},%
+ keywordstyle=\color{UFkeyscolor},%
+ stringstyle=\color{UFstringcolor},%
+ commentstyle=\itshape,%
+ columns=flexible,%
+ tabsize=4,%
+ frame=single,%
+ extendedchars=true,%
+ showspaces=false,%
+ showstringspaces=false,%
+ numbers=none,%
+ %numberstyle=\tiny\ttfamily,%
+ breaklines=true,%
+ breakindent=10pt,%
+ backgroundcolor=\color{UFbackgroundcolor},%
+ breakautoindent=true,%
+ captionpos=t,%
+ xleftmargin=1em,%
+ xrightmargin=\fboxsep,%
+ %numbersep=1em,%
+ breakatwhitespace=true,
+ preset=\raggedright\setlength{\parskip}{1ex},%
+ explpreset={numbers=none, basicstyle=\footnotesize\ttfamily},% ueberschreibt default
+ rframe={},% code ist im Rahmen
+ varwidth=true,% Breite des Beispiels
+ pos=o,
+ overhang=4em,%
+ literate={Ì}{{\"u}}1{ö}{{\"o}}1{À}{{\"a}}1
+}
+
+\lstdefinestyle{inline}{%
+ basicstyle=\ttfamily,
+ keywordstyle={}}
+
+\newcommand\mylstinline{\lstinline[style=inline]}
+
+\endinput
+%%
+%% End of file `UFlstlocal.cfg'.
+\end{filecontents}
+
+\RequirePackage[final]{showexpl}
+\input{UFlstlocal.cfg}
+\lstset{style=UFdocu}
+
+\newcommand\UFleftexamples{%
+\let\OriisSX@odd\isSX@odd
+\renewcommand*{\isSX@odd}[2]{##2}}
+
+\UFleftexamples
+
+\RequirePackage{doc}
+\def\meta@font@select{\rmfamily\itshape}
+\c@IndexColumns = 2
+\renewcommand\MacroFont{\scriptsize\ttfamily}
+\renewcommand\encapchar{ -- }
+% from ltxdoc.sty
+\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
+\providecommand\marg[1]{%
+ {\ttfamily\char`\{}\meta{#1}{\ttfamily\char`\}}}
+\providecommand\oarg[1]{%
+ {\ttfamily[}\meta{#1}{\ttfamily]}}
+\providecommand\parg[1]{%
+ {\ttfamily(}\meta{#1}{\ttfamily)}}
+
+
+%% pagestyle and layout
+\providecommand\UFcurrentpackage{unknown}
+\providecommand\UFcurrentversion{version unknown}
+
+\reversemarginpar
+
+\RequirePackage{fancyhdr}
+\pagestyle{fancy}
+
+\renewcommand\headrulewidth{0pt}
+\fancyhf{}
+\cfoot{\thepage}
+\lfoot{\today}
+\rfoot{\packagename{\UFcurrentpackage} \UFcurrentversion}
+
+
+%% captions
+\RequirePackage[tableposition=top]{caption}
+\captionsetup{singlelinecheck=false,format=hang,belowskip=1em}
+
+
+
+%% pdf-goodies:
+\RequirePackage{animate}
+\RequirePackage[colorlinks=true, %options are passed to hyperref
+ linkcolor=black,
+ hyperindex=true% true clashes with doc.sty
+ ]{attachfile}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chessboard/chessboard-keys-main.sty new/tex/latex/chessboard/chessboard-keys-main.sty
--- old/tex/latex/chessboard/chessboard-keys-main.sty 2014-05-02 23:14:31.000000000 +0200
+++ new/tex/latex/chessboard/chessboard-keys-main.sty 2019-06-24 23:06:01.000000000 +0200
@@ -4,10 +4,10 @@
%%
%% The original source files were:
%%
-%% chessboard-src.dtx (with options: `chessboard-keys-main')
+%% chessboard.dtx (with options: `chessboard-keys-main')
%%
%% chessboard: a package to print chessboards
-%% Copyright 2006-2014 Ulrike Fischer (chess(a)nililand.de)
+%% Copyright 2006-2019 Ulrike Fischer (chess(a)nililand.de)
%% -------------------------------------------
%%
%% This file can be redistributed and/or modified under the terms of
@@ -16,7 +16,7 @@
%% License, or (at your option) any later version.
%%
%% For error reports see documentation.
-\ProvidesFile{chessboard-keys-main.sty}[2014/05/01 version v1.7 key definitions for chessboard.sty]
+\ProvidesFile{chessboard-keys-main.sty}[2019/06/23 version v1.8 key definitions for chessboard.sty]
%%$Date: 2011/03/23 08:42:57 $$Version: 66142533647c $
%%file=Linie=column=vertikal=al_f_abetisch= a-h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chessboard/chessboard-keys-pgf.sty new/tex/latex/chessboard/chessboard-keys-pgf.sty
--- old/tex/latex/chessboard/chessboard-keys-pgf.sty 2014-05-02 23:14:31.000000000 +0200
+++ new/tex/latex/chessboard/chessboard-keys-pgf.sty 2019-06-24 23:06:01.000000000 +0200
@@ -4,10 +4,10 @@
%%
%% The original source files were:
%%
-%% chessboard-src.dtx (with options: `chessboard-keys-pgf')
+%% chessboard.dtx (with options: `chessboard-keys-pgf')
%%
%% chessboard: a package to print chessboards
-%% Copyright 2006-2014 Ulrike Fischer (chess(a)nililand.de)
+%% Copyright 2006-2019 Ulrike Fischer (chess(a)nililand.de)
%% -------------------------------------------
%%
%% This file can be redistributed and/or modified under the terms of
@@ -16,7 +16,7 @@
%% License, or (at your option) any later version.
%%
%% For error reports see documentation.
-\ProvidesFile{chessboard-keys-pgf.sty}[2014/05/01 version v1.7 key definitions for chessboard.sty]
+\ProvidesFile{chessboard-keys-pgf.sty}[2019/06/23 version v1.8 key definitions for chessboard.sty]
%%$Date: 2011/03/17 13:42:38 $$Version: e7ec1b100ede $
%% new 1.5.: style keys for curvemove
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chessboard/chessboard-pgf.sty new/tex/latex/chessboard/chessboard-pgf.sty
--- old/tex/latex/chessboard/chessboard-pgf.sty 2014-05-02 23:14:31.000000000 +0200
+++ new/tex/latex/chessboard/chessboard-pgf.sty 2019-06-24 23:06:01.000000000 +0200
@@ -4,10 +4,10 @@
%%
%% The original source files were:
%%
-%% chessboard-src.dtx (with options: `chessboard-pgf')
+%% chessboard.dtx (with options: `chessboard-pgf')
%%
%% chessboard: a package to print chessboards
-%% Copyright 2006-2014 Ulrike Fischer (chess(a)nililand.de)
+%% Copyright 2006-2019 Ulrike Fischer (chess(a)nililand.de)
%% -------------------------------------------
%%
%% This file can be redistributed and/or modified under the terms of
@@ -16,7 +16,7 @@
%% License, or (at your option) any later version.
%%
%% For error reports see documentation.
-\ProvidesFile{chessboard-pgf.sty}[2014/05/01 version v1.7 pgf code for chessboard.sty]
+\ProvidesFile{chessboard-pgf.sty}[2019/06/23 version v1.8 pgf code for chessboard.sty]
%%$Date: 2011/01/11 14:07:20 $$Version: 3d9f59c743f1 $
\newcommand\board@pgf@extrabackground{}%
@@ -90,7 +90,7 @@
{\setcounter{cnt@board@rank}{0}%
\whiledo %nodes for on one field for each rank
{\value{cnt@board@rank}<\numexpr\board@val@maxranknum+1\relax}%
- {\edef\board@temp{\zeroalph{cnt@board@file}\arabic{cnt@board@rank}}%
+ {\edef\board@temp{\zeroalph{cnt@board@file}\number\value{cnt@board@rank}}%
\expandafter\board@pgf@addnode\expandafter{\board@temp}{#1}%
\expandafter\board@do@l@addto@macro\csname board@pgf@#1ground\endcsname{%
\pgftransformshift{\pgfpointxy{0}{1}}}%
@@ -204,7 +204,7 @@
{\setcounter{cnt@board@file}{\board@temp@curstartfilenum}%
\whiledo
{\value{cnt@board@file}<\numexpr \board@temp@curstopfilenum+1\relax}%
- {\edef\board@temp@curfield{\zeroalph{cnt@board@file}\arabic{cnt@board@rank}}%
+ {\edef\board@temp@curfield{\zeroalph{cnt@board@file}\number\value{cnt@board@rank}}%
\expandafter\board@pgf@addpgftofield\expandafter{\board@temp@curfield}{mark}%
\addtocounter{cnt@board@file}{1}}%
\addtocounter{cnt@board@rank}{-1}}}%
@@ -222,7 +222,7 @@
{\setcounter{cnt@board@file}{\board@temp@curstartfilenum}%
\whiledo
{\value{cnt@board@file}<\numexpr \board@temp@curstopfilenum+1\relax}%
- {\edef\board@temp@curfield{\zeroalph{cnt@board@file}\arabic{cnt@board@rank}}%
+ {\edef\board@temp@curfield{\zeroalph{cnt@board@file}\number\value{cnt@board@rank}}%
\expandafter\board@pgf@addpgftofield\expandafter{\board@temp@curfield}{back}%
\addtocounter{cnt@board@file}{1}}%
\addtocounter{cnt@board@rank}{-1}}}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/chessboard/chessboard.sty new/tex/latex/chessboard/chessboard.sty
--- old/tex/latex/chessboard/chessboard.sty 2014-05-02 23:14:31.000000000 +0200
+++ new/tex/latex/chessboard/chessboard.sty 2019-06-24 23:06:01.000000000 +0200
@@ -4,10 +4,10 @@
%%
%% The original source files were:
%%
-%% chessboard-src.dtx (with options: `chessboard')
+%% chessboard.dtx (with options: `chessboard')
%%
%% chessboard: a package to print chessboards
-%% Copyright 2006-2014 Ulrike Fischer (chess(a)nililand.de)
+%% Copyright 2006-2019 Ulrike Fischer (chess(a)nililand.de)
%% -------------------------------------------
%%
%% This file can be redistributed and/or modified under the terms of
@@ -17,7 +17,7 @@
%%
%% For error reports see documentation.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{chessboard}[2014/05/01 version v1.7 print chessboards]
+\ProvidesPackage{chessboard}[2019/06/23 version v1.8 print chessboards]
%%$Date: 2011/03/23 08:42:57 $$Version: 66142533647c $
\DeclareOption{skaknew}{}%
@@ -46,7 +46,7 @@
\ifpdf\else
\RequirePackage{pst-node}%
\fi
-
+\RequirePackage{etoolbox}
%%%%%%%
%% naming conventions
%%%%%%%
@@ -304,13 +304,13 @@
{\isodd{\value{cnt@board}}}
{\ifthenelse%
{\equal{\board@val@whitefieldlist}{}}%
- {\edef\board@val@whitefieldlist{\zeroalph{cnt@board@file}\arabic{cnt@board@rank}}}%
- {\edef\board@temp@curfield{\zeroalph{cnt@board@file}\arabic{cnt@board@rank}}%
+ {\edef\board@val@whitefieldlist{\zeroalph{cnt@board@file}\number\value{cnt@board@rank}}}%
+ {\edef\board@temp@curfield{\zeroalph{cnt@board@file}\number\value{cnt@board@rank}}%
\expandafter\board@do@l@addto@macro\expandafter\board@val@whitefieldlist\expandafter{\expandafter,\board@temp@curfield}}}%
{\ifthenelse%
{\equal{\board@val@blackfieldlist}{}}%
- {\edef\board@val@blackfieldlist{\zeroalph{cnt@board@file}\arabic{cnt@board@rank}}}%
- {\edef\board@temp@curfield{\zeroalph{cnt@board@file}\arabic{cnt@board@rank}}%
+ {\edef\board@val@blackfieldlist{\zeroalph{cnt@board@file}\number\value{cnt@board@rank}}}%
+ {\edef\board@temp@curfield{\zeroalph{cnt@board@file}\number\value{cnt@board@rank}}%
\expandafter\board@do@l@addto@macro\expandafter\board@val@blackfieldlist\expandafter{\expandafter,\board@temp@curfield}}}%
\addtocounter{cnt@board@rank}{1}}%
\addtocounter{cnt@board@file}{1}}}%
@@ -695,7 +695,7 @@
{\value{cnt@board}>0}%
{\edef\board@temp@currankposition{%
\board@temp@currankposition
- \arabic{cnt@board}%
+ \number\value{cnt@board}%
\csname board@val@f\the\c@cnt@board@file r\the\c@cnt@board@rank @piecechar\endcsname}%
\setcounter{cnt@board}{0}}%
{\edef\board@temp@currankposition{%
@@ -706,7 +706,7 @@
{\value{cnt@board}>0}%
{\edef\board@temp@currankposition{%
\board@temp@currankposition
- \arabic{cnt@board}}}%
+ \number\value{cnt@board}}}%
{}}%
%% stores the fen in chessgame.<name> (as in skak.sty the \storegame command
@@ -1361,10 +1361,16 @@
\newcommand\board@skak@piececharlist{K,Q,R,B,N,P,k,q,r,b,n,p}%
\newcommand\board@skak@whitepiececharlist{K,Q,R,B,N,P}%
\newcommand\board@skak@blackpiececharlist{k,q,r,b,n,p}%
-
\AtBeginDocument{%
\@ifpackageloaded{skak}%
- {\def\board@skak@do@fencalculate{%
+ {%patch skak, see issue #1
+ \patchcmd\Fen@handleA{\arabic}{\number\value}{}{}%
+ \patchcmd\Fen@handleA{\arabic}{\number\value}{}{}%
+ \patchcmd\Fen@handleA{\thehelpgobble}{\c@helpgobble}{}{}%
+ \patchcmd\Fen@handleA{\thehelpgobble}{\c@helpgobble}{}{}%
+ \patchcmd\Fen@calculate{\arabic}{\number\value}{}{}%
+ \patchcmd\Fen@calculate{\arabic}{\number\value}{}{}%
+ \def\board@skak@do@fencalculate{%
\Fen@calculate
\let\board@val@fencalculate\temp@board}%
\def\board@skak@set@special@psmarkers#1#2{%
@@ -1372,8 +1378,8 @@
\setcounter{fileFrom}{\value{fileTo}}%
\setcounter{rankFrom}{\value{rankTo}}%
\get@translation#2%
- \rput(BM){\pnode(-\arabic{fileFrom},\arabic{rankFrom}){From}}%
- \rput(BM){\pnode(-\arabic{fileTo},\arabic{rankTo}){To}}}}%
+ \rput(BM){\pnode(-\number\value{fileFrom},\number\value{rankFrom}){From}}%
+ \rput(BM){\pnode(-\number\value{fileTo},\number\value{rankTo}){To}}}}%
{\def\board@skak@do@fencalculate{%
\def\board@val@fencalculate{8/8/8/8/8/8/8/8}}}}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chessboard.tlpobj new/tlpkg/tlpobj/chessboard.tlpobj
--- old/tlpkg/tlpobj/chessboard.tlpobj 2019-02-28 03:25:29.000000000 +0100
+++ new/tlpkg/tlpobj/chessboard.tlpobj 2019-06-27 01:54:21.000000000 +0200
@@ -1,6 +1,6 @@
name chessboard
category Package
-revision 33801
+revision 51469
shortdesc Print chess boards
relocated 1
longdesc This package offers commands to print chessboards. It can print
@@ -10,13 +10,16 @@
longdesc chess) is possible. The documentation includes an example of an
longdesc animated chessboard, for those whose PDF viewer can display
longdesc animations.
-runfiles size=48
+runfiles size=50
+ RELOC/tex/latex/chessboard/UF-chessboard-documentation.sty
RELOC/tex/latex/chessboard/chessboard-keys-main.sty
RELOC/tex/latex/chessboard/chessboard-keys-pgf.sty
RELOC/tex/latex/chessboard/chessboard-pgf.sty
RELOC/tex/latex/chessboard/chessboard.sty
+catalogue-contact-repository https://github.com/u-fischer/chessboard
+catalogue-contact-support https://github.com/u-fischer/chessboard/issues
catalogue-ctan /macros/latex/contrib/chessboard
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-06-24 05:47:40 +0200
catalogue-license lppl
catalogue-topics games
-catalogue-version 1.7
+catalogue-version 1.8
++++++ chivo.doc.tar.xz ++++++
Binary files old/doc/fonts/chivo/Chivo.pdf and new/doc/fonts/chivo/Chivo.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/chivo/OFL.txt new/doc/fonts/chivo/OFL.txt
--- old/doc/fonts/chivo/OFL.txt 2016-05-07 00:52:30.000000000 +0200
+++ new/doc/fonts/chivo/OFL.txt 2019-07-14 22:46:37.000000000 +0200
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2015, Omnibus-Type (www.omnibus-type.com|omnibus.type@gmail.com).
+Copyright 2016 The Sansita Project Authors (omnibus.type(a)gmail.com)
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/chivo/README.md new/doc/fonts/chivo/README.md
--- old/doc/fonts/chivo/README.md 2016-05-07 00:52:30.000000000 +0200
+++ new/doc/fonts/chivo/README.md 2019-07-21 00:27:00.000000000 +0200
@@ -1,14 +1,23 @@
# Chivo fonts for LaTeX #
This work provides the necessary files to use the Chivo fonts with
-LaTeX. Chivo is a set of eight fonts provided by Héctor Gatti &
-[Omnibus-Type](http://www.omnibus-type.com/fonts/chivo.php) Team under
+LaTeX. Chivo is a set of fourteen fonts provided by Héctor Gatti &
+[Omnibus-Type](https://www.omnibus-type.com/fonts/chivo/) Team under
the Open Font License [(OFL)](http://scripts.sil.org/OFL), version
-1.1. The fonts are copyright (c) 2011-2015, Omnibus-Type.
+1.1. The fonts are copyright (c) 2011-2019, Omnibus-Type.
The LaTeX package is released under the LaTeX Project Public License
[(LPPL)](http://www.latex-project.org/lppl.txt) v1.3c or later,
-copyright (c) 2016 Arash Esbati.
+copyright (c) 2016-2019 Arash Esbati.
+
+ v2.1, 2019/07/19
+ * Fix a bug in handling of alias keys
+
+ v2.0, 2019/07/07
+ * Add the `scaled' key
+ * Use NFSS scheme for fonts mapping
+ * Rewrite major part of the code supporting 14 fonts. Harmonize
+ the usage of package options over different TeX engines
v1.0, 2016/05/05
* Initial release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chivo.doc.tlpobj new/tlpkg/tlpobj/chivo.doc.tlpobj
--- old/tlpkg/tlpobj/chivo.doc.tlpobj 2019-02-28 03:25:31.000000000 +0100
+++ new/tlpkg/tlpobj/chivo.doc.tlpobj 2020-03-24 01:56:41.000000000 +0100
@@ -1,9 +1,9 @@
name chivo.doc
category Package
-revision 40931
+revision 54512
shortdesc doc files of chivo
relocated 1
-docfiles size=91
+docfiles size=150
RELOC/doc/fonts/chivo/Chivo.pdf
RELOC/doc/fonts/chivo/OFL.txt
RELOC/doc/fonts/chivo/README.md
++++++ chivo.tar.xz ++++++
++++ 11796 lines of diff (skipped)
++++++ chktex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/chktex.man1.pdf and new/texmf-dist/doc/man/man1/chktex.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/chkweb.man1.pdf and new/texmf-dist/doc/man/man1/chkweb.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/deweb.man1.pdf and new/texmf-dist/doc/man/man1/deweb.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chktex.doc.tlpobj new/tlpkg/tlpobj/chktex.doc.tlpobj
--- old/tlpkg/tlpobj/chktex.doc.tlpobj 2019-03-27 02:24:03.000000000 +0100
+++ new/tlpkg/tlpobj/chktex.doc.tlpobj 2019-11-19 01:55:39.000000000 +0100
@@ -1,6 +1,6 @@
name chktex.doc
category TLCore
-revision 50602
+revision 52851
shortdesc doc files of chktex
docfiles size=112
texmf-dist/doc/chktex/ChkTeX.pdf
++++++ chktex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chktex.tlpobj new/tlpkg/tlpobj/chktex.tlpobj
--- old/tlpkg/tlpobj/chktex.tlpobj 2019-03-27 02:24:03.000000000 +0100
+++ new/tlpkg/tlpobj/chktex.tlpobj 2019-11-19 01:55:39.000000000 +0100
@@ -1,6 +1,6 @@
name chktex
category TLCore
-revision 50602
+revision 52851
shortdesc Check for errors in LaTeX documents
longdesc The program reports typographic and other errors in LaTeX
longdesc documents. Filters are also provided for checking the LaTeX
++++++ chs-physics-report.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chs-physics-report.doc.tlpobj new/tlpkg/tlpobj/chs-physics-report.doc.tlpobj
--- old/tlpkg/tlpobj/chs-physics-report.doc.tlpobj 2019-02-28 03:25:35.000000000 +0100
+++ new/tlpkg/tlpobj/chs-physics-report.doc.tlpobj 2020-03-24 01:56:44.000000000 +0100
@@ -1,6 +1,6 @@
name chs-physics-report.doc
category Package
-revision 48549
+revision 54512
shortdesc doc files of chs-physics-report
relocated 1
docfiles size=56
++++++ chs-physics-report.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/chs-physics-report.tlpobj new/tlpkg/tlpobj/chs-physics-report.tlpobj
--- old/tlpkg/tlpobj/chs-physics-report.tlpobj 2019-02-28 03:25:36.000000000 +0100
+++ new/tlpkg/tlpobj/chs-physics-report.tlpobj 2020-03-24 01:56:44.000000000 +0100
@@ -1,6 +1,6 @@
name chs-physics-report
category Package
-revision 48549
+revision 54512
shortdesc Physics lab reports for Carmel High School
relocated 1
longdesc This package may optionally be used by students at Carmel High
@@ -15,6 +15,5 @@
runfiles size=2
RELOC/tex/latex/chs-physics-report/chs-physics-report.sty
catalogue-ctan /macros/latex/contrib/chs-physics-report
-catalogue-date 2018-09-06 05:15:28 +0200
-catalogue-license pdcc-by-sa-3
+catalogue-license pd cc-by-sa-3
catalogue-topics physics report-like
++++++ cinzel.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cinzel/README new/doc/fonts/cinzel/README
--- old/doc/fonts/cinzel/README 2014-06-25 17:18:47.000000000 +0200
+++ new/doc/fonts/cinzel/README 2019-10-15 23:49:22.000000000 +0200
@@ -1,4 +1,4 @@
-This is the README for the cinzel package, version 2014-05-24.
+This is the README for the cinzel package, version 2019-10-15.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support
for the Cinzel and Cinzel Decorative families of fonts, designed
@@ -24,12 +24,24 @@
\usepackage{cinzel}
-to the preamble of your document. This will activate Cinzel as the
-main (serifed) text font and Cinzel Decorative as the "italic"
-variants.
+to the preamble of your document. This will define
-The black option selects the Black variants as the default bold
-series.
+\cinzel and \textcinzel{...}
+
+and
+
+\cinzelblack and \textcinzelblack{...}
+
+for localized use of Cinzel and the black series,
+respectively. Cinzel Decorative is treated as the italic
+shape.
+
+To activate Cinzel as the main (serifed) text font and
+Cinzel Decorative as the "italic" variants, use the
+"default" option.
+
+The "black" option selects the Black variants as the default
+bold series.
LuaLaTeX and xeLaTeX users who might prefer type1 fonts or who wish
to avoid fontspec may use the type1 option.
@@ -38,10 +50,6 @@
Font encodings supported are OT1, T1, LY1 and TS1.
-Command \cinzel allows for localized use of Cinzel (and Cinzel
-Decorative). Command \cinzelblack allows for localized use of the
-Black series.
-
The truetype fonts were downloaded from
http://www.google.com/webfonts and are licensed under the SIL Open
Font License, (version 1.1); the text may be found in the doc
Binary files old/doc/fonts/cinzel/cinzel-samples.pdf and new/doc/fonts/cinzel/cinzel-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cinzel/cinzel-samples.tex new/doc/fonts/cinzel/cinzel-samples.tex
--- old/doc/fonts/cinzel/cinzel-samples.tex 2014-06-25 17:18:47.000000000 +0200
+++ new/doc/fonts/cinzel/cinzel-samples.tex 2019-05-12 22:16:41.000000000 +0200
@@ -1,12 +1,12 @@
\documentclass[12pt]{article}
\usepackage[T1]{fontenc}
-\usepackage{cinzel}
+\usepackage[default]{cinzel}
\usepackage{lipsum}
\begin{document}
\thispagestyle{empty}
-\begin{center}\LARGE\bfseries\itshape
-Cinzel and Cinzel Decorative
+\begin{center}\LARGE\bfseries
+\cinzel Cinzel and \Large\itshape Cinzel Decorative
\end{center}
\sloppy
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cinzel.doc.tlpobj new/tlpkg/tlpobj/cinzel.doc.tlpobj
--- old/tlpkg/tlpobj/cinzel.doc.tlpobj 2019-02-28 03:25:36.000000000 +0100
+++ new/tlpkg/tlpobj/cinzel.doc.tlpobj 2020-03-24 01:56:44.000000000 +0100
@@ -1,9 +1,9 @@
name cinzel.doc
category Package
-revision 34408
+revision 54512
shortdesc doc files of cinzel
relocated 1
-docfiles size=12
+docfiles size=13
RELOC/doc/fonts/cinzel/README
RELOC/doc/fonts/cinzel/SIL_Open_Font_License.txt
RELOC/doc/fonts/cinzel/cinzel-samples.pdf
++++++ cinzel.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/cinzel/cnzl_7luz43.enc new/fonts/enc/dvips/cinzel/cnzl_7luz43.enc
--- old/fonts/enc/dvips/cinzel/cnzl_7luz43.enc 2014-06-25 17:18:47.000000000 +0200
+++ new/fonts/enc/dvips/cinzel/cnzl_7luz43.enc 2019-10-15 23:49:22.000000000 +0200
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_7luz434ypt3pnlnjm2v7veregd
-% Encoding created by otftotfm on Sat May 24 08:57:58 2014
+% Encoding created by otftotfm on Tue Oct 15 12:03:15 2019
% Command line follows encoding
/AutoEnc_7luz434ypt3pnlnjm2v7veregd [
%00
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/cinzel/cnzl_7t2zcj.enc new/fonts/enc/dvips/cinzel/cnzl_7t2zcj.enc
--- old/fonts/enc/dvips/cinzel/cnzl_7t2zcj.enc 2014-06-25 17:18:47.000000000 +0200
+++ new/fonts/enc/dvips/cinzel/cnzl_7t2zcj.enc 2019-10-15 23:49:22.000000000 +0200
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_7t2zcj7avoq2hw5wmb7d3cuoug
-% Encoding created by otftotfm on Sat May 24 08:57:58 2014
+% Encoding created by otftotfm on Tue Oct 15 12:03:15 2019
% Command line follows encoding
/AutoEnc_7t2zcj7avoq2hw5wmb7d3cuoug [
%00
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/cinzel/cnzl_aakhvz.enc new/fonts/enc/dvips/cinzel/cnzl_aakhvz.enc
--- old/fonts/enc/dvips/cinzel/cnzl_aakhvz.enc 2014-06-25 17:18:47.000000000 +0200
+++ new/fonts/enc/dvips/cinzel/cnzl_aakhvz.enc 2019-10-15 23:49:22.000000000 +0200
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_aakhvzp3cpj6fyj77cfsufw3ga
-% Encoding created by otftotfm on Sat May 24 08:57:59 2014
+% Encoding created by otftotfm on Tue Oct 15 12:03:15 2019
% Command line follows encoding
/AutoEnc_aakhvzp3cpj6fyj77cfsufw3ga [
%00
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/cinzel/cnzl_k6z3ge.enc new/fonts/enc/dvips/cinzel/cnzl_k6z3ge.enc
--- old/fonts/enc/dvips/cinzel/cnzl_k6z3ge.enc 2014-06-25 17:18:47.000000000 +0200
+++ new/fonts/enc/dvips/cinzel/cnzl_k6z3ge.enc 2019-10-15 23:49:22.000000000 +0200
@@ -1,7 +1,7 @@
% THIS FILE WAS AUTOMATICALLY GENERATED -- DO NOT EDIT
%%AutoEnc_k6z3gecwro7ayfjhhk2i7i2wgc
-% Encoding created by otftotfm on Sat May 24 08:57:58 2014
+% Encoding created by otftotfm on Tue Oct 15 12:03:15 2019
% Command line follows encoding
/AutoEnc_k6z3gecwro7ayfjhhk2i7i2wgc [
%00
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/cinzel/cinzel.map new/fonts/map/dvips/cinzel/cinzel.map
--- old/fonts/map/dvips/cinzel/cinzel.map 2014-06-25 17:18:47.000000000 +0200
+++ new/fonts/map/dvips/cinzel/cinzel.map 2019-10-15 23:49:22.000000000 +0200
@@ -1,5 +1,4 @@
-% Automatically maintained by otftotfm or other programs. Do not edit.
Cinzel-Black-lf-ot1 Cinzel-Black "AutoEnc_k6z3gecwro7ayfjhhk2i7i2wgc ReEncodeFont" <[cnzl_k6z3ge.enc <Cinzel-Black.pfb
Cinzel-Black-lf-t1--base Cinzel-Black "AutoEnc_7t2zcj7avoq2hw5wmb7d3cuoug ReEncodeFont" <[cnzl_7t2zcj.enc <Cinzel-Black.pfb
@@ -14,7 +13,6 @@
Cinzel-Regular-lf-ly1--base Cinzel-Regular "AutoEnc_7luz434ypt3pnlnjm2v7veregd ReEncodeFont" <[cnzl_7luz43.enc <Cinzel-Regular.pfb
Cinzel-Regular-lf-ts1--base Cinzel-Regular "AutoEnc_aakhvzp3cpj6fyj77cfsufw3ga ReEncodeFont" <[cnzl_aakhvz.enc <Cinzel-Regular.pfb
-% Automatically maintained by otftotfm or other programs. Do not edit.
CinzelDecorative-Black-lf-ot1 CinzelDecorative-Black "AutoEnc_k6z3gecwro7ayfjhhk2i7i2wgc ReEncodeFont" <[cnzl_k6z3ge.enc <CinzelDecorative-Black.pfb
CinzelDecorative-Black-lf-t1--base CinzelDecorative-Black "AutoEnc_7t2zcj7avoq2hw5wmb7d3cuoug ReEncodeFont" <[cnzl_7t2zcj.enc <CinzelDecorative-Black.pfb
Binary files old/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-t1.tfm and new/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-t1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ts1.tfm and new/fonts/tfm/ndiscovered/cinzel/Cinzel-Black-lf-ts1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ly1--base.tfm and new/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ly1--base.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ly1.tfm and new/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ly1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ot1.tfm and new/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ot1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-t1--base.tfm and new/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-t1--base.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-t1.tfm and new/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-t1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ts1--base.tfm and new/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ts1--base.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ts1.tfm and new/fonts/tfm/ndiscovered/cinzel/Cinzel-Bold-lf-ts1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-t1.tfm and new/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-t1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ts1.tfm and new/fonts/tfm/ndiscovered/cinzel/Cinzel-Regular-lf-ts1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1--base.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1--base.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ot1.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ot1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1--base.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1--base.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1--base.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1--base.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1--base.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1--base.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ot1.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ot1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1--base.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1--base.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1--base.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1--base.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1--base.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1--base.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ot1.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ot1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1--base.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1--base.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1--base.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1--base.tfm differ
Binary files old/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1.tfm and new/fonts/tfm/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1.tfm differ
Binary files old/fonts/vf/ndiscovered/cinzel/Cinzel-Black-lf-t1.vf and new/fonts/vf/ndiscovered/cinzel/Cinzel-Black-lf-t1.vf differ
Binary files old/fonts/vf/ndiscovered/cinzel/Cinzel-Black-lf-ts1.vf and new/fonts/vf/ndiscovered/cinzel/Cinzel-Black-lf-ts1.vf differ
Binary files old/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-ly1.vf and new/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-ly1.vf differ
Binary files old/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-t1.vf and new/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-t1.vf differ
Binary files old/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-ts1.vf and new/fonts/vf/ndiscovered/cinzel/Cinzel-Bold-lf-ts1.vf differ
Binary files old/fonts/vf/ndiscovered/cinzel/Cinzel-Regular-lf-t1.vf and new/fonts/vf/ndiscovered/cinzel/Cinzel-Regular-lf-t1.vf differ
Binary files old/fonts/vf/ndiscovered/cinzel/Cinzel-Regular-lf-ts1.vf and new/fonts/vf/ndiscovered/cinzel/Cinzel-Regular-lf-ts1.vf differ
Binary files old/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1.vf and new/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-ly1.vf differ
Binary files old/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1.vf and new/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-t1.vf differ
Binary files old/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1.vf and new/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Black-lf-ts1.vf differ
Binary files old/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1.vf and new/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ly1.vf differ
Binary files old/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1.vf and new/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-t1.vf differ
Binary files old/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1.vf and new/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Bold-lf-ts1.vf differ
Binary files old/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1.vf and new/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ly1.vf differ
Binary files old/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1.vf and new/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-t1.vf differ
Binary files old/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1.vf and new/fonts/vf/ndiscovered/cinzel/CinzelDecorative-Regular-lf-ts1.vf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cinzel/LY1Cinzel-LF.fd new/tex/latex/cinzel/LY1Cinzel-LF.fd
--- old/tex/latex/cinzel/LY1Cinzel-LF.fd 2014-06-25 17:18:47.000000000 +0200
+++ new/tex/latex/cinzel/LY1Cinzel-LF.fd 2019-10-15 23:49:22.000000000 +0200
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/24
+%% Generated by autoinst on 2019/10/15
%%
\ProvidesFile{LY1Cinzel-LF.fd}
- [2014/05/24 (autoinst) Font definitions for LY1/Cinzel-LF.]
+ [2019/10/15 (autoinst) Font definitions for LY1/Cinzel-LF.]
\expandafter\ifx\csname Cinzel@scale\endcsname\relax
\let\Cinzel@@scale\@empty
@@ -11,16 +11,49 @@
\DeclareFontFamily{LY1}{Cinzel-LF}{}
-\DeclareFontShape{LY1}{Cinzel-LF}{k}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{Cinzel-LF}{regular}{n}{
+ <-> \Cinzel@@scale Cinzel-Regular-lf-ly1
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{LY1}{Cinzel-LF}{black}{n}{
<-> \Cinzel@@scale Cinzel-Black-lf-ly1
}{}
-\DeclareFontShape{LY1}{Cinzel-LF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{Cinzel-LF}{bold}{n}{
<-> \Cinzel@@scale Cinzel-Bold-lf-ly1
}{}
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
\DeclareFontShape{LY1}{Cinzel-LF}{m}{n}{
- <-> \Cinzel@@scale Cinzel-Regular-lf-ly1
+ <-> ssub * Cinzel-LF/regular/n
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LY1}{Cinzel-LF}{b}{n}{
+ <-> ssub * Cinzel-LF/bold/n
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{LY1}{Cinzel-LF}{eb}{n}{
+ <-> ssub * Cinzel-LF/black/n
}{}
\DeclareFontShape{LY1}{Cinzel-LF}{bx}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cinzel/LY1CinzelDecorative-LF.fd new/tex/latex/cinzel/LY1CinzelDecorative-LF.fd
--- old/tex/latex/cinzel/LY1CinzelDecorative-LF.fd 2014-06-25 17:18:47.000000000 +0200
+++ new/tex/latex/cinzel/LY1CinzelDecorative-LF.fd 2019-10-15 23:49:22.000000000 +0200
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/24
+%% Generated by autoinst on 2019/10/15
%%
\ProvidesFile{LY1CinzelDecorative-LF.fd}
- [2014/05/24 (autoinst) Font definitions for LY1/CinzelDecorative-LF.]
+ [2019/10/15 (autoinst) Font definitions for LY1/CinzelDecorative-LF.]
\expandafter\ifx\csname CinzelDecorative@scale\endcsname\relax
\let\CinzelDecorative@@scale\@empty
@@ -11,16 +11,49 @@
\DeclareFontFamily{LY1}{CinzelDecorative-LF}{}
-\DeclareFontShape{LY1}{CinzelDecorative-LF}{k}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{CinzelDecorative-LF}{regular}{n}{
+ <-> \CinzelDecorative@@scale CinzelDecorative-Regular-lf-ly1
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{LY1}{CinzelDecorative-LF}{black}{n}{
<-> \CinzelDecorative@@scale CinzelDecorative-Black-lf-ly1
}{}
-\DeclareFontShape{LY1}{CinzelDecorative-LF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{CinzelDecorative-LF}{bold}{n}{
<-> \CinzelDecorative@@scale CinzelDecorative-Bold-lf-ly1
}{}
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
\DeclareFontShape{LY1}{CinzelDecorative-LF}{m}{n}{
- <-> \CinzelDecorative@@scale CinzelDecorative-Regular-lf-ly1
+ <-> ssub * CinzelDecorative-LF/regular/n
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LY1}{CinzelDecorative-LF}{b}{n}{
+ <-> ssub * CinzelDecorative-LF/bold/n
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{LY1}{CinzelDecorative-LF}{eb}{n}{
+ <-> ssub * CinzelDecorative-LF/black/n
}{}
\DeclareFontShape{LY1}{CinzelDecorative-LF}{bx}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cinzel/OT1Cinzel-LF.fd new/tex/latex/cinzel/OT1Cinzel-LF.fd
--- old/tex/latex/cinzel/OT1Cinzel-LF.fd 2014-06-25 17:18:47.000000000 +0200
+++ new/tex/latex/cinzel/OT1Cinzel-LF.fd 2019-10-15 23:49:22.000000000 +0200
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/24
+%% Generated by autoinst on 2019/10/15
%%
\ProvidesFile{OT1Cinzel-LF.fd}
- [2014/05/24 (autoinst) Font definitions for OT1/Cinzel-LF.]
+ [2019/10/15 (autoinst) Font definitions for OT1/Cinzel-LF.]
\expandafter\ifx\csname Cinzel@scale\endcsname\relax
\let\Cinzel@@scale\@empty
@@ -11,16 +11,49 @@
\DeclareFontFamily{OT1}{Cinzel-LF}{}
-\DeclareFontShape{OT1}{Cinzel-LF}{k}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{Cinzel-LF}{regular}{n}{
+ <-> \Cinzel@@scale Cinzel-Regular-lf-ot1
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{OT1}{Cinzel-LF}{black}{n}{
<-> \Cinzel@@scale Cinzel-Black-lf-ot1
}{}
-\DeclareFontShape{OT1}{Cinzel-LF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{Cinzel-LF}{bold}{n}{
<-> \Cinzel@@scale Cinzel-Bold-lf-ot1
}{}
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
\DeclareFontShape{OT1}{Cinzel-LF}{m}{n}{
- <-> \Cinzel@@scale Cinzel-Regular-lf-ot1
+ <-> ssub * Cinzel-LF/regular/n
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{OT1}{Cinzel-LF}{b}{n}{
+ <-> ssub * Cinzel-LF/bold/n
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{OT1}{Cinzel-LF}{eb}{n}{
+ <-> ssub * Cinzel-LF/black/n
}{}
\DeclareFontShape{OT1}{Cinzel-LF}{bx}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cinzel/OT1CinzelDecorative-LF.fd new/tex/latex/cinzel/OT1CinzelDecorative-LF.fd
--- old/tex/latex/cinzel/OT1CinzelDecorative-LF.fd 2014-06-25 17:18:47.000000000 +0200
+++ new/tex/latex/cinzel/OT1CinzelDecorative-LF.fd 2019-10-15 23:49:22.000000000 +0200
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/24
+%% Generated by autoinst on 2019/10/15
%%
\ProvidesFile{OT1CinzelDecorative-LF.fd}
- [2014/05/24 (autoinst) Font definitions for OT1/CinzelDecorative-LF.]
+ [2019/10/15 (autoinst) Font definitions for OT1/CinzelDecorative-LF.]
\expandafter\ifx\csname CinzelDecorative@scale\endcsname\relax
\let\CinzelDecorative@@scale\@empty
@@ -11,16 +11,49 @@
\DeclareFontFamily{OT1}{CinzelDecorative-LF}{}
-\DeclareFontShape{OT1}{CinzelDecorative-LF}{k}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{CinzelDecorative-LF}{regular}{n}{
+ <-> \CinzelDecorative@@scale CinzelDecorative-Regular-lf-ot1
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{OT1}{CinzelDecorative-LF}{black}{n}{
<-> \CinzelDecorative@@scale CinzelDecorative-Black-lf-ot1
}{}
-\DeclareFontShape{OT1}{CinzelDecorative-LF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{CinzelDecorative-LF}{bold}{n}{
<-> \CinzelDecorative@@scale CinzelDecorative-Bold-lf-ot1
}{}
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
\DeclareFontShape{OT1}{CinzelDecorative-LF}{m}{n}{
- <-> \CinzelDecorative@@scale CinzelDecorative-Regular-lf-ot1
+ <-> ssub * CinzelDecorative-LF/regular/n
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{OT1}{CinzelDecorative-LF}{b}{n}{
+ <-> ssub * CinzelDecorative-LF/bold/n
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{OT1}{CinzelDecorative-LF}{eb}{n}{
+ <-> ssub * CinzelDecorative-LF/black/n
}{}
\DeclareFontShape{OT1}{CinzelDecorative-LF}{bx}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cinzel/T1Cinzel-LF.fd new/tex/latex/cinzel/T1Cinzel-LF.fd
--- old/tex/latex/cinzel/T1Cinzel-LF.fd 2014-06-25 17:18:47.000000000 +0200
+++ new/tex/latex/cinzel/T1Cinzel-LF.fd 2019-10-15 23:49:22.000000000 +0200
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/24
+%% Generated by autoinst on 2019/10/15
%%
\ProvidesFile{T1Cinzel-LF.fd}
- [2014/05/24 (autoinst) Font definitions for T1/Cinzel-LF.]
+ [2019/10/15 (autoinst) Font definitions for T1/Cinzel-LF.]
\expandafter\ifx\csname Cinzel@scale\endcsname\relax
\let\Cinzel@@scale\@empty
@@ -11,16 +11,49 @@
\DeclareFontFamily{T1}{Cinzel-LF}{}
-\DeclareFontShape{T1}{Cinzel-LF}{k}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{Cinzel-LF}{regular}{n}{
+ <-> \Cinzel@@scale Cinzel-Regular-lf-t1
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{T1}{Cinzel-LF}{black}{n}{
<-> \Cinzel@@scale Cinzel-Black-lf-t1
}{}
-\DeclareFontShape{T1}{Cinzel-LF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{Cinzel-LF}{bold}{n}{
<-> \Cinzel@@scale Cinzel-Bold-lf-t1
}{}
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
\DeclareFontShape{T1}{Cinzel-LF}{m}{n}{
- <-> \Cinzel@@scale Cinzel-Regular-lf-t1
+ <-> ssub * Cinzel-LF/regular/n
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{T1}{Cinzel-LF}{b}{n}{
+ <-> ssub * Cinzel-LF/bold/n
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{T1}{Cinzel-LF}{eb}{n}{
+ <-> ssub * Cinzel-LF/black/n
}{}
\DeclareFontShape{T1}{Cinzel-LF}{bx}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cinzel/T1CinzelDecorative-LF.fd new/tex/latex/cinzel/T1CinzelDecorative-LF.fd
--- old/tex/latex/cinzel/T1CinzelDecorative-LF.fd 2014-06-25 17:18:47.000000000 +0200
+++ new/tex/latex/cinzel/T1CinzelDecorative-LF.fd 2019-10-15 23:49:22.000000000 +0200
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/24
+%% Generated by autoinst on 2019/10/15
%%
\ProvidesFile{T1CinzelDecorative-LF.fd}
- [2014/05/24 (autoinst) Font definitions for T1/CinzelDecorative-LF.]
+ [2019/10/15 (autoinst) Font definitions for T1/CinzelDecorative-LF.]
\expandafter\ifx\csname CinzelDecorative@scale\endcsname\relax
\let\CinzelDecorative@@scale\@empty
@@ -11,16 +11,49 @@
\DeclareFontFamily{T1}{CinzelDecorative-LF}{}
-\DeclareFontShape{T1}{CinzelDecorative-LF}{k}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{CinzelDecorative-LF}{regular}{n}{
+ <-> \CinzelDecorative@@scale CinzelDecorative-Regular-lf-t1
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{T1}{CinzelDecorative-LF}{black}{n}{
<-> \CinzelDecorative@@scale CinzelDecorative-Black-lf-t1
}{}
-\DeclareFontShape{T1}{CinzelDecorative-LF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{CinzelDecorative-LF}{bold}{n}{
<-> \CinzelDecorative@@scale CinzelDecorative-Bold-lf-t1
}{}
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
\DeclareFontShape{T1}{CinzelDecorative-LF}{m}{n}{
- <-> \CinzelDecorative@@scale CinzelDecorative-Regular-lf-t1
+ <-> ssub * CinzelDecorative-LF/regular/n
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{T1}{CinzelDecorative-LF}{b}{n}{
+ <-> ssub * CinzelDecorative-LF/bold/n
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{T1}{CinzelDecorative-LF}{eb}{n}{
+ <-> ssub * CinzelDecorative-LF/black/n
}{}
\DeclareFontShape{T1}{CinzelDecorative-LF}{bx}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cinzel/TS1Cinzel-LF.fd new/tex/latex/cinzel/TS1Cinzel-LF.fd
--- old/tex/latex/cinzel/TS1Cinzel-LF.fd 2014-06-25 17:18:47.000000000 +0200
+++ new/tex/latex/cinzel/TS1Cinzel-LF.fd 2019-10-15 23:49:22.000000000 +0200
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/24
+%% Generated by autoinst on 2019/10/15
%%
\ProvidesFile{TS1Cinzel-LF.fd}
- [2014/05/24 (autoinst) Font definitions for TS1/Cinzel-LF.]
+ [2019/10/15 (autoinst) Font definitions for TS1/Cinzel-LF.]
\expandafter\ifx\csname Cinzel@scale\endcsname\relax
\let\Cinzel@@scale\@empty
@@ -11,16 +11,49 @@
\DeclareFontFamily{TS1}{Cinzel-LF}{}
-\DeclareFontShape{TS1}{Cinzel-LF}{k}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{TS1}{Cinzel-LF}{regular}{n}{
+ <-> \Cinzel@@scale Cinzel-Regular-lf-ts1
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{TS1}{Cinzel-LF}{black}{n}{
<-> \Cinzel@@scale Cinzel-Black-lf-ts1
}{}
-\DeclareFontShape{TS1}{Cinzel-LF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{TS1}{Cinzel-LF}{bold}{n}{
<-> \Cinzel@@scale Cinzel-Bold-lf-ts1
}{}
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
\DeclareFontShape{TS1}{Cinzel-LF}{m}{n}{
- <-> \Cinzel@@scale Cinzel-Regular-lf-ts1
+ <-> ssub * Cinzel-LF/regular/n
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{TS1}{Cinzel-LF}{b}{n}{
+ <-> ssub * Cinzel-LF/bold/n
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{TS1}{Cinzel-LF}{eb}{n}{
+ <-> ssub * Cinzel-LF/black/n
}{}
\DeclareFontShape{TS1}{Cinzel-LF}{bx}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cinzel/TS1CinzelDecorative-LF.fd new/tex/latex/cinzel/TS1CinzelDecorative-LF.fd
--- old/tex/latex/cinzel/TS1CinzelDecorative-LF.fd 2014-06-25 17:18:47.000000000 +0200
+++ new/tex/latex/cinzel/TS1CinzelDecorative-LF.fd 2019-10-15 23:49:22.000000000 +0200
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/05/24
+%% Generated by autoinst on 2019/10/15
%%
\ProvidesFile{TS1CinzelDecorative-LF.fd}
- [2014/05/24 (autoinst) Font definitions for TS1/CinzelDecorative-LF.]
+ [2019/10/15 (autoinst) Font definitions for TS1/CinzelDecorative-LF.]
\expandafter\ifx\csname CinzelDecorative@scale\endcsname\relax
\let\CinzelDecorative@@scale\@empty
@@ -11,16 +11,49 @@
\DeclareFontFamily{TS1}{CinzelDecorative-LF}{}
-\DeclareFontShape{TS1}{CinzelDecorative-LF}{k}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{TS1}{CinzelDecorative-LF}{regular}{n}{
+ <-> \CinzelDecorative@@scale CinzelDecorative-Regular-lf-ts1
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{TS1}{CinzelDecorative-LF}{black}{n}{
<-> \CinzelDecorative@@scale CinzelDecorative-Black-lf-ts1
}{}
-\DeclareFontShape{TS1}{CinzelDecorative-LF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{TS1}{CinzelDecorative-LF}{bold}{n}{
<-> \CinzelDecorative@@scale CinzelDecorative-Bold-lf-ts1
}{}
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% m --> regular
+
\DeclareFontShape{TS1}{CinzelDecorative-LF}{m}{n}{
- <-> \CinzelDecorative@@scale CinzelDecorative-Regular-lf-ts1
+ <-> ssub * CinzelDecorative-LF/regular/n
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{TS1}{CinzelDecorative-LF}{b}{n}{
+ <-> ssub * CinzelDecorative-LF/bold/n
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{TS1}{CinzelDecorative-LF}{eb}{n}{
+ <-> ssub * CinzelDecorative-LF/black/n
}{}
\DeclareFontShape{TS1}{CinzelDecorative-LF}{bx}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cinzel/cinzel.sty new/tex/latex/cinzel/cinzel.sty
--- old/tex/latex/cinzel/cinzel.sty 2014-06-25 17:18:47.000000000 +0200
+++ new/tex/latex/cinzel/cinzel.sty 2019-10-15 23:49:22.000000000 +0200
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{cinzel}
- [2014/05/24 (Bob Tennent) Supports Cinzel and CinzelDecorative for all LaTeX engines.]
+ [2019/10/15 (Bob Tennent) Supports Cinzel and CinzelDecorative for all LaTeX engines.]
\RequirePackage{ifxetex,ifluatex,xkeyval,textcomp}
@@ -14,9 +14,11 @@
\fi\fi
\newif\ifcinzel@black \cinzel@blackfalse
+\newif\ifcinzel@default \cinzel@defaultfalse
\DeclareOptionX{type1}{\cinzel@ttffalse}
\DeclareOptionX{black}{\cinzel@blacktrue}
+\DeclareOptionX{default}{\cinzel@defaulttrue}
\ProcessOptionsX\relax
\ifcinzel@ttf
@@ -25,7 +27,7 @@
\else % type1
\def\bfseries@rm{b}
- \ifcinzel@black\def\bfseries@rm{k}\fi
+ \ifcinzel@black\def\bfseries@rm{eb}\fi
\fi
@@ -41,12 +43,14 @@
\defaultfontfeatures{
Ligatures = TeX ,
Extension = .ttf }
- \setmainfont
+ \ifcinzel@default
+ \setmainfont
[ UprightFont = *-Regular ,
ItalicFont = *Decorative-Regular ,
BoldFont = *-\cinzel@boldstyle ,
BoldItalicFont = *Decorative-\cinzel@boldstyle ]
{Cinzel}
+ \fi
\newfontfamily\cinzel
[ UprightFont = *-Regular ,
ItalicFont = *Decorative-Regular ,
@@ -60,13 +64,24 @@
\else % type1
\def\cinzelfamily{Cinzel-LF}
- \newcommand*\cinzel{\fontfamily{\cinzelfamily}\def\itshape{\fontfamily{CinzelDecorative-LF}\fontshape{n}\selectfont}\selectfont}
- \def\rmdefault{\cinzelfamily}
- \def\itshape{\fontfamily{CinzelDecorative-LF}\fontshape{n}\selectfont}
- \newcommand*\cinzelblack{\fontfamily{\cinzelfamily}\fontseries{k}\def\itshape{\fontfamily{CinzelDecorative-LF}\fontshape{n}\selectfont}\selectfont}
+ \newcommand*\cinzel{%
+ \fontfamily{\cinzelfamily}\selectfont
+ \def\itshape{\ifx\f@family\cinzelfamily\fontfamily{CinzelDecorative-LF}\fontshape{n}\else\fontshape{\itdefault}\fi\selectfont}
+ }
+ \ifcinzel@default
+ \def\rmdefault{\cinzelfamily}
+ \def\itshape{\ifx\f@family\cinzelfamily\fontfamily{CinzelDecorative-LF}\fontshape{n}\else\fontshape{\itdefault}\fi\selectfont}
+ \fi
+ \newcommand*\cinzelblack{%
+ \fontfamily{\cinzelfamily}\fontseries{eb}\selectfont
+ \def\itshape{\ifx\f@family\cinzelfamily\fontfamily{CinzelDecorative-LF}\fontseries{eb}\else\fontshape{\itdefault}\fi\selectfont}
+ }
\fi
+\DeclareTextFontCommand{\textcinzel}{\cinzel}
+\DeclareTextFontCommand{\textcinzelblack}{\cinzelblack}
+
\ifcinzel@ttf
% turn off defaults in case other fonts are selected:
\defaultfontfeatures{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cinzel.tlpobj new/tlpkg/tlpobj/cinzel.tlpobj
--- old/tlpkg/tlpobj/cinzel.tlpobj 2019-02-28 03:25:36.000000000 +0100
+++ new/tlpkg/tlpobj/cinzel.tlpobj 2020-03-24 01:56:44.000000000 +0100
@@ -1,6 +1,6 @@
name cinzel
category Package
-revision 34408
+revision 54512
shortdesc LaTeX support for Cinzel and Cinzel Decorative fonts
relocated 1
longdesc Cinzel and Cinzel Decorative fonts, designed by Natanael Gama
@@ -101,6 +101,5 @@
RELOC/tex/latex/cinzel/cinzel.sty
catalogue-contact-home http://ndiscovered.com
catalogue-ctan /fonts/cinzel
-catalogue-date 2018-01-03 05:10:13 +0100
-catalogue-license ofl
-catalogue-topics font font-decor font-type1 font-ttf
+catalogue-license ofl lppl
+catalogue-topics font font-decor font-type1 font-ttf font-supp font-t1enc
++++++ circuitikz.doc.tar.xz ++++++
++++ 8541 lines of diff (skipped)
++++++ circuitikz.tar.xz ++++++
++++ 192707 lines of diff (skipped)
++++++ cjk-gs-integrate.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog new/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog
--- old/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog 2019-03-03 23:13:02.000000000 +0100
+++ new/texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog 2020-03-07 22:39:27.000000000 +0100
@@ -1,10 +1,186 @@
+2020-03-07 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * Release 20200307.0 (HEAD -> master) [57531f5]
+
+2020-03-07 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * cjk-gs-integrate-macos.pl: support Catalina (at least nothing is wrong) (origin/master, origin/HEAD) [d43852e]
+
+2020-03-07 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * don't check PSName even in --strict-psname mode if false e.g. STKaiti-Adobe-CNS1 has intentionally wrong PSName in database. [be79554]
+
+2020-03-07 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * fix database for MalgunGothic (#28) [bccb1a5]
+
+2020-03-07 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * comment [8f64741]
+
+2020-03-07 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * improve hidden debug option --strict-psname [c037fe3]
+
+2020-03-07 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * typo in warning [53d0a58]
+
+2020-03-07 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * don't add symlinking AI0 CMaps when real fonts are unavailable [5ce4c52]
+
+2020-03-07 Masamichi Hosoda <trueroad(a)trueroad.jp>
+
+ * Add search_cmap (trueroad/add-kpsewhich-cmap-cache) [b0b0b09]
+
+2020-03-07 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * 'CMap:' entry is unsupported for class other than AI0 (trueroad/master) [f499f39]
+
+2020-03-05 Masamichi Hosoda <trueroad(a)trueroad.jp>
+
+ * Add warning when AI0 is specified for non-OTF (trueroad/add-ai0-cmap) [0d8bceb]
+
+2020-03-05 Masamichi Hosoda <trueroad(a)trueroad.jp>
+
+ * Add AI0 font alias handling [37a8f77]
+
+2020-03-03 Masamichi Hosoda <trueroad(a)trueroad.jp>
+
+ * Add CMap parameters to the database for sourcehan [adac7e5]
+
+2020-03-03 Masamichi Hosoda <trueroad(a)trueroad.jp>
+
+ * Change the class of AI0 fonts to AI0 in the database [9a47a63]
+
+2020-03-03 Masamichi Hosoda <trueroad(a)trueroad.jp>
+
+ * Add database class AI0 and parameter CMap for AI0 fonts [96b7811]
+
+2020-03-05 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * HaranoAji -> J70 [e29c9a2]
+
+2020-03-05 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * Merge remote-tracking branch 'trueroad/add-haranoaji-alias' [7c68c9e]
+
+2020-03-05 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * reduce kpsewhich call [c8f9877]
+
+2020-03-04 Masamichi Hosoda <trueroad(a)trueroad.jp>
+
+ * Add removing CMap files when `--remove` option (trueroad/add-symlinking-cmaps) [534e4de]
+
+2020-03-04 Masamichi Hosoda <trueroad(a)trueroad.jp>
+
+ * Add symlinking CMap files used by created snippets [a354a37]
+
+2020-03-03 Masamichi Hosoda <trueroad(a)trueroad.jp>
+
+ * Add haranoaji for aliases (trueroad/add-haranoaji-alias) [78a8a63]
+
+2020-01-15 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * more info on debug message [9bf9f64]
+
+2020-01-15 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * Release 20200115.0 (tag: 20200115.0) [2eba287]
+
+2020-01-15 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * copyright year [ec0590e]
+
+2020-01-14 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * fix for incompatible change in msgothic.ttc index [14485c6]
+
+2019-11-09 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * add haranoaji database (see texjporg/jfontmaps#23) [091e829]
+
+2019-10-11 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * prioritize database/ dir in current [ed62e0e]
+
+2019-10-11 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * cjk-gs-integrate.pl: support macOS 10.15 Catalina font path (wip) [d870a3f]
+
+2019-09-05 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * YuMincho-DemiBold -> YuMincho-Demibold [e819473]
+
+2019-09-04 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * Makefile: also install zrlistttc.lua [c03fe55]
+
+2019-09-04 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * cjkgs-microsoft.dat: fix typo of HGPMinchoE [6e2de8c]
+
+2019-09-04 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * code cleanup [840be09]
+
+2019-09-04 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * use local zrlistttc.lua [3216bf6]
+
+2019-09-04 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * zrlistttc.lua: licensed under MIT license [b4f072c]
+
+2019-09-04 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * zrlistttc.lua: add -i option, support macOS-TrueType (v0.4) [bda3126]
+
+2019-09-04 Takayuki YATO <tak_yato(a)yahoo.co.jp>
+
+ * First public version of zrlistttc.lua (v0.2) [6bd8986]
+
+2019-09-01 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * use zrlistttc.lua for checking PSName (preliminary) [789ba5b]
+
+2019-08-16 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * Release 20190816.0 (tag: 20190816.0) [089a440]
+
+2019-08-16 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * gs-9.27 doesn't like snippets for TTF/TTC it seems gs-9.25 and gs-9.26 does not require snippets for TTF/TTC so it will be safe enough [22bc208]
+
+2019-05-22 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * mention requirement of kpsewhich in help message [fd6f3d2]
+
+2019-05-19 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * make sure CR is stripped [2120e9f]
+
+2019-05-19 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * \/dev\/null -> $nul [1145435]
+
+2019-05-19 Norbert Preining <norbert(a)preining.info>
+
+ * test for kpsewhich (Issue: #33) [68ae7ce]
+
+2019-04-06 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
+
+ * Add info for latest BIZ-UD fonts [ce8d802]
+
2019-03-03 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
- * Release 20190303.0 (HEAD -> master) [131b0f4]
+ * Release 20190303.0 (tag: 20190303.0) [131b0f4]
2019-03-03 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
- * copyright year (origin/master, origin/HEAD) [0732219]
+ * copyright year [0732219]
2019-03-03 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
@@ -140,7 +316,7 @@
2018-02-15 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
- * don't discard when otfinfo exits with non-zero (origin/otfinfo-rewrite, otfinfo-rewrite) [9e630e3]
+ * don't discard when otfinfo exits with non-zero [9e630e3]
2018-02-15 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
@@ -496,7 +672,7 @@
2017-06-20 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
- * NTFS symlink on win32 has file size = 0, we can distinguish it (origin/cleanup) [ab9b543]
+ * NTFS symlink on win32 has file size = 0, we can distinguish it [ab9b543]
2017-06-20 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
@@ -588,7 +764,7 @@
2017-05-05 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
- * fix a mistake, adjust help message for search path (origin/win32-support, aminophen/win32-support) [8fd2c88]
+ * fix a mistake, adjust help message for search path (aminophen/win32-support) [8fd2c88]
2017-05-02 Hironobu Yamashita <h.y.acetaminophen(a)gmail.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/fonts/cjk-gs-integrate/README.md new/texmf-dist/doc/fonts/cjk-gs-integrate/README.md
--- old/texmf-dist/doc/fonts/cjk-gs-integrate/README.md 2018-03-06 23:52:16.000000000 +0100
+++ new/texmf-dist/doc/fonts/cjk-gs-integrate/README.md 2020-03-07 22:39:27.000000000 +0100
@@ -5,6 +5,9 @@
them available to an installed Ghostscript. In the simplest case with
sufficient privileges, a run without arguments should effect in a
complete setup of Ghostscript.
+Search is done using the kpathsea library, in particular `kpsewhich`
+program. To run this script, you will need some TeX distribution in
+your system.
Usage
-----
@@ -188,6 +191,7 @@
For the Japanese fonts:
Morisawa Pr6N, Morisawa, Hiragino ProN, Hiragino,
Kozuka Pr6N, Kozuka ProVI, Kozuka Pro, Kozuka Std,
+ HaranoAji,
Yu OS X, Yu Win, MS,
Moga-Mobo-ex, Moga-Mobo, IPAex, IPA, Ume
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cjk-gs-integrate.doc.tlpobj new/tlpkg/tlpobj/cjk-gs-integrate.doc.tlpobj
--- old/tlpkg/tlpobj/cjk-gs-integrate.doc.tlpobj 2019-03-04 02:24:04.000000000 +0100
+++ new/tlpkg/tlpobj/cjk-gs-integrate.doc.tlpobj 2020-03-08 01:33:31.000000000 +0100
@@ -1,7 +1,7 @@
name cjk-gs-integrate.doc
category Package
-revision 50214
+revision 54155
shortdesc doc files of cjk-gs-integrate
-docfiles size=13
+docfiles size=15
texmf-dist/doc/fonts/cjk-gs-integrate/ChangeLog
texmf-dist/doc/fonts/cjk-gs-integrate/README.md
++++++ cjk-gs-integrate.tar.xz ++++++
++++ 2053 lines of diff (skipped)
++++++ cjkutils.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/bg5conv.man1.pdf and new/texmf-dist/doc/man/man1/bg5conv.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/cef5conv.man1.pdf and new/texmf-dist/doc/man/man1/cef5conv.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/cefconv.man1.pdf and new/texmf-dist/doc/man/man1/cefconv.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/cefsconv.man1.pdf and new/texmf-dist/doc/man/man1/cefsconv.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/extconv.man1.pdf and new/texmf-dist/doc/man/man1/extconv.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/hbf2gf.man1.pdf and new/texmf-dist/doc/man/man1/hbf2gf.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/sjisconv.man1.pdf and new/texmf-dist/doc/man/man1/sjisconv.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cjkutils.doc.tlpobj new/tlpkg/tlpobj/cjkutils.doc.tlpobj
--- old/tlpkg/tlpobj/cjkutils.doc.tlpobj 2019-03-27 02:24:03.000000000 +0100
+++ new/tlpkg/tlpobj/cjkutils.doc.tlpobj 2019-11-19 01:55:39.000000000 +0100
@@ -1,6 +1,6 @@
name cjkutils.doc
category TLCore
-revision 50602
+revision 52851
shortdesc doc files of cjkutils
docfiles size=55
texmf-dist/doc/man/man1/bg5conv.1
++++++ cjkutils.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cjkutils.tlpobj new/tlpkg/tlpobj/cjkutils.tlpobj
--- old/tlpkg/tlpobj/cjkutils.tlpobj 2019-03-27 02:24:03.000000000 +0100
+++ new/tlpkg/tlpobj/cjkutils.tlpobj 2019-11-19 01:55:39.000000000 +0100
@@ -1,6 +1,6 @@
name cjkutils
category TLCore
-revision 50602
+revision 52851
catalogue cjk
shortdesc CJK language support
longdesc CJK is a macro package for LaTeX, providing simultaneous
++++++ classics.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/classics/README new/doc/latex/classics/README
--- old/doc/latex/classics/README 2013-02-03 23:52:46.000000000 +0100
+++ new/doc/latex/classics/README 2020-02-04 23:16:32.000000000 +0100
@@ -1,9 +1,13 @@
Package: classics
Description: Cite classic works
-This package provides a basic framework to cite classic works in accordance
-with traditional pagination systems. It can also be used in conjunction with
-other citation packages.
+The package provides a basic framework to cite classic works (from authors such
+as Homer, Plato, Aristotle, Descartes, Hume, and Kant) in accordance with
+traditional pagination systems. It may be used in conjunction with other
+citation packages.
+
+2020/02/03 v0.1a
+ * replaced \str_if_eq_x_p:nn with \str_if_eq_p:ee
2013/02/02 v0.1
Initial version
@@ -20,7 +24,7 @@
*See classics.pdf
--------------------------------------------------------------------------------
-Copyright (C) 2013 Eduardo C. Lourenço de Lima
+Copyright (C) 2020 Eduardo C. Lourenço de Lima
This material is subject to the LaTeX Project Public License. See
http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
Binary files old/doc/latex/classics/classics.pdf and new/doc/latex/classics/classics.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/classics/classics.tex new/doc/latex/classics/classics.tex
--- old/doc/latex/classics/classics.tex 2013-02-03 23:52:46.000000000 +0100
+++ new/doc/latex/classics/classics.tex 2020-02-04 23:16:32.000000000 +0100
@@ -1,4 +1,4 @@
-% Copyright (C) 2013 Eduardo C. Lourenço de Lima
+% Copyright (C) 2020 Eduardo C. Lourenço de Lima
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -11,8 +11,8 @@
% version 2005/12/01 or later.
\documentclass{ltxdoc}
-\newcommand\fileversion{0.1}
-\newcommand\filedate{February 2, 2013}
+\newcommand\fileversion{0.1a}
+\newcommand\filedate{February 3, 2020}
\usepackage{color}
\usepackage{classics}
@@ -44,7 +44,7 @@
\begin{document}
\title{The \textsf{\color{myblue} classics} package,\thanks{This document
corresponds to \textsf{classics}~\fileversion, dated~\filedate. I am grateful
-to Joseph Wright and Scott \mbox{H.} for suggestions.}\\{or the end of
+to Joseph Wright, Scott \mbox{H.}, and Robert Alessi for suggestions.}\\{or the end of
anachronism}}
\author{Eduardo C. Louren\c{c}o de Lima \\ \texttt{elourenco(a)phi.pro.br}}
\maketitle
@@ -52,7 +52,7 @@
\begin{abstract}\noindent This package provides a basic framework to
cite classic works in accordance with traditional pagination systems.
- It can also be used in conjunction with other citation
+ It may be used in conjunction with other citation
packages.\end{abstract}
\section*{Introduction}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/classics.doc.tlpobj new/tlpkg/tlpobj/classics.doc.tlpobj
--- old/tlpkg/tlpobj/classics.doc.tlpobj 2019-02-28 03:25:48.000000000 +0100
+++ new/tlpkg/tlpobj/classics.doc.tlpobj 2020-02-05 01:54:52.000000000 +0100
@@ -1,6 +1,6 @@
name classics.doc
category Package
-revision 29018
+revision 53671
shortdesc doc files of classics
relocated 1
docfiles size=55
++++++ classics.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/classics/classics.sty new/tex/latex/classics/classics.sty
--- old/tex/latex/classics/classics.sty 2013-02-03 23:52:46.000000000 +0100
+++ new/tex/latex/classics/classics.sty 2020-02-04 23:16:32.000000000 +0100
@@ -1,4 +1,4 @@
-%% Copyright (C) 2013 Eduardo C. Lourenço de Lima
+%% Copyright (C) 2020 Eduardo C. Lourenço de Lima
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -13,7 +13,7 @@
%\NeedsTeXFormat{LaTeX2e}[1996/06/01]
\RequirePackage{expl3}
\RequirePackage{xparse}
-\ProvidesExplPackage {classics} {2013/02/02} {0.1} {Cite classic works}
+\ProvidesExplPackage {classics} {2020/02/03} {0.1a} {Cite classic works}
\tl_new:N \g_classics_style_range_separator_tl
\tl_new:N \g_classics_style_separator_tl
@@ -54,7 +54,7 @@
}
%Range: Typeset page when last page is provided only if they differ
- \bool_if:nTF { (! #1) && \str_if_eq_x_p:nn{##2}{##4} }
+ \bool_if:nTF { (! #1) && \str_if_eq_p:ee{##2}{##4} }
{
\classics_style_map:nnnnnnn{#3} {} {##5}{##6}{##7}{##8}{##9}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/classics.tlpobj new/tlpkg/tlpobj/classics.tlpobj
--- old/tlpkg/tlpobj/classics.tlpobj 2019-02-28 03:25:48.000000000 +0100
+++ new/tlpkg/tlpobj/classics.tlpobj 2020-02-05 01:54:52.000000000 +0100
@@ -1,6 +1,6 @@
name classics
category Package
-revision 29018
+revision 53671
shortdesc Cite classic works
relocated 1
longdesc The package provides a basic framework to cite classic works
@@ -11,7 +11,6 @@
runfiles size=1
RELOC/tex/latex/classics/classics.sty
catalogue-ctan /macros/latex/contrib/classics
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
-catalogue-topics humanities cite-supp
-catalogue-version 0.1
+catalogue-topics humanities cite-supp expl3
+catalogue-version 0.1a
++++++ cleanthesis.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/CHANGELOG.md new/doc/latex/cleanthesis/CHANGELOG.md
--- old/doc/latex/cleanthesis/CHANGELOG.md 2015-08-28 00:02:35.000000000 +0200
+++ new/doc/latex/cleanthesis/CHANGELOG.md 2019-06-26 22:40:49.000000000 +0200
@@ -1,7 +1,7 @@
---
CHANGELOG.md
-Copyright 2015 R. Langner
+Copyright 2019 R. Langner
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -27,6 +27,19 @@
## Latest Dev
- ...
+## v0.4.0
+- Fixed compatibility to new version of KOMA script
+- Fixed code for headline/title styles (e.g., removed use of package titlesec)
+- Fixed code for footer style (e.g., removed use of package fancyhdr)
+- Fixed compatibility to new version of biblatex (e.g., obsolete options)
+- Fixed an issue with page breaks at headings (thanks @guillerodriguez)
+- Added style for part sections (often used for books)
+- Added new package options: quotation style, bibliography sorting,
+- Changed alignment of titles from justified to left aligned
+- Changed the documentation according the updates
+- Changed file structure of the repository in order to improve the development and release process
+- Example: several improvements, such as location of appendix, use of subsubsections and paragraphs, long section titles, listings, pdf bookmark for toc, or separate config file
+
## v0.3.1
- re-licensed cleanthesis using the LPPL 1.3, http://www.latex-project.org/lppl.txt
- moved documentation into a separate subfolder (doc/)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/MANIFEST.md new/doc/latex/cleanthesis/MANIFEST.md
--- old/doc/latex/cleanthesis/MANIFEST.md 2015-08-28 00:02:35.000000000 +0200
+++ new/doc/latex/cleanthesis/MANIFEST.md 2019-06-26 22:40:49.000000000 +0200
@@ -1,7 +1,7 @@
---
MANIFEST.md
-Copyright 2015 R. Langner
+Copyright 2019 R. Langner
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -27,6 +27,7 @@
|-- cleanthesis.sty - the cleanthesis style
|-- MANIFEST.md - this file
|-- README.md - readme file
+|-- VERSION - the version of the style
|-- doc/
|-- cleanthesis-doc.tex - documentation source
|-- cleanthesis-doc.pdf - generated documentation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/README.md new/doc/latex/cleanthesis/README.md
--- old/doc/latex/cleanthesis/README.md 2015-08-28 00:02:35.000000000 +0200
+++ new/doc/latex/cleanthesis/README.md 2019-06-26 22:40:49.000000000 +0200
@@ -1,7 +1,15 @@
# Clean Thesis
-*-- A LaTeX Style for Thesis Documents --*
+*-- A Clean LaTeX Style for Thesis Documents --*
-## Readme:
+## Table of contents
+
+* [About](#about)
+* [Getting started](#getting-started)
+* [Documentation and Support](#documentation-and-support)
+* [Contributing](#contributing)
+* [License Information](#license-information)
+
+## About
**Clean, Simple, Elegant**
*Clean Thesis* is a LaTeX style for thesis documents, developed for my diploma thesis (Diplomarbeit). The style can be understood as my personal compromise â a typical clean looking scientific document combined and polished with minor beautifications.
@@ -11,15 +19,32 @@
Note: If you are looking for an exact and correct style regarding typographic rules, please have a look at the "[Classic Thesis Style](see http://www.miede.de/#classicthesis)".
**Donation = Postcard**
-Based on the idea of André Miede: If you like the *Clean Thesis* style I would be very pleased about a donation in the form of a POSTCARD. You can find my address at the *Clean Thesis* [website](http://cleanthesis.der-ric.de/) as well as in the [documentation](Clean-Thesis.pdf). I am going to collect all postcards and exhibit them at the website I mentioned.
+Based on the idea of André Miede: If you like the *Clean Thesis* style I would be very pleased about a donation in the form of a POSTCARD. You can find my address at the *Clean Thesis* [website](http://cleanthesis.der-ric.de/) as well as in the [documentation](doc/cleanthesis-doc.pdf). I am going to collect all postcards and exhibit them at the website I mentioned.
**Idea and Inspiration**
-The idea of providing my customized style for thesis documents passed through my mind while writing my own thesis. Motivated and inspired by the superb "[Classic Thesis Style](see http://www.miede.de/#classicthesis)" by André Miede (thanks to André for doing a great job) I decided to collect all design and style related functionality in a separate LaTeX style and provide this style to other thesis writers.
+The idea of providing my customized style for thesis documents passed through my mind while writing my own thesis. Motivated and inspired by the superb "[Classic Thesis Style](http://www.miede.de/#classicthesis)" by André Miede (thanks to André for doing a great job) I decided to collect all design and style related functionality in a separate LaTeX style and provide this style to other thesis writers.
+
+## Getting started
+
+* Make sure you have an up-to-date TeX distribution
+* Download the latest [release](https://github.com/derric/cleanthesis/releases) or clone the repository with `git clone https://github.com/derric/cleanthesis.git`
+* Check out the included [example thesis](my-thesis.tex)
+* [Read the documentation](doc/cleanthesis-doc.pdf) to learn more about *Clean Thesis* and available package options
+
+## Documentation and Support
+
+The [documentation](doc/cleanthesis-doc.pdf) gives an overview of available package options.
+
+Please ask **questions** or start **discussions** about *Clean Thesis* at [Stack Exchange](http://tex.stackexchange.com/questions/tagged/cleanthesis) (tagged [cleanthesis](http://tex.stackexchange.com/questions/tagged/cleanthesis)). GitHub issues are for development purposes, e.g, reporting bugs or requesting new features.
+
+## Contributing
+
+Did you find an error or a bug? Do you have a feature request? Before opening a [new issue](https://github.com/derric/cleanthesis/issues/new), please check out the list of [existing](https://github.com/derric/cleanthesis/issues) and [closed](https://github.com/derric/cleanthesis/issues?q=is%3Aissue+is%3Aclos… issues.
-## License Information:
+## License Information
README.md
-Copyright 2015 R. Langner
+Copyright 2019 R. Langner
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/VERSION new/doc/latex/cleanthesis/VERSION
--- old/doc/latex/cleanthesis/VERSION 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/cleanthesis/VERSION 2019-06-26 22:40:49.000000000 +0200
@@ -0,0 +1 @@
+0.4.0
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/content/abstract.tex new/doc/latex/cleanthesis/content/abstract.tex
--- old/doc/latex/cleanthesis/content/abstract.tex 2015-08-28 00:02:35.000000000 +0200
+++ new/doc/latex/cleanthesis/content/abstract.tex 2019-06-26 22:40:49.000000000 +0200
@@ -1,14 +1,14 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
%
\pdfbookmark[0]{Abstract}{Abstract}
-\chapter*{Abstract}
+\addchap*{Abstract}
\label{sec:abstract}
-\vspace*{-10mm}
\blindtext
\vspace*{20mm}
-{\usekomafont{chapter}Abstract (different language)}\label{sec:abstract-diff} \\
+{\usekomafont{chapter}Abstract (different language)}
+\label{sec:abstract-diff}
\blindtext
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/content/acknowledgement.tex new/doc/latex/cleanthesis/content/acknowledgement.tex
--- old/doc/latex/cleanthesis/content/acknowledgement.tex 2015-08-28 00:02:35.000000000 +0200
+++ new/doc/latex/cleanthesis/content/acknowledgement.tex 2019-06-26 22:40:49.000000000 +0200
@@ -1,8 +1,7 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
%
\pdfbookmark[0]{Acknowledgement}{Acknowledgement}
-\chapter*{Acknowledgement}
+\addchap*{Acknowledgement}
\label{sec:acknowledgement}
-\vspace*{-10mm}
\Blindtext[2][2]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/content/chapter-appendix.tex new/doc/latex/cleanthesis/content/chapter-appendix.tex
--- old/doc/latex/cleanthesis/content/chapter-appendix.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/cleanthesis/content/chapter-appendix.tex 2019-06-26 22:40:49.000000000 +0200
@@ -0,0 +1,40 @@
+% !TEX root = ../my-thesis.tex
+%
+\chapter{Example Appendix}
+\label{sec:appendix}
+
+\Blindtext[1][1]
+
+\section{Appendix Section 1}
+\label{sec:appendix:sec1}
+
+\Blindtext[1][1]
+
+\begin{table}[h]
+ \begin{tabularx}{\textwidth}{X | X | X}
+ %\hline
+ Alpha & Beta & Gamma \\ \hline
+ 0 & 1 & 2 \\ \hline
+ 3 & 4 & 5 \\ %\hline
+ \end{tabularx}
+ \label{tab:table1}
+ \caption{This is a caption text.}
+\end{table}
+
+\section{Appendix Section 2}
+\label{sec:appendix:sec2}
+
+\Blindtext[1][1]
+
+\begin{table}[h]
+ \begin{tabularx}{\textwidth}{X | X | X}
+ %\hline
+ Alpha & Beta & Gamma \\ \hline
+ 0 & 1 & 2 \\ \hline
+ 3 & 4 & 5 \\ %\hline
+ \end{tabularx}
+ \label{tab:table2}
+ \caption{This is a caption text.}
+\end{table}
+
+\Blindtext[1][2]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/content/chapter-concepts.tex new/doc/latex/cleanthesis/content/chapter-concepts.tex
--- old/doc/latex/cleanthesis/content/chapter-concepts.tex 2015-08-28 00:02:35.000000000 +0200
+++ new/doc/latex/cleanthesis/content/chapter-concepts.tex 2019-06-26 22:40:49.000000000 +0200
@@ -1,6 +1,6 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
%
-\chapter{Concepts: This text is here to test a very long title, to simulate the line break behavior, to show that an extremely long tilte also works}
+\chapter{Concepts: This text is here to test a very long title, to simulate the line break behavior, to show that an extremely long title also works}
\label{sec:concepts}
\cleanchapterquote{Users do not care about what is inside the box, as long as the box does what they need done.}{Jef Raskin}{about Human Computer Interfaces}
@@ -12,7 +12,7 @@
\Blindtext[2][2]
-\section{Concepts Section 2}
+\section{Concepts Section 2 with a very very long title that illustrates how long section titles are handled in the footer}
\label{sec:concepts:sec2}
\Blindtext[3][2]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/content/chapter-conclusion.tex new/doc/latex/cleanthesis/content/chapter-conclusion.tex
--- old/doc/latex/cleanthesis/content/chapter-conclusion.tex 2015-08-28 00:02:35.000000000 +0200
+++ new/doc/latex/cleanthesis/content/chapter-conclusion.tex 2019-06-26 22:40:49.000000000 +0200
@@ -1,4 +1,4 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
%
\chapter{Conclusion}
\label{sec:conclusion}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/content/chapter-introduction.tex new/doc/latex/cleanthesis/content/chapter-introduction.tex
--- old/doc/latex/cleanthesis/content/chapter-introduction.tex 2015-08-28 00:02:35.000000000 +0200
+++ new/doc/latex/cleanthesis/content/chapter-introduction.tex 2019-06-26 22:40:49.000000000 +0200
@@ -1,4 +1,4 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
%
\chapter{Introduction}
\label{sec:intro}
@@ -28,7 +28,40 @@
\subsection{Some References}
\label{sec:intro:results:refs}
+
\cite{WEB:GNU:GPL:2010,WEB:Miede:2011}
+\Blindtext[1][1]
+
+\subsubsection{Methodology}
+\label{sec:intro:results:refs:method}
+
+\Blindtext[1][2]
+
+\paragraph{Strategy 1}
+\Blindtext[1][1]
+
+\begin{lstlisting}[language=Python, caption={This simple helloworld.py file prints Hello World.}\label{lst:pyhelloworld}]
+#!/usr/bin/env python
+print "Hello World"
+\end{lstlisting}
+
+\paragraph{Strategy 2}
+\Blindtext[1][1]
+
+\begin{lstlisting}[language=Python, caption={This is a bubble sort function.}\label{lst:pybubblesort}]
+#!/usr/bin/env python
+def bubble_sort(list):
+ for num in range(len(list)-1,0,-1):
+ for i in range(num):
+ if list[i]>list[i+1]:
+ tmp = list[i]
+ list[i] = list[i+1]
+ list[i+1] = tmp
+
+alist = [34,67,2,4,65,16,17,95,20,31]
+bubble_sort(list)
+print(list)
+\end{lstlisting}
\section{Thesis Structure}
\label{sec:intro:structure}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/content/chapter-related-work.tex new/doc/latex/cleanthesis/content/chapter-related-work.tex
--- old/doc/latex/cleanthesis/content/chapter-related-work.tex 2015-08-28 00:02:35.000000000 +0200
+++ new/doc/latex/cleanthesis/content/chapter-related-work.tex 2019-06-26 22:40:49.000000000 +0200
@@ -1,4 +1,4 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
%
\chapter{Related Work}
\label{sec:related}
@@ -7,6 +7,17 @@
\Blindtext[2][1]
+\begin{lstlisting}[language=Java, caption={A simple Hellow World example in Java.}\label{lst:javahelloworld}]
+public class HelloWorld {
+ public static void main ( String[] args ) {
+ // Output Hello World!
+ System.out.println( "Hello World!" );
+ }
+}
+\end{lstlisting}
+
+\Blindtext[1][1]
+
\section{Related Work Section 1}
\label{sec:related:sec1}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/content/chapter-system.tex new/doc/latex/cleanthesis/content/chapter-system.tex
--- old/doc/latex/cleanthesis/content/chapter-system.tex 2015-08-28 00:02:35.000000000 +0200
+++ new/doc/latex/cleanthesis/content/chapter-system.tex 2019-06-26 22:40:49.000000000 +0200
@@ -1,4 +1,4 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
%
\chapter{System}
\label{sec:system}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/content/colophon.tex new/doc/latex/cleanthesis/content/colophon.tex
--- old/doc/latex/cleanthesis/content/colophon.tex 2015-08-28 00:02:35.000000000 +0200
+++ new/doc/latex/cleanthesis/content/colophon.tex 2019-06-26 22:40:49.000000000 +0200
@@ -1,4 +1,4 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
%
\pagestyle{empty}
\hfill
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/content/declaration.tex new/doc/latex/cleanthesis/content/declaration.tex
--- old/doc/latex/cleanthesis/content/declaration.tex 2015-08-28 00:02:35.000000000 +0200
+++ new/doc/latex/cleanthesis/content/declaration.tex 2019-06-26 22:40:49.000000000 +0200
@@ -1,10 +1,10 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
%
%************************************************
% Declaration
%************************************************
\pdfbookmark[0]{Declaration}{Declaration}
-\chapter*{Declaration}
+\addchap{Declaration}
\label{sec:declaration}
\thispagestyle{empty}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/content/titlepages.tex new/doc/latex/cleanthesis/content/titlepages.tex
--- old/doc/latex/cleanthesis/content/titlepages.tex 2015-08-28 00:02:35.000000000 +0200
+++ new/doc/latex/cleanthesis/content/titlepages.tex 2019-06-26 22:40:49.000000000 +0200
@@ -1,4 +1,4 @@
-% !TEX root = ../thesis-example.tex
+% !TEX root = ../my-thesis.tex
%
% ------------------------------------ --> cover title page
\begin{titlepage}
Binary files old/doc/latex/cleanthesis/doc/cleanthesis-doc.pdf and new/doc/latex/cleanthesis/doc/cleanthesis-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/doc/cleanthesis-doc.tex new/doc/latex/cleanthesis/doc/cleanthesis-doc.tex
--- old/doc/latex/cleanthesis/doc/cleanthesis-doc.tex 2015-08-28 00:02:35.000000000 +0200
+++ new/doc/latex/cleanthesis/doc/cleanthesis-doc.tex 2019-06-26 22:40:49.000000000 +0200
@@ -1,5 +1,5 @@
%% cleanthesis-doc.tex
-%% Copyright 2015 R. Langner
+%% Copyright 2019 R. Langner
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,8 +25,7 @@
\usepackage{booktabs}
\usepackage{shortvrb}
\usepackage{pifont}
-
-\rcsid{$Id: cleanthesis.tex,v 0.3.1 2015/08/26 23:32:00 derric stable $}
+\usepackage{graphicx}
\newcommand*{\cleanthesis}{\emph{Clean Thesis}\xspace}
\newcommand*{\cthesishome}{http://cleanthesis.der-ric.de/}
@@ -34,21 +33,26 @@
\titlepage{%
title={The \sty{cleanthesis} Package},
- subtitle={A LaTeX Style for Thesis Documents},
+ subtitle={A Clean LaTeX Style for Thesis Documents},
url={\cthesishome},
author={Ricardo Langner},
email={info(a)cleanthesis.der-ric.de},
- revision={\rcsrevision},
- date={\rcstoday}}
+ revision={0.4.0},
+ date={2019/06/21}}
\hypersetup{%
pdftitle={The \cleanthesis Package},
- pdfsubject={A LaTeX Style for Thesis Documents},
+ pdfsubject={A Clean LaTeX Style for Thesis Documents},
pdfauthor={Ricardo Langner},
pdfkeywords={tex, latex, thesis, style}}
%\setcounter{secnumdepth}{4}
+% > adjust depth of the toc and removes the indention
+\setcounter{tocdepth}{3}
+\AtBeginToc{\setcounter{tocdepth}{3}}
+\AtEndToc{\setcounter{tocdepth}{5}}
+\KOMAoption{toc}{flat}
\begin{document}
@@ -83,7 +87,7 @@
\subsection{License}
\label{sec:intro:license}
-Copyright \textcopyright\ 2015 R. Langner
+Copyright \textcopyright\ 2019 R. Langner
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -107,7 +111,7 @@
First of all I would like to thank André Miede. He is the author of the Classic Thesis style. His Classic Thesis style inspired end encouraged me to publish my own thesis style. Thank you André for doing a great job.
-I would like to thank the following people for using the \cleanthesis style and giving important initial feedback to me, e.g., features, bugs: (1) \textbf{Sebastian Kleinau}\footnote{\url{http://www.sk-downloading.de/} (in German only)} in his bachelor thesis, (2) \textbf{Mathias Frisch}\footnote{\url{http://wwwpub.zih.tu-dresden.de/~frisch/}} in his dissertation (PhD), and (3) \textbf{Anton Augsburg}\footnote{\url{http://antonaugsburg.de/} (in German only)} in his project thesis.
+I would like to thank the following people for using the \cleanthesis style and providing me important initial feedback (e.g., features, bugs): (1) \textbf{Sebastian Kleinau} in his bachelor thesis, (2) \textbf{Mathias Frisch} in his dissertation (PhD), and (3) \textbf{Anton Augsburg} in his project thesis.
\subsection{Prerequisites}
\label{sec:intro:pre}
@@ -124,16 +128,12 @@
\label{sec:userguide:pkgopt}
All package options are given in \keyval notation.
-The value \texttt{true} can be omitted for all boolean keys, \eg \opt{sansserif} without a value is equivalent to \kvopt{sansserif}{true}.
+The value \texttt{true} can be omitted for all boolean keys, \eg \opt{hangsection} without a value is equivalent to \kvopt{hangsection}{true}.
All of the following options must be used as \sty{cthesis} is loaded, \ie in the optional argument to \cmd{usepackage}.
\begin{optionlist}
-\boolitem[false]{sansserif}
-
-Sets whether to use a sans serif font or not.
-
\boolitem[false]{hangfigurecaption}
Sets whether to use a hanging figure label (similar to headlines, placed in page margin) or not.
@@ -146,6 +146,14 @@
Sets whether to use a hanging sub-section label (placed in page margin) or not.
+\boolitem[false]{sansserif}
+
+Sets whether to use a sans serif font or not.
+
+\boolitem[false]{configurelistings}
+
+Sets whether to use the package listings and to configure the visual appearance of lstlisting environments.
+
\optitem[endash]{figuresep}{\opt{none},\opt{colon},\opt{period},\opt{space},\opt{quad},\opt{endash}}
This option can be used to define a different label separator for cations of figures. The following value are allowed:
@@ -187,6 +195,23 @@
\item[bluegreen] Headlines and titles use a blue color, figure labels use green.
\end{valuelist}
+\optitem[english]{quotesstyle}{csquotes style options}
+
+Sets the quote style.
+This is a direct interface to the corresponding style option of the csquotes package.
+For further information please check out the csquotes documentation \url{https://www.ctan.org/pkg/csquotes}.
+The default is \texttt{english}.
+For individual settings, for instance German quotes, you can use \texttt{quotesstyle=german}.
+
+
+\subsubsection{Setup Your Bibliography}
+
+\boolitem[false]{configurebiblatex}
+
+Sets whether to use and configure the package biblatex within the template.
+
+If this option is set to false, you can setup your bibliography environment by yourself depending on your individual needs or requirements. In this case, you have to include something like \cs{usepackage\{biblatex\}} and \cs{bibliography\{bib-refs\}} in your preamble (i.e., before the \cs{begin\{document\}} statement).
+
\optitem[bibtex]{bibsys}{\opt{biber},\opt{bibtex}}
Sets whether to use \texttt{biber} or \texttt{bibtex} as citation management tool (engine).
@@ -199,11 +224,35 @@
Sets the file name of the bibtex file used for the bibliography.
If this option is not used (defined), the package looks for the default bibliography \texttt{bib-refs.bib}.
-\optitem[alphabetic]{bibstyle}{\opt{alphabetic},\opt{numeric},\opt{authoryear}}
+\optitem[alphabetic]{bibstyle}{biblatex style options}
-Sets whether to use an \texttt{alphabetic}, a \texttt{numeric}, or an \texttt{authoryear} reference style for the bibliography.
-For further information please check out the biblatex documentation\footnote{\url{http://www.ctan.org/pkg/biblatex}}.
+Sets the bibliography style.
+This is a direct interface to the corresponding style option of the biblatex package.
+For further information please check out the biblatex documentation \url{http://www.ctan.org/pkg/biblatex}.
The default is \texttt{alphabetic}.
+Two popular options are:
+
+\begin{valuelist}
+\item[alphabetic] (default) Prints labels similar to the traditional BibTeX style \texttt{alpha.bst}, for instance \texttt{[Lan+15]} or \texttt{[LHD17]}
+\item[numeric] Uses numeric labels, such as \texttt{[1]} or \texttt{[37]}
+\end{valuelist}
+
+However, you can also pass non-standard options to make use of other bibliography packages for biblatex.
+For example, by setting the option \texttt{style=ieee} or \texttt{style=ieee-alphabetic} you can use the biblatex-ieee package (see \url{https://ctan.org/pkg/biblatex-ieee}).
+
+\optitem[nty]{bibsorting}{biblatex sorting options}
+
+Sets the sorting order of the bibliography.
+This is a direct interface to the corresponding option of the biblatex package.
+For further information please check out the biblatex documentation \url{http://www.ctan.org/pkg/biblatex}.
+The default is \texttt{nty}.
+Some popular options include:
+
+\begin{valuelist}
+\item[nty] (default) Sort by name, title, year
+\item[nyt] Sort by name, year, title
+\item[none] No sorting at all, entries are processed in the order of their citation
+\end{valuelist}
\end{optionlist}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/my-thesis-setup.tex new/doc/latex/cleanthesis/my-thesis-setup.tex
--- old/doc/latex/cleanthesis/my-thesis-setup.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/cleanthesis/my-thesis-setup.tex 2019-06-26 22:40:49.000000000 +0200
@@ -0,0 +1,77 @@
+% !TEX root = my-thesis.tex
+
+
+% **************************************************
+% Files' Character Encoding
+% **************************************************
+\PassOptionsToPackage{utf8}{inputenc}
+\usepackage{inputenc}
+
+
+% **************************************************
+% Information and Commands for Reuse
+% **************************************************
+\newcommand{\thesisTitle}{The Clean Thesis Style}
+\newcommand{\thesisName}{Ricardo Langner}
+\newcommand{\thesisSubject}{Documentation}
+\newcommand{\thesisDate}{June 21, 2016}
+\newcommand{\thesisVersion}{My First Draft}
+
+\newcommand{\thesisFirstReviewer}{Jane Doe}
+\newcommand{\thesisFirstReviewerUniversity}{\protect{Clean Thesis Style University}}
+\newcommand{\thesisFirstReviewerDepartment}{Department of Clean Thesis Style}
+
+\newcommand{\thesisSecondReviewer}{John Doe}
+\newcommand{\thesisSecondReviewerUniversity}{\protect{Clean Thesis Style University}}
+\newcommand{\thesisSecondReviewerDepartment}{Department of Clean Thesis Style}
+
+\newcommand{\thesisFirstSupervisor}{Jane Doe}
+\newcommand{\thesisSecondSupervisor}{John Smith}
+
+\newcommand{\thesisUniversity}{\protect{Clean Thesis Style University}}
+\newcommand{\thesisUniversityDepartment}{Department of Clean Thesis Style}
+\newcommand{\thesisUniversityInstitute}{Institute for Clean Thesis Dev}
+\newcommand{\thesisUniversityGroup}{Clean Thesis Group (CTG)}
+\newcommand{\thesisUniversityCity}{City}
+\newcommand{\thesisUniversityStreetAddress}{Street address}
+\newcommand{\thesisUniversityPostalCode}{Postal Code}
+
+
+% **************************************************
+% Debug LaTeX Information
+% **************************************************
+%\listfiles
+
+
+% **************************************************
+% Load and Configure Packages
+% **************************************************
+\usepackage[english]{babel} % babel system, adjust the language of the content
+\PassOptionsToPackage{% setup clean thesis style
+ figuresep=colon,%
+ hangfigurecaption=false,%
+ hangsection=true,%
+ hangsubsection=true,%
+ sansserif=false,%
+ configurelistings=true,%
+ colorize=full,%
+ colortheme=bluemagenta,%
+ configurebiblatex=true,%
+ bibsys=biber,%
+ bibfile=bib-refs,%
+ bibstyle=alphabetic,%
+ bibsorting=nty,%
+}{cleanthesis}
+\usepackage{cleanthesis}
+
+\hypersetup{% setup the hyperref-package options
+ pdftitle={\thesisTitle}, % - title (PDF meta)
+ pdfsubject={\thesisSubject},% - subject (PDF meta)
+ pdfauthor={\thesisName}, % - author (PDF meta)
+ plainpages=false, % -
+ colorlinks=false, % - colorize links?
+ pdfborder={0 0 0}, % -
+ breaklinks=true, % - allow line break inside links
+ bookmarksnumbered=true, %
+ bookmarksopen=true %
+}
Binary files old/doc/latex/cleanthesis/my-thesis.pdf and new/doc/latex/cleanthesis/my-thesis.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/my-thesis.tex new/doc/latex/cleanthesis/my-thesis.tex
--- old/doc/latex/cleanthesis/my-thesis.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/cleanthesis/my-thesis.tex 2019-06-26 22:40:49.000000000 +0200
@@ -0,0 +1,124 @@
+% **************************************************
+% Document Class Definition
+% **************************************************
+\documentclass[%
+ paper=A4, % paper size --> A4 is default in Germany
+ twoside=true, % onesite or twoside printing
+ openright, % doublepage cleaning ends up right side
+ parskip=half, % spacing value / method for paragraphs
+ chapterprefix=true, % prefix for chapter marks
+ 11pt, % font size
+ headings=normal, % size of headings
+ bibliography=totoc, % include bib in toc
+ listof=totoc, % include listof entries in toc
+ titlepage=on, % own page for each title page
+ captions=tableabove, % display table captions above the float env
+ chapterprefix=false, % do not display a prefix for chapters
+ appendixprefix=false, % but display a prefix for appendix chapter
+ draft=false, % value for draft version
+]{scrreprt}%
+
+
+% **************************************************
+% Setup YOUR thesis document in this file !
+% **************************************************
+\input{my-thesis-setup}
+
+
+% **************************************************
+% Document CONTENT
+% **************************************************
+\begin{document}
+
+% uncomment the following command to fill up pages with
+% whitespace instead of aligning the first and last lines
+% of a page (see \raggedbottom vs. \flushbottom)
+%\raggedbottom
+
+% --------------------------
+% rename document parts
+% --------------------------
+%\renewcaptionname{ngerman}{\figurename}{Abb.}
+%\renewcaptionname{ngerman}{\tablename}{Tab.}
+\renewcaptionname{english}{\figurename}{Fig.}
+\renewcaptionname{english}{\tablename}{Tab.}
+
+% --------------------------
+% Front matter
+% --------------------------
+\pagenumbering{roman} % roman page numbing (invisible for empty page style)
+\pagestyle{empty} % no header or footers
+\input{content/titlepages} % INCLUDE: all titlepages
+\cleardoublepage
+
+\pagestyle{plain} % display just page numbers
+\input{content/abstract} % INCLUDE: the abstracts (english and german)
+\cleardoublepage
+%
+\input{content/acknowledgement} % INCLUDE: acknowledgement
+\cleardoublepage
+%
+\currentpdfbookmark{\contentsname}{toc}
+\setcounter{tocdepth}{2} % define depth of toc
+\tableofcontents % display table of contents
+\cleardoublepage
+
+% --------------------------
+% Body matter
+% --------------------------
+\pagenumbering{arabic} % arabic page numbering
+\setcounter{page}{1} % set page counter
+\pagestyle{scrheadings} % header and footer style
+
+%% Uncomment the following lines using the \part command
+%% to add part sections
+%\part{Example Part}
+\input{content/chapter-introduction} % INCLUDE: introduction
+\input{content/chapter-related-work} % INCLUDE: related work
+
+%\part{Additional Example Part}
+\input{content/chapter-system} % INCLUDE: system
+\input{content/chapter-concepts} % INCLUDE: concepts
+\input{content/chapter-conclusion} % INCLUDE: conclusion
+
+% --------------------------
+% Back matter
+% --------------------------
+%
+{%
+\setstretch{1.1}
+\renewcommand{\bibfont}{\normalfont\small}
+\setlength{\biblabelsep}{0pt}
+\setlength{\bibitemsep}{0.5\baselineskip plus 0.5\baselineskip}
+\printbibliography[nottype=online]
+\newrefcontext[labelprefix={@}]
+\printbibliography[heading=subbibliography,title={Webpages},type=online]
+}
+\cleardoublepage
+
+\listoffigures
+\cleardoublepage
+
+\listoftables
+\cleardoublepage
+
+\lstlistoflistings
+\cleardoublepage
+
+\appendix\cleardoublepage
+\input{content/chapter-appendix} % INCLUDE: appendix
+
+\cleardoublepage
+\input{content/colophon}
+
+\cleardoublepage
+\input{content/declaration}
+\clearpage
+
+\newpage
+\mbox{}
+
+% **************************************************
+% End of Document CONTENT
+% **************************************************
+\end{document}
Binary files old/doc/latex/cleanthesis/thesis-example.pdf and new/doc/latex/cleanthesis/thesis-example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cleanthesis/thesis-example.tex new/doc/latex/cleanthesis/thesis-example.tex
--- old/doc/latex/cleanthesis/thesis-example.tex 2015-08-28 00:02:35.000000000 +0200
+++ new/doc/latex/cleanthesis/thesis-example.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,158 +0,0 @@
-% **************************************************
-% Document Class Definition
-% **************************************************
-\documentclass[%
- paper=A4, % paper size --> A4 is default in Germany
- twoside=true, % onesite or twoside printing
- openright, % doublepage cleaning ends up right side
- parskip=full, % spacing value / method for paragraphs
- chapterprefix=true, % prefix for chapter marks
- 11pt, % font size
- headings=normal, % size of headings
- bibliography=totoc, % include bib in toc
- listof=totoc, % include listof entries in toc
- titlepage=on, % own page for each title page
- captions=tableabove, % display table captions above the float env
- draft=false, % value for draft version
-]{scrreprt}%
-
-% **************************************************
-% Debug LaTeX Information
-% **************************************************
-%\listfiles
-
-% **************************************************
-% Information and Commands for Reuse
-% **************************************************
-\newcommand{\thesisTitle}{The Clean Thesis Style}
-\newcommand{\thesisName}{Ricardo Langner}
-\newcommand{\thesisSubject}{Documentation}
-\newcommand{\thesisDate}{August 26, 2015}
-\newcommand{\thesisVersion}{My First Draft}
-
-\newcommand{\thesisFirstReviewer}{Jane Doe}
-\newcommand{\thesisFirstReviewerUniversity}{\protect{Clean Thesis Style University}}
-\newcommand{\thesisFirstReviewerDepartment}{Department of Clean Thesis Style}
-
-\newcommand{\thesisSecondReviewer}{John Doe}
-\newcommand{\thesisSecondReviewerUniversity}{\protect{Clean Thesis Style University}}
-\newcommand{\thesisSecondReviewerDepartment}{Department of Clean Thesis Style}
-
-\newcommand{\thesisFirstSupervisor}{Jane Doe}
-\newcommand{\thesisSecondSupervisor}{John Smith}
-
-\newcommand{\thesisUniversity}{\protect{Clean Thesis Style University}}
-\newcommand{\thesisUniversityDepartment}{Department of Clean Thesis Style}
-\newcommand{\thesisUniversityInstitute}{Institut for Clean Thesis Dev}
-\newcommand{\thesisUniversityGroup}{Clean Thesis Group (CTG)}
-\newcommand{\thesisUniversityCity}{City}
-\newcommand{\thesisUniversityStreetAddress}{Street address}
-\newcommand{\thesisUniversityPostalCode}{Postal Code}
-
-% **************************************************
-% Load and Configure Packages
-% **************************************************
-\usepackage[utf8]{inputenc} % defines file's character encoding
-\usepackage[english]{babel} % babel system, adjust the language of the content
-\usepackage[ % clean thesis style
- figuresep=colon,%
- sansserif=false,%
- hangfigurecaption=false,%
- hangsection=true,%
- hangsubsection=true,%
- colorize=full,%
- colortheme=bluemagenta,%
- bibsys=bibtex,%
- bibfile=bib-refs,%
- bibstyle=alphabetic,%
-]{cleanthesis}
-
-\hypersetup{ % setup the hyperref-package options
- pdftitle={\thesisTitle}, % - title (PDF meta)
- pdfsubject={\thesisSubject},% - subject (PDF meta)
- pdfauthor={\thesisName}, % - author (PDF meta)
- plainpages=false, % -
- colorlinks=false, % - colorize links?
- pdfborder={0 0 0}, % -
- breaklinks=true, % - allow line break inside links
- bookmarksnumbered=true, %
- bookmarksopen=true %
-}
-
-% **************************************************
-% Document CONTENT
-% **************************************************
-\begin{document}
-
-% --------------------------
-% rename document parts
-% --------------------------
-%\renewcaptionname{ngerman}{\figurename}{Abb.}
-%\renewcaptionname{ngerman}{\tablename}{Tab.}
-\renewcaptionname{english}{\figurename}{Fig.}
-\renewcaptionname{english}{\tablename}{Tab.}
-
-% --------------------------
-% Front matter
-% --------------------------
-\pagenumbering{roman} % roman page numbing (invisible for empty page style)
-\pagestyle{empty} % no header or footers
-\input{content/titlepages} % INCLUDE: all titlepages
-\cleardoublepage
-
-\pagestyle{plain} % display just page numbers
-\input{content/abstract} % INCLUDE: the abstracts (english and german)
-\cleardoublepage
-%
-\input{content/acknowledgement} % INCLUDE: acknowledgement
-\cleardoublepage
-%
-\setcounter{tocdepth}{2} % define depth of toc
-\tableofcontents % display table of contents
-\cleardoublepage
-
-% --------------------------
-% Body matter
-% --------------------------
-\pagenumbering{arabic} % arabic page numbering
-\setcounter{page}{1} % set page counter
-\pagestyle{maincontentstyle} % fancy header and footer
-
-\input{content/chapter-introduction} % INCLUDE: introduction
-\input{content/chapter-related-work} % INCLUDE: related work
-\input{content/chapter-system} % INCLUDE: system
-\input{content/chapter-concepts} % INCLUDE: concepts
-\input{content/chapter-conclusion} % INCLUDE: conclusion
-\cleardoublepage
-
-% --------------------------
-% Back matter
-% --------------------------
-{%
-\setstretch{1.1}
-\renewcommand{\bibfont}{\normalfont\small}
-\setlength{\biblabelsep}{0pt}
-\setlength{\bibitemsep}{0.5\baselineskip plus 0.5\baselineskip}
-\printbibliography[nottype=online]
-\printbibliography[heading=subbibliography,title={Webseiten},type=online,prefixnumbers={@}]
-}
-\cleardoublepage
-
-\listoffigures
-\cleardoublepage
-
-\listoftables
-\cleardoublepage
-
-\input{content/colophon}
-\cleardoublepage
-
-\input{content/declaration}
-\clearpage
-\newpage
-\mbox{}
-
-% **************************************************
-% End of Document CONTENT
-% **************************************************
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cleanthesis.doc.tlpobj new/tlpkg/tlpobj/cleanthesis.doc.tlpobj
--- old/tlpkg/tlpobj/cleanthesis.doc.tlpobj 2019-02-28 03:25:49.000000000 +0100
+++ new/tlpkg/tlpobj/cleanthesis.doc.tlpobj 2019-06-27 01:54:21.000000000 +0200
@@ -1,15 +1,17 @@
name cleanthesis.doc
category Package
-revision 38221
+revision 51472
shortdesc doc files of cleanthesis
relocated 1
-docfiles size=465
+docfiles size=489
RELOC/doc/latex/cleanthesis/CHANGELOG.md
RELOC/doc/latex/cleanthesis/MANIFEST.md
RELOC/doc/latex/cleanthesis/README.md
+ RELOC/doc/latex/cleanthesis/VERSION
RELOC/doc/latex/cleanthesis/bib-refs.bib
RELOC/doc/latex/cleanthesis/content/abstract.tex
RELOC/doc/latex/cleanthesis/content/acknowledgement.tex
+ RELOC/doc/latex/cleanthesis/content/chapter-appendix.tex
RELOC/doc/latex/cleanthesis/content/chapter-concepts.tex
RELOC/doc/latex/cleanthesis/content/chapter-conclusion.tex
RELOC/doc/latex/cleanthesis/content/chapter-introduction.tex
@@ -22,5 +24,6 @@
RELOC/doc/latex/cleanthesis/doc/cleanthesis-doc.tex
RELOC/doc/latex/cleanthesis/gfx/Clean-Thesis-Figure.pdf
RELOC/doc/latex/cleanthesis/gfx/Clean-Thesis-Logo.pdf
- RELOC/doc/latex/cleanthesis/thesis-example.pdf
- RELOC/doc/latex/cleanthesis/thesis-example.tex
+ RELOC/doc/latex/cleanthesis/my-thesis-setup.tex
+ RELOC/doc/latex/cleanthesis/my-thesis.pdf
+ RELOC/doc/latex/cleanthesis/my-thesis.tex
++++++ cleanthesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cleanthesis/cleanthesis.sty new/tex/latex/cleanthesis/cleanthesis.sty
--- old/tex/latex/cleanthesis/cleanthesis.sty 2015-08-28 00:02:35.000000000 +0200
+++ new/tex/latex/cleanthesis/cleanthesis.sty 2019-06-26 22:40:49.000000000 +0200
@@ -1,5 +1,5 @@
%% cleanthesis.sty
-%% Copyright 2015 R. Langner
+%% Copyright 2019 R. Langner
%
% 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 @@
%
% **************************************************
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{cleanthesis}[2015/08/26 v0.3.1 Clean-looking thesis style inspired by Apple's user guide documents]
+\ProvidesPackage{cleanthesis}[2019/06/21 v0.4.0 A clean LaTeX style for thesis documents]
%
% **************************************************
% Package options
@@ -42,11 +42,6 @@
% in an easy way
\RequirePackage{xkeyval}
-% OPTION sansserif
-% --> values = true|false
-\define@boolkey[ct]{cthesis}{sansserif}[true]{}
-\setkeys[ct]{cthesis}{sansserif=false}
-
% OPTION hangfigurecaption
% --> values = true|false
\define@boolkey[ct]{cthesis}{hangfigurecaption}[true]{}
@@ -62,6 +57,21 @@
\define@boolkey[ct]{cthesis}{hangsubsection}[true]{}
\setkeys[ct]{cthesis}{hangsubsection=true}
+% OPTION sansserif
+% --> values = true|false
+\define@boolkey[ct]{cthesis}{sansserif}[false]{}
+\setkeys[ct]{cthesis}{sansserif=false}
+
+% OPTION configurelistings
+% --> values = true|false
+\define@boolkey[ct]{cthesis}{configurelistings}[false]{}
+\setkeys[ct]{cthesis}{configurelistings=false}
+
+% OPTION configurebiblatex
+% --> values = true|false
+\define@boolkey[ct]{cthesis}{configurebiblatex}[false]{}
+\setkeys[ct]{cthesis}{configurebiblatex=false}
+
% OPTION figuresep
% --> values = none|colon|period|space|quad|endash
\define@choicekey*[ct]{cthesis}{figuresep}{none,colon,period,space,quad,newline,endash}[endash]{\def\cthesis@figuresep{#1}}
@@ -88,10 +98,19 @@
\setkeys[ct]{cthesis}{bibfile=bib-refs}
% OPTION bibstyle
-% --> values = alphabetic|numeric|authoryear
-\define@choicekey*[ct]{cthesis}{bibstyle}[\val\bibstylenr]{alphabetic,numeric,authoryear}[alphabetic]{\def\cthesis@bibstyle{#1}}
+% --> values = biblatex style options
+\define@key[ct]{cthesis}{bibstyle}[alphabetic]{\def\cthesis@bibstyle{#1}}
\setkeys[ct]{cthesis}{bibstyle=alphabetic}
+% OPTION bibsorting
+% --> values = biblatex sorting options
+\define@key[ct]{cthesis}{bibsorting}[nty]{\def\cthesis@bibsorting{#1}}
+\setkeys[ct]{cthesis}{bibsorting=nty}
+
+% OPTION quotesstyle
+% --> values = csquotes style options
+\define@key[ct]{cthesis}{quotesstyle}[english]{\def\cthesis@quotesstyle{#1}}
+\setkeys[ct]{cthesis}{quotesstyle=english}
\DeclareOptionX*{
\PackageWarning{cleanthesis}{Unknown option â\CurrentOptionâ}%
@@ -99,6 +118,8 @@
\ProcessOptionsX[ct]<cthesis>
+% Checks if bib file exists, if not we throw an error
+\IfFileExists{\cthesis(a)bibfile.bib}{}{\PackageError{cleanthesis}{Unable to find BibTeX file \cthesis(a)bibfile.bib!}{Please provide the name of your BibTeX file to the cleanthesis package parameter bibfile.}}
% **************************************************
% Color Definitions
@@ -186,6 +207,7 @@
\definecolor{ctcolorblack}{gray}{0}
\definecolor{ctcolorgray}{gray}{.5}
\definecolor{ctcolorgraylight}{gray}{.8}
+\definecolor{ctcolorgraylighter}{gray}{.95}
% sets the color theme regarding the given package option colortheme
\ifcase\cthesis@colortheme
@@ -203,40 +225,38 @@
% **************************************************
% Font Definitions (see http://www.tug.dk/FontCatalogue/)
% **************************************************
-\RequirePackage[T1]{fontenc} % font types and character verification
-%\ifthenelse{\boolean{@sansserif}}%
+\RequirePackage[T1]{fontenc} % font types and character verification
+
\ifct@cthesis@sansserif
-% {%
- % Using sans-serif fonts
- %
- %\RequirePackage{helvet} % Font: Helvetica
- %\RequirePackage{nimbus} % Font: Nimbus Sans, a clone of the Helvetica
- \RequirePackage{tgheros} % Font: TEX Gyre Heros
- %\RequirePackage{libertine} % Font: Biolinum, the standard sans serif typeface with the Libertine package
- %\RequirePackage[scaled]{berasans} % Font: Bera Sans, a a version of Bitstream Vera Sans slightly enhanced
- \renewcommand*\familydefault{\sfdefault}%
-% }{%
+ % Using sans-serif fonts
+ %
+ %\RequirePackage{helvet} % Font: Helvetica
+ %\RequirePackage{nimbus} % Font: Nimbus Sans, a clone of the Helvetica
+ \RequirePackage{tgheros} % Font: TEX Gyre Heros
+ %\RequirePackage{libertine} % Font: Biolinum, the standard sans serif typeface with the Libertine package
+ %\RequirePackage[scaled]{berasans} % Font: Bera Sans, a a version of Bitstream Vera Sans slightly enhanced
+ \renewcommand*\familydefault{\sfdefault}%
\else
- % Using serif fonts
- %
- \RequirePackage{lmodern} % font set: Latin Modern
- \RequirePackage{charter} % font set: Charter
- %\RequirePackage{fourier} % font set: (basically improved utopia)
-% }
+ % Using serif fonts
+ %
+ \RequirePackage{lmodern} % font set: Latin Modern
+ \RequirePackage{charter} % font set: Charter
+ %\RequirePackage{fourier} % font set: (basically improved utopia)
\fi
% **************************************************
% Load Packages
% **************************************************
-\RequirePackage{fixltx2e} % packages provides fixes to LaTeX2e
\RequirePackage{microtype} % typographic tuning
\RequirePackage{setspace} % for line spacing, e.g. \onehalfspacing
\RequirePackage[]{graphicx} % graphics import features
-\RequirePackage{fancyhdr} % for header and footer modifications
+\RequirePackage{tabularx} % table features
+%\RequirePackage{fancyhdr} % for header and footer modifications
\RequirePackage{enumitem} % for simple list modifications
\RequirePackage{blindtext} % package for blind text
\RequirePackage{textcomp} % different symbols
\RequirePackage{hyperref} % interactive link inside the document
+\RequirePackage[automark]{scrlayer-scrpage}
%
\RequirePackage[ % modify figure and table captions
@@ -253,63 +273,89 @@
% }{}
\fi
%
-\RequirePackage[ % page layout modifications
- paper=a4paper, % - use A4 paper size
- %scale={0.86,0.94}, % - total body size (h,v)
- %scale={0.86,0.94}, % - total body size (h,v)
- nohead, % - no header
- includefoot, % - include footer space
- includemp, % - include side note space
- bindingoffset=0.5cm, % - binding correction
- top=2.25cm, % - total body: top margin
- left=3.75cm, % - total body: left margin (odd pages)
- right=0.75cm, % - total body: right margin (odd pages)
- bottom=1.5cm, % - total body: bottom margin
- marginparwidth=1.75cm, % - width for side note
- marginparsep=10pt, % - space between notes and body text (content)
- footskip=2cm, % - footer skip size
-]{geometry}
+%
+% **************************************************
+% Page construction
+% **************************************************
+\KOMAoption{headinclude}{false} % include header in body?
+\KOMAoption{footinclude}{false} % include footer in body?
+\KOMAoption{footlines}{2.1} % number of foot lines
+\KOMAoption{mpinclude}{false} % include marginpar in body?
+\KOMAoption{BCOR}{25mm} % binding correction
+\KOMAoption{DIV}{12} % number of page divs (divider)
+%
%
\RequirePackage[ % advanced quotes
strict=true, % - warning are errors now
- style=german % - german quotes
+ style=\cthesis@quotesstyle % - german quotes
]{csquotes}
%
-\RequirePackage[ % use biblatex for bibliography
- backend=\cthesis@bibsys, % - use biber backend (bibtex replacement) or bibtex
- bibencoding=utf8, % - use auto file encode
- style=\cthesis@bibstyle, % - use alphabetic (or numeric) bib style
- natbib=true, % - allow natbib commands
- hyperref=true, % - activate hyperref support
- backref=true, % - activate backrefs
- isbn=false, % - don't show isbn tags
- url=false, % - don't show url tags
- doi=false, % - don't show doi tags
- urldate=long, % - display type for dates
- maxnames=3,%
- minnames=1,%
- maxbibnames=5,%
- minbibnames=3,%
- maxcitenames=2,%
- mincitenames=1%
-]{biblatex}
-\bibliography{\cthesis@bibfile}
-\DefineBibliographyStrings{ngerman}{%
- andothers = {{et\,al\adddot}}, % 'et al.' instead of 'u.a.'
- backrefpage = {{zitiert auf Seite}},%
- backrefpages = {{zitiert auf den Seiten}},%
-}
+
+% **************************************************
+% Bibliography
+% **************************************************
+\ifct@cthesis@configurebiblatex
+ \RequirePackage[ % use biblatex for bibliography
+ backend=\cthesis@bibsys, % - use biber backend (bibtex replacement) or bibtex
+ style=\cthesis@bibstyle, % - use alphabetic (or numeric) bib style
+ natbib=true, % - allow natbib commands
+ hyperref=true, % - activate hyperref support
+ backref=true, % - activate backrefs
+ isbn=false, % - don't show isbn tags
+ url=false, % - don't show url tags
+ doi=false, % - don't show doi tags
+ urldate=long, % - display type for dates
+ maxnames=3,%
+ minnames=1,%
+ maxbibnames=5,%
+ minbibnames=3,%
+ maxcitenames=2,%
+ mincitenames=1,%,
+ sorting=\cthesis@bibsorting%
+ ]{biblatex}
+ \bibliography{\cthesis@bibfile}
+ \DefineBibliographyStrings{ngerman}{%
+ andothers = {{et\,al\adddot}}, % 'et al.' instead of 'u.a.'
+ backrefpage = {{zitiert auf Seite}},%
+ backrefpages = {{zitiert auf den Seiten}},%
+ }
+\fi
% **************************************************
% Text Format
% **************************************************
\setstretch{1.2} % value for line spacing, use \setstretch{} or \singlespacing or \onehalfspacing or \doublespacing
-\setlength{\parindent}{0em} % value for paragraph indentation
+%\setlength{\parindent}{0em} % value for paragraph indentation
\clubpenalty = 10000 % prevent single lines at the beginning of a paragraph (Schusterjungen)
\widowpenalty = 10000 % prevent single lines at the end of a paragraph (Hurenkinder)
\displaywidowpenalty = 10000 %
% **************************************************
+% Listing Format
+% **************************************************
+\ifct@cthesis@configurelistings
+ \RequirePackage{listings} % package for listings
+ \lstset{%
+ backgroundcolor=\color{ctcolorgraylighter},
+ linewidth=\textwidth,
+ xleftmargin=10pt,
+ captionpos=b,
+ showspaces=false,
+ showstringspaces=false,
+ showtabs=false,
+ tabsize=2,
+ basicstyle=\footnotesize\ttfamily,
+ frame=leftline,
+ framerule=3pt,
+ framexleftmargin=4pt,
+ rulecolor=\color{ctcolorgraylight},
+ numbers=left,
+ numberstyle=\footnotesize\sffamily\color{ctcolorgray},
+ numbersep=15pt
+ }
+\fi
+
+% **************************************************
% List Definitions
% **************************************************
\newenvironment{my_list}%
@@ -355,70 +401,99 @@
% **************************************************
% Header and Footer
% **************************************************
-\pagestyle{fancy}
+
+\automark[section]{chapter} % automatically marks sections as rightmark
+ % and chapters as leftmark
+\setlength{\footheight}{120pt} % avoids scrlayer-scrpage warning:
+ % footheight to low warning
+\setlength{\footskip}{185pt} % BAD HACK that moves the foot downwards
+\KOMAoption{footwidth}{foot:53pt} % BAD HACK that moves the foot towards
+ % the outer border
+\setkomafont{pagefoot}{\ctfontfootertext} % font for footer
+\setkomafont{pagenumber}{\ctfontfooterpagenumber} % font for page numbers
+
+%% Redefinition of the chaptermark (used for footer mark on even (left) pages)
\renewcommand{\chaptermark}[1]{%
- \markboth{%
- \footnotesize%
- {\color{ctcolorfootermark}\textbf{\chaptername\ \thechapter}}%
- \quad%
- {\color{ctcolorfootertitle}#1}%
- }{}%
+ \markboth{%
+ \ctfontfootertext
+ % use \@chapapp instead of \chaptername to avoid
+ % 'Chapter A Appendix ...', thanks to @farbverlust (issue #47)
+ {\color{ctcolorfootermark}\textbf{\@chapapp\ \thechapter}}%
+ \quad%
+ \protect\begin{minipage}[t]{.65\textwidth}%
+ #1%
+ \protect\end{minipage}%
+ }{}%
}
+
+%% Redefinition of the sectionmark (used for footer mark on odd (right) pages)
+\newlength{\lensectionnumber}
\renewcommand{\sectionmark}[1]{%
- \markright{%
- \footnotesize%
- {\color{ctcolorfootermark}\textbf{\thesection}}%
- \quad%
- {\color{ctcolorfootertitle}#1}%
- }%
-}
-%
-\fancypagestyle{plain}{%
- \fancyhf{}
- \fancyfootoffset[OR]{1.85cm}
- \fancyfoot[OR]{%
- {\ }\tgherosfont%
- {\color{ctcolorfooterline}\rule[-90pt]{1.25pt}{100pt}}%
- \hspace*{10pt}\begin{minipage}[b]{1.5cm}%
- \color{ctcolorfooterpage}\normalsize\textbf{\thepage}%
- \end{minipage}%
- }
- \fancyfootoffset[EL]{1.85cm}
- \fancyfoot[EL]{%
- \tgherosfont%
- \begin{minipage}[b]{1.5cm}%
- \raggedleft\color{ctcolorfooterpage}\normalsize\textbf{\thepage}%
- \end{minipage}%
- \hspace*{10pt}{\color{ctcolorfooterline}\rule[-90pt]{1.25pt}{100pt}}%
- }
- \renewcommand{\headrulewidth}{0pt}
- \renewcommand{\footrulewidth}{0pt}
-}
-%
-\fancypagestyle{maincontentstyle}{%
- \pagestyle{plain}
- \fancyhf{}
- \fancyfootoffset[OR]{1.85cm}
- \fancyfoot[OR]{%
- {\ }\tgherosfont\footnotesize%
- \rightmark%
- \hspace*{0.75cm}{\color{ctcolorfooterline}\rule[-90pt]{1.25pt}{100pt}}%
- \hspace*{10pt}\begin{minipage}[b]{1.5cm}%
- \color{ctcolorfooterpage}\normalsize\textbf{\thepage}%
- \end{minipage}%
- }
- \fancyfootoffset[EL]{1.85cm}
- \fancyfoot[EL]{%
- \tgherosfont\footnotesize%
- \begin{minipage}[b]{1.5cm}%
- \raggedleft\color{ctcolorfooterpage}\normalsize\textbf{\thepage}%
- \end{minipage}%
- \footnotesize%
- \hspace*{10pt}{\color{ctcolorfooterline}\rule[-90pt]{1.25pt}{100pt}}%
- \hspace*{0.75cm}\leftmark%
- }
+ \markright{%
+ \ctfontfootertext
+ \setlength{\lensectionnumber}{0em}
+ \settowidth{\lensectionnumber}{\textbf{\thesection}\quad}
+ \protect\begin{minipage}[t]{.72\textwidth}%
+ {\ }% bad hack to prevent a wrong baseline for the minipage
+ \protect\raggedleft%
+ \hangindent=\lensectionnumber%
+ {\color{ctcolorfootermark}\textbf{\thesection}}%
+ \quad%
+ #1%
+ \protect\end{minipage}%
+ }%
+}
+
+%% Vertical line in the footer (between page number and mark)
+\newcommand{\ctfooterline}{%
+ \color{ctcolorfooterline}\rule[-90pt]{1.25pt}{100pt}%
+}
+
+%% Page number for odd (right) pages
+\newcommand{\ctfooterrightpagenumber}{%
+ \ctfooterline%
+ \hspace*{10pt}%
+ \begin{minipage}[b]{1.5cm}%
+ \pagemark\ %
+ \end{minipage}%
+}
+
+%% Page number for even (left) pages
+\newcommand{\ctfooterleftpagenumber}{%
+ \begin{minipage}[b]{1.5cm}%
+ \raggedleft\pagemark%
+ \end{minipage}%
+ \hspace*{10pt}%
+ \ctfooterline%
+}
+
+%% Defines the content for header and footer
+\lehead{}
+\cehead{}
+\rehead{}
+\lohead{}
+\cohead{}
+\rohead{}
+\lefoot[% > plain
+ \ctfooterleftpagenumber%
+]{% > srcheadings
+ \ctfooterleftpagenumber%
+ \hspace*{0.75cm}%
+ \headmark%
+}
+\cefoot{}
+\refoot{}
+\lofoot{}
+\cofoot{}
+\rofoot[% > plain
+ \ctfooterrightpagenumber%
+]{% > srcheadings
+ \headmark%
+ \hspace*{0.75cm}%
+ \ctfooterrightpagenumber%
}
+
% **************************************************
% New Commands
% **************************************************
@@ -485,13 +560,22 @@
\newcommand{\book}{\fontfamily{pbk}\fontseries{m}\fontsize{11}{13}\selectfont}
\newcommand{\tgherosfont}{\fontfamily{qhv}\selectfont}
-\newcommand{\thesispartlabelfont}{\color{ctcolorpartnum}\book\fontsize{60}{60}\selectfont}
-\newcommand{\thesispartfont}{\color{ctcolorparttext}\huge \tgherosfont\selectfont}
-\newcommand{\thesischapterfont}{\color{ctcolorblack}\huge \fontfamily{phv}\selectfont}
-%\newcommand{\thesissectionfont}{\color{ctcolormain}\LARGE\bfseries \tgherosfont}
-\newcommand{\thesissectionfont}{\color{ctcolorsection}\LARGE \tgherosfont}
-\newcommand{\thesissubsectionfont}{\color{ctcolorsubsection}\Large \tgherosfont}
-\newcommand{\thesisparagraphfont}{\color{ctcolorparagraph}\tgherosfont\small\bfseries}
+\newcommand{\thesispartlabelfont}{\color{ctcolorpartnum}\nobreak\book\fontsize{60}{60}\selectfont}
+\newcommand{\thesispartfont}{\color{ctcolorparttext}\nobreak\normalfont\huge \tgherosfont\selectfont}
+\newcommand{\thesischapterfont}{\color{ctcolorblack}\nobreak\normalfont\huge \fontfamily{phv}\selectfont}
+%\newcommand{\thesissectionfont}{\color{ctcolormain}\nobreak\LARGE\bfseries \tgherosfont}
+\newcommand{\thesissectionfont}{\color{ctcolorsection}\nobreak\normalfont\LARGE \tgherosfont}
+\newcommand{\thesissubsectionfont}{\color{ctcolorsubsection}\nobreak\normalfont\Large \tgherosfont}
+\newcommand{\thesisparagraphfont}{\color{ctcolorparagraph}\nobreak\tgherosfont\small\bfseries}
+
+\newcommand{\ctfontfooterpagenumber}{%
+ \color{ctcolorfooterpage}%
+ \normalfont\normalsize\bfseries \tgherosfont%
+}
+\newcommand{\ctfontfootertext}{%
+ \color{ctcolorfootertitle}%
+ \normalfont\footnotesize \tgherosfont%
+}
%
% headings
\setkomafont{part}{\thesispartfont} % for chapter entries
@@ -514,118 +598,103 @@
% -- modifications regarding sectioning (structural) commands,
% i.e. \part, \chapter, \section, \subsection, \subsubsection, \paragraph
%
-%
-% The package titlesec enables us to modify (style) the sectioning commands
-% -- usage: \titlespacing{\command}{left}{before-sep}{after-sep}[right-sep]
-% -- usage: \titleformat{\command}[shape]{format}{label}{sep}{before}[after]
-% -- usage: \titleclass{\command}{class}
-% -- classes: page (single page), top (like chapters),
-% straight (title in the middle)
-\RequirePackage{titlesec}
-%
+% ---------------------------
% > formats: \part
-\titleclass{\part}{top} % <-- display:
-\assignpagestyle{\part}{empty} % <-- no page numbers/decorations
-\titleformat{\part}%
- [display]%
- {\usekomafont{part}}%
- {\raggedleft{%
- {\thesispartlabelfont%
- \partname\ \thepart\ \quad}%
- {\color{ctcolorpartline}%
- \hspace*{-200pt}\rule[20pt]{600pt}{2pt}}
- }%
- }%
- {0em}%
- {\raggedleft}%
- [\phantomsection]
+% ---------------------------
+\renewcommand*{\partpagestyle}{empty}
+\renewcommand*{\raggedpart}{\raggedleft}
+\renewcommand*\partheadmidvskip{\par\vspace*{3em}}
+\renewcommand*{\partformat}{%
+ \usekomafont{part}%
+ \thesispartlabelfont%
+ \partname\ \thepart\quad%
+ {\color{ctcolorpartline}\hspace*{-200pt}\rule[0pt]{600pt}{2pt}}%
+}
%
+% ---------------------------
% > formats: \chapter
+% ---------------------------
+\renewcommand*\chapterheadstartvskip{\vspace*{-8.75em}}
+\renewcommand*\chapterheadendvskip{\vspace*{2.5\baselineskip}}
+\renewcommand*{\chapterformat}{%
+ \ctchapternumber{\thechapter}%
+}
+\renewcommand{\chapterlinesformat}[3]{%
+ \ctchaptertitle{#3}%
+ #2%
+}
+%\renewcommand{\chapterlineswithprefixformat}[3]{%
+% \ctchaptertitle{\@chapapp\ \thechapter: #3}%
+% #2%
+%}
+\newcommand{\ctchapternumber}[1]{%
+ \usekomafont{chapter}%
+ \begin{minipage}[t]{0.3\textwidth}%
+ \raggedleft{%
+ {\color{ctcolorchapterline}\rule[-5pt]{2pt}{5cm}}%
+ \quad%
+ {\color{ctcolorchapternum}\fontsize{60}{60}\selectfont#1}%
+ }%
+ \end{minipage}%
+}
+\newcommand{\ctchaptertitle}[1]{%
+ \usekomafont{chapter}%
+ \begin{minipage}[t]{0.7\textwidth}%
+ \vspace*{5.85em}%
+ \raggedright%
+ #1%
+ \end{minipage}%
+}
%
-% The following command is used to avoid overlapping
-% of the chapter headline text, see bug/ticket #1
-% Solution adapted according to the comment from "Gonzalo Medina" - Thanks
-% http://tex.stackexchange.com/questions/165878/width-of-chapter-section-with…
-\newcommand\ctformatchapter[1]{\parbox[t]{\dimexpr\textwidth-4em\relax}{\raggedright#1}}
-%
-\titleformat{\chapter}[display]%
- {\usekomafont{chapter}}%
- {\vspace{-8em}\raggedleft{%
- {\color{ctcolorchapterline}%
- \rule[-5pt]{2pt}{5cm}}\quad%
- {\color{ctcolorchapternum}
- \fontsize{60}{60}\selectfont\thechapter}%
- }%
- }%
- {-2.1em}%
- {\ctformatchapter}%
- [\phantomsection]
-%
+% ---------------------------
% > formats: \section
-\titlespacing{\section}{0em}{.75em}{.2em}%[0pt]
-%\ifthenelse{\boolean{@sectionlabeloutside}}%
+% ---------------------------
\ifct@cthesis@hangsection
-% {%
- \titleformat{\section}[hang]%
- {\usekomafont{section}}%
- {\color{ctcolorblack}\thesection\hspace*{10pt}}%
- {0pt}%
- {\raggedright}%
- [\phantomsection]
-% }{%
+ \renewcommand*{\sectionformat}{%
+ \usekomafont{section}%
+ \makebox[0pt][r]{\color{ctcolorblack}\thesection\hspace*{10pt}}%
+ }
\else
- \titleformat{\section}[block]%
- {\usekomafont{section}}%
- {\color{ctcolorblack}\thesection\hspace*{10pt}}%
- {0pt}%
- {\raggedright}%
- [\phantomsection]
-% }
+ \renewcommand*{\sectionformat}{%
+ \usekomafont{section}%
+ {\color{ctcolorblack}\thesection\hspace*{10pt}}%
+ }
\fi
%
+% ---------------------------
% > formats: \subsection
-\titlespacing{\subsection}{0em}{.5em}{0em}%[0pt]
-%\ifthenelse{\boolean{@subsectionlabeloutside}}%
+% ---------------------------
\ifct@cthesis@hangsubsection
-% {%
- \titleformat{\subsection}[hang]%
- {\usekomafont{subsection}}%
- {\color{ctcolorblack}\thesubsection\hspace*{10pt}}%
- {0pt}%
- {\raggedright}%
- [\phantomsection]
-% }{%
+ \renewcommand*{\subsectionformat}{%
+ \usekomafont{subsection}%
+ \makebox[0pt][r]{\color{ctcolorblack}\thesubsection\hspace*{10pt}}%
+ }
\else
- \titleformat{\subsection}[block]%
- {\usekomafont{subsection}}%
- {\color{ctcolorblack}\thesubsection\hspace*{10pt}}%
- {0pt}%
- {\raggedright}%
- [\phantomsection]
-% }
+ \renewcommand*{\subsectionformat}{%
+ \usekomafont{subsection}%
+ {\color{ctcolorblack}\thesubsection\hspace*{10pt}}%
+ }
\fi
%
-% > formats: \paragraph
-\titlespacing{\paragraph}{0pt}{\parsep}{1em}%[0pt]
-% \titleformat{\paragraph}[runin]%
- % {\usekomafont{paragraph}}%
- % {}%
- % {}%
- % {}%
- % []
-%
%
% **************************************************
-% ToC, LoF, LoT
+% ToC, LoF, LoT, LoL
% **************************************************
%
% -- modifications regarding the table of contents,
-% the list of figures and the list of tables
+% the list of figures, list of tables,
+% and list of listings
%
%
% The tocloft package enables us to control the typographic design of the
% table of contents, list of figures and list of tables
\RequirePackage{tocloft}
+% - fixes wrong fonts in the toc, thanks to magnucki
+\renewcommand{\cftchapfont}{\usefont{T1}{bch}{b}{n}\selectfont}
+\renewcommand{\cfttoctitlefont}{\thesischapterfont}
+\renewcommand{\cftloftitlefont}{\thesischapterfont}
+\renewcommand{\cftlottitlefont}{\thesischapterfont}
+%
%
% > adjusts the indention for figure and table entries (lof and lot)
% -- \cftsetindents{entry}{indent}{numwidth} sets the entry's indent to
@@ -634,6 +703,23 @@
\cftsetindents{table}{0em}{3em}
%
%
+\ifct@cthesis@configurelistings
+ % makes lol to look like lof
+ \makeatletter
+ \begingroup\let\newcounter\@gobble\let\setcounter\@gobbletwo
+ \globaldefs\@ne \let\c@loldepth\@ne
+ \newlistof{listings}{lol}{\lstlistlistingname}
+ \endgroup
+ \let\l@lstlisting\l@listings
+ \AtBeginDocument{\addtocontents{lol}{\protect\addvspace{10\p@}}}
+ \makeatother
+ \renewcommand{\lstlistoflistings}{\listoflistings}
+ \renewcommand\lstlistlistingname{List of Listings}
+ \renewcommand{\cftloltitlefont}{\thesischapterfont}
+ \cftsetindents{listings}{0em}{3em}
+\fi
+%
+%
%
% **************************************************
% Mishmash
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cleanthesis.tlpobj new/tlpkg/tlpobj/cleanthesis.tlpobj
--- old/tlpkg/tlpobj/cleanthesis.tlpobj 2019-02-28 03:25:50.000000000 +0100
+++ new/tlpkg/tlpobj/cleanthesis.tlpobj 2019-06-27 01:54:22.000000000 +0200
@@ -1,14 +1,14 @@
name cleanthesis
category Package
-revision 38221
+revision 51472
shortdesc A clean LaTeX style for thesis documents
relocated 1
longdesc The package offers a clean, simple, and elegant LaTeX style for
longdesc thesis documents.
-runfiles size=6
+runfiles size=7
RELOC/tex/latex/cleanthesis/cleanthesis.sty
catalogue-ctan /macros/latex/contrib/cleanthesis
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-06-25 21:53:35 +0200
catalogue-license lppl1.3
catalogue-topics dissertation
-catalogue-version 0.3.1
+catalogue-version 0.4.0
++++++ clearsans.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/clearsans/README new/doc/fonts/clearsans/README
--- old/doc/fonts/clearsans/README 2014-06-25 17:10:24.000000000 +0200
+++ new/doc/fonts/clearsans/README 2019-10-25 23:01:54.000000000 +0200
@@ -1,4 +1,4 @@
-This is the README for the clearsans package, version 2014-05-28.
+This is the README for the clearsans package, version 2019-10-25.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support
for the Clear Sans family of fonts (version 1.0), designed by Daniel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/clearsans.doc.tlpobj new/tlpkg/tlpobj/clearsans.doc.tlpobj
--- old/tlpkg/tlpobj/clearsans.doc.tlpobj 2019-02-28 03:25:50.000000000 +0100
+++ new/tlpkg/tlpobj/clearsans.doc.tlpobj 2020-03-24 01:56:48.000000000 +0100
@@ -1,6 +1,6 @@
name clearsans.doc
category Package
-revision 34405
+revision 54512
shortdesc doc files of clearsans
relocated 1
docfiles size=58
++++++ clearsans.tar.xz ++++++
++++ 1973 lines of diff (skipped)
++++++ clrscode.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/clrscode/clrscode.tex new/doc/latex/clrscode/clrscode.tex
--- old/doc/latex/clrscode/clrscode.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/clrscode/clrscode.tex 2019-05-15 22:38:29.000000000 +0200
@@ -0,0 +1,744 @@
+% $Id$
+% $Log$
+
+\documentclass[11pt,mtbold]{article}
+\usepackage{mathtime}
+\usepackage{clrscode}
+\input{page}
+
+\newcommand{\subheading}[1]{\subsubsection*{#1}}
+\newcommand{\clrscode}{\texttt{clrscode}}
+\newcommand{\Codebox}{\texttt{codebox}}
+
+\begin{document}
+
+\title{Using the \clrscode{} Package in \LaTeXe}
+\author{Thomas H. Cormen \\ thc(a)cs.dartmouth.edu}
+\date{June 11, 2003}
+
+\maketitle
+
+\section{Introduction}
+\label{sec:intro}
+
+This document describes how to use the \clrscode{} package in
+\LaTeXe{} to typeset pseudocode in the style of \textit{Introduction
+to Algorithms}, Second edition, by Cormen, Leiserson, Rivest, and
+Stein (CLRS) \cite{CLRS01}. You use the commands in the same way we
+did in writing CLRS, and your output will look just like the
+pseudocode in the text.
+
+\section{Setup}
+\label{sec:setup}
+
+To get the \clrscode{} package, download
+http://www.cs.dartmouth.edu/\~{ }thc/clrscode/clrscode.sty .
+To use the package, include the following line in your source file:
+
+{\small
+\begin{verbatim}
+\usepackage{clrscode}
+\end{verbatim}
+}
+
+\noindent The \clrscode{} package itself includes the line
+
+{\small
+\begin{verbatim}
+\usepackage{latexsym}
+\end{verbatim}
+}
+
+\noindent This line is necessary in order to get the character $\rhd$
+for comments in pseudocode. Therefore, you will need to have the
+\texttt{latexsym} package installed and available on your system.
+
+\section{Typesetting names}
+\label{sec:names}
+
+Pseudocode in CLRS uses four types of names: identifiers, procedures,
+constants, and fixed functions. We provide commands \verb`\id`,
+\verb`\proc`, \verb`\const`, and \verb`\func` for these names. Each
+of these commands takes one argument, which is the name being typeset.
+These commands work both in and out of math mode. When used in math
+mode, and when the name given as an argument contains a dash, the dash
+is typeset as a hyphen rather than as a minus sign.
+
+\begin{description}
+
+\item[Identifiers:] Identifiers are used for variable and attribute
+names. When a variable name is just a single letter, e.g., the
+identifier $j$ in line~2 of \proc{Insertion-Sort} on page~17, we just
+typeset it in math mode: \verb`$j$`.
+
+Identifiers consisting of two or more letters, e.g., the attribute
+\id{length} in the same line of \proc{Insertion-Sort}, should not be
+typeset in this way. (See page~51 of Lamport \cite{Lamport93}.)
+Although \LaTeXe{} provides the \verb`\mathit` command for typesetting
+multiletter identifiers, we use our \verb`\id` command instead:
+\verb`\id{length}`. We recommend that you use it, too. Since the
+\verb`\id` command may be used both in and out of math mode, the source
+text
+
+{\small
+\begin{verbatim}
+We use the \id{length} attribute to denote the length of an array,
+e.g., $\id{length}[A]$.
+\end{verbatim}
+}
+
+\noindent will produce
+\begin{quote}
+We use the \id{length} attribute to denote the length of an array,
+e.g., $\id{length}[A]$.
+\end{quote}
+
+\sloppy
+
+To see how a dash turns into a hyphen, consider line~3
+of \proc{Max-Heapify} on page~130. Its source contains the text
+\verb`$l \leq \id{heap-size}[A]$`, which typesets as $l \leq
+\id{heap-size}[A]$. Using \verb`$l \leq \mathit{heap-size}[A]$` would
+produce $l \leq \mathit{heap-size}[A]$, with a minus sign rather than
+a hyphen in the identifier.
+
+\fussy
+
+\item[Procedures:] For procedure names, use the \verb`\proc` command.
+It typesets procedure names in small caps, and dashes (which occur
+frequently in our procedure names) are typeset as hyphens. Thus, the
+source \verb`\proc{Insertion-Sort}` produces \proc{Insertion-Sort}.
+Since you can use the \verb`\proc` command both in and out of math mode,
+the source text
+
+{\small
+\begin{verbatim}
+We call \proc{Insertion-Sort} with an array $A$, so that the
+call is $\proc{Insertion-Sort}(A)$.
+\end{verbatim}
+}
+
+\noindent will produce
+\begin{quote}
+We call \proc{Insertion-Sort} with an array $A$, so that the
+call is $\proc{Insertion-Sort}(A)$.
+\end{quote}
+
+\item[Constants:] We typeset constants like \const{nil}, \const{true},
+and \const{red} in small caps with the \verb`\const` command, e.g.,
+\verb`\const{nil}`, \verb`\const{true}`, and \verb`\const{red}`. I
+don't think that any of our constants have dashes in them, but the
+\verb`\const` command would typeset a dash within a constant name as a
+hyphen, so that \verb`$\const{red-and-black}$` will produce
+$\const{red-and-black}$.
+
+\item[Fixed functions:] We typeset the names of fixed functions in
+plain old roman with the \verb`\func` command, e.g., \func{level} and
+\func{out-degree}. By a ``fixed function,'' we mean a function that
+is a specific, given function. For example, the $\sin$ function is
+typically typeset in roman; $\sin x$ looks right, but wouldn't
+$\id{sin} x$ look strange? Yet, on page~42, $\Theta(g(n))$ looks
+right, but $\Theta(\textrm{g}(n))$ would look wrong, since $g$ is a
+variable that stands for any one of a number of functions.
+
+As with the other commands for names, a dash within a function name will
+typeset as a hyphen, so that \verb`$\func{out-degree}$` will produce
+$\func{out-degree}$ rather than $\textrm{out}-\textrm{degree}$. Note
+that \LaTeXe{} provides commands for many fixed functions, such as
+$\sin$ and $\log$; Table 3.9 on page~44 of~\cite{Lamport93} lists
+these ``log-like'' functions.
+
+\end{description}
+
+There is one other command that doesn't really fit anywhere else, so
+I'll mention it here. We denote subarrays with the ``$\twodots$''
+notation, which is produced by the \verb`\twodots` command. Thus, the
+source text \verb`$A[1 \twodots j-1]$` will produce $A[1 \twodots
+j-1]$. The \verb`\twodots` command must be used in math mode.
+
+\section{The \Codebox{} environment}
+\label{sec:codebox}
+
+We typeset pseudocode by putting it in a \Codebox{} environment. A
+\Codebox{} is a section of code that will not break across pages (I
+hope).
+
+\subheading{Contents of a \Codebox{}}
+
+Each procedure should go in a separate \Codebox{}, even if you have
+multiple procedures appearing consecutively. The only possible reason
+I can think of to put more than one procedure in a single \Codebox{}
+is to ensure that the procedures appear on the same page. If you
+really need your procedures to appear on the same page, there are
+other means in \LaTeXe, such as the \texttt{minipage} environment,
+that you can use. Moreover, if you have written your procedures so
+that they have to appear on the same page, you should probably be
+asking yourself whether they are too interdependent.
+
+The typical structure within a \Codebox{} is as follows. Usually, the
+first line is the name of a procedure, along with a list of
+parameters. (Not all \Codebox{}es include procedure names; for
+example, see the pseudocode near the bottom of page~306 of CLRS\@.)
+After the line containing the procedure name comes one or more lines
+of code, usually numbered. Some of the lines may be unnumbered, being
+continuations of previous lines. In rare cases, when there is just
+one line of code per procedure, we don't bother numbering the line;
+see the \proc{Parent}, \proc{Left}, and \proc{Right} procedures on
+page~128 for example. Lines are usually numbered starting from~1, but
+again there are exceptions, such as the pseudocode near the bottom of
+page~306.
+
+\subheading{Using \texttt{$\backslash$Procname} to name the procedure}
+
+The \verb`\Procname` command specifies the name of the procedure. It
+takes as a parameter the procedure name and parameters, typically all
+in math mode. \verb`\Procname` makes its argument flush left against
+the margin, and it leaves a little bit of extra space below the line.
+For example, here is how we typeset the \proc{Insertion-Sort}
+procedure on page~17:
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Insertion-Sort}(A)$}
+\li \For $j \gets 2$ \To $\id{length}[A]$
+\li \Do
+ $\id{key} \gets A[j]$
+\li \Comment Insert $A[j]$ into the sorted sequence
+ $A[1 \twodots j-1]$.
+\li $i \gets j-1$
+\li \While $i > 0$ and $A[i] > \id{key}$
+\li \Do
+ $A[i+1] \gets A[i]$
+\li $i \gets i-1$
+ \End
+\li $A[i+1] \gets \id{key}$
+ \End
+\end{codebox}
+\end{verbatim}
+}
+
+\subheading{Using \texttt{$\backslash$li} and \texttt{$\backslash$zi}
+to start new lines}
+
+To start a new, numbered line, use the \verb`\li` command. To start a
+new, \emph{un}numbered line, use the \verb`\zi` command. Note that
+since a \Codebox{} is not like the \verb`verbatim` environment, the
+line breaks within the source text do not correspond to the line
+breaks in the typeset output.
+
+\subheading{Tabs}
+
+I find that it is best to set the tab stops to every 4 characters when
+typing in and displaying pseudocode source with the \clrscode{}
+package. I use emacs, and to get the tabs set up the way I want them,
+my \mbox{\texttt{tex-mode.el}} file includes the line
+\verb`(setq tab-width 4)`. For reasons I do not understand, sometimes
+emacs ``forgets'' this setting, and I have to do a little friendly
+persuasion.
+
+A \Codebox{} environment has a \verb`tabbing` environment within it.
+The tab stops come in pairs, in that each pair of tab stops gives one
+level of indentation. Tab stops are paired up so that when we typeset
+the keywords \kw{then} and \kw{else}, they have the correct vertical
+alignment. In other words, within each pair of tab stops, the first
+stop is where \kw{then} and \kw{else} begin, and the second stop
+completes a full level of indentation. For the most part, you won't
+need to be concerned with tabs. The primary exception is when you
+want to include a comment at the end of a line of pseudocode, and
+especially when you want to include comments after several lines and
+you want the comments to vertically align. Note that the
+\verb`tabbing` environment within a codebox has nothing to do with
+tabs that you enter in your source code; when you press the TAB key,
+that's the same as pressing the space bar in the eyes of \LaTeXe{}.
+
+\subheading{Commands for keywords}
+
+As you can see from the source for \proc{Insertion-Sort}, there are
+commands \verb`\For`, \verb`\Do`, and \verb`\While` that produce the
+keywords \kw{for}, \kw{do}, and \kw{while}. \verb`\Do` and some other
+commands also affect indentation.
+
+Sometimes you want to include a keyword in the main text, as I have
+done in several places in this document. Use the \verb`\kw` command
+to do so. For example, to produce a sentence that appeared two
+paragraphs ago, I typed in the following:
+
+{\small
+\begin{verbatim}
+Tab stops are paired up so that when we typeset the keywords \kw{then}
+and \kw{else}, they have the correct vertical alignment.
+\end{verbatim}
+}
+
+The following commands simply produce their corresponding keywords,
+typeset in boldface: \verb`\For`, \verb`\To`, \verb`\Downto`,
+\verb`\By`, \verb`\While`, \verb`\If`, \verb`\Return`, \verb`\Goto`,
+and \verb`\Error`. Although you could achieve the same effect with
+the \verb`\kw` command (e.g., \verb`\kw{for}` instead of \verb`\For`),
+you will find it easier and more readable to use the above commands.
+The \verb`\Comment` command simply produces the comment symbol~$\rhd$.
+None of the above commands affects indentation.
+
+In \kw{for} loops and \kw{while} loops, the important commands are
+\verb`\Do` and \verb`\End`. \verb`\Do` produces the keyword \kw{do},
+and it also increments the indentation level. \verb`\End` simply
+decrements the indentation level, and it is the way to end any
+\kw{for} or \kw{while} loop or otherwise decrement the indentation
+level.
+
+As you can see from the above example, I like to place each \verb`\Do`
+and \verb`\End` on its own line. You can of course format your source
+text as you like, but I find that the way I format pseudocode makes it
+easy to match up \verb`\Do`-\verb`\End` pairs.
+
+We also use \verb`\End` to terminate an \kw{if}-\kw{then} or
+\kw{if}-\kw{then}-\kw{else} construct. For an example of
+\kw{if}-\kw{then}, here's the \proc{Merge-Sort} procedure on page~32:
+
+\newpage
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Merge-Sort}(A, p, r)$}
+\li \If $p < r$
+\li \Then
+ $q \gets \floor{(p + r) / 2}$
+\li $\proc{Merge-Sort}(A, p, q)$
+\li $\proc{Merge-Sort}(A, q+1, r)$
+\li $\proc{Merge}(A, p, q, r)$
+ \End
+\end{codebox}
+\end{verbatim}
+}
+
+\noindent For a more complicated example, using
+\kw{if}-\kw{then}-\kw{else}, here's the \proc{Tree-Insert} procedure
+on page~261:
+
+{\footnotesize
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Tree-Insert}(T,z)$}
+\li $y \gets \const{nil}$
+\li $x \gets \id{root}[T]$
+\li \While $x \neq \const{nil}$
+\li \Do
+ $y \gets x$
+\li \If $\id{key}[z] < \id{key}[x]$
+\li \Then $x \gets \id{left}[x]$
+\li \Else $x \gets \id{right}[x]$
+ \End
+ \End
+\li $p[z] \gets y$
+\li \If $y = \const{nil}$
+\li \Then
+ $\id{root}[T] \gets z$\>\>\>\>\>\>\>\>\Comment Tree $T$ was empty
+\li \Else
+ \If $\id{key}[z] <\ id{key}[y]$
+\li \Then $\id{left}[y]\ gets z$
+\li \Else $\id{right}[y] \gets z$
+ \End
+ \End
+\end{codebox}
+\end{verbatim}
+}
+
+\noindent As you can see, I like to line up the \verb`\End` commands
+under the \verb`\Then` and \verb`\Else` commands. I could just as
+easily have chosen to line up \verb`\End` under the \verb`\If` command
+instead. I also sometimes elect to put the ``then'' or ``else'' code
+on the same source line as the \verb`\Then` or \verb`\Else` command,
+especially when that code is short.
+
+The \proc{Tree-Insert} example also shows how we put a comment on the
+same line as code. Via the tab command \verb`\>`, we explicitly tab
+to where we want the comment to begin and then use the \verb`\Comment`
+command to produce the comment symbol. When there are several lines
+with comments, you probably want them to align vertically. I just add
+tab characters, using a trial-and-error approach, until I am pleased
+with the result. For example, here's how we produced the
+\proc{KMP-Matcher} procedure on page~926:
+
+\newpage
+
+{\footnotesize
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{KMP-Matcher}(T,P)$}
+\li $n \gets \id{length}[T]$
+\li $m \gets \id{length}[P]$
+\li $\pi \gets \proc{Compute-Prefix-Function}(P)$
+\li $q \gets 0$\>\>\>\>\>\>\>\>\>\>\Comment Number of characters matched.
+\li \For $i \gets 1$ \To $n$\>\>\>\>\>\>\>\>\>\>\Comment
+ Scan the text from left to right.
+\li \Do
+ \While $q > 0$ and $\Px{q+1} \neq \Tx{i}$
+\li \Do $q \gets \pi[q]$\>\>\>\>\>\>\Comment Next character does not match.
+ \End
+\li \If $\Px{q+1} = \Tx{i}$
+\li \Then $q \gets q+1$\>\>\>\>\>\>\Comment Next character matches.
+ \End
+\li \If $q = m$\>\>\>\>\>\>\>\>\Comment Is all of $P$ matched?
+\li \Then
+ print ``Pattern occurs with shift'' $i-m$
+\li $q \gets \pi[q]$\>\>\>\>\>\>\Comment Look for the next match.
+ \End
+ \End
+\end{codebox}
+\end{verbatim}
+}
+
+\noindent All six comments align nicely.
+
+For a \kw{repeat} loop, use the \verb`\Repeat` and \verb`\Until`
+commands, as in the \proc{Hash-Insert} procedure on page~238:
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Hash-Insert}(T,k)$}
+\li $i \gets 0$
+\li \Repeat
+ $j \gets h(k,i)$
+\li \If $T[j] = \const{nil}$
+\li \Then
+ $T[j]\gets k$
+\li \Return $j$
+\li \Else
+ $i \gets i+1$
+ \End
+\li \Until $i = m$
+\li \Error ``hash table overflow''
+\end{codebox}
+\end{verbatim}
+}
+
+\noindent Note that the \verb`\Until` command has an implied
+\verb`\End`.
+
+Sometimes, you need more complicated ``\kw{if}-ladders'' than you can
+get from the \verb`\Then` and \verb`\Else` commands. The
+\proc{Randomized-Select} procedure on page~186 provides an example,
+and it uses the \verb`\ElseIf` and \verb`\ElseNoIf` commands:
+
+\newpage
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Randomized-Select}(A, p, r, i)$}
+\li \If $p = r$
+\li \Then \Return $A[p]$
+ \End
+\li $q \gets \proc{Randomized-Partition}(A, p, r)$
+\li $k \gets q - p +1$
+\li \If $i = k$\>\>\>\>\Comment the pivot value is the answer
+\li \Then \Return $A[q]$
+\li \ElseIf $i < k$
+\li \Then \Return $\proc{Randomized-Select}(A, p, q-1, i)$
+\li \ElseNoIf \Return $\proc{Randomized-Select}(A, q+1, r, i-k)$
+ \End
+\end{codebox}
+\end{verbatim}
+}
+
+\noindent For an \kw{if}-ladder, use \verb`\Then` for the first case,
+\verb`\ElseNoIf` for the last case, and \verb`\ElseIf` for all
+intermediate cases. An \kw{if}-ladder is terminated by \verb`\End`.
+As another example, here is the \proc{Segments-Intersect} procedure on
+page~937:
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Segments-Intersect}(p_1, p_2, p_3, p_4)$}
+\li $d_1 \gets \proc{Direction}(p_3, p_4, p_1)$
+\li $d_2 \gets \proc{Direction}(p_3, p_4, p_2)$
+\li $d_3 \gets \proc{Direction}(p_1, p_2, p_3)$
+\li $d_4 \gets \proc{Direction}(p_1, p_2, p_4)$
+\li \If $((d_1 > 0 \mbox{ and } d_2 < 0) \mbox{ or }
+ (d_1 < 0 \mbox{ and } d_2 > 0))$ and
+ \Indentmore
+\zi $((d_3 > 0 \mbox{ and } d_4 < 0) \mbox{ or }
+ (d_3 < 0 \mbox{ and } d_4 > 0))$
+ \End
+\li \Then \Return \const{true}
+\li \ElseIf $d_1 = 0$ and $\proc{On-Segment}(p_3, p_4, p_1)$
+\li \Then \Return \const{true}
+\li \ElseIf $d_2 = 0$ and $\proc{On-Segment}(p_3, p_4, p_2)$
+\li \Then \Return \const{true}
+\li \ElseIf $d_3 = 0$ and $\proc{On-Segment}(p_1, p_2, p_3)$
+\li \Then \Return \const{true}
+\li \ElseIf $d_4 = 0$ and $\proc{On-Segment}(p_1, p_2, p_4)$
+\li \Then \Return \const{true}
+\li \ElseNoIf \Return \const{false}
+ \End
+\end{codebox}
+\end{verbatim}
+}
+
+This example also shows our first use of an unnumbered line: the
+second half of the tests on line~5. We use \verb`\zi` to indicate
+that we're starting an unnumbered line.
+
+\subheading{Indentation}
+
+We also wish to indent the unnumbered line after line~5 by one level
+more than the line above it. We do so with the \verb`\Indentmore`
+command. The \verb`\End` command following the indented line
+decrements the indentation level back to what it was prior to the
+\verb`\Indentmore`. If I had wanted to indent the line by two levels,
+I would have used two \verb`\Indentmore` commands before the line and
+two \verb`\End` commands afterward. (Recall that \verb`\End` simply
+decrements the indentation level.)
+
+Upon seeing the \verb`\end{codebox}` command, the \Codebox{}
+environment checks that the indentation level is back to where it was
+when it started, namely an indentation level of~0. If it is not, you
+will get a warning message like the following:
+
+{\small
+\begin{verbatim}
+Warning: Indentation ends at level 1 in codebox on page 1.
+\end{verbatim}
+}
+
+\noindent This message would indicate that there is one missing
+\verb`\End` command. On the other hand, you might have one too many
+\verb`\End` commands, in which case you would get
+
+{\small
+\begin{verbatim}
+Warning: Indentation ends at level -1 in codebox on page 1.
+\end{verbatim}
+}
+
+\subheading{Right justification}
+
+The final two commands, \verb`\RComment` and \verb`\Flushright`, are
+infrequently used and pertain to right justification.
+\verb`\RComment` produces a comment that is flush against the right
+margin. For example, here is how we typeset the
+\proc{Binomial-Heap-Union} procedure on page~463:
+
+\newpage
+
+{\footnotesize
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Binomial-Heap-Union}(H_1,H_2)$}
+\li $H \gets \proc{Make-Binomial-Heap}()$
+\li $\id{head}[H] \gets \proc{Binomial-Heap-Merge}(H_1,H_2)$
+\li free the objects $H_1$ and $H_2$ but not the lists they point to
+\li \If $\id{head}[H] = \const{nil}$
+\li \Then \Return $H$
+ \End
+\li $\id{prev-x} \gets \const{nil}$
+\li $x \gets \id{head}[H]$
+\li $\id{next-x} \gets \id{sibling}[x]$
+\li \While $\id{next-x} \neq \const{nil}$
+\li \Do
+ \If $(\id{degree}[x] \neq \id{degree}[\id{next-x}])$ or
+\zi \Flushright $(\id{sibling}[\id{next-x}] \neq \const{nil}$
+ and $\id{degree}[\id{sibling}[\id{next-x}]] = \id{degree}[x])$
+\li \Then
+ $\id{prev-x} \gets x$
+ \RComment Cases 1 and 2
+\li $x \gets \id{next-x}$
+ \RComment Cases 1 and 2
+\li \Else
+ \If $\id{key}[x] \leq \id{key}[\id{next-x}]$
+\li \Then
+ $\id{sibling}[x] \gets \id{sibling}[\id{next-x}]$
+ \RComment Case 3
+\li $\proc{Binomial-Link}(\id{next-x},x)$
+ \RComment Case 3
+\li \Else
+ \If $\id{prev-x} = \const{nil}$
+ \RComment Case 4
+\li \Then $\id{head}[H] \gets \id{next-x}$
+ \RComment Case 4
+\li \Else $\id{sibling}[\id{prev-x}] \gets
+ \id{next-x}$
+ \RComment Case 4
+ \End
+\li $\proc{Binomial-Link}(x,\id{next-x})$
+ \RComment Case 4
+\li $x \gets \id{next-x}$
+ \RComment Case 4
+ \End
+ \End
+\li $\id{next-x} \gets \id{sibling}[x]$
+ \End
+\li \Return $H$
+\end{codebox}
+\end{verbatim}
+}
+
+\noindent This procedure is also the only place in CLRS in which we
+used the \verb`\Flushright` command. It puts the unnumbered line
+following line~10 flush against the right margin.
+
+\subheading{Referencing line numbers}
+
+In the source files for CLRS, there are no absolute references to line
+numbers. We use \emph{only} symbolic references. The \Codebox{}
+environment is set up to allow you to place \verb`\label` commands on
+lines of pseudocode and then reference these labels. The references
+will resolve to the line numbers. Our convention is that any label
+for a line number begins with \verb`\li:`, but you can name the labels
+any way that you like.
+
+For example, here's how we \emph{really} wrote the
+\proc{Insertion-Sort} procedure on page~17:
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Insertion-Sort}(A)$}
+\li \For $j \gets 2$ \To $\id{length}[A]$
+ \label{li:ins-sort-for}
+\li \Do $\id{key} \gets A[j]$ \label{li:ins-sort-pick}
+ \label{li:ins-sort-for-body-begin}
+\li \Comment Insert $A[j]$ into the sorted sequence
+ $A[1 \twodots j-1]$.
+\li $i \gets j-1$ \label{li:ins-sort-find-begin}
+\li \While $i > 0$ and $A[i] > \id{key}$
+ \label{li:ins-sort-while}
+\li \Do
+ $A[i+1] \gets A[i]$ \label{li:ins-sort-while-begin}
+\li $i \gets i-1$ \label{li:ins-sort-find-end}
+ \label{li:ins-sort-while-end}
+ \End
+\li $A[i+1] \gets \id{key}$ \label{li:ins-sort-ins}
+ \label{li:ins-sort-for-body-end}
+ \End
+\end{codebox}
+\end{verbatim}
+}
+
+\noindent Note that any line may have multiple labels. As an example
+of referencing these labels, here's the beginning of the first item
+under ``Pseudocode conventions'' on page~19:
+
+{\small
+\begin{verbatim}
+\item For example, the body of the \kw{for} loop that begins on
+line~\ref{li:ins-sort-for} consists of lines
+\ref{li:ins-sort-for-body-begin}--\ref{li:ins-sort-for-body-end},
+and the body of the \kw{while} loop that begins on
+line~\ref{li:ins-sort-while} contains lines
+\ref{li:ins-sort-while-begin}--\ref{li:ins-sort-while-end} but
+not line~\ref{li:ins-sort-for-body-end}.
+\end{verbatim}
+}
+
+\subheading{Setting line numbers}
+
+On rare occasions, we needed to start line numbers somewhere other
+than~1. Use the \verb`setlinenumber` command to set the next line
+number. For example, in Exercise~24.2-2 on page~594, we want the line
+number to be the same as a line number within the
+\proc{Dag-Shortest-Paths} procedure on page~592. Here's the source
+for the exercise:
+
+{\small
+\begin{verbatim}
+Suppose we change line~\ref{li:dag-sp-loop-begin} of
+\proc{Dag-Shortest-Paths} to read
+
+\begin{codebox}
+\setlinenumber{li:dag-sp-loop-begin}
+\li \For the first $\card{V}-1$ vertices, taken in topologically sorted order
+\end{codebox}
+Show that the procedure would remain correct.
+\end{verbatim}
+}
+
+\noindent The \proc{Dag-Shortest-Paths} procedure is
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Dag-Shortest-Paths}(G,w,s)$}
+\li topologically sort the vertices of $G$ \label{li:dag-sp-topo-sort}
+\li $\proc{Initialize-Single-Source}(G,s)$ \label{li:dag-sp-init}
+\li \For each vertex $u$, taken in topologically sorted order
+ \label{li:dag-sp-loop-begin}
+\li \Do
+ \For each vertex $v \in \id{Adj}[u]$
+ \label{li:dag-sp-inner-begin}
+\li \Do $\proc{Relax}(u,v,w)$ \label{li:dag-sp-loop-end}
+ \End
+ \End
+\end{codebox}
+\end{verbatim}
+}
+
+Even more rarely (just once, in fact), we needed to set a line number
+to be some other line number plus an offset. That was in the two
+lines of pseudocode near the bottom of page~306, where the first line
+number had to be one greater than the number of the last line of
+\proc{Left-Rotate} on page~278. Use the \verb`setlinenumberplus`
+command:
+
+{\footnotesize
+\begin{verbatim}
+\begin{codebox}
+\setlinenumberplus{li:left-rot-parent}{1}
+\li $\id{size}[y] \gets \id{size}[x]$
+\li $\id{size}[x] \gets \id{size}[\id{left}[x]] + \id{size}[\id{right}[x]] + 1$
+\end{codebox}
+\end{verbatim}
+}
+
+\noindent Here, the last line of \proc{Left-Rotate} has
+\verb`\label{li:left-rot-parent}`.
+
+\section{Reporting bugs}
+\label{sec:bugs}
+
+If you find errors in the \clrscode{} package, please send me email
+(thc(a)cs.dartmouth.edu). It would be best if your message included
+everything I would require to elicit the error myself.
+
+The \texttt{clrscode.sty} file contains the following disclaimer:
+
+{\small
+\begin{verbatim}
+% Written for general distribution by Thomas H. Cormen, June 2003.
+
+% The author grants permission for anyone to use this macro package and
+% to distribute it unchanged without further restriction. If you choose
+% to modify this package, you must indicate that you have modified it
+% prior to your distributing it. I don't want to get bug reports about
+% changes that *you* have made!
+\end{verbatim}
+}
+
+\noindent I have enough trouble keeping up with my own bugs; I don't
+want to hear about bugs that others have introduced in the package!
+
+\section{Revision history}
+
+\begin{itemize}
+
+\item 11 June 2003. Initial revision of document and code.
+
+\end{itemize}
+
+\begin{thebibliography}{9}
+
+\bibitem{CLRS01} Thomas H. Cormen, Charles E. Leiserson, Ronald L.
+Rivest, and Clifford Stein. \textit{Introduction to Algorithms},
+second edition. The MIT Press and McGraw-Hill, 2001.
+
+\bibitem{Lamport93} Leslie Lamport. \textit{\LaTeX: A Document
+Preparation System User's Guide and Reference Manual}.
+Addison-Wesley, 1993.
+
+\end{thebibliography}
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/clrscode/page.tex new/doc/latex/clrscode/page.tex
--- old/doc/latex/clrscode/page.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/clrscode/page.tex 2019-05-15 22:38:29.000000000 +0200
@@ -0,0 +1,18 @@
+\setlength{\oddsidemargin}{0in}
+\setlength{\evensidemargin}{0in}
+\setlength{\textwidth}{6.5in}
+\setlength{\topmargin}{0in}
+\setlength{\textheight}{8.5in}
+\setlength{\headheight}{0pt}
+\setlength{\headsep}{0pt}
+
+\setcounter{topnumber}{3}%
+\def\topfraction{.7}%
+\setcounter{bottomnumber}{1}
+\def\bottomfraction{.3}
+\setcounter{totalnumber}{5}%
+\def\textfraction{.1}% was .2
+\def\floatpagefraction{.7}% was .7
+\setcounter{dbltopnumber}{2}
+\def\dbltopfraction{.7}
+\def\dblfloatpagefraction{.5}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/clrscode.doc.tlpobj new/tlpkg/tlpobj/clrscode.doc.tlpobj
--- old/tlpkg/tlpobj/clrscode.doc.tlpobj 2019-02-28 03:25:54.000000000 +0100
+++ new/tlpkg/tlpobj/clrscode.doc.tlpobj 2019-05-16 01:38:19.000000000 +0200
@@ -1,8 +1,10 @@
name clrscode.doc
category Package
-revision 15878
+revision 51136
shortdesc doc files of clrscode
relocated 1
-docfiles size=11
+docfiles size=19
RELOC/doc/latex/clrscode/README
RELOC/doc/latex/clrscode/clrscode.pdf
+ RELOC/doc/latex/clrscode/clrscode.tex
+ RELOC/doc/latex/clrscode/page.tex
++++++ clrscode.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/clrscode.tlpobj new/tlpkg/tlpobj/clrscode.tlpobj
--- old/tlpkg/tlpobj/clrscode.tlpobj 2019-02-28 03:25:54.000000000 +0100
+++ new/tlpkg/tlpobj/clrscode.tlpobj 2019-05-16 01:38:19.000000000 +0200
@@ -1,6 +1,6 @@
name clrscode
category Package
-revision 15878
+revision 51136
shortdesc Typesets pseudocode as in Introduction to Algorithms
relocated 1
longdesc This package allows you to typeset pseudocode in the style of
@@ -13,7 +13,7 @@
RELOC/tex/latex/clrscode/clrscode.sty
catalogue-also newalg clrscode3e
catalogue-ctan /macros/latex/contrib/clrscode
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-05-15 17:29:17 +0200
catalogue-license lppl
catalogue-topics pseudocode
catalogue-version 1.7
++++++ clrscode3e.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/clrscode3e/README.TEXLIVE new/doc/latex/clrscode3e/README.TEXLIVE
--- old/doc/latex/clrscode3e/README.TEXLIVE 2014-08-10 01:20:30.000000000 +0200
+++ new/doc/latex/clrscode3e/README.TEXLIVE 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-The following files have been removed in the TeX Live installation of
-the current package, typically due to duplication, lack of space, or
-missing source code. You can find these files on CTAN at
- http://mirror.ctan.org/macros/latex/contrib/clrscode3e
-If questions or concerns, email tex-live(a)tug.org.
-
- clrscode3e.pdf
Binary files old/doc/latex/clrscode3e/clrscode3e.pdf and new/doc/latex/clrscode3e/clrscode3e.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/clrscode3e/clrscode3e.tex new/doc/latex/clrscode3e/clrscode3e.tex
--- old/doc/latex/clrscode3e/clrscode3e.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/clrscode3e/clrscode3e.tex 2019-05-15 22:38:43.000000000 +0200
@@ -0,0 +1,999 @@
+\documentclass[11pt]{article}
+\usepackage{times}
+\usepackage[mtpcal,mtphrb,zswash,subscriptcorrection]{mtpro2}
+\usepackage{clrscode3e}
+\usepackage{url}
+\urlstyle{rm}
+\input{page}
+
+\newcommand{\subheading}[1]{\subsubsection*{#1}}
+\newcommand{\clrscodethree}{\texttt{clrscode3e}}
+\newcommand{\Codebox}{\texttt{codebox}}
+\newcommand{\defn}[1]{\textit{\textbf{#1}}}
+
+\begin{document}
+
+\title{Using the \clrscodethree{} Package in \LaTeXe}
+\author{Thomas H. Cormen \\ thc(a)cs.dartmouth.edu}
+\date{February 20, 2018}
+
+\maketitle
+
+\section{Introduction}
+\label{sec:intro}
+
+This document describes how to use the \clrscodethree{} package in
+\LaTeXe{} to typeset pseudocode in the style of \textit{Introduction
+to Algorithms}, Third edition, by Cormen, Leiserson, Rivest, and Stein
+(CLRS 3/e) \cite{CLRS09}. You use the commands\footnote{We use the
+term ``command'' rather than ``macro'' throughout this document,
+though ``macro'' would work just as well.} in the same way we did in
+writing CLRS 3/e, and your output will look just like the pseudocode
+in the text.
+
+\section{Setup}
+\label{sec:setup}
+
+To get the \clrscodethree{} package, download
+\url{http://www.cs.dartmouth.edu/~thc/clrscode/clrscode3e.sty}, and
+put it where it will be found when you run \LaTeXe{}. To use the
+package, include the following line in your source file:
+
+{\small
+\begin{verbatim}
+\usepackage{clrscode3e}
+\end{verbatim}
+}
+
+\noindent The \clrscodethree{} package itself includes the line
+
+{\small
+\begin{verbatim}
+\RequirePackage{graphics} % needed for \scalebox command
+\end{verbatim}
+}
+
+\noindent This line is necessary in order to get the right spacing for
+the $\isequal$ symbol that we use for equality tests. Therefore, you
+will need to have the \texttt{graphics} package installed and
+available on your system.
+
+\section{Typesetting names}
+\label{sec:names}
+
+Pseudocode in CLRS 3/e uses four types of names: identifiers,
+procedures, constants, and fixed functions. We provide commands
+\verb`\id`, \verb`\proc`, \verb`\const`, and \verb`\func` for these
+names. Each of these commands takes one argument, which is the name
+being typeset. These commands work both in and out of math mode.
+When used in math mode, and when the name given as an argument
+contains a dash, the dash is typeset as a hyphen rather than as a
+minus sign.
+
+\begin{description}
+
+\item[Identifiers:] Use identifiers for variable names of more than
+one character. When a variable name is just a single character, e.g.,
+the identifier~$j$ in line~1 of \proc{Insertion-Sort} on page~18, we
+just typeset it in math mode rather than using the \verb`\id` command:
+\verb`$j$`.
+
+\sloppy
+
+Do not typeset identifiers consisting of two or more characters, e.g.,
+the variable \id{key} in line~2 of \proc{Insertion-Sort}, in this way.
+(See page~51 of Lamport \cite{Lamport93}.) Although \LaTeXe{}
+provides the \verb`\mathit` command for typesetting multiletter
+identifiers, use our \verb`\id` command instead: \verb`\id{key}`,
+rather than \verb`\mathit{key}` or---horrors!---\verb`$key$`. Since
+the \verb`\id` command may be used both in and out of math mode, the
+source text
+
+\fussy
+
+{\small
+\begin{verbatim}
+Line~5 uses the variable \id{key} in the test $A[i] > \id{key}$.
+\end{verbatim}
+}
+
+\noindent will produce
+\begin{quote}
+Line~5 uses the variable \id{key} in the test $A[i] > \id{key}$.
+\end{quote}
+
+To see how a dash turns into a hyphen, consider line~1 of
+\proc{Find-Max-Crossing-Subarray} on page~71. It contains the
+variable \id{left-sum}. Typesetting this variable name by
+\verb`\id{left-sum}` produces a hyphen in the identifier, but
+typesetting it by \verb`\mathit{left-sum}` would produce
+$\mathit{left-sum}$, with a minus sign---rather than a hyphen---in the
+identifier.
+
+\item[Procedures:] For procedure names, use the \verb`\proc` command.
+It typesets procedure names in small caps, and dashes (which occur
+frequently in our procedure names) are typeset as hyphens. Thus, the
+source \verb`\proc{Insertion-Sort}` produces \proc{Insertion-Sort}.
+Since you can use the \verb`\proc` command both in and out of math mode,
+the source text
+
+{\small
+\begin{verbatim}
+We call \proc{Insertion-Sort} with an array $A$, so that the
+call is $\proc{Insertion-Sort}(A)$.
+\end{verbatim}
+}
+
+\noindent will produce
+\begin{quote}
+We call \proc{Insertion-Sort} with an array $A$, so that the
+call is $\proc{Insertion-Sort}(A)$.
+\end{quote}
+
+\item[Constants:] We typeset constants such as \const{nil},
+\const{true}, and \const{red} in small caps with the \verb`\const`
+command, e.g., \verb`\const{nil}`, \verb`\const{true}`, and
+\verb`\const{red}`. The \verb`\const` command typesets a dash within
+a constant name as a hyphen, so that, as on page~409,
+\verb`\const{no-such-path}` will produce $\const{no-such-path}$.
+
+\item[Fixed functions:] We typeset the names of fixed functions in
+plain old roman with the \verb`\func` command, e.g., \func{level} and
+\func{out-degree}. By a ``fixed function,'' we mean a function that
+is a specific, given function. For example, the $\sin$ function is
+typically typeset in roman; $\sin x$ looks right, but wouldn't
+$\id{sin}\ x$ look strange? Yet, on page~44, $\Theta(g(n))$ looks
+right, but $\Theta(\textrm{g}(n))$ would look wrong, since $g$ is a
+variable that stands for any one of a number of functions.
+
+As with the other commands for names, a dash within a function name
+will typeset as a hyphen, so that \verb`\func{out-degree}` will
+produce \func{out-degree} rather than $\textrm{out}-\textrm{degree}$.
+Note that \LaTeXe{} provides commands for many fixed functions, such
+as $\sin$ and $\log$; Table 3.9 on page~44 of Lamport \cite{Lamport93}
+lists these ``log-like'' functions.
+
+\end{description}
+
+\section{Typesetting object attributes}
+\label{sec:attributes}
+
+In the first two editions of the book, we used square brackets for
+object attributes. For example, we represented the length of an
+array~$A$ by $\id{length}[A]$. Based on requests from readers, we
+switched to the object-like dot-notation in the third edition, so that
+we now denote the length of array~$A$ by \attrib{A}{length}.
+
+You might think that you could typeset \attrib{A}{length} by
+\verb`$A.\id{length}$`, but that would produce $A.\id{length}$, which
+has not quite enough space after the dot. Therefore, we created a set
+of commands to typeset object attributes. Each one may be used either
+in or out of math mode.
+
+Most of the time, we use the \verb`\attrib` command, which takes two
+arguments: the name of the object and the name of the attribute.
+Let's make a couple of definitions:
+\begin{itemize}
+
+\item An \defn{i-string} is a string that you would use in an
+\verb`\id` command, typically one or more non-Greek letters, numerals,
+or dashes.
+
+\item An \defn{x-string} is a string that you would not use in an
+\verb`\id` command, typically because it has a subscript or one or
+more Greek letters.
+
+\item As a special, and very common, case, a single non-Greek letter
+can count as either an i-string or an x-string.
+
+\end{itemize}
+
+\noindent The \verb`\attrib` command works well when the object name
+is an x-string and the attribute name is an \mbox{i-string}. For
+example, to produce \attrib{A}{length}, use \verb`\attrib{A}{length}`.
+Here, we treat the object name,~$A$, as an x-string. The attribute
+name, \id{length}, is of course an i-string.
+
+If all your objects are x-strings and all your attributes are
+i-strings, then the \verb`\attrib` command will be all you need. We
+provide several other commands for other situations that arose when we
+produced CLRS~3/e.
+
+The four basic attribute commands are \verb`\attribxi`,
+\verb`\attribxx`, \verb`\attribii`, and \verb`\attribix`. Each takes
+two arguments: the object name and the attribute name. The last two
+letters of the command name tell you what type of strings the
+arguments should be. The next-to-last letter tells you about the
+object name, and the last letter tells you about the attribute name.
+\verb`i` indicates that the argument will be treated as an \verb`\id`,
+in which case the command calls the \verb`\id` command and also puts
+the right amount of space between the argument and the dot.
+
+\begin{itemize}
+
+\item You may use \verb`\attribxi` precisely when you would use
+\verb`\attrib`. In fact, \verb`\attrib` is just a call to
+\verb`\attribxi`.
+
+\item Use \verb`\attribxx` when both the object name and attribute
+names are x-strings. For example, you would use \verb`\attribxx` if
+the attribute name has a subscript, so that to produce
+\attribxx{y}{c_i}, you would use \verb`\attribxx{y}{c_i}`. Another
+situation in which you would use \verb`\attribxx` is when the
+attribute name is a Greek letter: to produce \attribxx{v}{\pi}, use
+\verb`\attribxx{v}{\pi}`.
+
+\item If both the object name and attribute name are i-strings, then
+you should use \verb`\attribii`. For example,
+\verb`\attribii{item}{key}` produces \attribii{item}{key}, and
+\verb`\attribii{prev-item}{np}` produces \attribii{prev-item}{np}.
+
+\item If the object name is an i-string and the attribute name is an
+x-string, then use \verb`\attribix`. (We never had this situation
+arise in CLRS 3/e.) But if we had wanted to produce
+\attribix{item}{\pi}, we would have used \verb`\attribix{item}{\pi}`.
+
+\end{itemize}
+
+For convenience, the \clrscodethree{} package also contains commands
+for cascading attributes, such as \attribb{x}{left}{size}. These
+commands string together calls to the appropriate \verb`\attribxi` and
+\verb`\attribxx` commands. The number of arguments they take depends
+on how many attributes you are stringing together.
+
+\begin{itemize}
+
+\item When you have two attributes, use \verb`\attribb`, which takes
+an object name and two attribute names: \verb`\attribb{x}{left}{size}`
+produces \attribb{x}{left}{size}. This command assumes that the
+object name is an x-string and both attribute names are i-strings.
+
+\item For three attributes, use \verb`\attribbb`, which takes an
+object name (an x-string) and three object names (i-strings): to
+produce \attribbb{y}{p}{left}{size}, use
+\verb`\attribbb{y}{p}{left}{size}`.
+
+\item For four attributes, use \verb`\attribbbb`, which is like
+\verb`\attribbb` but with one additional attribute tacked on. We
+never needed to use this command in CLRS 3/e.
+
+\item The \verb`\attribbxxi` command is for one level of cascading
+where the first attribute given is an \mbox{x-string}. For example,
+\verb`\attribbxxi{x}{c_i}{n}` produces \attribbxxi{x}{c_i}{n}.
+
+\end{itemize}
+
+If your cascading attributes do not fit any of these descriptions,
+you'll have to roll your own command from the \verb`\attribxx` and
+\verb`\attribxi` (or \verb`\attrib`) commands. For example, suppose
+you want to produce \attribxx{\attribxi{x}{left}}{\id{key_i}}.
+Because it has a subscript, $\id{key}_i$ is an x-string, and so you
+should not use \verb`\attribb`. Instead, use
+\verb`\attribxx{\attribxi{x}{left}}{\id{key_i}}`. (You could replace
+the call of \verb`\attribxi` by a call of \verb`\attrib`.) Note that
+this call treats $\id{key_i}$ as an attribute of \attrib{x}{left},
+which is correct, rather than treating \attribii{left}{\id{key}_i} as
+an attribute of~$x$, which is not correct.
+
+Edges of a graph can have attributes, too, and the \clrscodethree{}
+package provides two commands for attributes of edges. These commands
+assume that the edges are of the form $(u,v)$, where the vertices $u$
+and~$v$ are x-strings. They take three parameters: the two vertices
+that define the edge and the name of the attribute.
+\begin{itemize}
+
+\item When the attribute name is an i-string, use \verb`\attribe`.
+For example, to produce \attribe{u}{v}{c}, use
+\verb`\attribe{u}{v}{c}`.
+
+\item When the attribute name is an x-string, use \verb`\attribex`.
+For example, to produce \attribex{u}{v}{c'}, use
+\verb`\attribex{u}{v}{c'}`.
+
+\end{itemize}
+
+\section{Miscellaneous commands}
+\label{sec:misc}
+
+The \clrscodethree{} package contains three commands that don't really
+fit anywhere else, so let's handle them here. All three must be used
+in math mode.
+
+\begin{itemize}
+
+\item We denote subarrays with the ``$\twodots$'' notation, which is
+produced by the \verb`\twodots` command. Thus, the source text
+\verb`$A[1 \twodots j-1]$` will produce $A[1 \twodots j-1]$.
+
+\item We use the \verb`\gets` command for the assignment operator.
+For example, line~4 of \proc{Insertion-Sort} on page~18 is
+\verb`$i \gets j - 1$`, producing $i \gets j - 1$.
+
+\item We use the \verb`\isequal` command to test for equality with the
+$\isequal$ symbol. For example, line~1 of
+\proc{Find-Maximum-Subarray} on page~72 contains the test $\id{high}
+\isequal \id{low}$, which we get by typesetting
+\verb`$\id{high} \isequal \id{low}$`.
+
+\end{itemize}
+
+You might wonder why we bother with the \verb`\gets` command when we
+could just typeset an equals sign directly. The answer is that in the
+first two editions of \textit{Introduction to Algorithms}, we used a
+different symbol (a left arrow) for the assignment operator, and it
+made sense to use a command for that. Many readers told us that they
+preferred to use an equals sign for assignment---as many programming
+languages use---and so we made this change for the third edition. But
+it's a good idea to continue using the \verb`\gets` command so that we
+can easily change our assignment operator should we desire to do so in
+the future.
+
+Once we decided to use the equals sign for assignment, we could no
+longer use it for equality tests. We created the \verb`\isequal`
+command for equality tests, and we decided to base it on the double
+equals sign used for equality tests in C, C++, and Java. Typesetting
+it as \verb`==` in math mode produces $==$, which is too wide for our
+tastes. Our \verb`\isequal` command calls the \verb`\scalebox`
+command from the \texttt{graphics} package to narrow the symbol, and
+it puts a nice amount of space between the equals signs: $\isequal$.
+
+\section{The \Codebox{} environment}
+\label{sec:codebox}
+
+We typeset pseudocode by putting it in a \Codebox{} environment. A
+\Codebox{} is a section of code that does not break across pages.
+
+\subheading{Contents of a \Codebox{}}
+
+Each procedure should go in a separate \Codebox{}, even if you have
+multiple procedures appearing consecutively. The only possible reason
+I can think of to put more than one procedure in a single \Codebox{}
+is to ensure that the procedures appear on the same page. If you
+really need your procedures to appear on the same page, then you
+should consider using other means in \LaTeXe, such as the
+\texttt{minipage} environment. Moreover, if you have written your
+procedures so that they have to appear on the same page, you should
+probably be asking yourself whether they are too interdependent.
+
+The typical structure within a \Codebox{} is as follows. Usually, the
+first line is the name of a procedure, along with a list of
+parameters. (Not all \Codebox{}es include procedure names; for
+example, see the pseudocode on page~343 of CLRS 3/e.) After the line
+containing the procedure name come one or more lines of code, usually
+numbered. Some of the lines may be unnumbered, being continuations of
+previous lines. Lines are usually numbered starting from~1, but again
+there are exceptions, such as the pseudocode on page~343.
+
+\subheading{Using \texttt{$\backslash$Procname} to name the procedure}
+
+The \verb`\Procname` command specifies the name of the procedure. It
+takes as a parameter the procedure name and parameters, typically all
+in math mode. \verb`\Procname` makes its argument flush left against
+the margin, and it leaves a little bit of extra space below the line.
+For example, here is how we typeset the \proc{Insertion-Sort}
+procedure on page~18:
+
+\pagebreak
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Insertion-Sort}(A)$}
+\li \For $j \gets 2$ \To $\attrib{A}{length}$
+\li \Do
+ $\id{key} \gets A[j]$
+\li \Comment Insert $A[j]$ into the sorted sequence
+ $A[1 \twodots j-1]$.
+\li $i \gets j-1$
+\li \While $i > 0$ and $A[i] > \id{key}$
+\li \Do
+ $A[i+1] \gets A[i]$
+\li $i \gets i-1$
+ \End
+\li $A[i+1] \gets \id{key}$
+ \End
+\end{codebox}
+\end{verbatim}
+}
+
+\subheading{Using \texttt{$\backslash$li} and \texttt{$\backslash$zi}
+to start new lines}
+
+To start a new, numbered line, use the \verb`\li` command. To start a
+new, \emph{un}numbered line, use the \verb`\zi` command. Note that
+since a \Codebox{} is not like the \verb`verbatim` environment, the
+line breaks within the source text do not correspond to the line
+breaks in the typeset output.
+
+\subheading{Tabs}
+
+I find that it is best to set the tab stops in the text editor to
+every 4 characters when typing in and displaying pseudocode source
+with the \clrscodethree{} package. I use emacs, and to get the tabs
+set up the way I want them, my \mbox{\texttt{tex-mode.el}} file
+includes the line \verb`(setq tab-width 4)`.
+
+A \Codebox{} environment has a \verb`tabbing` environment within it.
+Each tab stop gives one level of indentation. We designed the
+indentation so that the body of an \kw{else} clause starts at just the
+right indentation. For the most part, you won't need to be concerned
+with tabs. The primary exception is when you want to include a
+comment at the end of a line of pseudocode, and especially when you
+want to include comments after several lines and you want the comments
+to vertically align.
+
+If you used the \texttt{clrscode} package from the second edition of
+the book, you might notice different tabbing behavior when you port
+your pseudocode to the \clrscodethree{} package. Where the
+\texttt{clrscode} package used two tab stops for each level of loop
+indentation, the \clrscodethree{} package uses just one tab stop. We
+made this change in the \clrscodethree{} package because the third
+edition eliminates the keyword \kw{then} and left-aligns \kw{else}
+with its corresponding \kw{if}.
+
+Note that the \verb`tabbing` environment within a codebox has nothing
+to do with tabs that you enter in your source code; when you press the
+TAB key, that's the same as pressing the space bar in the eyes of
+\LaTeXe{}.
+
+\subheading{Commands for keywords}
+
+As you can see from the source for \proc{Insertion-Sort}, the commands
+\verb`\For` and \verb`\While` produce the keywords \kw{for} and
+\kw{while} in boldface within a \Codebox{}.
+
+Sometimes you want to include a keyword in the main text, as I have
+done in several places in this document. Use the \verb`\kw` command
+to do so. For example, to produce the previous paragraph, I typed in
+the following:
+
+{\small
+\begin{verbatim}
+As you can see from the source for \proc{Insertion-Sort}, the commands
+\verb`\For` and \verb`\While` produce the keywords \kw{for} and
+\kw{while} in boldface within a \texttt{codebox}.
+\end{verbatim}
+}
+
+The following commands simply produce their corresponding keywords,
+typeset in boldface: \verb`\For`, \verb`\To`, \verb`\Downto`,
+\verb`\By`, \verb`\While`, \verb`\If`, \verb`\Return`, \verb`\Goto`
+(which does not appear in CLRS 3/e, but you might wish to use),
+\verb`\Error`, \verb`\Spawn`, \verb`\Sync`, and \verb`\Parfor` (which
+produces the compound keyword \mbox{\kw{parallel~for}}). Although you
+could achieve the same effect with the \verb`\kw` command (e.g.,
+\verb`\kw{for}` instead of \verb`\For`), you will find it easier and
+more readable to use the above commands in pseudocode. The
+\verb`\Comment` command simply produces the comment symbol
+\CommentSymbol, followed by a space. To get the comment symbol
+without a following space, use \verb`\CommentSymbol`. None of the
+above commands affects indentation.
+
+\subheading{Loops}
+
+The \proc{Insertion-Sort} example above shows typical ways to typeset
+\kw{for} and \kw{while} loops. In these loops, the important commands
+are \verb`\Do` and \verb`\End`. \verb`\Do` increments the indentation
+level to start the body. Put \verb`\Do` on a line starting with
+\verb`\li`, but don't put either \verb`\li` or \verb`\zi` between the
+\verb`\Do` command and the first statement of the loop body. Use
+\verb`\li` or \verb`\zi` in front of all loop-body statements after
+the first one. \verb`\End` simply decrements the indentation level,
+and you use it to end any \kw{for} or \kw{while} loop, or otherwise
+decrement the indentation level.
+
+In the first two editions of the book, the body of a \kw{for} or
+\kw{while} loop began with the keyword \kw{do}. Responding to
+requests from readers to make pseudocode more like C, C++, and Java,
+we eliminated this keyword in the third edition.
+
+As you can see from the above example, I like to place each \verb`\Do`
+and \verb`\End` on its own line. You can format your source text any
+way you like, but I find that the way I format pseudocode makes it
+easy to match up \verb`\Do`-\verb`\End` pairs.
+
+If you want your \kw{for} loop to decrease the loop variable in each
+iteration, use \verb`\Downto` rather than \verb`\To`. If you want the
+stride to be a value other than~$1$, use the \verb`\By` command. For
+example, line~6 of \proc{Iterative-FFT} on page~917 is typeset as
+\begin{verbatim}
+\For $k \gets 0$ \To $n-1$ \By $m$
+\end{verbatim}
+
+Loops that use the \kw{repeat}-\kw{until} structure are a bit
+different. We use the \verb`\Repeat` and \verb`\Until`
+commands, as in the \proc{Hash-Insert} procedure on page~270:
+
+\pagebreak
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Hash-Insert}(T,k)$}
+\li $i \gets 0$
+\li \Repeat
+\li $j \gets h(k,i)$
+\li \If $T[j] \isequal \const{nil}$
+\li \Then
+ $T[j] \gets k$
+\li \Return $j$
+\li \Else
+ $i \gets i+1$
+ \End
+\li \Until $i \isequal m$
+\li \Error ``hash table overflow''
+\end{codebox}
+\end{verbatim}
+}
+
+\noindent Note that the \verb`\Until` command has an implied
+\verb`\End`.
+
+\subheading{Typesetting \kw{if} statements}
+
+As you can see from the above example of \proc{Hash-Insert}, we
+typeset \kw{if} statements with the commands \verb`\If`, \verb`\Then`,
+\verb`\Else`, and \verb`\End`. In the first two editions of the book,
+the keyword \kw{then} appeared in pseudocode, but---again mindful of
+requests from our readers to make our pseudocode more like C, C++, and
+Java---we eliminated the keyword \kw{then} in the third edition. The
+\verb`\Then` command remains, however, in order to indent the code
+that runs when the test in the \kw{if} clause evaluates to
+\const{true}.
+
+We use \verb`\End` to terminate an \kw{if} statement, whether or not
+it has an \kw{else} clause. For an example of an \kw{if} statement
+without an \kw{else} clause, here's the \proc{Merge-Sort} procedure on
+page~34:
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Merge-Sort}(A, p, r)$}
+\li \If $p < r$
+\li \Then
+ $q \gets \floor{(p + r) / 2}$
+\li $\proc{Merge-Sort}(A, p, q)$
+\li $\proc{Merge-Sort}(A, q+1, r)$
+\li $\proc{Merge}(A, p, q, r)$
+ \End
+\end{codebox}
+\end{verbatim}
+}
+
+Note: the command \verb`\floor` is our own. It is defined as
+
+{\small
+\begin{verbatim}
+\newcommand{\floor}[1]{\left\lfloor #1 \right\rfloor}
+\end{verbatim}
+}
+
+The \proc{Hash-Insert} procedure above shows how to typeset an \kw{if}
+statement that has an \kw{else} clause. For a more complicated
+example, using nested \kw{if} statements, here's the
+\proc{Cascading-Cut} procedure on page~519:
+
+\pagebreak
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Cascading-Cut}(H,y)$}
+\li $z \gets \attrib{y}{p}$
+\li \If $z \neq \const{nil}$
+\li \Then
+ \If $\attrib{y}{mark} \isequal \const{false}$
+\li \Then $\attrib{y}{mark} \gets \const{true}$
+\li \Else
+ $\proc{Cut}(H,y,z)$
+\li $\proc{Cascading-Cut}(H,z)$
+ \End
+ \End
+\end{codebox}
+\end{verbatim}
+}
+
+\noindent Note that \verb`\Then` and \verb`\Else` always follow an
+\verb`\li` command to start a new numbered line. As with the
+\verb`\Do` command, don't put either \verb`\li` or \verb`\zi` between
+\verb`\Then` or \verb`\Else` and the statement that follows.
+
+As you can see, I line up the \verb`\End` commands under the
+\verb`\Then` and \verb`\Else` commands. I could just as easily have
+chosen to line up \verb`\End` under the \verb`\If` command instead. I
+also sometimes elect to put the ``then'' or ``else'' code on the same
+source line as the \verb`\Then` or \verb`\Else` command, especially
+when that code is one short line, such as in line~4 of
+\proc{Cascading-Cut}.
+
+Sometimes, you need more complicated ``\kw{if}-ladders'' than you can
+get from the \verb`\Then` and \verb`\Else` commands. The
+\proc{Transplant} procedure on page~296 provides an example,
+and it uses the \verb`\ElseIf` and \verb`\ElseNoIf` commands:
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Transplant}(T, u, v)$}
+\li \If $\attrib{u}{p} \isequal \const{nil}$
+\li \Then $\attrib{T}{root} \gets v$
+\li \ElseIf $u \isequal \attribb{u}{p}{left}$
+\li \Then $\attribb{u}{p}{left} \gets v$
+\li \ElseNoIf
+ $\attribb{u}{p}{right} \gets v$
+ \End
+\li \If $v \neq \const{nil}$
+\li \Then $\attrib{v}{p} \gets \attrib{u}{p}$
+ \End
+\end{codebox}
+\end{verbatim}
+}
+
+\noindent For an \kw{if}-ladder, use \verb`\Then` for the first case,
+\verb`\ElseNoIf` for the last case, and \verb`\ElseIf` followed by
+\verb`\Then` for all intermediate cases. You use \verb`\ElseNoIf`
+like you use \verb`\Else` in that it follows an \verb`\li` command,
+you don't follow it with \verb`\Then`, and, because it terminates an
+\kw{if}-ladder, it's followed by \verb`\End`. I usually line up the
+terminating \verb`\End` with \verb`\If`, the \verb`\ElseIf` commands,
+and \verb`\ElseNoIf`, but the way you line it up won't change the
+typeset output.
+
+As another example, here is the \proc{Segments-Intersect} procedure on
+page~1018:
+
+\pagebreak
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Segments-Intersect}(p_1, p_2, p_3, p_4)$}
+\li $d_1 \gets \proc{Direction}(p_3, p_4, p_1)$
+\li $d_2 \gets \proc{Direction}(p_3, p_4, p_2)$
+\li $d_3 \gets \proc{Direction}(p_1, p_2, p_3)$
+\li $d_4 \gets \proc{Direction}(p_1, p_2, p_4)$
+\li \If $((d_1 > 0 \mbox{ and } d_2 < 0) \mbox{ or }
+ (d_1 < 0 \mbox{ and } d_2 > 0))$ and
+ \Indentmore
+\zi $((d_3 > 0 \mbox{ and } d_4 < 0) \mbox{ or }
+ (d_3 < 0 \mbox{ and } d_4 > 0))$
+ \End
+\li \Then \Return \const{true}
+\li \ElseIf $d_1 \isequal 0$ and $\proc{On-Segment}(p_3, p_4, p_1)$
+\li \Then \Return \const{true}
+\li \ElseIf $d_2 \isequal 0$ and $\proc{On-Segment}(p_3, p_4, p_2)$
+\li \Then \Return \const{true}
+\li \ElseIf $d_3 \isequal 0$ and $\proc{On-Segment}(p_1, p_2, p_3)$
+\li \Then \Return \const{true}
+\li \ElseIf $d_4 \isequal 0$ and $\proc{On-Segment}(p_1, p_2, p_4)$
+\li \Then \Return \const{true}
+\li \ElseNoIf \Return \const{false}
+ \End
+\end{codebox}
+\end{verbatim}
+}
+
+This example also shows our first use of an unnumbered line: the
+second half of the tests on line~5. We use \verb`\zi` to indicate
+that we're starting an unnumbered line.
+
+\subheading{Indentation levels}
+
+In the \proc{Segments-Intersect} procedure, we indent the unnumbered
+line after line~5 by one level more than the line above it. We do so
+with the \verb`\Indentmore` command. The \verb`\End` command
+following the indented line decrements the indentation level back to
+what it was prior to the \verb`\Indentmore`. If I had wanted to
+indent the line by two levels, I would have used two
+\verb`\Indentmore` commands before the line and two \verb`\End`
+commands afterward. (Recall that \verb`\End` simply decrements the
+indentation level.)
+
+Upon seeing the \verb`\end{codebox}` command, the \Codebox{}
+environment checks that the indentation level is back to where it was
+when it started, namely an indentation level of~0. If it is not, you
+will get a warning message like the following:
+
+{\small
+\begin{verbatim}
+Warning: Indentation ends at level 1 in codebox on page 1.
+\end{verbatim}
+}
+
+\noindent This message would indicate that there is one missing
+\verb`\End` command. On the other hand, you might have one too many
+\verb`\End` commands, in which case you would get
+
+{\small
+\begin{verbatim}
+Warning: Indentation ends at level -1 in codebox on page 1.
+\end{verbatim}
+}
+
+\noindent Whenever the indentation level is nonzero upon hitting an
+\verb`\end{codebox}` command, you'll get a warning telling you what
+the indentation level was.
+
+\subheading{Tabs and comments}
+
+Line~3 of \proc{Insertion-Sort} shows how to make a line that is only
+a comment. It's a little more tricky to put a comment at the end of a
+line of code. Using the tab command \verb`\>`, explicitly tab to
+where you want the comment to begin and then use the \verb`\Comment`
+command to produce the comment symbol. When several lines contain
+comments, you probably want them to align vertically. I just add tab
+characters, using a trial-and-error approach, until I am pleased with
+the result. For example, here's how we produced the
+\proc{KMP-Matcher} procedure on page~1005:
+
+{\footnotesize
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{KMP-Matcher}(T,P)$}
+\li $n \gets \attrib{T}{length}$
+\li $m \gets \attrib{P}{length}$
+\li $\pi \gets \proc{Compute-Prefix-Function}(P)$
+\li $q \gets 0$\>\>\>\>\>\>\>\>\Comment number of characters matched
+\li \For $i \gets 1$ \To $n$\>\>\>\>\>\>\>\>\Comment scan the text from left to right
+\li \Do
+ \While $q>0$ and $\Px{q+1}\ne \Tx{i}$
+\li \Do $q \gets \pi[q]$\>\>\>\>\>\>\Comment next character does not match
+ \End
+\li \If $\Px{q+1} \isequal \Tx{i}$
+\li \Then $q \gets q+1$\>\>\>\>\>\>\Comment next character matches
+ \End
+\li \If $q \isequal m$\>\>\>\>\>\>\>\Comment is all of $P$ matched?
+\li \Then
+ print ``Pattern occurs with shift'' $i-m$
+\li $q \gets \pi[q]$\>\>\>\>\>\>\Comment look for the next match
+ \End
+ \End
+\end{codebox}
+\end{verbatim}
+}
+
+\noindent All six comments align nicely.
+
+Note: the commands \verb`\Px` and \verb`\Tx` are our own, with the
+definitions
+
+{\small
+\begin{verbatim}
+\newcommand{\Px}[1]{P[#1]}
+\newcommand{\Tx}[1]{T[#1]}
+\end{verbatim}
+}
+
+We used the command \verb`\RComment` to justify a comment against the
+right margin. We used this command only in the \proc{RB-Insert-Fixup}
+procedure on page~316 and the \proc{RB-Delete-Fixup} procedure on
+page~326. For example, here's how we typeset line~5 of
+\proc{RB-Insert-Fixup}:
+
+{\small
+\begin{verbatim}
+\li \Then
+ $\attribb{z}{p}{color}\gets \const{black}$
+ \RComment case 1
+\end{verbatim}
+}
+
+\subheading{Referencing line numbers}
+
+The source files for CLRS 3/e contain no absolute references to line
+numbers. We use \emph{only} symbolic references. The \Codebox{}
+environment is set up to allow you to place \verb`\label` commands on
+lines of pseudocode and then reference these labels. The references
+will resolve to the line numbers. Our convention is that any label
+for a line number begins with \verb`\li:`, but you can name the labels
+any way that you like.
+
+For example, here's how we \emph{really} wrote the
+\proc{Insertion-Sort} procedure on page~18:
+
+\pagebreak
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Insertion-Sort}(A)$}
+\li \For $j \gets 2$ \To $\attrib{A}{length}$
+ \label{li:ins-sort-for}
+\li \Do
+ $\id{key} \gets A[j]$ \label{li:ins-sort-pick}
+ \label{li:ins-sort-for-body-begin}
+\li \Comment Insert $A[j]$ into the sorted sequence
+ $A[1 \twodots j-1]$.
+\li $i \gets j-1$ \label{li:ins-sort-find-begin}
+\li \While $i > 0$ and $A[i] > \id{key}$
+ \label{li:ins-sort-while}
+\li \Do
+ $A[i+1] \gets A[i]$ \label{li:ins-sort-while-begin}
+\li $i \gets i-1$ \label{li:ins-sort-find-end}
+ \label{li:ins-sort-while-end}
+ \End
+\li $A[i+1] \gets \id{key}$ \label{li:ins-sort-ins}
+ \label{li:ins-sort-for-body-end}
+ \End
+\end{codebox}
+\end{verbatim}
+}
+
+\noindent Note that any line may have multiple labels. As an example
+of referencing these labels, here's the beginning of the first item
+under ``Pseudocode conventions'' on page~19:
+
+{\small
+\begin{verbatim}
+\item Indentation indicates block structure. For example, the body of
+the \kw{for} loop that begins on line~\ref{li:ins-sort-for} consists
+of lines
+\ref{li:ins-sort-for-body-begin}--\ref{li:ins-sort-for-body-end}, and
+the body of the \kw{while} loop that begins on
+line~\ref{li:ins-sort-while} contains lines
+\ref{li:ins-sort-while-begin}--\ref{li:ins-sort-while-end} but not
+line~\ref{li:ins-sort-for-body-end}.
+\end{verbatim}
+}
+
+\subheading{Setting line numbers}
+
+On rare occasions, we needed to start line numbers somewhere other
+than~1. Use the \verb`setlinenumber` command to set the next line
+number. For example, in Exercise~24.2-2 on page~657, we want the line
+number to be the same as a line number within the
+\proc{Dag-Shortest-Paths} procedure on page~655. Here's the source
+for the exercise:
+
+{\small
+\begin{verbatim}
+Suppose we change line~\ref{li:dag-sp-loop-begin} of
+\proc{Dag-Shortest-Paths} to read
+
+\begin{codebox}
+\setlinenumber{li:dag-sp-loop-begin}
+\li \For the first $\card{V}-1$ vertices, taken in topologically sorted order
+\end{codebox}
+Show that the procedure would remain correct.
+\end{verbatim}
+}
+
+\noindent The \proc{Dag-Shortest-Paths} procedure is
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Dag-Shortest-Paths}(G,w,s)$}
+\li topologically sort the vertices of $G$ \label{li:dag-sp-topo-sort}
+\li $\proc{Initialize-Single-Source}(G,s)$ \label{li:dag-sp-init}
+\li \For each vertex $u$, taken in topologically sorted order
+ \label{li:dag-sp-loop-begin}
+\li \Do
+ \For each vertex $v \in \attrib{G}{Adj}[u]$
+ \label{li:dag-sp-inner-begin}
+\li \Do $\proc{Relax}(u,v,w)$ \label{li:dag-sp-loop-end}
+ \End
+ \End
+\end{codebox}
+\end{verbatim}
+}
+
+Even more rarely (just once, in fact), we needed to set a line number
+to be some other line number plus an offset. That was in the two
+lines of pseudocode on page~343, where the first line number had to be
+one greater than the number of the last line of \proc{Left-Rotate} on
+page~313. Use the \verb`setlinenumberplus` command:
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\setlinenumberplus{li:left-rot-parent}{1}
+\li $\attrib{y}{size} \gets \attrib{x}{size}$
+\li $\attrib{x}{size} \gets \attribb{x}{left}{size}
+ + \attribb{x}{right}{size} + 1
+\end{codebox}
+\end{verbatim}
+}
+
+\noindent Here, the last line of \proc{Left-Rotate} has
+\verb`\label{li:left-rot-parent}`.
+
+\subheading{Indenting long argument lists in procedure calls}
+
+You might find that you have to call a procedure with an argument list
+so long that the call requires more than one line. When this
+situation arises, it often looks best to align the second and
+subsequent lines of arguments with the first argument. The only place
+we did so was in the $\proc{Sum-Arrays}'$ procedure in Problem~27-1 on
+page~805.
+
+To get this style of alignment, use the \verb`\Startalign` and
+\verb`\Stopalign` commands, in concert with the \verb`\>` command of
+\LaTeXe{}. The \verb`\Startalign` command takes an argument that is
+the text string that you wish to align just to the right of. Start
+each line that you want to indent with \verb`\>`. Use the
+\verb`\Stopalign` command to restore indentation to its state from
+before the \verb`\Startalign` command.
+
+The source code for $\proc{Sum-Arrays}'$ shows how to use these
+commands:
+
+\pagebreak
+
+{\small
+\begin{verbatim}
+\begin{codebox}
+\Procname{$\proc{Sum-Arrays}{$'$}(A, B, C)$}
+\li $n \gets \attrib{A}{length}$
+\li $\id{grain-size} \gets\ \ ?$ \>\>\>\>\>\>\Comment to be determined
+\li $r \gets \ceil{n/\id{grain-size}}$
+\li \For $k \gets 0$ \To $r-1$
+\li \Do
+ \Spawn $\proc{Add-Subarray}(A, B, C, k\cdot\id{grain-size}+1,$
+\Startalign{\Spawn $\proc{Add-Subarray}($}
+\> $\min((k+1)\cdot\id{grain-size}, n))$
+\Stopalign
+ \End
+\li \Sync
+\end{codebox}
+\end{verbatim}
+}
+
+\noindent The second line of arguments in the call to
+\proc{Add-Subarray} starts right under the first parameter, $A$, in
+the call.
+
+\section{Reporting bugs}
+\label{sec:bugs}
+
+If you find errors in the \clrscodethree{} package, please send me
+email (thc(a)cs.dartmouth.edu). It would be best if your message
+included everything I would require to elicit the error myself.
+
+The \texttt{clrscode3e.sty} file contains the following disclaimer:
+
+{\small
+\begin{verbatim}
+% Written for general distribution by Thomas H. Cormen, March 2009.
+
+% The author grants permission for anyone to use this macro package and
+% to distribute it unchanged without further restriction. If you choose
+% to modify this package, you must indicate that you have modified it
+% prior to your distributing it. I don't want to get bug reports about
+% changes that *you* have made!
+\end{verbatim}
+}
+
+\noindent I have enough trouble keeping up with my own bugs; I don't
+want to hear about bugs that others have introduced in the package!
+
+\section{Revision history}
+
+\begin{itemize}
+
+\item 20 February 2018. Included definitions for the commands
+\verb`\floor`, \verb`\Px`, and \verb`\Tx`. Changed \verb`\procdecl`
+and \verb`\procdecltag` commands to \verb`\proc`.
+
+\item 27 January 2010. Corrected an error in the documentation. The
+first line after a \verb`\Repeat` command should begin with
+\verb`\li`.
+
+\item 23 March 2009. Initial revision of document and code.
+
+\end{itemize}
+
+\begin{thebibliography}{9}
+
+\bibitem{CLRS09} Thomas H. Cormen, Charles E. Leiserson, Ronald L.
+Rivest, and Clifford Stein. \textit{Introduction to Algorithms},
+third edition. The MIT Press, 2009.
+
+\bibitem{Lamport93} Leslie Lamport. \textit{\LaTeX: A Document
+Preparation System User's Guide and Reference Manual}.
+Addison-Wesley, 1993.
+
+\end{thebibliography}
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/clrscode3e/page.tex new/doc/latex/clrscode3e/page.tex
--- old/doc/latex/clrscode3e/page.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/clrscode3e/page.tex 2019-05-15 22:38:43.000000000 +0200
@@ -0,0 +1,18 @@
+\setlength{\oddsidemargin}{0in}
+\setlength{\evensidemargin}{0in}
+\setlength{\textwidth}{6.5in}
+\setlength{\topmargin}{0in}
+\setlength{\textheight}{8.5in}
+\setlength{\headheight}{0pt}
+\setlength{\headsep}{0pt}
+
+\setcounter{topnumber}{3}%
+\def\topfraction{.7}%
+\setcounter{bottomnumber}{1}
+\def\bottomfraction{.3}
+\setcounter{totalnumber}{5}%
+\def\textfraction{.1}% was .2
+\def\floatpagefraction{.7}% was .7
+\setcounter{dbltopnumber}{2}
+\def\dbltopfraction{.7}
+\def\dblfloatpagefraction{.5}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/clrscode3e.doc.tlpobj new/tlpkg/tlpobj/clrscode3e.doc.tlpobj
--- old/tlpkg/tlpobj/clrscode3e.doc.tlpobj 2019-02-28 03:25:54.000000000 +0100
+++ new/tlpkg/tlpobj/clrscode3e.doc.tlpobj 2019-05-16 01:38:19.000000000 +0200
@@ -1,8 +1,10 @@
name clrscode3e.doc
category Package
-revision 34887
+revision 51137
shortdesc doc files of clrscode3e
relocated 1
-docfiles size=2
+docfiles size=31
RELOC/doc/latex/clrscode3e/README
- RELOC/doc/latex/clrscode3e/README.TEXLIVE
+ RELOC/doc/latex/clrscode3e/clrscode3e.pdf
+ RELOC/doc/latex/clrscode3e/clrscode3e.tex
+ RELOC/doc/latex/clrscode3e/page.tex
++++++ clrscode3e.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/clrscode3e.tlpobj new/tlpkg/tlpobj/clrscode3e.tlpobj
--- old/tlpkg/tlpobj/clrscode3e.tlpobj 2019-02-28 03:25:54.000000000 +0100
+++ new/tlpkg/tlpobj/clrscode3e.tlpobj 2019-05-16 01:38:20.000000000 +0200
@@ -1,6 +1,6 @@
name clrscode3e
category Package
-revision 34887
+revision 51137
shortdesc Typesets pseudocode as in Introduction to Algorithms
relocated 1
longdesc This package allows you to typeset pseudocode in the style of
@@ -13,6 +13,6 @@
RELOC/tex/latex/clrscode3e/clrscode3e.sty
catalogue-also newalg clrscode
catalogue-ctan /macros/latex/contrib/clrscode3e
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-05-15 17:42:59 +0200
catalogue-license lppl
catalogue-topics pseudocode
++++++ clrstrip.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/clrstrip/README.md new/doc/latex/clrstrip/README.md
--- old/doc/latex/clrstrip/README.md 2018-07-30 23:12:14.000000000 +0200
+++ new/doc/latex/clrstrip/README.md 2020-01-24 22:47:22.000000000 +0100
@@ -1,6 +1,6 @@
clrstrip: place contents into a full width colour strip
-Copyright (C) 2018 by Jonathan P. Spratte
+Copyright (C) 2018-2020 by Jonathan P. Spratte
This package may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this license or (at
Binary files old/doc/latex/clrstrip/clrstrip.pdf and new/doc/latex/clrstrip/clrstrip.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/clrstrip.doc.tlpobj new/tlpkg/tlpobj/clrstrip.doc.tlpobj
--- old/tlpkg/tlpobj/clrstrip.doc.tlpobj 2019-02-28 03:25:54.000000000 +0100
+++ new/tlpkg/tlpobj/clrstrip.doc.tlpobj 2020-01-25 01:55:08.000000000 +0100
@@ -1,8 +1,8 @@
name clrstrip.doc
category Package
-revision 49570
+revision 53537
shortdesc doc files of clrstrip
relocated 1
-docfiles size=96
+docfiles size=49
RELOC/doc/latex/clrstrip/README.md
RELOC/doc/latex/clrstrip/clrstrip.pdf
++++++ clrstrip.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/clrstrip/clrstrip.sty new/tex/latex/clrstrip/clrstrip.sty
--- old/tex/latex/clrstrip/clrstrip.sty 2019-01-01 23:50:26.000000000 +0100
+++ new/tex/latex/clrstrip/clrstrip.sty 2020-01-24 22:47:22.000000000 +0100
@@ -13,7 +13,7 @@
%% See http://www.latex-project.org/lppl.txt
%% --------------------------------------------------------------
%%
-%% Copyright (C) 2018 Jonathan P. Spratte
+%% Copyright (C) 2018-2020 Jonathan P. Spratte
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this license or
@@ -29,10 +29,10 @@
%% and the derived files clrstrip.pdf and
%% clrstrip.sty.
%%
-\newcommand*\clrstrip@date{2018-12-31}
+\newcommand*\clrstrip@date{2020-01-23}
\ProvidesPackage{clrstrip}
[\clrstrip@date\space place contents into a full width colour strip]
-\RequirePackage{keyval}
+\RequirePackage{expkv}
\newsavebox\clrstrip@box
\newlength\clrstrip@innerT
\clrstrip@innerT\medskipamount
@@ -45,29 +45,9 @@
\newlength\clrstrip@width
\newlength\clrstrip@left
\clrstrip@left1sp
-\newcommand*\clrstrip@oarg{}
-\newcommand*\clrstrip@marg{}
-\newcommand*\clrstrip@key{\define@key{clrstrip}}
-\newcommand*\clrstrip@strip[1]
- {%
- \begingroup
- \ifx\clrstrip@oarg\@empty
- \color{#1}%
- \else
- \expandafter\color\expandafter[\clrstrip@oarg]{#1}%
- \fi
- \advance\clrstrip@innerT\ht\clrstrip@box
- \advance\clrstrip@innerB\dp\clrstrip@box
- \rlap
- {%
- \hskip-\paperwidth
- \vrule
- width 2\paperwidth
- height \clrstrip@innerT
- depth \clrstrip@innerB
- }%
- \endgroup
- }
+\newcommand*\clrstrip@arg{}
+\newcommand*\clrstrip@key{\protected\ekvdef{clrstrip}}
+\newcommand*\clrstrip@keyNV{\protected\ekvdefNoVal{clrstrip}}
\newcommand\clrstrip@start[1][]
{%
\colorstripSet{#1}%
@@ -76,6 +56,8 @@
\fi
\setbox\clrstrip@box\vbox\bgroup
\hsize\clrstrip@width
+ \linewidth\hsize
+ \color@setgroup
\clrstrip@preventIndent
}
\newcommand*\clrstrip@afterheading{\@afterindentfalse\@afterheading}
@@ -90,21 +72,38 @@
\clrstrip@key{outer bot}{\clrstrip@outerB#1\relax}
\clrstrip@key{width}{\clrstrip@width#1\relax}
\clrstrip@key{left}{\clrstrip@left#1\relax}
-\clrstrip@key{afterheading}[]{\let\clrstrip@preventIndent\clrstrip@afterheading}
-\clrstrip@key{noindent}[]{\let\clrstrip@preventIndent\clrstrip@noindent}
-\newcommand*\colorstripSet{\setkeys{clrstrip}}
+\clrstrip@keyNV{afterheading}{\let\clrstrip@preventIndent\clrstrip@afterheading}
+\clrstrip@keyNV{noindent}{\let\clrstrip@preventIndent\clrstrip@noindent}
+\protected\def\colorstripSet{\ekvset{clrstrip}}
\newenvironment{colorstrip}[2][]
{%
- \def\clrstrip@oarg{#1}%
- \def\clrstrip@marg{#2}%
+ \def\clrstrip@arg{#1}%
+ \ifx\clrstrip@arg\@empty
+ \def\clrstrip@arg{{#2}}%
+ \else
+ \def\clrstrip@arg{[{#1}]{#2}}%
+ \fi
\clrstrip@start
}
{%
+ \color@endgroup
\egroup
\par
\vskip\clrstrip@outerT
\noindent
- \expandafter\clrstrip@strip\expandafter{\clrstrip@marg}%
+ \begingroup
+ \expandafter\color\clrstrip@arg
+ \advance\clrstrip@innerT\ht\clrstrip@box
+ \advance\clrstrip@innerB\dp\clrstrip@box
+ \rlap
+ {%
+ \hskip-\paperwidth
+ \vrule
+ width 2\paperwidth
+ height \clrstrip@innerT
+ depth \clrstrip@innerB
+ }%
+ \endgroup
\ifdim\clrstrip@left=1sp
\advance\clrstrip@width-\linewidth
\clrstrip@left-.5\clrstrip@width
@@ -112,6 +111,7 @@
\rlap{\hskip\clrstrip@left\copy\clrstrip@box}%
\par
\vskip\clrstrip@outerB
+ \@endpetrue
}
%%
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/clrstrip.tlpobj new/tlpkg/tlpobj/clrstrip.tlpobj
--- old/tlpkg/tlpobj/clrstrip.tlpobj 2019-02-28 03:25:54.000000000 +0100
+++ new/tlpkg/tlpobj/clrstrip.tlpobj 2020-01-25 01:55:08.000000000 +0100
@@ -1,6 +1,6 @@
name clrstrip
category Package
-revision 49570
+revision 53537
shortdesc Place contents into a full width colour strip
relocated 1
longdesc This lightweight package provides the colorstrip environment,
@@ -10,6 +10,5 @@
catalogue-also tcolorbox
catalogue-contact-repository https://github.com/Skillmon/ltx_clrstrip
catalogue-ctan /macros/latex/contrib/clrstrip
-catalogue-date 2018-12-31 21:41:42 +0100
catalogue-license lppl1.3c
catalogue-topics colour
++++++ cluttex.doc.tar.xz ++++++
++++ 3999 lines of diff (skipped)
++++++ cluttex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/cluttex/cluttex.lua new/texmf-dist/scripts/cluttex/cluttex.lua
--- old/texmf-dist/scripts/cluttex/cluttex.lua 2019-02-23 00:18:23.000000000 +0100
+++ new/texmf-dist/scripts/cluttex/cluttex.lua 2020-02-06 21:51:06.000000000 +0100
@@ -344,7 +344,7 @@
if os.type == "windows" then
package.preload["texrunner.shellutil"] = function(...)
--[[
- Copyright 2016 ARATA Mizuki
+ Copyright 2016,2019 ARATA Mizuki
This file is part of ClutTeX.
@@ -363,6 +363,7 @@
]]
local string_gsub = string.gsub
+local os_execute = os.execute
-- s: string
local function escape(s)
@@ -370,14 +371,21 @@
end
+local function has_command(name)
+ local result = os_execute("where " .. escape(name) .. " > NUL 2>&1")
+ -- Note that os.execute returns a number on Lua 5.1 or LuaTeX
+ return result == 0 or result == true
+end
+
return {
escape = escape,
+ has_command = has_command,
}
end
else
package.preload["texrunner.shellutil"] = function(...)
--[[
- Copyright 2016 ARATA Mizuki
+ Copyright 2016,2019 ARATA Mizuki
This file is part of ClutTeX.
@@ -400,6 +408,7 @@
local table = table
local table_insert = table.insert
local table_concat = table.concat
+local os_execute = os.execute
-- s: string
local function escape(s)
@@ -430,8 +439,15 @@
end
+local function has_command(name)
+ local result = os_execute("which " .. escape(name) .. " > /dev/null")
+ -- Note that os.execute returns a number on Lua 5.1 or LuaTeX
+ return result == 0 or result == true
+end
+
return {
escape = escape,
+ has_command = has_command,
}
end
end
@@ -542,6 +558,7 @@
-- options_and_params, i = parseoption(arg, options)
-- options[i] = {short = "o", long = "option" [, param = true] [, boolean = true] [, allow_single_hyphen = false]}
+-- options_and_params[j] = {"option", "value"}
-- arg[i], arg[i + 1], ..., arg[#arg] are non-options
local function parseoption(arg, options)
local i = 1
@@ -581,6 +598,7 @@
elseif o.boolean and name == "no-" .. o.long then
-- --no-option
opt = o
+ param = false
break
end
end
@@ -620,6 +638,7 @@
elseif o.boolean and name == "no-" .. o.long then
-- -no-option
opt = o
+ param = false
break
end
elseif o.long and #name >= 2 and (o.long == name or (o.boolean and name == "no-" .. o.long)) then
@@ -673,7 +692,7 @@
end
package.preload["texrunner.tex_engine"] = function(...)
--[[
- Copyright 2016 ARATA Mizuki
+ Copyright 2016,2019 ARATA Mizuki
This file is part of ClutTeX.
@@ -700,7 +719,7 @@
--[[
engine.name: string
engine.type = "onePass" or "twoPass"
-engine:build_command(inputfile, options)
+engine:build_command(inputline, options)
options:
halt_on_error: boolean
interaction: string
@@ -714,7 +733,6 @@
output_format: "pdf" or "dvi"
draftmode: boolean (pdfTeX / XeTeX / LuaTeX)
fmt: string
- tex_injection: string
lua_initialization_script: string (LuaTeX only)
engine.executable: string
engine.supports_pdf_generation: boolean
@@ -726,8 +744,9 @@
local engine_meta = {}
engine_meta.__index = engine_meta
engine_meta.dvi_extension = "dvi"
-function engine_meta:build_command(inputfile, options)
- local command = {self.executable, "-recorder"}
+function engine_meta:build_command(inputline, options)
+ local executable = options.engine_executable or self.executable
+ local command = {executable, "-recorder"}
if options.fmt then
table.insert(command, "-fmt=" .. options.fmt)
end
@@ -764,11 +783,7 @@
table.insert(command, v)
end
end
- if type(options.tex_injection) == "string" then
- table.insert(command, shellutil.escape(options.tex_injection .. "\\input " .. inputfile)) -- TODO: what if filename contains spaces?
- else
- table.insert(command, shellutil.escape(inputfile))
- end
+ table.insert(command, shellutil.escape(inputline))
return table.concat(command, " ")
end
@@ -1118,8 +1133,9 @@
for l in io.lines(auxfile) do
local subauxfile = string_match(l, "\\(a)input{(.+)}")
if subauxfile then
- if fsutil.isfile(subauxfile) then
- parse_aux_file(pathutil.join(outdir, subauxfile), outdir, report, seen)
+ local subauxfile_abs = pathutil.abspath(subauxfile, outdir)
+ if fsutil.isfile(subauxfile_abs) then
+ parse_aux_file(subauxfile_abs, outdir, report, seen)
else
local dir = pathutil.join(outdir, pathutil.dirname(subauxfile))
if not fsutil.isdir(dir) then
@@ -1144,8 +1160,11 @@
end
elseif name == "@input" then
local subauxfile = string_match(l, "\\(a)input{(.+)}")
- if subauxfile and fsutil.isfile(subauxfile) then
- extract_bibtex_from_aux_file(pathutil.join(outdir, subauxfile), outdir, biblines)
+ if subauxfile then
+ local subauxfile_abs = pathutil.abspath(subauxfile, outdir)
+ if fsutil.isfile(subauxfile_abs) then
+ extract_bibtex_from_aux_file(subauxfile_abs, outdir, biblines)
+ end
end
end
end
@@ -1177,17 +1196,19 @@
-- Packages coded in Lua doesn't follow -output-directory option and doesn't write command to the log file
initscript:write(string.format("local output_directory = %q\n", options.output_directory))
+ -- tex.jobname may not be available when io.open is called for the first time
+ initscript:write(string.format("local jobname = %q\n", options.jobname))
initscript:write([==[
local luawritelog
local function openluawritelog()
if not luawritelog then
- luawritelog = assert(io_open(output_directory .. "/" .. tex.jobname .. ".cluttex-fls", "w"))
+ luawritelog = assert(io_open(output_directory .. "/" .. jobname .. ".cluttex-fls", "w"))
end
return luawritelog
end
io.open = function(fname, mode)
-- luatexja-ruby
- if mode == "w" and fname == tex.jobname .. ".ltjruby" then
+ if mode == "w" and fname == jobname .. ".ltjruby" then
fname = output_directory .. "/" .. fname
end
if type(mode) == "string" and string.find(mode, "w") ~= nil then
@@ -1348,7 +1369,7 @@
end
package.preload["texrunner.handleoption"] = function(...)
local COPYRIGHT_NOTICE = [[
-Copyright (C) 2016,2018-2019 ARATA Mizuki
+Copyright (C) 2016-2020 ARATA Mizuki
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
@@ -1385,6 +1406,9 @@
xelatex, xetex, latex, etex, tex,
platex, eptex, ptex,
uplatex, euptex, uptex,
+ --engine-executable=COMMAND+OPTIONs
+ The actual TeX command to use.
+ [default: ENGINE]
-o, --output=FILE The name of output file.
[default: JOBNAME.pdf or JOBNAME.dvi]
--fresh Clean intermediate files before running TeX.
@@ -1400,17 +1424,26 @@
--dvipdfmx-option[s]=OPTION[s] Same for dvipdfmx.
--makeindex=COMMAND+OPTIONs Command to generate index, such as
`makeindex' or `mendex'.
- --bibtex=COMMAND+OPTIONs Command for BibTeX, such as
+ --bibtex=COMMAND+OPTIONs Command for BibTeX, such as
`bibtex' or `pbibtex'.
- --biber[=COMMAND+OPTIONs] Command for Biber.
+ --biber[=COMMAND+OPTIONs] Command for Biber.
--makeglossaries[=COMMAND+OPTIONs] Command for makeglossaries.
-h, --help Print this message and exit.
-v, --version Print version information and exit.
-V, --verbose Be more verbose.
- --color=WHEN Make ClutTeX's message colorful. WHEN is one of
- `always', `auto', or `never'. [default: auto]
+ --color[=WHEN] Make ClutTeX's message colorful. WHEN is one of
+ `always', `auto', or `never'.
+ [default: `auto' if --color is omitted,
+ `always' if WHEN is omitted]
--includeonly=NAMEs Insert '\includeonly{NAMEs}'.
--make-depends=FILE Write dependencies as a Makefile rule.
+ --print-output-directory Print the output directory and exit.
+ --package-support=PKG1[,PKG2,...]
+ Enable special support for some shell-escaping
+ packages.
+ Currently supported: minted, epstopdf
+ --check-driver=DRIVER Check that the correct driver file is loaded.
+ DRIVER is one of `dvipdfmx', `dvips', `dvisvgm'.
--[no-]shell-escape
--shell-restricted
@@ -1435,6 +1468,10 @@
param = true,
},
{
+ long = "engine-executable",
+ param = true,
+ },
+ {
short = "o",
long = "output",
param = true,
@@ -1482,6 +1519,17 @@
long = "make-depends",
param = true
},
+ {
+ long = "print-output-directory",
+ },
+ {
+ long = "package-support",
+ param = true
+ },
+ {
+ long = "check-driver",
+ param = true
+ },
-- Options for TeX
{
long = "synctex",
@@ -1585,6 +1633,10 @@
if options.halt_on_error == nil then
options.halt_on_error = true
end
+
+ if options.output_format == nil then
+ options.output_format = "pdf"
+ end
end
-- inputfile, engine, options = handle_cluttex_options(arg)
@@ -1596,6 +1648,7 @@
local options = {
tex_extraoptions = {},
dvipdfmx_extraoptions = {},
+ package_support = {},
}
CLUTTEX_VERBOSITY = 0
for _,option in ipairs(option_and_params) do
@@ -1606,6 +1659,10 @@
assert(options.engine == nil, "multiple --engine options")
options.engine = param
+ elseif name == "engine-executable" then
+ assert(options.engine_executable == nil, "multiple --engine-executable options")
+ options.engine_executable = param
+
elseif name == "output" then
assert(options.output == nil, "multiple --output options")
options.output = param
@@ -1655,6 +1712,24 @@
assert(options.make_depends == nil, "multiple --make-depends options")
options.make_depends = param
+ elseif name == "print-output-directory" then
+ assert(options.print_output_directory == nil, "multiple --print-output-directory options")
+ options.print_output_directory = true
+
+ elseif name == "package-support" then
+ local known_packages = {["minted"] = true, ["epstopdf"] = true}
+ for pkg in string.gmatch(param, "[^,%s]+") do
+ options.package_support[pkg] = true
+ if not known_packages[pkg] and CLUTTEX_VERBOSITY >= 1 then
+ message.warn("ClutTeX provides no special support for '"..pkg.."'.")
+ end
+ end
+
+ elseif name == "check-driver" then
+ assert(options.check_driver == nil, "multiple --check-driver options")
+ assert(param == "dvipdfmx" or param == "dvips" or param == "dvisvgm", "wrong value for --check-driver option")
+ options.check_driver = param
+
-- Options for TeX
elseif name == "synctex" then
assert(options.synctex == nil, "multiple --synctex options")
@@ -1765,6 +1840,27 @@
set_default_values(options)
+ if options.output_format == "pdf" then
+ if options.check_driver ~= nil then
+ error("--check-driver can only be used when the output format is DVI.")
+ end
+ if engine.supports_pdf_generation then
+ if engine.is_luatex then
+ options.check_driver = "luatex"
+ elseif engine.name == "xetex" or engine.name == "xelatex" then
+ options.check_driver = "xetex"
+ elseif engine.name == "pdftex" or engine.name == "pdflatex" then
+ options.check_driver = "pdftex"
+ else
+ message.warning("Unknown engine: "..engine.name)
+ message.warning("Driver check will not work.")
+ end
+ else
+ -- ClutTeX uses dvipdfmx to generate PDF from DVI output.
+ options.check_driver = "dvipdfmx"
+ end
+ end
+
return inputfile, engine, options
end
@@ -2073,7 +2169,7 @@
local function exec_msg(commandline)
if use_colors then
- io.stderr:write(CMD.fg_x_white, CMD.bg_red, "[EXEC]", CMD.reset, " ", CMD.fg_red, commandline, CMD.reset, "\n")
+ io.stderr:write(CMD.fg_x_white, CMD.bg_red, "[EXEC]", CMD.reset, " ", CMD.fg_cyan, commandline, CMD.reset, "\n")
else
io.stderr:write("[EXEC] ", commandline, "\n")
end
@@ -2124,8 +2220,9 @@
info = info_msg,
}
end
+package.preload["texrunner.fswatcher_windows"] = function(...)
--[[
- Copyright 2016,2018-2019 ARATA Mizuki
+ Copyright 2019 ARATA Mizuki
This file is part of ClutTeX.
@@ -2143,7 +2240,673 @@
along with ClutTeX. If not, see <http://www.gnu.org/licenses/>.
]]
-CLUTTEX_VERSION = "v0.2"
+local ffi = require "ffi"
+local bitlib = assert(bit32 or bit, "Neither bit32 (Lua 5.2) nor bit (LuaJIT) found") -- Lua 5.2 or LuaJIT
+
+ffi.cdef[[
+typedef int BOOL;
+typedef unsigned int UINT;
+typedef uint32_t DWORD;
+typedef void *HANDLE;
+typedef uintptr_t ULONG_PTR;
+typedef uint16_t WCHAR;
+typedef struct _OVERLAPPED {
+ ULONG_PTR Internal;
+ ULONG_PTR InternalHigh;
+ union {
+ struct {
+ DWORD Offset;
+ DWORD OffsetHigh;
+ };
+ void *Pointer;
+ };
+ HANDLE hEvent;
+} OVERLAPPED;
+typedef struct _FILE_NOTIFY_INFORMATION {
+ DWORD NextEntryOffset;
+ DWORD Action;
+ DWORD FileNameLength;
+ WCHAR FileName[?];
+} FILE_NOTIFY_INFORMATION;
+typedef void (__stdcall *LPOVERLAPPED_COMPLETION_ROUTINE)(DWORD dwErrorCode, DWORD dwNumberOfBytesTransfered, OVERLAPPED *lpOverlapped);
+DWORD GetLastError();
+BOOL CloseHandle(HANDLE hObject);
+HANDLE CreateFileA(const char *lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, void *lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile);
+HANDLE CreateIoCompletionPort(HANDLE fileHandle, HANDLE existingCompletionPort, ULONG_PTR completionKey, DWORD numberOfConcurrentThreads);
+BOOL ReadDirectoryChangesW(HANDLE hDirectory, void *lpBuffer, DWORD nBufferLength, BOOL bWatchSubtree, DWORD dwNotifyFilter, DWORD *lpBytesReturned, OVERLAPPED *lpOverlapped, LPOVERLAPPED_COMPLETION_ROUTINE lpOverlappedCompletionRoutine);
+BOOL GetQueuedCompletionStatus(HANDLE CompletionPort, DWORD *lpNumberOfBytes, ULONG_PTR *lpCompletionKey, OVERLAPPED **lpOverlapped, DWORD dwMilliseconds);
+int MultiByteToWideChar(UINT CodePage, DWORD dwFlags, const char *lpMultiByteStr, int cbMultiByte, WCHAR *lpWideCharStr, int cchWideChar);
+int WideCharToMultiByte(UINT CodePage, DWORD dwFlags, const WCHAR *lpWideCharStr, int cchWideChar, char *lpMultiByteStr, int cbMultiByte, const char *lpDefaultChar, BOOL *lpUsedDefaultChar);
+DWORD GetFullPathNameA(const char *lpFileName, DWORD nBufferLength, char *lpBuffer, char **lpFilePart);
+uint64_t GetTickCount64();
+]]
+
+-- LuaTeX's FFI does not equate a null pointer with nil.
+-- On LuaJIT, ffi.NULL is just nil.
+local NULL = ffi.NULL
+
+-- GetLastError
+local ERROR_FILE_NOT_FOUND = 0x0002
+local ERROR_PATH_NOT_FOUND = 0x0003
+local ERROR_ACCESS_DENIED = 0x0005
+local ERROR_INVALID_PARAMETER = 0x0057
+local ERROR_INSUFFICIENT_BUFFER = 0x007A
+local WAIT_TIMEOUT = 0x0102
+local ERROR_ABANDONED_WAIT_0 = 0x02DF
+local ERROR_NOACCESS = 0x03E6
+local ERROR_INVALID_FLAGS = 0x03EC
+local ERROR_NOTIFY_ENUM_DIR = 0x03FE
+local ERROR_NO_UNICODE_TRANSLATION = 0x0459
+local KnownErrors = {
+ [ERROR_FILE_NOT_FOUND] = "ERROR_FILE_NOT_FOUND",
+ [ERROR_PATH_NOT_FOUND] = "ERROR_PATH_NOT_FOUND",
+ [ERROR_ACCESS_DENIED] = "ERROR_ACCESS_DENIED",
+ [ERROR_INVALID_PARAMETER] = "ERROR_INVALID_PARAMETER",
+ [ERROR_INSUFFICIENT_BUFFER] = "ERROR_INSUFFICIENT_BUFFER",
+ [ERROR_ABANDONED_WAIT_0] = "ERROR_ABANDONED_WAIT_0",
+ [ERROR_NOACCESS] = "ERROR_NOACCESS",
+ [ERROR_INVALID_FLAGS] = "ERROR_INVALID_FLAGS",
+ [ERROR_NOTIFY_ENUM_DIR] = "ERROR_NOTIFY_ENUM_DIR",
+ [ERROR_NO_UNICODE_TRANSLATION] = "ERROR_NO_UNICODE_TRANSLATION",
+}
+
+-- CreateFile
+local FILE_FLAG_BACKUP_SEMANTICS = 0x02000000
+local FILE_FLAG_OVERLAPPED = 0x40000000
+local OPEN_EXISTING = 3
+local FILE_SHARE_READ = 0x00000001
+local FILE_SHARE_WRITE = 0x00000002
+local FILE_SHARE_DELETE = 0x00000004
+local FILE_LIST_DIRECTORY = 0x1
+local INVALID_HANDLE_VALUE = ffi.cast("void *", -1)
+
+-- ReadDirectoryChangesW / FILE_NOTIFY_INFORMATION
+local FILE_NOTIFY_CHANGE_FILE_NAME = 0x00000001
+local FILE_NOTIFY_CHANGE_DIR_NAME = 0x00000002
+local FILE_NOTIFY_CHANGE_ATTRIBUTES = 0x00000004
+local FILE_NOTIFY_CHANGE_SIZE = 0x00000008
+local FILE_NOTIFY_CHANGE_LAST_WRITE = 0x00000010
+local FILE_NOTIFY_CHANGE_LAST_ACCESS = 0x00000020
+local FILE_NOTIFY_CHANGE_CREATION = 0x00000040
+local FILE_NOTIFY_CHANGE_SECURITY = 0x00000100
+local FILE_ACTION_ADDED = 0x00000001
+local FILE_ACTION_REMOVED = 0x00000002
+local FILE_ACTION_MODIFIED = 0x00000003
+local FILE_ACTION_RENAMED_OLD_NAME = 0x00000004
+local FILE_ACTION_RENAMED_NEW_NAME = 0x00000005
+
+-- WideCharToMultiByte / MultiByteToWideChar
+local CP_ACP = 0
+local CP_UTF8 = 65001
+
+local C = ffi.C
+
+local function format_error(name, lasterror, extra)
+ local errorname = KnownErrors[lasterror] or string.format("error code %d", lasterror)
+ if extra then
+ return string.format("%s failed with %s (0x%04x) [%s]", name, errorname, lasterror, extra)
+ else
+ return string.format("%s failed with %s (0x%04x)", name, errorname, lasterror)
+ end
+end
+local function wcs_to_mbs(wstr, wstrlen, codepage)
+ -- wstr: FFI uint16_t[?]
+ -- wstrlen: length of wstr, or -1 if NUL-terminated
+ if wstrlen == 0 then
+ return ""
+ end
+ codepage = codepage or CP_ACP
+ local dwFlags = 0
+ local result = C.WideCharToMultiByte(codepage, dwFlags, wstr, wstrlen, nil, 0, nil, nil)
+ if result <= 0 then
+ -- Failed
+ local lasterror = C.GetLastError()
+ -- Candidates: ERROR_INSUFFICIENT_BUFFER, ERROR_INVALID_FLAGS, ERROR_INVALID_PARAMETER, ERROR_NO_UNICODE_TRANSLATION
+ return nil, format_error("WideCharToMultiByte", lasterror)
+ end
+ local mbsbuf = ffi.new("char[?]", result)
+ result = C.WideCharToMultiByte(codepage, dwFlags, wstr, wstrlen, mbsbuf, result, nil, nil)
+ if result <= 0 then
+ -- Failed
+ local lasterror = C.GetLastError()
+ -- Candidates: ERROR_INSUFFICIENT_BUFFER, ERROR_INVALID_FLAGS, ERROR_INVALID_PARAMETER, ERROR_NO_UNICODE_TRANSLATION
+ return nil, format_error("WideCharToMultiByte", lasterror)
+ end
+ return ffi.string(mbsbuf, result)
+end
+local function mbs_to_wcs(str, codepage)
+ -- str: Lua string
+ if str == "" then
+ return ffi.new("WCHAR[0]")
+ end
+ codepage = codepage or CP_ACP
+ local dwFlags = 0
+ local result = C.MultiByteToWideChar(codepage, dwFlags, str, #str, nil, 0)
+ if result <= 0 then
+ local lasterror = C.GetLastError()
+ -- ERROR_INSUFFICIENT_BUFFER, ERROR_INVALID_FLAGS, ERROR_INVALID_PARAMETER, ERROR_NO_UNICODE_TRANSLATION
+ return nil, format_error("MultiByteToWideChar", lasterror)
+ end
+ local wcsbuf = ffi.new("WCHAR[?]", result)
+ result = C.MultiByteToWideChar(codepage, dwFlags, str, #str, wcsbuf, result)
+ if result <= 0 then
+ local lasterror = C.GetLastError()
+ return nil, format_error("MultiByteToWideChar", lasterror)
+ end
+ return wcsbuf, result
+end
+
+
+local function get_full_path_name(filename)
+ local bufsize = 1024
+ local buffer
+ local filePartPtr = ffi.new("char*[1]")
+ local result
+ repeat
+ buffer = ffi.new("char[?]", bufsize)
+ result = C.GetFullPathNameA(filename, bufsize, buffer, filePartPtr)
+ if result == 0 then
+ local lasterror = C.GetLastError()
+ return nil, format_error("GetFullPathNameA", lasterror, filename)
+ elseif bufsize < result then
+ -- result: buffer size required to hold the path + terminating NUL
+ bufsize = result
+ end
+ until result < bufsize
+ local fullpath = ffi.string(buffer, result)
+ local filePart = ffi.string(filePartPtr[0])
+ local dirPart = ffi.string(buffer, ffi.cast("intptr_t", filePartPtr[0]) - ffi.cast("intptr_t", buffer)) -- LuaTeX's FFI doesn't support pointer subtraction
+ return fullpath, filePart, dirPart
+end
+
+--[[
+ dirwatche.dirname : string
+ dirwatcher._rawhandle : cdata HANDLE
+ dirwatcher._overlapped : cdata OVERLAPPED
+ dirwatcher._buffer : cdata char[?]
+]]
+local dirwatcher_meta = {}
+dirwatcher_meta.__index = dirwatcher_meta
+function dirwatcher_meta:close()
+ if self._rawhandle ~= nil then
+ C.CloseHandle(ffi.gc(self._rawhandle, nil))
+ self._rawhandle = nil
+ end
+end
+local function open_directory(dirname)
+ local dwShareMode = bitlib.bor(FILE_SHARE_READ, FILE_SHARE_WRITE, FILE_SHARE_DELETE)
+ local dwFlagsAndAttributes = bitlib.bor(FILE_FLAG_BACKUP_SEMANTICS, FILE_FLAG_OVERLAPPED)
+ local handle = C.CreateFileA(dirname, FILE_LIST_DIRECTORY, dwShareMode, nil, OPEN_EXISTING, dwFlagsAndAttributes, nil)
+ if handle == INVALID_HANDLE_VALUE then
+ local lasterror = C.GetLastError()
+ print("Failed to open "..dirname)
+ return nil, format_error("CreateFileA", lasterror, dirname)
+ end
+ return setmetatable({
+ dirname = dirname,
+ _rawhandle = ffi.gc(handle, C.CloseHandle),
+ _overlapped = ffi.new("OVERLAPPED"),
+ _buffer = ffi.new("char[?]", 1024),
+ }, dirwatcher_meta)
+end
+function dirwatcher_meta:start_watch(watchSubtree)
+ local dwNotifyFilter = bitlib.bor(FILE_NOTIFY_CHANGE_FILE_NAME, FILE_NOTIFY_CHANGE_DIR_NAME, FILE_NOTIFY_CHANGE_ATTRIBUTES, FILE_NOTIFY_CHANGE_SIZE, FILE_NOTIFY_CHANGE_LAST_WRITE, FILE_NOTIFY_CHANGE_LAST_ACCESS, FILE_NOTIFY_CHANGE_CREATION, FILE_NOTIFY_CHANGE_SECURITY)
+ local buffer = self._buffer
+ local bufferSize = ffi.sizeof(buffer)
+ local result = C.ReadDirectoryChangesW(self._rawhandle, buffer, bufferSize, watchSubtree, dwNotifyFilter, nil, self._overlapped, nil)
+ if result == 0 then
+ local lasterror = C.GetLastError()
+ return nil, format_error("ReadDirectoryChangesW", lasterror, self.dirname)
+ end
+ return true
+end
+local ActionTable = {
+ [FILE_ACTION_ADDED] = "added",
+ [FILE_ACTION_REMOVED] = "removed",
+ [FILE_ACTION_MODIFIED] = "modified",
+ [FILE_ACTION_RENAMED_OLD_NAME] = "rename_from",
+ [FILE_ACTION_RENAMED_NEW_NAME] = "rename_to",
+}
+function dirwatcher_meta:process(numberOfBytes)
+ -- self._buffer received `numberOfBytes` bytes
+ local buffer = self._buffer
+ numberOfBytes = math.min(numberOfBytes, ffi.sizeof(buffer))
+ local ptr = ffi.cast("char *", buffer)
+ local structSize = ffi.sizeof("FILE_NOTIFY_INFORMATION", 1)
+ local t = {}
+ while numberOfBytes >= structSize do
+ local notifyInfo = ffi.cast("FILE_NOTIFY_INFORMATION*", ptr)
+ local nextEntryOffset = notifyInfo.NextEntryOffset
+ local action = notifyInfo.Action
+ local fileNameLength = notifyInfo.FileNameLength
+ local fileName = notifyInfo.FileName
+ local u = { action = ActionTable[action], filename = wcs_to_mbs(fileName, fileNameLength / 2) }
+ table.insert(t, u)
+ if nextEntryOffset == 0 or numberOfBytes <= nextEntryOffset then
+ break
+ end
+ numberOfBytes = numberOfBytes - nextEntryOffset
+ ptr = ptr + nextEntryOffset
+ end
+ return t
+end
+
+--[[
+ watcher._rawport : cdata HANDLE
+ watcher._pending : array of {
+ action = ..., filename = ...
+ }
+ watcher._directories[dirname] = {
+ dir = directory watcher,
+ dirname = dirname,
+ files = { [filename] = user-supplied path } -- files to watch
+ }
+ watcher[i] = i-th directory (_directories[dirname] for some dirname)
+]]
+
+local fswatcher_meta = {}
+fswatcher_meta.__index = fswatcher_meta
+local function new_watcher()
+ local port = C.CreateIoCompletionPort(INVALID_HANDLE_VALUE, nil, 0, 0)
+ if port == NULL then
+ local lasterror = C.GetLastError()
+ return nil, format_error("CreateIoCompletionPort", lasterror)
+ end
+ return setmetatable({
+ _rawport = ffi.gc(port, C.CloseHandle), -- ?
+ _pending = {},
+ _directories = {},
+ }, fswatcher_meta)
+end
+local function add_directory(self, dirname)
+ local t = self._directories[dirname]
+ if not t then
+ local dirwatcher, err = open_directory(dirname)
+ if not dirwatcher then
+ return dirwatcher, err
+ end
+ t = { dirwatcher = dirwatcher, dirname = dirname, files = {} }
+ table.insert(self, t)
+ local i = #self
+ local result = C.CreateIoCompletionPort(dirwatcher._rawhandle, self._rawport, i, 0)
+ if result == NULL then
+ local lasterror = C.GetLastError()
+ return nil, format_error("CreateIoCompletionPort", lasterror, dirname)
+ end
+ self._directories[dirname] = t
+ local result, err = dirwatcher:start_watch(false)
+ if not result then
+ return result, err
+ end
+ end
+ return t
+end
+function fswatcher_meta:add_file(path, ...)
+ local fullpath, filename, dirname = get_full_path_name(path)
+ local t, err = add_directory(self, dirname)
+ if not t then
+ return t, err
+ end
+ t.files[filename] = path
+ return true
+end
+local INFINITE = 0xFFFFFFFF
+local function get_queued(self, timeout)
+ local startTime = C.GetTickCount64()
+ local timeout_ms
+ if timeout == nil then
+ timeout_ms = INFINITE
+ else
+ timeout_ms = timeout * 1000
+ end
+ local numberOfBytesPtr = ffi.new("DWORD[1]")
+ local completionKeyPtr = ffi.new("ULONG_PTR[1]")
+ local lpOverlapped = ffi.new("OVERLAPPED*[1]")
+ repeat
+ local result = C.GetQueuedCompletionStatus(self._rawport, numberOfBytesPtr, completionKeyPtr, lpOverlapped, timeout_ms)
+ if result == 0 then
+ local lasterror = C.GetLastError()
+ if lasterror == WAIT_TIMEOUT then
+ return nil, "timeout"
+ else
+ return nil, format_error("GetQueuedCompletionStatus", lasterror)
+ end
+ end
+ local numberOfBytes = numberOfBytesPtr[0]
+ local completionKey = tonumber(completionKeyPtr[0])
+ local dir_t = assert(self[completionKey], "invalid completion key: " .. tostring(completionKey))
+ local t = dir_t.dirwatcher:process(numberOfBytes)
+ dir_t.dirwatcher:start_watch(false)
+ local found = false
+ for i,v in ipairs(t) do
+ local path = dir_t.files[v.filename]
+ if path then
+ found = true
+ table.insert(self._pending, {path = path, action = v.action})
+ end
+ end
+ if found then
+ return true
+ end
+ if timeout_ms ~= INFINITE then
+ local tt = C.GetTickCount64()
+ timeout_ms = timeout_ms - (tt - startTime)
+ startTime = tt
+ end
+ until timeout_ms < 0
+ return nil, "timeout"
+end
+function fswatcher_meta:next(timeout)
+ if #self._pending > 0 then
+ local result = table.remove(self._pending, 1)
+ get_queued(self, 0) -- ignore error
+ return result
+ else
+ local result, err = get_queued(self, timeout)
+ if result == nil then
+ return nil, err
+ end
+ return table.remove(self._pending, 1)
+ end
+end
+function fswatcher_meta:close()
+ if self._rawport ~= nil then
+ for i,v in ipairs(self) do
+ v.dirwatcher:close()
+ end
+ C.CloseHandle(ffi.gc(self._rawport, nil))
+ self._rawport = nil
+ end
+end
+--[[
+local watcher = require("fswatcher_windows").new()
+assert(watcher:add_file("rdc-sync.c"))
+assert(watcher:add_file("sub2/hoge"))
+for i = 1, 10 do
+ local result, err = watcher:next(2)
+ if err == "timeout" then
+ print(os.date(), "timeout")
+ else
+ assert(result, err)
+ print(os.date(), result.path, result.action)
+ end
+end
+watcher:close()
+]]
+return {
+ new = new_watcher,
+}
+end
+package.preload["texrunner.safename"] = function(...)
+--[[
+ Copyright 2019 ARATA Mizuki
+
+ This file is part of ClutTeX.
+
+ ClutTeX is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ ClutTeX 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 ClutTeX. If not, see <http://www.gnu.org/licenses/>.
+]]
+
+local string = string
+local table = table
+
+local function dounsafechar(c)
+ if c == " " then
+ return "_"
+ else
+ return string.format("_%02x", c:byte(1))
+ end
+end
+
+local function escapejobname(name)
+ return (string.gsub(name, "[%s\"$%%&'();<>\\^`|]", dounsafechar))
+end
+
+local function handlespecialchar(s)
+ return (string.gsub(s, "[%\\%%^%{%}%~%#]", "~\\%1"))
+end
+
+local function handlespaces(s)
+ return (string.gsub(s, " +", function(s) return string.rep(" ", #s, "~") end))
+end
+
+local function handlenonascii(s)
+ return (string.gsub(s, "[\x80-\xFF]+", "\\detokenize{%1}"))
+end
+
+local function safeinput(name, engine)
+ local escaped = handlespaces(handlespecialchar(name))
+ if engine.name == "pdftex" or engine.name == "pdflatex" then
+ escaped = handlenonascii(escaped)
+ end
+ if name == escaped then
+ return string.format("\\input\"%s\"", name)
+ else
+ return string.format("\\begingroup\\escapechar-1\\let~\\string\\edef\\x{\"%s\" }\\expandafter\\endgroup\\expandafter\\input\\x", escaped)
+ end
+end
+
+return {
+ escapejobname = escapejobname,
+ safeinput = safeinput,
+}
+end
+package.preload["texrunner.checkdriver"] = function(...)
+--[[
+ Copyright 2020 ARATA Mizuki
+
+ This file is part of ClutTeX.
+
+ ClutTeX is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ ClutTeX 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 ClutTeX. If not, see <http://www.gnu.org/licenses/>.
+]]
+local assert = assert
+local ipairs = ipairs
+local error = error
+local string = string
+local pathutil = require "texrunner.pathutil"
+local message = require "texrunner.message"
+
+local right_values = {
+ dvips = {
+ graphics = "dvips",
+ expl3 = "dvips",
+ hyperref = "dvips",
+ xypic = "dvips",
+ },
+ dvipdfmx = {
+ graphics = "dvipdfmx",
+ expl3 = "dvipdfmx",
+ hyperref = "dvipdfmx",
+ xypic = "pdf",
+ },
+ dvisvgm = {
+ graphics = "dvisvgm",
+ expl3 = "dvisvgm",
+ },
+ xetex = {
+ graphics = "xetex",
+ expl3 = "xdvipdfmx",
+ hyperref = "xetex",
+ xypic = "pdf",
+ },
+ pdftex = {
+ graphics = "pdftex",
+ expl3 = "pdfmode",
+ hyperref = "pdftex",
+ xypic = "pdf",
+ },
+ luatex = {
+ graphics = "luatex",
+ expl3 = "pdfmode",
+ hyperref = "luatex",
+ xypic = "pdf",
+ },
+}
+
+-- expected_driver: one of "dvips", "dvipdfmx", "dvisvgm", "pdftex", "xetex", "luatex"
+local function checkdriver(expected_driver, filelist)
+ if CLUTTEX_VERBOSITY >= 1 then
+ message.info("checkdriver: expects ", expected_driver)
+ end
+
+ local loaded = {}
+ for i,t in ipairs(filelist) do
+ if t.kind == "input" then
+ local basename = pathutil.basename(t.path)
+ loaded[basename] = true
+ end
+ end
+
+ local graphics_driver = nil -- "dvipdfmx" | "dvips" | "dvisvgm" | "pdftex" | "luatex" | "xetex" | "unknown"
+ if loaded["graphics.sty"] or loaded["color.sty"] then
+ if loaded["dvipdfmx.def"] then
+ graphics_driver = "dvipdfmx"
+ elseif loaded["dvips.def"] then
+ graphics_driver = "dvips"
+ elseif loaded["dvisvgm.def"] then
+ graphics_driver = "dvisvgm"
+ elseif loaded["pdftex.def"] then
+ graphics_driver = "pdftex"
+ elseif loaded["luatex.def"] then
+ graphics_driver = "luatex"
+ elseif loaded["xetex.def"] then
+ graphics_driver = "xetex"
+ else
+ -- Not supported: dvipdf, dvipsone, emtex, textures, pctexps, pctexwin, pctexhp, pctex32, truetex, tcidvi, vtex
+ graphics_driver = "unknown"
+ end
+ end
+ local expl3_driver = nil -- "pdfmode" | "dvisvgm" | "xdvipdfmx" | "dvipdfmx" | "dvips" | "unknown"
+ if loaded["expl3-code.tex"] or loaded["expl3.sty"] or loaded["l3backend-dvips.def"] or loaded["l3backend-dvipdfmx.def"] or loaded["l3backend-xdvipdfmx.def"] or loaded["l3backend-pdfmode.def"] then
+ if loaded["l3backend-pdfmode.def"] then
+ expl3_driver = "pdfmode" -- pdftex, luatex
+ elseif loaded["l3backend-dvisvgm.def"] then
+ expl3_driver = "dvisvgm"
+ elseif loaded["l3backend-xdvipdfmx.def"] then
+ expl3_driver = "xdvipdfmx"
+ elseif loaded["l3backend-dvipdfmx.def"] then
+ expl3_driver = "dvipdfmx"
+ elseif loaded["l3backend-dvips.def"] then
+ expl3_driver = "dvips"
+ else
+ -- TODO: driver=latex2e?
+ expl3_driver = "unknown"
+ end
+ end
+ local hyperref_driver = nil -- "luatex" | "pdftex" | "xetex" | "dvipdfmx" | "dvips" | "unknown"
+ if loaded["hyperref.sty"] then
+ if loaded["hluatex.def"] then
+ hyperref_driver = "luatex"
+ elseif loaded["hpdftex.def"] then
+ hyperref_driver = "pdftex"
+ elseif loaded["hxetex.def"] then
+ hyperref_driver = "xetex"
+ elseif loaded["hdvipdfm.def"] then
+ hyperref_driver = "dvipdfmx"
+ elseif loaded["hdvips.def"] then
+ hyperref_driver = "dvips"
+ else
+ -- Not supported: dvipson, dviwind, tex4ht, texture, vtex, vtexhtm, xtexmrk, hypertex
+ hyperref_driver = "unknown"
+ end
+ -- TODO: dvisvgm?
+ end
+ local xypic_driver = nil -- "pdf" | "dvips" | "unknown"
+ if loaded["xy.tex"] then
+ if loaded["xypdf.tex"] then
+ xypic_driver = "pdf" -- pdftex, luatex, xetex, dvipdfmx
+ elseif loaded["xydvips.tex"] then
+ xypic_driver = "dvips"
+ else
+ -- Not supported: dvidrv, dvitops, oztex, 17oztex, textures, 16textures, xdvi
+ xypic_driver = "unknown"
+ end
+ -- TODO: dvisvgm?
+ end
+
+ if CLUTTEX_VERBOSITY >= 1 then
+ message.info("checkdriver: graphics=", tostring(graphics_driver))
+ message.info("checkdriver: expl3=", tostring(expl3_driver))
+ message.info("checkdriver: hyperref=", tostring(hyperref_driver))
+ message.info("checkdriver: xypic=", tostring(xypic_driver))
+ end
+
+ local expected = assert(right_values[expected_driver], "invalid value for expected_driver")
+ if graphics_driver ~= nil and expected.graphics ~= nil and graphics_driver ~= expected.graphics then
+ message.diag("The driver option for graphics(x)/color is missing or wrong.")
+ message.diag("Consider setting '", expected.graphics, "' option.")
+ end
+ if expl3_driver ~= nil and expected.expl3 ~= nil and expl3_driver ~= expected.expl3 then
+ message.diag("The driver option for expl3 is missing or wrong.")
+ message.diag("Consider setting 'driver=", expected.expl3, "' option when loading expl3.")
+ end
+ if hyperref_driver ~= nil and expected.hyperref ~= nil and hyperref_driver ~= expected.hyperref then
+ message.diag("The driver option for hyperref is missing or wrong.")
+ message.diag("Consider setting '", expected.hyperref, "' option.")
+ end
+ if xypic_driver ~= nil and expected.xypic ~= nil and xypic_driver ~= expected.xypic then
+ message.diag("The driver option for Xy-pic is missing or wrong.")
+ if expected_driver == "dvipdfmx" then
+ message.diag("Consider setting 'dvipdfmx' option or running \\xyoption{pdf}.")
+ elseif expected_driver == "pdftex" then
+ message.diag("Consider setting 'pdftex' option or running \\xyoption{pdf}.")
+ elseif expected.xypic == "pdf" then
+ message.diag("Consider setting 'pdf' package option or running \\xyoption{pdf}.")
+ elseif expected.xypic == "dvips" then
+ message.diag("Consider setting 'dvips' option.")
+ end
+ end
+end
+
+--[[
+filelist[i] = {path = ""}
+]]
+
+return {
+ checkdriver = checkdriver,
+}
+end
+--[[
+ Copyright 2016-2020 ARATA Mizuki
+
+ This file is part of ClutTeX.
+
+ ClutTeX is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ ClutTeX 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 ClutTeX. If not, see <http://www.gnu.org/licenses/>.
+]]
+
+CLUTTEX_VERSION = "v0.5"
-- Standard libraries
local coroutine = coroutine
@@ -2162,8 +2925,12 @@
local luatexinit = require "texrunner.luatexinit"
local recoverylib = require "texrunner.recovery"
local message = require "texrunner.message"
+local safename = require "texrunner.safename"
local extract_bibtex_from_aux_file = require "texrunner.auxfile".extract_bibtex_from_aux_file
local handle_cluttex_options = require "texrunner.handleoption".handle_cluttex_options
+local checkdriver = require "texrunner.checkdriver".checkdriver
+
+os.setlocale("", "ctype") -- Workaround for recent Universal CRT
-- arguments: input file name, jobname, etc...
local function genOutputDirectory(...)
@@ -2180,12 +2947,17 @@
local inputfile, engine, options = handle_cluttex_options(arg)
-local jobname = options.jobname or pathutil.basename(pathutil.trimext(inputfile))
+local jobname_for_output
+if options.jobname == nil then
+ local basename = pathutil.basename(pathutil.trimext(inputfile))
+ options.jobname = safename.escapejobname(basename)
+ jobname_for_output = basename
+else
+ jobname_for_output = options.jobname
+end
+local jobname = options.jobname
assert(jobname ~= "", "jobname cannot be empty")
-if options.output_format == nil then
- options.output_format = "pdf"
-end
local output_extension
if options.output_format == "dvi" then
output_extension = engine.dvi_extension or "dvi"
@@ -2194,13 +2966,13 @@
end
if options.output == nil then
- options.output = jobname .. "." .. output_extension
+ options.output = jobname_for_output .. "." .. output_extension
end
-- Prepare output directory
if options.output_directory == nil then
local inputfile_abs = pathutil.abspath(inputfile)
- options.output_directory = genOutputDirectory(inputfile_abs, jobname, options.engine)
+ options.output_directory = genOutputDirectory(inputfile_abs, jobname, options.engine_executable or options.engine)
if not fsutil.isdir(options.output_directory) then
assert(fsutil.mkdir_rec(options.output_directory))
@@ -2220,6 +2992,12 @@
os.exit(1)
end
+-- --print-output-directory
+if options.print_output_directory then
+ io.write(options.output_directory, "\n")
+ os.exit(0)
+end
+
local pathsep = ":"
if os.type == "windows" then
pathsep = ";"
@@ -2258,6 +3036,7 @@
local recorderfile2 = path_in_output_directory("cluttex-fls")
local tex_options = {
+ engine_executable = options.engine_executable,
interaction = options.interaction,
file_line_error = options.file_line_error,
halt_on_error = options.halt_on_error,
@@ -2284,7 +3063,7 @@
-- should_rerun, newauxstatus = single_run([auxstatus])
-- This function should be run in a coroutine.
local function single_run(auxstatus, iteration)
- local minted = false
+ local minted, epstopdf = false, false
local bibtex_aux_hash = nil
local mainauxfile = path_in_output_directory("aux")
if fsutil.isfile(recorderfile) then
@@ -2297,7 +3076,9 @@
for _,fileinfo in ipairs(filelist) do
if string.match(fileinfo.path, "minted/minted%.sty$") then
minted = true
- break
+ end
+ if string.match(fileinfo.path, "epstopdf%.sty$") then
+ epstopdf = true
end
end
if options.bibtex then
@@ -2316,14 +3097,38 @@
end
--local timestamp = os.time()
+ local tex_injection = ""
+
if options.includeonly then
- tex_options.tex_injection = string.format("%s\\includeonly{%s}", tex_options.tex_injection or "", options.includeonly)
+ tex_injection = string.format("%s\\includeonly{%s}", tex_options.tex_injection or "", options.includeonly)
end
- if minted and not (tex_options.tex_injection and string.find(tex_options.tex_injection,"minted") == nil) then
- tex_options.tex_injection = string.format("%s\\PassOptionsToPackage{outputdir=%s}{minted}", tex_options.tex_injection or "", options.output_directory)
+ if minted or options.package_support["minted"] then
+ local outdir = options.output_directory
+ if os.type == "windows" then
+ outdir = string.gsub(outdir, "\\", "/") -- Use forward slashes
+ end
+ tex_injection = string.format("%s\\PassOptionsToPackage{outputdir=%s}{minted}", tex_injection or "", outdir)
+ if not options.package_support["minted"] then
+ message.diag("You may want to use --package-support=minted option.")
+ end
+ end
+ if epstopdf or options.package_support["epstopdf"] then
+ local outdir = options.output_directory
+ if os.type == "windows" then
+ outdir = string.gsub(outdir, "\\", "/") -- Use forward slashes
+ end
+ if string.sub(outdir, -1, -1) ~= "/" then
+ outdir = outdir.."/" -- Must end with a directory separator
+ end
+ tex_injection = string.format("%s\\PassOptionsToPackage{outdir=%s}{epstopdf}", tex_injection or "", outdir)
+ if not options.package_support["epstopdf"] then
+ message.diag("You may want to use --package-support=epstopdf option.")
+ end
end
+ local inputline = tex_injection .. safename.safeinput(inputfile, engine)
+
local current_tex_options, lightweight_mode = tex_options, false
if iteration == 1 and options.start_with_draft then
current_tex_options = {}
@@ -2340,7 +3145,7 @@
current_tex_options.draftmode = false
end
- local command = engine:build_command(inputfile, current_tex_options)
+ local command = engine:build_command(inputline, current_tex_options)
local execlog -- the contents of .log file
@@ -2376,6 +3181,10 @@
logfile:close()
end
+ if options.check_driver ~= nil then
+ checkdriver(options.check_driver, filelist)
+ end
+
if options.makeindex then
-- Look for .idx files and run MakeIndex
for _,file in ipairs(filelist) do
@@ -2610,7 +3419,90 @@
if options.watch then
-- Watch mode
+
+ local fswatcherlib
+ if os.type == "windows" then
+ -- Windows: Try built-in filesystem watcher
+ local succ, result = pcall(require, "texrunner.fswatcher_windows")
+ if not succ and CLUTTEX_VERBOSITY >= 1 then
+ message.warn("Failed to load texrunner.fswatcher_windows: " .. result)
+ end
+ fswatcherlib = result
+ end
+
+ local do_watch
+ if fswatcherlib then
+ if CLUTTEX_VERBOSITY >= 2 then
+ message.info("Using built-in filesystem watcher for Windows")
+ end
+ do_watch = function(files)
+ local watcher = assert(fswatcherlib.new())
+ for _,path in ipairs(files) do
+ assert(watcher:add_file(path))
+ end
+ local result = assert(watcher:next())
+ if CLUTTEX_VERBOSITY >= 2 then
+ message.info(string.format("%s %s", result.action, result.path))
+ end
+ watcher:close()
+ return true
+ end
+ elseif shellutil.has_command("fswatch") then
+ if CLUTTEX_VERBOSITY >= 2 then
+ message.info("Using `fswatch' command")
+ end
+ do_watch = function(files)
+ local fswatch_command = {"fswatch", "--one-event", "--event=Updated", "--"}
+ for _,path in ipairs(files) do
+ table.insert(fswatch_command, shellutil.escape(path))
+ end
+ local fswatch_command_str = table.concat(fswatch_command, " ")
+ if CLUTTEX_VERBOSITY >= 1 then
+ message.exec(fswatch_command_str)
+ end
+ local fswatch = assert(io.popen(fswatch_command_str, "r"))
+ for l in fswatch:lines() do
+ for _,path in ipairs(files) do
+ if l == path then
+ fswatch:close()
+ return true
+ end
+ end
+ end
+ return false
+ end
+ elseif shellutil.has_command("inotifywait") then
+ if CLUTTEX_VERBOSITY >= 2 then
+ message.info("Using `inotifywait' command")
+ end
+ do_watch = function(files)
+ local inotifywait_command = {"inotifywait", "--event=modify", "--event=attrib", "--format=%w", "--quiet"}
+ for _,path in ipairs(files) do
+ table.insert(inotifywait_command, shellutil.escape(path))
+ end
+ local inotifywait_command_str = table.concat(inotifywait_command, " ")
+ if CLUTTEX_VERBOSITY >= 1 then
+ message.exec(inotifywait_command_str)
+ end
+ local inotifywait = assert(io.popen(inotifywait_command_str, "r"))
+ for l in inotifywait:lines() do
+ for _,path in ipairs(files) do
+ if l == path then
+ inotifywait:close()
+ return true
+ end
+ end
+ end
+ return false
+ end
+ else
+ message.error("Could not watch files because neither `fswatch' nor `inotifywait' was installed.")
+ message.info("See ClutTeX's manual for details.")
+ os.exit(1)
+ end
+
local success, status = do_typeset()
+ -- TODO: filenames here can be UTF-8 if command_line_encoding=utf-8
local filelist, filemap = reruncheck.parse_recorder_file(recorderfile, options)
if engine.is_luatex and fsutil.isfile(recorderfile2) then
filelist, filemap = reruncheck.parse_recorder_file(recorderfile2, options, filelist, filemap)
@@ -2621,26 +3513,21 @@
table.insert(input_files_to_watch, fileinfo.abspath)
end
end
- local fswatch_command = {"fswatch", "--event=Updated", "--"}
- for _,path in ipairs(input_files_to_watch) do
- table.insert(fswatch_command, shellutil.escape(path))
- end
- if CLUTTEX_VERBOSITY >= 1 then
- message.exec(table.concat(fswatch_command, " "))
- end
- local fswatch = assert(io.popen(table.concat(fswatch_command, " "), "r"))
- for l in fswatch:lines() do
- local found = false
- for _,path in ipairs(input_files_to_watch) do
- if l == path then
- found = true
- break
+
+ while do_watch(input_files_to_watch) do
+ local success, status = do_typeset()
+ if not success then
+ -- error
+ else
+ local filelist, filemap = reruncheck.parse_recorder_file(recorderfile, options)
+ if engine.is_luatex and fsutil.isfile(recorderfile2) then
+ filelist, filemap = reruncheck.parse_recorder_file(recorderfile2, options, filelist, filemap)
end
- end
- if found then
- local success, status = do_typeset()
- if not success then
- -- Not successful
+ input_files_to_watch = {}
+ for _,fileinfo in ipairs(filelist) do
+ if fileinfo.kind == "input" then
+ table.insert(input_files_to_watch, fileinfo.abspath)
+ end
end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cluttex.tlpobj new/tlpkg/tlpobj/cluttex.tlpobj
--- old/tlpkg/tlpobj/cluttex.tlpobj 2019-02-28 03:25:55.000000000 +0100
+++ new/tlpkg/tlpobj/cluttex.tlpobj 2020-02-08 01:55:43.000000000 +0100
@@ -1,6 +1,6 @@
name cluttex
category Package
-revision 50090
+revision 53698
shortdesc An automation tool for running LaTeX
longdesc This is another tool for the automation of LaTeX document
longdesc processing, like latexmk or arara. The main feature of this
@@ -12,12 +12,11 @@
longdesc set. Furthermore, cluttex can watch input files for changes
longdesc (using an external program).
depend cluttex.ARCH
-runfiles size=21
+runfiles size=29
texmf-dist/scripts/cluttex/cluttex.lua
catalogue-contact-bugs https://github.com/minoki/cluttex/issues
catalogue-contact-repository https://github.com/minoki/cluttex
catalogue-ctan /support/cluttex
-catalogue-date 2019-02-22 09:26:57 +0100
-catalogue-license gpl3
+catalogue-license gpl3+
catalogue-topics compilation use-lua
-catalogue-version 0.2
+catalogue-version 0.5
++++++ cm-mf-extra-bold.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cm-mf-extra-bold.tlpobj new/tlpkg/tlpobj/cm-mf-extra-bold.tlpobj
--- old/tlpkg/tlpobj/cm-mf-extra-bold.tlpobj 2019-02-28 03:26:12.000000000 +0100
+++ new/tlpkg/tlpobj/cm-mf-extra-bold.tlpobj 2020-03-24 01:56:49.000000000 +0100
@@ -1,6 +1,6 @@
name cm-mf-extra-bold
category Package
-revision 45796
+revision 54512
shortdesc Extra Metafont files for CM
relocated 1
longdesc The bundle provides bold versions of cmcsc, cmex, cmtex and
@@ -21,6 +21,5 @@
RELOC/fonts/tfm/public/cm-mf-extra-bold/cmbtt9.tfm
RELOC/fonts/tfm/public/cm-mf-extra-bold/cmttb10.tfm
catalogue-ctan /fonts/cm/mf-extra/bold
-catalogue-date 2017-11-12 11:19:12 +0100
-catalogue-license gplpd
+catalogue-license gpl pd
catalogue-topics font font-mf
++++++ cmexb.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmexb.doc.tlpobj new/tlpkg/tlpobj/cmexb.doc.tlpobj
--- old/tlpkg/tlpobj/cmexb.doc.tlpobj 2019-02-28 03:27:12.000000000 +0100
+++ new/tlpkg/tlpobj/cmexb.doc.tlpobj 2020-03-04 23:50:30.000000000 +0100
@@ -1,6 +1,6 @@
name cmexb.doc
category Package
-revision 45677
+revision 54074
shortdesc doc files of cmexb
relocated 1
docfiles size=1
++++++ cmexb.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmexb.tlpobj new/tlpkg/tlpobj/cmexb.tlpobj
--- old/tlpkg/tlpobj/cmexb.tlpobj 2019-02-28 03:27:12.000000000 +0100
+++ new/tlpkg/tlpobj/cmexb.tlpobj 2020-03-04 23:50:30.000000000 +0100
@@ -1,6 +1,6 @@
name cmexb
category Package
-revision 45677
+revision 54074
shortdesc cmexb10 metrics and Type 1
relocated 1
longdesc Computer Modern Math Extension bold, metrics and .pfb file.
++++++ cmpj.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cmpj/README new/doc/latex/cmpj/README
--- old/doc/latex/cmpj/README 2017-05-10 23:12:18.000000000 +0200
+++ new/doc/latex/cmpj/README 2019-07-18 22:33:40.000000000 +0200
@@ -85,6 +85,10 @@
CHANGES
+RELEASE NOTES FOR VERSION 3.02:
+
+* cmpj3.sty and cmpj2.sty use new 'droid' font families names.
+
RELEASE NOTES FOR VERSION 3.01:
* New cmpj3.sty using 'newtx' fonts for text and math and
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cmpj/cmpjxampl.bib new/doc/latex/cmpj/cmpjxampl.bib
--- old/doc/latex/cmpj/cmpjxampl.bib 2017-05-10 23:12:18.000000000 +0200
+++ new/doc/latex/cmpj/cmpjxampl.bib 2019-07-18 22:33:40.000000000 +0200
@@ -34,7 +34,7 @@
abstract="We propose a microscopic approach for investigating the behavior of a symmetric binary fluid mixture in the vicinity of the vapor-liquid critical point. The problem can be reduced to calculating the partition function of a 3D Ising model in an external field. For a square-well symmetric binary mixture, we express the parameters of the critical point as functions of the microscopic parameter r measuring the relative strength of interactions between the particles of dissimilar and similar species. The calculations are performed at intermediate ($\lambda$=1.5) and moderately long ($\lambda$=2) intermolecular potential ranges. The obtained results agree well with the results of computer simulations.",
issn="1573-9333",
doi="10.1007/BF02551084",
- OPTurl="http://dx.doi.org/10.1007/BF02551084",
+ OPTurl="https://doi.org/10.1007/BF02551084",
note = {[Teor. Mat. Fiz., 2000, \textbf{124}, No.~2, 339--352 (in Russian), \bibdoi{10.4213/tmf643}]},
}
@@ -86,7 +86,7 @@
abstract="A desirable goal of scientific management is to introduce, if it exists, a simple and reliable way to measure the scientific excellence of publicly funded research institutions and universities to serve as a basis for their ranking and financing. While citation-based indicators and metrics are easily accessible, they are far from being universally accepted as way to automate or inform evaluation processes or to replace evaluations based on peer review. Here we consider absolute measurements of research excellence at an amalgamated, institutional level and specific measures of research excellence as performance per head. Using biology research institutions in the UK as a test case, we examine the correlations between peer review-based and citation-based measures of research excellence on these two scales. We find that citation-based indicators are very highly correlated with peer-evaluated measures of group strength, but are poorly correlated with group quality. Thus, and almost paradoxically, our analysis indicates that citation counts could possibly form a basis for deciding on, how to fund research institutions, but they should not be used as a basis for ranking them in terms of quality.",
issn="1588-2861",
doi="10.1007/s11192-012-0874-7",
- OPTurl="http://dx.doi.org/10.1007/s11192-012-0874-7",
+ OPTurl="https://doi.org/10.1007/s11192-012-0874-7",
note="(in press)",
}
@@ -142,7 +142,7 @@
OPTyear = {year},
OPTnote = {note},
OPTannote = {annote},
- url={http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,5…,
+ url={https://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078125,…,
}
@misc{han12,
Binary files old/doc/latex/cmpj/template.pdf and new/doc/latex/cmpj/template.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cmpj/template.tex new/doc/latex/cmpj/template.tex
--- old/doc/latex/cmpj/template.tex 2017-05-10 23:12:18.000000000 +0200
+++ new/doc/latex/cmpj/template.tex 2019-07-18 22:33:40.000000000 +0200
@@ -6,9 +6,9 @@
%%% in the Condensed Matter Physics journal <cmp(a)icmp.lviv.ua> %%%
%%% using LaTeX2e %%%
%%% %%%
-%%% Last time modified: May 8, 2017 %%%
+%%% Last time modified: July 17, 2019 %%%
%%% %%%
-%%% Copyright (C) 2017 by the Institute for Condensed Matter Physics %%%
+%%% Copyright (C) 2019 by the Institute for Condensed Matter Physics %%%
%%% of the National Academy of Sciences of Ukraine %%%
%%% %%%
%%% This file can be redistributed and/or modified under the terms %%%
@@ -106,7 +106,7 @@
%
\keywords Up to six keywords (\href{https://physh.aps.org/browse}{Physics Subject Headings})
%
-\pacs Up to six PACS numbers
+\pacs Up to six \href{https://journals.aps.org/PACS}{PACS} numbers
\end{abstract}
@@ -149,7 +149,7 @@
\\ [1ex]
or from the Comprehensive \TeX\ Archive Network (CTAN)
\nopagebreak\\ [1ex]
-\centerline{\texttt{\url{http://www.ctan.org/pkg/cmpj}}.}
+\centerline{\texttt{\url{https://www.ctan.org/pkg/cmpj}}.}
\smallskip
@@ -224,7 +224,7 @@
Please use the full classification system which
is available online at
\\ [1ex]
-\centerline{\texttt{\url{http://journals.aps.org/PACS/}}}
+\centerline{\texttt{\url{https://journals.aps.org/PACS}}}
\\ [1ex]
There should be no more than six numbers, the principal number
should be placed first, and the check characters should always be
@@ -649,8 +649,8 @@
e.g. in Ukrainian, unpublished, private communication, in press) \cite{Bus89,Mel00,Mry94,Sta11}.
For journals without volume numbers place the issue number instead as in reference~\cite{Mry94}.
The names of all authors of cited papers should be given.
-Title of journal should be abbreviated according to the ISO~4 ``\href{http://www.issn.org/services/online-services/access-to-the-ltwa/}{List of Title Word Abbreviations}'' standard (see, \texttt{\url{http://woodward.library.ubc.ca/research-help/journal-abbreviations/}} or \texttt{\url{http://cassi.cas.org/search.jsp}} for the ready for use lists of journal titles).
-Please supply \href{http://www.crossref.org/guestquery/}{DOI} for
+Title of journal should be abbreviated according to the ISO~4 ``\href{https://www.issn.org/services/online-services/access-to-the-ltwa/}{List of Title Word Abbreviations}'' standard (see, \texttt{\url{https://woodward.library.ubc.ca/research-help/journal-abbreviations/}} or \texttt{\url{https://cassi.cas.org/search.jsp}} for the ready for use lists of journal titles).
+Please supply \href{https://www.crossref.org/guestquery/}{DOI} for
e-version of the papers if available \cite{Bus89,Mel00,Mry94,Sta11,Scient2012}.
For books, the following order is required (skip irrelevant information):
@@ -664,14 +664,14 @@
in English \cite{Mel00,Sta04,Yuk87}. Indicate materials accepted for
publications by adding ``(in press)'' \cite{Scient2012}. If a preprint
exists of the paper not yet accepted for publication, give the e-print
-\href{http://arxiv.org}{arXiv} number \cite{Shv04}.
+\href{https://arxiv.org}{arXiv} number \cite{Shv04}.
Any web resources should be cited as references \cite{url2}.
Please avoid references to unpublished materials, private communication
and web pages \cite{han12,url2}.
It is important to confirm the accuracy of bibliographic information
in references. This has become more important now that the journal
-is online. To ensure that the \href{http://www.crossref.org/}{CrossRef}
+is online. To ensure that the \href{https://www.crossref.org/}{CrossRef}
facility can hyper-link to the articles quoted in the bibliography,
\textbf{multiple references must not be used}. I.e., a list of
references under the same number is not allowed: each reference has
@@ -691,7 +691,7 @@
\textbf{39}, 207--214, \doi{10.1103/PhysRevB.39.207}.
\bibitem{Mel00} Melnyk R.S., Patsahan O.V., Theor. Math. Phys., 2000, \textbf{124}, No.~2,
1145--1156, \doi{10.1007/BF02551084}, [Teor. Mat. Fiz., 2000, \textbf{124}, No.~2,
- 339--352 (in Russian), \bibdoi{10.4213/tmf643}].
+ 339--352 (in Russian), \doi{10.4213/tmf643}].
\bibitem{Mry94} Mryglod I.M., Tokarchuk M.V., Condens. Matter Phys., 1994, \textbf{3},
116--133, \doi{10.5488/CMP.3.116}.
\bibitem{Sta11} Stasyuk I.V., Velychko O.V., Condens. Matter Phys., 2011, \textbf{14},
@@ -713,7 +713,7 @@
\bibitem{Shv04} Shvaika A.M., Vorobyov O., Freericks J.K., Devereaux T.P.,Preprint
\arxiv{cond-mat/0408400}, 2004.
\bibitem{url2} {EOSDIS} {W}orldview. {C}ity {L}ights,
- URL~\url{http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.050781….
+ URL~\url{https://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078….
\bibitem{han12} Han Y., Kida T., Ikeda M., Hagiwara M., Stre\v{c}ka J., Honda Z.,
(unpublished).
\end{thebibliography}
@@ -742,20 +742,20 @@
A lot of useful (and free) information one can find at
``\TeX{} Users Group'' web site
\\ [1ex]
-\centerline{\texttt{\url{http://www.tug.org/}}.}
+\centerline{\texttt{\url{https://www.tug.org/}}.}
\smallskip
``The Not So Short Introduction to \LaTeXe{}'' by Tobias Oetiker is an
absolutely necessary book for beginners:
\\ [1ex]
-\centerline{\texttt{\url{http://ctan.org/tex-archive/info/lshort/}}}
+\centerline{\texttt{\url{https://ctan.org/pkg/lshort}}}
\\ [1ex]
(available in a variety of languages including Ukrainian). Ukrainian
\TeX{}nicians will find a plenty of language-specific information
at Andrij Shvaika's ``\TeX{} \& Ukrainian'' Web-page
\\ [1ex]
-\centerline{\texttt{\url{http://ph.icmp.lviv.ua/~ashv/tex/TeXandUkrainian.win.html}}.}
+\centerline{\texttt{\url{http://ph.icmp.lviv.ua/~ashv/tex/TeXandUkrainian.html}}.}
\smallskip
@@ -771,15 +771,15 @@
comprehensive (and free) tutorials on the subject one can mention
%``IOP Style Guide''
%\\ [1ex]
-%\centerline{\texttt{\url{http://www.iop.org/websupport/file_53266.pdf}},}
+%\centerline{\texttt{\url{https://www.iop.org/websupport/file_53266.pdf}},}
%\\ [1ex]
``Physical Review Style and Notation Guide''
\\ [1ex]
-\centerline{\texttt{\url{http://publish.aps.org/files/styleguide-pr.pdf}},}
+\centerline{\texttt{\url{https://publish.aps.org/files/styleguide-pr.pdf}},}
\\ [1ex]
and ``Reviews of Modern Physics Style Guide''
\\ [1ex]
-\centerline{\texttt{\url{http://rmp.aps.org/files/rmpguide.pdf}}}
+\centerline{\texttt{\url{https://rmp.aps.org/files/rmpguide.pdf}}}
\\ [1ex]
Remember: ``\textit{Ignorantia non est argumentum}'' and
``\textit{Scientia potentia est}''!
@@ -798,7 +798,7 @@
207--214, \doi{10.1103/PhysRevB.39.207}.
\bibitem{Mel00} Melnyk R.S., Patsahan O.V., Theor. Math. Phys., 2000, \textbf{124}, No.~2,
1145--1156, \doi{10.1007/BF02551084}, [Teor. Mat. Fiz., 2000, \textbf{124}, No.~2,
- 339--352 (in Russian), \bibdoi{10.4213/tmf643}].
+ 339--352 (in Russian), \doi{10.4213/tmf643}].
\bibitem{Mry94} Mryglod I.M., Tokarchuk M.V., Condens. Matter Phys., 1994, \textbf{3},
116--133, \doi{10.5488/CMP.3.116}.
\bibitem{Sta11} Stasyuk I.V., Velychko O.V., Condens. Matter Phys., 2011, \textbf{14},
@@ -820,7 +820,7 @@
\bibitem{Shv04} Shvaika A.M., Vorobyov O., Freericks J.K., Devereaux T.P., Preprint
\arxiv{cond-mat/0408400}, 2004.
\bibitem{url2} {EOSDIS} {W}orldview. {C}ity {L}ights,
- URL~\url{http://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.050781….
+ URL~\url{https://earthdata.nasa.gov/labs/worldview/?map=-24.484375,14.05078….
\bibitem{han12} Han Y., Kida T., Ikeda M., Hagiwara M., Stre\v{c}ka J., Honda Z., (unpublished).
\end{thebibliography}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmpj.doc.tlpobj new/tlpkg/tlpobj/cmpj.doc.tlpobj
--- old/tlpkg/tlpobj/cmpj.doc.tlpobj 2019-02-28 03:27:14.000000000 +0100
+++ new/tlpkg/tlpobj/cmpj.doc.tlpobj 2019-07-20 01:53:10.000000000 +0200
@@ -1,9 +1,9 @@
name cmpj.doc
category Package
-revision 44283
+revision 51661
shortdesc doc files of cmpj
relocated 1
-docfiles size=172
+docfiles size=171
RELOC/doc/latex/cmpj/README
RELOC/doc/latex/cmpj/cmpjxampl.bib
RELOC/doc/latex/cmpj/eps_demo.eps
++++++ cmpj.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cmpj/cmpj2.sty new/tex/latex/cmpj/cmpj2.sty
--- old/tex/latex/cmpj/cmpj2.sty 2017-05-10 23:12:18.000000000 +0200
+++ new/tex/latex/cmpj/cmpj2.sty 2019-07-18 22:33:40.000000000 +0200
@@ -7,9 +7,9 @@
%%% http://www.icmp.lviv.ua/journal/ %%%
%%% using LaTeX2e %%%
%%% %%%
-%%% Last time modified: May 8, 2017 %%%
+%%% Last time modified: July 17, 2019 %%%
%%% %%%
-%%% Copyright (C) 2013 by the Institute for Condensed Matter Physics %%%
+%%% Copyright (C) 2019 by the Institute for Condensed Matter Physics %%%
%%% of the National Academy of Sciences of Ukraine %%%
%%% all rights reserved. %%%
%%% %%%
@@ -22,11 +22,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{cmpj2}
- [2017/05/08 v2.07
+ [2019/07/17 v2.08
The Condensed Matter Physics journal package]
\def\filename{cmpj2.sty}
-\def\fileversion{2.07}
-\def\filedate{2017/05/08}
+\def\fileversion{2.08}
+\def\filedate{2019/07/17}
\immediate\write32{This is '\filename' v\fileversion \space <\filedate> ^^J%
the Condensed Matter Physics journal package}
@@ -83,9 +83,9 @@
\edef\_{_}%
\edef\textless{\@percentchar3C}% instead of {\string<} for Apple
\edef\textgreater{\@percentchar3E}% instead of {\sting>} for Apple
- \edef\x{\toks1={\noexpand\href{\doiURL#1}}}%
+ \edef\x{\toks2={\noexpand\href{\doiURL#1}}}%
\x
- \edef\x{\endgroup\doitext\the\toks1 \the\toks0}%
+ \edef\x{\endgroup\doitext\the\toks2 \the\toks0}%
\x
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -317,18 +317,34 @@
}
\def\cmpj@sf@droid{
- \IfFileExists{t2afds.fd}{
- \IfFileExists{omltxmi.fd}{\RequirePackage{txfonts}}{}
- \IfFileExists{fmlfutm.fd}{\RequirePackage{fourier}}{}
- \IfFileExists{omltxmi.fd}{\re@DeclareMathSymbol{\varkappa}{\mathord}{AMSb}{123}}{}
- \RequirePackage[default,scale=0.86]{droidserif}
- \RequirePackage[defaultsans,scale=0.86]{droidsans}
- \RequirePackage[defaultmono,scale=0.86]{droidmono}
- \def\lat@sf{fds}
- \def\cyr@sf{fds}
- }{\cmpj@sf@helvet}
+ \IfFileExists{t2afds.fd}{
+ \IfFileExists{omltxmi.fd}{\RequirePackage{txfonts}}{}
+ \IfFileExists{fmlfutm.fd}{\RequirePackage{fourier}}{}
+ \IfFileExists{omltxmi.fd}{\re@DeclareMathSymbol{\varkappa}{\mathord}{AMSb}{123}}{}
+ \RequirePackage[default,scale=0.86]{droidserif}
+ \RequirePackage[defaultsans,scale=0.86]{droidsans}
+ \RequirePackage[defaultmono,scale=0.86]{droidmono}
+ \def\lat@sf{fds}
+ \def\cyr@sf{fds}
+% \newcommand\hmmax{0} % default 3
+% \newcommand\bmmax{0} % default 4
+ }{
+ \IfFileExists{T2Adroidsans.fd}{
+ \IfFileExists{omltxmi.fd}{\RequirePackage{txfonts}}{}
+ \IfFileExists{fmlfutm.fd}{\RequirePackage{fourier}}{}
+ \IfFileExists{omltxmi.fd}{\re@DeclareMathSymbol{\varkappa}{\mathord}{AMSb}{123}}{}
+ \RequirePackage[default,scale=0.86]{droidserif}
+ \RequirePackage[defaultsans,scale=0.86]{droidsans}
+ \RequirePackage[defaultmono,scale=0.86]{droidsansmono}
+ \def\lat@sf{droidsans}
+ \def\cyr@sf{droidsans}
+% \newcommand\hmmax{0} % default 3
+% \newcommand\bmmax{0} % default 4
+ }{\cmpj@sf@helvet}
+ }
}
+
\DeclareOption{droid}{\let\cmpj@sf\cmpj@sf@droid}
\DeclareOption{helvet}{\let\cmpj@sf\cmpj@sf@helvet}
@@ -438,7 +454,7 @@
\def\doinumber#1{\def\doi@number{#1}}
%\def\bibdoi#1{\href{\doiURL#1}{\doitext#1}}
\def\bibdoi{\doi}
-\def\arxiv#1{\href{http://arxiv.org/abs/#1}{arXiv:#1}}
+\def\arxiv#1{\href{https://arxiv.org/abs/#1}{arXiv:#1}}
\def\archive[#1]#2{Preprint #1:#2}
\def\eprint{\@ifnextchar[\archive{Preprint \arxiv}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cmpj/cmpj3.sty new/tex/latex/cmpj/cmpj3.sty
--- old/tex/latex/cmpj/cmpj3.sty 2017-05-10 23:12:18.000000000 +0200
+++ new/tex/latex/cmpj/cmpj3.sty 2019-07-18 22:33:40.000000000 +0200
@@ -7,9 +7,9 @@
%%% http://www.icmp.lviv.ua/journal/ %%%
%%% using LaTeX2e %%%
%%% %%%
-%%% Last time modified: May 8, 2017 %%%
+%%% Last time modified: July 17, 2019 %%%
%%% %%%
-%%% Copyright (C) 2017 by the Institute for Condensed Matter Physics %%%
+%%% Copyright (C) 2019 by the Institute for Condensed Matter Physics %%%
%%% of the National Academy of Sciences of Ukraine %%%
%%% all rights reserved. %%%
%%% %%%
@@ -22,11 +22,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{cmpj3}
- [2017/05/08 v3.01
+ [2019/07/17 v3.02
The Condensed Matter Physics journal package]
\def\filename{cmpj3.sty}
-\def\fileversion{3.01}
-\def\filedate{2017/05/08}
+\def\fileversion{3.02}
+\def\filedate{2019/07/17}
\immediate\write32{This is '\filename' v\fileversion \space <\filedate> ^^J%
the Condensed Matter Physics journal package}
@@ -84,9 +84,9 @@
\edef\_{_}%
\edef\textless{\@percentchar3C}% instead of {\string<} for Apple
\edef\textgreater{\@percentchar3E}% instead of {\sting>} for Apple
- \edef\x{\toks1={\noexpand\href{\doiURL#1}}}%
+ \edef\x{\toks2={\noexpand\href{\doiURL#1}}}%
\x
- \edef\x{\endgroup\doitext\the\toks1 \the\toks0}%
+ \edef\x{\endgroup\doitext\the\toks2 \the\toks0}%
\x
}
%%%%%%% end doi.sty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -328,8 +328,8 @@
\def\cmpj@sf@droid{
\IfFileExists{t2afds.fd}{
- \RequirePackage{textcomp}
- \RequirePackage{amsmath,amssymb}
+ \RequirePackage{textcomp}
+ \RequirePackage{amsmath,amssymb}
\IfFileExists{omltxmi.fd}{\RequirePackage{txfonts}}{}
\IfFileExists{fmlfutm.fd}{\RequirePackage{fourier}}{}
\IfFileExists{omltxmi.fd}{\re@DeclareMathSymbol{\varkappa}{\mathord}{AMSb}{123}}{}
@@ -338,22 +338,39 @@
\RequirePackage[defaultmono,scale=0.86]{droidmono}
\def\lat@sf{fds}
\def\cyr@sf{fds}
- \def\cyr@rm{fdr}
- }{\cmpj@sf@helvet}
+ \def\cyr@rm{fdr}
+% \newcommand\hmmax{0} % default 3
+% \newcommand\bmmax{0} % default 4
+ }{
+ \IfFileExists{T2Adroidsans.fd}{
+ \RequirePackage{textcomp}
+ \RequirePackage{amsmath,amssymb}
+ \IfFileExists{omltxmi.fd}{\RequirePackage{txfonts}}{}
+ \IfFileExists{fmlfutm.fd}{\RequirePackage{fourier}}{}
+ \IfFileExists{omltxmi.fd}{\re@DeclareMathSymbol{\varkappa}{\mathord}{AMSb}{123}}{}
+ \RequirePackage[default,scale=0.86]{droidserif}
+ \RequirePackage[defaultsans,scale=0.86]{droidsans}
+ \RequirePackage[defaultmono,scale=0.86]{droidsansmono}
+ \def\lat@sf{droidsans}
+ \def\cyr@sf{droidsans}
+ \def\cyr@rm{droidserif}
+% \newcommand\hmmax{0} % default 3
+% \newcommand\bmmax{0} % default 4
+ }{\cmpj@sf@helvet}
+ }
}
\def\cmpj@sf@newtx{
\IfFileExists{omlntxmi.fd}{
- \IfFileExists{t2afdr.fd}{\RequirePackage[default,scale=0.86]{droidserif}}{}
+ \IfFileExists{t2afdr.fd}{\RequirePackage[default,scale=0.86]{droidserif}\def\cyr@rm{fdr}}{}
+ \IfFileExists{T2Adroidserif.fd}{\RequirePackage[default,scale=0.86]{droidserif}\def\cyr@rm{droidserif}}{}
\RequirePackage[largesc,scaled=1.03]{newtxtext}
- \IfFileExists{t2afds.fd}{\RequirePackage[defaultsans,scale=0.86]{droidsans}}{}
- \IfFileExists{t2afdm.fd}{\RequirePackage[defaultmono,scale=0.86]{droidmono}}{}
+ \IfFileExists{t2afds.fd}{\RequirePackage[defaultsans,scale=0.86]{droidsans}\def\lat@sf{fds}\def\cyr@sf{fds}}{}
+ \IfFileExists{T2Adroidsans.fd}{\RequirePackage[defaultsans,scale=0.86]{droidsans}\def\lat@sf{droidsans}\def\cyr@sf{droidsans}}{}
+ \IfFileExists{t2afdm.fd}{\RequirePackage[defaultmono,scale=0.86]{droidmono}\def\cyr@tt{fdm}}{}
+ \IfFileExists{T2Adroidsansmono.fd}{\RequirePackage[defaultmono,scale=0.86]{droidsansmono}\def\cyr@tt{droidsansmono}}{}
\RequirePackage[upint,varg,scaled=1.03]{newtxmath}
% \IfFileExists{omlntxmi.fd}{\RequirePackage[utopia,smallerops,vvarbb,timesmathacc]{newtxmath}}{}
- \def\lat@sf{fds}
- \def\cyr@sf{fds}
- \def\cyr@rm{fdr}
- \def\cyr@tt{fdm}
}{\cmpj@sf@droid}
}
@@ -378,7 +395,7 @@
\def\cc@by@copyright{%
% \def\@@copyright{\raisebox{-8pt}{\includegraphics[width=16mm]{cmpj-cc-by}\space}}
\def\@@copyright{}
- \authorcopyright{\raisebox{-2pt}{\includegraphics[width=16mm]{cmpj-cc-by-small}\space}\footnotesize\sf@phv This work is licensed under a \href{http://creativecommons.org/licenses/by/4.0/}{\textsl{Creative Commons Attribution 4.0 International License}}. Further distribution of this work must maintain attribution to the author(s) and the published articles title, journal citation, and DOI.}
+ \authorcopyright{\raisebox{-2pt}{\includegraphics[width=16mm]{cmpj-cc-by-small}\space}\footnotesize\sf@phv This work is licensed under a \href{https://creativecommons.org/licenses/by/4.0/}{\textsl{Creative Commons Attribution 4.0 International License}}. Further distribution of this work must maintain attribution to the author(s) and the published article's title, journal citation, and DOI.}
}
\DeclareOption{nocopyright}{\let\print@copyright\no@copyright}
@@ -484,7 +501,7 @@
\def\doinumber#1{\def\doi@number{#1}}
%\def\bibdoi#1{\href{\doiURL#1}{\doitext#1}}
\def\bibdoi{\doi}
-\def\arxiv#1{\href{http://arxiv.org/abs/#1}{arXiv:#1}}
+\def\arxiv#1{\href{https://arxiv.org/abs/#1}{arXiv:#1}}
\def\archive[#1]#2{Preprint #1:#2}
\def\eprint{\@ifnextchar[\archive{Preprint \arxiv}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmpj.tlpobj new/tlpkg/tlpobj/cmpj.tlpobj
--- old/tlpkg/tlpobj/cmpj.tlpobj 2019-02-28 03:27:15.000000000 +0100
+++ new/tlpkg/tlpobj/cmpj.tlpobj 2019-07-20 01:53:10.000000000 +0200
@@ -1,13 +1,13 @@
name cmpj
category Package
-revision 44283
+revision 51661
shortdesc Style for the journal Condensed Matter Physics
relocated 1
longdesc The package contains macros and some documentation for
longdesc typesetting papers for submission to the Condensed Matter
longdesc Physics journal published by the Institute for Condensed Matter
longdesc Physics of the National Academy of Sciences of Ukraine.
-runfiles size=75
+runfiles size=76
RELOC/bibtex/bst/cmpj/cmpj.bst
RELOC/tex/latex/cmpj/cmp-logo.eps
RELOC/tex/latex/cmpj/cmp-logo.pdf
@@ -18,7 +18,7 @@
RELOC/tex/latex/cmpj/cmpj3.sty
catalogue-contact-home http://www.icmp.lviv.ua/journal/Instructions.html
catalogue-ctan /macros/latex/contrib/cmpj
-catalogue-date 2017-05-10 15:16:26 +0200
+catalogue-date 2019-07-18 13:31:22 +0200
catalogue-license lppl
catalogue-topics physics journalpub
-catalogue-version 3.01
+catalogue-version 3.02
++++++ cmsrb.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cmsrb/README.md new/doc/fonts/cmsrb/README.md
--- old/doc/fonts/cmsrb/README.md 2019-03-22 21:48:29.000000000 +0100
+++ new/doc/fonts/cmsrb/README.md 2020-04-13 00:27:38.000000000 +0200
@@ -1,16 +1,17 @@
The cmsrb font package
-version 3.0 (March 22, 2019)
+version 4.0 (March 30, 2020)
UroÅ¡ StefanoviÄ
This material is subject to the GNU General Public License.
The cmsrb family provides Adobe Type 1 Computer Modern font for Serbian and Macedonian language.
-Supported encodings are: T1, T2A, TS1, X2 and OT2.
+Supported encodings are: T1, T2A, TS1, X2 and OT2; plus the experimental encodings ECMSRB1 and ECMSRB2.
The cmsrb package includes the correct shapes for italic letters \cyrb, \cyrg, \cyrd, \cyrp and \cyrt.
-Also, in OT2 encoding support for letters \cyrgje, \cyrkje, \cyrsje and \cyrzje are added.
This package is very simple to use: just put
\usepackage{cmsrb}
+or
+ \usepackage[math]{cmsrb}
in preamble of the document.
See 'cmsrb.pdf' of 'cmsrb-SR.pfd' for more informations.
Binary files old/doc/fonts/cmsrb/cmsrb-SR.pdf and new/doc/fonts/cmsrb/cmsrb-SR.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cmsrb/cmsrb-SR.tex new/doc/fonts/cmsrb/cmsrb-SR.tex
--- old/doc/fonts/cmsrb/cmsrb-SR.tex 2019-03-22 21:48:29.000000000 +0100
+++ new/doc/fonts/cmsrb/cmsrb-SR.tex 2020-04-13 00:27:38.000000000 +0200
@@ -1,15 +1,15 @@
\documentclass{article}
-\usepackage[OT2, T1, T2A]{fontenc}
+\usepackage[OT2, T1, TS1, X2, ECMSRB1, ECMSRB2, T2A]{fontenc}
\usepackage[utf8]{inputenc}
\usepackage[serbianc]{babel}
+\usepackage[a4paper,top=2.0cm,left=3cm,right=2.5cm,bottom=2cm,includefoot,includehead]{geometry}
-\usepackage[nomath]{cmsrb}
-\DeclareSymbolFont{cmsrbex}{OMX}{cmsrbex}{m}{n}
-\DeclareMathSymbol{\srbintop}{\mathop}{cmsrbex}{"52}
-\DeclareMathSymbol{\srbointop}{\mathop}{cmsrbex}{"49}
-\newcommand{\srbint}{\relax\srbintop\displaylimits}
-\newcommand{\srboint}{\relax\srbointop\displaylimits}
+\usepackage{cmsrb}
+\usepackage{cmupint}
+\let\enint\intop
+
+\usepackage{amssymb}
\input glyphtounicode.tex
\pdfgentounicode=1
@@ -21,13 +21,29 @@
\newcommand{\example}[1]{{\fontencoding{T2A}\selectfont #1} & \textcmsuper{#1}}
\newcommand\otinput[1]{{\fontencoding{T1}\selectfont \verb"#1"} & {\fontencoding{OT2}\selectfont #1}}
+\newcommand\ecminput[1]{{\fontencoding{T1}\selectfont \verb"#1"} & {\fontencoding{ECMSRB1}\selectfont #1} & {\fontencoding{ECMSRB2}\selectfont #1}}
\DeclareTextSymbolDefault{\dj}{T1}
+\newcounter{primer}
+\newcounter{rezultat}
+\newenvironment{primer}{\VerbatimEnvironment\refstepcounter{primer}\par\medskip
+ \noindent\textbf{ÐÑОЌеÑ~\theprimer: }
+\begin{Verbatim}
+}{\end{Verbatim}\medskip}
+\newenvironment{rezultat}{\refstepcounter{rezultat}\par\medskip
+\noindent\textbf{РезÑлÑаÑ~\therezultat: }\\ }{\medskip}
+
+\makeatletter
+\newcommand{\manuallabel}[2]{\def\@currentlabel{#2}\label{#1}}
+\makeatother
+
+\usepackage{fonttable}
+
\begin{document}
\title{ÐÐ°ÐºÐµÑ \texttt{cmsrb}}
\author{УÑÐŸÑ Ð¡ÑеÑаМПвОÑ\footnote{\texttt{urostajms(a)gmail.com}}}
- \date{\today{} в3.0}
+ \date{\today{} веÑзОÑа 4.0}
\maketitle
\section{ÐаÑÑП \textsf{cmsrb}?}
@@ -36,7 +52,7 @@
\section{ÐаÑакÑеÑОÑÑОке пакеÑа}
- ЀПМÑПвО \textsf{cmsrb} ÑÑ Ð¿ÑПÑОÑеÑе \textit{Computer Modern} ÑПМÑПва за ÑÑпÑкО О ЌакеЎПМÑкО ÑезОк за \TeX{} (\LaTeX). ÐПЎÑжаМа кПЎОÑаÑа ÑÑ \textit{T1}, \textit{TS1}, \textit{T2A}, \textit{X2} О \textit{OT2}. ÐПЎÑжаМО ÑÑОлПвО ÑПМÑа ÑÑ ÑеÑОÑМО, ÑаМÑ-ÑеÑОÑМО О МепÑПпПÑÑОПМалМО, за велОÑÐžÐœÑ 10\textit{pt}.
+ ЀПМÑПвО \textsf{cmsrb} ÑÑ Ð¿ÑПÑОÑеÑе \textit{Computer Modern} ÑПМÑПва за ÑÑпÑкО О ЌакеЎПМÑкО ÑезОк за \TeX{} (\LaTeX). ÐПЎÑжаМа кПЎОÑаÑа ÑÑ \texttt{T1}, \texttt{TS1}, \texttt{T2A}, \texttt{X2} О \texttt{OT2}, каП О екÑпеÑОЌеМÑалМа кПЎОÑаÑа \texttt{ECMSRB1} О \texttt{ECMSRB2}. ÐПЎÑжаМО ÑÑОлПвО ÑПМÑа ÑÑ ÑеÑОÑМО, ÑаМÑ-ÑеÑОÑМО О МепÑПпПÑÑОПМалМО, за велОÑÐžÐœÑ 10\textit{pt}.
ÐÐ²Ð°Ñ Ð¿Ð°ÐºÐµÑ Ñе ÑеЎМПÑÑаваМ за кПÑОÑÑеÑе: ÑаЌП Ñе пПÑÑебМП Ўа ÑÑавОЌП
\begin{verbatim}
@@ -58,11 +74,11 @@
\section{ÐаÑакÑеÑОÑÑОке \textit{OT2} кПЎОÑаÑа}
- ÐПЎОÑаÑе \textit{OT2} Ñе ОзЌеÑеМП какП бО пПЎÑжалП пÑавОлМП пÑебаÑОваÑе Оз лаÑОМОÑе Ñ ÑОÑОлОÑÑ Ñ ÑÑпÑкПЌ ÑезОкÑ. ÐÑеЌа ÑПЌе, \textsf{ts}, \textsf{kh}, \textsf{ch} О ÑлОÑМе лОгаÑÑÑе ÑÑ ÑклПÑеМе Оз кПЎОÑаÑа (вОЎО ÑабелÑ~\ref{t1}).
+ ÐПЎОÑаÑе \texttt{OT2} Ñе ОзЌеÑеМП какП бО пПЎÑжалП пÑавОлМП пÑебаÑОваÑе Оз лаÑОМОÑе Ñ ÑОÑОлОÑÑ Ñ ÑÑпÑкПЌ ÑезОкÑ. ÐÑеЌа ÑПЌе, \textsf{ts}, \textsf{kh}, \textsf{ch} О ÑлОÑМе лОгаÑÑÑе ÑÑ ÑклПÑеМе Оз кПЎОÑаÑа (вОЎО ÑабелÑ~\ref{t1}).
- У \textit{OT2} кПЎОÑаÑÑ ÑÑ ÐŽÐŸÐŽÐ°Ñа ЌакеЎПМÑка ÑлПва РО Ð, каП О ÑÑМПгПÑÑка ÑлПва \CYRSJE{} О \CYRZJE.
+ У \texttt{OT2} кПЎОÑаÑÑ ÑÑ ÐŽÐŸÐŽÐ°Ñа ЌакеЎПМÑка ÑлПва РО Ð, ÑÑМПгПÑÑка ÑлПва \CYRSJE{} О \CYRZJE, каП О ПЎÑеÑеМО пÑавПпОÑМО зМаÑО.
- Ðпак, МОÑе пÑепПÑÑÑÑОвП кПÑОÑÑеÑе \textit{OT2} кПЎОÑаÑа; бПÑО ÐžÐ·Ð±ÐŸÑ Ð·Ð° ÑÑпÑкО ÑезОк Ñе \textit{T2A} кПЎОÑаÑе О \textit{utf8} ÑМПÑ. ÐПЎОÑаÑе \textit{OT2} Ñе ÐŽÐŸÐ±Ð°Ñ ÐžÐ·Ð±ÐŸÑ Ð°ÐºÐŸ Ð²ÐµÑ ÐžÐŒÐ°ÐŒÐŸ ЎПкÑÐŒÐµÐœÑ ÐœÐ°Ð¿ÐžÑаМ лаÑОМОÑПЌ â ÑаЎа Ñе бОÑО ÑеЎМПÑÑавМП пÑебаÑОÑО га Ñ ÑОÑОлОÑÑ.
+ Ðпак, МОÑе пÑепПÑÑÑÑОвП кПÑОÑÑеÑе \texttt{OT2} кПЎОÑаÑа; бПÑО ÐžÐ·Ð±ÐŸÑ Ð·Ð° ÑÑпÑкО ÑезОк Ñе \texttt{T2A} кПЎОÑаÑе О \textit{utf8} ÑМПÑ. ÐПЎОÑаÑе \texttt{OT2} Ñе ÐŽÐŸÐ±Ð°Ñ ÐžÐ·Ð±ÐŸÑ Ð°ÐºÐŸ Ð²ÐµÑ ÐžÐŒÐ°ÐŒÐŸ ЎПкÑÐŒÐµÐœÑ ÐœÐ°Ð¿ÐžÑаМ лаÑОМОÑПЌ â ÑаЎа Ñе бОÑО ÑеЎМПÑÑавМП пÑебаÑОÑО га Ñ ÑОÑОлОÑÑ.
\begin{table}
\newcolumntype{C}{>{\centering\arraybackslash}X}%
@@ -106,139 +122,256 @@
\otinput{\'G} & \otinput{\'K} & \otinput{\'g} & \otinput{\'k} \\ \hline
\otinput{\'S} & \otinput{\'Z} & \otinput{\'s} & \otinput{\'z} \\ \hline
\end{tabularx}
- \caption{ÐПЎОÑаÑе \textit{OT2} за Ð¿Ð°ÐºÐµÑ \textsf{cmsrb}.}\label{t1}
+ \caption{ÐПЎОÑаÑе \texttt{OT2} за Ð¿Ð°ÐºÐµÑ \textsf{cmsrb}.}\label{t1}
\end{table}
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\usepackage[OT2,T1]{fontenc}
+\usepackage[serbian]{babel}
+\newcommand{\test}%
+{Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos.}
+\begin{document}
+\test \\
+\fontencoding{OT2}\selectfont \test \\
+Akcenti: \'a\`a\C a\f a\=a\^a\"a\u a
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+\indent {\fontencoding{T1}\selectfont Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos.} \\
+{\fontencoding{OT2}\selectfont Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos. \\ Akcenti: \'a\`a\C a\f a\=a\^a\"a\u a}
+\end{rezultat}
+
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\usepackage[OT2,T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[serbian]{babel}
+\newcommand{\test}%
+{Ljubazni fenjerdÅŸija ÄaÄavog lica hoÄe da mi pokaÅŸe Å¡tos.}
+\begin{document}
+\textit{\test} \\
+\fontencoding{OT2}\selectfont \textit{\test}
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+\indent{\fontencoding{T1}\selectfont \textit{Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos.}} \\
+{\fontencoding{OT2}\selectfont \textit{Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos.}}
+\end{rezultat}
+
\section{ÐаÑакÑеÑОÑÑОке \textit{T1} кПЎОÑаÑа}
- ÐПЎОÑаÑе \textit{T1} ÑаЎа пПЎÑжава кПМвеÑзОÑÑ ÐžÐ· ÑОÑОлОÑе Ñ Ð»Ð°ÑОМОÑÑ (вОЎО пÑОЌеÑ~7).
+ ÐПЎОÑаÑе \texttt{T1} ÑаЎа пПЎÑжава кПМвеÑзОÑÑ ÐžÐ· ÑОÑОлОÑе Ñ Ð»Ð°ÑОМОÑÑ (вОЎО пÑОЌеÑ~\ref{prim:t1}).
+
+ Ðа пПзОÑОÑО 208 Ñе МалазО ÑлПвП {\fontencoding{T1}\selectfont Ä (\texttt{U+0110})} ÑЌеÑÑП ÑлПва {\fontencoding{TS1}\selectfont \DH{} \fontencoding{T1}\selectfont (\texttt{U+00D0})}, ÑОЌе Ñе ПЌПгÑÑава кПпОÑаÑе ОлО пÑеÑÑага ÑекÑÑа МапОÑаМПг Ма лаÑОМОÑО.
+
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\usepackage[T2A,T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[serbian]{babel}
+\begin{document}
+ÐÑбазМО ÑеÑеÑÑОÑа ÑаÑавПг лОÑа Ñ
ПÑе Ўа ЌО пПкаже ÑÑПÑ.
+\end{document}
+\end{primer}
+\manuallabel{prim:t1}{\theprimer}
+
+\begin{rezultat}
+\indent Ljubazni fenjerdÅŸija ÄaÄavog lica hoÄe da mi pokaÅŸe Å¡tos.
+\end{rezultat}
+
+
+ \section{ÐаÑакÑеÑОÑÑОке \textit{T2A} кПЎОÑаÑа}
+
+ ÐОÑОлОÑка ÑлПва \texttt{Ð} О \texttt{Ñ} МОÑÑ Ð¿ÐŸÐŽÑжаМа Ñ \texttt{T2A} кПЎОÑаÑÑ; збПг ÑПга ÑÑ ÐŸÐœÐ° пПÑÑавÑеМа ÑЌеÑÑП лаÑОМОÑкОÑ
ÑлПва \texttt{J} О \texttt{j}.
+ ТП ЎаÑе бПÑО ÑезÑлÑÐ°Ñ Ñ ÑОÑОлОÑкПЌ ÑекÑÑÑ, алО ÑП ÑакПÑе зМаÑО Ўа Ñе Ñа лаÑОМОÑка ÑлПва Ме Малазе Ñ ÐŸÐ²ÐŸÐŒ кПЎОÑаÑÑ, па Ñе пПÑÑебМП вПЎОÑО ÑаÑÑМа пÑОлОкПЌ кПпОÑаÑа О пÑеÑÑаге лаÑОМОÑкПг ÑекÑÑа МапОÑаМПг \texttt{T2A} кПЎОÑаÑеЌ.
+
+ СлПва {\fontencoding{X2}\selectfont \char"81, \char"89, \char"86, \char"91, \char"A1, \char"A9, \char"A6, \char"B1} ÑÑ ÑклПÑеМа Оз кПЎОÑаÑа \texttt{T2A}, а ÑЌеÑÑП ÑОÑ
ÑÑ ÑÑавÑеМа ÑлПва \char"81, \char"89, \char"86, \char"91, \char"A1, \char"A9, \char"A6, \char"B1.
+
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\usepackage[T2A]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[serbianc]{babel}
+\DeclareTextSymbolDefault{\dj}{T1}
+\begin{document}
+\textit{Ljubazni fenjerdÅŸija ÄaÄavog lica hoÄe da mi pokaÅŸe Å¡tos.\\
+ÐÑбазМО ÑеÑеÑÑОÑа ÑаÑавПг лОÑа Ñ
ПÑе Ўа ЌО пПкаже ÑÑПÑ.} \\
+ÐкÑеМÑО: \'{О}\`{О}\C{О}\f{О}\={О}\^{О}\"{О}\u{О}
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+\indent {\textit{Ljubazni fenjerdÅŸija ÄaÄavog lica hoÄe da mi pokaÅŸe Å¡tos.\\ ÐÑбазМО ÑеÑеÑÑОÑа ÑаÑавПг лОÑа Ñ
ПÑе Ўа ЌО пПкаже ÑÑПÑ.} \\ ÐкÑеМÑО: \'{О}\`{О}\C{О}\f{О}\={О}\^{О}\"{О}\u{О}}
+\end{rezultat}
+
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\usepackage[T2A]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[serbianc]{babel}
+\begin{document}
+\textit{абвгЎÑÑежз\'{з}ÑОÑклÑЌМÑПпÑÑ\'{Ñ}ÑÑÑÑÑÑ
ÑÑÑÑ}
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+\indent {\textit{абвгЎÑÑежз\'{з}ÑОÑклÑЌМÑПпÑÑ\'{Ñ}ÑÑÑÑÑÑ
ÑÑÑÑ}}
+\end{rezultat}
+
+ \section{ÐаÑакÑеÑОÑÑОке \textit{TS1} кПЎОÑаÑа}
+
+ У \texttt{TS1} кПЎОÑаÑÑ Ñе МалазО ÑлПвП {\fontencoding{TS1}\selectfont \DH} (\texttt{U+00D0}) кПÑе Ñе ÑклПÑеМП Оз \texttt{T1} кПЎОÑаÑа.
+ ТакПÑе, Ñ \texttt{TS1} кПЎОÑаÑÑ Ñе Малазе ÑлПва б, г, ÐŽ, п, Ñ Ñа ÑÑÑкОЌ ПблОкПЌ кÑÑзОва.
+
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\usepackage[TS1,T2A]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[serbianc]{babel}
+\begin{document}
+\textit{бгЎпÑ} \fontencoding{TS1}\selectfont \textit{Ð±Ð³ÐŽÐ¿Ñ \DH}
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+ \indent \textit{бгЎпÑ} {\fontencoding{TS1}\selectfont \textit{Ð±Ð³ÐŽÐ¿Ñ \DH}}
+\end{rezultat}
\section{ÐаÑеЌаÑОка}
ÐÐ°ÐºÐµÑ \textsf{cmsrb} ÑÑОÑава пПЎÑазÑЌеваМе \textit{Computer Modern} ЌаÑеЌаÑОÑке ÑПМÑПве, алО ÑÑОÑа ÑаЌП велОÑОМе веÑе ОлО ÑеЎМаке 10\textit{pt}, за бПÑО вОзÑелМО еÑекаÑ.
- ТакПÑе, Ð¿Ð°ÐºÐµÑ ÑаЎа ЌеÑа пПЎÑазÑЌеваМО зМак за ОМÑегÑал $\int$ Ñ $\srbint$ (ÑÑпÑавМО ОМÑегÑал Ñе ÑÑаЎОÑОПМалМП кПÑОÑÑеМ Ñ ÑÑпÑкПЌ ÑезОкÑ, Ñа \verb|\limits| ПпÑОÑПЌ).
- ÐМаÑе, пÑПЌеМе Ñ ÐŒÐ°ÑеЌаÑОÑкОЌ ÑПМÑПвОЌа ÐŒÐŸÐ³Ñ ÐŽÐ° Ñе ÑпÑеÑе кПÑОÑÑеÑеЌ \textsf{nomath} ПпÑОÑе:
+ ÐкП Ñе кПÑОÑÑО \textsf{math} ПпÑОÑа ÑаЎа Ñе бОÑО ÑÑОÑаМ Ð¿Ð°ÐºÐµÑ \textsf{cmupint} кПÑО ЌеÑа пПЎÑазÑЌеваМО зМак за ОМÑегÑал $\enint$ Ñ $\int$ (ÑÑпÑавМО ОМÑегÑал Ñе ÑÑаЎОÑОПМалМП кПÑОÑÑеМ Ñ ÑÑпÑкПЌ ÑезОкÑ, Ñа \verb|\limits| ПпÑОÑПЌ).
+ ТакПÑе, Ñ ÑÑпÑкПЌ ÑÐµÐ·ÐžÐºÑ Ð±ÐŸÑе Ñе кПÑОÑÑеÑе зМакПва $\leqslant$ О $\geqslant$ ÑЌеÑÑП зМакПва $\leq$ О $\geq$. ÐкП Ñе кПÑОÑÑО \textsf{math} ПпÑОÑа ÑÑОÑаÑе Ñе Ð¿Ð°ÐºÐµÑ \textsf{amssymb} О ÑО зМаÑО Ñе аÑÑПЌаÑÑкО бОÑО пÑПЌеÑеМО (ОÑÑП важО за $\nleqslant$ О $\ngeqslant$).
+
+ ÐпÑОÑа Ñе кПÑОÑÑО Ма ÑлеЎеÑО МаÑОМ:
\begin{verbatim}
- \usepackage[nomath]{cmsrb}
+ \usepackage[math]{cmsrb}
\end{verbatim}
+
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\newcommand{\ud}{\,\mathrm{d}}
+\begin{document}
+$$ \int_0^1 e^x\ud x \geq 0 $$
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+$$ \enint\nolimits_0^1 e^x\,\mathrm{d} x \geq 0 $$
+\end{rezultat}
- \section{ÐÑОЌеÑО}
+\begin{primer}
+\documentclass{article}
+\usepackage[math]{cmsrb}
+\newcommand{\ud}{\,\mathrm{d}}
+\begin{document}
+$$ \int_0^1 e^x\ud x \geq 0 $$
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+$$ \int_0^1 e^x\,\mathrm{d} x \geqslant 0 $$
+\end{rezultat}
+
+
+ \section{ÐкÑпеÑОЌеМÑалМа кПЎОÑаÑа}
+
+ ÐПЎОÑаÑа \texttt{ECMSRB1} О \texttt{ECMSRB2} ÑÑ ÐœÐ°Ð¿ÑавÑеМа ÑаЌП за ÐŸÐ²Ð°Ñ Ð¿Ð°ÐºÐµÑ. СлОÑМа ÑÑ Ñа \texttt{OT2} кПЎОÑаÑеЌ, алО ÑаЎÑже ÑпеÑОÑОÑМе лОгаÑÑÑе О акÑеМÑе (вОЎО ÑабелÑ~\ref{t3}). Ðа кПЌплеÑÐœÑ ÑÐ°Ð±ÐµÐ»Ñ ÐºÐ°ÑакÑеÑа кПÑО ÑÑ Ð¿ÐŸÐŽÑжаМО ПвОЌ кПЎОÑаÑеЌ пПглеЎаÑО Ñабеле Ма ÑÑÑаМаЌа~\pageref{ecs1} О \pageref{ecs2}. ÐÑМПвМа МаЌеМа ПвОÑ
кПЎОÑаÑа Ñе пОÑаÑе ÑекÑÑа Ма ÑÑпÑкПЌ ÑÐµÐ·ÐžÐºÑ ÑаЌП \texttt{ASCII} каÑакÑеÑОЌа, каП О ÑеЎМПÑÑавМП пÑебаÑОваÑе Оз лаÑОМОÑе Ñ ÑОÑОлОÑÑ.
+
+ \begin{table}[h!]
+ \newcolumntype{C}{>{\centering\arraybackslash}X}%
+ \begin{tabularx}{\textwidth}{|C C C|C C C|C C C|}
+ \hline
+ Улаз & \texttt{ECMSRB1} & \texttt{ECMSRB2} & Улаз & \texttt{ECMSRB1} & \texttt{ECMSRB2} &Улаз & \texttt{ECMSRB1} & \texttt{ECMSRB2} \\ \hline
+ \hline
+ \ecminput{CX} & \ecminput{CY} & \ecminput{DX} \\ \hline
+ \ecminput{DY} & \ecminput{EY} & \ecminput{GY} \\ \hline
+ \ecminput{KY} & \ecminput{LJ} & \ecminput{LY} \\ \hline
+ \ecminput{NJ} & \ecminput{NY} & \ecminput{SX} \\ \hline
+ \ecminput{SXY} & \ecminput{ZX} & \ecminput{ZY} \\ \hline
+ \ecminput{ZXY} & \ecminput{\EZH} & \ecminput{} \\ \hline
+ \hline
+ \ecminput{Cx} & \ecminput{Cy} & \ecminput{Dx} \\ \hline
+ \ecminput{Dy} & \ecminput{Ey} & \ecminput{Gy} \\ \hline
+ \ecminput{Ky} & \ecminput{Lj} & \ecminput{Ly} \\ \hline
+ \ecminput{Nj} & \ecminput{Ny} & \ecminput{Sx} \\ \hline
+ \ecminput{Sxy} & \ecminput{Zx} & \ecminput{Zy} \\ \hline
+ \ecminput{Zxy} & \ecminput{} & \ecminput{} \\ \hline
+ \hline
+ \ecminput{cx} & \ecminput{cy} & \ecminput{dx} \\ \hline
+ \ecminput{dy} & \ecminput{ey} & \ecminput{gy} \\ \hline
+ \ecminput{ky} & \ecminput{lj} & \ecminput{ly} \\ \hline
+ \ecminput{nj} & \ecminput{ny} & \ecminput{sx} \\ \hline
+ \ecminput{sxy} & \ecminput{zx} & \ecminput{zy} \\ \hline
+ \ecminput{zxy} & \ecminput{\ezh} & \ecminput{} \\ \hline
+ \hline
+ \ecminput{\`a} & \ecminput{\'a} & \ecminput{\^a} \\ \hline
+ \ecminput{\T a} & \ecminput{\D a} & \ecminput{\H a} \\ \hline
+ \ecminput{\r a} & \ecminput{\R a} & \ecminput{\v a} \\ \hline
+ \ecminput{\u a} & \ecminput{\U a} & \ecminput{\=a} \\ \hline
+ \ecminput{\b a} & \ecminput{\.a} & \ecminput{\d a} \\ \hline
+ \ecminput{\c a} & \ecminput{\k a} & \ecminput{\"a} \\ \hline
+ \ecminput{\C a} & \ecminput{\~a} & \ecminput{\f a} \\ \hline
+ \end{tabularx}
+ \caption{ÐПЎОÑаÑа \texttt{ECMSRB1} О \texttt{ECMSRB2} за Ð¿Ð°ÐºÐµÑ \textsf{cmsrb}.}\label{t3}
+ \end{table}
+
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\usepackage[ECMSRB1]{fontenc}
+\usepackage[serbian]{babel}
+\begin{document}
+Ljubazni fenjerdxija cxadyavog lica hocye da mi pokazxe sxtos.
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+ \indent {\fontencoding{ECMSRB1}\selectfont Ljubazni fenjerdxija cxadyavog lica hocye da mi pokazxe sxtos.}
+\end{rezultat}
+
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\usepackage[ECMSRB2]{fontenc}
+\usepackage[serbian]{babel}
+\begin{document}
+Ljubazni fenjerdxija cxadyavog lica hocye da mi pokazxe sxtos.
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+\indent {\fontencoding{ECMSRB2}\selectfont Ljubazni fenjerdxija cxadyavog lica hocye da mi pokazxe sxtos.}
+\end{rezultat}
- \noindent\textbf{ÐÑÐžÐŒÐµÑ 1: }
- \begin{Verbatim}
- \documentclass{article}
- \usepackage{cmsrb}
- \usepackage[OT2,T1]{fontenc}
- \usepackage[serbian]{babel}
- \newcommand{\test}%
- {Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos.}
- \begin{document}
- \test \\
- \fontencoding{OT2}\selectfont \test \\
- Akcenti: \'a\`a\C a\f a\=a\^a\"a\u a
- \end{document}
- \end{Verbatim}
-
- \noindent\textbf{РезÑлÑÐ°Ñ 1:} \\
- \indent Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos. \\
- {\fontencoding{OT2}\selectfont Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos. \\ Akcenti: \'a\`a\C a\f a\=a\^a\"a\u a}\\[1cm]
-
- \noindent\textbf{ÐÑÐžÐŒÐµÑ 2: }
- \begin{Verbatim}
- \documentclass{article}
- \usepackage{cmsrb}
- \usepackage[OT2,T1]{fontenc}
- \usepackage[utf8]{inputenc}
- \usepackage[serbian]{babel}
- \newcommand{\test}%
- {Ljubazni fenjerdÅŸija ÄaÄavog lica hoÄe da mi pokaÅŸe Å¡tos.}
- \begin{document}
- \textit{\test} \\
- \fontencoding{OT2}\selectfont \textit{\test}
- \end{document}
- \end{Verbatim}
-
- \noindent\textbf{РезÑлÑÐ°Ñ 2:} \\
- \indent \textit{Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos.} \\
- {\fontencoding{OT2}\selectfont \textit{Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos.}}\\[1cm]
-
- \fontencoding{T2A}\selectfont
-
- \noindent\textbf{ÐÑÐžÐŒÐµÑ 3: }
- \begin{Verbatim}
- \documentclass{article}
- \usepackage{cmsrb}
- \usepackage[T2A]{fontenc}
- \usepackage[utf8]{inputenc}
- \usepackage[serbianc]{babel}
- \DeclareTextSymbolDefault{\dj}{T1}
- \begin{document}
- \textit{Ljubazni fenjerdÅŸija ÄaÄavog lica hoÄe da mi pokaÅŸe Å¡tos.\\
- ÐÑбазМО ÑеÑеÑÑОÑа ÑаÑавПг лОÑа Ñ
ПÑе Ўа ЌО пПкаже ÑÑПÑ.} \\
- ÐкÑеМÑО: \'{О}\`{О}\C{О}\f{О}\={О}\^{О}\"{О}\u{О}
- \end{document}
- \end{Verbatim}
-
- \noindent\textbf{РезÑлÑÐ°Ñ 3:} \\
- \indent {\textit{Ljubazni fenjerdÅŸija ÄaÄavog lica hoÄe da mi pokaÅŸe Å¡tos.\\ ÐÑбазМО ÑеÑеÑÑОÑа ÑаÑавПг лОÑа Ñ
ПÑе Ўа ЌО пПкаже ÑÑПÑ.} \\ ÐкÑеМÑО: \'{О}\`{О}\C{О}\f{О}\={О}\^{О}\"{О}\u{О}}\\[1cm]
-
- \noindent\textbf{ÐÑÐžÐŒÐµÑ 4: }
- \begin{Verbatim}
- \documentclass{article}
- \usepackage{cmsrb}
- \usepackage[T2A]{fontenc}
- \usepackage[utf8]{inputenc}
- \usepackage[serbianc]{babel}
- \begin{document}
- \textit{абвгЎÑÑежз\'{з}ÑОÑклÑЌМÑПпÑÑ\'{Ñ}ÑÑÑÑÑÑ
ÑÑÑÑ}
- \end{document}
- \end{Verbatim}
-
- \noindent\textbf{РезÑлÑÐ°Ñ 4:} \\
- \indent {\textit{абвгЎÑÑежз\'{з}ÑОÑклÑЌМÑПпÑÑ\'{Ñ}ÑÑÑÑÑÑ
ÑÑÑÑ}}\\[1cm]
-
- \noindent\textbf{ÐÑÐžÐŒÐµÑ 5: }
- \begin{Verbatim}
- \documentclass{article}
- \usepackage{cmsrb}
- \newcommand{\ud}{\,\mathrm{d}}
- \begin{document}
- $$ \int_0^1 e^x\ud x $$
- \end{document}
- \end{Verbatim}
-
- \noindent\textbf{РезÑлÑÐ°Ñ 5:} \\
- $$ \srbint_0^1 e^x\,\mathrm{d} x $$ \\[1cm]
-
- \noindent\textbf{ÐÑÐžÐŒÐµÑ 6: }
- \begin{Verbatim}
- \documentclass{article}
- \usepackage[nomath]{cmsrb}
- \newcommand{\ud}{\,\mathrm{d}}
- \begin{document}
- $$ \int_0^1 e^x\ud x $$
- \end{document}
- \end{Verbatim}
-
- \noindent\textbf{РезÑлÑÐ°Ñ 6:} \\
- $$ \int_0^1 e^x\,\mathrm{d} x $$\\[1cm]
-
- \noindent\textbf{ÐÑÐžÐŒÐµÑ 7: }
- \begin{Verbatim}
- \documentclass{article}
- \usepackage{cmsrb}
- \usepackage[T1]{fontenc}
- \usepackage[utf8]{inputenc}
- \usepackage[serbian]{babel}
- \begin{document}
- ÐÑбазМО ÑеÑеÑÑОÑа ÑаÑавПг лОÑа Ñ
ПÑе Ўа ЌО пПкаже ÑÑПÑ.
- \end{document}
- \end{Verbatim}
+ \section{ÐÑÑПÑОÑа веÑзОÑа}
- \noindent\textbf{РезÑлÑÐ°Ñ 7:} \\
- \indent Ljubazni fenjerdÅŸija ÄaÄavog lica hoÄe da mi pokaÅŸe Å¡tos.
+ \subsection*{4.0}
- \section{ÐÑÑПÑОÑа веÑзОÑа}
+ \begin{itemize}
+ \item Све ПпÑОÑе ÑклПÑеМе, ПпÑОÑа \textsf{math} ЎПЎаÑа.
+ \item ÐзЌеÑеМа кПЎОÑаÑа \texttt{T1}, \texttt{T2A}, \texttt{TS1}, \texttt{OT2}.
+ \item СлПвП \textsf{б} зМаÑаÑМП пПбПÑÑаМП Ñ ÑвОЌ ÑÑОлПвОЌа.
+ \item ÐПЎаÑа екÑпеÑОЌеМÑалМа кПЎОÑаÑа \texttt{ECMSRB1} О \texttt{ECMSRB2}.
+ \end{itemize}
+
+ \subsection*{3.1}
+
+ \begin{itemize}
+ \item ÐÑпÑавÑеМО багПвО.
+ \item ÐпÑОÑе \textsf{noint} О \textsf{nosymb} ÑÑ ÐŽÐŸÐŽÐ°Ñе.
+ \item ÐзЌеÑеМО зМаÑО $\leq$, $\geq$, $\nleq$, $\ngeq$.
+ \end{itemize}
\subsection*{3.0}
@@ -260,5 +393,19 @@
\begin{itemize}
\item ÐекПлОкП \verb|.map| ÑаÑлПва ÑпПÑеМП Ñ ÑеЎаМ.
\end{itemize}
+
+ \pagebreak
+
+ \appendix
+
+ \section{ÐПЎОÑаÑе \textit{ECMSRB1}}\label{ecs1}
+
+ \fonttable{ecmsrb1cmsrbrr}
+
+ \pagebreak
+
+ \section{ÐПЎОÑаÑе \textit{ECMSRB2}}\label{ecs2}
+
+ \fonttable{ecmsrb2cmsrbrr}
\end{document}
Binary files old/doc/fonts/cmsrb/cmsrb.pdf and new/doc/fonts/cmsrb/cmsrb.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cmsrb/cmsrb.tex new/doc/fonts/cmsrb/cmsrb.tex
--- old/doc/fonts/cmsrb/cmsrb.tex 2019-03-22 21:48:29.000000000 +0100
+++ new/doc/fonts/cmsrb/cmsrb.tex 2020-04-13 00:27:38.000000000 +0200
@@ -1,14 +1,14 @@
\documentclass{article}
-\usepackage[OT2, T2A, T1]{fontenc}
+\usepackage[OT2, TS1, X2, ECMSRB1, ECMSRB2, T2A, T1]{fontenc}
\usepackage[utf8]{inputenc}
+\usepackage[a4paper,top=2.0cm,left=3cm,right=2.5cm,bottom=2cm,includefoot,includehead]{geometry}
-\usepackage[nomath]{cmsrb}
-\DeclareSymbolFont{cmsrbex}{OMX}{cmsrbex}{m}{n}
-\DeclareMathSymbol{\srbintop}{\mathop}{cmsrbex}{"52}
-\DeclareMathSymbol{\srbointop}{\mathop}{cmsrbex}{"49}
-\newcommand{\srbint}{\relax\srbintop\displaylimits}
-\newcommand{\srboint}{\relax\srbointop\displaylimits}
+\usepackage{cmsrb}
+\usepackage{cmupint}
+\let\enint\intop
+
+\usepackage{amssymb}
\input glyphtounicode.tex
\pdfgentounicode=1
@@ -20,13 +20,29 @@
\newcommand{\example}[1]{{\fontencoding{T2A}\selectfont #1} & \textcmsuper{#1}}
\newcommand\otinput[1]{{\fontencoding{T1}\selectfont \verb"#1"} & {\fontencoding{OT2}\selectfont #1}}
+\newcommand\ecminput[1]{{\fontencoding{T1}\selectfont \verb"#1"} & {\fontencoding{ECMSRB1}\selectfont #1} & {\fontencoding{ECMSRB2}\selectfont #1}}
\DeclareTextSymbolDefault{\dj}{T1}
+\newcounter{primer}
+\newcounter{rezultat}
+\newenvironment{primer}{\VerbatimEnvironment\refstepcounter{primer}\par\medskip
+ \noindent\textbf{Example~\theprimer: }
+ \begin{Verbatim}
+ }{\end{Verbatim}\medskip}
+\newenvironment{rezultat}{\refstepcounter{rezultat}\par\medskip
+ \noindent\textbf{Result~\therezultat: }\\ }{\medskip}
+
+\makeatletter
+\newcommand{\manuallabel}[2]{\def\@currentlabel{#2}\label{#1}}
+\makeatother
+
+\usepackage{fonttable}
+
\begin{document}
\title{The \texttt{cmsrb} package}
\author{UroÅ¡ StefanoviÄ\footnote{\texttt{urostajms(a)gmail.com}}}
- \date{\today{} v3.0}
+ \date{\today{} v4.0}
\maketitle
\section{Why \textsf{cmsrb}?}
@@ -35,7 +51,7 @@
\section{Package Features}
- The \textsf{cmsrb} fonts are the extensions of the Computer Modern fonts for Serbian and Macedonian languages for \TeX{} (\LaTeX). Support files are provided for T1, TS1, T2A, X2 and OT2 encodings. Supported font styles are serif, sans-serif and mono, for size 10pt.
+ The \textsf{cmsrb} fonts are the extensions of the Computer Modern fonts for Serbian and Macedonian languages for \TeX{} (\LaTeX). Support files are provided for \texttt{T1}, \texttt{TS1}, \texttt{T2A}, \texttt{X2} and \texttt{OT2} encodings, but also for the experimental \texttt{ECMSRB1} and \texttt{ECMSRB2} encodings. Supported font styles are serif, sans-serif and mono, for size 10pt.
This package is very simple to use: just put
\begin{verbatim}
@@ -57,11 +73,11 @@
\section{OT2 Features}
- The OT2 encoding is modified to match the rules of Latin to Cyrillic transcription in Serbian language. Therefore, the \textsf{ts}, \textsf{kh}, \textsf{ch} and similar ligatures are removed from the encoding (see Table~\ref{t1}).
+ The \texttt{OT2} encoding is modified to match the rules of Latin to Cyrillic transcription in Serbian language. Therefore, the \textsf{ts}, \textsf{kh}, \textsf{ch} and similar ligatures are removed from the encoding (see Table~\ref{t1}).
- In OT2 encoding Macedonian letters Ð and Ð are added, with Montenegrin letters \CYRSJE{} and \CYRZJE.
+ In \texttt{OT2} encoding Macedonian letters {\fontencoding{T2A}\selectfont Ð} and {\fontencoding{T2A}\selectfont Ð} are added, with Montenegrin letters {\fontencoding{T2A}\selectfont\CYRSJE} and {\fontencoding{T2A}\selectfont\CYRZJE}, and also some orthographic symbols are included.
- However, it is not recommended to use the OT2 encoding; better choice for Serbian language is T2A encoding and utf8 input. One can use OT2 encoding if they already have a document written in Latin---in which case it would be easy to transcribe it to Cyrillic.
+ However, it is not recommended to use the \texttt{OT2} encoding; better choice for Serbian language is \texttt{T2A} encoding and utf8 input. One can use \texttt{OT2} encoding if they already have a document written in Latin---in which case it would be easy to transcribe it to Cyrillic.
\begin{table}
\newcolumntype{C}{>{\centering\arraybackslash}X}%
@@ -105,139 +121,261 @@
\otinput{\'G} & \otinput{\'K} & \otinput{\'g} & \otinput{\'k} \\ \hline
\otinput{\'S} & \otinput{\'Z} & \otinput{\'s} & \otinput{\'z} \\ \hline
\end{tabularx}
- \caption{OT2 encoding in \textsf{cmsrb} package.}\label{t1}
+ \caption{\texttt{OT2} encoding in \textsf{cmsrb} package.}\label{t1}
\end{table}
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\usepackage[OT2,T1]{fontenc}
+\usepackage[serbian]{babel}
+\newcommand{\test}%
+{Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos.}
+\begin{document}
+\test \\
+\fontencoding{OT2}\selectfont \test \\
+Akcenti: \'a\`a\C a\f a\=a\^a\"a\u a
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+\indent {\fontencoding{T1}\selectfont Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos.} \\
+{\fontencoding{OT2}\selectfont Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos. \\ Akcenti: \'a\`a\C a\f a\=a\^a\"a\u a}
+\end{rezultat}
+
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\usepackage[OT2,T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[serbian]{babel}
+\newcommand{\test}%
+{Ljubazni fenjerdÅŸija ÄaÄavog lica hoÄe da mi pokaÅŸe Å¡tos.}
+\begin{document}
+\textit{\test} \\
+\fontencoding{OT2}\selectfont \textit{\test}
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+\indent{\fontencoding{T1}\selectfont \textit{Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos.}} \\
+{\fontencoding{OT2}\selectfont \textit{Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos.}}
+\end{rezultat}
+
\section{T1 Features}
+
+ The \texttt{T1} encoding now support conversion from Cyrillic to Latin script (see Example~\ref{prim:t1}).
+
+ On the position 208 now is the letter Ä (\texttt{U+0110}) instead of the letter {\fontencoding{TS1}\selectfont \DH} (\texttt{U+00D0}), which enable copying and searching in the Serbian or Croatian Latin text.
+
+\fontencoding{T2A}\selectfont
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\usepackage[T2A,T1]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[serbian]{babel}
+\begin{document}
+ÐÑбазМО ÑеÑеÑÑОÑа ÑаÑавПг лОÑа Ñ
ПÑе Ўа ЌО пПкаже ÑÑПÑ.
+\end{document}
+\end{primer}
+\manuallabel{prim:t1}{\theprimer}
+\fontencoding{T1}\selectfont
+
+\begin{rezultat}
+\indent Ljubazni fenjerdÅŸija ÄaÄavog lica hoÄe da mi pokaÅŸe Å¡tos.
+\end{rezultat}
+
+ \section{T2A Features}
+
+ The Cyrillic letters {\fontencoding{T2A}\selectfont\texttt{Ð}} and {\fontencoding{T2A}\selectfont\texttt{Ñ}} are not supported in the \texttt{T2A} encoding, so they are placed instead of the Latin letters \texttt{J} and \texttt{j}.
+ This give us the better results in the Cyrillic text, but that also means this Latin letter are not present in the \texttt{T2A} encoding, so be carefull during searching and copying Latin text in this encoding.
- The T1 encoding now support conversion from Cyrillic to Latin script (see Example~7).
+ The letters {\fontencoding{X2}\selectfont \char"81, \char"89, \char"86, \char"91, \char"A1, \char"A9, \char"A6, \char"B1} are removed from the \texttt{T2A} encoding, and on their places now are the letters {\fontencoding{T2A}\selectfont \char"81, \char"89, \char"86, \char"91, \char"A1, \char"A9, \char"A6, \char"B1}.
+
+\fontencoding{T2A}\selectfont
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\usepackage[T2A]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[serbianc]{babel}
+\DeclareTextSymbolDefault{\dj}{T1}
+\begin{document}
+\textit{Ljubazni fenjerdÅŸija ÄaÄavog lica hoÄe da mi pokaÅŸe Å¡tos.\\
+ÐÑбазМО ÑеÑеÑÑОÑа ÑаÑавПг лОÑа Ñ
ПÑе Ўа ЌО пПкаже ÑÑПÑ.} \\
+ÐкÑеМÑО: \'{О}\`{О}\C{О}\f{О}\={О}\^{О}\"{О}\u{О}
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+\indent {\textit{Ljubazni fenjerdÅŸija ÄaÄavog lica hoÄe da mi pokaÅŸe Å¡tos.\\ ÐÑбазМО ÑеÑеÑÑОÑа ÑаÑавПг лОÑа Ñ
ПÑе Ўа ЌО пПкаже ÑÑПÑ.} \\ ÐкÑеМÑО: \'{О}\`{О}\C{О}\f{О}\={О}\^{О}\"{О}\u{О}}
+\end{rezultat}
+
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\usepackage[T2A]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[serbianc]{babel}
+\begin{document}
+\textit{абвгЎÑÑежз\'{з}ÑОÑклÑЌМÑПпÑÑ\'{Ñ}ÑÑÑÑÑÑ
ÑÑÑÑ}
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+\indent {\textit{абвгЎÑÑежз\'{з}ÑОÑклÑЌМÑПпÑÑ\'{Ñ}ÑÑÑÑÑÑ
ÑÑÑÑ}}
+\end{rezultat}
+\fontencoding{T1}\selectfont
+
+\section{TS1 Features}
+
+In the \texttt{TS1} encoding we can find the letter {\fontencoding{TS1}\selectfont \DH} (\texttt{U+00D0}), which is removed from the \texttt{T1} encoding.
+Also, in the \texttt{TS1} encoding now are the letters {\fontencoding{T2A}\selectfont б, г, ÐŽ, п, Ñ} with Russian italic shape.
+
+\fontencoding{T2A}\selectfont
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\usepackage[TS1,T2A]{fontenc}
+\usepackage[utf8]{inputenc}
+\usepackage[serbianc]{babel}
+\begin{document}
+\textit{бгЎпÑ} \fontencoding{TS1}\selectfont \textit{Ð±Ð³ÐŽÐ¿Ñ \DH}
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+\indent \textit{бгЎпÑ} {\fontencoding{TS1}\selectfont \textit{Ð±Ð³ÐŽÐ¿Ñ \DH}}
+\end{rezultat}
+\fontencoding{T1}\selectfont
\section{Math}
The \textsf{cmsrb} package load default Computer Modern math fonts, but load only fonts with size lower or equal 10pt, for better visual effect.
- Also, it change integral sign from $\int$ to $\srbint$ (upright integral is traditionally used in Serbian language, with \verb|\limits| option).
- However, one can use \textsf{nomath} option to prevent any change in math fonts:
+ If the option \textsf{math} is used, then the package \textsf{cmupint} will be loaded, and the integral sign will be changed from $\enint$ to $\int$ (upright integral is traditionally used in Serbian language, with \verb|\limits| option).
+ Also, in Serbian language is better to use the symbols $\leqslant$ and $\geqslant$ than the symbols $\leq$ О $\geq$. If the \textsf{math} option is used the package \textsf{amssymb} will be loaded and this symbols will be changed (also $\nleqslant$ and $\ngeqslant$ will be used).
+
+ We use this option like this:
\begin{verbatim}
- \usepackage[nomath]{cmsrb}
+ \usepackage[math]{cmsrb}
\end{verbatim}
+
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\newcommand{\ud}{\,\mathrm{d}}
+\begin{document}
+$$ \int_0^1 e^x\ud x \geq 0 $$
+\end{document}
+\end{primer}
- \section{Examples}
-
- \noindent\textbf{Example 1: }
- \begin{Verbatim}
- \documentclass{article}
- \usepackage{cmsrb}
- \usepackage[OT2,T1]{fontenc}
- \usepackage[serbian]{babel}
- \newcommand{\test}%
- {Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos.}
- \begin{document}
- \test \\
- \fontencoding{OT2}\selectfont \test \\
- Akcenti: \'a\`a\C a\f a\=a\^a\"a\u a
- \end{document}
- \end{Verbatim}
-
- \noindent\textbf{Result 1:} \\
- \indent Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos. \\
- {\fontencoding{OT2}\selectfont Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos. \\ Akcenti: \'a\`a\C a\f a\=a\^a\"a\u a}\\[1cm]
-
- \noindent\textbf{Example 2: }
- \begin{Verbatim}
- \documentclass{article}
- \usepackage{cmsrb}
- \usepackage[OT2,T1]{fontenc}
- \usepackage[utf8]{inputenc}
- \usepackage[serbian]{babel}
- \newcommand{\test}%
- {Ljubazni fenjerdÅŸija ÄaÄavog lica hoÄe da mi pokaÅŸe Å¡tos.}
- \begin{document}
- \textit{\test} \\
- \fontencoding{OT2}\selectfont \textit{\test}
- \end{document}
- \end{Verbatim}
-
- \noindent\textbf{Result 2:} \\
- \indent \textit{Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos.} \\
- {\fontencoding{OT2}\selectfont \textit{Ljubazni fenjerd\v zija \v ca\dj avog lica ho\'ce da mi poka\v ze \v stos.}}\\[1cm]
-
- \fontencoding{T2A}\selectfont
-
- \noindent\textbf{Example 3: }
- \begin{Verbatim}
- \documentclass{article}
- \usepackage{cmsrb}
- \usepackage[T2A]{fontenc}
- \usepackage[utf8]{inputenc}
- \usepackage[serbianc]{babel}
- \DeclareTextSymbolDefault{\dj}{T1}
- \begin{document}
- \textit{Ljubazni fenjerdÅŸija ÄaÄavog lica hoÄe da mi pokaÅŸe Å¡tos.\\
- ÐÑбазМО ÑеÑеÑÑОÑа ÑаÑавПг лОÑа Ñ
ПÑе Ўа ЌО пПкаже ÑÑПÑ.} \\
- ÐкÑеМÑО: \'{О}\`{О}\C{О}\f{О}\={О}\^{О}\"{О}\u{О}
- \end{document}
- \end{Verbatim}
-
- \noindent\textbf{Result 3:} \\
- \indent {\textit{Ljubazni fenjerdÅŸija ÄaÄavog lica hoÄe da mi pokaÅŸe Å¡tos.\\ ÐÑбазМО ÑеÑеÑÑОÑа ÑаÑавПг лОÑа Ñ
ПÑе Ўа ЌО пПкаже ÑÑПÑ.} \\ ÐкÑеМÑО: \'{О}\`{О}\C{О}\f{О}\={О}\^{О}\"{О}\u{О}}\\[1cm]
-
- \noindent\textbf{Example 4: }
- \begin{Verbatim}
- \documentclass{article}
- \usepackage{cmsrb}
- \usepackage[T2A]{fontenc}
- \usepackage[utf8]{inputenc}
- \usepackage[serbianc]{babel}
- \begin{document}
- \textit{абвгЎÑÑежз\'{з}ÑОÑклÑЌМÑПпÑÑ\'{Ñ}ÑÑÑÑÑÑ
ÑÑÑÑ}
- \end{document}
- \end{Verbatim}
-
- \noindent\textbf{Result 4:} \\
- \indent {\textit{абвгЎÑÑежз\'{з}ÑОÑклÑЌМÑПпÑÑ\'{Ñ}ÑÑÑÑÑÑ
ÑÑÑÑ}}\\[1cm]
-
- \noindent\textbf{Example 5: }
- \begin{Verbatim}
- \documentclass{article}
- \usepackage{cmsrb}
- \newcommand{\ud}{\,\mathrm{d}}
- \begin{document}
- $$ \int_0^1 e^x\ud x $$
- \end{document}
- \end{Verbatim}
-
- \noindent\textbf{Result 5:} \\
- $$ \srbint_0^1 e^x\,\mathrm{d} x $$ \\[1cm]
-
- \noindent\textbf{Example 6: }
- \begin{Verbatim}
- \documentclass{article}
- \usepackage[nomath]{cmsrb}
- \newcommand{\ud}{\,\mathrm{d}}
- \begin{document}
- $$ \int_0^1 e^x\ud x $$
- \end{document}
- \end{Verbatim}
-
- \noindent\textbf{Result 6:} \\
- $$ \int_0^1 e^x\,\mathrm{d} x $$\\[1cm]
-
- \noindent\textbf{Example 7: }
- \begin{Verbatim}
- \documentclass{article}
- \usepackage{cmsrb}
- \usepackage[T1]{fontenc}
- \usepackage[utf8]{inputenc}
- \usepackage[serbian]{babel}
- \begin{document}
- ÐÑбазМО ÑеÑеÑÑОÑа ÑаÑавПг лОÑа Ñ
ПÑе Ўа ЌО пПкаже ÑÑПÑ.
- \end{document}
- \end{Verbatim}
+\begin{rezultat}
+$$ \enint\nolimits_0^1 e^x\,\mathrm{d} x \geq 0 $$
+\end{rezultat}
+
+\begin{primer}
+\documentclass{article}
+\usepackage[math]{cmsrb}
+\newcommand{\ud}{\,\mathrm{d}}
+\begin{document}
+$$ \int_0^1 e^x\ud x \geq 0 $$
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+$$ \int_0^1 e^x\,\mathrm{d} x \geqslant 0 $$
+\end{rezultat}
+
+ \section{Experimental encodings}
+
+ The encodings \texttt{ECMSRB1} and \texttt{ECMSRB2} are created for this package only. They are similar to \texttt{OT2} encoding, but they contain specific ligatures and accents (see Table~\ref{t3}). For the complete list of characters used in this encodings see Tables on Pages~\pageref{ecs1} and \pageref{ecs2}. The purposes of this encodins are writting Serbian text using only \texttt{ASCII} characters, and making simple conversions from Latin to Cyrillic.
+
+ \begin{table}[h!]
+ \newcolumntype{C}{>{\centering\arraybackslash}X}%
+ \begin{tabularx}{\textwidth}{|C C C|C C C|C C C|}
+ \hline
+ Input & \texttt{ECMSRB1} & \texttt{ECMSRB2} & Input & \texttt{ECMSRB1} & \texttt{ECMSRB2} &Улаз & \texttt{ECMSRB1} & \texttt{ECMSRB2} \\ \hline
+ \hline
+ \ecminput{CX} & \ecminput{CY} & \ecminput{DX} \\ \hline
+ \ecminput{DY} & \ecminput{EY} & \ecminput{GY} \\ \hline
+ \ecminput{KY} & \ecminput{LJ} & \ecminput{LY} \\ \hline
+ \ecminput{NJ} & \ecminput{NY} & \ecminput{SX} \\ \hline
+ \ecminput{SXY} & \ecminput{ZX} & \ecminput{ZY} \\ \hline
+ \ecminput{ZXY} & \ecminput{\EZH} & \ecminput{} \\ \hline
+ \hline
+ \ecminput{Cx} & \ecminput{Cy} & \ecminput{Dx} \\ \hline
+ \ecminput{Dy} & \ecminput{Ey} & \ecminput{Gy} \\ \hline
+ \ecminput{Ky} & \ecminput{Lj} & \ecminput{Ly} \\ \hline
+ \ecminput{Nj} & \ecminput{Ny} & \ecminput{Sx} \\ \hline
+ \ecminput{Sxy} & \ecminput{Zx} & \ecminput{Zy} \\ \hline
+ \ecminput{Zxy} & \ecminput{} & \ecminput{} \\ \hline
+ \hline
+ \ecminput{cx} & \ecminput{cy} & \ecminput{dx} \\ \hline
+ \ecminput{dy} & \ecminput{ey} & \ecminput{gy} \\ \hline
+ \ecminput{ky} & \ecminput{lj} & \ecminput{ly} \\ \hline
+ \ecminput{nj} & \ecminput{ny} & \ecminput{sx} \\ \hline
+ \ecminput{sxy} & \ecminput{zx} & \ecminput{zy} \\ \hline
+ \ecminput{zxy} & \ecminput{\ezh} & \ecminput{} \\ \hline
+ \hline
+ \ecminput{\`a} & \ecminput{\'a} & \ecminput{\^a} \\ \hline
+ \ecminput{\T a} & \ecminput{\D a} & \ecminput{\H a} \\ \hline
+ \ecminput{\r a} & \ecminput{\R a} & \ecminput{\v a} \\ \hline
+ \ecminput{\u a} & \ecminput{\U a} & \ecminput{\=a} \\ \hline
+ \ecminput{\b a} & \ecminput{\.a} & \ecminput{\d a} \\ \hline
+ \ecminput{\c a} & \ecminput{\k a} & \ecminput{\"a} \\ \hline
+ \ecminput{\C a} & \ecminput{\~a} & \ecminput{\f a} \\ \hline
+ \end{tabularx}
+ \caption{Encodings \texttt{ECMSRB1} and \texttt{ECMSRB2} for the package \textsf{cmsrb}.}\label{t3}
+ \end{table}
+
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\usepackage[ECMSRB1]{fontenc}
+\usepackage[serbian]{babel}
+\begin{document}
+Ljubazni fenjerdxija cxadyavog lica hocye da mi pokazxe sxtos.
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+\indent {\fontencoding{ECMSRB1}\selectfont Ljubazni fenjerdxija cxadyavog lica hocye da mi pokazxe sxtos.}
+\end{rezultat}
+
+\begin{primer}
+\documentclass{article}
+\usepackage{cmsrb}
+\usepackage[ECMSRB2]{fontenc}
+\usepackage[serbian]{babel}
+\begin{document}
+Ljubazni fenjerdxija cxadyavog lica hocye da mi pokazxe sxtos.
+\end{document}
+\end{primer}
+
+\begin{rezultat}
+\indent {\fontencoding{ECMSRB2}\selectfont Ljubazni fenjerdxija cxadyavog lica hocye da mi pokazxe sxtos.}
+\end{rezultat}
+
+
+ \section{Version history}
+
+ \subsection*{4.0}
+
+ \begin{itemize}
+ \item All options are removed, the option \textsf{math} is added.
+ \item Fixed encodings \texttt{T1}, \texttt{T2A}, \texttt{TS1}, \texttt{OT2}.
+ \item Letter {\fontencoding{T2A}\selectfont\textsf{б}} is significantly improved in all styles.
+ \item Experimental encodings \texttt{ECMSRB1} and \texttt{ECMSRB2} are added.
+ \end{itemize}
- \noindent\textbf{Result 7:} \\
- \indent Ljubazni fenjerdÅŸija ÄaÄavog lica hoÄe da mi pokaÅŸe Å¡tos.
+ \subsection*{3.1}
- \section{Version history}
+ \begin{itemize}
+ \item Bugs fixed.
+ \item Options \textsf{noint} and \textsf{nosymb} are active.
+ \item Symbols $\leq$, $\geq$, $\nleq$, $\ngeq$ are changed.
+ \end{itemize}
\subsection*{3.0}
@@ -259,5 +397,19 @@
\begin{itemize}
\item The separate \verb|.map| files merged into one.
\end{itemize}
+
+ \pagebreak
+
+ \appendix
+
+ \section{Encoding ECMSRB1}\label{ecs1}
+
+ \fonttable{ecmsrb1cmsrbrr}
+
+ \pagebreak
+
+ \section{Encoding ECMSRB2}\label{ecs2}
+
+ \fonttable{ecmsrb2cmsrbrr}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cmsrb.doc.tlpobj new/tlpkg/tlpobj/cmsrb.doc.tlpobj
--- old/tlpkg/tlpobj/cmsrb.doc.tlpobj 2019-03-24 02:24:07.000000000 +0100
+++ new/tlpkg/tlpobj/cmsrb.doc.tlpobj 2020-04-13 01:54:40.000000000 +0200
@@ -1,9 +1,9 @@
name cmsrb.doc
category Package
-revision 50531
+revision 54706
shortdesc doc files of cmsrb
relocated 1
-docfiles size=217
+docfiles size=256
RELOC/doc/fonts/cmsrb/README.md
RELOC/doc/fonts/cmsrb/cmsrb-SR.pdf
RELOC/doc/fonts/cmsrb/cmsrb-SR.tex
++++++ cmsrb.tar.xz ++++++
++++ 64537 lines of diff (skipped)
++++++ cnltx.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cnltx/README new/doc/latex/cnltx/README
--- old/doc/latex/cnltx/README 2015-08-18 00:16:52.000000000 +0200
+++ new/doc/latex/cnltx/README 2019-11-01 21:58:55.000000000 +0100
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the CNLTX bundle v0.13 2015/08/17
+the CNLTX bundle v0.15 2019/11/01
LaTeX tools and documenting facilities
@@ -8,7 +8,7 @@
Web: https://github.com/cgnieder/cnltx/
E-Mail: contact(a)mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2013-2015 Clemens Niederberger
+Copyright 2013--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/cnltx/cnltx_en.pdf and new/doc/latex/cnltx/cnltx_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cnltx/cnltx_en.tex new/doc/latex/cnltx/cnltx_en.tex
--- old/doc/latex/cnltx/cnltx_en.tex 2015-08-18 00:16:52.000000000 +0200
+++ new/doc/latex/cnltx/cnltx_en.tex 2019-11-01 21:58:55.000000000 +0100
@@ -13,7 +13,7 @@
% Web: https://github.com/cgnieder/cnltx/
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2013-2015 Clemens Niederberger
+% Copyright 2013--2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -131,6 +131,7 @@
}
}
+\usepackage{csquotes}
\defbibheading{bibliography}[\bibname]{\section{#1}}
\makeatletter
@@ -352,8 +353,7 @@
and actually loads most if not all of the bundle.
\item The module \cnltxbase\ is also intended as a programming tools package
that will be used in other packages eventually. For example it is used by
- the \pkg{cntformats} package from the \bnd{exsheets}
- bundle~\cite{bnd:exsheets}.
+ the \pkg{cntformats} package.
\item In case parts of this bundle prove useful to be used in a document the
recommended way is to add
\begin{sourcecode}[gobble=6]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cnltx.doc.tlpobj new/tlpkg/tlpobj/cnltx.doc.tlpobj
--- old/tlpkg/tlpobj/cnltx.doc.tlpobj 2019-02-28 03:27:21.000000000 +0100
+++ new/tlpkg/tlpobj/cnltx.doc.tlpobj 2019-11-02 16:11:42.000000000 +0100
@@ -1,9 +1,9 @@
name cnltx.doc
category Package
-revision 38138
+revision 52601
shortdesc doc files of cnltx
relocated 1
-docfiles size=223
+docfiles size=221
RELOC/doc/latex/cnltx/README
RELOC/doc/latex/cnltx/cnltx_en.pdf
RELOC/doc/latex/cnltx/cnltx_en.tex
++++++ cnltx.tar.xz ++++++
++++ 1957 lines of diff (skipped)
++++++ cochineal.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cochineal/README new/doc/fonts/cochineal/README
--- old/doc/fonts/cochineal/README 2018-12-17 22:29:24.000000000 +0100
+++ new/doc/fonts/cochineal/README 2020-01-08 22:39:45.000000000 +0100
@@ -13,13 +13,53 @@
part of all distributions of LaTeX version 2003/12/01 or later. Those files and
LaTeX support file cochineal.sty are
- Copyright (c) 2016--2018 Michael Sharpe
+ Copyright (c) 2016--2019 Michael Sharpe
Files provided "as is", with no warranties.
The support files are provided in encodings OT1, T1, TS1 and LY1 for users of Western scripts, LGR for Greek scripts and T2A and OT2 for Cyrillic scripts.
-Current version: 1.049
+Current version: 1.060
+
+Changes in version 1.059
+1. Corrected two errors in the map file.
+2. Added the most recent versions of the math italic and math upright virtual fonts, some of which were omitted from version 1.059.
+
+Changes in version 1.059
+Eight files were inadvertently not included in recent updates. This omission is now corrected.
+
+Changes in version 1.058
+The TS1 encoded fonts were revised so that about a dozen new glyphs were added, most importantly asteriskcentered, which is required if you use a third level of \itemize. See the documentation for the new fonttable. (Thanks Frank Mittelbach.)
+
+Changes in version 1.057
+Added missing map entries.
+
+Changes in version 1.056
+1. The math support files have been reworked to provide the ability to generate output satisfying the requirements of PDF/A-1b.
+2. At the same time, the math metrics were reworked. It appears that in regular weight, the accent positions had become detached from reality and required a complete overhaul.
+
+Changes in version 1.055
+Removed four duplicate entries in Cochineal.map.
+
+Changes in version 1.054
+Changes to the sty and fd files and to the relevant tfm files so that the theoremfont option now works correctly.
+
+Changes in version 1.053
+Small changes to spacing of accents in some Greek glyphs.
+
+Changes in version 1.052
+Changed all occurrences of \let\Cochineal@@swashQ\@empty in the fd files to \global\let\Cochineal@@swashQ\@empty to prevent problems that could occr if the fd file is loaded within a group. (Thanks Frank Mittelbach.)
+
+Changes in version 1.051
+1. Modified the handling of U+1E9E and related glyphs in the otf lookups to work better outside TeX.
+2. Small changes to theorem fonts and to documentation.
+
+Changes in version 1.050
+1. Corrected code in a number of fd files that could led to source being ignored. (Thanks to Frank Mittelbach who diagnosed the problem and suggested fixes.)
+2. Corrected the theorem font which was missing glyphs Tcedilla and tcedilla.
+3. Added U+1E9E, which may be used as capital germandbls, and a small caps version thereof. These are supplements to the existing symbol SS and its small caps version, and are available so far only via unicode processing.
+4. Added a number of superior symbols, including comma, period, plus, hyphen, slash, exclam and numbersign.
+5. Added an entry to smcp tables to make longs point to the small cap glyph s.sc.
Changes in version 1.049
Corrected an error that resulted in a loss of f-ligatures in some encodings. (Thanks to DB Miller who reported this.)
Binary files old/doc/fonts/cochineal/cochineal-doc.pdf and new/doc/fonts/cochineal/cochineal-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cochineal/cochineal-doc.tex new/doc/fonts/cochineal/cochineal-doc.tex
--- old/doc/fonts/cochineal/cochineal-doc.tex 2018-12-17 22:29:24.000000000 +0100
+++ new/doc/fonts/cochineal/cochineal-doc.tex 2019-06-23 22:56:12.000000000 +0200
@@ -1,11 +1,10 @@
% !TEX TS-program = pdflatexmk
-% Template file for TeXShop by Michael Sharpe, LPPL
-\documentclass[11pt]{amsart}
+\documentclass[11pt]{article}
\usepackage[margin=1in]{geometry}
\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
\usepackage{graphicx}
\pdfmapfile{=Cochineal.map}
-\pdfmapfile{=newtx.map}
+%\pdfmapfile{=newtx.map}
%\usepackage{amssymb}% don't use with newtxmath
%SetFonts
% cochineal+newtxmath
@@ -14,9 +13,8 @@
\usepackage{textcomp}
\usepackage[varqu,varl]{zi4}% inconsolata
\usepackage{amsmath,amsthm}
-\usepackage[cochineal,bigdelims,cmintegrals,vvarbb]{newtxmath}
+\usepackage[cochineal,vvarbb]{newtxmath}
% option vvarbb gives you stix blackboard bold
-\useosf % use oldstyle figures except in math
\usepackage[cal=boondoxo]{mathalfa}% less slanted than STIX cal
\usepackage{bm}
%SetFonts
@@ -76,11 +74,15 @@
\item {\tt sups}: use superior figures to make footnote markers, rather than the \LaTeX's default markers;
\item {\tt swashQ}: use Cochineal's swash \Qswash\ instead of its tamer default version, \Qnoswash;
\item {\tt scosf}: always use oldstyle figures within a small caps block;
-\item {\tt theoremfont}: for theorem statements in the {\tt plain} style, use a doctored version of italics that has upright figures, braces, brackets, parentheses, exclamation mark, colon and semicolon.
+\item {\tt theoremfont}: for theorem statements in the {\tt plain} style, use a doctored version of italics that has upright figures, braces, brackets, parentheses, exclamation mark, colon and semicolon. It is implemented as the {\tt slanted} shape, and there are two options you can add to the call to the {\tt cochineal} package to modify the way it outputs figures.
+
+The default (neither of the following options is set) is to use upright figures within theorem text, but in the same alignment (proportional or tabular) and the same style (lining or oldstyle) as in general text.
+
+Option {\tt thmtabular} causes figures in theorem text to render in tabular alignment, while option {\tt thmlining} causes figure styles to render in lining rather than oldstyle. The two may be used in conjunction, forcing figures in theorem text to render as tabular lining figures.
\end{itemize}
\section*{Mathematical accompaniment}
-The package contains fonts for use as math letters that are derived from Cochineal Roman and Greek glyphs and the newtxmath family. Note that $v$ and $\nu$ (Greek {\tt nu}) are quite distinct. Here's a sample.
+The package contains fonts for use as math letters that are derived from Cochineal Roman and Greek glyphs and the {\tt newtxmath} family. Note that $v$ and $\nu$ (Greek {\tt nu}) are quite distinct. Here's a sample.
\begin{verbatim}
% preamble should include, in this order:
@@ -127,4 +129,25 @@
\newpage
The OT$2$ encoding (supposedly obsolete, but still useful) is intended for limited use in producing Russian characters with a Western keyboard, making by means of \TeX\ a transliteration of ASCII for most characters in the range 33--122, and providing ligatures to generate the rest. See the documentation of {\tt nimbus15} for further details.
\fonttable{Cochineal-Roman-tlf-ot2}
+\newpage
+\section*{Additional glyphs for use in German orthography}
+Prior to version {\tt1.050}, {\tt cochineal} offered basic support for German orthography, having all required accented glyphs and the lower case \ss, as well as a small caps \textsc{\ss}. Under LaTeX, the T$1$ encoding contained \verb|S_S|, but only as a synthesized character in the {\tt tfm}. Unicode users could not make use of \verb|S_S| as it was not present in the~{\tt otf}. So, with unicode tex processing:
+\begin{verbatim}
+{\addfontfeature{StylisticSet=1}\ss\ \textsc{\ss}}
+\end{verbatim}
+typesets, as in LaTeX processing, to
+
+\ss\ \textsc{\ss}
+
+Note also that in unicode processing, in order to obtain the expected case change behavior, it may be necessary to add in your preamble:
+\begin{verbatim}
+\uccode`Ã="1E9E
+\end{verbatim}
+
+
+ As of version {\tt1.050} of {\tt cochineal}, there are now glyphs in each style for {\tt U+1E9E} and for its small caps version, as well as \verb|S_S| as a real character, accessible under unicode TeX. The glyphs may be used as the uppercase and small caps versions of {\tt germandbls}. Currently, the new glyphs are not available in any of the LaTeX encodings and must be used via unicode TeX.
+
+The following tables show how to access the new glyphs in unicode TeX. Note that you will need to set {\tt StylisticSet=1} if you wish not to use the new sharp-s glyphs.
+
+\includegraphics{newgermanglyphs-crop}
\end{document}
\ No newline at end of file
Binary files old/doc/fonts/cochineal/newgermanglyphs-crop.pdf and new/doc/fonts/cochineal/newgermanglyphs-crop.pdf differ
Binary files old/doc/fonts/cochineal/newgermanglyphs.pdf and new/doc/fonts/cochineal/newgermanglyphs.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cochineal/newgermanglyphs.tex new/doc/fonts/cochineal/newgermanglyphs.tex
--- old/doc/fonts/cochineal/newgermanglyphs.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/cochineal/newgermanglyphs.tex 2019-05-19 22:50:43.000000000 +0200
@@ -0,0 +1,108 @@
+% !TEX TS-program = XeLaTeX
+\documentclass[11pt]{article}
+\usepackage{geometry}
+\usepackage{fontspec}
+%\uccode`Ã=\SS
+%\renewcommand{\SS}{{\addfontfeature{RawFeature=+ss01}\symbol{"1E9E}}}
+\defaultfontfeatures{Mapping=tex-text}
+\setromanfont{cochineal}
+\pagestyle{empty}
+%\setromanfont{cochineal}[StylisticSet=1]
+%\setromanfont{cochineal}[StylisticSet=2]
+%\setsansfont[Scale=MatchLowercase,Mapping=tex-text]{LMSans}
+%\setmonofont[Scale=MatchLowercase]{courierN}
+%\newunicodechar{Ã}{\ss}
+%\usepackage{fonttable}
+%\usepackage[ngerman]{babel}
+%\usepackage{polyglossia}
+%\setmainlanguage{german}
+%\def\longs{\symbol{"017F}}
+\begin{document}
+\noindent New symbols:
+\begin{center}
+ \begin{tabular}{@{} lcl @{}}
+ \hline
+ Glyph name & glyph & macro\\
+ \hline
+ {\tt uni1E9E} & \symbol{"1E9E} &\verb|\symbol{"1E9E}|\\
+ {\tt uni1E9E.ss01} & {\addfontfeature{StylisticSet=1}\symbol{"1E9E}} & \verb|{\addfontfeature{StylisticSet=1}\symbol{"1E9E}}| \\
+ {\tt germandbls.sc} & \textsc{\ss} & \verb|{\textsc{\ss}}| \\
+ {\tt germandbls.sc.ss01} & {\addfontfeature{StylisticSet=1}\textsc{\ss}} & \verb|{\addfontfeature{StylisticSet=1}\textsc{\ss}}| \\
+ \hline
+ \end{tabular}
+\end{center}
+
+%{\bfseries
+%\begin{center}
+% \begin{tabular}{@{} lcl @{}}
+% \hline
+% Glyph name & glyph & macro\\
+% \hline
+% {\tt uni1E9E} & \symbol{"1E9E} &\verb|\symbol{"1E9E}|\\
+% {\tt uni1E9E.alt} & {\addfontfeature{StylisticSet=1}\symbol{"1E9E}} & \verb|{\addfontfeature{StylisticSet=1}\symbol{"1E9E}}| \\
+% {\tt germandbls.sc.ss01} & {\addfontfeature{StylisticSet=1}\textsc{\ss}} & \verb|{\addfontfeature{StylisticSet=1}\textsc{\ss}}| \\
+% \hline
+% \end{tabular}
+%\end{center}
+%}
+ \noindent Effect of choice of {\tt StylisticSet}:
+
+\begin{center}
+ \begin{tabular}{@{} ccccc @{}}
+ \hline
+ StylisticSet & \verb|\ss| & \verb|\SS| & \verb|\MakeUppercase{\ss}| & \verb|\textsc{\ss}| \\
+ \hline
+ None & \ss & \SS & \MakeUppercase{\ss} & \textsc{\ss}\\
+
+ =1 & {\addfontfeature{StylisticSet=1}\ss} & {\addfontfeature{StylisticSet=1}\SS} & {\addfontfeature{StylisticSet=1}\MakeUppercase{\ss}} & {\addfontfeature{StylisticSet=1}\textsc{\ss}}\\
+ \hline
+ \end{tabular}
+\end{center}
+
+%{\itshape
+%\begin{center}
+% \begin{tabular}{@{} ccccc @{}}
+% \hline
+% StylisticSet & \verb|\ss| & \verb|\SS| & \verb|\MakeUppercase{\ss}| & \verb|\textsc{\ss}| \\
+% \hline
+% None & \ss & \SS & \MakeUppercase{\ss} & \textsc{\ss}\\
+%
+% =1 & {\addfontfeature{StylisticSet=1}\ss} & {\addfontfeature{StylisticSet=1}\SS} & {\addfontfeature{StylisticSet=1}\MakeUppercase{\ss}} & {\addfontfeature{StylisticSet=1}\textsc{\ss}}\\
+% \hline
+% \end{tabular}
+%\end{center}
+%}
+%
+%\bfseries
+%\begin{center}
+% \begin{tabular}{@{} ccccc @{}}
+% \hline
+% StylisticSet & \verb|\ss| & \verb|\SS| & \verb|\MakeUppercase{\ss}| & \verb|\textsc{\ss}| \\
+% \hline
+% None & \ss & \SS & \MakeUppercase{\ss} & \textsc{\ss}\\
+%
+% =1 & {\addfontfeature{StylisticSet=1}\ss} & {\addfontfeature{StylisticSet=1}\SS} & {\addfontfeature{StylisticSet=1}\MakeUppercase{\ss}} & {\addfontfeature{StylisticSet=1}\textsc{\ss}}\\
+% \hline
+% \end{tabular}
+%\end{center}
+%
+%\itshape
+%\begin{center}
+% \begin{tabular}{@{} ccccc @{}}
+% \hline
+% StylisticSet & \verb|\ss| & \verb|\SS| & \verb|\MakeUppercase{\ss}| & \verb|\textsc{\ss}| \\
+% \hline
+% None & \ss & \SS & \MakeUppercase{\ss} & \textsc{\ss}\\
+%
+% =1 & {\addfontfeature{StylisticSet=1}\ss} & {\addfontfeature{StylisticSet=1}\SS} & {\addfontfeature{StylisticSet=1}\MakeUppercase{\ss}} & {\addfontfeature{StylisticSet=1}\textsc{\ss}}\\
+% \hline
+% \end{tabular}
+%\end{center}
+
+%{\addfontfeature{StylisticSet=2}
+%
+%\ss\ \MakeUppercase{\ss} \SS\ \textsc{\ss}
+%
+%}
+%\expandafter\show\csname SS\endcsname
+\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cochineal.doc.tlpobj new/tlpkg/tlpobj/cochineal.doc.tlpobj
--- old/tlpkg/tlpobj/cochineal.doc.tlpobj 2019-02-28 03:27:34.000000000 +0100
+++ new/tlpkg/tlpobj/cochineal.doc.tlpobj 2020-03-24 01:56:49.000000000 +0100
@@ -1,11 +1,14 @@
name cochineal.doc
category Package
-revision 49436
+revision 54512
shortdesc doc files of cochineal
relocated 1
-docfiles size=90
+docfiles size=102
RELOC/doc/fonts/cochineal/OFL-FAQ.txt
RELOC/doc/fonts/cochineal/OFL.txt
RELOC/doc/fonts/cochineal/README
RELOC/doc/fonts/cochineal/cochineal-doc.pdf
RELOC/doc/fonts/cochineal/cochineal-doc.tex
+ RELOC/doc/fonts/cochineal/newgermanglyphs-crop.pdf
+ RELOC/doc/fonts/cochineal/newgermanglyphs.pdf
+ RELOC/doc/fonts/cochineal/newgermanglyphs.tex
++++++ cochineal.tar.xz ++++++
++++ 18755 lines of diff (skipped)
++++++ codepage.doc.tar.xz ++++++
Binary files old/doc/latex/codepage/demo.zip and new/doc/latex/codepage/demo.zip differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/codepage/voyel850.tex new/doc/latex/codepage/voyel850.tex
--- old/doc/latex/codepage/voyel850.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/codepage/voyel850.tex 2019-06-29 00:42:49.000000000 +0200
@@ -0,0 +1,32 @@
+\documentstyle[codepage]{article}
+
+\codepage{\EightFiveZero}{\CM}
+
+\begin{document}
+\begin{center}
+\Large \sc Les voyelles
+\end{center}
+\begin{verse}
+A noir, E blanc, I rouge, O bleu: voyelles,\\
+Je dirai quelque jour vos naissances latentes:\\
+A, noir corset velu des mouches clatantes\\
+Qui bombinent autour des puanteurs cruelles,
+
+Golfs d'ombre; et, candeurs des vapeurs et des tentes,\\
+Lances des glaciers fiers, rois blancs, frissons d'ombelles;\\
+I, pourpres, sang crach, rire des lvres belles\\
+Dans la colre ou les ivresses pnitentes;
+
+U, cycles, vibrements divins des mers virides,\\
+Paix des ptis sems d'animaux, paix des rides\\
+Que l'alchimie imprime aux grands fronts studieux;
+
+O, suprme Clairon plein des strideurs tranges,\\
+Silences traverss des Mondes et des Anges:\\
+-- O l'Omga, rayon violet de Ses Yeux!\\
+\end{verse}
+
+\begin{flushright}
+A. Rimbaud
+\end{flushright}
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/codepage/voyeliso.tex new/doc/latex/codepage/voyeliso.tex
--- old/doc/latex/codepage/voyeliso.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/codepage/voyeliso.tex 2019-06-29 00:42:49.000000000 +0200
@@ -0,0 +1,32 @@
+\documentstyle[codepage]{article}
+
+\codepage{\IsoOne}{\CM}
+
+\begin{document}
+\begin{center}
+\Large \sc Les voyelles
+\end{center}
+\begin{verse}
+A noir, E blanc, I rouge, O bleu: voyelles,\\
+Je dirai quelque jour vos naissances latentes:\\
+A, noir corset velu des mouches éclatantes\\
+Qui bombinent autour des puanteurs cruelles,
+
+Golfs d'ombre; et, candeurs des vapeurs et des tentes,\\
+Lances des glaciers fiers, rois blancs, frissons d'ombelles;\\
+I, pourpres, sang craché, rire des lèvres belles\\
+Dans la colère ou les ivresses pénitentes;
+
+U, cycles, vibrements divins des mers virides,\\
+Paix des pâtis semés d'animaux, paix des rides\\
+Que l'alchimie imprime aux grands fronts studieux;
+
+O, suprême Clairon plein des strideurs étranges,\\
+Silences traversés des Mondes et des Anges:\\
+-- O l'Oméga, rayon violet de Ses Yeux!\\
+\end{verse}
+
+\begin{flushright}
+A. Rimbaud
+\end{flushright}
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/codepage.doc.tlpobj new/tlpkg/tlpobj/codepage.doc.tlpobj
--- old/tlpkg/tlpobj/codepage.doc.tlpobj 2019-02-28 03:27:44.000000000 +0100
+++ new/tlpkg/tlpobj/codepage.doc.tlpobj 2019-06-29 01:53:49.000000000 +0200
@@ -1,11 +1,12 @@
name codepage.doc
category Package
-revision 21126
+revision 51502
shortdesc doc files of codepage
relocated 1
-docfiles size=81
+docfiles size=82
RELOC/doc/latex/codepage/LISEZMOI
RELOC/doc/latex/codepage/README
RELOC/doc/latex/codepage/codepage.pdf
- RELOC/doc/latex/codepage/demo.zip
RELOC/doc/latex/codepage/frintro.pdf
+ RELOC/doc/latex/codepage/voyel850.tex
+ RELOC/doc/latex/codepage/voyeliso.tex
++++++ codepage.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/codepage.tlpobj new/tlpkg/tlpobj/codepage.tlpobj
--- old/tlpkg/tlpobj/codepage.tlpobj 2019-02-28 03:27:44.000000000 +0100
+++ new/tlpkg/tlpobj/codepage.tlpobj 2019-06-29 01:53:49.000000000 +0200
@@ -1,6 +1,6 @@
name codepage
category Package
-revision 21126
+revision 51502
shortdesc Support for variant code pages
relocated 1
longdesc The package provides a mechanism for inputting non-ASCII text.
++++++ coelacanth.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/coelacanth/README new/doc/fonts/coelacanth/README
--- old/doc/fonts/coelacanth/README 2017-09-11 22:47:09.000000000 +0200
+++ new/doc/fonts/coelacanth/README 2020-04-14 23:06:20.000000000 +0200
@@ -1,5 +1,5 @@
This is the README for the coelacanth package, version 0.005
-(2017-09-10).
+(2020-04-13).
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX
support for Coelecanth fonts, designed by Ben Whitmore.
Binary files old/doc/fonts/coelacanth/coelacanth-samples.pdf and new/doc/fonts/coelacanth/coelacanth-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/coelacanth/coelacanth-samples.tex new/doc/fonts/coelacanth/coelacanth-samples.tex
--- old/doc/fonts/coelacanth/coelacanth-samples.tex 2017-09-11 22:47:09.000000000 +0200
+++ new/doc/fonts/coelacanth/coelacanth-samples.tex 2019-10-11 23:10:33.000000000 +0200
@@ -1,16 +1,18 @@
\documentclass{article}
+
\usepackage[T1]{fontenc}
\usepackage{coelacanth}
-\newcommand{\Section}[1]{\section*{\scshape#1}}
+\newcommand{\Section}[1]{\section*{\large\scshape#1}}
\renewcommand{\,}{\kern0.2ex}
\usepackage{lipsum}
\begin{document}
-\begin{center}\huge
-\textsc{C\,o\,e\,l\,a\,c\,a\,n\,t\,h}\\[0.5ex]
+\begin{center}\LARGE
+\textbf{\textsc{C\,o\,e\,l\,a\,c\,a\,n\,t\,h}\\[0.5ex]}
\end{center}
+
\Section{Regular}
\lipsum[1]
@@ -23,6 +25,7 @@
\Section{Small Caps}
\textsc{\lipsum[5]}
+
\Section{Default Numbers}
1234567890
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/coelacanth.doc.tlpobj new/tlpkg/tlpobj/coelacanth.doc.tlpobj
--- old/tlpkg/tlpobj/coelacanth.doc.tlpobj 2019-02-28 03:27:44.000000000 +0100
+++ new/tlpkg/tlpobj/coelacanth.doc.tlpobj 2020-04-15 01:54:36.000000000 +0200
@@ -1,9 +1,9 @@
name coelacanth.doc
category Package
-revision 45270
+revision 54736
shortdesc doc files of coelacanth
relocated 1
-docfiles size=41
+docfiles size=20
RELOC/doc/fonts/coelacanth/LICENSE.md
RELOC/doc/fonts/coelacanth/README
RELOC/doc/fonts/coelacanth/coelacanth-samples.pdf
++++++ coelacanth.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-e/coelacanth.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-e.new.3606/coelacanth.tar.xz differ: char 26, line 1
++++++ colortbl.doc.tar.xz ++++++
Binary files old/doc/latex/colortbl/colortbl-DE.pdf and new/doc/latex/colortbl/colortbl-DE.pdf differ
Binary files old/doc/latex/colortbl/colortbl.pdf and new/doc/latex/colortbl/colortbl.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colortbl.doc.tlpobj new/tlpkg/tlpobj/colortbl.doc.tlpobj
--- old/tlpkg/tlpobj/colortbl.doc.tlpobj 2019-02-28 03:27:57.000000000 +0100
+++ new/tlpkg/tlpobj/colortbl.doc.tlpobj 2020-01-26 01:56:51.000000000 +0100
@@ -1,6 +1,6 @@
name colortbl.doc
category Package
-revision 49404
+revision 53545
shortdesc doc files of colortbl
relocated 1
docfiles size=152
++++++ colortbl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/colortbl/colortbl.sty new/tex/latex/colortbl/colortbl.sty
--- old/tex/latex/colortbl/colortbl.sty 2018-12-13 23:50:26.000000000 +0100
+++ new/tex/latex/colortbl/colortbl.sty 2020-01-25 23:23:37.000000000 +0100
@@ -8,14 +8,14 @@
%%
%%
%% Source File: `colortbl.dtx'.
-%% Copyright 1996 1998 1999 2012 2018 David Carlisle
+%% Copyright 1996 1998 1999 2012 2018 2020 David Carlisle
%%
%% This file may be distributed under the terms of the LPPL.
%% See readme for details.
%%
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{colortbl}
- [2018/12/12 v1.0d Color table columns (DPC)]
+ [2020/01/04 v1.0e Color table columns (DPC)]
\edef\@tempa{%
\noexpand\AtEndOfPackage{%
\catcode`\noexpand\^^A\the\catcode`\^^A\relax}}
@@ -320,11 +320,13 @@
##2%
\global\setbox\@ne\HH@box\doublerulesep\doublerulesep}}%
\HH@let!}\else
+ \ifx\@tempb\@sptoken\let\next\HH@spacelet\else
\PackageWarning{hhline}%
{\meaning\@tempb\space ignored in \noexpand\hhline argument%
\MessageBreak}%
- \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
+ \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
\next}
+\lowercase{\def\HH@spacelet} {\futurelet\@tempb \HH@loop}
\fi}
\AtBeginDocument{
\ifx\longtable\@undefined\else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/colortbl.tlpobj new/tlpkg/tlpobj/colortbl.tlpobj
--- old/tlpkg/tlpobj/colortbl.tlpobj 2019-02-28 03:27:57.000000000 +0100
+++ new/tlpkg/tlpobj/colortbl.tlpobj 2020-01-26 01:56:51.000000000 +0100
@@ -1,6 +1,6 @@
name colortbl
category Package
-revision 49404
+revision 53545
shortdesc Add colour to LaTeX tables
relocated 1
longdesc The package allows rows and columns to be coloured, and even
@@ -9,7 +9,6 @@
RELOC/tex/latex/colortbl/colortbl.sty
catalogue-also xcolor
catalogue-ctan /macros/latex/contrib/colortbl
-catalogue-date 2018-12-12 22:35:53 +0100
catalogue-license lppl
catalogue-topics colour table
-catalogue-version 1.0d
+catalogue-version 1.0e
++++++ combofont.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/combofont/README.md new/doc/lualatex/combofont/README.md
--- old/doc/lualatex/combofont/README.md 2017-07-03 22:59:09.000000000 +0200
+++ new/doc/lualatex/combofont/README.md 2019-06-08 23:43:09.000000000 +0200
@@ -2,7 +2,8 @@
An EXPERIMENTAL package to add nfss-declaration of combo fonts to a luaLaTeX document
-Version 0.2 copyright Ulrike Fischer 2017-
+Version 0.3 2019/06/08
+copyright Ulrike Fischer
## License
Binary files old/doc/lualatex/combofont/combofont-test-fira-math.pdf and new/doc/lualatex/combofont/combofont-test-fira-math.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/combofont/combofont-test-fira-math.tex new/doc/lualatex/combofont/combofont-test-fira-math.tex
--- old/doc/lualatex/combofont/combofont-test-fira-math.tex 2017-07-03 22:59:09.000000000 +0200
+++ new/doc/lualatex/combofont/combofont-test-fira-math.tex 2019-06-08 23:43:09.000000000 +0200
@@ -1,5 +1,5 @@
% !Mode:: "TeX:DE:UTF-8:Main"
-
+%% Date 2017/07/03 Version 0.2 combofont example
\documentclass[parskip=full]{scrartcl}
\usepackage{luacode}
@@ -26,7 +26,7 @@
)
\end{luacode}
-\usepackage{unicode-math}
+\usepackage[math-style=upright]{unicode-math}
\usepackage{combofont}
\setmainfont{Fira Sans}
@@ -41,19 +41,19 @@
{%
{},
0x30-0x39,
- 0x61-0x7A
+ 0x61-0x7A*0x03B1-0x03C9
}
\setupcombofont{FiraMathScript}
{%
file:texgyrepagella-math.otf:mode=base;script=math;language=DFLT;+ssty=0 at #1pt,
file:firasans-regular.otf at #1pt,
- file:firasans-regularitalic.otf at #1pt
+ file:firasans-italic.otf at #1pt
}
{%
{},
0x30-0x39,
- 0x61-0x7A
+ 0x61-0x7A*0x03B1-0x03C9
}
\setupcombofont{FiraMathScriptScript}
@@ -65,20 +65,20 @@
{%
{},
0x30-0x39,
- 0x61-0x7A
+ 0x61-0x7A*0x03B1-0x03C9
}
-
-% Mathversion bold need Script and ScriptScript declarations too!
+
+% Mathversion bold need Script and ScriptScript declarations too!
\setupcombofont{FiraMathBold}
{%
file:texgyrepagella-math.otf:mode=base;script=math;language=DFLT; at #1pt,
file:firasans-regular.otf at #1pt,
- file:firasans-regularitalic.otf at #1pt
+ file:firasans-italic.otf at #1pt
}
{%
{},
0x30-0x39,
- 0x61-0x7A
+ 0x61-0x7A*0x03B1-0x03C9
}
@@ -101,17 +101,10 @@
\SetSymbolFont{operators}{bold}{TU}{FiraMath}{bx}{n}
-% Map a etc to the ascii range. Original values can be found with
-% [\Umathcharclass `\a] [\Umathcharfam `\a] [\Umathcharslot `\a]
-
-\Umathcode `\a = "7 "0 "61
-\Umathcode `\b = "7 "0 "62
-\Umathcode `\c = "7 "0 "63
-\Umathcode `\d = "7 "0 "64
-\Umathcode `\e = "7 "0 "65
-\Umathcode `\f = "7 "0 "66
-\Umathcode `\g = "7 "0 "67
-\Umathcode `\h = "7 "0 "68
+% Map "a" etc to the ascii range. Original values can be found with
+%[\Umathcharclass `\a] [\Umathcharfam `\a] [\Umathcharslot `\a]
+% not needed because of math-style=upright
+%\Umathcode `\a = "7 "0 "61
\begin{document}
Binary files old/doc/lualatex/combofont/combofont.pdf and new/doc/lualatex/combofont/combofont.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/combofont/combofont.tex new/doc/lualatex/combofont/combofont.tex
--- old/doc/lualatex/combofont/combofont.tex 2017-07-03 22:59:09.000000000 +0200
+++ new/doc/lualatex/combofont/combofont.tex 2019-06-08 23:43:09.000000000 +0200
@@ -1,8 +1,9 @@
% !Mode:: "TeX:DE:UTF-8:Main"
-\RequirePackage{luatex85}
\documentclass[parskip=half-,egregdoesnotlikesansseriftitles]{scrartcl}
\usepackage{combofont}
\usepackage{ydoc-code,ydoc-desc}
+\usepackage[english]{babel}
+\usepackage[autostyle]{csquotes}
\usepackage{fontspec}
\usepackage{xcolor}
@@ -38,7 +39,9 @@
\DeclareFontShape{TU} {combotest}{m}{n}{<->combo*combotest-regular}{}
\DeclareFontShape{TU} {combotest}{bx}{n}{<->combo*combotest-bold}{}
-\title{The \texttt{combofont} package}
+\title{The \texttt{combofont} package \\
+{\normalsize Version \csname UlrikeFischer@package@ufcombofont@version\endcsname\
+from \csname UlrikeFischer@package@ufcombofont@date\endcsname}}
\author{Ulrike Fischer\thanks{fischer(a)troubleshooting-tex.de}}
\newcommand\package[1]{\texttt{#1}}
\begin{document}
@@ -46,29 +49,29 @@
\section{Status: EXPERIMENTAL}
-This is a EXPERIMENTAL package.
+This is an EXPERIMENTAL package.
-It can disappear without notice e.\,g. if the \package{luaotfload} changes so that it no longer work, or if luatex changes, or if \package{fontspec} includes the code.
+It can disappear without notice e.\,g. if the \package{luaotfload} changes so that it no longer works, or if luatex changes, or if \package{fontspec} includes the code.
-It is also possible that syntax and commands change in a incompatible way. So if you use it in a production environment: \textbf{You have been warned}.
+It is also possible that syntax and commands change in an incompatible way. So if you use it in a production environment: \textbf{You have been warned}.
\section{Introduction}
-In version 2.7. \package{luaotfload} supports combining characters from multiple fonts into a single virtualized one.
+In version 2.7 \package{luaotfload} supports combining characters from multiple fonts into a single virtualized one.
That means that one can build a font that takes e.g. the capital letters from a sans serif font and the lowercase letters from a serif font. Or a font that pulls in missing greek or cyrillic glyphs from another font.
-The methods pulls in \emph{only} glyphs. It is not suitable for every imaginable font combination -- some drawbacks are described below -- and one should use it with care. Nevertheless it is a quite neat extension of the tools to manipulate fonts.
+The method pulls in \emph{only} glyphs. It is not suitable for every imaginable font combination -- some drawbacks are described below -- and one should use it with care. Nevertheless it is a quite neat extension of the tools to manipulate fonts.
-The main problem with the examples in the \package{luaotfload} manual is that it creates fonts of a fix size. This means that they don't respond to command like \verb+\large+ or \verb+\footnotesize+.
+The main problem with the examples in the \package{luaotfload} manual is that they create fonts of a fix size. This means that they don't respond to command like \verb+\large+ or \verb+\footnotesize+.
-After trying around a bit and then asking a question (https://tex.stackexchange.com/questions/371647/call-a-luatex-combo-font-thr…) I got from David Carlisle the idea to use a \texttt{size}-Funktion which one define with \verb+\DeclareSizeFunction+ to inject the needed code to size the combo-font in a nfss-\verb+\DeclareFontShape+-command.
+After trying around a bit and then asking a question (https://tex.stackexchange.com/questions/371647/call-a-luatex-combo-font-thr…) I got from David Carlisle the idea to use a \texttt{size}-Funktion which one defines with \verb+\DeclareSizeFunction+ to inject the needed code to size the combo-font in a nfss-\verb+\DeclareFontShape+-command.
\package{combofont.sty} is the result.
It is not meant as a production package but as package that helps to exploit the use of combo fonts.
\section{Requirements}
-You need at least an up-to-date TeXLive 2016. TeXLive 2017 with luatex 1.0.4. or a current miktex is better.
+You need at least an up-to-date TeXLive 2016. TeXLive 2017 with luatex 1.0.4 or a current miktex is better.
\textbf{Change Version 0.2, 3.7.2017}: The style no longer loads the now obsolete \texttt{l3regex}, it assumes that it is loaded by \texttt{expl3}. In older \TeX-systems you will have to load the package.
@@ -88,7 +91,7 @@
\DescribeMacro\setupcombofont{<name>}{<comma list of basefonts>}{<comma list of ranges and code-points>}
\begin{description}
- \item[\marg{name}] is the name of the font. It should be some unique ascii-string without spaces. If you intent to define lots of fonts it would be a good idea to think about a sensible naming sheme. In the example here I simply used \texttt{combotest-regular} and \texttt{combotest-bold}.
+ \item[\marg{name}] is the name of the font. It should be some unique ascii-string without spaces. If you intend to define lots of fonts it would be a good idea to think about a sensible naming sheme. In the example here I simply used \texttt{combotest-regular} and \texttt{combotest-bold}.
\item[\marg{comma list of basefonts}] This should be a list of font declarations you want to use to build your combo font. The syntax used is described in the \package{luaotfload} manual. Example:
@@ -105,8 +108,8 @@
\item[Order of the fonts] The first font is the main font which will receive the glyphs. So think carefully which font is should be and setup its font features correctly. \package{combofont} defines as a helper command \verb+\combodefaultfeat+ which sets \texttt{mode=node;script=latn;language=DFLT;+tlig;}.
\item[Size declaration] The font description should end with a size declaration line \verb+at #1pt+. When processing the font \verb+#1+ will be replaced by the current font size. As you can see in the second font you can do calculations. \emph{Don't forget the size declaration!}
-
-\item Be careful with the commas: there shouldn't be one after the last font.
+
+\item Be careful with the commas: there shouldn't be one after the last font.
\end{description}
\item[\marg{comma list of ranges and code-points}] This is a comma list of settings which describe which glyphs are taken from the respective font. Example:
@@ -124,13 +127,13 @@
\item There should be as many settings as there are fonts.
\item Empty entries should be marked with a pair of braces (normally the first entry is empty).
\item You can add ranges of code points and single code points. Blocks are separated by an asterix \verb+*+. The example set the uppercase letters and the exclamation and the question mark.
-\item The keyword \texttt{fallback} means that this font is used for âmissing glyphsâ (in the example for the cyrillic glyphs).
+\item The keyword \texttt{fallback} means that this font is used for \enquote{missing glyphs} (in the example for the cyrillic glyphs).
\end{enumerate}
\end{description}
\subsection{Write \texttt{nfss}-declarations}
-After all the fonts you need have been setup, you can write suitable \texttt{nfss}-declaration which make it possible to call the font by family and other font commands. Example:
+After all the fonts you need have been setup, you can write suitable \texttt{nfss}-declarations which make it possible to call the font by family and other font commands. Example:
\begin{verbatim}
\DeclareFontFamily{TU}{combotest}{}
@@ -183,17 +186,17 @@
\minisec{Important points:}
\begin{enumerate}
\item This a first try to get something working in math. It is in no way finished or complete, I'm rather certain that something will be missing or even faulty.
-\item Start with a real math font with a math constants table.
-\item Don't expect to get a perfect sans serif math font this way without work. It can take quite some time to adjust everything. Also a text font is not really meant to be used as math font.
+\item Start with a real math font with a math constants table.
+\item Don't expect to get a perfect sans serif math font this way without work. It can take quite some time to adjust everything. Also a text font is not really meant to be used as math font.
\item The lua-code for the font patch compares \texttt{fontdata.psname} with the string \\\texttt{TeXGyrePagellaMath-Regular} to restrict the patch to the specific font.
The font name database of luaotfload-names.lua contains for \textsf{TeX Gyre Pagella Math} these entries:
-
+
\begin{verbatim}
["plainname"]="TeXGyrePagellaMath-Regular",
["psname"]="texgyrepagellamathregular",
\end{verbatim}
-
+
As you can see the correct string for the comparision with \texttt{fontdata.psname} is in \verb+["plainname"]+ and not in \verb+["psname"]+. Don't ask me why. \texttt{luaotfload} seems to copy the infos around quite a lot. So when adapting the code to other fonts, test with various font names if it seems not to work.
\end{enumerate}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/combofont.doc.tlpobj new/tlpkg/tlpobj/combofont.doc.tlpobj
--- old/tlpkg/tlpobj/combofont.doc.tlpobj 2019-02-28 03:27:59.000000000 +0100
+++ new/tlpkg/tlpobj/combofont.doc.tlpobj 2019-06-09 01:38:35.000000000 +0200
@@ -1,6 +1,6 @@
name combofont.doc
category Package
-revision 44746
+revision 51348
shortdesc doc files of combofont
relocated 1
docfiles size=29
++++++ combofont.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/combofont/combofont.sty new/tex/lualatex/combofont/combofont.sty
--- old/tex/lualatex/combofont/combofont.sty 2017-07-03 22:59:09.000000000 +0200
+++ new/tex/lualatex/combofont/combofont.sty 2019-06-08 23:43:09.000000000 +0200
@@ -1,21 +1,29 @@
+% !Mode:: "TeX:DE:UTF-8:Main"
+%28.05.2018
+\def\UlrikeFischer@package@ufcombofont@date{2019/06/08}\def\UlrikeFischer@package@ufcombofont@version{0.3}
+
\RequirePackage{xparse}
-\ProvidesExplPackage {combofont} {2017/07/03} {0.2}
+\ProvidesExplPackage {combofont} {\UlrikeFischer@package@ufcombofont@date}{\UlrikeFischer@package@ufcombofont@version}
{An EXPERIMENTAL package to add nfss-declaration of combo fonts to a luaLaTeX document}
% highly experimental! Comments to Ulrike Fischer. fischer(a)troubleshooting-tex.de
+\prop_if_exist:NT \g_msg_module_name_prop
+ {
+ \prop_gput:Nnn \g_msg_module_name_prop { ufcombo }{ combofont }
+ }
-\msg_new:nnn {combo} {need-luatex}
+\msg_new:nnn {ufcombo} {need-luatex}
{
The~ combofont~package~requires~LuaLaTeX.~Quitting.
}
-\msg_new:nnn {combo} {combofont-already-exists}
+\msg_new:nnn {ufcombo} {combofont-already-exists}
{
The~combofont~#1~has~already~been~set~up.~I~won't~overwrite~it
}
\sys_if_engine_luatex:F
{
- \msg_fatal:nn {combo} {need-luatex}
+ \msg_fatal:nn {ufcombo} {need-luatex}
\endinput
}
@@ -28,29 +36,29 @@
\tl_set:Nn\l_tmpa_tl { #2 }
\regex_replace_all:nnN {\#1} {\c{f@size}} \l_tmpa_tl
% \tl_show:N\l_tmpa_tl
- \seq_if_exist:cTF { l__combo_#1_basefonts_seq }
+ \seq_if_exist:cTF { l__ufcombo_#1_basefonts_seq }
{
- \msg_warning:nnn { combo} {combofont-already-exists} { #1 }
+ \msg_warning:nnn { ufcombo} {combofont-already-exists} { #1 }
}
{
- \seq_new:c { l__combo_#1_basefonts_seq }
- \seq_set_split:cnV { l__combo_#1_basefonts_seq } { , }\l_tmpa_tl
- %%\seq_show:c {l__combo_#1_basefonts_seq }
- \seq_new:c { l__combo_#1_combodesc_seq }
- \seq_set_from_clist:cn { l__combo_#1_combodesc_seq } { #3 }
- %%\seq_show:c { l__combo_#1_combodesc_seq }
- \__combo_build_combodesc:n { #1 }
+ \seq_new:c { l__ufcombo_#1_basefonts_seq }
+ \seq_set_split:cnV { l__ufcombo_#1_basefonts_seq } { , }\l_tmpa_tl
+ %%\seq_show:c {l__ufcombo_#1_basefonts_seq }
+ \seq_new:c { l__ufcombo_#1_combodesc_seq }
+ \seq_set_from_clist:cn { l__ufcombo_#1_combodesc_seq } { #3 }
+ %%\seq_show:c { l__ufcombo_#1_combodesc_seq }
+ \__ufcombo_build_combodesc:n { #1 }
}
}
-\cs_new:Nn \__combo_call_basefonts:n
+\cs_new:Nn \__ufcombo_call_basefonts:n
{
\int_zero:N \l_tmpa_int
- \seq_map_inline:cn {l__combo_#1_basefonts_seq}
+ \seq_map_inline:cn {l__ufcombo_#1_basefonts_seq}
{
\int_incr:N \l_tmpa_int
- \exp_args:Nc \font { l_combo_tmpfont_\int_to_roman:n{\l_tmpa_int}_tl } = ##1
+ \exp_args:Nc \font { l__ufcombo_tmpfont_\int_to_roman:n{\l_tmpa_int}_tl } = ##1
}
}
@@ -59,38 +67,38 @@
-\cs_new:Nn \__combo_build_combodesc:n
+\cs_new:Nn \__ufcombo_build_combodesc:n
{
- \tl_new:c { l__combo_#1_combodesc_tl }
- \tl_set:cx { l__combo_#1_combodesc_tl } { \tl_to_str:n { " } combo \tl_to_str:n { : }~ }
- \int_step_inline:nnnn { 1 } { 1 } { \seq_count:c { l__combo_#1_basefonts_seq } }
+ \tl_new:c { l__ufcombo_#1_combodesc_tl }
+ \tl_set:cx { l__ufcombo_#1_combodesc_tl } { \tl_to_str:n { " } combo \tl_to_str:n { : }~ }
+ \int_step_inline:nnnn { 1 } { 1 } { \seq_count:c { l__ufcombo_#1_basefonts_seq } }
{
- \tl_put_right:cn { l__combo_#1_combodesc_tl } { ##1~->~\fontid }
- \exp_args:Nnc \tl_put_right:cn { l__combo_#1_combodesc_tl }
+ \tl_put_right:cn { l__ufcombo_#1_combodesc_tl } { ##1~->~\fontid }
+ \exp_args:Nnc \tl_put_right:cn { l__ufcombo_#1_combodesc_tl }
{
- l_combo_tmpfont_\int_to_roman:n{##1}_tl
+ l__ufcombo_tmpfont_\int_to_roman:n{##1}_tl
}
- \tl_set:Nx\l_tmpa_tl { \seq_item:cn {l__combo_#1_combodesc_seq } {##1} }
+ \tl_set:Nx\l_tmpa_tl { \seq_item:cn {l__ufcombo_#1_combodesc_seq } {##1} }
\tl_if_empty:NF \l_tmpa_tl
{
- \tl_put_right:cx { l__combo_#1_combodesc_tl}
+ \tl_put_right:cx { l__ufcombo_#1_combodesc_tl}
{
- ,~ \seq_item:cn {l__combo_#1_combodesc_seq } {##1}
+ ,~ \seq_item:cn {l__ufcombo_#1_combodesc_seq } {##1}
}
}
- \tl_put_right:cx { l__combo_#1_combodesc_tl} {\tl_to_str:n{;}}
+ \tl_put_right:cx { l__ufcombo_#1_combodesc_tl} {\tl_to_str:n{;}}
}
- \tl_put_right:cx { l__combo_#1_combodesc_tl } { \tl_to_str:n { " } }
- %% \tl_show:c { l__combo_#1_combodesc_tl }
+ \tl_put_right:cx { l__ufcombo_#1_combodesc_tl } { \tl_to_str:n { " } }
+ %% \tl_show:c { l__ufcombo_#1_combodesc_tl }
}
-\DeclareSizeFunction{combo}{\__combo_sfcnt:}
+\DeclareSizeFunction{combo}{\__ufcombo_sfcnt:}
-\cs_new:Nn\__combo_sfcnt:
+\cs_new:Nn\__ufcombo_sfcnt:
{
- % \tl_show:c {l__combo_\use:c{mandatory@arg}_combodesc_tl}
- \__combo_call_basefonts:n { \mandatory@arg }
- \tl_set_eq:Nc \external@font { l__combo_\use:c{mandatory@arg}_combodesc_tl}
+ % \tl_show:c {l__ufcombo_\use:c{mandatory@arg}_combodesc_tl}
+ \__ufcombo_call_basefonts:n { \mandatory@arg }
+ \tl_set_eq:Nc \external@font { l__ufcombo_\use:c{mandatory@arg}_combodesc_tl}
}%
\tl_new:N\combodefaultfeat
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/combofont.tlpobj new/tlpkg/tlpobj/combofont.tlpobj
--- old/tlpkg/tlpobj/combofont.tlpobj 2019-02-28 03:27:59.000000000 +0100
+++ new/tlpkg/tlpobj/combofont.tlpobj 2019-06-09 01:38:36.000000000 +0200
@@ -1,6 +1,6 @@
name combofont
category Package
-revision 44746
+revision 51348
shortdesc Add NFSS-declarations of combo fonts to LuaLaTeX documents
relocated 1
longdesc This highly experimental package can be used to add
@@ -13,8 +13,10 @@
longdesc environment: You have been warned.
runfiles size=1
RELOC/tex/lualatex/combofont/combofont.sty
+catalogue-contact-repository https://github.com/u-fischer/combofont
+catalogue-contact-support https://github.com/u-fischer/combofont
catalogue-ctan /macros/luatex/latex/combofont
-catalogue-date 2017-07-03 18:05:12 +0200
+catalogue-date 2019-06-08 16:41:14 +0200
catalogue-license lppl1.3c
catalogue-topics luatex font-mgmt
-catalogue-version 0.2
+catalogue-version 0.3
++++++ comfortaa.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/comfortaa/CHANGES new/doc/fonts/comfortaa/CHANGES
--- old/doc/fonts/comfortaa/CHANGES 2012-08-28 00:08:44.000000000 +0200
+++ new/doc/fonts/comfortaa/CHANGES 2019-06-25 23:32:27.000000000 +0200
@@ -1,28 +1,44 @@
-Changelog for version 1.1:
- - fix small caps series in TS1 encoding
+VERSION 3.2:
+ - Fix ligatures for hyphens
-Changelog for version 1.2:
- - clean comfortaa-fixlatin.etx
-
-Changelog for version 1.3:
- - fix comfortaa-fixglyphs.mtx
-
-Changelog for version 1.4:
- - remove "light" class option
- - fix documentation
- - add samples PDF
-
-Changelog for version 2.0:
- - complete rewrite of the fontinst driver file
- - rename .vf and .tfm files based on the pattern <font>-<encoding>
- - modify paths of the archive: documentation is now in
+VERSION 3.1:
+ - Fix OT1 encoding with slanted shape
+ - Fix packaging according to CTAN guidelines
+
+VERSION 3.0:
+ - Update .ttf files to version 3.001
+ - Complete rewrite of the TeX metric file generation (otftotfm is now
+ used instead of fontinst)
+ - Support for XeLaTeX and LuaLaTeX
+ - Drop faked smallcaps support
+ - Fix kerning with uppercase Greek diacritics
+ - Add "scaled" alias option
+
+VERSION 2.3:
+ - Update fonts to version 2.003
+
+VERSION 2.2:
+ - Update fonts to version 2.002
+
+VERSION 2.1:
+ - Fix bad weight substitution when using light weight and slanted shape
+
+VERSION 2.0:
+ - Complete rewrite of the fontinst driver file
+ - Rename .vf and .tfm files based on the pattern <font>-<encoding>
+ - Modify paths of the archive: documentation is now in
doc/fonts/comfortaa/ and sources in source/fonts/comfortaa/
-Changelog for version 2.1:
- - fix bad weight substitution when using light weight and slanted shape
+VERSION 1.4:
+ - Remove "light" class option
+ - Fix documentation
+ - Add samples PDF
+
+VERSION 1.3:
+ - Fix comfortaa-fixglyphs.mtx
-Changelog for version 2.2:
- - update fonts to version 2.002
+VERSION 1.2:
+ - Clean comfortaa-fixlatin.etx
-Changelog for version 2.2:
- - update fonts to version 2.003
\ No newline at end of file
+VERSION 1.1:
+ - Fix small caps series in TS1 encoding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/comfortaa/README new/doc/fonts/comfortaa/README
--- old/doc/fonts/comfortaa/README 2012-08-28 00:08:44.000000000 +0200
+++ new/doc/fonts/comfortaa/README 2019-06-25 23:32:27.000000000 +0200
@@ -1,18 +1,16 @@
------------------------
- Comfortaa, version 2.3
+ Comfortaa, version 3.1
------------------------
-Comfortaa is a sans-serif font comfortable in every aspect designed by Jonas
-Aakerlund. This font, delivered under the OFL version 1.1, is available on
-Jonas's deviantArt web page at
-http://aajohan.deviantart.com/art/Comfortaa-font-105395949 as TrueType files.
+Comfortaa is a rounded geometric sans-serif type designed by Johan
+Aakerlund. The font, which includes three weights, is available on Johan's
+deviantArt web page as TTF-flavored OpenType files licensed under the OFL
+version 1.1.
-This package provides support for this font in LaTeX. It includes the original
-TrueType fonts, as well as Type 1 versions, converted for this package using
-FontForge for full support with Dvips.
-
-Installation and usage instructions are described in
-doc/latex/comfortaa/comfortaa.pdf.
+This package provides support for this font family in LaTeX, including XeLaTeX
+and LuaLaTeX. It includes the original OpenType fonts, as well as Type 1
+versions, converted for this package using FontForge for full support with LaTeX
+and Dvips.
This package is released under the LaTeX Project Public License, either version
1.3c or above, with the exception of the .ttf and .pfb files, released under the
Binary files old/doc/fonts/comfortaa/comfortaa-samples.pdf and new/doc/fonts/comfortaa/comfortaa-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/comfortaa/comfortaa-samples.tex new/doc/fonts/comfortaa/comfortaa-samples.tex
--- old/doc/fonts/comfortaa/comfortaa-samples.tex 2011-08-27 00:22:42.000000000 +0200
+++ new/doc/fonts/comfortaa/comfortaa-samples.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,89 +0,0 @@
-%% comfortaa-samples.tex
-%% Copyright 2011 Mohamed El Morabity
-%
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3 of this license or (at your option)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[greek,russian,francais,american]{babel}
-\usepackage{comfortaa}
-\usepackage[LGR,T2A,T1,OT1]{fontenc}
-\usepackage[utf8x]{inputenc}
-\usepackage{microtype}
-\usepackage{textcomp}
-
-\newcommand{\latinSample}{%
- \foreignlanguage{francais}{%
- Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils sont doués de raison et de conscience et doivent agir les uns envers les autres dans un esprit de fraternité.%
- }%
-}
-
-\newcommand{\cyrillicSample}{%
- \foreignlanguage{russian}{%
- ÐÑе лÑЎО ÑПжЎаÑÑÑÑ ÑвПбПЎМÑЌО О ÑавМÑЌО в ÑвПеЌ ЎПÑÑПОМÑÑве О пÑаваÑ
. ÐМО ÐœÐ°ÐŽÐµÐ»ÐµÐœÑ ÑазÑЌПЌ О ÑПвеÑÑÑÑ Ðž ÐŽÐŸÐ»Ð¶ÐœÑ Ð¿ÐŸÑÑÑпаÑÑ Ð² ПÑМПÑеМОО ÐŽÑÑг ÐŽÑÑга в ÐŽÑÑ
е бÑаÑÑÑва.%
- }%
-}
-
-\newcommand{\greekSample}{%
- \foreignlanguage{greek}{%
- 'Îλοι οι άΜΞÏÏÏοι γεΜΜιοÏÎœÏαι ελεÏΞεÏοι και ίÏοι ÏÏηΜ αΟιοÏÏÎÏεια και Ïα ΎικαιÏΌαÏα. ÎίΜαι ÏÏοικιÏÎŒÎΜοι Όε λογική και ÏÏ
ΜείΎηÏη, και οÏείλοÏ
Îœ Μα ÏÏ
ÎŒÏεÏιÏÎÏοΜÏαι ΌεÏÎ±ÎŸÏ ÏοÏ
Ï ÎŒÎµ ÏΜεÏΌα αΎελÏοÏÏΜηÏ.%
- }%
-}
-
-\newcommand{\miscSample}{%
- 0123456789 fi fl \textperthousand{} \textcopyright{} \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
-}
-
-\newcommand{\fontSample}[2]{%
- {\usefont{T1}{fco}{#1}{#2} \latinSample}
-
- {\usefont{T2A}{fco}{#1}{#2} \cyrillicSample}
-
- {\usefont{LGR}{fco}{#1}{#2} \greekSample}%
-
- {\fontfamily{fco}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
-}
-
-\begin{document}
-
-\section*{Comfortaa Light}
-
-\fontSample{l}{n}
-
-\fontSample{l}{sl}
-
-\fontSample{l}{sc}
-
-\fontSample{l}{scsl}
-
-\section*{Comfortaa Regular}
-
-\fontSample{m}{n}
-
-\fontSample{m}{sl}
-
-\fontSample{m}{sc}
-
-\fontSample{m}{scsl}
-
-\section*{Comfortaa Bold}
-
-\fontSample{b}{n}
-
-\fontSample{b}{sl}
-
-\fontSample{b}{sc}
-
-\fontSample{b}{scsl}
-
-\end{document}
Binary files old/doc/fonts/comfortaa/comfortaa.pdf and new/doc/fonts/comfortaa/comfortaa.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/comfortaa/comfortaa.tex new/doc/fonts/comfortaa/comfortaa.tex
--- old/doc/fonts/comfortaa/comfortaa.tex 2012-08-28 00:08:44.000000000 +0200
+++ new/doc/fonts/comfortaa/comfortaa.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,226 +0,0 @@
-%% comfortaa.tex
-%% Copyright 2011, 2012 Mohamed El Morabity
-%
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3 of this license or (at your option)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[american]{babel}
-\usepackage{booktabs}
-\usepackage[default]{comfortaa}
-\usepackage{microtype}
-\usepackage{multirow}
-\usepackage{path}
-\usepackage{varioref}
-\usepackage[colorlinks]{hyperref}
-
-\hypersetup{%
- pdftitle={LaTeX support for Comfortaa},%
- pdfauthor={Mohamed El Morabity}%
-}%
-
-\newcommand{\acronym}[1]{\textsc{\lowercase{#1}}}
-\newcommand{\code}{\texttt}
-\newcommand{\command}{\texttt}
-\newcommand{\email}[1]{\href{mailto:#1}{\nolinkurl{#1}}}
-\newcommand{\name}{}
-\newcommand{\package}{\texttt}
-\newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
-\newcommand{\program}{}
-
-\title{\LaTeX{} support for Comfortaa\\Version~2.3}
-
-\author{Mohamed \name{El~Morabity}\\\email{melmorabity(a)fedoraproject.org}}
-
-\begin{document}
-
-\maketitle
-
-\tableofcontents
-
-\section{Introduction}
-
-Comfortaa is a sans-serif font comfortable in every aspect designed by Johan
-\name{Aakerlund}. This font, which includes three weights (see
-figure~\vref{styles}), is available on Johan's deviantArt web
-page~\cite{comfortaa} as TrueType files licensed under the \acronym{OFL}
-version~1.1.
-
-\begin{figure}
- \centering
- {%
- \fcofamily%
- {\fontseries{l}\selectfont Comfortaa Light}\\
- Comfortaa Regular\\
- {\bfseries Comfortaa Bold}%
- }
- \caption{Available styles for Comfortaa}
- \label{styles}
-\end{figure}
-
-This package provides support for this font in \LaTeX{}. It includes the
-original TrueType fonts, as well as Type~1 versions, converted for this package
-using \program{FontForge} for full support with \program{Dvips}.
-
-\section{Installation}
-
-These directions assume that your \TeX{} distribution is
-\acronym{TDS}-compliant.
-
-Once the \path|comfortaa.zip| archive extracted:
-\begin{enumerate}
-\item Copy \path|doc/|, \path|fonts/|, \path|source/|, and \path|tex/|
- directories to your \path|texmf/| directory (either your local or global
- \path|texmf/| directory).
-\item Run \command{mktexlsr} to refresh the file name database and make \TeX{}
- aware of the new files.
-\item Run \command{updmap --enable Map comfortaa.map} to make \program{Dvips},
- \program{dvipdf} and \program{pdf\TeX} aware of the new fonts.
-\end{enumerate}
-
-Note that this package requires the \package{keyval}~\cite{keyval} and
-\package{slantsc}~\cite{slantsc} (to handle italic/slanted small caps) ones to
-work.
-
-\section{Usage}
-
-\subsection{Calling Comfortaa}
-
-You can use the Comfortaa font in a \LaTeX{} document by adding the command
-\begin{verbatim}
-\usepackage{comfortaa}
-\end{verbatim}
-to the preamble. The package supplies the \code{\char`\\fcofamily} command to
-switch the current font to Comfortaa.
-
-\subsection{Options}
-
-\subsubsection{Comfortaa as default (sans-serif) font}
-
-You can set \LaTeX{} to use Comfortaa as standard font throughout the whole
-document by passing the \code{default} option to the package:
-\begin{verbatim}
-\usepackage[default]{comfortaa}
-\end{verbatim}
-To set Comfortaa as default sans-serif only:
-\begin{verbatim}
-\usepackage[defaultsans]{comfortaa}
-\end{verbatim}
-
-\subsubsection{Font scaling}
-
-The font can be up- and downscaled by any factor. This can be used to make
-Comfortaa more friendly when used in company with other type faces, e.g., to
-adapt the x-height. The package option \code{scale=\parameter{ratio}} will scale
-the font according to \parameter{ratio} (1.0 by default), for example:
-\begin{verbatim}
-\usepackage[scale=0.95]{comfortaa}
-\end{verbatim}
-
-\subsection{Encodings}
-
-The following encodings are supported:
-\begin{description}
-\item[Latin] OT1, T1, TS1 (partial)
-\item[Cyrillic] T2A, T2B, T2C, X2
-\item[Greek] LGR (monotonic only)
-\end{description}
-To use one or another encoding, give the \LaTeX{} name to the \package{fontenc}
-package as usual, as in
-\begin{verbatim}
-\usepackage[T1]{fontenc}
-\usepackage{comfortaa}
-\end{verbatim}
-
-Note that, as usual with OT1 encoded fonts, kerning with accented characters is
-treated poorly, if at all. Note difference in kerning between these two encoding
-in table~\vref{kerning}.
-\begin{table}
-\centering
- \begin{tabular}{ll}
- \toprule
- OT1-encoded&{\fcofamily Te T\'e}\\
- \midrule
- T1-encoded&{\fcofamily\fontencoding{T1}\selectfont Te T\'e}\\
- \bottomrule
- \end{tabular}
- \caption{Kerning with OT1 and T1 encodings}
- \label{kerning}
-\end{table}
-It is therefore advised to always use the Comfortaa fonts in any encoding than
-OT1 when typing diacritics.
-
-\subsection{Available weights and variants}
-
-Table~\vref{nfss} lists the available font series and shapes with their
-\acronym{NFSS} classification. Parenthesized combinations are provided via
-substitutions.
-\begin{table}
- \centering
- \begin{tabular}{llll}
- \toprule
- family&encoding&series&shape\\
- \midrule
- \multirow{4}{*}{fco}&OT1,T1,&\multirow{4}{*}{l, m, b (bx)}&\multirow{3}{*}{n, sl (it), sc, scsl (scit)}\\
- &T2A, T2B, T2C, X2,&&\\
- &LGR&&\\
- \cmidrule{2-2}
- \cmidrule{4-4}
- &TS1&&n, sl (it)\\
- \bottomrule
- \end{tabular}
- \caption{Available font series and shapes for Comfortaa}
- \label{nfss}
-\end{table}
-Notice that the slanted shapes are faked ones, as well as the small capitals
-(reduced to 80\%).
-
-\section{Known bugs and improvements}
-
-Please send bug reports and suggestions about the Comfortaa \LaTeX{} support to
-\href{mailto:melmorabity@fedoraproject.org}{Mohamed \name{El~Morabity}}, not to
-Johan \name{Aakerlund}. Johan only distributes the TrueType font files
-themselves.
-
-\subsection{Small dotless ``j''}
-
-The Comfortaa font files do not provide any dotless ``j'' glyph. This \LaTeX{}
-support provides a faked one ({\fcofamily\j}), available by typing
-\code{\char`\\j}, and built using the \command{t1dotlessj} command (from
-LCDF~Typetools~\cite{lcdf}).
-
-\subsection{Searching for words containing ligatures in \acronym{PDF} documents}
-
-Searching for words typeset in Comfortaa and containing ligatures (such as
-``fi'' or ``fl'') in \acronym{PDF} documents is currently only possible if the
-\acronym{PDF} was generated using \program{pdf\TeX}~1.40 or above.
-
-\section{License}
-
-This package is released under the \LaTeX{} project public license, either
-version~1.3c or above~\cite{lppl}. Anyway both the TrueType and Type~1 files are
-delivered under the Open Font License version~1.1~\cite{ofl}.
-
-\begin{thebibliography}{9}
-\bibitem{comfortaa}
- \url{http://aajohan.deviantart.com/art/Comfortaa-font-105395949}
-\bibitem{keyval}
- \url{http://www.ctan.org/tex-archive/macros/latex/required/graphics/}
-\bibitem{slantsc}
- \url{http://www.ctan.org/tex-archive/macros/latex/contrib/slantsc/}
-\bibitem{lcdf} \url{http://www.lcdf.org/type/}
-\bibitem{lppl} \url{http://www.latex-project.org/lppl/lppl-1-3c.html}
-\bibitem{ofl} \url{http://scripts.sil.org/OFL_web}
-\end{thebibliography}
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/comfortaa/manifest.txt new/doc/fonts/comfortaa/manifest.txt
--- old/doc/fonts/comfortaa/manifest.txt 2012-08-28 00:08:44.000000000 +0200
+++ new/doc/fonts/comfortaa/manifest.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,254 +0,0 @@
-./source/fonts/comfortaa/comfortaa-fixgreek.mtx
-./source/fonts/comfortaa/comfortaa-dotlessj.etx
-./source/fonts/comfortaa/comfortaa-02.etx
-./source/fonts/comfortaa/comfortaa-fixtextcomp.mtx
-./source/fonts/comfortaa/comfortaa-drv.tex
-./source/fonts/comfortaa/comfortaa-map.tex
-./source/fonts/comfortaa/comfortaa-fixlatin.mtx
-./source/fonts/comfortaa/Makefile
-./source/fonts/comfortaa/comfortaa-01.etx
-./source/fonts/comfortaa/comfortaa-03.etx
-./source/fonts/comfortaa/comfortaa-fixcyrillic.mtx
-./source/fonts/comfortaa/comfortaa-diacritics.mtx
-./source/fonts/comfortaa/ttf2type1.pe
-./fonts/afm/public/comfortaa/Comfortaa-Light.afm
-./fonts/afm/public/comfortaa/Comfortaa-Light-LCDFJ.afm
-./fonts/afm/public/comfortaa/Comfortaa-Regular-LCDFJ.afm
-./fonts/afm/public/comfortaa/Comfortaa-Bold.afm
-./fonts/afm/public/comfortaa/Comfortaa-Bold-LCDFJ.afm
-./fonts/afm/public/comfortaa/Comfortaa-Regular.afm
-./fonts/map/dvips/comfortaa/comfortaa.map
-./fonts/truetype/public/comfortaa/Comfortaa-Regular.ttf
-./fonts/truetype/public/comfortaa/Comfortaa-Light.ttf
-./fonts/truetype/public/comfortaa/Comfortaa-Bold.ttf
-./fonts/type1/public/comfortaa/Comfortaa-Bold-LCDFJ.pfb
-./fonts/type1/public/comfortaa/Comfortaa-Regular.pfb
-./fonts/type1/public/comfortaa/Comfortaa-Light-LCDFJ.pfb
-./fonts/type1/public/comfortaa/Comfortaa-Bold.pfb
-./fonts/type1/public/comfortaa/Comfortaa-Light.pfb
-./fonts/type1/public/comfortaa/Comfortaa-Regular-LCDFJ.pfb
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-ts1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-ts1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-ts1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-ts1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-ts1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-SmallCaps-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-ts1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-SmallCaps-t2a.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2c.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-t2b.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-x2.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-SmallCaps-ot1.vf
-./fonts/vf/public/comfortaa/Comfortaa-Regular-lgr.vf
-./fonts/vf/public/comfortaa/Comfortaa-Light-lgr.vf
-./fonts/tfm/public/comfortaa/Comfortaa-Light-ts1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-01.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-dotlessj.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-03.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-01.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-ts1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-03.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-02.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-ts1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-01.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-dotlessj.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-03.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-dotlessj.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-01.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-ts1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-02.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-01.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-02.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-02.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-dotlessj.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-ts1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-02.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-SmallCaps-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-02.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-SmallCaps-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-ts1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-03.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-03.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-01.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-dotlessj.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-SmallCaps-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Light-Slanted-t2b.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-03.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-t1.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-lgr.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Regular-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/comfortaa/Comfortaa-Bold-dotlessj.tfm
-./fonts/enc/dvips/comfortaa/comfortaa-02.enc
-./fonts/enc/dvips/comfortaa/comfortaa-dotlessj.enc
-./fonts/enc/dvips/comfortaa/comfortaa-01.enc
-./fonts/enc/dvips/comfortaa/comfortaa-03.enc
-./tex/latex/comfortaa/x2fco.fd
-./tex/latex/comfortaa/t2bfco.fd
-./tex/latex/comfortaa/comfortaa.sty
-./tex/latex/comfortaa/t2cfco.fd
-./tex/latex/comfortaa/lgrfco.fd
-./tex/latex/comfortaa/ts1fco.fd
-./tex/latex/comfortaa/t2afco.fd
-./tex/latex/comfortaa/t1fco.fd
-./tex/latex/comfortaa/ot1fco.fd
-./doc/fonts/comfortaa/comfortaa.tex
-./doc/fonts/comfortaa/comfortaa-samples.tex
-./doc/fonts/comfortaa/README
-./doc/fonts/comfortaa/CHANGES
-./doc/fonts/comfortaa/comfortaa.pdf
-./doc/fonts/comfortaa/comfortaa-samples.pdf
-./README
-./manifest.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/comfortaa.doc.tlpobj new/tlpkg/tlpobj/comfortaa.doc.tlpobj
--- old/tlpkg/tlpobj/comfortaa.doc.tlpobj 2019-02-28 03:27:59.000000000 +0100
+++ new/tlpkg/tlpobj/comfortaa.doc.tlpobj 2020-03-24 01:57:02.000000000 +0100
@@ -1,13 +1,10 @@
name comfortaa.doc
category Package
-revision 27536
+revision 54512
shortdesc doc files of comfortaa
relocated 1
-docfiles size=103
+docfiles size=89
RELOC/doc/fonts/comfortaa/CHANGES
RELOC/doc/fonts/comfortaa/README
RELOC/doc/fonts/comfortaa/comfortaa-samples.pdf
- RELOC/doc/fonts/comfortaa/comfortaa-samples.tex
RELOC/doc/fonts/comfortaa/comfortaa.pdf
- RELOC/doc/fonts/comfortaa/comfortaa.tex
- RELOC/doc/fonts/comfortaa/manifest.txt
++++++ comfortaa.tar.xz ++++++
++++ 22245 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package texlive-specs-d for openSUSE:Factory checked in at 2020-05-29 21:17:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-d (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-d.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-d"
Fri May 29 21:17:01 2020 rev:39 rq:806885 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-d/texlive-specs-d.changes 2019-11-07 23:09:58.692097277 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-d.new.3606/texlive-specs-d.changes 2020-05-29 21:23:44.116207214 +0200
@@ -1,0 +2,60 @@
+Mon May 18 08:47:10 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Wed May 6 11:27:35 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Scan *.def files as well for RequirePackage
+
+-------------------------------------------------------------------
+Tue May 5 13:55:07 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- Update to TeXLive 2020
+ * Port patches
+ kpathsea_cnf.dif
+ latexpand_perl.dif
+ luaotfload_varfonts.dif
+ luatex_cnf.dif
+ musixtex_various.dif
+ * Delete patches not needed anymore as files have moved
+ tetex_scripts.dif
+ * Delete patche updmap-map_roboto.dif as fixed upstream
+ * Add new patches to catch moved files
+ texlive-scripts-extra_scripts.dif
+ texlive-scripts_scripts.dif
+ * Add new patch xetex_conf.dif to fit FHS location
+ * Remove TeXLive installer files breaking rpm database
+ texlive-scripts.removes
+
+-------------------------------------------------------------------
New:
----
bitset.doc.tar.xz
bitset.tar.xz
bitter.doc.tar.xz
bitter.tar.xz
bookmark.doc.tar.xz
bookmark.tar.xz
brandeis-thesis.doc.tar.xz
brandeis-thesis.tar.xz
bxghost.doc.tar.xz
bxghost.tar.xz
bxjatoucs.doc.tar.xz
bxjatoucs.tar.xz
catchfile.doc.tar.xz
catchfile.tar.xz
ccool.doc.tar.xz
ccool.tar.xz
centeredline.doc.tar.xz
centeredline.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-d.spec ++++++
++++ 15141 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-d/texlive-specs-d.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-d.new.3606/texlive-specs-d.spec
++++++ bohr.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bohr.doc.tlpobj new/tlpkg/tlpobj/bohr.doc.tlpobj
--- old/tlpkg/tlpobj/bohr.doc.tlpobj 2019-02-28 03:23:14.000000000 +0100
+++ new/tlpkg/tlpobj/bohr.doc.tlpobj 2020-03-24 01:56:39.000000000 +0100
@@ -1,6 +1,6 @@
name bohr.doc
category Package
-revision 37657
+revision 54512
shortdesc doc files of bohr
relocated 1
docfiles size=107
++++++ bohr.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bohr.tlpobj new/tlpkg/tlpobj/bohr.tlpobj
--- old/tlpkg/tlpobj/bohr.tlpobj 2019-02-28 03:23:14.000000000 +0100
+++ new/tlpkg/tlpobj/bohr.tlpobj 2020-03-24 01:56:39.000000000 +0100
@@ -1,6 +1,6 @@
name bohr
category Package
-revision 37657
+revision 54512
shortdesc Simple atom representation according to the Bohr model
relocated 1
longdesc The package provides means for the creation of simple Bohr
@@ -9,9 +9,8 @@
longdesc symbols or element names and vice versa.
runfiles size=4
RELOC/tex/latex/bohr/bohr.sty
-catalogue-contact-repository https://bitbucket.org/cgnieder/bohr/
+catalogue-contact-repository https://github.com/cgnieder/bohr/
catalogue-ctan /macros/latex/contrib/bohr
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license lppl1.3
catalogue-topics chemistry
catalogue-version 1.0
++++++ booktabs.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/booktabs/README new/doc/latex/booktabs/README
--- old/doc/latex/booktabs/README 2016-05-03 01:54:35.000000000 +0200
+++ new/doc/latex/booktabs/README 2020-01-14 22:51:18.000000000 +0100
@@ -13,8 +13,8 @@
the quality of tables in LaTeX. Guidelines are given as
to what constitutes a good table in this context.
-Copyright: (C) 1995--2016 Simon Fear
-Licence: GPL
+Copyright: (C) 1995--2020 Simon Fear
+Licence: LPPL
FILES IN DISTRIBUTION
=====================
Binary files old/doc/latex/booktabs/booktabs.pdf and new/doc/latex/booktabs/booktabs.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/booktabs.doc.tlpobj new/tlpkg/tlpobj/booktabs.doc.tlpobj
--- old/tlpkg/tlpobj/booktabs.doc.tlpobj 2019-02-28 03:23:22.000000000 +0100
+++ new/tlpkg/tlpobj/booktabs.doc.tlpobj 2020-01-15 01:54:34.000000000 +0100
@@ -1,6 +1,6 @@
name booktabs.doc
category Package
-revision 40846
+revision 53402
shortdesc doc files of booktabs
relocated 1
docfiles size=74
++++++ booktabs.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/booktabs/booktabs.sty new/tex/latex/booktabs/booktabs.sty
--- old/tex/latex/booktabs/booktabs.sty 2016-05-03 01:54:35.000000000 +0200
+++ new/tex/latex/booktabs/booktabs.sty 2020-01-14 22:51:18.000000000 +0100
@@ -6,21 +6,25 @@
%%
%% booktabs.dtx (with options: `package')
%%
-%% Copyright (C) 1995--2016 Simon Fear
-%% Maintained by Danie Els <dnjels(a)sun.ac.za>
+%% Copyright (C) 1995--2020 Simon Fear
+%% Maintained by Danie Els <dnjels(a)gmail.com>
%%
-%% This file 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:
+%% -----------------------------------------------------------------
+%% The booktabs package for publication quality tables for LaTeX
+%% -----------------------------------------------------------------
%%
-%% http://www.latex-project.org/lppl.txt
+%% 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 2008/05/04 or later.
%%
-%% and version 1.3 or later is part of all distributions of LaTeX version
-%% 2005/12/01 or later.
%% -----------------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{booktabs}
- [2016/04/27 v1.618033 publication quality tables]
+ [2020/01/12 v1.61803398 Publication quality tables]
\newdimen\heavyrulewidth
\newdimen\lightrulewidth
\newdimen\cmidrulewidth
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/booktabs.tlpobj new/tlpkg/tlpobj/booktabs.tlpobj
--- old/tlpkg/tlpobj/booktabs.tlpobj 2019-02-28 03:23:22.000000000 +0100
+++ new/tlpkg/tlpobj/booktabs.tlpobj 2020-01-15 01:54:35.000000000 +0100
@@ -1,6 +1,6 @@
name booktabs
category Package
-revision 40846
+revision 53402
shortdesc Publication quality tables in LaTeX
relocated 1
longdesc The package enhances the quality of tables in LaTeX, providing
@@ -11,7 +11,6 @@
runfiles size=2
RELOC/tex/latex/booktabs/booktabs.sty
catalogue-ctan /macros/latex/contrib/booktabs
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
catalogue-topics table table-rule
-catalogue-version 1.618033
+catalogue-version 1.61803398
++++++ boondox.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/boondox.doc.tlpobj new/tlpkg/tlpobj/boondox.doc.tlpobj
--- old/tlpkg/tlpobj/boondox.doc.tlpobj 2019-02-28 03:23:22.000000000 +0100
+++ new/tlpkg/tlpobj/boondox.doc.tlpobj 2020-03-24 01:56:39.000000000 +0100
@@ -1,6 +1,6 @@
name boondox.doc
category Package
-revision 43344
+revision 54512
shortdesc doc files of boondox
relocated 1
docfiles size=28
++++++ boondox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/boondox.tlpobj new/tlpkg/tlpobj/boondox.tlpobj
--- old/tlpkg/tlpobj/boondox.tlpobj 2019-02-28 03:23:23.000000000 +0100
+++ new/tlpkg/tlpobj/boondox.tlpobj 2020-03-24 01:56:39.000000000 +0100
@@ -1,6 +1,6 @@
name boondox
category Package
-revision 43344
+revision 54512
shortdesc Mathematical alphabets derived from the STIX fonts
relocated 1
longdesc The package contains a number of PostScript fonts derived from
@@ -62,7 +62,6 @@
RELOC/tex/latex/boondox/uboondox-frak.fd
RELOC/tex/latex/boondox/uboondoxuprscr.fd
catalogue-ctan /fonts/boondox
-catalogue-date 2017-02-26 09:09:50 +0100
-catalogue-license ofllppl
+catalogue-license ofl lppl
catalogue-topics font font-maths font-type1
catalogue-version 1.02d
++++++ braids.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/braids/README new/doc/latex/braids/README
--- old/doc/latex/braids/README 2011-08-27 00:08:04.000000000 +0200
+++ new/doc/latex/braids/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-----------------------------------------------------------------
-braids --- a style file for drawing braid diagrams with TikZ/PGF
-E-mail: stacey(a)math.ntnu.no
-Released under the LaTeX Project Public License v1.3c or later
-See http://www.latex-project.org/lppl.txt
-----------------------------------------------------------------
-
-This package defines some commands for drawing braid diagrams with TikZ/PGF.
-It was designed and tested with PGF2.10.
-The initial idea of this package came from a question and answer on the site http://tex.stackexchange.com.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/braids/README.txt new/doc/latex/braids/README.txt
--- old/doc/latex/braids/README.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/braids/README.txt 2019-05-08 23:15:00.000000000 +0200
@@ -0,0 +1,10 @@
+----------------------------------------------------------------
+braids --- a style file for drawing braid diagrams with TikZ/PGF
+E-mail: loopspace(a)mathforge.org
+Released under the LaTeX Project Public License v1.3c or later
+See http://www.latex-project.org/lppl.txt
+----------------------------------------------------------------
+
+This package defines some commands for drawing braid diagrams with TikZ/PGF.
+The initial idea of this package came from a question and answer on the site http://tex.stackexchange.com.
+
Binary files old/doc/latex/braids/braids.pdf and new/doc/latex/braids/braids.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/braids/braids.tex new/doc/latex/braids/braids.tex
--- old/doc/latex/braids/braids.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/braids/braids.tex 2019-05-08 23:15:00.000000000 +0200
@@ -0,0 +1,481 @@
+\documentclass{ltxdoc}
+\usepackage[T1]{fontenc}
+\usepackage{lmodern}
+\usepackage{morefloats}
+\usepackage{tikz}
+\usepackage{braids}
+\usetikzlibrary{braids}
+\usepackage[numbered]{hypdoc}
+\definecolor{lstbgcolor}{rgb}{0.9,0.9,0.9}
+
+\usepackage{listings}
+\lstloadlanguages{[LaTeX]TeX}
+\lstset{breakatwhitespace=true,breaklines=true,language=TeX}
+
+\usepackage{fancyvrb}
+
+\newenvironment{example}
+ {\VerbatimEnvironment
+ \begin{VerbatimOut}{example.out}}
+ {\end{VerbatimOut}
+ \begin{center}
+ \setlength{\parindent}{0pt}
+ \fbox{\begin{minipage}{.9\linewidth}
+ \lstset{breakatwhitespace=true,breaklines=true,language=TeX,basicstyle=\small}
+ \lstinputlisting[]{example.out}
+ \end{minipage}}
+
+ \fbox{\begin{minipage}{.9\linewidth}
+ \input{example.out}
+ \end{minipage}}
+\end{center}
+}
+
+\providecommand*{\url}{\texttt}
+\GetFileInfo{tikzlibrarybraids.code.tex}
+
+\title{The \textsf{braids} Package: Documentation}
+\author{Andrew Stacey \\ \texttt{loopspace(a)mathforge.org}}
+\date{\fileversion~from \filedate}
+
+\begin{document}
+
+\maketitle
+
+\begin{center}
+ \begin{tikzpicture}
+ \pic[
+ line width=1.5pt,
+ red,
+ line cap=round,
+ braid/.cd,
+ width=.75cm,
+ height=.5cm,
+ strand 3/.style={gray,line width=1pt},
+ strand 6/.style={gray,line width=1pt},
+ strand 7/.style={gray,line width=1pt},
+ strand 10/.style={gray,line width=1pt},
+ strand 14/.style={gray,line width=1pt},
+ strand 15/.style={gray,line width=1pt},
+ strand 16/.style={gray,line width=1pt},
+ strand 18/.style={gray,line width=1pt},
+ ] {braid={s_1-s_4-s_8-s_{12}-s_{16} s_2-s_5-s_7-s_9-s_{13}-s_{15} s_2-s_5-s_7-s_9-s_{15} s_1-s_4-s_8-s_{16} s_1-s_4-s_7-s_9-s_{17} s_2-s_5-s_{17} s_2-s_{13}-s_{16} s_1-s_{12}-s_{15}}};
+\end{tikzpicture}
+\end{center}
+
+\section{Introduction}
+
+This is a package for drawing braid diagrams using PGF/TikZ.
+An example follows.
+
+\begin{example}
+\begin{center}
+\begin{tikzpicture}
+\pic[
+ rotate=90,
+ braid/.cd,
+ every strand/.style={ultra thick},
+ strand 1/.style={red},
+ strand 2/.style={green},
+ strand 3/.style={blue},
+] {braid={s_1 s_2^{-1} s_1 s_2^{-1} s_1 s_2^{-1}}};
+\end{tikzpicture}
+\end{center}
+\end{example}
+
+\section{TikZ Library Usage}
+
+Version 2.0 changed the implementation to use the TikZ \Verb+pic+ syntax.
+It also converted it to a TikZ library, so to use it put the following in the preamble.
+
+\begin{verbatim}
+\usetikzlibrary{braids}
+\end{verbatim}
+
+(Or add it to the copious list of TikZ libraries that you are already using.)
+
+\bigskip
+
+\DescribeMacro{braid}
+A braid is specified by the pic name \Verb+braid+.
+The usual syntax for this is as follows:
+
+\Verb+\pic[options] at (coordinate) {braid={braid-word}};+
+
+\DescribeMacro{braid-word}
+The \Verb+braid-word+ is an expression in the braid group, such as \Verb+s_1 s_2^{-1} s_{3,5}+.
+The generator labels are not significant.
+If the subscript is a single number, as in \Verb+s_2+, the crossing goes from that number over the next.
+If the subscript is two numbers, as in \Verb+s_{2,4}+, the crossing goes from the first over the second, with both the crossing strands passing over all of the intervening strands.
+The exponent can be \Verb+1+, \Verb+{-1}+, or missing (in which case it defaults to \Verb+1+, note also that the exponent is read as a \TeX-token so \Verb+{1}+ is also legal).
+If the exponent is \(-1\) then the over and under strands swap.
+
+\begin{itemize}
+\item \Verb+s_1+ is strand \(1\) over strand \(2\).
+\item \Verb+s_1^{-1}+ is strand \(2\) over strand \(1\).
+\item \Verb+s_{1,3}+ is strand \(1\) over strand \(3\), and both are over strand \(2\).
+\end{itemize}
+
+Certain other symbols are allowed in the \Verb+braid-word+ which control the rendering of the braid.
+These extras are as follows.
+
+\begin{enumerate}
+\item To get crossings to render at the same height, separate them with a hyphen (note: no check is made to ensure that the crossings can legally be put at the same height; \emph{caveat emptor}).
+For example, \Verb+s_1-s_3+.
+
+\item To draw a \emph{floor} -- which is a rectangle behind the braid occupying some number of levels (the default being one level) -- precede the braid element by a vertical line, as in \Verb+s_1 | s_2+.
+The floor is itself a pic which, by default, consists of a rectangle and two horizontal lines.
+The rectangle picks up any \Verb+fill+ options and the lines any \Verb+draw+ options that are set in the \Verb+braid/every floor+ and \Verb+braid/floor <n>+ styles.
+The \Verb+n+ is the level number, starting at \(1\).
+
+More general floors can be drawn using the key \Verb+braid/add floor+.
+This takes one argument which is a comma separated list of parameters that specifies the position and size floor:
+%
+\begin{verbatim}
+braid/add floor={x,y,width,height,name}
+\end{verbatim}
+%
+The units used are the ``natural'' units of the braid: strand separation and level height.
+The \Verb+name+ is optional and if given can be used to style the floor in that the style \Verb+braid/floor <name>+ is applied to that floor.
+
+Replacing the floor pic will change how it is drawn.
+The coordinate system is set up for the floor pic so that the floor is a unit square with lower left corner at the origin.
+
+\item The identity element can occur in the braid-word.
+It is represented by \Verb+1+.
+This inserts the identity which corresponds to no crossing.
+However, it takes the same amount of space as if there were a crossing.
+
+\end{enumerate}
+
+\subsection{Style Options}
+\label{sec:picstyleopts}
+
+There are various keys that change the behaviour or rendering of the braid.
+All of these are in the \Verb+/tikz/braid/+ namespace.
+
+\DescribeMacro{number of strands} The key \Verb+number of strands+ sets the minimum number of strands for the braid.
+The number of strands will grow according to the terms in the braid word so this merely sets a lower bound.
+If not set, the number of strands will be determined by the terms in the braid word.
+
+\DescribeMacro{height}
+The key \Verb+height+ sets the height of the piece of the braid corresponding to an element in the group.
+This can be negative.
+
+\DescribeMacro{width}
+The key \Verb+width+ sets the separation of the strands in the braid.
+This can be negative.
+
+\DescribeMacro{border height}
+The key \Verb+border height+ adds a little extra length to the strands at the start and end of the braid.
+
+\DescribeMacro{gap}
+The key \Verb+gap+ is used to determine how much of a gap to leave in the under strand at a crossing.
+This should be a number strictly between 0 and .5.
+The curve is drawn using a cubic bezier and the gap is in terms of the time parameter, so the gap will not increase exactly proportionally to the value given by this key, though that is a reasonable approximation.
+
+\DescribeMacro{control factor}
+As just said, the parts of the strands involved in a crossing are drawn using a cubic bezier curve.
+The control points are vertically above or below their respective end point.
+This key determines that vertical separation.
+It is multiplied by the \Verb+height+ so that it scales properly.
+It can be set to 0 whereupon the strands in the crossing are straight lines.
+The default is 0.5.
+
+\DescribeMacro{nudge factor}
+The crossings are not quite placed one after another.
+There is a small ``nudge'' between the end of one crossing and the start of another.
+Due to the way that the strands are lengthened, if there is no ``nudge'' then some PDF renderers produce slightly strange results at certain magnifications.
+This key controls how much that ``nudge'' is, as a factor of the \Verb+height+.
+For the aforementioned reason, it should not be set to 0 (the default is 0.05).
+Note that this does not change the height of a crossing.
+Rather, it nudges the height at which the strands start to cross over.
+
+\DescribeMacro{every strand, strand <n>}
+The style of the strands are controlled by two types of option.
+Style options that are set on the \Verb+pic+ are passed to every strand.
+It is also possible to add style options to individual strands using the keys \Verb+every strand+ and \Verb+strand <n>+.
+The strands are numbered by their starting position.
+
+\DescribeMacro{every floor, floor <n>}
+When a floor is requested behind a crossing, it is rendered as a pic.
+These keys control how the floor is styled.
+
+\subsection{Coordinates and Anchors}
+
+The braid is littered with coordinates.
+Each strand gets a coordinate at each end, and at every level between crossings.
+These are labelled and numbered by the initial strand position and the crossing level.
+They are also labelled and numbered by the final strand position with the prefix \Verb+rev+.
+With a \Verb+name prefix+, the coordinate names look like the following:
+%
+\begin{verbatim}
+<name prefix>-<strand number>-<crossing number>
+<name prefix>-rev-<strand number>-<crossing number>
+\end{verbatim}
+%
+The crossing number can also be either \Verb+s+ or \Verb+e+ for the start and end of the strand.
+Note that \Verb+-1-0+ and \Verb+-1-s+ are slightly different in that \Verb+s+ includes the border height.
+
+\DescribeMacro{anchor}
+The key \Verb+anchor+ (in the \Verb+braid+ name space) can be used to shift the braid so that a different part of it is at the specified location.
+It uses the same syntax as the coordinates, except without the \Verb+<name prefix>-+.
+In the following example, the braid is shifted so that where the third strand starts the second level is at the position \Verb+(1,1)+
+
+\begin{example}
+\begin{center}
+\begin{tikzpicture}
+\fill[purple] (1,1) circle[radius=3mm];
+\pic[braid/anchor=3-2,rotate=90] at (1,1) {braid={s_2 s_1 s_2 s_1}};
+\end{tikzpicture}
+\end{center}
+\end{example}
+
+
+\section{Examples}
+
+Here are more detailed examples.
+
+\begin{example}
+\begin{center}
+\begin{tikzpicture}
+\pic[
+ braid/every floor/.style={fill=yellow},
+ braid/floor 1/.style={draw=black,dashed,fill=yellow!50!green},
+ line width=2pt,
+ braid/strand 1/.style={red},
+ braid/strand 2/.style={blue},
+ braid/strand 3/.style={green},
+ braid/add floor={2,4,3,2,a},
+ braid/floor a/.style={fill=pink},
+ name prefix=braid,
+] at (2,0) {braid={| s_1-s_3-s_5 | s_2^{-1}-s_4| s_1-s_4 s_2^{-1} s_1-s_3 s_2^{-1}-s_4^{-1}}};
+\fill[yellow] (2,0) circle (4pt);
+\node[at=(braid-3-s),pin=north west:strand 3 start] {};
+\node[at=(braid-3-e),pin=south west:strand 3 end] {};
+\node[at=(braid-rev-3-s),pin=north east:strand 3 (from bottom) start] {};
+\node[at=(braid-rev-3-e),pin=south east:strand 3 (from bottom) end] {};
+\end{tikzpicture}
+\end{center}
+\end{example}
+
+\begin{example}
+\begin{center}
+\begin{tikzpicture}
+\pic[
+ braid/.cd,
+ number of strands=3,
+ line width=8pt,
+ strand 1/.style={red},
+ strand 2/.style={green},
+ strand 3/.style={blue},
+ gap=0.1,
+ control factor=0,
+ nudge factor=0,
+ name prefix=braid,
+] {braid={a_2 a_1 a_2^{-1} a_1}};
+\node[circle,draw,fill=white,inner sep=0pt] at (braid-2-1) {\(+\)};
+\node[circle,draw,fill=white,inner sep=0pt] at (braid-3-1) {\(-\)};
+\node[circle,draw,fill=white,inner sep=0pt] at (braid-2-3) {\(+\)};
+\end{tikzpicture}
+\end{center}
+
+\end{example}
+
+\newpage
+
+\section{Original Package Usage (Depreciated)}
+
+The original version was as a separate package.
+This is still included for backwards compatibility.
+To use this package, you need to put the following in the preamble.
+
+\begin{verbatim}
+\usepackage{braids}
+\end{verbatim}
+
+\DescribeMacro{\braid}
+A braid is specified by the command \Verb+\braid+.
+The syntax for this command is as follows:
+
+\Verb+\braid[style options] (name) at (coordinate) braid-word;+
+
+\DescribeMacro{braid-word}
+The \Verb+braid-word+ is an expression in the braid group, such as \Verb+s_1 s_2^{-1}+.
+The generator labels are not significant.
+The exponent can be \Verb+1+, \Verb+{-1}+, or missing (in which case it defaults to \Verb+1+, note also that the exponent is read as a \TeX-token so \Verb+{1}+ is also legal).
+Certain other symbols are allowed in the \Verb+braid-word+ which control the rendering of the braid.
+These extras are as follows.
+
+\begin{enumerate}
+\item To get crossings to render at the same height, separate them with a hyphen (note: no check is made to ensure that the crossings can legally be put at the same height; \emph{caveat emptor}).
+
+\item To draw a \emph{floor}, precede the braid element by a vertical line.
+What happens then is that when the braid is rendered, the coordinates of the rectangle behind that crossing (wide enough to encompass all the strands) is passed to a command.
+The intention is that this command draw something behind the braid.
+The command is configurable by a key (see \ref{sec:styleopts}).
+
+\item The identity element can occur in the braid-word.
+It is represented by \Verb+1+.
+This inserts the identity which corresponds to no crossing.
+However, it takes the same amount of space as if there were a crossing.
+
+\item Strands can be labelled between crossings.
+To do this, the commands \Verb+\label+, \Verb+\olabel+, and \Verb+\clabel+ are provided.
+These take three arguments, the first is optional.
+The result of this command is to place a node on top of a particular strand between the crossings where the command is given.
+The first (optional) argument can be used to pass style options to this node.
+The second argument is the strand number.
+The third argument is the label text.
+
+The three commands differ as to how they interpret the strand number.
+For \Verb+\olabel+, the strand number is taken to mean the strand that starts at that position.
+For \Verb+\clabel+, the strand number is taken to mean the strand that is currently at that position.
+The behaviour of \Verb+\label+ is to choose one or other of these depending on whether the key \Verb+strand label by origin+ is true or false.
+This key only has an effect at the start of the braid-word; it cannot be reset in the middle.
+
+\item Style options can be given in the middle of a braid-word by enclosing them in square brackets.
+There are not many style options that it makes sense to change in the middle of the braid-word, since the strands are rendered all in one go at the end.
+
+\item Scoping is handled by using braces.
+Thus to change a style only briefly, enclose the desired scope in braces.
+\end{enumerate}
+
+\DescribeMacro{name}
+The (optional) \Verb+name+ acts a little like the \Verb+name+ of a TikZ node.
+When it is specified, the routine that renders the braid also saves certain coordinates as if they were node anchors.
+Specifically, \Verb+coordinate+ nodes are placed at the centre of the braid diagram and at the ends of each strand.
+The centre has the label \Verb+name+, the strands are labelled \Verb+name-number-end+ and \Verb+name-rev-number-end+, where \Verb+name+ is the name given to the braid, \Verb+number+ is the number of the strand counting from the left, and \Verb+end+ is either \Verb+s+ for the start or \Verb+e+ for the end.
+If the version with \Verb+rev+ is used then the numbers correspond to the \emph{final} positions of the braids.
+The name can also be specified with the \Verb+name+ key.
+
+\DescribeMacro{at}
+The (optional) \Verb+at (coordinate)+ syntax positions the braid at the \Verb+coordinate+ in the current picture.
+Due to the implementation, the coordinate has to be known at the start, but the width and height of the braid are only known at the end.
+Therefore, the braid is positioned so that the start of the first strand is at \Verb+(coordinate)+.
+This can also be specified using the \Verb+at+ key.
+
+\DescribeMacro{style options}
+The \Verb+style options+ set the style for the braid strands.
+They can be grouped into three types: options that set up the main parameters for the braid, options that set the default style for the strands, and options that set up styles for individual strands.
+The options are as follows.
+
+\subsection{Style Options}
+\label{sec:styleopts}
+
+\DescribeMacro{number of strands} The key \Verb+number of strands+ sets the minimum number of strands for the braid.
+The number of strands will grow according to the terms in the braid word so this merely sets a lower bound.
+If not set, the number of strands will be determined by the terms in the braid word.
+
+\DescribeMacro{height}
+The key \Verb+height+ sets the height of the piece of the braid corresponding to an element in the group.
+
+\DescribeMacro{width}
+The key \Verb+width+ sets the separation of the strands in the braid.
+
+\DescribeMacro{border height}
+The key \Verb+border height+ adds a little extra length to the strands at the start and end of the braid.
+
+\DescribeMacro{gap}
+The key \Verb+gap+ is used to determine how much of a gap to leave in the under strand at a crossing.
+This should be a number strictly between 0 and .5.
+The curve is drawn using a cubic bezier and the gap is in terms of the time parameter, so the gap will not increase exactly proportionally to the value given by this key, though that is a reasonable approximation.
+
+\DescribeMacro{control factor}
+As just said, the parts of the strands involved in a crossing are drawn using a cubic bezier curve.
+The control points are vertically above or below their respective end point.
+This key determines that vertical separation.
+It is multiplied by the \Verb+height+ so that it scales properly.
+It can be set to 0 whereupon the strands in the crossing are straight lines.
+The default is 0.5.
+
+\DescribeMacro{nudge factor}
+The crossings are not quite placed one after another.
+There is a small ``nudge'' between the end of one crossing and the start of another.
+Due to the way that the strands are lengthened, if there is no ``nudge'' then some PDF renderers produce slightly strange results at certain magnifications.
+This key controls how much that ``nudge'' is, as a factor of the \Verb+height+.
+For the aforementioned reason, it should not be set to 0 (the default is 0.05).
+Note that this does not change the height of a crossing.
+Rather, it nudges the height at which the strands start to cross over.
+
+\DescribeMacro{style strands}
+The style of the strands are controlled by two types of option.
+Style options that are set on the \Verb+\braid+ command are passed to every strand.
+It is also possible to add style options to individual strands using the key \Verb+style strands+.
+This takes two options, a comma-delimited list of strand numbers (which could be just a single number) and a list of options to be applied to that strand.
+Thus, the syntax is \Verb+style strands={n,m,...}{options}+.
+The strands are numbered by their starting position.
+Not all of the standard TikZ style options are possible due to the way that the strands are constructed.
+Basically, the options that are allowed are those that do not require changing the path or drawing it more than once.
+
+\DescribeMacro{floor command}
+When a floor is requested behind a crossing, the actual way to render it is determined by a command.
+This key allows the user to define that command.
+The argument to this key should be the code that should be executed for each floor.
+To avoid the hassle of getting the number of hashes right, the command should take no arguments.
+Rather, the coordinates of the rectangle are saved in to macros \Verb+\floorsx+, \Verb+\floorsy+, \Verb+\floorex+, \Verb+\floorey+ (these macros will expand to something like \Verb+10pt+) and the command should use these to position the drawing.
+The default is to draw a line at the top and at the bottom of the rectangle.
+
+\DescribeMacro{style floors}
+\DescribeMacro{style all floors}
+In the spirit of separating \emph{style} and \emph{content}, the style options for the floors can be specified separately to the command (of course, they could be built in to the command).
+One advantage of this over building them in to the command is to allow them to be overridden for individual floors.
+The \Verb+style all floors+ sets up options to be used for \emph{all} floors, whilst the \Verb+style floors={n,m,...}{options}+ sets up options to be used only for the listed floor.
+Anything specified in the \Verb+floor command+ will take precedence over both of these.
+
+Any other style options are passed to the underlying TikZ/PGF system and so may influence how the braid is drawn (but note that not all keys make sense due to the implementation).
+
+
+\section{Examples}
+
+Here are more detailed examples.
+
+\begin{example}
+\begin{center}
+\begin{tikzpicture}
+\braid[
+ style all floors={fill=yellow},
+ style floors={1}{dashed,fill=yellow!50!green},
+ floor command={%
+ \fill (\floorsx,\floorsy) rectangle (\floorex,\floorey);
+ \draw (\floorsx,\floorsy) -- (\floorex,\floorsy);
+ },
+ line width=2pt,
+ style strands={1}{red},
+ style strands={2}{blue},
+ style strands={3}{green}
+] (braid) at (2,0) | s_1-s_3-s_5 | s_2^{-1}-s_4| s_1-s_4 s_2^{-1} s_1-s_3 s_2^{-1}-s_4^{-1};
+\fill[yellow] (2,0) circle (4pt);
+\fill[purple] (braid) circle (4pt);
+\node[at=(braid-3-s),pin=north west:strand 3] {};
+\node[at=(braid-3-e),pin=south west:strand 3] {};
+\node[at=(braid-rev-3-s),pin=north east:strand 3 (from bottom)] {};
+\node[at=(braid-rev-3-e),pin=south east:strand 3 (from bottom)] {};
+\end{tikzpicture}
+\end{center}
+\end{example}
+
+\begin{example}
+\begin{center}
+\begin{tikzpicture}
+\braid[
+ number of strands=3,
+ line width=8pt,
+ style strands={1}{red},
+ style strands={2}{green},
+ style strands={3}{blue},
+ gap=0.1,
+ control factor=0,
+ nudge factor=0,
+ strand label by origin=true,
+ strand label/.style={circle,draw,fill=white,inner sep=0pt},
+ yscale=1] (braid_1) a_2 \label{2}{\(+\)} \clabel{2}{\(-\)} a_1 a_2^{-1} \olabel{2}{\(+\)} a_1;
+\end{tikzpicture}
+\end{center}
+
+\end{example}
+
+\end{document}
+% Local Variables:
+% tex-output-type: "pdf18"
+% End:
Binary files old/doc/latex/braids/braids_code.pdf and new/doc/latex/braids/braids_code.pdf differ
Binary files old/doc/latex/braids/braids_doc.pdf and new/doc/latex/braids/braids_doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/braids/braids_doc.tex new/doc/latex/braids/braids_doc.tex
--- old/doc/latex/braids/braids_doc.tex 2011-09-04 17:37:44.000000000 +0200
+++ new/doc/latex/braids/braids_doc.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,178 +0,0 @@
-\documentclass{ltxdoc}
-\usepackage[T1]{fontenc}
-\usepackage{lmodern}
-\usepackage{morefloats}
-\usepackage{tikz}
-\usepackage{braids}
-\usepackage[numbered]{hypdoc}
-\definecolor{lstbgcolor}{rgb}{0.9,0.9,0.9}
-
-\usepackage{listings}
-\lstloadlanguages{[LaTeX]TeX}
-\lstset{breakatwhitespace=true,breaklines=true,language=TeX}
-
-\usepackage{fancyvrb}
-
-\newenvironment{example}
- {\VerbatimEnvironment
- \begin{VerbatimOut}{example.out}}
- {\end{VerbatimOut}
- \begin{center}
- \setlength{\parindent}{0pt}
- \fbox{\begin{minipage}{.9\linewidth}
- \lstset{breakatwhitespace=true,breaklines=true,language=TeX,basicstyle=\small}
- \lstinputlisting[]{example.out}
- \end{minipage}}
-
- \fbox{\begin{minipage}{.9\linewidth}
- \input{example.out}
- \end{minipage}}
-\end{center}
-}
-
-\providecommand*{\url}{\texttt}
-\GetFileInfo{braids.sty}
-
-\title{The \textsf{braids} Package: Documentation}
-\author{Andrew Stacey \\ \url{stacey(a)math.ntnu.no}}
-\date{\fileversion~from \filedate}
-
-\begin{document}
-
-\maketitle
-
-\begin{center}
-\begin{tikzpicture}
-\braid[width=.75cm,height=.5cm,line width=1.5pt,red,line cap=round,style strands={3,6,7,10,14,15,16,18}{gray,line width=1pt}] s_1-s_4-s_8-s_{12}-s_{16} s_2-s_5-s_7-s_9-s_{13}-s_{15} s_2-s_5-s_7-s_9-s_{15} s_1-s_4-s_8-s_{16} s_1-s_4-s_7-s_9-s_{17} s_2-s_5-s_{17} s_2-s_{13}-s_{16} s_1-s_{12}-s_{15};
-\end{tikzpicture}
-\end{center}
-
-\section{Introduction}
-
-This is a package for drawing braid diagrams using PGF/TikZ.
-An example follows.
-
-\begin{example}
-\begin{center}
-\begin{tikzpicture}
-\braid[rotate=90,style strands={1}{red},style strands={2}{blue},style strands={3}{green}] s_1 s_2^{-1} s_1 s_2^{-1} s_1 s_2^{-1};
-\end{tikzpicture}
-\end{center}
-\end{example}
-
-\section{Usage}
-
-\DescribeMacro{\braid}
-A braid is specified by the command \Verb+\braid+.
-The syntax for this command is as follows:
-
-\Verb+\braid[style options] (name) at (coordinate) braid-word;+
-
-\DescribeMacro{braid-word}
-The \Verb+braid-word+ is an expression in the braid group, such as \Verb+s_1 s_2^{-1}+.
-The generator labels are not significant.
-The exponent can be \Verb+1+, \Verb+{-1}+, or missing (in which case it defaults to \Verb+1+, note also that the exponent is read as a \TeX-token so \Verb+{1}+ is also legal).
-Certain other symbols are allowed in the \Verb+braid-word+ which control the rendering of the braid.
-To get crossings to render at the same height, separate them with a hyphen (note: no check is made to ensure that the crossings can legally be put at the same height; \emph{caveat emptor}).
-To draw a \emph{floor}, precede the braid element by a vertical line.
-What happens then is that when the braid is rendered, the coordinates of the rectangle behind that crossing (wide enough to encompass all the strands) is passed to a command.
-The intention is that this command draw something behind the braid.
-The command is configurable by a key (see \ref{sec:styleopts}).
-
-\DescribeMacro{name}
-The (optional) \Verb+name+ acts a little like the \Verb+name+ of a TikZ node.
-When it is specified, the routine that renders the braid also saves certain coordinates as if they were node anchors.
-Specifically, \Verb+coordinate+ nodes are placed at the centre of the braid diagram and at the ends of each strand.
-The centre has the label \Verb+name+, the strands are labelled \Verb+name-number-end+ and \Verb+name-rev-number-end+, where \Verb+name+ is the name given to the braid, \Verb+number+ is the number of the strand counting from the left, and \Verb+end+ is either \Verb+s+ for the start or \Verb+e+ for the end.
-If the version with \Verb+rev+ is used then the numbers correspond to the \emph{final} positions of the braids.
-The name can also be specified with the \Verb+name+ key.
-
-\DescribeMacro{at}
-The (optional) \Verb+at (coordinate)+ syntax positions the braid at the \Verb+coordinate+ in the current picture.
-Due to the implementation, the coordinate has to be known at the start, but the width and height of the braid are only known at the end.
-Therefore, the braid is positioned so that the start of the first strand is at \Verb+(coordinate)+.
-This can also be specified using the \Verb+at+ key.
-
-\DescribeMacro{style options}
-The \Verb+style options+ set the style for the braid strands.
-They can be grouped into three types: options that set up the main parameters for the braid, options that set the default style for the strands, and options that set up styles for individual strands.
-The options are as follows.
-
-\subsection{Style Options}
-\label{sec:styleopts}
-
-\DescribeMacro{number of strands} The key \Verb+number of strands+ sets the minimum number of strands for the braid.
-The number of strands will grow according to the terms in the braid word so this merely sets a lower bound.
-If not set, the number of strands will be determined by the terms in the braid word.
-
-\DescribeMacro{height}
-The key \Verb+height+ sets the height of the piece of the braid corresponding to an element in the group.
-
-\DescribeMacro{width}
-The key \Verb+width+ sets the separation of the strands in the braid.
-
-\DescribeMacro{border height}
-The key \Verb+border height+ adds a little extra length to the strands at the start and end of the braid.
-
-\DescribeMacro{style strands}
-The style of the strands are controlled by two types of option.
-Style options that are set on the \Verb+\braid+ command are passed to every strand.
-It is also possible to add style options to individual strands using the key \Verb+style strands+.
-This takes two options, a comma-delimited list of strand numbers (which could be just a single number) and a list of options to be applied to that strand.
-Thus, the syntax is \Verb+style strands={n,m,...}{options}+.
-The strands are numbered by their starting position.
-Not all of the standard TikZ style options are possible due to the way that the strands are constructed.
-Basically, the options that are allowed are those that do not require changing the path or drawing it more than once.
-
-\DescribeMacro{floor command}
-When a floor is requested behind a crossing, the actual way to render it is determined by a command.
-This key allows the user to define that command.
-The argument to this key should be the code that should be executed for each floor.
-To avoid the hassle of getting the number of hashes right, the command should take no arguments.
-Rather, the coordinates of the rectangle are saved in to macros \Verb+\floorsx+, \Verb+\floorsy+, \Verb+\floorex+, \Verb+\floorey+ (these macros will expand to something like \Verb+10pt+) and the command should use these to position the drawing.
-The default is to draw a line at the top and at the bottom of the rectangle.
-
-\DescribeMacro{style floors}
-\DescribeMacro{style all floors}
-In the spirit of separating \emph{style} and \emph{content}, the style options for the floors can be specified separately to the command (of course, they could be built in to the command).
-One advantage of this over building them in to the command is to allow them to be overridden for individual floors.
-The \Verb+style all floors+ sets up options to be used for \emph{all} floors, whilst the \Verb+style floors={n,m,...}{options}+ sets up options to be used only for the listed floor.
-Anything specified in the \Verb+floor command+ will take precedence over both of these.
-
-Any other style options are passed to the underlying TikZ/PGF system and so may influence how the braid is drawn (but note that not all keys make sense due to the implementation).
-
-
-\section{Example}
-
-Here is a more detailed example.
-
-
-\begin{example}
-\begin{center}
-\begin{tikzpicture}
-\braid[
- style all floors={fill=yellow},
- style floors={1}{dashed,fill=yellow!50!green},
- floor command={%
- \fill (\floorsx,\floorsy) rectangle (\floorex,\floorey);
- \draw (\floorsx,\floorsy) -- (\floorex,\floorsy);
- },
- line width=2pt,
- style strands={1}{red},
- style strands={2}{blue},
- style strands={3}{green}
-] (braid) at (2,0) | s_1-s_3-s_5 | s_2^{-1}-s_4| s_1-s_4 s_2^{-1} s_1-s_3 s_2^{-1}-s_4^{-1};
-\fill[yellow] (2,0) circle (4pt);
-\fill[purple] (braid) circle (4pt);
-\node[at=(braid-3-s),pin=north west:strand 3] {};
-\node[at=(braid-3-e),pin=south west:strand 3] {};
-\node[at=(braid-rev-3-s),pin=north east:strand 3 (from bottom)] {};
-\node[at=(braid-rev-3-e),pin=south east:strand 3 (from bottom)] {};
-\end{tikzpicture}
-\end{center}
-\end{example}
-\end{document}
-
-% Local Variables:
-% tex-output-type: "pdf18"
-% End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/braids.doc.tlpobj new/tlpkg/tlpobj/braids.doc.tlpobj
--- old/tlpkg/tlpobj/braids.doc.tlpobj 2019-02-28 03:23:25.000000000 +0100
+++ new/tlpkg/tlpobj/braids.doc.tlpobj 2020-03-04 23:49:53.000000000 +0100
@@ -1,9 +1,10 @@
name braids.doc
category Package
-revision 23790
+revision 54080
shortdesc doc files of braids
relocated 1
-docfiles size=73
- RELOC/doc/latex/braids/README
- RELOC/doc/latex/braids/braids_doc.pdf
- RELOC/doc/latex/braids/braids_doc.tex
+docfiles size=185
+ RELOC/doc/latex/braids/README.txt
+ RELOC/doc/latex/braids/braids.pdf
+ RELOC/doc/latex/braids/braids.tex
+ RELOC/doc/latex/braids/braids_code.pdf
++++++ braids.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/braids/braids.sty new/tex/latex/braids/braids.sty
--- old/tex/latex/braids/braids.sty 2011-08-27 00:08:04.000000000 +0200
+++ new/tex/latex/braids/braids.sty 2019-05-08 23:15:00.000000000 +0200
@@ -4,21 +4,19 @@
%%
%% The original source files were:
%%
-%% braids.dtx (with options: `package')
+%% braids_code.dtx (with options: `package')
%% ----------------------------------------------------------------
%% braids --- a style file for drawing braid diagrams with TikZ/PGF
-%% E-mail: stacey(a)math.ntnu.no
+%% E-mail: loopspace(a)mathforge.org
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{braids}[2011/05/07 v1.0 Tikz/PGF commands for drawing braid diagrams]
-\def\braid(a)pgfversion{2.10}%
-\ifx\pgfversion\braid@pgfversion
-\else
-\PackageWarning{braids}{This package was designed using PGF2.10; you are using \pgfversion.}%
-\fi
+\ProvidesPackage{braids}[2011/10/18 v1.1 Tikz/PGF commands for drawing braid diagrams]
+\PackageWarning{braids}{%
+ This package has been reimplemented as a TikZ library; if starting with a fresh document, please consider using that instead.%
+}%
\long\def\ge@addto@macro#1#2{%
\begingroup
\toks@\expandafter\expandafter\expandafter{\expandafter#1#2}%
@@ -71,7 +69,14 @@
\ifx\braid@token-
\braid@increase@levelfalse
\else
- \ifx\braid@token[
+ \ifx\braid@token1%
+ \ifbraid@increase@level
+ \stepcounter{braid@level}
+ \fi
+ \braid@increase@leveltrue
+ \ge@addto@macro\braid@label{\braid@token}%
+ \else
+ \ifx\braid@token[%
\let\braid@next=\braid@process@options
\else
\ifx\braid@token\braid@bar
@@ -84,6 +89,12 @@
\ifx\braid@token\egroup
\braid@endscope
\else
+ \ifx\braid@token\braid@olabel@strand
+ \let\braid@next=\braid@olabel@strand
+ \else
+ \ifx\braid@token\braid@clabel@strand
+ \let\braid@next=\braid@clabel@strand
+ \else
\ge@addto@macro\braid@label{\braid@token}%
\fi
\fi
@@ -93,6 +104,9 @@
\fi
\fi
\fi
+ \fi
+ \fi
+ \fi
\braid@next%
}
\def\braid@maybe@locate{%
@@ -140,9 +154,18 @@
\tikzset{#1}%
\braid@process%
}
-\def\braid@sup#1_#2{\g@addto@macro\braid@label{_{#2}^{#1}}\braid@add@crossing{#2}{#1}}
-\def\braid@sub#1{\@ifnextchar^{\braid@@sub{#1}}{\g@addto@macro\braid@label{_{#1}}\braid@add@crossing{#1}{1}}}
-\def\braid@@sub#1^#2{\g@addto@macro\braid@label{_{#1}^{#2}}\braid@add@crossing{#1}{#2}}
+\def\braid@sup#1_#2{%
+ \g@addto@macro\braid@label{_{#2}^{#1}}%
+ \braid@add@crossing{#2}{#1}%
+}
+\def\braid@sub#1{%
+ \@ifnextchar^{\braid@@sub{#1}}%
+ {\g@addto@macro\braid@label{_{#1}}\braid@add@crossing{#1}{1}}%
+}
+\def\braid@@sub#1^#2{%
+ \g@addto@macro\braid@label{_{#1}^{#2}}%
+ \braid@add@crossing{#1}{#2}%
+}
\def\braid@ne{1}
\def\braid@add@crossing#1#2{%
\edef\braid@crossing@type{#2}%
@@ -159,60 +182,197 @@
\braid@ny=\braid@ty
\advance\braid@nx by \braid@width
\advance\braid@ny by \braid@height
+ \advance\braid@ty by \braid@nf\braid@height
+ \advance\braid@ny by -\braid@nf\braid@height
\braid@cy=\braid@ty
\braid@dy=\braid@ny
- \advance\braid@cy by .5\braid@height
- \advance\braid@dy by -.5\braid@height
- \advance\braid@ty by .05\braid@height
- \advance\braid@ny by -.05\braid@height
- \expandafter\let\expandafter\braid@this@path@origin\csname braid@strand@\braid@this@strand @origin\endcsname
+ \advance\braid@cy by \braid@cf\braid@height
+ \advance\braid@dy by -\braid@cf\braid@height
+ \expandafter\let\expandafter\braid@this@path@origin%
+ \csname braid@strand@\braid@this@strand @origin\endcsname
\ifx\braid@this@path@origin\relax
\let\braid@this@path@origin\braid@this@strand
\pgfsyssoftpath@setcurrentpath{\@empty}
\pgfpathmoveto{\pgfpoint{\braid@tx}{0pt}}
\pgfsyssoftpath@getcurrentpath{\braid@this@path}
\else
- \expandafter\let\expandafter\braid@this@path\csname braid@strand@\braid@this@path@origin\endcsname
+ \expandafter\let\expandafter\braid@this@path%
+ \csname braid@strand@\braid@this@path@origin\endcsname
\fi
- \expandafter\let\expandafter\braid@next@path@origin\csname braid@strand@\braid@next@strand @origin\endcsname
+ \expandafter\let\expandafter\braid@next@path@origin%
+ \csname braid@strand@\braid@next@strand @origin\endcsname
\ifx\braid@next@path@origin\relax
\let\braid@next@path@origin\braid@next@strand
\pgfsyssoftpath@setcurrentpath{\@empty}
\pgfpathmoveto{\pgfpoint{\braid@nx}{0pt}}
\pgfsyssoftpath@getcurrentpath{\braid@next@path}
\else
- \expandafter\let\expandafter\braid@next@path\csname braid@strand@\braid@next@path@origin\endcsname
+ \expandafter\let\expandafter\braid@next@path%
+ \csname braid@strand@\braid@next@path@origin\endcsname
\fi
\pgfsyssoftpath@setcurrentpath{\braid@this@path}
\pgfpathlineto{\pgfqpoint{\braid@tx}{\braid@ty}}
+\pgfmathsetmacro{\braid(a)gst}{0.5 - \pgfkeysvalueof{/pgf/braid/gap}}%
+\pgfmathsetmacro{\braid(a)gend}{0.5 + \pgfkeysvalueof{/pgf/braid/gap}}%
\ifx\braid@crossing@type\braid@over@cross
-\pgfpathcurveto{\pgfqpoint{\braid@tx}{\braid@cy}}{\pgfqpoint{\braid@nx}{\braid@dy}}{\pgfqpoint{\braid@nx}{\braid@ny}}
+ \pgfpathcurveto{\pgfqpoint{\braid@tx}{\braid@cy}}%
+ {\pgfqpoint{\braid@nx}{\braid@dy}}%
+ {\pgfqpoint{\braid@nx}{\braid@ny}}
\else
-\pgfpathcurvebetweentimecontinue{0}{.4}{\pgfqpoint{\braid@tx}{\braid@ty}}{\pgfqpoint{\braid@tx}{\braid@cy}}{\pgfqpoint{\braid@nx}{\braid@dy}}{\pgfqpoint{\braid@nx}{\braid@ny}}
-\pgfpathcurvebetweentime{.6}{1}{\pgfqpoint{\braid@tx}{\braid@ty}}{\pgfqpoint{\braid@tx}{\braid@cy}}{\pgfqpoint{\braid@nx}{\braid@dy}}{\pgfqpoint{\braid@nx}{\braid@ny}}
+ \pgfpathcurvebetweentimecontinue{0}{\braid@gst}%
+ {\pgfqpoint{\braid@tx}{\braid@ty}}%
+ {\pgfqpoint{\braid@tx}{\braid@cy}}%
+ {\pgfqpoint{\braid@nx}{\braid@dy}}%
+ {\pgfqpoint{\braid@nx}{\braid@ny}}%
+ \pgfpathcurvebetweentime{\braid@gend}{1}%
+ {\pgfqpoint{\braid@tx}{\braid@ty}}%
+ {\pgfqpoint{\braid@tx}{\braid@cy}}%
+ {\pgfqpoint{\braid@nx}{\braid@dy}}%
+ {\pgfqpoint{\braid@nx}{\braid@ny}}
\fi
\pgfsyssoftpath@getcurrentpath{\braid@this@path}
\pgfsyssoftpath@setcurrentpath{\braid@next@path}
\pgfpathlineto{\pgfqpoint{\braid@nx}{\braid@ty}}
\ifx\braid@crossing@type\braid@over@cross
-\pgfpathcurvebetweentimecontinue{0}{.4}{\pgfqpoint{\braid@nx}{\braid@ty}}{\pgfqpoint{\braid@nx}{\braid@cy}}{\pgfqpoint{\braid@tx}{\braid@dy}}{\pgfqpoint{\braid@tx}{\braid@ny}}
-\pgfpathcurvebetweentime{.6}{1}{\pgfqpoint{\braid@nx}{\braid@ty}}{\pgfqpoint{\braid@nx}{\braid@cy}}{\pgfqpoint{\braid@tx}{\braid@dy}}{\pgfqpoint{\braid@tx}{\braid@ny}}
+ \pgfpathcurvebetweentimecontinue{0}{\braid@gst}%
+ {\pgfqpoint{\braid@nx}{\braid@ty}}%
+ {\pgfqpoint{\braid@nx}{\braid@cy}}%
+ {\pgfqpoint{\braid@tx}{\braid@dy}}%
+ {\pgfqpoint{\braid@tx}{\braid@ny}}
+ \pgfpathcurvebetweentime{\braid@gend}{1}%
+ {\pgfqpoint{\braid@nx}{\braid@ty}}%
+ {\pgfqpoint{\braid@nx}{\braid@cy}}%
+ {\pgfqpoint{\braid@tx}{\braid@dy}}%
+ {\pgfqpoint{\braid@tx}{\braid@ny}}
\else
- \pgfpathcurveto{\pgfqpoint{\braid@nx}{\braid@cy}}{\pgfqpoint{\braid@tx}{\braid@dy}}{\pgfqpoint{\braid@tx}{\braid@ny}}
+ \pgfpathcurveto{\pgfqpoint{\braid@nx}{\braid@cy}}%
+ {\pgfqpoint{\braid@tx}{\braid@dy}}%
+ {\pgfqpoint{\braid@tx}{\braid@ny}}
\fi
\pgfsyssoftpath@getcurrentpath{\braid@next@path}
- \expandafter\let\csname braid@strand@\braid@this@path@origin \endcsname\braid@this@path
- \expandafter\let\csname braid@strand@\braid@next@path@origin \endcsname\braid@next@path
- \expandafter\let\csname braid@strand@\braid@this@strand @origin\endcsname\braid@next@path@origin
- \expandafter\let\csname braid@strand@\braid@next@strand @origin\endcsname\braid@this@path@origin
- \pgfmathparse{\value{braid@strands} < \braid@next@strand ? "\noexpand\setcounter{braid@strands}{\braid@next@strand}" : ""}
+ \expandafter\let%
+ \csname braid@strand@\braid@this@path@origin \endcsname%
+ \braid@this@path
+ \expandafter\let%
+ \csname braid@strand@\braid@next@path@origin \endcsname%
+ \braid@next@path
+ \expandafter\let%
+ \csname braid@strand@\braid@this@strand @origin\endcsname%
+ \braid@next@path@origin
+ \expandafter\let%
+ \csname braid@strand@\braid@next@strand @origin\endcsname%
+ \braid@this@path@origin
+ \pgfmathparse{\value{braid@strands} < \braid@next@strand ?
+ "\noexpand\setcounter{braid@strands}{\braid@next@strand}" : ""}
\pgfmathresult
\braid@process%
}
+\newcommand{\braid@olabel@strand}[3][]{%
+ \edef\braid@tmp{{\the\value{braid@level}}}%
+ \expandafter\ifx\csname braid@strand@#2@origin\endcsname\relax
+ \g@addto@macro\braid@tmp{{#2}}%
+ \else
+ \edef\braid@tmpa{{\csname braid@strand@#2@origin\endcsname}}%
+ \ge@addto@macro\braid@tmp{\braid@tmpa}%
+ \fi
+ \g@addto@macro\braid@tmp{{#3}{#1}}%
+ \ge@addto@macro{\braid@strand@labels}{\braid@tmp}%
+ \braid@process%
+}
+\newcommand{\braid@clabel@strand}[3][]{%
+ \edef\braid@tmp{{\the\value{braid@level}}}%
+ \g@addto@macro\braid@tmp{{#2}{#3}{#1}}%
+ \ge@addto@macro{\braid@strand@labels}{\braid@tmp}%
+ \braid@process%
+}
\def\braid@floors@trim,{}
\def\braid@render@floor{%
\draw (\floorsx,\floorsy) rectangle (\floorex,\floorey);
}
+\def\braid@render@strand@labels#1{%
+ \def\braid@tmp{#1}%
+ \ifx\braid@tmp\pgfutil@empty
+ \let\braid@next=\pgfutil@gobble
+ \else
+ \let\braid@next=\braid@@render@strand@labels
+ \fi
+ \braid@next{#1}%
+}
+\def\braid@@render@strand@labels#1#2#3#4{%
+ \begingroup
+ \pgfscope
+ \let\tikz@options=\pgfutil@empty
+ \let\tikz@mode=\pgfutil@empty
+ \let\tik@transform=\pgfutil@empty
+ \let\tikz@fig@name=\pgfutil@empty
+ \tikzset{/pgf/braid/strand label,#4}%
+ \braid@nx=#2\braid@width
+ \braid@ny=#1\braid@height
+ \advance\braid@ny by \braid@eh
+ \advance\braid@ny by \braid@height
+ \pgftransformshift{\pgfqpoint{\braid@nx}{\braid@ny}}%
+ \tikz@options
+ \setbox\pgfnodeparttextbox=\hbox%
+ \bgroup%
+ \tikzset{every text node part/.try}%
+ \ifx\tikz@textopacity\pgfutil@empty%
+ \else%
+ \pgfsetfillopacity{\tikz@textopacity}%
+ \pgfsetstrokeopacity{\tikz@textopacity}%
+ \fi%
+ \pgfinterruptpicture%
+ \tikz@textfont%
+ \ifx\tikz@text@width\pgfutil@empty%
+ \else%
+ \begingroup%
+ \pgfmathsetlength{\pgf@x}{\tikz@text@width}%
+ \pgfutil@minipage[t]{\pgf@x}\leavevmode\hbox{}%
+ \tikz@text@action%
+ \fi%
+ \tikz@atbegin@node%
+ \bgroup%
+ \aftergroup\unskip%
+ \ifx\tikz@textcolor\pgfutil@empty%
+ \else%
+ \pgfutil@colorlet{.}{\tikz@textcolor}%
+ \fi%
+ \pgfsetcolor{.}%
+ \setbox\tikz@figbox=\box\pgfutil@voidb@x%
+ \tikz@uninstallcommands%
+ \tikz@halign@check%
+ \ignorespaces%
+ #3
+ \egroup
+ \tikz@atend@node%
+ \ifx\tikz@text@width\pgfutil@empty%
+ \else%
+ \pgfutil@endminipage%
+ \endgroup%
+ \fi%
+ \endpgfinterruptpicture%
+ \egroup%
+ \ifx\tikz@text@width\pgfutil@empty%
+ \else%
+ \pgfmathsetlength{\pgf@x}{\tikz@text@width}%
+ \wd\pgfnodeparttextbox=\pgf@x%
+ \fi%
+ \ifx\tikz@text@height\pgfutil@empty%
+ \else%
+ \pgfmathsetlength{\pgf@x}{\tikz@text@height}%
+ \ht\pgfnodeparttextbox=\pgf@x%
+ \fi%
+ \ifx\tikz@text@depth\pgfutil@empty%
+ \else%
+ \pgfmathsetlength{\pgf@x}{\tikz@text@depth}%
+ \dp\pgfnodeparttextbox=\pgf@x%
+ \fi%
+ \pgfmultipartnode{\tikz@shape}{\tikz@anchor}{\tikz@fig@name}{%
+ {\begingroup\tikz@finish}%
+ }%
+ \endpgfscope
+ \endgroup
+ \braid@render@strand@labels%
+}
\def\braid@render{
\ifx\braid@floors\@empty
\else
@@ -237,7 +397,8 @@
\let\tikz@options=\pgfutil@empty
\expandafter\tikzset\expandafter{\braid@floors@style}
\pgfmathtruncatemacro{\braid@ff}{\braid@f+2}
- \expandafter\let\expandafter\braid@floor@style\csname braid@options@floor@\braid@ff\endcsname
+ \expandafter\let\expandafter\braid@floor@style%
+ \csname braid@options@floor@\braid@ff\endcsname
\ifx\braid@floor@style\relax
\else
\expandafter\tikzset\expandafter{\braid@floor@style}%
@@ -257,18 +418,21 @@
\braid@tx=\braid@k\braid@width
\braid@ty=\value{braid@level}\braid@height
\advance\braid@ty by 2\braid@eh
- \expandafter\let\expandafter\braid@path@origin\csname braid@strand@\braid@k @origin\endcsname
+ \expandafter\let\expandafter\braid@path@origin%
+ \csname braid@strand@\braid@k @origin\endcsname
\ifx\braid@path@origin\relax
\pgfsyssoftpath@setcurrentpath{\@empty}
\pgfpathmoveto{\pgfqpoint{\braid@tx}{0pt}}
\let\braid@path@origin\braid@k
\else
- \expandafter\let\expandafter\braid@path\csname braid@strand@\braid@path@origin\endcsname
+ \expandafter\let\expandafter\braid@path%
+ \csname braid@strand@\braid@path@origin\endcsname
\pgfsyssoftpath@setcurrentpath{\braid@path}
\fi
\pgflineto{\pgfqpoint{\braid@tx}{\braid@ty}}
\expandafter\tikzset\expandafter{\braid@style}
- \expandafter\let\expandafter\braid@style\csname braid@options@strand@\braid@path@origin\endcsname
+ \expandafter\let\expandafter\braid@style%
+ \csname braid@options@strand@\braid@path@origin\endcsname
\ifx\braid@style\relax
\else
\expandafter\tikzset\expandafter{\braid@style}
@@ -300,25 +464,40 @@
\braid@ty=.5\braid@ty
\coordinate (\braid@name) at (\braid@tx,\braid@ty);
\fi
+ \ifx\braid@strand@labels\pgfutil@empty
+ \else
+ \expandafter\braid@render@strand@labels\braid@strand@labels{}%
+ \fi
\pgfsys@endscope
\endgroup}
\def\braid@start#1{%
- \pgfsys@beginscope
- \setcounter{braid@level}{-1}%
- \let\braid@label\@empty
- \let\braid@floors\@empty
- \let\braid@name\empty
- \pgfkeys{/pgf/braid/.cd,#1}
- \let\braid@options\tikz@options
+ \pgfsys@beginscope
+ \setcounter{braid@level}{-1}%
+ \let\braid@label\@empty
+ \let\braid@strand@labels\@empty
+ \let\braid@floors\@empty
+ \let\braid@name\empty
+ \let\clabel=\braid@clabel@strand
+ \let\olabel=\braid@olabel@strand
+ \pgfkeys{/pgf/braid/.cd,#1}%
+ \ifbraid@strand@labels@origin
+ \let\label=\braid@olabel@strand
+ \else
+ \let\label=\braid@clabel@strand
+ \fi
+ \let\braid@options\tikz@options
\tikz@transform
- \setcounter{braid@strands}{\pgfkeysvalueof{/pgf/braid/number of strands}}%
- \braid@width=\pgfkeysvalueof{/pgf/braid/width}
- \braid@height=\pgfkeysvalueof{/pgf/braid/height}
- \braid@eh=\pgfkeysvalueof{/pgf/braid/border height}
- \braid@height=-\braid@height
- \braid@eh=-\braid@eh
- \braid@increase@leveltrue
- \braid@process@start
+ \setcounter{braid@strands}{%
+ \pgfkeysvalueof{/pgf/braid/number of strands}}%
+ \braid@width=\pgfkeysvalueof{/pgf/braid/width}%
+ \braid@height=\pgfkeysvalueof{/pgf/braid/height}%
+ \braid@eh=\pgfkeysvalueof{/pgf/braid/border height}%
+ \pgfkeysgetvalue{/pgf/braid/control factor}{\braid@cf}%
+ \pgfkeysgetvalue{/pgf/braid/nudge factor}{\braid@nf}%
+ \braid@height=-\braid@height
+ \braid@eh=-\braid@eh
+ \braid@increase@leveltrue
+ \braid@process@start
}
\newdimen\braid@width
\newdimen\braid@height
@@ -330,6 +509,7 @@
\newdimen\braid@dy
\newdimen\braid@eh
\newif\ifbraid@increase@level
+\newif\ifbraid@strand@labels@origin
\let\braid@style\pgfutil@empty
\let\braid@floors@style\pgfutil@empty
\def\braid@over@cross{1}
@@ -342,7 +522,10 @@
number of strands/.initial=0,
height/.initial=1cm,
width/.initial=1cm,
+ gap/.initial=.1,
border height/.initial=.25cm,
+ control factor/.initial=.5,
+ nudge factor/.initial=.05,
name/.code={%
\def\braid@name{#1}%
},
@@ -357,24 +540,28 @@
\braidset{style each strand/.list={#1}}%
},
style each strand/.code={%
- \expandafter\edef\csname braid@options@strand@#1\endcsname{\braid@temp}%
+ \expandafter\edef%
+ \csname braid@options@strand@#1\endcsname{\braid@temp}%
},
style floors/.code 2 args={%
\def\braid@temp{#2}%
\braidset{style each floor/.list={#1}}%
},
style each floor/.code={%
- \expandafter\edef\csname braid@options@floor@#1\endcsname{\braid@temp}%
+ \expandafter\edef%
+ \csname braid@options@floor@#1\endcsname{\braid@temp}%
},
style all floors/.code={%
\def\braid@floors@style{#1}
- }
+ },
+ strand label/.style={},
+ strand label by origin/.is if=braid@strand@labels@origin,
}
\def\braidset#1{%
\pgfkeys{/pgf/braid/.cd,#1}}
%%
-%% Copyright (C) 2011 by Andrew Stacey <stacey(a)math.ntnu.no>
+%% Copyright (C) 2011-2019 by Andrew Stacey <loopspace(a)mathforge.org>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -392,6 +579,7 @@
%% braids.ins,
%% braids.pdf,
%% braids.sty,
+%% tikzlibrarybraids.code.tex,
%% braids_doc.pdf.
%%
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/braids/tikzlibrarybraids.code.tex new/tex/latex/braids/tikzlibrarybraids.code.tex
--- old/tex/latex/braids/tikzlibrarybraids.code.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/braids/tikzlibrarybraids.code.tex 2019-05-08 23:15:00.000000000 +0200
@@ -0,0 +1,916 @@
+%%
+%% This is file `tikzlibrarybraids.code.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% braids_code.dtx (with options: `library')
+%% ----------------------------------------------------------------
+%% braids --- a style file for drawing braid diagrams with TikZ/PGF
+%% E-mail: loopspace(a)mathforge.org
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
+%%
+\ProvidesFile{tikzlibrarybraids.code.tex}[%
+ 2019/03/20 v2.0 Tikz/PGF library for drawing braid diagrams%
+]
+\RequirePackage{expl3}
+\ExplSyntaxOn
+\tl_new:N \l__braid_tmpa_tl
+\tl_new:N \l__braid_tmpb_tl
+\tl_new:N \l__braid_tmpc_tl
+\tl_new:N \l__braid_tmpd_tl
+\tl_new:N \l__braid_anchor_strand_tl
+\tl_new:N \l__braid_anchor_level_tl
+\fp_new:N \l__braid_height_fp
+\fp_new:N \l__braid_width_fp
+\fp_new:N \l__braid_nudge_fp
+\fp_new:N \l__braid_control_fp
+\fp_new:N \l__braid_ctrlax_fp
+\fp_new:N \l__braid_ctrlay_fp
+\fp_new:N \l__braid_ctrlbx_fp
+\fp_new:N \l__braid_ctrlby_fp
+\fp_new:N \l__braid_endx_fp
+\fp_new:N \l__braid_endy_fp
+\fp_new:N \l__braid_anchor_x_fp
+\fp_new:N \l__braid_anchor_y_fp
+\int_new:N \l__braid_tmpa_int
+\int_new:N \l__braid_length_int
+\int_new:N \l__braid_strands_int
+\int_new:N \l__braid_crossing_int
+\int_new:N \l__braid_anchor_level_int
+\int_new:N \l__braid_floor_int
+\seq_new:N \l__braid_word_seq
+\seq_new:N \l__braid_crossing_seq
+\seq_new:N \l__braid_anchor_seq
+\seq_new:N \l__braid_floors_seq
+\str_new:N \l__braid_tmpa_str
+\str_new:N \l__braid_sup_str
+\str_set:Nn \l__braid_sup_str {^}
+\str_new:N \l__braid_sub_str
+\str_set:Nn \l__braid_sub_str {_}
+\str_new:N \l__braid_hyphen_str
+\str_set:Nn \l__braid_hyphen_str {-}
+\str_new:N \l__braid_bar_str
+\str_set:Nn \l__braid_bar_str {|}
+\str_new:N \l__braid_one_str
+\str_set:Nn \l__braid_one_str {1}
+\bool_new:N \l__braid_step_level_bool
+\bool_new:N \l__braid_swap_crossing_bool
+\bool_new:N \l__braid_floor_bool
+\prop_new:N \l__braid_strands_prop
+\prop_new:N \l__braid_permutation_prop
+\prop_new:N \l__braid_crossing_permutation_prop
+\prop_new:N \l__braid_inverse_prop
+\prop_new:N \l__braid_anchor_prop
+\tikzset{
+ braid/.pic={
+ code={
+ \__braid_parse_word:n {#1}
+ \__braid_count:
+ \__braid_render:
+ }
+ },
+ floor/.pic={
+ code={
+ \path[pic~ actions, draw=none] (0,0) rectangle (1,1);
+ \path[pic~ actions, fill=none] (0,0) -- (1,0) (0,1) -- (1,1);
+ }
+ },
+ /tikz/braid/.search~ also={/tikz},
+ braid/.cd,
+ anchor/.initial=1-s,
+ number~ of~ strands/.initial=0,
+ height/.initial=-1cm,
+ width/.initial=1cm,
+ gap/.initial=.05,
+ border~ height/.initial=.25cm,
+ floor~ border/.initial=.25cm,
+ add~ floor/.code={
+ \seq_push:Nn \l__braid_floors_seq {#1}
+ },
+ control~ factor/.initial=.5,
+ nudge~ factor/.initial=.05
+}
+\cs_new_nopar:Npn \__braid_parse_word:n #1
+{
+ \seq_clear:N \l__braid_word_seq
+ \tl_clear:N \l__braid_tmpa_tl
+ \tl_set:Nn \l__braid_tmpb_tl {#1}
+
+ \bool_until_do:nn { \tl_if_empty_p:N \l__braid_tmpb_tl }
+ {
+ \str_set:Nx \l__braid_tmpa_str {\tl_head:N \l__braid_tmpb_tl}
+ \tl_set:Nx \l__braid_tmpb_tl {\tl_tail:N \l__braid_tmpb_tl}
+ \str_case_e:nnTF {\l__braid_tmpa_str}
+ {
+ {_}
+ {
+ \tl_put_right:Nx \l__braid_tmpa_tl
+ {
+ \exp_not:N \__braid_parse_index:n {\tl_head:N \l__braid_tmpb_tl}
+ }
+ \tl_set:Nx \l__braid_tmpb_tl {\tl_tail:N \l__braid_tmpb_tl}
+ }
+ {^}
+ {
+ \tl_put_left:Nx \l__braid_tmpa_tl
+ {
+ \exp_not:N \__braid_parse_exponent:n {\tl_head:N \l__braid_tmpb_tl}
+ }
+ \tl_set:Nx \l__braid_tmpb_tl {\tl_tail:N \l__braid_tmpb_tl}
+ }
+ {|}
+ {
+ \tl_if_empty:NF \l__braid_tmpa_tl
+ {
+ \seq_put_right:NV \l__braid_word_seq \l__braid_tmpa_tl
+ \tl_clear:N \l__braid_tmpa_tl
+ }
+
+ \tl_set:Nn \l__braid_tmpa_tl {
+ \bool_set_false:N \l__braid_step_level_bool
+ \bool_set_true:N \l__braid_floor_bool
+ }
+ \seq_put_right:NV \l__braid_word_seq \l__braid_tmpa_tl
+ \tl_clear:N \l__braid_tmpa_tl
+ }
+ {-}
+ {
+ \tl_put_right:Nn \l__braid_tmpa_tl
+ {
+ \bool_set_false:N \l__braid_step_level_bool
+ }
+ }
+ {1}
+ {
+ \tl_if_empty:NF \l__braid_tmpa_tl
+ {
+ \seq_put_right:NV \l__braid_word_seq \l__braid_tmpa_tl
+ \tl_clear:N \l__braid_tmpa_tl
+ }
+ \tl_put_right:Nn \l__braid_tmpa_tl {\__braid_do_identity:}
+ }
+ {~}
+ {
+ }
+ }
+ {
+ }
+ {
+ \tl_if_empty:NF \l__braid_tmpa_tl
+ {
+ \seq_put_right:NV \l__braid_word_seq \l__braid_tmpa_tl
+ \tl_clear:N \l__braid_tmpa_tl
+ }
+ }
+ }
+ \tl_if_empty:NF \l__braid_tmpa_tl
+ {
+ \seq_put_right:NV \l__braid_word_seq \l__braid_tmpa_tl
+ \tl_clear:N \l__braid_tmpa_tl
+ }
+}
+\cs_new_nopar:Npn \__braid_parse_index:n #1
+{
+ \seq_set_from_clist:Nn \l__braid_crossing_seq {#1}
+ \int_compare:nT {\seq_count:N \l__braid_crossing_seq == 1}
+ {
+ \seq_put_right:Nx \l__braid_crossing_seq {\int_eval:n {#1 + 1} }
+ }
+ \bool_if:NT \l__braid_swap_crossing_bool
+ {
+ \seq_pop_left:NN \l__braid_crossing_seq \l__braid_tmpa_tl
+ \seq_put_right:NV \l__braid_crossing_seq \l__braid_tmpa_tl
+ }
+}
+\cs_new_nopar:Npn \__braid_parse_exponent:n #1
+{
+ \int_compare:nTF {#1 == -1}
+ {
+ \bool_set_true:N \l__braid_swap_crossing_bool
+ }
+ {
+ \bool_set_false:N \l__braid_swap_crossing_bool
+ }
+}
+\cs_new_nopar:Npn \__braid_do_identity:
+{
+}
+\cs_new_nopar:Npn \__braid_count:
+{
+ \int_zero:N \l__braid_length_int
+ \int_set:Nn \l__braid_strands_int {\__braid_value:n {number~of~strands}}
+ \prop_clear:N \l__braid_permutation_prop
+ \prop_clear:N \l__braid_crossing_permutation_prop
+ \prop_clear:N \l__braid_anchor_prop
+ \prop_clear:N \l__braid_inverse_prop
+
+ \seq_map_inline:Nn \l__braid_word_seq
+ {
+ \seq_clear:N \l__braid_crossing_seq
+ \bool_set_true:N \l__braid_step_level_bool
+ \bool_set_false:N \l__braid_swap_crossing_bool
+ ##1
+ \bool_if:NT \l__braid_step_level_bool
+ {
+ \int_incr:N \l__braid_length_int
+ }
+ \seq_if_empty:NF \l__braid_crossing_seq
+ {
+ \int_set:Nn \l__braid_strands_int
+ {
+ \int_max:nn
+ {
+ \int_max:nn {\l__braid_strands_int}
+ { \seq_item:Nn \l__braid_crossing_seq {1}}
+ }
+ {
+ \seq_item:Nn \l__braid_crossing_seq {2}
+ }
+ }
+ }
+ }
+ \int_step_inline:nnnn {1} {1} {\l__braid_strands_int}
+ {
+ \prop_put:Nnn \l__braid_permutation_prop {##1} {##1}
+ \prop_put:Nnn \l__braid_anchor_prop {##1} {##1}
+ \prop_put:Nnn \l__braid_crossing_permutation_prop {##1} {##1}
+ }
+ \tl_set:Nx \l__braid_tmpa_tl {\__braid_value:n {anchor}}
+ \seq_set_split:NnV \l__braid_anchor_seq {-} \l__braid_tmpa_tl
+
+ \tl_set:Nx \l__braid_tmpa_tl {\seq_item:Nn \l__braid_anchor_seq {1}}
+ \tl_if_eq:VnTF \l__braid_tmpa_tl {rev}
+ {
+ \tl_set:Nx \l__braid_anchor_strand_tl {\seq_item:Nn \l__braid_anchor_seq {2}}
+ \tl_set:Nx \l__braid_anchor_level_tl {\seq_item:Nn \l__braid_anchor_seq {3}}
+ }
+ {
+ \tl_set:Nx \l__braid_anchor_strand_tl {\seq_item:Nn \l__braid_anchor_seq {1}}
+ \tl_set:Nx \l__braid_anchor_level_tl {\seq_item:Nn \l__braid_anchor_seq {2}}
+ }
+ \tl_if_eq:VnTF \l__braid_anchor_level_tl {s}
+ {
+ \int_set:Nn \l__braid_anchor_level_int {-1}
+ }
+ {
+ \tl_if_eq:VnTF \l__braid_anchor_level_tl {e}
+ {
+ \int_set:Nn \l__braid_anchor_level_int {-1}
+ }
+ {
+ \int_set:Nn \l__braid_anchor_level_int
+ {\tl_use:N \l__braid_anchor_level_tl}
+ }
+ }
+
+ \int_zero:N \l__braid_crossing_int
+ \int_incr:N \l__braid_crossing_int
+ \seq_map_inline:Nn \l__braid_word_seq
+ {
+ \bool_set_true:N \l__braid_step_level_bool
+ \seq_clear:N \l__braid_crossing_seq
+ \bool_set_false:N \l__braid_swap_crossing_bool
+ ##1
+ \seq_if_empty:NF \l__braid_crossing_seq
+ {
+ \prop_get:NxN \l__braid_permutation_prop
+ {
+ \seq_item:Nn \l__braid_crossing_seq {1}
+ } \l__braid_tmpa_tl
+ \prop_get:NxN \l__braid_permutation_prop
+ {
+ \seq_item:Nn \l__braid_crossing_seq {2}
+ } \l__braid_tmpb_tl
+
+ \prop_put:NxV \l__braid_permutation_prop
+ {
+ \seq_item:Nn \l__braid_crossing_seq {2}
+ } \l__braid_tmpa_tl
+ \prop_put:NxV \l__braid_permutation_prop
+ {
+ \seq_item:Nn \l__braid_crossing_seq {1}
+ } \l__braid_tmpb_tl
+ }
+ \int_compare:nT {\l__braid_crossing_int = \l__braid_anchor_level_int}
+ {
+ \prop_set_eq:NN \l__braid_anchor_prop \l__braid_permutation_prop
+ }
+ \bool_if:NT \l__braid_step_level_bool
+ {
+ \int_incr:N \l__braid_crossing_int
+ }
+ }
+ \int_step_inline:nnnn {1} {1} {\l__braid_strands_int}
+ {
+ \prop_get:NnN \l__braid_anchor_prop {##1} \l__braid_tmpa_tl
+ \prop_put:NVn \l__braid_inverse_prop \l__braid_tmpa_tl {##1}
+ }
+ \prop_set_eq:NN \l__braid_anchor_prop \l__braid_inverse_prop
+ \int_step_inline:nnnn {1} {1} {\l__braid_strands_int}
+ {
+ \prop_get:NnN \l__braid_permutation_prop {##1} \l__braid_tmpa_tl
+ \prop_put:NVn \l__braid_inverse_prop \l__braid_tmpa_tl {##1}
+ }
+ \tl_set:Nx \l__braid_tmpa_tl {\seq_item:Nn \l__braid_anchor_seq {1}}
+ \tl_if_eq:VnT \l__braid_tmpa_tl {rev}
+ {
+ \prop_get:NVN \l__braid_permutation_prop
+ \l__braid_anchor_strand_tl \l__braid_anchor_strand_tl
+ }
+ \tl_if_eq:VnF \l__braid_anchor_level_tl {s}
+ {
+ \tl_if_eq:VnTF \l__braid_anchor_level_tl {e}
+ {
+ \prop_get:NVN \l__braid_inverse_prop
+ \l__braid_anchor_strand_tl \l__braid_anchor_strand_tl
+ }
+ {
+ \prop_get:NVN \l__braid_anchor_prop
+ \l__braid_anchor_strand_tl \l__braid_anchor_strand_tl
+ }
+ }
+}
+\cs_new_nopar:Npn \__braid_dim_value:n #1
+{
+ \dim_to_fp:n {\pgfkeysvalueof{/tikz/braid/#1}}
+}
+\cs_new_nopar:Npn \__braid_value:n #1
+{
+ \pgfkeysvalueof{/tikz/braid/#1}
+}
+\cs_generate_variant:Nn \prop_get:NnN {NxN}
+\cs_generate_variant:Nn \prop_put:Nnn {NxV}
+\cs_generate_variant:Nn \tl_if_eq:nnTF {VnTF}
+\cs_generate_variant:Nn \tl_if_eq:nnF {VnF}
+\cs_generate_variant:Nn \tl_if_eq:nnT {VnT}
+
+\cs_new_nopar:Npn \__braid_render:
+{
+ \fp_set:Nn \l__braid_anchor_x_fp { - 1 * (\tl_use:N \l__braid_anchor_strand_tl - 1) * \__braid_dim_value:n {width} }
+
+ \tl_if_eq:VnTF \l__braid_anchor_level_tl {s}
+ {
+ \fp_set:Nn \l__braid_anchor_y_fp {0}
+ }
+ {
+ \tl_if_eq:VnTF \l__braid_anchor_level_tl {e}
+ {
+ \fp_set:Nn \l__braid_anchor_y_fp {
+ -1 * \l__braid_length_int * \__braid_dim_value:n {height}
+ - sign(\__braid_dim_value:n {height})
+ * 2 * \__braid_dim_value:n {border~ height}
+ }
+ }
+ {
+ \fp_set:Nn \l__braid_anchor_y_fp {
+ -1 * \l__braid_anchor_level_tl * \__braid_dim_value:n {height}
+ - sign(\__braid_dim_value:n {height})
+ * \__braid_dim_value:n {border~ height}
+ }
+ }
+ }
+
+ \begin{scope}[
+ shift={
+ (\fp_to_decimal:N \l__braid_anchor_x_fp pt,
+ \fp_to_decimal:N \l__braid_anchor_y_fp pt
+ )
+ }
+ ]
+ \prop_clear:N \l__braid_strands_prop
+ \fp_zero:N \l__braid_height_fp
+ \fp_zero:N \l__braid_nudge_fp
+ \fp_zero:N \l__braid_control_fp
+ \fp_set:Nn \l__braid_height_fp
+ {
+ sign(\__braid_dim_value:n {height})
+ * \__braid_dim_value:n {border~ height}
+ }
+ \fp_set:Nn \l__braid_width_fp
+ {
+ (\l__braid_strands_int - 1) * \__braid_dim_value:n {width}
+ + 2 * sign(\__braid_dim_value:n{width})
+ * \__braid_dim_value:n {floor~ border}
+ }
+ \fp_set:Nn \l__braid_nudge_fp
+ {
+ \__braid_value:n {nudge~ factor} * \__braid_dim_value:n {height}
+ }
+ \fp_set:Nn \l__braid_control_fp
+ {
+ \__braid_value:n {control~ factor} * \__braid_dim_value:n {height}
+ }
+ \fp_sub:Nn \l__braid_control_fp {\l__braid_nudge_fp}
+ \int_step_inline:nnnn {1} {1} {\l__braid_strands_int}
+ {
+ \prop_get:NnN \l__braid_inverse_prop {##1} \l__braid_tmpa_tl
+ \prop_put:Nnx \l__braid_strands_prop {##1}
+ {
+ \exp_not:N \draw[
+ braid/every~ strand/.try,
+ braid/strand~ ##1/.try
+ ]
+ \exp_not:N \__braid_moveto:nn {
+ \fp_eval:n {(##1 - 1) * \__braid_dim_value:n {width} }
+ } {0}
+ \exp_not:N \__braid_lineto:nn {
+ \fp_eval:n {(##1 - 1) * \__braid_dim_value:n {width} }
+ } { \fp_to_decimal:N \l__braid_height_fp}
+ }
+ \__braid_coordinate:xxxx {-##1-s} {-rev-\l__braid_tmpa_tl-s}
+ {\fp_eval:n {(##1 - 1) * \__braid_dim_value:n {width} }} {0}
+
+ \__braid_coordinate:xxxx {-##1-0} {-rev-\l__braid_tmpa_tl-0}
+ {\fp_eval:n {(##1 - 1) * \__braid_dim_value:n {width} }}
+ { \fp_to_decimal:N \l__braid_height_fp}
+ }
+ \seq_map_inline:Nn \l__braid_floors_seq
+ {
+ \tl_set:Nx \l__braid_tmpa_tl {\clist_item:nn {##1} {5}}
+ \__braid_do_floor:Vxxxx \l__braid_tmpa_tl
+ {\fp_eval:n
+ {
+ -1*sign(\__braid_dim_value:n{width})
+ * \__braid_dim_value:n {floor~ border}
+ + (\__braid_dim_value:n {width}) * (\clist_item:nn {##1} {1} - 1)
+ }
+ pt
+ }
+ {\fp_eval:n
+ {
+ \l__braid_height_fp + ( \__braid_dim_value:n {height} ) * (\clist_item:nn {##1} {2})
+ }
+ pt
+ }
+ {\fp_eval:n {
+ ( (\clist_item:nn {##1} {3}) * \__braid_dim_value:n {width}
+ + 2 * sign(\__braid_dim_value:n{width})
+ * \__braid_dim_value:n {floor~ border} ) / \dim_to_fp:n {1cm}
+ }
+ }
+ {\fp_eval:n {
+ (\clist_item:nn {##1} {4}) * ( \__braid_dim_value:n {height} ) / \dim_to_fp:n {1cm}
+ }
+ }
+ }
+ \int_zero:N \l__braid_crossing_int
+ \int_incr:N \l__braid_crossing_int
+
+ \seq_map_inline:Nn \l__braid_word_seq
+ {
+ \seq_clear:N \l__braid_crossing_seq
+ \bool_set_true:N \l__braid_step_level_bool
+ \bool_set_false:N \l__braid_floor_bool
+ \bool_set_false:N \l__braid_swap_crossing_bool
+ ##1
+ \bool_if:NT \l__braid_floor_bool
+ {
+ \__braid_do_floor:Vxxxx \l__braid_crossing_int
+ {\fp_eval:n
+ {
+ -1*sign(\__braid_dim_value:n{width})
+ * \__braid_dim_value:n {floor~ border}
+ }
+ pt
+ }
+ {\fp_to_decimal:N \l__braid_height_fp pt}
+ {\fp_eval:n { \l__braid_width_fp / \dim_to_fp:n {1cm} }}
+ {\fp_eval:n { ( \__braid_dim_value:n {height} ) / \dim_to_fp:n {1cm}}}
+ }
+ \seq_if_empty:NF \l__braid_crossing_seq
+ {
+ \prop_get:NxN \l__braid_crossing_permutation_prop
+ {\seq_item:Nn \l__braid_crossing_seq {1}} \l__braid_tmpa_tl
+ \prop_get:NxN \l__braid_crossing_permutation_prop
+ {\seq_item:Nn \l__braid_crossing_seq {2}} \l__braid_tmpb_tl
+
+ \prop_put:NxV \l__braid_crossing_permutation_prop
+ {\seq_item:Nn \l__braid_crossing_seq {2}} \l__braid_tmpa_tl
+ \prop_put:NxV \l__braid_crossing_permutation_prop
+ {\seq_item:Nn \l__braid_crossing_seq {1}} \l__braid_tmpb_tl
+ \prop_get:NxN \l__braid_strands_prop
+ {\seq_item:Nn \l__braid_crossing_seq {1}} \l__braid_tmpa_tl
+ \prop_get:NxN \l__braid_strands_prop
+ {\seq_item:Nn \l__braid_crossing_seq {2}} \l__braid_tmpb_tl
+ \tl_put_right:Nx \l__braid_tmpa_tl
+ {
+ \exp_not:N \__braid_lineto:nn
+
+ {\fp_eval:n
+ {
+ (\seq_item:Nn \l__braid_crossing_seq {1} - 1)
+ * \__braid_dim_value:n {width}
+ }
+ }
+ {\fp_eval:n { \l__braid_height_fp + \l__braid_nudge_fp } }
+
+ \exp_not:N \__braid_curveto:nnnnnn
+
+ {0}
+ {\fp_eval:n { \l__braid_control_fp}}
+
+ {0}
+ {\fp_eval:n {- \l__braid_control_fp}}
+
+ {\fp_eval:n
+ {
+ (\seq_item:Nn \l__braid_crossing_seq {2} - 1)
+ * \__braid_dim_value:n {width}
+ }
+ }
+ {\fp_eval:n
+ {
+ \l__braid_height_fp
+ + \__braid_dim_value:n {height}
+ - \l__braid_nudge_fp
+ }
+ }
+ }
+ \tl_put_right:Nx \l__braid_tmpb_tl
+ {
+ \exp_not:N \__braid_lineto:nn
+
+ {\fp_eval:n
+ {
+ (\seq_item:Nn \l__braid_crossing_seq {2} - 1)
+ * \__braid_dim_value:n {width}
+ }
+ }
+ {\fp_eval:n { \l__braid_height_fp + \l__braid_nudge_fp } }
+
+ \exp_not:N \__braid_curveto:nnnnnn
+
+ {0}
+ {
+ \fp_eval:n {
+ \l__braid_control_fp * (.5 - \__braid_value:n {gap} )
+ }
+ }
+
+ {
+ \fp_eval:n {
+ - (.5 - \__braid_value:n {gap} ) / 3 *
+ \__braid_bezier_tangent:nnnnn
+ {.5 - \__braid_value:n {gap} }
+ {0}
+ {0}
+ {
+ (\seq_item:Nn \l__braid_crossing_seq {1}
+ - \seq_item:Nn \l__braid_crossing_seq {2})
+ * \__braid_dim_value:n {width}
+ }
+ {
+ (\seq_item:Nn \l__braid_crossing_seq {1}
+ - \seq_item:Nn \l__braid_crossing_seq {2})
+ * \__braid_dim_value:n {width}
+ }
+ }
+ }
+ {
+ \fp_eval:n {
+ -(.5 - \__braid_value:n {gap} ) / 3 *
+ \__braid_bezier_tangent:nnnnn
+ {.5 - \__braid_value:n {gap} }
+ {0}
+ {\l__braid_control_fp}
+ {
+ \__braid_dim_value:n {height}
+ - 2* \l__braid_nudge_fp
+ - \l__braid_control_fp
+ }
+ {\__braid_dim_value:n {height} - 2* \l__braid_nudge_fp}
+ }
+ }
+
+ {
+ \fp_eval:n {
+ (\seq_item:Nn \l__braid_crossing_seq {2} - 1)
+ * \__braid_dim_value:n {width} +
+ \__braid_bezier_point:nnnnn
+ {.5 - \__braid_value:n {gap} }
+ {0}
+ {0}
+ {
+ (\seq_item:Nn \l__braid_crossing_seq {1}
+ - \seq_item:Nn \l__braid_crossing_seq {2})
+ * \__braid_dim_value:n {width}
+ }
+ {
+ (\seq_item:Nn \l__braid_crossing_seq {1}
+ - \seq_item:Nn \l__braid_crossing_seq {2})
+ * \__braid_dim_value:n {width}
+ }
+ }
+ }
+ {
+ \fp_eval:n {
+ \l__braid_height_fp + \l__braid_nudge_fp +
+ \__braid_bezier_point:nnnnn
+ {.5 - \__braid_value:n {gap} }
+ {0}
+ {\l__braid_control_fp}
+ {
+ \__braid_dim_value:n {height}
+ - 2* \l__braid_nudge_fp
+ - \l__braid_control_fp
+ }
+ {\__braid_dim_value:n {height} - 2* \l__braid_nudge_fp}
+ }
+ }
+
+ \exp_not:N \__braid_moveto:nn
+ {
+ \fp_eval:n {
+ (\seq_item:Nn \l__braid_crossing_seq {2} - 1)
+ * \__braid_dim_value:n {width} +
+ \__braid_bezier_point:nnnnn
+ {.5 + \__braid_value:n {gap} }
+ {0}
+ {0}
+ {
+ (\seq_item:Nn \l__braid_crossing_seq {1}
+ - \seq_item:Nn \l__braid_crossing_seq {2})
+ * \__braid_dim_value:n {width}
+ }
+ {
+ (\seq_item:Nn \l__braid_crossing_seq {1}
+ - \seq_item:Nn \l__braid_crossing_seq {2})
+ * \__braid_dim_value:n {width}
+ }
+ }
+ }
+ {
+ \fp_eval:n {
+ \l__braid_height_fp + \l__braid_nudge_fp +
+ \__braid_bezier_point:nnnnn
+ {.5 + \__braid_value:n {gap} }
+ {0}
+ {\l__braid_control_fp}
+ {
+ \__braid_dim_value:n {height} - 2* \l__braid_nudge_fp
+ - \l__braid_control_fp
+ }
+ {\__braid_dim_value:n {height} - 2* \l__braid_nudge_fp}
+ }
+ }
+
+ \exp_not:N \__braid_curveto:nnnnnn
+
+ {
+ \fp_eval:n {
+ (.5 - \__braid_value:n {gap} ) / 3 *
+ \__braid_bezier_tangent:nnnnn
+ {.5 + \__braid_value:n {gap} }
+ {0}
+ {0}
+ {
+ (\seq_item:Nn \l__braid_crossing_seq {1}
+ - \seq_item:Nn \l__braid_crossing_seq {2})
+ * \__braid_dim_value:n {width}
+ }
+ {
+ (\seq_item:Nn \l__braid_crossing_seq {1}
+ - \seq_item:Nn \l__braid_crossing_seq {2})
+ * \__braid_dim_value:n {width}
+ }
+ }
+ }
+ {
+ \fp_eval:n {
+ (.5 - \__braid_value:n {gap} ) / 3 *
+ \__braid_bezier_tangent:nnnnn
+ {.5 + \__braid_value:n {gap} }
+ {0}
+ {\l__braid_control_fp}
+ {
+ \__braid_dim_value:n {height} - 2* \l__braid_nudge_fp
+ - \l__braid_control_fp
+ }
+ {\__braid_dim_value:n {height} - 2* \l__braid_nudge_fp}
+ }
+ }
+
+ {0}
+ { \fp_eval:n {
+ -\l__braid_control_fp * (.5 - \__braid_value:n {gap} )
+ }
+ }
+
+ {\fp_eval:n
+ {
+ (\seq_item:Nn \l__braid_crossing_seq {1} - 1)
+ * \__braid_dim_value:n {width}
+ }
+ }
+ {\fp_eval:n
+ {
+ \l__braid_height_fp + \__braid_dim_value:n {height}
+ - \l__braid_nudge_fp
+ }
+ }
+
+ }
+ \prop_put:NxV \l__braid_strands_prop
+ {\seq_item:Nn \l__braid_crossing_seq {2}} \l__braid_tmpa_tl
+ \prop_put:NxV \l__braid_strands_prop
+ {\seq_item:Nn \l__braid_crossing_seq {1}} \l__braid_tmpb_tl
+ \int_compare:nT
+ {
+ \int_max:nn
+ {
+ \seq_item:Nn \l__braid_crossing_seq {1}
+ }
+ {
+ \seq_item:Nn \l__braid_crossing_seq {2}
+ }
+ -
+ \int_min:nn
+ {
+ \seq_item:Nn \l__braid_crossing_seq {1}
+ }
+ {
+ \seq_item:Nn \l__braid_crossing_seq {2}
+ }
+ > 1
+ }
+ {
+ \int_step_inline:nnnn
+ {
+ \int_min:nn
+ {
+ \seq_item:Nn \l__braid_crossing_seq {1}
+ }
+ {
+ \seq_item:Nn \l__braid_crossing_seq {2}
+ }
+ + 1}
+ {1}
+ {
+ \int_max:nn
+ {
+ \seq_item:Nn \l__braid_crossing_seq {1}
+ }
+ {
+ \seq_item:Nn \l__braid_crossing_seq {2}
+ }
+ - 1
+ }
+ {
+
+ \prop_get:NnN \l__braid_strands_prop {####1} \l__braid_tmpa_tl
+ \tl_put_right:Nx \l__braid_tmpa_tl
+ {
+ \exp_not:N \__braid_lineto:nn
+ {\fp_eval:n {(####1 - 1) * \__braid_dim_value:n {width} }}
+ {\fp_eval:n
+ {
+ \l__braid_height_fp + \l__braid_nudge_fp
+ + .5 * \l__braid_control_fp
+ }
+ }
+ \exp_not:N \__braid_moveto:nn
+ {\fp_eval:n {(####1 - 1) * \__braid_dim_value:n {width} }}
+ {\fp_eval:n
+ {
+ \l__braid_height_fp + \__braid_dim_value:n {height}
+ - \l__braid_nudge_fp - .5 * \l__braid_control_fp
+ }
+ }
+ }
+
+ \prop_put:NnV \l__braid_strands_prop {####1} \l__braid_tmpa_tl
+ }
+ }
+ }
+ \bool_if:NT \l__braid_step_level_bool
+ {
+ \fp_add:Nn \l__braid_height_fp { \__braid_dim_value:n {height} }
+
+ \int_step_inline:nnnn {1} {1} {\l__braid_strands_int}
+ {
+ \prop_get:NnN \l__braid_crossing_permutation_prop
+ {####1} \l__braid_tmpb_tl
+ \prop_get:NVN \l__braid_inverse_prop
+ \l__braid_tmpb_tl \l__braid_tmpa_tl
+
+ \__braid_coordinate:xxxx
+ {-\l__braid_tmpb_tl-\int_use:N \l__braid_crossing_int}
+ {-rev-\l__braid_tmpa_tl-\int_use:N \l__braid_crossing_int }
+ {\fp_eval:n { (####1 - 1) * \__braid_dim_value:n {width} }}
+ {\fp_to_decimal:N \l__braid_height_fp}
+ }
+
+ \int_incr:N \l__braid_crossing_int
+ }
+ }
+
+ \fp_add:Nn \l__braid_height_fp
+ {
+ sign(\__braid_dim_value:n {height})
+ * \__braid_dim_value:n {border~ height}
+ }
+ \int_step_inline:nnnn {1} {1} {\l__braid_strands_int}
+ {
+ \prop_get:NxN \l__braid_strands_prop {##1} \l__braid_tmpa_tl
+ \prop_get:NxN \l__braid_permutation_prop {##1} \l__braid_tmpb_tl
+
+ \tl_put_right:Nx \l__braid_tmpa_tl {
+ \exp_not:N \__braid_lineto:nn
+ {\fp_eval:n { (##1 - 1) * \__braid_dim_value:n {width} }}
+ {\fp_to_decimal:N \l__braid_height_fp}
+ coordinate (-rev-##1-e)
+ coordinate (-\l__braid_tmpb_tl-e)
+ ;
+ }
+
+ \prop_put:NnV \l__braid_strands_prop {##1} \l__braid_tmpa_tl
+ }
+ \int_step_inline:nnnn {1} {1} {\l__braid_strands_int}
+ {
+ \prop_get:NnN \l__braid_strands_prop {##1} \l__braid_tmpa_tl
+ \tl_use:N \l__braid_tmpa_tl
+ }
+ \end{scope}
+}
+\cs_new_nopar:Npn \__braid_moveto:nn #1#2
+{
+ (#1 pt, #2 pt)
+}
+\cs_new_nopar:Npn \__braid_lineto:nn #1#2
+{
+ -- (#1 pt, #2 pt)
+}
+\cs_new_nopar:Npn \__braid_curveto:nnnnnn #1#2#3#4#5#6
+{
+ .. controls +(#1 pt, #2 pt) and +(#3 pt, #4 pt)
+ .. (#5 pt, #6 pt)
+}
+\cs_new_nopar:Npn \__braid_coordinate:nnnn #1#2#3#4
+{
+ \coordinate[alias=#2] (#1) at (#3 pt,#4 pt);
+}
+\cs_generate_variant:Nn \__braid_coordinate:nnnn {xxxx}
+\cs_new_nopar:Npn \__braid_bezier_point:nnnnn #1#2#3#4#5
+{
+ \fp_eval:n
+ {
+ (1 - (#1)) * (1 - (#1)) * (1 - (#1)) * (#2)
+ +
+ 3 * (1 - (#1)) * (1 - (#1)) * (#1) * (#3)
+ +
+ 3 * (1 - (#1)) * (#1) * (#1) * (#4)
+ +
+ (#1) * (#1) * (#1) * (#5)
+ }
+}
+\cs_new_nopar:Npn \__braid_bezier_tangent:nnnnn #1#2#3#4#5
+{
+ \fp_eval:n
+ {
+ 3 * (1 - (#1)) * (1 - (#1)) * (#3 - (#2))
+ +
+ 6 * (1 - (#1)) * (#1) * (#4 - (#3))
+ +
+ 3 * (#1) * (#1) * (#5 - (#4))
+ }
+}
+\cs_new_nopar:Npn \__braid_do_floor:nnnnn #1#2#3#4#5
+{
+ \pic[pic~ type=floor,
+ xscale=#4,
+ yscale=#5,
+ at={(#2,#3)},
+ braid/every~ floor/.try,
+ braid/floor~#1/.try,
+ ];
+}
+\cs_generate_variant:Nn \__braid_do_floor:nnnnn {Vxxxx}
+\ExplSyntaxOff
+
+%%
+%% Copyright (C) 2011-2019 by Andrew Stacey <loopspace(a)mathforge.org>
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License (LPPL), either
+%% version 1.3c of this license or (at your option) any later
+%% version. The latest version of this license is in the file:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% This work is "maintained" (as per LPPL maintenance status) by
+%% Andrew Stacey.
+%%
+%% This work consists of the files braids.dtx
+%% braids_doc.tex
+%% and the derived files README.txt,
+%% braids.ins,
+%% braids.pdf,
+%% braids.sty,
+%% tikzlibrarybraids.code.tex,
+%% braids_doc.pdf.
+%%
+%%
+%% End of file `tikzlibrarybraids.code.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/braids.tlpobj new/tlpkg/tlpobj/braids.tlpobj
--- old/tlpkg/tlpobj/braids.tlpobj 2019-02-28 03:23:25.000000000 +0100
+++ new/tlpkg/tlpobj/braids.tlpobj 2020-03-04 23:49:53.000000000 +0100
@@ -1,16 +1,19 @@
name braids
category Package
-revision 23790
+revision 54080
shortdesc Draw braid diagrams with PGF/TikZ
relocated 1
longdesc The package enables drawing of braid diagrams with PGF/TikZ
longdesc using a simple syntax. The braid itself is specified by giving
longdesc a word in the braid group, and there are many options for
longdesc styling the strands and for drawing "floors".
-runfiles size=4
+runfiles size=12
RELOC/tex/latex/braids/braids.sty
+ RELOC/tex/latex/braids/tikzlibrarybraids.code.tex
+catalogue-contact-bugs https://github.com/loopspace/braids/issues
+catalogue-contact-home https://github.com/loopspace/braids
+catalogue-contact-repository https://github.com/loopspace/braids
catalogue-ctan /graphics/pgf/contrib/braids
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl1.3
-catalogue-topics maths diagram
-catalogue-version 1.0
+catalogue-license lppl1.3c
+catalogue-topics maths graphics diagram pgf-tikz
+catalogue-version 2.0
++++++ brandeis-dissertation.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/brandeis-dissertation/README new/doc/latex/brandeis-dissertation/README
--- old/doc/latex/brandeis-dissertation/README 2013-11-04 00:41:39.000000000 +0100
+++ new/doc/latex/brandeis-dissertation/README 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-Brandeis-dissertation class provides the formatting for a Ph.D dissertation at Brandeis University specified by the Graduate School of Arts and Sciences. It also generates the title, abstract, and signature pages.
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/brandeis-dissertation/README.txt new/doc/latex/brandeis-dissertation/README.txt
--- old/doc/latex/brandeis-dissertation/README.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/brandeis-dissertation/README.txt 2020-02-09 23:06:45.000000000 +0100
@@ -0,0 +1,6 @@
+brandeis-dissertation
+
+brandeis-dissertation.cls provides the structures and formatting information for an
+PhD dissertation for Brandeis University. To generate the documentation, run
+LaTeX on brandeis-dissertation.dtx. To generate the .cls file, run LaTeX on
+brandeis-dissertation.ins. This material is subject to the LATEX Project Public License 1.3c.
\ No newline at end of file
Binary files old/doc/latex/brandeis-dissertation/brandeis-dissertation.pdf and new/doc/latex/brandeis-dissertation/brandeis-dissertation.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/brandeis-dissertation/brandeis-dissertation.tex new/doc/latex/brandeis-dissertation/brandeis-dissertation.tex
--- old/doc/latex/brandeis-dissertation/brandeis-dissertation.tex 2013-10-18 00:46:55.000000000 +0200
+++ new/doc/latex/brandeis-dissertation/brandeis-dissertation.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,65 +0,0 @@
-%%
-%% This is file `brandeis-dissertation.tex',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% brandeis-dissertation.dtx (with options: `driver')
-%%
-%% IMPORTANT NOTICE:
-%%
-%% For the copyright see the source file.
-%%
-%% Any modified versions of this file must be renamed
-%% with new filenames distinct from brandeis-dissertation.tex.
-%%
-%% For distribution of the original source see the terms
-%% for copying and modification in the file brandeis-dissertation.dtx.
-%%
-%% This generated file may be distributed as long as the
-%% original source files, as listed above, are part of the
-%% same distribution. (The sources need not necessarily be
-%% in the same archive or directory.)
-%% \RCS$Id: brandeis-dissertation.dtx,v 2.0 2004/10/27 00:47:04 turtle Exp $
-%% \RCS$Revision: 2.0 $
-%% \RCS$Date: 2013/10/17 00:47:04 $
-%%
-%% (C) 2000 Andy Garland (aeg(a)cs.brandeis.edu)
-%% (C) 2001 Pablo Funes (pablo(a)cs.brandeis.edu)
-%% (C) 2004 Peter M�ller Neergaard
-%% (C) 2013 Meg Peck and John Burt
-%%
-%% This program may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.2
-%% 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.2 or later is part of all distributions of LaTeX
-%% version 1999/12/01 or later.
-\documentclass{ltxdoc}
-\usepackage{url}
-\usepackage{alltt}
- \OnlyDescription % Comment this line out for full documentation
- % \EnableCrossrefs % Uncomment for full documentation
- % \RecordChanges
- \typeout{Expect some Under- and overfull boxes}
-\makeatletter
-\def\RCS$#1: #2 ${\@namedef{RCS#1}{#2}}
-\let\bd@saved@cmd\cmd
-\renewcommand{\cmd}{\bgroup\makeatletter\bd@cmd@i}
-\newcommand{\bd@cmd@i}[1]{\bd@saved@cmd{#1}\egroup}
-\newcommand{\mcmd}{\bgroup\makeatletter\mcmd@i}
-\newcommand{\mcmd@i}[1]{\textbf{\hbox{\bd@saved@cmd#1}}\egroup}
-\newcommand{\mcs}[1]{\textbf{\hbox{\cs{#1}}}}
-\let\org@marg\marg
-\renewcommand{\marg}[1]{\textbf{\org@marg{#1}}}
-\newcommand{\ostar}{\texttt{*}}
-\newcommand{\package}[1]{\textsf{#1}}
-\makeatother
-\begin{document}
- \DocInput{brandeis-dissertation.dtx}
-\end{document}
-
-\endinput
-%%
-%% End of file `brandeis-dissertation.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/brandeis-dissertation.doc.tlpobj new/tlpkg/tlpobj/brandeis-dissertation.doc.tlpobj
--- old/tlpkg/tlpobj/brandeis-dissertation.doc.tlpobj 2019-02-28 03:23:26.000000000 +0100
+++ new/tlpkg/tlpobj/brandeis-dissertation.doc.tlpobj 2020-04-16 01:56:54.000000000 +0200
@@ -1,9 +1,8 @@
name brandeis-dissertation.doc
category Package
-revision 32047
+revision 54758
shortdesc doc files of brandeis-dissertation
relocated 1
-docfiles size=64
- RELOC/doc/latex/brandeis-dissertation/README
+docfiles size=43
+ RELOC/doc/latex/brandeis-dissertation/README.txt
RELOC/doc/latex/brandeis-dissertation/brandeis-dissertation.pdf
- RELOC/doc/latex/brandeis-dissertation/brandeis-dissertation.tex
++++++ brandeis-dissertation.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/brandeis-dissertation/brandeis-dissertation.cls new/tex/latex/brandeis-dissertation/brandeis-dissertation.cls
--- old/tex/latex/brandeis-dissertation/brandeis-dissertation.cls 2013-11-04 00:41:39.000000000 +0100
+++ new/tex/latex/brandeis-dissertation/brandeis-dissertation.cls 2020-04-12 00:22:07.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% brandeis-dissertation.dtx (with options: `class')
+%% brandeis-dissertation.dtx (with options: `package')
%%
%% IMPORTANT NOTICE:
%%
@@ -20,386 +20,139 @@
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
-%% \RCS$Id: brandeis-dissertation.dtx,v 2.0 2004/10/27 00:47:04 turtle Exp $
-%% \RCS$Revision: 2.0 $
-%% \RCS$Date: 2013/10/17 00:47:04 $
-%%
-%% (C) 2000 Andy Garland (aeg(a)cs.brandeis.edu)
-%% (C) 2001 Pablo Funes (pablo(a)cs.brandeis.edu)
-%% (C) 2004 Peter M�ller Neergaard
-%% (C) 2013 Meg Peck and John Burt
-%%
-%% This program may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.2
-%% 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.2 or later is part of all distributions of LaTeX
-%% version 1999/12/01 or later.
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{brandeis-dissertation}%
- [2013/10/21 v2.0 Brandeis dissertation settings]
-\newif\ifbd@blankclear
-\DeclareOption{blankcleared}{\bd@blankcleartrue}
-\DeclareOption{numbercleared}{\bd@blankclearfalse}
-\newif\ifbd@minmar
-\DeclareOption{minmargins}{\bd@minmartrue}
-\DeclareOption{15margins}{\bd@minmarfalse}
-\newif\ifbd@nochange@small@ftnt
-\DeclareOption{12pt}{\def\bd@book@size{12pt}%
- \bd@nochange@small@ftntfalse}
-\DeclareOption{11pt}{\def\bd@book@size{11pt}%
- \bd@nochange@small@ftnttrue}
-\DeclareOption{10pt}{\def\bd@book@size{10}%
- \bd@nochange@small@ftnttrue}
-\DeclareOption{oneside}{\def\bd@book@side{oneside}}
-\DeclareOption{twoside}{\def\bd@book@side{twoside}}
-\DeclareOption{draft}{\def\bd@book@final{draft}}
-\DeclareOption{final}{\def\bd@book@final{final}}
-\DeclareOption{openright}{\def\bd@book@openrght{openright}}
-\DeclareOption{openany}{\def\bd@book@openrght{openany}}
-\DeclareOption{leqno}{\PassOptionsToClass{book}{\currentoption}}
-\DeclareOption{fleqno}{\PassOptionsToClass{book}{\currentoption}}
-\DeclareOption{openbib}{\PassOptionsToClass{book}{\currentoption}}
-\DeclareOption{openbib}{\def\bd@book@openbib{openbib}}
-\ExecuteOptions{12pt,openright,final,oneside,%
- minmargins,copyright,nolot,lof}
-\ProcessOptions*
-\LoadClass[letterpaper,\bd@book@size,\bd@book@side,%
- \bd@book@final,\bd@book@openrght]{book}
-\ifbd@nochange@small@ftnt
- \let\small\normalsize
- \let\footnotesize\normalsize
-\fi
-\let\bd@cleardoublepage@save\cleardoublepage
-\newcommand{\bd@cleardoublepageblank}{%
- \clearpage
- \thispagestyle{empty}%
- \bd@cleardoublepage@save}
-\ifbd@blankclear
- \AtBeginDocument{\let\cleardoublepage\bd@cleardoublepageblank}
-\fi
-\RequirePackage[doublespacing]{setspace}
-\let\bd@thebibliography\thebibliography
-\let\bd@endthebibliography\endthebibliography
-\renewenvironment{thebibliography}%
- {\begin{singlespace}\bd@thebibliography}%
- {\bd@endthebibliography\end{singlespace}}
-\let\bd@theindex\theindex
-\let\bd@endtheindex\endtheindex
-\renewenvironment{theindex}{%
- \addcontentsline{toc}{chapter}%
- {\protect\numberline{}\indexname}%
- \bd@theindex\begin{singlespace}\small}%
- {\end{singlespace}\bd@endtheindex}
-\let\bd@quotation\quotation
-\let\bd@endquotation\endquotation
-\renewenvironment{quotation}%
- {\begin{singlespace}\bd@quotation}%
- {\bd@endquotation\end{singlespace}}
-\everydisplay\expandafter{%
- \the\everydisplay
- \def\baselinestretch{1.2}\selectfont}
-\smallskipamount=2pt plus 1.5pt minus 1.5pt
-\smallskipamount=4pt plus 3pt minus 3pt
-\bigskipamount=8pt plus 6pt minus 6pt
-\RequirePackage[letterpaper]{geometry}
-\ifbd@minmar
- \geometry{left=1in, top=1in, right=1in, bottom=1in,
- marginparwidth=.5in}
-\else
- \geometry{margin=1.5in,marginparwidth=1in}
-\fi
-\if@twoside
- \def\ps@brandeisheadings{%
- \def\@evenfoot{\hfil\thepage\hfil}%
- \def\@oddfoot{\hfil\thepage\hfil}%
- \def\@evenhead{\relax}%
- \def\@oddhead{\relax}%
- % \def\@evenhead{\hfil{\slhape\leftmark}\hfil}%
- % \def\@oddhead{\hfil{\slshape\rightmark}\hfil}%
- \let\@mkboth\markboth
- \def\chaptermark##1{%
- \markboth {\MakeUppercase{%
- \ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
- \@chapapp\ \thechapter. \ %
- \fi
- \fi
- ##1}}{}}%
- \def\sectionmark##1{%
- \markright {\MakeUppercase{%
- \ifnum \c@secnumdepth >\z@
- \thesection. \ %
- \fi
- ##1}}}}
-\else
- \def\ps@brandeisheadings{%
-
- \def\@oddfoot{\hfil\thepage\hfil}%
- \def\@oddhead{\hfil{\slshape\rightmark}\hfil}%
- \let\@mkboth\markboth
- \def\chaptermark##1{%
- \markright {\MakeUppercase{%
- \ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
- \@chapapp\ \thechapter. \ %
- \fi
- \fi
- ##1}}}}
-\fi
-\let\bd@ps@plain@saved\ps@plain
-\let\bd@ps@empty@saved\ps@empty
-\let\bd@ps@headings@saved\ps@headings
-\let\bd@ps@myheadings@saved\ps@myheadings
-\let\bd@ps@brandeisheadings@saved\ps@brandeisheadings
-\def\ps@plain{\geometry{includehead=false,includefoot}%
- \bd@ps@plain@saved}
-\def\ps@pempty{\geometry{includehead=false,includefoot=false}%
- \bd@ps@empty@saved}
-\def\ps@headings{\geometry{includehead,includefoot=false}%
- \bd@ps@headings@saved}
-\def\ps@myheadings{\geometry{includehead,includefoot=false}%
- \bd@ps@myheadings@saved}
-\def\ps@brandeisheadings{\geometry{includehead,includefoot}%
- \bd@ps@brandeisheadings@saved}
-\AtBeginDocument{%
- \let\ps@plain\bd@ps@plain@saved
- \let\ps@empty\bd@ps@empty@saved
- \let\ps@headings\bd@ps@headings@saved
- \let\ps@myheadings\bd@ps@myheadings@saved
- \let\ps@brandeisheadings\bd@ps@brandeisheadings@saved
- \let\bd@ps@plain\@undefined
- \let\bd@ps@empty\@undefined
- \let\bd@ps@headings\@undefined
- \let\bd@ps@myheadings\@undefined
- \let\bd@ps@brandeisheadings\@undefined}
-\pagestyle{brandeisheadings}
-\newcommand{\thesisfront}[1][]{%
- \@for\bd@option:=#1\do{%
- \@ifundefined{bd@tf@\bd@option}{%
- \@latex@error{\@backslashchar thesisfront: option `\bd@option'
- unknown}%
- {The option you have specified is unknown. Check the spelling
-and \MessageBreak consult the documentation for the\MessageBreak
-brandeis-dissertation class.}}%
- {\@nameuse{bd@tf@\bd@option}}}%
- \frontmatter
- \bgroup
- \pagestyle{empty}
- \thesistitlepage\cleardoublepage
- \if@bd@onlinesubmission{\signaturepage}{\signaturepage*}%
- \cleardoublepage
- \if@bd@crpage{\copyrightpage{\@author}{\@graduationyear}%
- \cleardoublepage}%
- \ifx\@dedication\@empty\else
- \dedicationpage{\@dedication}%
- \cleardoublepage
- \fi
- \cleardoublepage
- \egroup
- \bd@optpage*{Acknowledgments}{\@acknowledgments}%
- \cleardoublepage
- \bd@abstract{\@thesisabstract}%
- \cleardoublepage
- \bd@optpage{Preface}{\@preface}%
- \cleardoublepage
- \tableofcontents
- \cleardoublepage
- \if@bd@lot{\listoftables\cleardoublepage}%
- \if@bd@lof{\listoffigures\cleardoublepage}%
- \mainmatter}
-\let\if@bd@onlinesubmission\@firstoftwo
-\newcommand{\bd@tf@onlinesubmission}{%
- \let\if@bd@onlinesubmission\@firstoftwo}
-\newcommand{\bd@tf@papersubmission}{%
- \let\if@bd@onlinesubmission\@secondoftwo}
-\let\if@bd@crpage\@iden
-\newcommand{\bd@tf@copyrightpage}{\let\if@bd@crpage\@iden}
-\newcommand{\bd@tf@nocopyrightpage}{\let\if@bd@crpage\@gobble}
-\let\if@bd@lot\@gobble
-\newcommand{\bd@tf@lot}{\let\if@bd@lot\@iden}
-\newcommand{\bd@tf@nolot}{\let\if@bd@lot\@gobble}
-\let\if@bd@lof\@gobble
-\newcommand{\bd@tf@lof}{\let\if@bd@lof\@iden}
-\newcommand{\bd@tf@nolof}{\let\if@bd@lof\@gobble}
-\setcounter{tocdepth}{1}
-\let\bd@org@tableofcontents\tableofcontents
-\renewcommand{\tableofcontents}{%
- \begin{singlespace}
- \bd@org@tableofcontents
- \end{singlespace}}
-\let\bd@org@listoftables\listoftables
-\renewcommand{\listoftables}{%
- \begin{singlespace}
- \bd@org@listoftables
- \end{singlespace}}
-\let\bd@org@listoffigures\listoffigures
-\renewcommand{\listoffigures}{%
- \begin{singlespace}
- \bd@org@listoffigures
- \end{singlespace}}
-\renewcommand\mainmatter{%
- \clearpage
- \@mainmattertrue
- \pagenumbering{arabic}}
-\gdef\@acknowledgments{}
-\gdef\@advisor{}
-\gdef\@dean{}
-\gdef\@dedication{}
-\gdef\@department{}
-\gdef\@graduationmonth{May}
-\xdef\@graduationyear{\the\year}
-\gdef\@othercopyright{}
-\gdef\@preface{}
-\gdef\@thesisabstract{}
-\newcommand{\acknowledgments}[1]{\gdef\@acknowledgments{#1}}
-\newcommand{\advisor}[1]{\gdef\@advisor{#1}}
-\newcommand{\dean}[1]{\gdef\@dean{#1}}
-\newcommand{\dedication}[1]{\gdef\@dedication{#1}}
-\newcommand{\department}[1]{\gdef\@department{#1}}
-\newcommand{\graduationmonth}[1]{\gdef\@graduationmonth{#1}}
-\newcommand{\graduationyear}[1]{\gdef\@graduationyear{#1}}
-\newcommand{\othercopyright}[1]{\gdef\@othercopyright{#1}}
-\newcommand{\preface}[1]{\gdef\@preface{#1}}
-\newcommand{\thesisabstract}[1]{\gdef\@thesisabstract{#1}}
-\newcommand{\reader}[1]{%
- \expandafter\gdef
- \expandafter\@committee
- \expandafter{\@committee\do{#1}}}
-\gdef\@committee{}
-\newcommand{\thesistitlepage}{
- \thispagestyle{empty}%
- \begin{center}
- \vspace*{.25in}%
- {\Huge \bf\baselineskip=.8\baselineskip \@title\\}
- \vspace*{.5in}%
- A Dissertation\\
- \vspace*{.25in}%
- Presented to\\
- The Faculty of the Graduate School of Arts and Sciences\\
- Brandeis University\\
- \@department\\
- \@advisor, Advisor\\
- \vspace*{.5in}
- In Partial Fulfillment\\
- of the Requirements for the Degree\\
- Doctor of Philosophy\\
- \vspace*{.5in}
- by\\
- \@author\\
- \@graduationmonth, \@graduationyear\\
- \end{center}%
- \clearpage}
-\newcommand{\copyrightpage}[2]{%
- \thispagestyle{empty}%
- \begin{center}
- \vspace*{2.5in}
- \copyright Copyright by \\
- \vspace*{.05in}
- #1 \\
- \vspace*{.05in}
- #2
- \end{center}
- \vspace{0pt}\vfill%
- \begin{singlespace}
- \begin{raggedright}
- \small
- \@othercopyright
- \end{raggedright}
- \end{singlespace}
- \clearpage}
-\newcommand{\dedicationpage}[1]{%
- \thispagestyle{empty}%
- \vspace*{2.5in}%
- \begin{center}%
- #1
- \end{center}%
- \clearpage}
-\newenvironment{abstract}{%
- \addcontentsline{toc}{chapter}{Abstract}
- \begin{singlespace}
- \thispagestyle{plain}
+\NeedsTeXFormat{LaTeX2e}[2005/12/01]
+\ProvidesPackage{brandeis-dissertation}
+ [2020/04/09 v3.11 .dtx brandeis-dissertation file]
+\LoadClass[12pt]{article}
+\RequirePackage[margin=1in]{geometry}
+\RequirePackage{setspace}
+\RequirePackage{titlesec}
+\RequirePackage[utf8]{inputenc}
+\RequirePackage[english]{babel}
+\RequirePackage{csquotes}
+\RequirePackage{tocloft}
+\AtBeginEnvironment{quote}{\singlespacing}
+\renewcommand\cfttoctitlefont{\normalsize}
+\renewcommand\cftlottitlefont{\normalsize}
+\renewcommand\cftloftitlefont{\normalsize}
+\titleformat*{\section}{\normalsize\bfseries}
+\titleformat*{\subsection}{\normalsize\bfseries}
+\titleformat*{\subsubsection}{\normalsize\bfseries}
+\newcommand{\sectionbreak}{\clearpage}
+\newcommand\graduationmonth[1]{\def\@graduationmonth{#1}}
+\newcommand\graduationyear[1]{\def\@graduationyear{#1}}
+\newcommand\program[1]{\def\@program{#1}}
+\newcommand\advisor[1]{\def\@advisor{#1}}
+\newcommand\signoff[2]{\def\@signoff{#1}\def\@signofftitle{#2}}
+\newcommand\committee[1]{\def\@committee{#1}}
+\addto\captionsenglish{\renewcommand*\contentsname{Table of Contents}}
+\renewcommand*\l@section{\@dottedtocline{1}{1.5em}{2.3em}}
+\newcommand{\maketitlepage}{%
+ \pagenumbering{gobble}
+ %\newgeometry{top=1.75in}
\begin{center}
- {\Huge\bf Abstract\\}%
- \vspace*{.2in}%
- {\large\bf \@title \\}%
- \vspace*{.1in}%
- \noindent
- A dissertation presented to the Faculty of \\
- the Graduate School of Arts and Sciences of \\
- Brandeis University, Waltham, Massachusetts \\
- \vspace*{0.1in}
- by \@author
+ \@title\\
+ \vspace{1em}
+ A Dissertation\\
+ \vspace{1em}
+ Presented to\\
+ \vspace{1em}
+ The Faculty of the Graduate School of Arts and Sciences\\
+ Brandeis University\\
+ \vspace{1em}
+ \@program\\
+ \vspace{1em}
+ \@advisor, Advisor\\
+ \vspace{1em}
+ In Partial Fulfillment\\
+ of the Requirements for the Degree\\
+ Doctor of Philosophy\\
+ \vspace{1em}
+ by\\
+ \@author\\
+ \vspace{1em}
+ \@graduationmonth\,\@graduationyear
\end{center}
- \end{singlespace}%
- \begin{doublespace}
- \noindent}%
- {\end{doublespace}%
- \clearpage}
-\newcommand{\bd@abstract}[1]{%
- \begin{abstract}#1\end{abstract}}
-\let\if@bd@sig@lines\@secondoftwo
-\newcommand{\signaturepage}{%
- \@ifstar{\let\if@bd@sig@lines\@firstoftwo\bd@sig@page}%
- {\let\if@bd@sig@lines\@secondoftwo\bd@sig@page}}
-\newcommand{\bd@sig@page}{%
- \bd@upd@signline@lngth{\@advisor, Chair}
- \let\do\bd@upd@signline@lngth\@committee
- \thispagestyle{empty}%
- \begin{flushleft}%
- \vspace*{.15in}%
- This dissertation, directed and approved by \@author's
- committee, has been accepted and approved by the Graduate
- Faculty of Brandeis University in partial fulfillment of the
- requirements for the degree of:
- \vspace*{0.25in}%
- \begin{flushright}%
- \centerline{\bfseries DOCTOR OF PHILOSOPHY}%
- \par
- \parbox{3.6in}{%
- \vspace{.8in}%
- \if@bd@sig@lines{\bd@signline{2.9in}}{}%
- \@dean, Dean of Arts and Sciences}%
- \end{flushright}%
- \vspace*{0.4in}%
- Dissertation Committee:
- \par
- \bd@sig@page@item{\@advisor, Chair}%
- {\let\do\bd@sig@page@item\@committee}%
- \end{flushleft}
- \clearpage}
-\newcommand{\bd@sig@page@item}[1]{%
- \if@bd@sig@lines{%
- \penalty10000\vskip.6in minus 1in%
- \bd@signline{\bd@comm@signline@lngth}}%
- {\par}%
- #1}
-\newcommand{\bd@signline}[1]{%
- \rule[.5\baselineskip]{#1}{0.4pt}\hskip-#1\relax\ignorespaces}
-\newlength{\bd@comm@signline@lngth}
-\setlength{\bd@comm@signline@lngth}{2.5in}
-\newcommand{\bd@upd@signline@lngth}[1]{%
- {\setbox0=\hbox{#1}%
- \ifdim \wd0>\bd@comm@signline@lngth
- \global\bd@comm@signline@lngth=\wd0
- \fi}}
-\newenvironment{optionalpage}[1]{%
- \chapter{#1}}%
- {\clearpage}
-\newenvironment{optionalpage*}[1]{%
- \chapter*{#1}}%
- {\clearpage}
-\newcommand{\bd@optpage}{%
- \@ifstar{\bd@optpage@i{optionalpage*}}{\bd@optpage@i{optionalpage}}}
-\newcommand{\bd@optpage@i}[3]{%
- \ifx\@empty#3
- \expandafter\@gobble
- \else
- \expandafter\@iden
- \fi
- {\begin{#1}{#2}#3\end{#1}}}
+ \restoregeometry
+ \newpage
+ \pagenumbering{roman}
+ \setcounter{page}{2}
+}
+\newcommand{\makeapproval}{%
+ \pagenumbering{gobble}
+ \begin{spacing}{2}
+ \noindent
+ This dissertation, directed and approved by \@author{}'s Committee, has been\\ accepted and approved by the Faculty of Brandeis University in partial fulfillment of the\\ requirements for the degree of:
+ \end{spacing}
+
+ \hspace{3in}\textbf{DOCTOR OF PHILOSOPHY}
+
+ \vspace{3em}
+
+ \hspace{3in}\@signoff, \@signofftitle
+
+\hspace{3in}Graduate School of Arts and Sciences\\
+ \vspace{1em}
+
+ \noindent
+ Dissertation Committee:
+ \noindent
+ \@committee
+
+ \newpage
+ \setcounter{page}{3}
+}
+\newcommand{\makecopyright}{%
+ \pagenumbering{gobble}
+ \newgeometry{top=6.2in}
+ \begin{center}
+ Copyright by\\
+ \@author{}\\
+ \vspace{1em}
+ \@graduationyear{}
+ \end{center}
+ \restoregeometry
+ \newpage
+ \pagenumbering{roman}
+ \setcounter{page}{4}
+}
+\newenvironment{dissertation-acknowledgements}
+ {
+ %\newgeometry{top=1.4in}
+ \begin{center}
+ Acknowledgements\\
+ \vspace{1em}
+ \end{center}
+ }
+ {
+ \restoregeometry
+ }
+\newenvironment{dissertation-abstract}
+ {
+ %\newgeometry{top=1.4in}
+ \begin{center}
+ \MakeUppercase{Abstract}\\
+ \vspace{1em}
+ \@title\\
+ \vspace{1em}
+ A dissertation presented to the Faculty of the\\
+ Graduate School of Arts and Sciences of Brandeis University\\
+ Waltham, Massachusetts\\
+ \vspace{1em}
+ By\,\@author\\
+ \vspace{2em}
+ \end{center}
+ \doublespacing
+ }
+ {
+ \restoregeometry
+ }
+\newcommand{\startbody}{%
+ \newpage
+ \pagenumbering{arabic}
+ \doublespacing
+}
\endinput
%%
%% End of file `brandeis-dissertation.cls'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/brandeis-dissertation.tlpobj new/tlpkg/tlpobj/brandeis-dissertation.tlpobj
--- old/tlpkg/tlpobj/brandeis-dissertation.tlpobj 2019-02-28 03:23:26.000000000 +0100
+++ new/tlpkg/tlpobj/brandeis-dissertation.tlpobj 2020-04-16 01:56:54.000000000 +0200
@@ -1,15 +1,14 @@
name brandeis-dissertation
category Package
-revision 32047
+revision 54758
shortdesc Class for Brandeis University dissertations
relocated 1
longdesc The class will enable the user to typeset a dissertation which
longdesc adheres to the formatting guidelines of Brandeis University
longdesc Graduate School of Arts and Sciences (GSAS).
-runfiles size=4
+runfiles size=2
RELOC/tex/latex/brandeis-dissertation/brandeis-dissertation.cls
catalogue-ctan /macros/latex/contrib/brandeis-dissertation
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.2
catalogue-topics dissertation
-catalogue-version 2.0
+catalogue-version 3.11
++++++ brandeis-problemset.doc.tar.xz ++++++
Binary files old/doc/latex/brandeis-problemset/brandeis-problemset.pdf and new/doc/latex/brandeis-problemset/brandeis-problemset.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/brandeis-problemset/brandeis-problemset.tex new/doc/latex/brandeis-problemset/brandeis-problemset.tex
--- old/doc/latex/brandeis-problemset/brandeis-problemset.tex 2019-04-03 23:39:50.000000000 +0200
+++ new/doc/latex/brandeis-problemset/brandeis-problemset.tex 2019-05-05 00:47:43.000000000 +0200
@@ -63,11 +63,10 @@
\author{Rebecca Turner\thanks{Brandeis University; \email{rebeccaturner(a)brandeis.edu}}}
\title{The \bps\ Document Class}
-\date{2019/04/02 0.5.4}
+\date{2019/04/15 0.5.5}
\begin{document}
\maketitle
\begin{abstract}
-
Brandeis University's computer science (``\textsc{cosi}'') courses
often assign ``problem sets'' which require fairly rigorous
formatting. The \ctan{brandeis-problemset} document class, which
@@ -76,7 +75,6 @@
Although \bps\ is compatible with all \LaTeX\ flavors, \fontspecok\
is recommended for \ctan{fontspec} support.
-
\end{abstract}
\begin{note}
@@ -730,7 +728,7 @@
\pid{1}{10}
\end{ganttschedule}
\end{document}
-\end{latexcode}
+\end{latexcode}%stopzone
\begin{changelog}[author=Rebecca Turner]
\begin{version}[v=Coming soon\dots]
@@ -739,15 +737,19 @@
context-free grammars.
\end{version}
+\shortversion{v=0.5.5, date=2019-04-10, changes={Reordered package loading
+ to prevent \ctan{mathtools} from breaking \cs{overbrace} and \cs{underbrace}
+ commands.}}
+
\shortversion{v=0.5.4, date=2019-04-02, changes={Fixed hanging indent in
\texttt{description}-lists; the hanging indent was accidentally
removed through a tweak to hang the list item markers for the
\texttt{itemize} and \texttt{enumerate} lists.}}
-\shortversion{v=0.5.3, date=2019-03-30, changes={Commands such as |\texttt|
- won't automatically cause errors when used in the optional arguments
- of the |problem| and |subproblem| environments. More complex
- commands may still cause issues, however.}}
+\shortversion{v=0.5.3, date=2019-03-30, changes={Commands such as
+ \cs{texttt} won't automatically cause errors when used in the optional
+ arguments of the \texttt{problem} and \texttt{subproblem} environments.
+ More complex commands may still cause issues, however.}}
\shortversion{v=0.5.2, date=2019-03-13, changes={Scheme code highlighting
erroneously highlighted \texttt{c\textbf{b}r},
Binary files old/doc/latex/brandeis-problemset/example.pdf and new/doc/latex/brandeis-problemset/example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/brandeis-problemset.doc.tlpobj new/tlpkg/tlpobj/brandeis-problemset.doc.tlpobj
--- old/tlpkg/tlpobj/brandeis-problemset.doc.tlpobj 2019-04-04 01:24:41.000000000 +0200
+++ new/tlpkg/tlpobj/brandeis-problemset.doc.tlpobj 2019-05-05 01:38:53.000000000 +0200
@@ -1,6 +1,6 @@
name brandeis-problemset.doc
category Package
-revision 50737
+revision 50991
shortdesc doc files of brandeis-problemset
relocated 1
docfiles size=51
++++++ brandeis-problemset.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/brandeis-problemset/brandeis-problemset.cls new/tex/latex/brandeis-problemset/brandeis-problemset.cls
--- old/tex/latex/brandeis-problemset/brandeis-problemset.cls 2019-04-03 23:39:50.000000000 +0200
+++ new/tex/latex/brandeis-problemset/brandeis-problemset.cls 2019-05-05 00:47:43.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesClass{brandeis-problemset}[2019/04/02 0.5.4 COSI problem sets at
+\ProvidesClass{brandeis-problemset}[2019/04/15 0.5.5 COSI problem sets at
Brandeis University]
\NeedsTeXFormat{LaTeX2e}
% Description: A document class for Brandeis University's computer science
@@ -59,6 +59,7 @@
\bps@comploption{antonella}
\bps@comploption{math}
+\bps@comploption[true]{fonts}
\DeclareDefaultOption{\PassOptionsToClass{\CurrentOption}{article}}
\ProcessKeyvalOptions*
@@ -96,8 +97,20 @@
bmargin=1.5in,
]{geometry}
+% math
+\ifbps@math
+ % see note below
+ \RequirePackage{mathtools}
+
+ % for whatever reason, redefining this before the \begin{document}
+ % has no effect
+ \AtBeginDocument{\renewcommand{\Re}{\mathbb{R}}}
+\fi
+
% fonts
% NOTE: The order these packages are loaded in is very important.
+% - mathtools has to be loaded before these or overbrackets and such get
+% messed up
% - unicode-math overwrites a bunch of commands, so should be loaded after
% amsmath and others
% - amsmath should be loaded after stix2 (not sure why, but the stix2
@@ -144,15 +157,6 @@
\fi
\fi
-% math
-\ifbps@math
- \RequirePackage{mathtools}
-
- % for whatever reason, redefining this before the \begin{document}
- % has no effect
- \AtBeginDocument{\renewcommand{\Re}{\mathbb{R}}}
-\fi
-
\ifbps@antonella
\instructor{Dr.~Antonella DiLillio}
\iffontspec@ok
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/brandeis-problemset/brandeis-problemset.sty new/tex/latex/brandeis-problemset/brandeis-problemset.sty
--- old/tex/latex/brandeis-problemset/brandeis-problemset.sty 2019-04-03 23:39:50.000000000 +0200
+++ new/tex/latex/brandeis-problemset/brandeis-problemset.sty 2019-05-05 00:47:43.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesPackage{brandeis-problemset}[2019/04/02 0.5.4 Commands for COSI
+\ProvidesPackage{brandeis-problemset}[2019/04/15 0.5.5 Commands for COSI
problem sets at Brandeis University]
\NeedsTeXFormat{LaTeX2e}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/brandeis-problemset.tlpobj new/tlpkg/tlpobj/brandeis-problemset.tlpobj
--- old/tlpkg/tlpobj/brandeis-problemset.tlpobj 2019-04-04 01:24:41.000000000 +0200
+++ new/tlpkg/tlpobj/brandeis-problemset.tlpobj 2019-05-05 01:38:53.000000000 +0200
@@ -1,6 +1,6 @@
name brandeis-problemset
category Package
-revision 50737
+revision 50991
shortdesc Document class for COSI Problem sets at Brandeis University (Waltham, MA)
relocated 1
longdesc Brandeis University's computer science ("COSI") courses often
@@ -15,7 +15,7 @@
catalogue-contact-bugs https://github.com/9999years/brandeis-problemset/issues
catalogue-contact-repository https://github.com/9999years/brandeis-problemset
catalogue-ctan /macros/latex/contrib/brandeis-problemset
-catalogue-date 2019-04-03 18:18:22 +0200
+catalogue-date 2019-04-15 22:05:06 +0200
catalogue-license lppl1.3c
catalogue-topics exercise class
-catalogue-version 0.5.4
+catalogue-version 0.5.5
++++++ breqn.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/breqn/CHANGES.md new/doc/latex/breqn/CHANGES.md
--- old/doc/latex/breqn/CHANGES.md 2018-09-16 23:37:43.000000000 +0200
+++ new/doc/latex/breqn/CHANGES.md 2020-04-20 00:15:28.000000000 +0200
@@ -1,10 +1,42 @@
# Release notes for the `breqn` packages
-* v0.98f (2018/09/14)
+
+## v0.98j (2020/04/19)
+
+ * Remove `color` and `background` options from the documentation, as they have never done anything!
+ (Todo: make them do something...)
+ * Fix spacing bug in `dseries` with arbitrary fonts.
+ * Really fix `\\genfrac` this time, making it backwards compatible with amsmath definition.
+ * Revamp of `mathstyle` code for setting `\mathstyle` to ensure consistency between
+ LuaTeX and other engines.
+ (This was originally just a quick fix of the value of `\\mathstyle` within double
+ subscripts or superscripts)
+
+## v0.98i (2020/02/18)
+
+ * Fix clash with new version of `babel` around use of the generic `\\@elt` command.
+
+
+## v0.98h (2020/02/16)
+
+ * No longer redefine LaTeX2e's `\\@ifstar` command, use a custom prefix instead.
+ This fixes a bizarre conflict with a combination of the `thm-restate` and `cleveref` packages.
+ * Use a prefix for `\\@optarg`, similar chance of potential conflict.
+ * Fix bug in `\\genfrac`.
+ * Allow `mathtools` to be loaded after `breqn` (by preloading `graphicx` always).
+
+
+## v0.98g (2019/10/15)
+
+ * Fix for robustness change in LaTeX 2019.
+
+
+## v0.98f (2018/09/14)
* Insert `\nolinenumbers` inside maths environments if the `lineno` package is loaded.
It would be better to insert a line number, but at least with this the document still compiles!
-* v0.98e (2017/01/27)
+
+## v0.98e (2017/01/27)
* Fix in `\mathchoice` to allow use under recent versions of LuaTeX
Binary files old/doc/latex/breqn/breqn.pdf and new/doc/latex/breqn/breqn.pdf differ
Binary files old/doc/latex/breqn/flexisym.pdf and new/doc/latex/breqn/flexisym.pdf differ
Binary files old/doc/latex/breqn/mathstyle.pdf and new/doc/latex/breqn/mathstyle.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/breqn.doc.tlpobj new/tlpkg/tlpobj/breqn.doc.tlpobj
--- old/tlpkg/tlpobj/breqn.doc.tlpobj 2019-02-28 03:23:27.000000000 +0100
+++ new/tlpkg/tlpobj/breqn.doc.tlpobj 2020-04-20 01:55:50.000000000 +0200
@@ -1,9 +1,9 @@
name breqn.doc
category Package
-revision 48679
+revision 54801
shortdesc doc files of breqn
relocated 1
-docfiles size=283
+docfiles size=280
RELOC/doc/latex/breqn/CHANGES.md
RELOC/doc/latex/breqn/README.md
RELOC/doc/latex/breqn/breqn.pdf
++++++ breqn.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/breqn/breqn.sty new/tex/latex/breqn/breqn.sty
--- old/tex/latex/breqn/breqn.sty 2018-09-16 23:37:43.000000000 +0200
+++ new/tex/latex/breqn/breqn.sty 2020-04-20 00:15:28.000000000 +0200
@@ -11,8 +11,8 @@
%% Copyright (C) 1997-2003 by Michael J. Downes
%% Copyright (C) 2007-2008 by Morten Hoegholm
%% Copyright (C) 2007-2014 by Lars Madsen
-%% Copyright (C) 2007-2018 by Will Robertson
%% Copyright (C) 2010-2017 by Joseph Wright
+%% Copyright (C) 2007-2019 by Will Robertson
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -26,13 +26,12 @@
%%
%% The Current Maintainer of this work is Will Robertson.
%%
-%% This work consists of the main source file breqn.dtx
-%% and the derived files
-%% breqn.sty, breqn.pdf, breqn.ins.
+%% This work consists of the main source file breqn.dtx,
+%% flexisym.dtx, and mathstyle.dtx.
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\ProvidesExplPackage{breqn}{2018/09/14}{0.98f}{Breaking equations}
+\ProvidesExplPackage{breqn}{2020/04/19}{0.98j}{Breaking equations}
\ExplSyntaxOff
\edef\breqnpopcats{%
\catcode\number`\"=\number\catcode`\"
@@ -43,6 +42,8 @@
\PassOptionsToPackage{mathstyleoff}{flexisym}%
}
\ProcessOptions\relax
+\RequirePackage{amsmath}
+\RequirePackage{graphicx}
\@ifpackageloaded{flexisym}{}{%
\RequirePackage{flexisym}[2009/08/07]
\edef\breqnpopcats{\breqnpopcats
@@ -52,23 +53,7 @@
\catcode`\^=7 \catcode`\_=8 \catcode`\"=12 \relax
}
\RequirePackage{keyval,calc}\relax
-\@ifundefined{options}{%
-\newcommand{\options}[2]{%
- \expandafter\options@a\csname opt(a)#1.sty\endcsname{#2}%
- \setkeys{#1}{#2}%
-}
-\def\options@a#1#2{%
- \edef\@tempa{\options@b#2,\@empty\@nil}%
- \ifx#1\relax \let#1\@empty\fi
- \xdef#1{#1\ifx#1\@empty\@xp\@gobble\@tempa\@empty\else\@tempa \fi}%
-}
-\def\options@b#1,#2#3\@nil{%
- \options@c#1 \@nil
- \ifx#2\@empty \else\options@b#2#3\@nil\fi
-}
-\def\options@c#1 #2\@nil{\options@d#1=\@nil}
-\def\options@d#1=#2\@nil{\ifx\@empty #1\@empty\else,\fi#1}
-}{}% end @ifundefined test
+\newcommand{\breqnsetup}[1]{\setkeys{breqn}{#1}}
\let\@nx\noexpand
\let\@xp\expandafter
\@ifundefined{@emptytoks}{\newtoks\@emptytoks}{}
@@ -99,11 +84,11 @@
\futurelet\@tempc\@ifnexta
}
\def\@ifnexta{\ifx\@tempc\@tempd \let\@tempb\@tempa \fi \@tempb}
-\def\@ifstar#1#2{%
+\def\breqn@ifstar#1#2{%
\let\@tempd*\def\@tempa*{#1}\def\@tempb{#2}%
\futurelet\@tempc\@ifnexta
}
-\def\@optarg#1#2{\@ifnext[{#1}{#1[#2]}}
+\def\breqn@optarg#1#2{\@ifnext[{#1}{#1[#2]}}
\def\@True{00}
\def\@False{01}
\def\@Not#1{0\ifcase#11 \or\@xp 1\else \@xp 0\fi}
@@ -135,9 +120,6 @@
\cs_set_eq:NN \math_csym_DeB:Nn \use_ii:nn
}
\ExplSyntaxOff
-\def\eq@cons#1#2{%
- \begingroup \let\@elt\relax \xdef#1{\@elt{#2}#1}\endgroup
-}
\providecommand{\@saveprimitive}[2]{%
\begingroup
\edef\@tempa{\string#1}\edef\@tempb{\meaning#1}%
@@ -448,7 +430,7 @@
\let\@dgroup@start@hook\@empty
\newenvironment{dmath}{%
\@dmath@start@hook
- \let\eq@hasNumber\@True \@optarg\@dmath{}}{}
+ \let\eq@hasNumber\@True \breqn@optarg\@dmath{}}{}
\def\@dmath[#1]{%
\everydisplay\expandafter{\the\everydisplay \display@setup}%
\if@noskipsec \leavevmode \fi
@@ -474,7 +456,7 @@
}
\newenvironment{dmath*}{%
\@dmath@start@hook
- \let\eq@hasNumber\@False \@optarg\@dmath{}%
+ \let\eq@hasNumber\@False \breqn@optarg\@dmath{}%
}{}
\@namedef{end@dmath*}{\end@dmath}
\@namedef{enddmath*}#1{\check@punct@or@qed}
@@ -645,8 +627,15 @@
\end{#2}%
}
\def\@tempa#1\endcsname#2\@nil{\def\latex@end##1{#2}}
-\expandafter\@tempa\end{#1}\@nil
-\def\end#1{\csname end#1\endcsname \latex@end{#1}}%
+\ifcsname end \endcsname
+ % 2019: \end was made robust
+ \expandafter\expandafter\expandafter\@tempa\csname end \endcsname{#1}\@nil
+ \@namedef{end }#1{\csname end#1\endcsname \latex@end{#1}}%
+\else
+ % pre-2019: the old approach
+ \expandafter\@tempa\end{#1}\@nil
+ \def\end#1{\csname end#1\endcsname \latex@end{#1}}%
+\fi
\def\check@punct@or@qed#1{%
\xdef\found@punct{\@empty}% BRM: punctuation was being remembered past this eqn.
% WSPR: err, why isn't that just \global\let\found@punct\@empty ?
@@ -857,7 +846,7 @@
\EQ@displayinfo
}
\def\eq@newline{%
- \@ifstar{\eq@newlinea\@M}{\eq@newlinea\eqinterlinepenalty}}
+ \breqn@ifstar{\eq@newlinea\@M}{\eq@newlinea\eqinterlinepenalty}}
\def\eq@newlinea#1{%
\@ifnext[{\eq@newlineb{#1}}{\eq@newlineb{#1}[\maxdimen]}}
\def\eq@newlineb#1[#2]{\penalty-\@M}
@@ -1010,14 +999,14 @@
}
\def\eq@recalc{%
\eq@wdT\z@ \eq@wdMin\maxdimen \eq@vspan\z@skip \eq@badness\z@
- \let\@elt\eq@recalc@a \eq@measurements \let\@elt\relax
+ \let\breqn@elt\eq@recalc@a \eq@measurements \let\breqn@elt\relax
}
-\def\eq@recalc@a#1x#2+#3\@endelt{%
+\def\eq@recalc@a#1x#2+#3\breqn@endelt{%
\eq@firstht#2\relax
- \let\@elt\eq@recalc@b
- \@elt#1x#2+#3\@endelt
+ \let\breqn@elt\eq@recalc@b
+ \breqn@elt#1x#2+#3\breqn@endelt
}
-\def\eq@recalc@b#1X#2,#3x#4+#5@#6\@endelt{%
+\def\eq@recalc@b#1X#2,#3x#4+#5@#6\breqn@endelt{%
\setlength\dim@a{#2+#3}%
\ifdim\dim@a>\eq@wdT \eq@wdT\dim@a \fi
\ifdim\dim@a<\eq@wdMin \eq@wdMin\dim@a \fi
@@ -1190,9 +1179,11 @@
\def\@tempc##1##2 {\int@b##2\afterassignment\@tempa\dim@a}%
\@xp\@tempc\@parshape
}
-\chardef\@endelt=`\?
+\chardef\breqn@endelt=`\?
+\let\breqn@elt\relax
+\let\breqn@endelt\relax
\def\eq@measurements{%
- \@elt 4.5pt/5.0pt,66.0ptx6.8pt+2.4pt@27\@endelt
+ \breqn@elt 4.5pt/5.0pt,66.0ptx6.8pt+2.4pt@27\breqn@endelt
...
}
\def\eq@measure@lines{%
@@ -1220,14 +1211,14 @@
\fi
}%
\fi
- \edef\eq@measurements{\@elt
+ \edef\eq@measurements{\breqn@elt
\the\skip@a\space X% extra space to facilitate extracting only the
% dimen part later
\csname eq@i%
\ifnum\eq@curline<\parshape \number\eq@curline
\else\number\parshape
\fi
- \endcsname,\the\dim@a x\the\ht\tw@+\the\dp\tw@ @\the\eq@badness\@endelt
+ \endcsname,\the\dim@a x\the\ht\tw@+\the\dp\tw@ @\the\eq@badness\breqn@endelt
\eq@measurements
}%
\advance\eq@curline\m@ne
@@ -1257,12 +1248,12 @@
\ifnum\eq@lines>\sixt@@n
\eq@dense@enough@b
\else
- \dim@b\z@ \let\@elt\eq@delt \eq@measurements
+ \dim@b\z@ \let\breqn@elt\eq@delt \eq@measurements
\dim@c\eq@density@factor\eq@wdT \multiply\dim@c\eq@lines
\ifdim\dim@b>\dim@c \true@false@true \else \false@false@false \fi
\fi
}
-\def\eq@delt#1X#2,#3x#4+#5@#6\@endelt{\addtolength\dim@b{#3}}%
+\def\eq@delt#1X#2,#3x#4+#5@#6\breqn@endelt{\addtolength\dim@b{#3}}%
\def\eq@dense@enough@b{%
\int@b\eq@wdT \divide\int@b\p@
\dim@b\eq@wdL \divide\dim@b\int@b
@@ -1709,9 +1700,9 @@
\DeclareTwang{\rangle}{-.4}
\DeclareTwang{)}{-.33}
\DeclareTwang{\rbrace}{-.25}
-\newenvironment{dseries}{\let\eq@hasNumber\@True \@optarg\@dseries{}}{}%
+\newenvironment{dseries}{\let\eq@hasNumber\@True \breqn@optarg\@dseries{}}{}%
\def\enddseries#1{\check@punct@or@qed}%
-\newenvironment{dseries*}{\let\eq@hasNumber\@False \@optarg\@dseries{}}{}%
+\newenvironment{dseries*}{\let\eq@hasNumber\@False \breqn@optarg\@dseries{}}{}%
\@namedef{enddseries*}#1{\check@punct@or@qed}%
\@namedef{end@dseries*}{\end@dseries}%
\def\@dseries[#1]{%
@@ -1722,7 +1713,7 @@
\mathsurround\z@\@@math \penalty\@Mi
\let\endmath\ends@math
\def\premath{%
- \ifdim\lastskip<.3em \unskip
+ \ifdim\lastskip<\fontdimen2\font \unskip
\else\ifnum\lastpenalty<\@M \dquad\fi\fi
}%
\def\postmath{\unpenalty\eq@addpunct \penalty\intermath@penalty \dquad \@ignoretrue}%
@@ -1758,13 +1749,13 @@
\let\grp@aligned\@True
\newenvironment{dgroup}{%
\@dgroup@start@hook
- \let\grp@hasNumber\@True\@optarg\@dgroup{}%
+ \let\grp@hasNumber\@True\breqn@optarg\@dgroup{}%
}{%
\end@dgroup
}
\newtoks\GRP@queue
\newenvironment{dgroup*}{%
- \let\grp@hasNumber\@False\@optarg\@dgroup{}%
+ \let\grp@hasNumber\@False\breqn@optarg\@dgroup{}%
}{%
\end@dgroup
}
@@ -1814,7 +1805,7 @@
\newbox\GRP@wholebox
\def\grp@push{%
\global\GRP@queue\@xp\@xp\@xp{\@xp\the\@xp\GRP@queue
- \@xp\@elt\@xp{\EQ@trial}%
+ \@xp\breqn@elt\@xp{\EQ@trial}%
}%
\global\setbox\GRP@box\vbox{%
\hbox{\box\EQ@box\box\EQ@copy\penalty\@ne\copy\EQ@numbox}%
@@ -1857,7 +1848,7 @@
\global\advance\grp@wdT\grp@wdR
\fi
\setbox\GRP@wholebox\vbox{%
- \let\@elt\eqgrp@elt
+ \let\breqn@elt\eqgrp@elt
\the\GRP@queue
}%
\global\let\eq@GRP@first@dmath\@True
@@ -1880,7 +1871,7 @@
\fi
\fi
\unvbox\GRP@wholebox
- \let\@elt\relax
+ \let\breqn@elt\relax
\eq@botspace % not needed unless bottom number?
}
\def\eqgrp@elt#1{%
@@ -1946,7 +1937,7 @@
\def\col@box{%
\unhbox\z@
}
-\newenvironment{darray}{\@optarg\@darray{}}{}
+\newenvironment{darray}{\breqn@optarg\@darray{}}{}
\def\@darray[#1]{%
\if\eq@group\else\eq@prelim\fi
\global\let\@preamble\@empty
@@ -1989,7 +1980,7 @@
\newcommand{\conditionpunct}{,}
\newcommand\condition{%
\begingroup\@tempswatrue
- \@ifstar{\@tempswafalse \condition@a}{\condition@a}}
+ \breqn@ifstar{\@tempswafalse \condition@a}{\condition@a}}
\newcommand\condition@a[2][\conditionpunct]{%
\unpenalty\unskip\unpenalty\unskip % BRM Added
\hbox{#1}%
@@ -2009,7 +2000,7 @@
\unvbox\GRP@box
}%
\global\GRP@queue\@xp{\the\GRP@queue
- \@elt{\gdef\EQ@trial{}}%
+ \breqn@elt{\gdef\EQ@trial{}}%
}%
}
\newenvironment{dsuspend}{%
@@ -2023,7 +2014,7 @@
\unvbox\GRP@box
}%
\global\GRP@queue\@xp{\the\GRP@queue
- \@elt{\let\eq@isIntertext\@True}%
+ \breqn@elt{\let\eq@isIntertext\@True}%
}%
}
\newcommand\breqn@intertext[1]{\dsuspend#1\enddsuspend}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/breqn/cmbase.sym new/tex/latex/breqn/cmbase.sym
--- old/tex/latex/breqn/cmbase.sym 2017-01-28 23:59:01.000000000 +0100
+++ new/tex/latex/breqn/cmbase.sym 2019-10-16 00:00:18.000000000 +0200
@@ -9,10 +9,10 @@
%% This is a generated file.
%%
%% Copyright (C) 1997-2003 by Michael J. Downes
-%% Copyright (C) 2007-2010 by Morten Hoegholm
+%% Copyright (C) 2007-2008 by Morten Hoegholm
%% Copyright (C) 2007-2014 by Lars Madsen
-%% Copyright (C) 2007-2017 by Will Robertson
%% Copyright (C) 2010-2017 by Joseph Wright
+%% Copyright (C) 2007-2019 by Will Robertson
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -26,10 +26,8 @@
%%
%% The Current Maintainer of this work is Will Robertson.
%%
-%% This work consists of the main source file flexisym.dtx
-%% and the derived files
-%% flexisym.sty, flexisym.pdf, flexisym.ins,
-%% cmbase.sym, mathpazo.sym, mathptmx.sym, msabm.sym.
+%% This work consists of the main source file breqn.dtx,
+%% flexisym.dtx, and mathstyle.dtx.
%%
\ProvidesSymbols{cmbase}[2007/12/19 v0.92]
\ExplSyntaxOn
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/breqn/flexisym.sty new/tex/latex/breqn/flexisym.sty
--- old/tex/latex/breqn/flexisym.sty 2017-01-28 23:59:01.000000000 +0100
+++ new/tex/latex/breqn/flexisym.sty 2020-04-20 00:15:28.000000000 +0200
@@ -9,10 +9,10 @@
%% This is a generated file.
%%
%% Copyright (C) 1997-2003 by Michael J. Downes
-%% Copyright (C) 2007-2010 by Morten Hoegholm
+%% Copyright (C) 2007-2008 by Morten Hoegholm
%% Copyright (C) 2007-2014 by Lars Madsen
-%% Copyright (C) 2007-2017 by Will Robertson
%% Copyright (C) 2010-2017 by Joseph Wright
+%% Copyright (C) 2007-2019 by Will Robertson
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -26,13 +26,11 @@
%%
%% The Current Maintainer of this work is Will Robertson.
%%
-%% This work consists of the main source file flexisym.dtx
-%% and the derived files
-%% flexisym.sty, flexisym.pdf, flexisym.ins,
-%% cmbase.sym, mathpazo.sym, mathptmx.sym, msabm.sym.
+%% This work consists of the main source file breqn.dtx,
+%% flexisym.dtx, and mathstyle.dtx.
%%
\RequirePackage{expl3}[2009/08/05]
-\ProvidesExplPackage{flexisym}{2017/01/27}{0.98e}{Make math characters macros}
+\ProvidesExplPackage{flexisym}{2020/04/19}{0.98j}{Make math characters macros}
\edef\do{%
\noexpand\AtEndOfPackage{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/breqn/mathpazo.sym new/tex/latex/breqn/mathpazo.sym
--- old/tex/latex/breqn/mathpazo.sym 2017-01-28 23:59:01.000000000 +0100
+++ new/tex/latex/breqn/mathpazo.sym 2019-10-16 00:00:18.000000000 +0200
@@ -9,10 +9,10 @@
%% This is a generated file.
%%
%% Copyright (C) 1997-2003 by Michael J. Downes
-%% Copyright (C) 2007-2010 by Morten Hoegholm
+%% Copyright (C) 2007-2008 by Morten Hoegholm
%% Copyright (C) 2007-2014 by Lars Madsen
-%% Copyright (C) 2007-2017 by Will Robertson
%% Copyright (C) 2010-2017 by Joseph Wright
+%% Copyright (C) 2007-2019 by Will Robertson
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -26,10 +26,8 @@
%%
%% The Current Maintainer of this work is Will Robertson.
%%
-%% This work consists of the main source file flexisym.dtx
-%% and the derived files
-%% flexisym.sty, flexisym.pdf, flexisym.ins,
-%% cmbase.sym, mathpazo.sym, mathptmx.sym, msabm.sym.
+%% This work consists of the main source file breqn.dtx,
+%% flexisym.dtx, and mathstyle.dtx.
%%
\ProvidesSymbols{mathpazo}[2010/07/11 v0.3]
\ExplSyntaxOn
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/breqn/mathptmx.sym new/tex/latex/breqn/mathptmx.sym
--- old/tex/latex/breqn/mathptmx.sym 2017-01-28 23:59:01.000000000 +0100
+++ new/tex/latex/breqn/mathptmx.sym 2019-10-16 00:00:18.000000000 +0200
@@ -9,10 +9,10 @@
%% This is a generated file.
%%
%% Copyright (C) 1997-2003 by Michael J. Downes
-%% Copyright (C) 2007-2010 by Morten Hoegholm
+%% Copyright (C) 2007-2008 by Morten Hoegholm
%% Copyright (C) 2007-2014 by Lars Madsen
-%% Copyright (C) 2007-2017 by Will Robertson
%% Copyright (C) 2010-2017 by Joseph Wright
+%% Copyright (C) 2007-2019 by Will Robertson
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -26,10 +26,8 @@
%%
%% The Current Maintainer of this work is Will Robertson.
%%
-%% This work consists of the main source file flexisym.dtx
-%% and the derived files
-%% flexisym.sty, flexisym.pdf, flexisym.ins,
-%% cmbase.sym, mathpazo.sym, mathptmx.sym, msabm.sym.
+%% This work consists of the main source file breqn.dtx,
+%% flexisym.dtx, and mathstyle.dtx.
%%
\ProvidesSymbols{mathptmx}[2010/07/11 v0.3]
\ExplSyntaxOn
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/breqn/mathstyle.sty new/tex/latex/breqn/mathstyle.sty
--- old/tex/latex/breqn/mathstyle.sty 2017-01-28 23:59:01.000000000 +0100
+++ new/tex/latex/breqn/mathstyle.sty 2020-04-20 00:15:28.000000000 +0200
@@ -9,10 +9,10 @@
%% This is a generated file.
%%
%% Copyright (C) 1997-2003 by Michael J. Downes
-%% Copyright (C) 2007-2011 by Morten Hoegholm et al
+%% Copyright (C) 2007-2008 by Morten Hoegholm
%% Copyright (C) 2007-2014 by Lars Madsen
-%% Copyright (C) 2007-2017 by Will Robertson
%% Copyright (C) 2010-2017 by Joseph Wright
+%% Copyright (C) 2007-2019 by Will Robertson
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -26,13 +26,13 @@
%%
%% The Current Maintainer of this work is Will Robertson.
%%
-%% This work consists of the main source file mathstyle.dtx
-%% and the derived files
-%% mathstyle.sty, mathstyle.pdf, mathstyle.ins.
+%% This work consists of the main source file breqn.dtx,
+%% flexisym.dtx, and mathstyle.dtx.
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{mathstyle}
- [2017/01/27 0.98e Tracking mathstyle implicitly]
+\RequirePackage{expl3}
+\ProvidesExplPackage{mathstyle}{2020/04/19}{0.98j}{Tracking mathstyle implicitly}
+\ExplSyntaxOff
\providecommand\@saveprimitive[2]{%
\begingroup
\edef\@tempa{\string#1}\edef\@tempb{\meaning#1}%
@@ -73,7 +73,8 @@
\fi
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname directlua\endcsname\relax
- \chardef\mathstyle\@ne
+ \chardef\mathstyle=2\relax
+ \chardef\mathstyledenom=0\relax
\else
\directlua{tex.enableprimitives("", {"mathstyle"})}
\fi
@@ -91,13 +92,13 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname directlua\endcsname\relax
\DeclareRobustCommand{\displaystyle}{%
- \@@displaystyle \chardef\mathstyle\z@}
+ \@@displaystyle \chardef\mathstyle0\relax}
\DeclareRobustCommand{\textstyle}{%
- \@@textstyle \chardef\mathstyle\tw@}
+ \@@textstyle \chardef\mathstyle2\relax}
\DeclareRobustCommand{\scriptstyle}{%
- \@@scriptstyle \chardef\mathstyle4 }
+ \@@scriptstyle \chardef\mathstyle4\relax}
\DeclareRobustCommand{\scriptscriptstyle}{%
- \@@scriptscriptstyle \chardef\mathstyle6 }
+ \@@scriptscriptstyle \chardef\mathstyle6\relax}
\fi
\begingroup \catcode`\^=7\relax \catcode`\_=8\relax % just in case
\lowercase{\endgroup
@@ -110,8 +111,10 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname directlua\endcsname\relax
\def\subsupstyle{%
- \ifnum\mathstyle<5 \chardef\mathstyle4 %
- \else \chardef\mathstyle6 %
+ \ifnum\mathstyle<4\relax
+ \chardef\mathstyle\numexpr4+\mathstyledenom\relax
+ \else
+ \chardef\mathstyle\numexpr6+\mathstyledenom\relax
\fi
}
\else
@@ -143,38 +146,68 @@
\providecommand\@thirdoffour[4]{#3}
\providecommand\@fourthoffour[4]{#4}
\DeclareRobustCommand\genfrac[6]{%
- {#1\fracstyle
+ {%
+ % emulate old amsmath syntax:
+ \if 0#4\relax\displaystyle\else
+ \if 1#4\relax\textstyle\else
+ \if 2#4\relax\scriptstyle\else
+ \if 3#4\relax\scriptscriptstyle\else
+ #4%
+ \fi\fi\fi\fi
+ \fracstyle
+ {\begingroup #5\endgroup
+ \csname @@\ifx\maxdimen#3\maxdimen over\else above\fi
+ \if @#1@\else withdelims\fi\endcsname #1 #2 #3\relax
+ \ifnum\mathstyledenom=0\relax
+ \chardef\mathstyledenom=1\relax
+ \edef\mathstyle@tempa{\number\mathstyle}%
+ \chardef\mathstyle=\numexpr\mathstyle@tempa+1\relax
+ \fi
+ #6%
+ \chardef\mathstyledenom=0\relax}%
+ }%
+}
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname directlua\endcsname\relax\else
+\DeclareRobustCommand\genfrac[6]{%
+ {%
+ % emulate old amsmath syntax:
+ \if 0#4\relax\displaystyle\else
+ \if 1#4\relax\textstyle\else
+ \if 2#4\relax\scriptstyle\else
+ \if 3#4\relax\scriptscriptstyle\else
+ #4%
+ \fi\fi\fi\fi
+ \fracstyle
{\begingroup #5\endgroup
- \csname @@\ifx\maxdimen#4\maxdimen over\else above\fi
- \if @#2@\else withdelims\fi\endcsname #2#3#4\relax
- #6}%
+ \csname @@\ifx\maxdimen#3\maxdimen over\else above\fi
+ \if @#1@\else withdelims\fi\endcsname #1 #2 #3\relax
+ #6%
+ }%
}%
}
+\fi
\renewcommand{\frac}{\genfrac{}{}{}{}}
\providecommand{\dfrac}{}
\providecommand{\tfrac}{}
-\renewcommand{\dfrac}{\genfrac\displaystyle{}{}{}}
-\renewcommand{\tfrac}{\genfrac\textstyle{}{}{}}
+\renewcommand{\dfrac}{\genfrac{}{}{}\displaystyle}
+\renewcommand{\tfrac}{\genfrac{}{}{}\displaystyle}
\providecommand{\binom}{}
\providecommand{\tbinom}{}
\providecommand{\dbinom}{}
-\renewcommand{\binom}{\genfrac{}(){0pt}}
-\renewcommand{\dbinom}{\genfrac\displaystyle(){0pt}}
-\renewcommand{\tbinom}{\genfrac\textstyle(){0pt}}
+\renewcommand{\binom}{\genfrac(){0pt}{}}
+\renewcommand{\dbinom}{\genfrac(){0pt}\displaystyle}
+\renewcommand{\tbinom}{\genfrac(){0pt}\textstyle}
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname directlua\endcsname\relax
\def\fracstyle{%
\ifcase\numexpr\mathstyle\relax
- \chardef\mathstyle=\@ne
- \or
- \chardef\mathstyle=\@ne
- \or
- \chardef\mathstyle=\tw@
- \or
- \chardef\mathstyle=\tw@
- \else
- \chardef\mathstyle=\thr@@
+ \chardef\mathstyle=0\relax % 0
+ \or \chardef\mathstyle=1\relax % 1
+ \or \chardef\mathstyle=2\relax % 2
+ \or \chardef\mathstyle=3\relax % 3
+ \else \chardef\mathstyle=3\relax % 4 or more
\fi
}
\else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/breqn/msabm.sym new/tex/latex/breqn/msabm.sym
--- old/tex/latex/breqn/msabm.sym 2017-01-28 23:59:01.000000000 +0100
+++ new/tex/latex/breqn/msabm.sym 2019-10-16 00:00:18.000000000 +0200
@@ -9,10 +9,10 @@
%% This is a generated file.
%%
%% Copyright (C) 1997-2003 by Michael J. Downes
-%% Copyright (C) 2007-2010 by Morten Hoegholm
+%% Copyright (C) 2007-2008 by Morten Hoegholm
%% Copyright (C) 2007-2014 by Lars Madsen
-%% Copyright (C) 2007-2017 by Will Robertson
%% Copyright (C) 2010-2017 by Joseph Wright
+%% Copyright (C) 2007-2019 by Will Robertson
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -26,10 +26,8 @@
%%
%% The Current Maintainer of this work is Will Robertson.
%%
-%% This work consists of the main source file flexisym.dtx
-%% and the derived files
-%% flexisym.sty, flexisym.pdf, flexisym.ins,
-%% cmbase.sym, mathpazo.sym, mathptmx.sym, msabm.sym.
+%% This work consists of the main source file breqn.dtx,
+%% flexisym.dtx, and mathstyle.dtx.
%%
\ProvidesSymbols{msabm}[2001/09/08 v0.91]
\ExplSyntaxOn
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/breqn.tlpobj new/tlpkg/tlpobj/breqn.tlpobj
--- old/tlpkg/tlpobj/breqn.tlpobj 2019-02-28 03:23:28.000000000 +0100
+++ new/tlpkg/tlpobj/breqn.tlpobj 2020-04-20 01:55:50.000000000 +0200
@@ -1,6 +1,6 @@
name breqn
category Package
-revision 48679
+revision 54801
shortdesc Automatic line breaking of displayed equations
relocated 1
longdesc The package provides solutions to a number of common
@@ -28,7 +28,6 @@
catalogue-contact-home http://wspr.io/breqn/
catalogue-contact-repository https://github.com/wspr/breqn
catalogue-ctan /macros/latex/contrib/breqn
-catalogue-date 2018-09-16 19:02:30 +0200
catalogue-license lppl1.3
catalogue-topics maths
-catalogue-version 0.98f
+catalogue-version 0.98j
++++++ bundledoc.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/arlatex.1 new/texmf-dist/doc/man/man1/arlatex.1
--- old/texmf-dist/doc/man/man1/arlatex.1 2018-05-24 00:08:34.000000000 +0200
+++ new/texmf-dist/doc/man/man1/arlatex.1 2019-09-08 23:54:05.000000000 +0200
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -54,16 +54,20 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
-.if !\nF .nr F 0
-.if \nF>0 \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{\
+. if \nF \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
-. if !\nF==2 \{\
-. nr % 0
-. nr F 2
+. if !\nF==2 \{\
+. nr % 0
+. nr F 2
+. \}
. \}
.\}
+.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -278,7 +282,7 @@
a different directory.
.SH "SEE ALSO"
.IX Header "SEE ALSO"
-\&\fIbundledoc\fR\|(1), \fIlatex\fR\|(1), \fIshar\fR\|(1), \fItar\fR\|(1), \fIzip\fR\|(1)
+\&\fBbundledoc\fR\|(1), \fBlatex\fR\|(1), \fBshar\fR\|(1), \fBtar\fR\|(1), \fBzip\fR\|(1)
.SH "AUTHOR"
.IX Header "AUTHOR"
Scott Pakin, \fIscott+bdoc(a)pakin.org\fR
Binary files old/texmf-dist/doc/man/man1/arlatex.man1.pdf and new/texmf-dist/doc/man/man1/arlatex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/bundledoc.1 new/texmf-dist/doc/man/man1/bundledoc.1
--- old/texmf-dist/doc/man/man1/bundledoc.1 2018-05-24 00:08:34.000000000 +0200
+++ new/texmf-dist/doc/man/man1/bundledoc.1 2019-09-08 23:54:05.000000000 +0200
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -54,16 +54,20 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
-.if !\nF .nr F 0
-.if \nF>0 \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{\
+. if \nF \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
-. if !\nF==2 \{\
-. nr % 0
-. nr F 2
+. if !\nF==2 \{\
+. nr % 0
+. nr F 2
+. \}
. \}
.\}
+.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -129,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "BUNDLEDOC 1"
-.TH BUNDLEDOC 1 "2018-05-23" "v3.3" "User Commands"
+.TH BUNDLEDOC 1 "2019-09-08" "v3.4" "User Commands"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -142,7 +146,7 @@
[\fB\-\-version\fR]
[\fB\-\-help\fR]
[\fB\-\-\fR[\fBno\fR]\fBverbose\fR]
-[\fB\-\-texfile\fR=\fIfile\fR]
+[\fB\-\-texfile\fR=\fIfile.tex\fR]
[\fB\-\-directory\fR=\fIdirectory\fR]
[\fB\-\-\fR[\fBno\fR]\fBlocalonly\fR]
[\fB\-\-exclude\fR=\fIstring\fR]
@@ -150,8 +154,8 @@
[\fB\-\-manifest\fR=\fIfile\fR]
[\fB\-\-\fR\fBlistdeps\fR=[yes|no|only|rel]...]
[\fB\-\-\fR[\fBno\fR]\fBkeepdirs\fR]
-[\fB\-\-config\fR=\fIfile\fR]
-\&\fI.dep file\fR
+[\fB\-\-config\fR=\fIfile.cfg\fR]
+\&\fIfile.dep\fR
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
\&\fBbundledoc\fR is a post-processor for the \fBsnapshot\fR package that
@@ -184,8 +188,9 @@
main LaTeX document (no extension).
.PP
\&\fBbundledoc\fR requires the name of the dependency file produced by
-\&\fBsnapshot\fR (normally \fIsomefile\fR\fI.dep\fR). The following options may
-also be given:
+\&\fBsnapshot\fR, normally \fIsomefile\fR\fI.dep\fR). (For convenience, the file
+can be specified without its \fI.dep\fR extension.) The following
+options may also be given:
.IP "\fB\-\-version\fR" 4
.IX Item "--version"
Output the \fBbundledoc\fR script's version number. This overrides all
@@ -301,7 +306,8 @@
appropriate configuration (\fI.cfg\fR) file for your TeX distribution and
operating system. \fBbundledoc\fR comes with a few configuration files
and it's easy to write more. See \*(L"\s-1CONFIGURATION FILES\*(R"\s0 (below) for
-a description of the configuration file format.
+a description of the configuration file format. For convenience, the
+file can be specified without its \fI.cfg\fR extension.
.SH "CONFIGURATION FILES"
.IX Header "CONFIGURATION FILES"
.SS "Format"
@@ -390,8 +396,11 @@
\& bundledoc \-\-config=miktex.cfg myfile.dep
.Ve
.PP
-(In practice, it's probably necessary to specify to \f(CW\*(C`\-\-config\*(C'\fR the
-complete path to \fBbundledoc\fR's \fImiktex.cfg\fR configuration file.)
+This can be abbreviated to
+.PP
+.Vb 1
+\& bundledoc \-\-config=miktex myfile
+.Ve
.PP
The following builds a \fI.tar.gz\fR archive with the TeX Live
distribution running on a Unix-like operating system. \fBbundledoc\fR
@@ -517,11 +526,14 @@
.IX Subsection "Acknowledgments"
Thanks to Fabien Vignes-Tourneret for suggesting what became the
\&\f(CW\*(C`\-\-localonly\*(C'\fR option and for a discussion that led to the
-\&\f(CW\*(C`\-\-exclude\*(C'\fR and \f(CW\*(C`\-\-include\*(C'\fR options; and to Marius Kleiner for
-updating \fBbundledoc\fR to properly handle document subdirectories.
+\&\f(CW\*(C`\-\-exclude\*(C'\fR and \f(CW\*(C`\-\-include\*(C'\fR options; to Marius Kleiner for updating
+\&\fBbundledoc\fR to properly handle document subdirectories; and to Frank
+Mittelbach for suggesting using Kpathsea to help find \fI.cfg\fR files
+and to automatically append \fI.cfg\fR and \fI.dep\fR extensions if
+necessary.
.SH "SEE ALSO"
.IX Header "SEE ALSO"
-\&\fIarlatex\fR\|(1), \fIgzip\fR\|(1), \fIkpsewhich\fR\|(1), \fIlatex\fR\|(1), \fIperl\fR\|(1), \fIzip\fR\|(1),
+\&\fBarlatex\fR\|(1), \fBgzip\fR\|(1), \fBkpsewhich\fR\|(1), \fBlatex\fR\|(1), \fBperl\fR\|(1), \fBzip\fR\|(1),
the \fBsnapshot\fR documentation
.SH "AUTHOR"
.IX Header "AUTHOR"
Binary files old/texmf-dist/doc/man/man1/bundledoc.man1.pdf and new/texmf-dist/doc/man/man1/bundledoc.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/bundledoc/README new/texmf-dist/doc/support/bundledoc/README
--- old/texmf-dist/doc/support/bundledoc/README 2018-05-24 00:08:34.000000000 +0200
+++ new/texmf-dist/doc/support/bundledoc/README 2019-09-08 23:54:05.000000000 +0200
@@ -25,14 +25,14 @@
Files
-----
--rwxrwxr-x 1 pakin users 9978 May 22 22:39 arlatex
--rw-r--r-- 1 pakin users 10176 May 22 22:40 arlatex.1
--rw-r--r-- 1 pakin users 16731 May 22 22:40 arlatex.pdf
--rwxrwxr-x 1 pakin users 29338 May 22 22:37 bundledoc
--rw-r--r-- 1 pakin users 23015 May 22 22:37 bundledoc.1
--rw-r--r-- 1 pakin users 29217 May 22 22:37 bundledoc.pdf
+-rwxrwxr-x 1 pakin users 9978 May 22 2018 arlatex
+-rw-r--r-- 1 pakin users 10262 Sep 6 22:21 arlatex.1
+-rw-r--r-- 1 pakin users 33296 Sep 6 22:26 arlatex.pdf
+-rwxrwxr-x 1 pakin users 31263 Sep 7 23:17 bundledoc
+-rw-r--r-- 1 pakin users 23351 Sep 7 23:18 bundledoc.1
+-rw-r--r-- 1 pakin users 49713 Sep 7 23:18 bundledoc.pdf
-rw-rw-r-- 1 pakin users 342 Jan 22 2014 miktex.cfg
--rw-r--r-- 1 pakin users 4430 May 22 22:40 README
+-rw-r--r-- 1 pakin users 4435 Sep 7 23:18 README
-rw-r--r-- 1 pakin users 248 Aug 24 2014 texlive-unix-arlatex.cfg
-rw-rw-r-- 1 pakin users 230 Apr 9 2010 texlive-unix.cfg
@@ -84,7 +84,7 @@
---------------------
bundledoc
- Copyright (C) 2018 Scott Pakin
+ Copyright (C) 2018-2019 Scott Pakin
This program may be distributed and/or modified under the conditions
of the LaTeX Project Public License, either version 1.3c of this
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bundledoc.doc.tlpobj new/tlpkg/tlpobj/bundledoc.doc.tlpobj
--- old/tlpkg/tlpobj/bundledoc.doc.tlpobj 2019-02-28 03:23:29.000000000 +0100
+++ new/tlpkg/tlpobj/bundledoc.doc.tlpobj 2019-09-09 01:54:40.000000000 +0200
@@ -1,8 +1,8 @@
name bundledoc.doc
category Package
-revision 47819
+revision 52059
shortdesc doc files of bundledoc
-docfiles size=33
+docfiles size=31
texmf-dist/doc/man/man1/arlatex.1
texmf-dist/doc/man/man1/arlatex.man1.pdf
texmf-dist/doc/man/man1/bundledoc.1
++++++ bundledoc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/bundledoc/bundledoc new/texmf-dist/scripts/bundledoc/bundledoc
--- old/texmf-dist/scripts/bundledoc/bundledoc 2018-05-24 00:08:34.000000000 +0200
+++ new/texmf-dist/scripts/bundledoc/bundledoc 2019-09-08 23:54:05.000000000 +0200
@@ -7,7 +7,7 @@
########################################################################
# bundledoc #
-# Copyright (C) 2018 Scott Pakin #
+# Copyright (C) 2018-2019 Scott Pakin #
# #
# This program may be distributed and/or modified under the conditions #
# of the LaTeX Project Public License, either version 1.3c of this #
@@ -24,8 +24,8 @@
# in the Files section of the associated README file. #
########################################################################
-use 5.006; # Fail gracefully if we're not using Perl v5.6.0.
-our $VERSION = "3.3"; # Specify the version of bundledoc.
+use 5.006; # Fail gracefully if we're not using Perl v5.6.0+.
+our $VERSION = "3.4"; # Specify the version of bundledoc.
use File::Basename;
use File::Copy;
use File::Spec::Functions qw(abs2rel catfile devnull rel2abs rootdir updir);
@@ -87,8 +87,7 @@
my $retval;
if ($verbose) {
- print "EXECUTING: $command\n";
- print " (BDINPUTS = $ENV{BDINPUTS})\n";
+ print "EXECUTING $command WITH BDINPUTS = $ENV{BDINPUTS}\n";
}
if ($pathsep eq "\\") {
# Dirty trick to work around idiotic "\" --> "/" conversion
@@ -100,12 +99,65 @@
die "${progname}: $!. Failing command was:\n\t$command\n" if $retval;
}
+# Append ".dep" to the dependency file if necessary.
+sub find_dependency_file ($)
+{
+ my $depfile = $_[0];
+
+ # Return the file as is if it exists.
+ return $depfile if -e $depfile || $depfile =~ /\.dep$/;
+
+ # Return the file with ".dep" appended if that exists.
+ return "${depfile}.dep" if -e "${depfile}.dep";
+
+ # Give up and return the file as specified.
+ return $depfile;
+}
+
+# Try hard to find a configuration file. Return the name of the actual file we
+# located.
+sub find_config_file ($)
+{
+ my $configfile = $_[0];
+ no warnings; # Don't complain if kpsewhich isn't found.
+
+ # Attempt 1: See if the file exists as named.
+ return $configfile if -e $configfile;
+
+ # Attempt 2: Append ".cfg" if it's not already there.
+ my $config_cfg = $configfile;
+ if ($config_cfg !~ /\.cfg$/) {
+ $config_cfg = "${configfile}.cfg";
+ return $config_cfg if -e $config_cfg;
+ }
+
+ # Attempt 3: Use kpsewhich to find the file with ".cfg" appended. (We
+ # don't search for it without ".cfg" because kpsewhich may find a version
+ # with ".tex" appended.)
+ my $kpfound = `kpsewhich $config_cfg`;
+ if (defined $kpfound) {
+ chomp $kpfound;
+ return $kpfound if -e $kpfound;
+ }
+
+ # Give up. Return the file name as specified.
+ return $configfile;
+}
+
# Read a configuration file, and set %uservariable accordingly.
sub process_config_file ($)
{
- my $configfile = $_[0];
+ my $configfile = find_config_file $_[0];
+ printf("CONFIGURATION FILE: %s\n", rel2abs($configfile)) if $verbose;
my $prevline = "";
- open (CONFIGFILE, "<$configfile") || die "${progname}: $! ($configfile)\n";
+ open (CONFIGFILE, "<", $configfile) || do {
+ my $configlist = $configfile;
+ if (! -e $configfile) {
+ # Error is "file not found". List the files we considered.
+ $configlist .= "; also considered ${configfile}.cfg" if $configfile !~ /\.cfg$/;
+ }
+ die "${progname}: $! ($configlist)\n";
+ };
while (my $oneline=<CONFIGFILE>) {
# Read a line and trim it.
chomp $oneline;
@@ -222,7 +274,7 @@
my $numextras = 0;
foreach my $include_glob (@include_files) {
foreach my $include_file (glob $include_glob) {
- push @dependencies, $include_file;
+ push @dependencies, qualifyname $include_file;
$numextras++;
}
}
@@ -255,6 +307,7 @@
$keepdirs = 0;
$verbose = 0;
$localonly = 0;
+my $configfile;
Getopt::Long::Configure("bundling");
GetOptions ('texfile=s' => \$texfile,
'directory=s' => \$docdirname,
@@ -263,7 +316,7 @@
'localonly!' => \$localonly,
'exclude=s' => \@exclude_files,
'include=s' => \@include_files,
- 'config=s' => sub { process_config_file($_[1]) },
+ 'config=s' => \$configfile,
'v|verbose!' => \$verbose,
'listdeps=s' => \@listdeps,
'V|version' => sub { print "bundledoc $VERSION\n"; exit -1 },
@@ -276,7 +329,8 @@
pod2usage (-message => "${progname}: Too few arguments",
-exitval => 1,
-verbose => 0) if $#ARGV==-1;
-$depfile = shift; # Dependencies from snapshot.sty
+$depfile = find_dependency_file shift; # Dependencies from snapshot.sty
+process_config_file $configfile if defined $configfile;
($texfile = $depfile) =~ s/\.[^.]*$/.tex/ if !$texfile; # Main LaTeX source file
($docdirname = basename($depfile)) =~ s/\.[^.]*$// if !$docdirname; # Name to use for the document directory
($ENV{"BDBASE"} = rel2abs($depfile)) =~ s/\.[^.]*$//; # May be needed by user-defined variables
@@ -370,7 +424,7 @@
[B<--version>]
[B<--help>]
[B<-->[B<no>]B<verbose>]
-[B<--texfile>=I<file>]
+[B<--texfile>=I<file.tex>]
[B<--directory>=I<directory>]
[B<-->[B<no>]B<localonly>]
[B<--exclude>=I<string>]
@@ -378,8 +432,8 @@
[B<--manifest>=I<file>]
[B<-->B<listdeps>=[yes|no|only|rel]...]
[B<-->[B<no>]B<keepdirs>]
-[B<--config>=I<file>]
-I<.dep file>
+[B<--config>=I<file.cfg>]
+I<file.dep>
=head1 DESCRIPTION
@@ -414,8 +468,9 @@
main LaTeX document (no extension).
B<bundledoc> requires the name of the dependency file produced by
-B<snapshot> (normally I<somefile>F<.dep>). The following options may
-also be given:
+B<snapshot>, normally I<somefile>F<.dep>). (For convenience, the file
+can be specified without its F<.dep> extension.) The following
+options may also be given:
=over 4
@@ -561,7 +616,8 @@
appropriate configuration (F<.cfg>) file for your TeX distribution and
operating system. B<bundledoc> comes with a few configuration files
and it's easy to write more. See L<"CONFIGURATION FILES"> (below) for
-a description of the configuration file format.
+a description of the configuration file format. For convenience, the
+file can be specified without its F<.cfg> extension.
=back
@@ -654,8 +710,9 @@
bundledoc --config=miktex.cfg myfile.dep
-(In practice, it's probably necessary to specify to C<--config> the
-complete path to B<bundledoc>'s F<miktex.cfg> configuration file.)
+This can be abbreviated to
+
+ bundledoc --config=miktex myfile
The following builds a F<.tar.gz> archive with the TeX Live
distribution running on a Unix-like operating system. B<bundledoc>
@@ -830,8 +887,11 @@
Thanks to Fabien Vignes-Tourneret for suggesting what became the
C<--localonly> option and for a discussion that led to the
-C<--exclude> and C<--include> options; and to Marius Kleiner for
-updating B<bundledoc> to properly handle document subdirectories.
+C<--exclude> and C<--include> options; to Marius Kleiner for updating
+B<bundledoc> to properly handle document subdirectories; and to Frank
+Mittelbach for suggesting using Kpathsea to help find F<.cfg> files
+and to automatically append F<.cfg> and F<.dep> extensions if
+necessary.
=head1 SEE ALSO
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bundledoc.tlpobj new/tlpkg/tlpobj/bundledoc.tlpobj
--- old/tlpkg/tlpobj/bundledoc.tlpobj 2019-02-28 03:23:29.000000000 +0100
+++ new/tlpkg/tlpobj/bundledoc.tlpobj 2019-09-09 01:54:40.000000000 +0200
@@ -1,6 +1,6 @@
name bundledoc
category Package
-revision 47819
+revision 52059
shortdesc Bundle together all the files needed to build a LaTeX document
longdesc The bundledoc package is a post-processor for the snapshot
longdesc package that bundles together all the classes, packages and
@@ -21,7 +21,7 @@
texmf-dist/tex/latex/bundledoc/texlive-unix-arlatex.cfg
texmf-dist/tex/latex/bundledoc/texlive-unix.cfg
catalogue-ctan /support/bundledoc
-catalogue-date 2018-05-23 08:34:52 +0200
+catalogue-date 2019-09-08 18:30:42 +0200
catalogue-license lppl1.3c
catalogue-topics bundle
-catalogue-version 3.3
+catalogue-version 3.4
++++++ businesscard-qrcode.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/businesscard-qrcode.doc.tlpobj new/tlpkg/tlpobj/businesscard-qrcode.doc.tlpobj
--- old/tlpkg/tlpobj/businesscard-qrcode.doc.tlpobj 2019-02-28 03:23:30.000000000 +0100
+++ new/tlpkg/tlpobj/businesscard-qrcode.doc.tlpobj 2020-03-04 23:49:53.000000000 +0100
@@ -1,6 +1,6 @@
name businesscard-qrcode.doc
category Package
-revision 48417
+revision 54080
shortdesc doc files of businesscard-qrcode
relocated 1
docfiles size=158
++++++ businesscard-qrcode.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/businesscard-qrcode.tlpobj new/tlpkg/tlpobj/businesscard-qrcode.tlpobj
--- old/tlpkg/tlpobj/businesscard-qrcode.tlpobj 2019-02-28 03:23:30.000000000 +0100
+++ new/tlpkg/tlpobj/businesscard-qrcode.tlpobj 2020-03-04 23:49:53.000000000 +0100
@@ -1,6 +1,6 @@
name businesscard-qrcode
category Package
-revision 48417
+revision 54080
shortdesc Business cards with QR-Code
relocated 1
longdesc What happens when you give your visiting card to someone?
@@ -22,10 +22,9 @@
longdesc properly.
runfiles size=3
RELOC/tex/xelatex/businesscard-qrcode/businesscard-qrcode.cls
-catalogue-contact-bugs https://mrw.sh/templates/businesscard-qrcode/issues
-catalogue-contact-repository https://mrw.sh/templates/businesscard-qrcode
+catalogue-contact-bugs https://mrw.dev/templates/businesscard-qrcode/issues
+catalogue-contact-repository https://mrw.dev/templates/businesscard-qrcode
catalogue-ctan /macros/xetex/latex/businesscard-qrcode
-catalogue-date 2018-08-18 05:31:14 +0200
catalogue-license lgpl
catalogue-topics class file-card qrcode xetex
catalogue-version 1.2
++++++ bussproofs-extra.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bussproofs-extra/LICENSE.txt new/doc/latex/bussproofs-extra/LICENSE.txt
--- old/doc/latex/bussproofs-extra/LICENSE.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/bussproofs-extra/LICENSE.txt 2019-06-02 23:47:32.000000000 +0200
@@ -0,0 +1,416 @@
+The LaTeX Project Public License
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+LPPL Version 1.3c 2008-05-04
+
+Copyright 1999 2002-2008 LaTeX3 Project
+ Everyone is allowed to distribute verbatim copies of this
+ license document, but modification of it is not allowed.
+
+
+PREAMBLE
+========
+
+The LaTeX Project Public License (LPPL) is the primary license under
+which the LaTeX kernel and the base LaTeX packages are distributed.
+
+You may use this license for any work of which you hold the copyright
+and which you wish to distribute. This license may be particularly
+suitable if your work is TeX-related (such as a LaTeX package), but
+it is written in such a way that you can use it even if your work is
+unrelated to TeX.
+
+The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
+below, gives instructions, examples, and recommendations for authors
+who are considering distributing their works under this license.
+
+This license gives conditions under which a work may be distributed
+and modified, as well as conditions under which modified versions of
+that work may be distributed.
+
+We, the LaTeX3 Project, believe that the conditions below give you
+the freedom to make and distribute modified versions of your work
+that conform with whatever technical specifications you wish while
+maintaining the availability, integrity, and reliability of
+that work. If you do not see how to achieve your goal while
+meeting these conditions, then read the document `cfgguide.tex'
+and `modguide.tex' in the base LaTeX distribution for suggestions.
+
+
+DEFINITIONS
+===========
+
+In this license document the following terms are used:
+
+ `Work'
+ Any work being distributed under this License.
+
+ `Derived Work'
+ Any work that under any applicable law is derived from the Work.
+
+ `Modification'
+ Any procedure that produces a Derived Work under any applicable
+ law -- for example, the production of a file containing an
+ original file associated with the Work or a significant portion of
+ such a file, either verbatim or with modifications and/or
+ translated into another language.
+
+ `Modify'
+ To apply any procedure that produces a Derived Work under any
+ applicable law.
+
+ `Distribution'
+ Making copies of the Work available from one person to another, in
+ whole or in part. Distribution includes (but is not limited to)
+ making any electronic components of the Work accessible by
+ file transfer protocols such as FTP or HTTP or by shared file
+ systems such as Sun's Network File System (NFS).
+
+ `Compiled Work'
+ A version of the Work that has been processed into a form where it
+ is directly usable on a computer system. This processing may
+ include using installation facilities provided by the Work,
+ transformations of the Work, copying of components of the Work, or
+ other activities. Note that modification of any installation
+ facilities provided by the Work constitutes modification of the Work.
+
+ `Current Maintainer'
+ A person or persons nominated as such within the Work. If there is
+ no such explicit nomination then it is the `Copyright Holder' under
+ any applicable law.
+
+ `Base Interpreter'
+ A program or process that is normally needed for running or
+ interpreting a part or the whole of the Work.
+
+ A Base Interpreter may depend on external components but these
+ are not considered part of the Base Interpreter provided that each
+ external component clearly identifies itself whenever it is used
+ interactively. Unless explicitly specified when applying the
+ license to the Work, the only applicable Base Interpreter is a
+ `LaTeX-Format' or in the case of files belonging to the
+ `LaTeX-format' a program implementing the `TeX language'.
+
+
+
+CONDITIONS ON DISTRIBUTION AND MODIFICATION
+===========================================
+
+1. Activities other than distribution and/or modification of the Work
+are not covered by this license; they are outside its scope. In
+particular, the act of running the Work is not restricted and no
+requirements are made concerning any offers of support for the Work.
+
+2. You may distribute a complete, unmodified copy of the Work as you
+received it. Distribution of only part of the Work is considered
+modification of the Work, and no right to distribute such a Derived
+Work may be assumed under the terms of this clause.
+
+3. You may distribute a Compiled Work that has been generated from a
+complete, unmodified copy of the Work as distributed under Clause 2
+above, as long as that Compiled Work is distributed in such a way that
+the recipients may install the Compiled Work on their system exactly
+as it would have been installed if they generated a Compiled Work
+directly from the Work.
+
+4. If you are the Current Maintainer of the Work, you may, without
+restriction, modify the Work, thus creating a Derived Work. You may
+also distribute the Derived Work without restriction, including
+Compiled Works generated from the Derived Work. Derived Works
+distributed in this manner by the Current Maintainer are considered to
+be updated versions of the Work.
+
+5. If you are not the Current Maintainer of the Work, you may modify
+your copy of the Work, thus creating a Derived Work based on the Work,
+and compile this Derived Work, thus creating a Compiled Work based on
+the Derived Work.
+
+6. If you are not the Current Maintainer of the Work, you may
+distribute a Derived Work provided the following conditions are met
+for every component of the Work unless that component clearly states
+in the copyright notice that it is exempt from that condition. Only
+the Current Maintainer is allowed to add such statements of exemption
+to a component of the Work.
+
+ a. If a component of this Derived Work can be a direct replacement
+ for a component of the Work when that component is used with the
+ Base Interpreter, then, wherever this component of the Work
+ identifies itself to the user when used interactively with that
+ Base Interpreter, the replacement component of this Derived Work
+ clearly and unambiguously identifies itself as a modified version
+ of this component to the user when used interactively with that
+ Base Interpreter.
+
+ b. Every component of the Derived Work contains prominent notices
+ detailing the nature of the changes to that component, or a
+ prominent reference to another file that is distributed as part
+ of the Derived Work and that contains a complete and accurate log
+ of the changes.
+
+ c. No information in the Derived Work implies that any persons,
+ including (but not limited to) the authors of the original version
+ of the Work, provide any support, including (but not limited to)
+ the reporting and handling of errors, to recipients of the
+ Derived Work unless those persons have stated explicitly that
+ they do provide such support for the Derived Work.
+
+ d. You distribute at least one of the following with the Derived Work:
+
+ 1. A complete, unmodified copy of the Work;
+ if your distribution of a modified component is made by
+ offering access to copy the modified component from a
+ designated place, then offering equivalent access to copy
+ the Work from the same or some similar place meets this
+ condition, even though third parties are not compelled to
+ copy the Work along with the modified component;
+
+ 2. Information that is sufficient to obtain a complete,
+ unmodified copy of the Work.
+
+7. If you are not the Current Maintainer of the Work, you may
+distribute a Compiled Work generated from a Derived Work, as long as
+the Derived Work is distributed to all recipients of the Compiled
+Work, and as long as the conditions of Clause 6, above, are met with
+regard to the Derived Work.
+
+8. The conditions above are not intended to prohibit, and hence do not
+apply to, the modification, by any method, of any component so that it
+becomes identical to an updated version of that component of the Work as
+it is distributed by the Current Maintainer under Clause 4, above.
+
+9. Distribution of the Work or any Derived Work in an alternative
+format, where the Work or that Derived Work (in whole or in part) is
+then produced by applying some process to that format, does not relax or
+nullify any sections of this license as they pertain to the results of
+applying that process.
+
+10. a. A Derived Work may be distributed under a different license
+ provided that license itself honors the conditions listed in
+ Clause 6 above, in regard to the Work, though it does not have
+ to honor the rest of the conditions in this license.
+
+ b. If a Derived Work is distributed under a different license, that
+ Derived Work must provide sufficient documentation as part of
+ itself to allow each recipient of that Derived Work to honor the
+ restrictions in Clause 6 above, concerning changes from the Work.
+
+11. This license places no restrictions on works that are unrelated to
+the Work, nor does this license place any restrictions on aggregating
+such works with the Work by any means.
+
+12. Nothing in this license is intended to, or may be used to, prevent
+complete compliance by all parties with all applicable laws.
+
+
+NO WARRANTY
+===========
+
+There is no warranty for the Work. Except when otherwise stated in
+writing, the Copyright Holder provides the Work `as is', without
+warranty of any kind, either expressed or implied, including, but not
+limited to, the implied warranties of merchantability and fitness for a
+particular purpose. The entire risk as to the quality and performance
+of the Work is with you. Should the Work prove defective, you assume
+the cost of all necessary servicing, repair, or correction.
+
+In no event unless required by applicable law or agreed to in writing
+will The Copyright Holder, or any author named in the components of the
+Work, or any other party who may distribute and/or modify the Work as
+permitted above, be liable to you for damages, including any general,
+special, incidental or consequential damages arising out of any use of
+the Work or out of inability to use the Work (including, but not limited
+to, loss of data, data being rendered inaccurate, or losses sustained by
+anyone as a result of any failure of the Work to operate with any other
+programs), even if the Copyright Holder or said author or said other
+party has been advised of the possibility of such damages.
+
+
+MAINTENANCE OF THE WORK
+=======================
+
+The Work has the status `author-maintained' if the Copyright Holder
+explicitly and prominently states near the primary copyright notice in
+the Work that the Work can only be maintained by the Copyright Holder
+or simply that it is `author-maintained'.
+
+The Work has the status `maintained' if there is a Current Maintainer
+who has indicated in the Work that they are willing to receive error
+reports for the Work (for example, by supplying a valid e-mail
+address). It is not required for the Current Maintainer to acknowledge
+or act upon these error reports.
+
+The Work changes from status `maintained' to `unmaintained' if there
+is no Current Maintainer, or the person stated to be Current
+Maintainer of the work cannot be reached through the indicated means
+of communication for a period of six months, and there are no other
+significant signs of active maintenance.
+
+You can become the Current Maintainer of the Work by agreement with
+any existing Current Maintainer to take over this role.
+
+If the Work is unmaintained, you can become the Current Maintainer of
+the Work through the following steps:
+
+ 1. Make a reasonable attempt to trace the Current Maintainer (and
+ the Copyright Holder, if the two differ) through the means of
+ an Internet or similar search.
+
+ 2. If this search is successful, then enquire whether the Work
+ is still maintained.
+
+ a. If it is being maintained, then ask the Current Maintainer
+ to update their communication data within one month.
+
+ b. If the search is unsuccessful or no action to resume active
+ maintenance is taken by the Current Maintainer, then announce
+ within the pertinent community your intention to take over
+ maintenance. (If the Work is a LaTeX work, this could be
+ done, for example, by posting to comp.text.tex.)
+
+ 3a. If the Current Maintainer is reachable and agrees to pass
+ maintenance of the Work to you, then this takes effect
+ immediately upon announcement.
+
+ b. If the Current Maintainer is not reachable and the Copyright
+ Holder agrees that maintenance of the Work be passed to you,
+ then this takes effect immediately upon announcement.
+
+ 4. If you make an `intention announcement' as described in 2b. above
+ and after three months your intention is challenged neither by
+ the Current Maintainer nor by the Copyright Holder nor by other
+ people, then you may arrange for the Work to be changed so as
+ to name you as the (new) Current Maintainer.
+
+ 5. If the previously unreachable Current Maintainer becomes
+ reachable once more within three months of a change completed
+ under the terms of 3b) or 4), then that Current Maintainer must
+ become or remain the Current Maintainer upon request provided
+ they then update their communication data within one month.
+
+A change in the Current Maintainer does not, of itself, alter the fact
+that the Work is distributed under the LPPL license.
+
+If you become the Current Maintainer of the Work, you should
+immediately provide, within the Work, a prominent and unambiguous
+statement of your status as Current Maintainer. You should also
+announce your new status to the same pertinent community as
+in 2b) above.
+
+
+WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
+======================================================
+
+This section contains important instructions, examples, and
+recommendations for authors who are considering distributing their
+works under this license. These authors are addressed as `you' in
+this section.
+
+Choosing This License or Another License
+----------------------------------------
+
+If for any part of your work you want or need to use *distribution*
+conditions that differ significantly from those in this license, then
+do not refer to this license anywhere in your work but, instead,
+distribute your work under a different license. You may use the text
+of this license as a model for your own license, but your license
+should not refer to the LPPL or otherwise give the impression that
+your work is distributed under the LPPL.
+
+The document `modguide.tex' in the base LaTeX distribution explains
+the motivation behind the conditions of this license. It explains,
+for example, why distributing LaTeX under the GNU General Public
+License (GPL) was considered inappropriate. Even if your work is
+unrelated to LaTeX, the discussion in `modguide.tex' may still be
+relevant, and authors intending to distribute their works under any
+license are encouraged to read it.
+
+A Recommendation on Modification Without Distribution
+-----------------------------------------------------
+
+It is wise never to modify a component of the Work, even for your own
+personal use, without also meeting the above conditions for
+distributing the modified component. While you might intend that such
+modifications will never be distributed, often this will happen by
+accident -- you may forget that you have modified that component; or
+it may not occur to you when allowing others to access the modified
+version that you are thus distributing it and violating the conditions
+of this license in ways that could have legal implications and, worse,
+cause problems for the community. It is therefore usually in your
+best interest to keep your copy of the Work identical with the public
+one. Many works provide ways to control the behavior of that work
+without altering any of its licensed components.
+
+How to Use This License
+-----------------------
+
+To use this license, place in each of the components of your work both
+an explicit copyright notice including your name and the year the work
+was authored and/or last substantially modified. Include also a
+statement that the distribution and/or modification of that
+component is constrained by the conditions in this license.
+
+Here is an example of such a notice and statement:
+
+ %% pig.dtx
+ %% Copyright 2005 M. Y. Name
+ %
+ % 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 M. Y. Name.
+ %
+ % This work consists of the files pig.dtx and pig.ins
+ % and the derived file pig.sty.
+
+Given such a notice and statement in a file, the conditions
+given in this license document would apply, with the `Work' referring
+to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
+generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
+referring to any `LaTeX-Format', and both `Copyright Holder' and
+`Current Maintainer' referring to the person `M. Y. Name'.
+
+If you do not want the Maintenance section of LPPL to apply to your
+Work, change `maintained' above into `author-maintained'.
+However, we recommend that you use `maintained', as the Maintenance
+section was added in order to ensure that your Work remains useful to
+the community even when you can no longer maintain and support it
+yourself.
+
+Derived Works That Are Not Replacements
+---------------------------------------
+
+Several clauses of the LPPL specify means to provide reliability and
+stability for the user community. They therefore concern themselves
+with the case that a Derived Work is intended to be used as a
+(compatible or incompatible) replacement of the original Work. If
+this is not the case (e.g., if a few lines of code are reused for a
+completely different task), then clauses 6b and 6d shall not apply.
+
+
+Important Recommendations
+-------------------------
+
+ Defining What Constitutes the Work
+
+ The LPPL requires that distributions of the Work contain all the
+ files of the Work. It is therefore important that you provide a
+ way for the licensee to determine which files constitute the Work.
+ This could, for example, be achieved by explicitly listing all the
+ files of the Work near the copyright notice of each file or by
+ using a line such as:
+
+ % This work consists of all files listed in manifest.txt.
+
+ in that place. In the absence of an unequivocal list it might be
+ impossible for the licensee to determine what is considered by you
+ to comprise the Work and, in such a case, the licensee would be
+ entitled to make reasonable conjectures as to which files comprise
+ the Work.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bussproofs-extra/README.md new/doc/latex/bussproofs-extra/README.md
--- old/doc/latex/bussproofs-extra/README.md 2019-04-04 22:59:56.000000000 +0200
+++ new/doc/latex/bussproofs-extra/README.md 2019-06-02 23:47:32.000000000 +0200
@@ -11,9 +11,6 @@
To generate the documentation, run
```
pdflatex bussproofs-extra.dtx
-makeindex -s gglo.ist -o bussproofs-extra.gls bussproofs-extra.glo
-pdflatex bussproofs-extra.dtx
-pdflatex bussproofs-extra.dtx
```
This package is distributed under the terms of the LPPL 1.3c
Binary files old/doc/latex/bussproofs-extra/bussproofs-extra.pdf and new/doc/latex/bussproofs-extra/bussproofs-extra.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bussproofs-extra.doc.tlpobj new/tlpkg/tlpobj/bussproofs-extra.doc.tlpobj
--- old/tlpkg/tlpobj/bussproofs-extra.doc.tlpobj 2019-04-06 23:32:27.000000000 +0200
+++ new/tlpkg/tlpobj/bussproofs-extra.doc.tlpobj 2019-06-03 01:38:43.000000000 +0200
@@ -1,9 +1,10 @@
name bussproofs-extra.doc
category Package
-revision 50760
+revision 51299
shortdesc doc files of bussproofs-extra
relocated 1
-docfiles size=59
+docfiles size=63
+ RELOC/doc/latex/bussproofs-extra/LICENSE.txt
RELOC/doc/latex/bussproofs-extra/README.md
RELOC/doc/latex/bussproofs-extra/bpextra.sty
RELOC/doc/latex/bussproofs-extra/bussproofs-extra.pdf
++++++ bussproofs-extra.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bussproofs-extra/bussproofs-extra.sty new/tex/latex/bussproofs-extra/bussproofs-extra.sty
--- old/tex/latex/bussproofs-extra/bussproofs-extra.sty 2019-04-04 22:59:56.000000000 +0200
+++ new/tex/latex/bussproofs-extra/bussproofs-extra.sty 2019-06-02 23:47:32.000000000 +0200
@@ -22,26 +22,34 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bussproofs-extra}
- [2019/04/04 0.3 Extra commands for bussproofs.sty]
-
+ [2019/05/31 0.4 Extra commands for bussproofs.sty]
\RequirePackage{bussproofs}
\RequirePackage{tikz}
-
\newdimen\CenterCorrection
\newdimen\DiagCorrection
+\newbox\myBoxLLL
+\newbox\myBoxRLL
+\tikzset{
+ deduceLine/.style = {line width=1.1pt, loosely dotted}}
\def\straightDeduce{%
- \gdef\fDeduce{\tikz\draw[very thick,loosely dotted] (0,0) -- (0,1);}
+ \gdef\fDeduce{\tikz\draw[deduceLine] (0,0) -- (0,1);}
+ \global\DiagCorrection=0pt
+ \ignorespaces
+}
+
+\def\shortDeduce{%
+ \gdef\fDeduce{\tikz\draw[deduceLine] (0,0) -- (0,.5);}
\global\DiagCorrection=0pt
\ignorespaces
}
\def\branchDeduce{%
\gdef\fDeduce{\begin{tikzpicture}
- \draw[very thick,loosely dotted] (0,0) -- (0,1);
- \draw[very thick,loosely dotted] (-.5,.5) -- (0,0);
- \draw[very thick,loosely dotted] (.5,.5) -- (0,0);
+ \draw[deduceLine] (0,0) -- (0,1);
+ \draw[deduceLine] (-.5,.5) -- (0,0);
+ \draw[deduceLine] (.5,.5) -- (0,0);
\end{tikzpicture}}
\global\DiagCorrection=0pt
\ignorespaces
@@ -49,7 +57,7 @@
\def\ddotsDeduce{%
\gdef\fDeduce{\begin{tikzpicture}
- \draw[very thick,loosely dotted] (0,1) -- (1,0);
+ \draw[deduceLine] (0,1) -- (1,0);
\end{tikzpicture}}
\setbox\myBoxA=\hbox{\fDeduce}
\global\DiagCorrection=-\wd\myBoxA
@@ -58,21 +66,18 @@
\def\dotsdDeduce{%
\gdef\fDeduce{\begin{tikzpicture}
- \draw[very thick,loosely dotted] (1,1) -- (0,0);
+ \draw[deduceLine] (1,1) -- (0,0);
\end{tikzpicture}}
\setbox\myBoxA=\hbox{\fDeduce}
\global\DiagCorrection=\wd\myBoxA
\ignorespaces
}
-
\def\alwaysDeduce{\straightDeduce}
\straightDeduce
-
\def\Deduce$#1\fCenter#2${%
\prepUnary%
\buildConclusion{#1}{#2}%
- \setbox\myBoxA=\hbox{\fCenter}
- % if we align at \fCenter, move \fDeduce left by 1/2 width of \fCenter
+ \setbox\myBoxA=\hbox{\fCenter}%
\global\CenterCorrection=-.5\wd\myBoxA
\joinDeduce%
\resetInferenceDefaults%
@@ -82,9 +87,7 @@
\def\DeduceC#1{
\prepUnary%
\buildConclusionC{#1}%
- % vdot alignment is off by a bit, correct
- \global\CenterCorrection=-4pt
- % Align and join the curBox and the new box into one vbox.
+ \global\CenterCorrection=0pt
\joinDeduce%
\resetInferenceDefaults%
\ignorespaces%
@@ -109,17 +112,6 @@
\kernUpperBox%
\fi%
\advance\curCenter by-.5\DiagCorrection
- %\ifnum \newScoreStart < \curScoreStart %
- % \global \curScoreStart = \newScoreStart \fi%
- %\ifnum \curScoreEnd < \newScoreEnd %
- % \global \curScoreEnd = \newScoreEnd \fi%
- % Leave room for the left label.
- %\ifnum \curScoreStart<\wd\myBoxLL%
- % \global\displace = \wd\myBoxLL%
- % \global\advance\displace by -\curScoreStart%
- % \kernUpperBox%
- % \kernLowerBox%
- %\fi%
\buildDeduce%
\buildScoreLabels%
\ifx\rootAtBottomFlag\myTrue%
@@ -146,45 +138,33 @@
\def\LeftLineLabel#1{%
\global\def\displayLeftLineLabel{%
- \llap{#1\hskip\ScoreOverhangLeft\hskip\labelSpacing}}
+ {#1\hskip\labelSpacing}}
\ignorespaces}
\def\RightLineLabel#1{%
- \global\def\displayRightLineLabel{
- \rlap{\hskip\ScoreOverhangLeft\hskip\labelSpacing #1}}
+ \global\def\displayRightLineLabel{%
+ {\hskip\labelSpacing #1}}
\ignorespaces}
\global\let\displayLeftLineLabel\relax
\global\let\displayRightLineLabel\relax
-
\def\LeftSubproofLabel#1{%
\global\setbox\curBox =
-<<<<<<< HEAD:bussproofs-extra.dtx
- \hbox{\vbox to \ht\curBox{\vfil\llap{#1
- $\left\{\vrule height .5\ht\curBox width 0pt\right.$}\vfil}\box\curBox}%
-=======
\hbox{\vbox to \ht\curBox{%
\vfil
\llap{#1$\left\{\vrule height .5\ht\curBox width 0pt\right.$}%
\vfil}\box\curBox}%
->>>>>>> 4823829694ec2392dad7e3c55cd366f991c7c6db:bpextra.dtx
}
\def\RightSubproofLabel#1{%
\displace=\ht\curBox
\global\setbox\curBox =
-<<<<<<< HEAD:bussproofs-extra.dtx
- \hbox{\box\curBox\vbox to \displace{\vfil
- \rlap{$\left.\vrule height .5\displace width 0pt\right\}$#1}\vfil}}%
-=======
\hbox{\box\curBox\vbox to \displace{%
\vfil
- \rlap{$\left.\vrule height .5\displace width 0pt\right\}$#1}
+ \rlap{$\left.\vrule height .5\displace width 0pt\right\}$#1}%
\vfil}}%
->>>>>>> 4823829694ec2392dad7e3c55cd366f991c7c6db:bpextra.dtx
}
-
\def\resetInferenceDefaults{%
\global\def\theHypSeparation{\defaultHypSeparation}%
\global\setbox\myBoxLL=\hbox{\defaultLeftLabel}%
@@ -204,16 +184,29 @@
\prepAxiom%
% Define the boxes
% bpextra -- add line labels
- \setbox\myBoxA=\hbox{\displayLeftLineLabel$\mathord{#1}\fCenter\mathord{\relax}$}% %bpextra
- \setbox\myBoxB=\hbox{$#2$\displayRightLineLabel}% %bpextra
+ \setbox\myBoxA=\hbox{$\mathord{#1}\fCenter\mathord{\relax}$}%
+ \setbox\myBoxB=\hbox{$#2$}% %bpextra
+ \setbox\myBoxLLL=\hbox{\displayLeftLineLabel}% %bpextra
+ \setbox\myBoxRLL=\hbox{\displayRightLineLabel}% %bpextra
\global\setbox\curBox=%
- \hbox{\hskip\ScoreOverhangLeft\relax%
- \unhcopy\myBoxA\unhcopy\myBoxB\hskip\ScoreOverhangRight\relax}%
+ \hbox{\unhcopy\myBoxLLL%bpextra
+ \hskip\ScoreOverhangLeft\relax
+ \unhcopy\myBoxA
+ \unhcopy\myBoxB
+ \hskip\ScoreOverhangRight
+ \unhcopy\myBoxRLL}%bpextra
% Set the relevant dimensions for the boxes
\global\curScoreStart=0pt \relax
\global\curScoreEnd=\wd\curBox \relax
- \global\curCenter=\wd\myBoxA \relax
+ \global\curCenter=\wd\myBoxA \relax %bpextra
\global\advance \curCenter by \ScoreOverhangLeft%
+ % bpextra adjust by dimensions of labels
+ \global\advance \curCenter by \wd\myBoxLLL%bpextra
+ \global\advance\curScoreStart by \wd\myBoxLLL%bpextra
+ \global\advance\curScoreEnd by -\wd\myBoxRLL%bpextra
+ % reset line labels to nothing %bpextra
+ \global\let\displayLeftLineLabel\relax %bpextra
+ \global\let\displayRightLineLabel\relax %bpextra
\ignorespaces
}
@@ -221,44 +214,80 @@
% Get level and correct names set.
\prepAxiom%
% Define the box.
- \setbox\myBoxA=\hbox{\displayLeftLineLabel #1\displayRightLineLabel}% %bpextra
+ \setbox\myBoxA=\hbox{#1}%
+ \setbox\myBoxLLL=\hbox{\displayLeftLineLabel}% %bpextra
+ \setbox\myBoxRLL=\hbox{\displayRightLineLabel}% %bpextra
\global\setbox\curBox =%
- \hbox{\hskip\ScoreOverhangLeft\relax%
- \unhcopy\myBoxA\hskip\ScoreOverhangRight\relax}%
+ \hbox{\unhcopy\myBoxLLL%bpextra
+ \hskip\ScoreOverhangLeft\relax%
+ \unhcopy\myBoxA
+ \hskip\ScoreOverhangRight\relax
+ \unhcopy\myBoxRLL}% %bpextra
% Set the relevant dimensions for the boxes
\global\curScoreStart=0pt \relax
\global\curScoreEnd=\wd\curBox \relax
- \global\curCenter=.5\wd\curBox \relax
+ \global\curCenter=.5\wd\myBoxA \relax %bpextra
\global\advance \curCenter by \ScoreOverhangLeft%
+ % bpextra adjust by dimensions of labels
+ \global\advance \curCenter by \wd\myBoxLLL%bpextra
+ \global\advance\curScoreStart by \wd\myBoxLLL%bpextra
+ \global\advance\curScoreEnd by -\wd\myBoxRLL%bpextra
+ % reset line labels to nothing %bpextra
+ \global\let\displayLeftLineLabel\relax %bpextra
+ \global\let\displayRightLineLabel\relax %bpextra
\ignorespaces
}
\def\buildConclusion#1#2{% Build lower sequent w/ center at \fCenter position.
% Define the boxes
- \setbox\myBoxA=\hbox{\displayLeftLineLabel $\mathord{#1}\fCenter\mathord{\relax}$}% %bpextra
- \setbox\myBoxB=\hbox{$#2$\displayRightLineLabel}% %bpextra
+ \setbox\myBoxA=\hbox{$\mathord{#1}\fCenter\mathord{\relax}$}%
+ \setbox\myBoxB=\hbox{$#2$}%
+ \setbox\myBoxLLL=\hbox{\displayLeftLineLabel}% %bpextra
+ \setbox\myBoxRLL=\hbox{\displayRightLineLabel}% %bpextra
% Put them together in \myBoxC
\setbox\myBoxC =%
- \hbox{\hskip\ScoreOverhangLeft\relax%
- \unhcopy\myBoxA\unhcopy\myBoxB\hskip\ScoreOverhangRight\relax}%
+ \hbox{\unhcopy\myBoxLLL%bpextra
+ \hskip\ScoreOverhangLeft\relax%
+ \unhcopy\myBoxA\unhcopy\myBoxB
+ \hskip\ScoreOverhangRight
+ \unhcopy\myBoxRLL}% %bpextra
% Calculate the center of the \myBoxC string.
\newScoreStart=0pt \relax%
\newCenter=\wd\myBoxA \relax%
\advance \newCenter by \ScoreOverhangLeft%
\newScoreEnd=\wd\myBoxC%
+ % bpextra adjust by dimensions of labels
+ \global\advance\newCenter by \wd\myBoxLLL%bpextra
+ \global\advance\newScoreStart by \wd\myBoxLLL%bpextra
+ \global\advance\newScoreEnd by -\wd\myBoxRLL%bpextra
+ % reset line labels to nothing %bpextra
+ \global\let\displayLeftLineLabel\relax %bpextra
+ \global\let\displayRightLineLabel\relax %bpextra
}
\def\buildConclusionC#1{% Build lower sequent w/o \fCenter present.
% Define the box.
- \setbox\myBoxA=\hbox{\displayLeftLineLabel #1\displayRightLineLabel}% %bpextra
- \setbox\myBoxC =%
- \hbox{\hbox{\hskip\ScoreOverhangLeft\relax%
- \unhcopy\myBoxA\hskip\ScoreOverhangRight\relax}}%
+ \setbox\myBoxA=\hbox{#1}%
+ \setbox\myBoxLLL=\hbox{\displayLeftLineLabel}% %bpextra
+ \setbox\myBoxRLL=\hbox{\displayRightLineLabel}% %bpextra
+\setbox\myBoxC =%
+ \hbox{\unhcopy\myBoxLLL%bpextra
+ \hskip\ScoreOverhangLeft\relax%
+ \unhcopy\myBoxA
+ \hskip\ScoreOverhangRight
+ \unhcopy\myBoxRLL}%bpextra
% Calculate kerning to line up centers
\newScoreStart=0pt \relax%
- \newCenter=.5\wd\myBoxC \relax%
+ \newCenter=.5\wd\myBoxA \relax% bpextra
\newScoreEnd=\wd\myBoxC%
\advance \newCenter by \ScoreOverhangLeft%
+ % bpextra adjust by dimensions of labels
+ \global\advance\newCenter by \wd\myBoxLLL%bpextra
+ \global\advance\newScoreStart by \wd\myBoxLLL%bpextra
+ \global\advance\newScoreEnd by -\wd\myBoxRLL%bpextra
+ % reset line labels to nothing %bpextra
+ \global\let\displayLeftLineLabel\relax %bpextra
+ \global\let\displayRightLineLabel\relax %bpextra
}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bussproofs-extra.tlpobj new/tlpkg/tlpobj/bussproofs-extra.tlpobj
--- old/tlpkg/tlpobj/bussproofs-extra.tlpobj 2019-04-06 23:32:27.000000000 +0200
+++ new/tlpkg/tlpobj/bussproofs-extra.tlpobj 2019-06-03 01:38:43.000000000 +0200
@@ -1,6 +1,6 @@
name bussproofs-extra
category Package
-revision 50760
+revision 51299
shortdesc Extra commands for bussproofs.sty
relocated 1
longdesc This package provides additional functionality for
@@ -12,7 +12,7 @@
catalogue-contact-bugs https://github.com/OpenLogicProject/bussproofs-extra/issues
catalogue-contact-repository https://github.com/OpenLogicProject/bussproofs-extra
catalogue-ctan /macros/latex/contrib/bussproofs-extra
-catalogue-date 2019-04-06 05:16:17 +0200
+catalogue-date 2019-06-02 18:10:17 +0200
catalogue-license lppl1.3c
catalogue-topics maths proof
-catalogue-version 0.3
+catalogue-version 0.4
++++++ bussproofs.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bussproofs.doc.tlpobj new/tlpkg/tlpobj/bussproofs.doc.tlpobj
--- old/tlpkg/tlpobj/bussproofs.doc.tlpobj 2019-02-28 03:23:30.000000000 +0100
+++ new/tlpkg/tlpobj/bussproofs.doc.tlpobj 2020-03-04 23:49:54.000000000 +0100
@@ -1,6 +1,6 @@
name bussproofs.doc
category Package
-revision 27488
+revision 54080
shortdesc doc files of bussproofs
relocated 1
docfiles size=42
++++++ bussproofs.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bussproofs.tlpobj new/tlpkg/tlpobj/bussproofs.tlpobj
--- old/tlpkg/tlpobj/bussproofs.tlpobj 2019-02-28 03:23:30.000000000 +0100
+++ new/tlpkg/tlpobj/bussproofs.tlpobj 2020-03-04 23:49:54.000000000 +0100
@@ -1,6 +1,6 @@
name bussproofs
category Package
-revision 27488
+revision 54080
shortdesc Proof trees in the style of the sequent calculus
relocated 1
longdesc The package allows the construction of proof trees in the style
@@ -13,10 +13,9 @@
longdesc the package file itself.
runfiles size=10
RELOC/tex/latex/bussproofs/bussproofs.sty
-catalogue-also ebproof
+catalogue-also bussproofs-extra ebproof
catalogue-contact-home http://math.ucsd.edu/~sbuss/ResearchWeb/bussproofs/
catalogue-ctan /macros/latex/contrib/bussproofs
-catalogue-date 2018-01-06 12:14:59 +0100
catalogue-license lppl1.3
catalogue-topics maths proof
catalogue-version 1.1
++++++ bxcalc.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxcalc/LICENSE new/doc/latex/bxcalc/LICENSE
--- old/doc/latex/bxcalc/LICENSE 2018-01-30 01:29:08.000000000 +0100
+++ new/doc/latex/bxcalc/LICENSE 2019-11-27 23:05:18.000000000 +0100
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2018 Takayuki YATO (aka. "ZR")
+Copyright (c) 2018-2019 Takayuki YATO (aka. "ZR")
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxcalc/README-ja.md new/doc/latex/bxcalc/README-ja.md
--- old/doc/latex/bxcalc/README-ja.md 2018-01-30 01:29:08.000000000 +0100
+++ new/doc/latex/bxcalc/README-ja.md 2019-11-27 23:05:18.000000000 +0100
@@ -51,6 +51,9 @@
更新履歴
--------
+ * Version 1.0b 〈2019/11/24〉
+ - バグ修正。
+
* Version 1.0a 〈2018/01/28〉
- (試験的) `\usepTeXunits` 命令を追加。
- バグ修正。
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxcalc/README.md new/doc/latex/bxcalc/README.md
--- old/doc/latex/bxcalc/README.md 2018-01-30 01:29:08.000000000 +0100
+++ new/doc/latex/bxcalc/README.md 2019-11-27 23:05:18.000000000 +0100
@@ -52,6 +52,9 @@
Revision History
----------------
+ * Version 1.0b 〈2019/11/24〉
+ - Bug fix.
+
* Version 1.0a 〈2018/01/28〉
- Bug fix.
Binary files old/doc/latex/bxcalc/bxcalcize.pdf and new/doc/latex/bxcalc/bxcalcize.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxcalc/bxcalcize.tex new/doc/latex/bxcalc/bxcalcize.tex
--- old/doc/latex/bxcalc/bxcalcize.tex 2018-01-30 01:29:08.000000000 +0100
+++ new/doc/latex/bxcalc/bxcalcize.tex 2019-11-27 23:05:18.000000000 +0100
@@ -2,8 +2,8 @@
\usepackage[scale=0.75]{geometry}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{1.0a}
-\newcommand{\PkgDate}{2018/01/28}
+\newcommand{\PkgVersion}{1.0b}
+\newcommand{\PkgDate}{2019/11/24}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\textit{#1}$\rangle$}
\newcommand{\Note}{\par\noindent \textbf{NB:}\quad}
Binary files old/doc/latex/bxcalc/bxcalcux.pdf and new/doc/latex/bxcalc/bxcalcux.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxcalc/bxcalcux.tex new/doc/latex/bxcalc/bxcalcux.tex
--- old/doc/latex/bxcalc/bxcalcux.tex 2018-01-30 01:29:08.000000000 +0100
+++ new/doc/latex/bxcalc/bxcalcux.tex 2019-11-27 23:05:18.000000000 +0100
@@ -2,8 +2,8 @@
\usepackage[scale=0.75]{geometry}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{1.0a}
-\newcommand{\PkgDate}{2018/01/28}
+\newcommand{\PkgVersion}{1.0b}
+\newcommand{\PkgDate}{2019/11/24}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\textit{#1}$\rangle$}
\newcommand{\Note}{\par\noindent \textbf{NB:}\quad}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxcalc.doc.tlpobj new/tlpkg/tlpobj/bxcalc.doc.tlpobj
--- old/tlpkg/tlpobj/bxcalc.doc.tlpobj 2019-02-28 03:23:33.000000000 +0100
+++ new/tlpkg/tlpobj/bxcalc.doc.tlpobj 2019-11-28 01:56:44.000000000 +0100
@@ -1,6 +1,6 @@
name bxcalc.doc
category Package
-revision 46482
+revision 52947
shortdesc doc files of bxcalc
relocated 1
docfiles size=91
++++++ bxcalc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxcalc/bxcalc.sty new/tex/latex/bxcalc/bxcalc.sty
--- old/tex/latex/bxcalc/bxcalc.sty 2018-01-30 01:29:08.000000000 +0100
+++ new/tex/latex/bxcalc/bxcalc.sty 2019-11-27 23:05:18.000000000 +0100
@@ -1,7 +1,7 @@
%%
%% This is file 'bxcalc.sty'.
%%
-%% Copyright (c) 2018 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2018-2019 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxcalc}[2018/01/28 v1.0a]
+\ProvidesPackage{bxcalc}[2019/11/24 v1.0b]
\def\bxqcz@pkgname{bxcalc}
%--------------------------------------- main
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxcalc/bxcalcize.sty new/tex/latex/bxcalc/bxcalcize.sty
--- old/tex/latex/bxcalc/bxcalcize.sty 2018-01-30 01:29:08.000000000 +0100
+++ new/tex/latex/bxcalc/bxcalcize.sty 2019-11-27 23:05:18.000000000 +0100
@@ -1,7 +1,7 @@
%%
%% This is file 'bxcalcize.sty'.
%%
-%% Copyright (c) 2018 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2018-2019 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxcalcize}[2018/01/28 v1.0a]
+\ProvidesPackage{bxcalcize}[2019/11/24 v1.0b]
\def\bxcy@pkgname{bxcalcize}
%% code guards
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxcalc/bxcalcux.sty new/tex/latex/bxcalc/bxcalcux.sty
--- old/tex/latex/bxcalc/bxcalcux.sty 2018-01-30 01:29:08.000000000 +0100
+++ new/tex/latex/bxcalc/bxcalcux.sty 2019-11-27 23:05:18.000000000 +0100
@@ -1,7 +1,7 @@
%%
%% This is file 'bxcalcux.sty'.
%%
-%% Copyright (c) 2018 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2018-2019 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxcalcux}[2018/01/28 v1.0a]
+\ProvidesPackage{bxcalcux}[2019/11/24 v1.0b]
\def\bxcx@pkgname{bxcalcux}
%% code guards
@@ -195,7 +195,7 @@
}
\def\bxcx@parse@cs#1{
%\typeout{<cs:\string#1>}
- \bxcx@cond\ifx#1\bxcx@end\fi{
+ \bxcx@cond{\ifx#1\bxcx@end}\fi{% NB. #1 can be \fi
\bxcx@parse@fin
}{%else
\ifcsdef{bxcx@arity\string#1}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxcalc.tlpobj new/tlpkg/tlpobj/bxcalc.tlpobj
--- old/tlpkg/tlpobj/bxcalc.tlpobj 2019-02-28 03:23:38.000000000 +0100
+++ new/tlpkg/tlpobj/bxcalc.tlpobj 2019-11-28 01:56:44.000000000 +0100
@@ -1,6 +1,6 @@
name bxcalc
category Package
-revision 46482
+revision 52947
shortdesc Extend the functionality of the calc package
relocated 1
longdesc This package bundle consists of the following packages:
@@ -14,7 +14,7 @@
RELOC/tex/latex/bxcalc/bxcalcux.sty
catalogue-contact-home https://github.com/zr-tex8r/BXcalc
catalogue-ctan /macros/latex/contrib/bxcalc
-catalogue-date 2018-01-28 18:33:51 +0100
+catalogue-date 2019-11-27 21:15:53 +0100
catalogue-license mit
catalogue-topics calculation arithmetic etex
-catalogue-version 1.0a
+catalogue-version 1.0b
++++++ bxcjkjatype.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxcjkjatype.doc.tlpobj new/tlpkg/tlpobj/bxcjkjatype.doc.tlpobj
--- old/tlpkg/tlpobj/bxcjkjatype.doc.tlpobj 2019-02-28 03:23:38.000000000 +0100
+++ new/tlpkg/tlpobj/bxcjkjatype.doc.tlpobj 2020-03-04 23:49:54.000000000 +0100
@@ -1,6 +1,6 @@
name bxcjkjatype.doc
category Package
-revision 42292
+revision 54080
shortdesc doc files of bxcjkjatype
relocated 1
docfiles size=74
++++++ bxcjkjatype.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxcjkjatype.tlpobj new/tlpkg/tlpobj/bxcjkjatype.tlpobj
--- old/tlpkg/tlpobj/bxcjkjatype.tlpobj 2019-02-28 03:23:38.000000000 +0100
+++ new/tlpkg/tlpobj/bxcjkjatype.tlpobj 2020-03-04 23:49:54.000000000 +0100
@@ -1,6 +1,6 @@
name bxcjkjatype
category Package
-revision 42292
+revision 54080
shortdesc Typeset Japanese with pdfLaTeX and CJK
relocated 1
longdesc The package provides a working configuration of the CJK
@@ -10,8 +10,7 @@
longdesc the pLaTeX kernel and some other packages used with it.
runfiles size=8
RELOC/tex/latex/bxcjkjatype/bxcjkjatype.sty
-catalogue-ctan /language/japanese/bxcjkjatype
-catalogue-date 2018-02-25 10:09:04 +0100
+catalogue-ctan /language/japanese/BX/bxcjkjatype
catalogue-license mit
catalogue-topics japanese
catalogue-version 0.3
++++++ bxjscls.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxjscls/LICENSE new/doc/latex/bxjscls/LICENSE
--- old/doc/latex/bxjscls/LICENSE 2019-01-14 00:30:14.000000000 +0100
+++ new/doc/latex/bxjscls/LICENSE 2020-02-05 22:43:51.000000000 +0100
@@ -2,8 +2,8 @@
Copyright 1995-1999 ASCII Corporation.
Copyright 1999-2016 Haruhiko Okumura
-Copyright 2016-2018 Japanese TeX Development Community
-Copyright 2013-2019 Takayuki YATO (aka. "ZR")
+Copyright 2016-2020 Japanese TeX Development Community
+Copyright 2013-2020 Takayuki YATO (aka. "ZR")
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/bxjscls/README-ja.md new/doc/latex/bxjscls/README-ja.md
--- old/doc/latex/bxjscls/README-ja.md 2019-03-10 22:00:33.000000000 +0100
+++ new/doc/latex/bxjscls/README-ja.md 2020-04-12 00:47:51.000000000 +0200
@@ -21,7 +21,7 @@
* 必須パッケージ:
- keyval
- calc
- - geometry
+ - geometry(v5.0以降)
* standard 和文ドライバで連携するパッケージ:
- (pdf)LaTeX の場合:
CJK / bxcjkjatype(v0.2c以降)
@@ -33,6 +33,7 @@
- type1cm : `magstyle` が `real`/`xreal` である場合
- pxchfon(v0.5以降): pLaTeX で `jafont` を指定した場合
- zxjafont(v0.2a以降): XeLaTeX で `jafont` を指定した場合
+ - bxwareki : 日付の和暦表示機能を使う場合
* エンジンが (u)pTeX 以外で、かつ和文ドライバが standard 以外の場合、
そのエンジンに対応する日本語処理パッケージが必要となる。
@@ -98,6 +99,28 @@
更新履歴
--------
+ * Version 2.0a 〈2020/04/04〉
+ - 非推奨のオプションの一部について、警告を出す。
+ * Version 2.0 〈2020/03/25〉
+ - XeLaTeX・LuaLaTeX での既定の和文フォントを「IPAex フォント」から
+ 「原ノ味フォント」に変更した。
+ - geometry 4.x 版のサポートを廃止した。
+ - 開発者命令 `\ifdraft` を廃止した。
+ - 和暦の処理に関して bxwareki パッケージを必須とする。
+ - 旧版との互換性のためのオプション(`dvipdfmx-if-dvi` など)を
+ 非推奨の扱いとする。
+ * Version 1.9k 〈2020/02/15〉
+ - バグ修正。(`12Q` 等を使えるようにする。)
+ * Version 1.9j 〈2020/02/05〉
+ - jsclasses の 2020/02/02 と同期。
+ + NFSS の改修に対応した。
+ * Version 1.9i 〈2019/11/24〉
+ - Pandoc モードを最新の Pandoc に対応させる。
+ * Version 1.9h 〈2019/07/27〉
+ - jsclasses の 2019/07/25 と同期。
+ - バグ修正。
+ * Version 1.9g 〈2019/06/23〉
+ - バグ修正。
* Version 1.9f 〈2019/03/10〉
- Pandoc モードを最新の Pandoc に対応させる。
* Version 1.9e 〈2019/01/13〉
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxjscls/README.md new/doc/latex/bxjscls/README.md
--- old/doc/latex/bxjscls/README.md 2019-03-10 22:00:33.000000000 +0100
+++ new/doc/latex/bxjscls/README.md 2020-04-12 00:47:51.000000000 +0200
@@ -21,7 +21,7 @@
* Prerequisite packages:
- keyval
- calc
- - geometry
+ - geometry (v5.0+)
* Packages that the standard ja-driver cooperates with:
- On (pdf)LaTeX:
CJK + bxcjkjatype (v0.2c+)
@@ -33,6 +33,7 @@
- type1cm: when `magstyle` is `nomag`/`nomag*`
- pxchfon (v0.5+): when `jafont` is used on pLaTeX
- zxjafont (v0.2a+): when `jafont` is used on XeLaTeX
+ - bxwareki: when the wareki feature is used
* When you use ja-drivers other than standard, you generally need
packages for processing Japanese documents that the employed
combination of the ja-driver and the engine supports.
@@ -88,6 +89,22 @@
Revision History
----------------
+ * Version 2.0a 〈2020/04/04〉
+ * Version 2.0 〈2020/03/25〉
+ - Now the default Japanese fonts on XeLaTeX/LuaLaTeX are "Harano
+ Aji Fonts". (Formerly "IPAex Fonts" were used.)
+ - Drop the support for geometry v4.x.
+ - Abolish a developer-level command `\ifdraft`.
+ - Now bxwareki package is required for using features on wareki
+ (Japanese calendar) provided by the classes.
+ - Some options provided for compatibility (`dvipdfmx-if-dvi` etc)
+ are now marked as deprecated.
+ * Version 1.9k 〈2020/02/15〉
+ * Version 1.9j 〈2020/02/05〉
+ - Sync with jsclasses 2020/02/02.
+ * Version 1.9i 〈2019/11/24〉
+ * Version 1.9h 〈2019/07/27〉
+ * Version 1.9g 〈2019/06/23〉
* Version 1.9f 〈2019/03/10〉
* Version 1.9e 〈2019/01/13〉
* Version 1.9d 〈2018/10/03〉
Binary files old/doc/latex/bxjscls/bxjscls-manual.pdf and new/doc/latex/bxjscls/bxjscls-manual.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxjscls/bxjscls-manual.tex new/doc/latex/bxjscls/bxjscls-manual.tex
--- old/doc/latex/bxjscls/bxjscls-manual.tex 2019-03-10 22:00:33.000000000 +0100
+++ new/doc/latex/bxjscls/bxjscls-manual.tex 2020-04-12 00:47:51.000000000 +0200
@@ -7,13 +7,12 @@
%\usepackage{url}
\usepackage[unicode,colorlinks,hyperfootnotes=false]{hyperref}
\hypersetup{linkcolor=myblue,urlcolor=mygreen}
-\usepackage{metalogo}
-\pdfstringdefDisableCommands{%
- \renewcommand*{\XeLaTeX}{XeLaTeX}}
+\usepackage{bxtexlogo}
+\bxtexlogoimport{*}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{1.9f}
-\newcommand{\PkgDate}{2019/03/10}
+\newcommand{\PkgVersion}{2.0a}
+\newcommand{\PkgDate}{2020/04/04}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}\nobr#1\nobr\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
@@ -22,12 +21,6 @@
\newcommand{\wbr}{\linebreak[0]}
\newcommand{\nobr}{\nolinebreak[4]}
\newcommand{\xast}{\mbox{}\mbox{$^*$}}
-\providecommand{\pTeX}{p\TeX}
-\providecommand{\pLaTeX}{p\LaTeX}
-\providecommand{\upTeX}{u\pTeX}
-\providecommand{\upLaTeX}{u\pLaTeX}
-\providecommand{\pdfLaTeX}{pdf\LaTeX}
-\providecommand{\BibTeX}{Bib\TeX}
%-----------------------------------------------------------
\begin{document}
\title{\Pkg{BXjscls} パッケージ\\
@@ -171,7 +164,7 @@
例えば次の設定は:
\begin{quote}\small\begin{verbatim}
-\documentclass[a5paper,uplatex,dvipdfmx,ja=standard]{bxjsarticle}
+\documentclass[a4paper,uplatex,dvipdfmx,ja=standard]{bxjsarticle}
\end{verbatim}\end{quote}
次の設定とほぼ等価になる
\footnote{論理フォントについては、従来のもの
@@ -262,10 +255,13 @@
\begin{quote}\small\begin{verbatim}
\documentclass[a4paper,twocolumn]{article}
\usepackage{zxjatype}
-\setCJKmainfont[BoldFont=IPAexGothic]{IPAexMincho}% 明朝→IPAex明朝
-\setCJKsansfont[BoldFont=IPAexGothic]{IPAexGothic}% ゴシック→IPAexゴシック
+\setCJKmainfont[BoldFont=HaranoAjiGothic-Medium.otf]{HaranoAjiMincho-Regular.otf}
+\setCJKsansfont[BoldFont=HaranoAjiGothic-Medium.otf]{HaranoAjiGothic-Medium.otf}
\end{verbatim}\end{quote}
+\Note 2.0版より、既定の和文フォントが「IPAexフォント」から
+「原ノ味フォント」に変更された。
+
|jafont| を指定した場合は:
\begin{quote}\small\begin{verbatim}
\documentclass[a4paper,xelatex,ja=standard,jafont=ms]{bxjsarticle}
@@ -291,9 +287,12 @@
\begin{quote}\small\begin{verbatim}
\documentclass[b5paper,9pt]{ltjsarticle}
\usepackage{luatexja-fontspec}
-\usepackage[ipaex]{luatexja-preset}
+\usepackage[haranoaji]{luatexja-preset}
\end{verbatim}\end{quote}
+\Note 2.0版より、既定の和文フォントが「IPAexフォント」から
+「原ノ味フォント」に変更された。
+
|jafont| を指定した場合は:
\begin{quote}\small\begin{verbatim}
\documentclass[b5paper,lualatex,ja=standard,jafont=ms]{bxjsarticle}
@@ -364,8 +363,8 @@
\Note \Pkg{hyperref}のパッケージオプションで和文文字を含む文書情報を
指定することはできない。
(\Pkg{hyperref}の制限仕様。)
-\item |jafont| が無い場合の既定のフォント設定は多くのエンジンに
- おいて「IPAexフォント使用」であるが、(u){\pLaTeX}だけは異なっていて
+\item (u){\pLaTeX}において、
+ |jafont| が無い場合の既定のフォント設定は
「何も指定しない状態」(JSクラスと同様)である。
すなわち実際に使われる物理フォントの選択はDVIウェアの設定に
委ねられている。
@@ -589,12 +588,12 @@
|standard|、|pandoc| がある。
エンジンが |platex| か |uplatex| の時は |ja| の
既定値は |standard| である。
- それ以外の場合は、一応 |minimal| とするが、
- 明示的な指定が推奨される。
+ それ以外の場合は、一応 |minimal| となるが、
+ 2.0版以降では |ja| の省略は\jemph{非推奨}である。
\item |jafont=|\Meta{名前}\Means
- 「和文フォントプリセット指定」の名雨を設定する。
- \Note \ref{sec:Basic}節で解説した通り、standard和文ドライバでは |jafont|
- の値が利用される。
+ 「和文フォントプリセット指定」の名前を設定する。
+ \Note standard和文ドライバでは |jafont| の値が利用される。
+ 詳細は\ref{ssec:ja-font-settings}節を参照。
\par
プリセット指定の値が丸括弧を含む(例えば“|sourcehan(-otc)|”)場合、
以下のように解釈される。
@@ -679,7 +678,9 @@
既定値は真。
\Note つまり「JSクラスの一種である」と判定されると不都合な場合に、
|disguise-js=false| を指定する。
-\item |bigcode|\Means
+\item |bigcode|(既定
+ \footnote{2.0版より常に |bigcode| が既定になる。
+ 昔の版では{\TeX}エンジンの版に応じて既定値を変えていた。})\Means
{\upTeX}エンジンとdvipdfmxの組合せで\Pkg{hyperref}パッケージを
利用する時に適用されるToUnicode CMapとして |UTF8-UTF16| を指定する。
PDFの文書情報の文字列にBMP外の文字が含まれる場合には
@@ -689,14 +690,6 @@
\item |nobigcode|\Means
|bigcode| の否定。ToUnicode CMapとして |UTF8-UCS2| を指定する。
この場合は文書情報の文字列にBMP外の文字を使用できない。
- \Note |UTF8-UTF16| のファイルが利用できるかを確実に判定するのは
- 困難なため、|bigcode| の既定値は次のようなアドホックな方法で
- 決めている:
- {\TeX}エンジンのバージョンが3.14159265以上
- \footnote{{\TeX}のバージョン3.14159265は2014年1月にリリースされた。}
- である場合は、
- ({\TeX}環境がある程度新しく、|UTF8-UTF16| が利用可能と思われるので)
- |bigcode| を既定とし、それ以外は |nobigcode| を既定とする。
\item |precise-text=|\Meta{真偽値}\Means
{\XeTeX}エンジンにおいて、「ActualText生成機能」を有効化する
\footnote{つまり、|\XeTeXgenerateactualtext=1| を行う。
@@ -839,6 +832,8 @@
\paragraph{旧版との互換用のオプション}\mbox{}
+2.0版以降では、これらのオプションの使用は\jemph{非推奨}である。
+
\begin{itemize}
\item |zw|\Means
|use-zw=true| と同値。
@@ -1126,9 +1121,84 @@
|minimal| を用いる意義がほとんどないため、
|standard| が既定値になっている。
-\Note 1.8版より、(u){\pLaTeX}以外のエンジンについては、
-和文ドライバを明示指定することを推奨する。
+\Note 2.0版より、(u){\pLaTeX}以外のエンジンについては、
+和文ドライバ指定を省略することは非推奨の扱いとなった。
+(既に1.8版で明示指定が推奨されていた。)
+
+%-------------------
+\subsection{standardドライバで用いられる日本語処理機構}
+\label{ssec:ja-package}
+\begin{itemize}
+\item \pLaTeX、\upLaTeX(および{\pLaTeX-ng})の場合\Means
+ エンジン自体が日本語処理の能力を持っているので
+ それが常に用いられる。
+\item \pdfLaTeX{}の場合\Means
+ \Pkg{bxcjkjatype}パッケージが |whole| と |autotilde| の
+ オプション付で読み込まれる。
+\item \XeLaTeX{}の場合\Means
+ \Pkg{zxjatype}パッケージが読み込まれる。
+\item \LuaLaTeX{}の場合\Means
+ \Pkg{luatexja}パッケージが読み込まれる。
+\end{itemize}
+
+%-------------------
+\subsection{和文フォント設定}
+\label{ssec:ja-font-settings}
+
+|jafont| が指定されない場合は、JSクラスと同様の
+「明朝・ゴシックで各1ウェイトのみを用いて、
+明朝の太字がゴシックになる」
+という設定が適用される。
+
+明朝・ゴシックのファミリとして用いられる物理フォントの
+割当(マッピング)は以下のようになる:
+\begin{itemize}
+\item \pLaTeX、\upLaTeX{}の場合\Means
+ クラスでは何もマッピングを設定しない。
+ 従って、DVIウェアでの設定が適用される。
+\item \pdfLaTeX{}の場合\Means
+ \Pkg{bxcjkjatype}パッケージの既定設定となり、
+ 従って、Type1形式のIPAexフォント(\Pkg{ipaex-type1}で提供される)
+ が使用される。
+\item \XeLaTeX{}の場合\Means
+ 「原ノ味フォント」が使用される。
+ \Pkg{zxjafont}パッケージの |haranoaji| プリセットの
+ 単ウェイト使用と同等であるが、パッケージが読み込まれるわけではない。
+\item \LuaLaTeX{}の場合\Means
+ 「原ノ味フォント」が使用される。
+ \Pkg{luatexja-preset}パッケージの |haranoaji| プリセットの
+ 単ウェイト使用と同等であるが、パッケージが読み込まれるわけではない。
+\end{itemize}
+
+\Note {\TeX} Live 2019(およびその前の数年間)では、DVIウェアでの
+和文フォントマッピングの既定設定は「IPAexフォント」であった。
+(つまり、(u){\pLaTeX}では既定で「IPAexフォント」が使われる。)
+これに合わせる形で、{\XeLaTeX}・{\LuaLaTeX}での既定設定も、
+以前は「IPAexフォント」としていた。
+ところが、{\TeX} Live 2020において、DVIウェアの既定のマッピングを
+「原ノ味フォント」に変更することが予定されている。
+従って、{\XeLaTeX}・{\LuaLaTeX}での既定設定についても、
+2.0版より「原ノ味フォント」に変更された。
+Type1形式の原ノ味フォントは存在しないため、
+{\pdfLaTeX}では\Pkg{ipaex-type1}のフォントが引き続き使用される。
+\par\medskip
+
+|jafont| で和文物理フォントの割当を指定した場合、
+具体的には以下のように処理される:
+\begin{itemize}
+\item \pLaTeX、\upLaTeX{}の場合\Means
+ \Pkg{pxchfon}パッケージが「|jafont| の値」をオプション
+ に指定した形で読み込まれる。
+\item \pdfLaTeX{}の場合\Means
+ \Pkg{bxcjkjatype}のオプションに「|jafont| の値」が指定される。
+\item \XeLaTeX{}の場合\Means
+ \Pkg{zxjafont}パッケージが「|jafont| の値」をオプション
+ に指定した形で読み込まれる。
+\item \LuaLaTeX{}の場合\Means
+ \Pkg{luatexja-preset}パッケージが「|jafont| の値」をオプション
+ に指定した形で読み込まれる。
+\end{itemize}
%===========================================================
\section{和文ドライバパラメタ}
Binary files old/doc/latex/bxjscls/bxjscls.pdf and new/doc/latex/bxjscls/bxjscls.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxjscls.doc.tlpobj new/tlpkg/tlpobj/bxjscls.doc.tlpobj
--- old/tlpkg/tlpobj/bxjscls.doc.tlpobj 2019-03-11 02:24:51.000000000 +0100
+++ new/tlpkg/tlpobj/bxjscls.doc.tlpobj 2020-04-12 01:55:22.000000000 +0200
@@ -1,9 +1,9 @@
name bxjscls.doc
category Package
-revision 50318
+revision 54673
shortdesc doc files of bxjscls
relocated 1
-docfiles size=438
+docfiles size=489
RELOC/doc/latex/bxjscls/LICENSE
RELOC/doc/latex/bxjscls/README-ja.md
RELOC/doc/latex/bxjscls/README.md
++++++ bxjscls.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxjscls/bxjsarticle.cls new/tex/latex/bxjscls/bxjsarticle.cls
--- old/tex/latex/bxjscls/bxjsarticle.cls 2019-03-10 22:00:33.000000000 +0100
+++ new/tex/latex/bxjscls/bxjsarticle.cls 2020-04-12 00:47:51.000000000 +0200
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsarticle}
- [2019/03/10 v1.9f BXJS document classes]
+ [2020/04/04 v2.0a BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsarticle}
\newif\ifjsc@needsp@tch
@@ -214,6 +214,8 @@
\else\ifdim\(a)tempdima=10.95pt \long\def\@ptsize{1}%
\else\ifdim\@tempdima=12pt \long\def\@ptsize{2}%
\else \long\edef\@ptsize{\jsUnusualPtSize}\fi\fi\fi}
+\def\bxjs@setjbasefontsize#1{%
+ \setkeys{bxjs}{jbase=#1}}
\newif\ifjsc@mag
\newif\ifjsc@mag@xreal
\DeclareOption{8pt}{\bxjs@setbasefontsize{8pt}}
@@ -314,17 +316,9 @@
\define@key{bxjs}{enablejfam}[true]{%
\bxjs@set@keyval{enablejfam}{#1}{}}
\DeclareOption{disablejfam}{\let\bxjs@enablejfam=f}
-\let\ifjsDraft\iffalse
-\@onlypreamble\bxjs@draft
-\def\bxjs@draft#1{%
- \expandafter\let\expandafter\ifjsDraft\csname if#1\endcsname}
-\DeclareOption{draft}{\bxjs@draft{true}\setlength\overfullrule{5pt}}
-\DeclareOption{final}{\bxjs@draft{false}\setlength\overfullrule{0pt}}
-\g@addto@macro\bxjs@begin@document@hook{%
- \expandafter\ifx\csname ifdraft\endcsname\relax
- \expandafter\let\csname ifdraft\expandafter\endcsname
- \csname ifjsDraft\endcsname
- \fi}
+\newif\ifjsDraft
+\DeclareOption{draft}{\jsDrafttrue \overfullrule=5pt }
+\DeclareOption{final}{\jsDraftfalse \overfullrule=0pt }
\newif\ifbxjs@papersize
\bxjs@papersizetrue
\DeclareOption{nopapersize}{\bxjs@papersizefalse}
@@ -425,12 +419,13 @@
\def\bxjs@driver@opt{xetex}%
\let\bxjs@driver@given\bxjs@driver@@xetex}
\DeclareOption{dvipdfmx-if-dvi}{%
+ \ClassWarningNoLine\bxjs@clsname
+ {The old option 'dvipdfmx-if-dvi' is DEPRECATED\MessageBreak
+ and may be abolished in future!\MessageBreak
+ You should write 'dvi=dvipdfmx' instead}%
\setkeys{bxjs}{dvi=dvipdfmx}}
-\newif\ifbxjs@bigcode \bxjs@bigcodefalse
-\edef\bxjs@tmpa{\expandafter\noexpand\csname\endcsname}
-\def\bxjs@tmpb#1 #2#3\@nil{%
- \ifx1#2\bxjs@bigcodetrue \fi}
-\expandafter\bxjs@tmpb\meaning\bxjs@tmpa1 0\@nil
+
+\newif\ifbxjs@bigcode \bxjs@bigcodetrue
\DeclareOption{nobigcode}{%
\bxjs@bigcodefalse}
\DeclareOption{bigcode}{%
@@ -745,6 +740,12 @@
\ifx j\jsEngine
\def\bxjs@jadriver{standard}
\else
+ \ClassWarningNoLine\bxjs@clsname
+ {The option 'ja' is MISSING!!\MessageBreak
+ So 'ja=minimal' is assumed as fallback, but\MessageBreak
+ such implicit setting is now DEPRECATED!\MessageBreak
+ You should write 'ja=minimal' explicitly,\MessageBreak
+ if it is intended}
\let\bxjs@jadriver\bxjs@@minimal
\fi
\fi
@@ -1142,14 +1143,10 @@
\bxjs@postproc@layout
\g@addto@macro\bxjs@bd@pre@geometry@hook{%
\@ifpackagelater{geometry}{2010/02/12}{}{%else
- \PackageWarningNoLine\bxjs@clsname
- {The 'geometry' package installed\MessageBreak
- is too old (< v5.0)}%
- \if x\jsEngine \ifnum\mag=\@m\else
- \def\bxjs@Gm@driver{pdftex}
- \ifx\pdfhorigin\@undefined \newdimen\pdfhorigin \fi
- \ifx\pdfvorigin\@undefined \newdimen\pdfvorigin \fi
- \fi\fi}%
+ \PackageError\bxjs@clsname
+ {Your 'geometry' package is too old (< v5.0)}%
+ {\@ehc}%
+ \let\Gm@driver\relax}%
\ifjsWithpTeXng
\ifx\Gm@driver\@empty
\def\Gm@driver{pdftex}%
@@ -1713,13 +1710,13 @@
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
\def\bxjs@dust{\vrule\@width\z@\@height\z@\@depth\z@}
\newcommand*{\jsInJaParen}[1]{%
- \bxjs@dust\jsInhibitGlue(\theenumii)\jsInhibitGlue\bxjs@dust}
+ \bxjs@dust\jsInhibitGlue (#1)\jsInhibitGlue\bxjs@dust}
\newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\jsInJaParen{(\theenumii)}}
+\newcommand{\labelenumii}{\jsInJaParen{\theenumii}}
\newcommand{\labelenumiii}{\theenumiii.}
\newcommand{\labelenumiv}{\theenumiv.}
\renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue(\theenumii)}
+\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue (\theenumii )}
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
\newcommand\labelitemi{\textbullet}
\newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -2288,67 +2285,54 @@
\@tempswafalse
\if p\jsEngine \@tempswatrue \fi
\if n\jsEngine \@tempswatrue \fi
-\if@tempswa \expandafter\@firstoftwo
-\else \expandafter\@secondoftwo
-\fi
-{%
+\bxjs@cond\if@tempswa\fi{%
\newif\ifjsSeireki \jsSeirekitrue
\def\bxjs@decl@Seireki@cmds{%
\def\西暦{\jsSeirekitrue}%
- \def\和暦{\jsSeirekifalse}}
+ \def\和暦{\jsSeirekifalse\bxjs@wareki@used}}
\def\Seireki{\jsSeirekitrue}
-\def\Wareki{\jsSeirekifalse}
-\def\bxjs@if@use@seireki{%
- \ifjsSeireki \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\jsSeirekifalse\bxjs@wareki@used}
+\def\bxjs@if@use@seireki{\bxjs@cond\ifjsSeireki\fi}
+\def\bxjs@iai{\noexpand~}
}{%
\newif\if西暦 \西暦true
\def\bxjs@decl@Seireki@cmds{%
\def\西暦{\西暦true}%
- \def\和暦{\西暦false}}
+ \def\和暦{\西暦false\bxjs@wareki@used}}
\def\Seireki{\西暦true}
-\def\Wareki{\西暦false}
-\def\bxjs@if@use@seireki{%
- \if西暦 \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\西暦false\bxjs@wareki@used}
+\def\bxjs@if@use@seireki{\bxjs@cond\if西暦\fi}
+\let\bxjs@iai\@empty
}
\bxjs@decl@Seireki@cmds
\let\bxjs@unxp\@firstofone \let\bxjs@onxp\@firstofone
-\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded
- \def\bxjs@onxp{\unexpanded\expandafter}}
-\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
- \def\bxjs@iai{\noexpand~}
-\else \def\bxjs@iai{}
-\fi
+\bxjs@test@engine\unexpanded{%
+ \let\bxjs@unxp\unexpanded \def\bxjs@onxp{\unexpanded\expandafter}}
\newif\ifbxjs@bxwareki@avail
\IfFileExists{bxwareki.sty}{%
\RequirePackage{bxwareki}[]%
\bxjs@bxwareki@availtrue}{}
+\ifbxjs@bxwareki@avail \let\bxjs@wareki@used\@empty
+\else
+ \bxjs@robust@def\bxjs@wareki@used{%
+ \global\let\bxjs@wareki@used\@empty
+ \ClassWarning\bxjs@clsname
+ {Wareki mode is not supported, since\MessageBreak
+ 'bxwareki' is unavailable, found}}
+ \g@addto@macro\bxjs@begin@document@hook{%
+ \let\bxjs@wareki@used\@empty}
+\fi
\ifbxjs@bxwareki@avail
\let\jayear\warekiyear
\def\bxjs@tmpa{H}\ifx\bxjs@tmpa\warekigengoinitial
\newcount\heisei \heisei=\value{warekiyear}
\fi
\else
- \@tempcnta=\the\year\two@digits\month\two@digits\day\relax
- \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501
- \newcount\heisei \heisei\year \advance\heisei-1988\relax
- \fi\fi
- \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \edef\jayear{\bxjs@unxp{平成}\bxjs@iai \the\heisei \bxjs@iai}
- \else \edef\jayear{\the\year \bxjs@iai}
- \fi
+ \edef\jayear{\the\year \bxjs@iai}
\fi
\let\bxjs@next\relax
-\ifbxjs@bxwareki@avail
- \ifx\warekigengo\@empty\else
- \def\bxjs@next{\bxjs@onxp{\warekitoday}}
- \fi
-\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \def\bxjs@next{%
- \bxjs@unxp{平成}\bxjs@iai\number\heisei\bxjs@iai\bxjs@unxp{年}%
- \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}%
- \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}}
+\ifbxjs@bxwareki@avail \ifx\warekigengo\@empty\else
+ \def\bxjs@next{\bxjs@onxp{\warekitoday}}
\fi\fi
\edef\bxjs@today{%
\if@english
@@ -2367,7 +2351,7 @@
\fi}
\let\today\bxjs@today
\g@addto@macro\bxjs@begin@document@hook{%
- \ifx\bbl@jpn@Seirekitrue\@undefined\else
+ \ifx\bbl@jpn@maybekansuji\@undefined\else
\bxjs@decl@Seireki@cmds
\g@addto@macro\datejapanese{%
\let\today\bxjs@today}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxjscls/bxjsbook.cls new/tex/latex/bxjscls/bxjsbook.cls
--- old/tex/latex/bxjscls/bxjsbook.cls 2019-03-10 22:00:33.000000000 +0100
+++ new/tex/latex/bxjscls/bxjsbook.cls 2020-04-12 00:47:51.000000000 +0200
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsbook}
- [2019/03/10 v1.9f BXJS document classes]
+ [2020/04/04 v2.0a BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsbook}
\newif\ifjsc@needsp@tch
@@ -217,6 +217,8 @@
\else\ifdim\(a)tempdima=10.95pt \long\def\@ptsize{1}%
\else\ifdim\@tempdima=12pt \long\def\@ptsize{2}%
\else \long\edef\@ptsize{\jsUnusualPtSize}\fi\fi\fi}
+\def\bxjs@setjbasefontsize#1{%
+ \setkeys{bxjs}{jbase=#1}}
\newif\ifjsc@mag
\newif\ifjsc@mag@xreal
\DeclareOption{8pt}{\bxjs@setbasefontsize{8pt}}
@@ -320,17 +322,9 @@
\define@key{bxjs}{enablejfam}[true]{%
\bxjs@set@keyval{enablejfam}{#1}{}}
\DeclareOption{disablejfam}{\let\bxjs@enablejfam=f}
-\let\ifjsDraft\iffalse
-\@onlypreamble\bxjs@draft
-\def\bxjs@draft#1{%
- \expandafter\let\expandafter\ifjsDraft\csname if#1\endcsname}
-\DeclareOption{draft}{\bxjs@draft{true}\setlength\overfullrule{5pt}}
-\DeclareOption{final}{\bxjs@draft{false}\setlength\overfullrule{0pt}}
-\g@addto@macro\bxjs@begin@document@hook{%
- \expandafter\ifx\csname ifdraft\endcsname\relax
- \expandafter\let\csname ifdraft\expandafter\endcsname
- \csname ifjsDraft\endcsname
- \fi}
+\newif\ifjsDraft
+\DeclareOption{draft}{\jsDrafttrue \overfullrule=5pt }
+\DeclareOption{final}{\jsDraftfalse \overfullrule=0pt }
\newif\ifbxjs@papersize
\bxjs@papersizetrue
\DeclareOption{nopapersize}{\bxjs@papersizefalse}
@@ -431,12 +425,13 @@
\def\bxjs@driver@opt{xetex}%
\let\bxjs@driver@given\bxjs@driver@@xetex}
\DeclareOption{dvipdfmx-if-dvi}{%
+ \ClassWarningNoLine\bxjs@clsname
+ {The old option 'dvipdfmx-if-dvi' is DEPRECATED\MessageBreak
+ and may be abolished in future!\MessageBreak
+ You should write 'dvi=dvipdfmx' instead}%
\setkeys{bxjs}{dvi=dvipdfmx}}
-\newif\ifbxjs@bigcode \bxjs@bigcodefalse
-\edef\bxjs@tmpa{\expandafter\noexpand\csname\endcsname}
-\def\bxjs@tmpb#1 #2#3\@nil{%
- \ifx1#2\bxjs@bigcodetrue \fi}
-\expandafter\bxjs@tmpb\meaning\bxjs@tmpa1 0\@nil
+
+\newif\ifbxjs@bigcode \bxjs@bigcodetrue
\DeclareOption{nobigcode}{%
\bxjs@bigcodefalse}
\DeclareOption{bigcode}{%
@@ -754,6 +749,12 @@
\ifx j\jsEngine
\def\bxjs@jadriver{standard}
\else
+ \ClassWarningNoLine\bxjs@clsname
+ {The option 'ja' is MISSING!!\MessageBreak
+ So 'ja=minimal' is assumed as fallback, but\MessageBreak
+ such implicit setting is now DEPRECATED!\MessageBreak
+ You should write 'ja=minimal' explicitly,\MessageBreak
+ if it is intended}
\let\bxjs@jadriver\bxjs@@minimal
\fi
\fi
@@ -1176,14 +1177,10 @@
\bxjs@postproc@layout
\g@addto@macro\bxjs@bd@pre@geometry@hook{%
\@ifpackagelater{geometry}{2010/02/12}{}{%else
- \PackageWarningNoLine\bxjs@clsname
- {The 'geometry' package installed\MessageBreak
- is too old (< v5.0)}%
- \if x\jsEngine \ifnum\mag=\@m\else
- \def\bxjs@Gm@driver{pdftex}
- \ifx\pdfhorigin\@undefined \newdimen\pdfhorigin \fi
- \ifx\pdfvorigin\@undefined \newdimen\pdfvorigin \fi
- \fi\fi}%
+ \PackageError\bxjs@clsname
+ {Your 'geometry' package is too old (< v5.0)}%
+ {\@ehc}%
+ \let\Gm@driver\relax}%
\ifjsWithpTeXng
\ifx\Gm@driver\@empty
\def\Gm@driver{pdftex}%
@@ -1838,13 +1835,13 @@
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
\def\bxjs@dust{\vrule\@width\z@\@height\z@\@depth\z@}
\newcommand*{\jsInJaParen}[1]{%
- \bxjs@dust\jsInhibitGlue(\theenumii)\jsInhibitGlue\bxjs@dust}
+ \bxjs@dust\jsInhibitGlue (#1)\jsInhibitGlue\bxjs@dust}
\newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\jsInJaParen{(\theenumii)}}
+\newcommand{\labelenumii}{\jsInJaParen{\theenumii}}
\newcommand{\labelenumiii}{\theenumiii.}
\newcommand{\labelenumiv}{\theenumiv.}
\renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue(\theenumii)}
+\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue (\theenumii )}
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
\newcommand\labelitemi{\textbullet}
\newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -2394,67 +2391,54 @@
\@tempswafalse
\if p\jsEngine \@tempswatrue \fi
\if n\jsEngine \@tempswatrue \fi
-\if@tempswa \expandafter\@firstoftwo
-\else \expandafter\@secondoftwo
-\fi
-{%
+\bxjs@cond\if@tempswa\fi{%
\newif\ifjsSeireki \jsSeirekitrue
\def\bxjs@decl@Seireki@cmds{%
\def\西暦{\jsSeirekitrue}%
- \def\和暦{\jsSeirekifalse}}
+ \def\和暦{\jsSeirekifalse\bxjs@wareki@used}}
\def\Seireki{\jsSeirekitrue}
-\def\Wareki{\jsSeirekifalse}
-\def\bxjs@if@use@seireki{%
- \ifjsSeireki \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\jsSeirekifalse\bxjs@wareki@used}
+\def\bxjs@if@use@seireki{\bxjs@cond\ifjsSeireki\fi}
+\def\bxjs@iai{\noexpand~}
}{%
\newif\if西暦 \西暦true
\def\bxjs@decl@Seireki@cmds{%
\def\西暦{\西暦true}%
- \def\和暦{\西暦false}}
+ \def\和暦{\西暦false\bxjs@wareki@used}}
\def\Seireki{\西暦true}
-\def\Wareki{\西暦false}
-\def\bxjs@if@use@seireki{%
- \if西暦 \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\西暦false\bxjs@wareki@used}
+\def\bxjs@if@use@seireki{\bxjs@cond\if西暦\fi}
+\let\bxjs@iai\@empty
}
\bxjs@decl@Seireki@cmds
\let\bxjs@unxp\@firstofone \let\bxjs@onxp\@firstofone
-\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded
- \def\bxjs@onxp{\unexpanded\expandafter}}
-\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
- \def\bxjs@iai{\noexpand~}
-\else \def\bxjs@iai{}
-\fi
+\bxjs@test@engine\unexpanded{%
+ \let\bxjs@unxp\unexpanded \def\bxjs@onxp{\unexpanded\expandafter}}
\newif\ifbxjs@bxwareki@avail
\IfFileExists{bxwareki.sty}{%
\RequirePackage{bxwareki}[]%
\bxjs@bxwareki@availtrue}{}
+\ifbxjs@bxwareki@avail \let\bxjs@wareki@used\@empty
+\else
+ \bxjs@robust@def\bxjs@wareki@used{%
+ \global\let\bxjs@wareki@used\@empty
+ \ClassWarning\bxjs@clsname
+ {Wareki mode is not supported, since\MessageBreak
+ 'bxwareki' is unavailable, found}}
+ \g@addto@macro\bxjs@begin@document@hook{%
+ \let\bxjs@wareki@used\@empty}
+\fi
\ifbxjs@bxwareki@avail
\let\jayear\warekiyear
\def\bxjs@tmpa{H}\ifx\bxjs@tmpa\warekigengoinitial
\newcount\heisei \heisei=\value{warekiyear}
\fi
\else
- \@tempcnta=\the\year\two@digits\month\two@digits\day\relax
- \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501
- \newcount\heisei \heisei\year \advance\heisei-1988\relax
- \fi\fi
- \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \edef\jayear{\bxjs@unxp{平成}\bxjs@iai \the\heisei \bxjs@iai}
- \else \edef\jayear{\the\year \bxjs@iai}
- \fi
+ \edef\jayear{\the\year \bxjs@iai}
\fi
\let\bxjs@next\relax
-\ifbxjs@bxwareki@avail
- \ifx\warekigengo\@empty\else
- \def\bxjs@next{\bxjs@onxp{\warekitoday}}
- \fi
-\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \def\bxjs@next{%
- \bxjs@unxp{平成}\bxjs@iai\number\heisei\bxjs@iai\bxjs@unxp{年}%
- \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}%
- \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}}
+\ifbxjs@bxwareki@avail \ifx\warekigengo\@empty\else
+ \def\bxjs@next{\bxjs@onxp{\warekitoday}}
\fi\fi
\edef\bxjs@today{%
\if@english
@@ -2473,7 +2457,7 @@
\fi}
\let\today\bxjs@today
\g@addto@macro\bxjs@begin@document@hook{%
- \ifx\bbl@jpn@Seirekitrue\@undefined\else
+ \ifx\bbl@jpn@maybekansuji\@undefined\else
\bxjs@decl@Seireki@cmds
\g@addto@macro\datejapanese{%
\let\today\bxjs@today}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxjscls/bxjscjkcat.sty new/tex/latex/bxjscls/bxjscjkcat.sty
--- old/tex/latex/bxjscls/bxjscjkcat.sty 2019-03-10 22:00:33.000000000 +0100
+++ new/tex/latex/bxjscls/bxjscjkcat.sty 2020-04-12 00:47:51.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{bxjscjkcat}
- [2019/03/10 v1.9f BXJS document classes]
+ [2020/04/04 v2.0a BXJS document classes]
\def\bxjx@pkgname{bxjscjkcat}
\newcount\bxjx@cnta
\@onlypreamble\bxjx@tmpdo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxjscls/bxjscompat.sty new/tex/latex/bxjscls/bxjscompat.sty
--- old/tex/latex/bxjscls/bxjscompat.sty 2019-03-10 22:00:33.000000000 +0100
+++ new/tex/latex/bxjscls/bxjscompat.sty 2020-04-12 00:47:51.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{bxjscompat}
- [2019/03/10 v1.9f BXJS document classes]
+ [2020/04/04 v2.0a BXJS document classes]
\def\bxac@pkgname{bxjscompat}
\let\bxac@engine=n
\def\bxac@do#1#2{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxjscls/bxjsja-minimal.def new/tex/latex/bxjscls/bxjsja-minimal.def
--- old/tex/latex/bxjscls/bxjsja-minimal.def 2019-03-10 22:00:33.000000000 +0100
+++ new/tex/latex/bxjscls/bxjsja-minimal.def 2020-04-12 00:47:51.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-minimal.def}
- [2019/03/10 v1.9f BXJS document classes]
+ [2020/04/04 v2.0a BXJS document classes]
%% このファイルは日本語文字を含みます
\def\DeclareJaTextFontCommand#1#2{%
\DeclareRobustCommand#1[1]{%
@@ -195,6 +195,7 @@
\DeclareFontShape{\jsc@JTn}{gt}{b}{n}{<->ssub*gt/bx/n}{}
\DeclareFontShape{\jsc@JTn}{gt}{b}{it}{<->ssub*gt/bx/n}{}
\DeclareFontShape{\jsc@JTn}{gt}{b}{sl}{<->ssub*gt/bx/n}{}
+\ifx\@rmfamilyhook\@undefined % old
\DeclareRobustCommand\rmfamily
{\not@math@alphabet\rmfamily\mathrm
\romanfamily\rmdefault\kanjifamily\mcdefault\selectfont}
@@ -204,6 +205,25 @@
\DeclareRobustCommand\ttfamily
{\not@math@alphabet\ttfamily\mathtt
\romanfamily\ttdefault\kanjifamily\gtdefault\selectfont}
+\g@addto@macro\bxjs@begin@document@hook{%
+ \ifx\mweights@init\@undefined\else % mweights.sty is loaded
+ % my definitions above should have been overwritten, recover it!
+ % \selectfont is executed twice but I don't care about speed...
+ \expandafter\g@addto@macro\csname rmfamily \endcsname
+ {\kanjifamily\mcdefault\selectfont}%
+ \expandafter\g@addto@macro\csname sffamily \endcsname
+ {\kanjifamily\gtdefault\selectfont}%
+ \expandafter\g@addto@macro\csname ttfamily \endcsname
+ {\kanjifamily\gtdefault\selectfont}%
+ \fi}
+\else % 2020-02-02
+\g@addto@macro\@rmfamilyhook
+ {\prepare@family@series@update@kanji{mc}\mcdefault}
+\g@addto@macro\@sffamilyhook
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
+\g@addto@macro\@ttfamilyhook
+ {\prepare@family@series@update@kanji{gt}\gtdefault}
+\fi
\ifx\DeclareFixJFMCJKTextFontCommand\@undefined
\DeclareJaTextFontCommand{\textmc}{\mcfamily}
\DeclareJaTextFontCommand{\textgt}{\gtfamily}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxjscls/bxjsja-modern.def new/tex/latex/bxjscls/bxjsja-modern.def
--- old/tex/latex/bxjscls/bxjsja-modern.def 2019-03-10 22:00:33.000000000 +0100
+++ new/tex/latex/bxjscls/bxjsja-modern.def 2020-04-12 00:47:51.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-modern.def}
- [2019/03/10 v1.9f BXJS document classes]
+ [2020/04/04 v2.0a BXJS document classes]
\input{bxjsja-standard.def}
\ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi=\z@
\def\encodingdefault{T1}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxjscls/bxjsja-pandoc.def new/tex/latex/bxjscls/bxjsja-pandoc.def
--- old/tex/latex/bxjscls/bxjsja-pandoc.def 2019-03-10 22:00:33.000000000 +0100
+++ new/tex/latex/bxjscls/bxjsja-pandoc.def 2020-04-12 00:47:51.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-pandoc.def}
- [2019/03/10 v1.9f BXJS document classes]
+ [2020/04/04 v2.0a BXJS document classes]
\input{bxjsja-standard.def}
\RequirePackage{bxjspandoc}
\@onlypreamble\bxjs@endpreamble@hook
@@ -77,7 +77,7 @@
\ClassWarning\bxjs@clsname
{Main language is invalid, thus the fallback\MessageBreak
definitions will be employed}%
- \bxjs@pandoc@lang@ja
+ \bxjs@pandoc@polyglossia@ja
}{%else
\ClassWarning\bxjs@clsname
{Main language is valid (##2),\MessageBreak
@@ -92,8 +92,8 @@
\ifx\bxjs@polyglossia@options\relax
\csundef{ver(a)polyglossia.sty}%
\fi}
-\@onlypreamble\bxjs@pandoc@lang@ja
-\def\bxjs@pandoc@lang@ja{%
+\@onlypreamble\bxjs@pandoc@polyglossia@ja
+\def\bxjs@pandoc@polyglossia@ja{%
\renewcommand*\setmainlanguage[2][]{}%
\newcommand*\setotherlanguage[2][]{%
\ifblank{##2}{}{%else
@@ -120,7 +120,7 @@
\ClassWarning\bxjs@clsname
{Main language is invalid, so fallback\MessageBreak
definitions will be employed}%
- \bxjs@pandoc@lang@ja
+ \bxjs@pandoc@polyglossia@ja
\else
\ClassWarning\bxjs@clsname
{Main language is valid,\MessageBreak
@@ -132,8 +132,8 @@
\ifx\bxjs@babel@options\relax
\expandafter\let\csname ver@babel.sty\endcsname\@undefined
\fi}
-\@onlypreamble\bxjs@pandoc@lang@ja
-\def\bxjs@pandoc@lang@ja{%
+\@onlypreamble\bxjs@pandoc@babel@ja
+\def\bxjs@pandoc@babel@ja{%
\expandafter\let\csname ver@babel.sty\endcsname\@undefined
\edef\bxjs@next{%
\noexpand\RequirePackage[\bxjs@babel@options,english]{babel}[]%
@@ -150,6 +150,10 @@
\pandocSkipLoadPackage{xeCJK}
\providecommand*{\setCJKmainfont}{\setmainjfont}
\fi
+\if x\jsEngine
+ \expandafter\g@addto@macro\csname opt(a)xeCJK.sty\endcsname{%
+ ,space}
+\fi
\g@addto@macro\bxjs@begin@document@hook{%
\@tempswafalse
\ifx\oldparagraph\@undefined\else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxjscls/bxjsja-standard.def new/tex/latex/bxjscls/bxjsja-standard.def
--- old/tex/latex/bxjscls/bxjsja-standard.def 2019-03-10 22:00:33.000000000 +0100
+++ new/tex/latex/bxjscls/bxjsja-standard.def 2020-04-12 00:47:51.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesFile{bxjsja-standard.def}
- [2019/03/10 v1.9f BXJS document classes]
+ [2020/04/04 v2.0a BXJS document classes]
%% このファイルは日本語文字を含みます
\input{bxjsja-minimal.def}
\bxjs@simplejasetupfalse
@@ -486,8 +486,8 @@
\bxjs@resolve@jafont@paren\bxjs@tmpa
\edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa\bxjs@jp@font}
\ifx\bxjs@tmpa\@empty
- \setCJKmainfont[BoldFont=ipaexg.ttf]{ipaexm.ttf}
- \setCJKsansfont[BoldFont=ipaexg.ttf]{ipaexg.ttf}
+ \setCJKmainfont[BoldFont=HaranoAjiGothic-Medium.otf]{HaranoAjiMincho-Regular.otf}
+ \setCJKsansfont[BoldFont=HaranoAjiGothic-Medium.otf]{HaranoAjiGothic-Medium.otf}
\else
\edef\bxjs@next{%
\noexpand\RequirePackage[\bxjs@tmpa]{zxjafont}[2013/01/28]% v0.2a
@@ -585,8 +585,8 @@
\edef\bxjs@tmpa{\bxjs@catopt\bxjs@tmpa\bxjs@jp@font}
\ifx\bxjs@tmpa\@empty
\defaultjfontfeatures{ Kerning=Off }
- \setmainjfont[BoldFont=IPAexGothic,JFM=ujis]{IPAexMincho}
- \setsansjfont[BoldFont=IPAexGothic,JFM=ujis]{IPAexGothic}
+ \setmainjfont[BoldFont=HaranoAjiGothic-Medium.otf,JFM=ujis]{HaranoAjiMincho-Regular.otf}
+ \setsansjfont[BoldFont=HaranoAjiGothic-Medium.otf,JFM=ujis]{HaranoAjiGothic-Medium.otf}
\else
\edef\bxjs@next{%
\noexpand\RequirePackage[\bxjs@tmpa]{luatexja-preset}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxjscls/bxjspandoc.sty new/tex/latex/bxjscls/bxjspandoc.sty
--- old/tex/latex/bxjscls/bxjspandoc.sty 2019-03-10 22:00:33.000000000 +0100
+++ new/tex/latex/bxjscls/bxjspandoc.sty 2020-04-12 00:47:51.000000000 +0200
@@ -21,7 +21,7 @@
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
\ProvidesPackage{bxjspandoc}
- [2019/03/10 v1.9f BXJS document classes]
+ [2020/04/04 v2.0a BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjsp@pkgname{bxjscjkcat}
\let\bxjsp@engine=n
@@ -79,7 +79,7 @@
\catcode\@tempcnta\bxjsp@cc@other
\advance\@tempcnta\@ne
\repeat}
-\ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi>0
+\ifnum0\if x\bxjsp@engine1\fi\if l\bxjsp@engine1\fi>0
\catcode"1F23B=\bxjsp@cc@other
\bxjsp@makeother@range{9FCD}{A000}
\bxjsp@makeother@range{1B002}{1B170}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxjscls/bxjsreport.cls new/tex/latex/bxjscls/bxjsreport.cls
--- old/tex/latex/bxjscls/bxjsreport.cls 2019-03-10 22:00:33.000000000 +0100
+++ new/tex/latex/bxjscls/bxjsreport.cls 2020-04-12 00:47:51.000000000 +0200
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsreport}
- [2019/03/10 v1.9f BXJS document classes]
+ [2020/04/04 v2.0a BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsreport}
\newif\ifjsc@needsp@tch
@@ -217,6 +217,8 @@
\else\ifdim\(a)tempdima=10.95pt \long\def\@ptsize{1}%
\else\ifdim\@tempdima=12pt \long\def\@ptsize{2}%
\else \long\edef\@ptsize{\jsUnusualPtSize}\fi\fi\fi}
+\def\bxjs@setjbasefontsize#1{%
+ \setkeys{bxjs}{jbase=#1}}
\newif\ifjsc@mag
\newif\ifjsc@mag@xreal
\DeclareOption{8pt}{\bxjs@setbasefontsize{8pt}}
@@ -320,17 +322,9 @@
\define@key{bxjs}{enablejfam}[true]{%
\bxjs@set@keyval{enablejfam}{#1}{}}
\DeclareOption{disablejfam}{\let\bxjs@enablejfam=f}
-\let\ifjsDraft\iffalse
-\@onlypreamble\bxjs@draft
-\def\bxjs@draft#1{%
- \expandafter\let\expandafter\ifjsDraft\csname if#1\endcsname}
-\DeclareOption{draft}{\bxjs@draft{true}\setlength\overfullrule{5pt}}
-\DeclareOption{final}{\bxjs@draft{false}\setlength\overfullrule{0pt}}
-\g@addto@macro\bxjs@begin@document@hook{%
- \expandafter\ifx\csname ifdraft\endcsname\relax
- \expandafter\let\csname ifdraft\expandafter\endcsname
- \csname ifjsDraft\endcsname
- \fi}
+\newif\ifjsDraft
+\DeclareOption{draft}{\jsDrafttrue \overfullrule=5pt }
+\DeclareOption{final}{\jsDraftfalse \overfullrule=0pt }
\newif\ifbxjs@papersize
\bxjs@papersizetrue
\DeclareOption{nopapersize}{\bxjs@papersizefalse}
@@ -431,12 +425,13 @@
\def\bxjs@driver@opt{xetex}%
\let\bxjs@driver@given\bxjs@driver@@xetex}
\DeclareOption{dvipdfmx-if-dvi}{%
+ \ClassWarningNoLine\bxjs@clsname
+ {The old option 'dvipdfmx-if-dvi' is DEPRECATED\MessageBreak
+ and may be abolished in future!\MessageBreak
+ You should write 'dvi=dvipdfmx' instead}%
\setkeys{bxjs}{dvi=dvipdfmx}}
-\newif\ifbxjs@bigcode \bxjs@bigcodefalse
-\edef\bxjs@tmpa{\expandafter\noexpand\csname\endcsname}
-\def\bxjs@tmpb#1 #2#3\@nil{%
- \ifx1#2\bxjs@bigcodetrue \fi}
-\expandafter\bxjs@tmpb\meaning\bxjs@tmpa1 0\@nil
+
+\newif\ifbxjs@bigcode \bxjs@bigcodetrue
\DeclareOption{nobigcode}{%
\bxjs@bigcodefalse}
\DeclareOption{bigcode}{%
@@ -753,6 +748,12 @@
\ifx j\jsEngine
\def\bxjs@jadriver{standard}
\else
+ \ClassWarningNoLine\bxjs@clsname
+ {The option 'ja' is MISSING!!\MessageBreak
+ So 'ja=minimal' is assumed as fallback, but\MessageBreak
+ such implicit setting is now DEPRECATED!\MessageBreak
+ You should write 'ja=minimal' explicitly,\MessageBreak
+ if it is intended}
\let\bxjs@jadriver\bxjs@@minimal
\fi
\fi
@@ -1150,14 +1151,10 @@
\bxjs@postproc@layout
\g@addto@macro\bxjs@bd@pre@geometry@hook{%
\@ifpackagelater{geometry}{2010/02/12}{}{%else
- \PackageWarningNoLine\bxjs@clsname
- {The 'geometry' package installed\MessageBreak
- is too old (< v5.0)}%
- \if x\jsEngine \ifnum\mag=\@m\else
- \def\bxjs@Gm@driver{pdftex}
- \ifx\pdfhorigin\@undefined \newdimen\pdfhorigin \fi
- \ifx\pdfvorigin\@undefined \newdimen\pdfvorigin \fi
- \fi\fi}%
+ \PackageError\bxjs@clsname
+ {Your 'geometry' package is too old (< v5.0)}%
+ {\@ehc}%
+ \let\Gm@driver\relax}%
\ifjsWithpTeXng
\ifx\Gm@driver\@empty
\def\Gm@driver{pdftex}%
@@ -1812,13 +1809,13 @@
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
\def\bxjs@dust{\vrule\@width\z@\@height\z@\@depth\z@}
\newcommand*{\jsInJaParen}[1]{%
- \bxjs@dust\jsInhibitGlue(\theenumii)\jsInhibitGlue\bxjs@dust}
+ \bxjs@dust\jsInhibitGlue (#1)\jsInhibitGlue\bxjs@dust}
\newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\jsInJaParen{(\theenumii)}}
+\newcommand{\labelenumii}{\jsInJaParen{\theenumii}}
\newcommand{\labelenumiii}{\theenumiii.}
\newcommand{\labelenumiv}{\theenumiv.}
\renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue(\theenumii)}
+\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue (\theenumii )}
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
\newcommand\labelitemi{\textbullet}
\newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -2417,67 +2414,54 @@
\@tempswafalse
\if p\jsEngine \@tempswatrue \fi
\if n\jsEngine \@tempswatrue \fi
-\if@tempswa \expandafter\@firstoftwo
-\else \expandafter\@secondoftwo
-\fi
-{%
+\bxjs@cond\if@tempswa\fi{%
\newif\ifjsSeireki \jsSeirekitrue
\def\bxjs@decl@Seireki@cmds{%
\def\西暦{\jsSeirekitrue}%
- \def\和暦{\jsSeirekifalse}}
+ \def\和暦{\jsSeirekifalse\bxjs@wareki@used}}
\def\Seireki{\jsSeirekitrue}
-\def\Wareki{\jsSeirekifalse}
-\def\bxjs@if@use@seireki{%
- \ifjsSeireki \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\jsSeirekifalse\bxjs@wareki@used}
+\def\bxjs@if@use@seireki{\bxjs@cond\ifjsSeireki\fi}
+\def\bxjs@iai{\noexpand~}
}{%
\newif\if西暦 \西暦true
\def\bxjs@decl@Seireki@cmds{%
\def\西暦{\西暦true}%
- \def\和暦{\西暦false}}
+ \def\和暦{\西暦false\bxjs@wareki@used}}
\def\Seireki{\西暦true}
-\def\Wareki{\西暦false}
-\def\bxjs@if@use@seireki{%
- \if西暦 \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\西暦false\bxjs@wareki@used}
+\def\bxjs@if@use@seireki{\bxjs@cond\if西暦\fi}
+\let\bxjs@iai\@empty
}
\bxjs@decl@Seireki@cmds
\let\bxjs@unxp\@firstofone \let\bxjs@onxp\@firstofone
-\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded
- \def\bxjs@onxp{\unexpanded\expandafter}}
-\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
- \def\bxjs@iai{\noexpand~}
-\else \def\bxjs@iai{}
-\fi
+\bxjs@test@engine\unexpanded{%
+ \let\bxjs@unxp\unexpanded \def\bxjs@onxp{\unexpanded\expandafter}}
\newif\ifbxjs@bxwareki@avail
\IfFileExists{bxwareki.sty}{%
\RequirePackage{bxwareki}[]%
\bxjs@bxwareki@availtrue}{}
+\ifbxjs@bxwareki@avail \let\bxjs@wareki@used\@empty
+\else
+ \bxjs@robust@def\bxjs@wareki@used{%
+ \global\let\bxjs@wareki@used\@empty
+ \ClassWarning\bxjs@clsname
+ {Wareki mode is not supported, since\MessageBreak
+ 'bxwareki' is unavailable, found}}
+ \g@addto@macro\bxjs@begin@document@hook{%
+ \let\bxjs@wareki@used\@empty}
+\fi
\ifbxjs@bxwareki@avail
\let\jayear\warekiyear
\def\bxjs@tmpa{H}\ifx\bxjs@tmpa\warekigengoinitial
\newcount\heisei \heisei=\value{warekiyear}
\fi
\else
- \@tempcnta=\the\year\two@digits\month\two@digits\day\relax
- \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501
- \newcount\heisei \heisei\year \advance\heisei-1988\relax
- \fi\fi
- \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \edef\jayear{\bxjs@unxp{平成}\bxjs@iai \the\heisei \bxjs@iai}
- \else \edef\jayear{\the\year \bxjs@iai}
- \fi
+ \edef\jayear{\the\year \bxjs@iai}
\fi
\let\bxjs@next\relax
-\ifbxjs@bxwareki@avail
- \ifx\warekigengo\@empty\else
- \def\bxjs@next{\bxjs@onxp{\warekitoday}}
- \fi
-\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \def\bxjs@next{%
- \bxjs@unxp{平成}\bxjs@iai\number\heisei\bxjs@iai\bxjs@unxp{年}%
- \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}%
- \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}}
+\ifbxjs@bxwareki@avail \ifx\warekigengo\@empty\else
+ \def\bxjs@next{\bxjs@onxp{\warekitoday}}
\fi\fi
\edef\bxjs@today{%
\if@english
@@ -2496,7 +2480,7 @@
\fi}
\let\today\bxjs@today
\g@addto@macro\bxjs@begin@document@hook{%
- \ifx\bbl@jpn@Seirekitrue\@undefined\else
+ \ifx\bbl@jpn@maybekansuji\@undefined\else
\bxjs@decl@Seireki@cmds
\g@addto@macro\datejapanese{%
\let\today\bxjs@today}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxjscls/bxjsslide.cls new/tex/latex/bxjscls/bxjsslide.cls
--- old/tex/latex/bxjscls/bxjsslide.cls 2019-03-10 22:00:33.000000000 +0100
+++ new/tex/latex/bxjscls/bxjsslide.cls 2020-04-12 00:47:51.000000000 +0200
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{bxjsslide}
- [2019/03/10 v1.9f BXJS document classes]
+ [2020/04/04 v2.0a BXJS document classes]
%% このファイルは日本語文字を含みます.
\def\bxjs@clsname{bxjsslide}
\newif\ifjsc@needsp@tch
@@ -214,6 +214,8 @@
\else\ifdim\(a)tempdima=10.95pt \long\def\@ptsize{1}%
\else\ifdim\@tempdima=12pt \long\def\@ptsize{2}%
\else \long\edef\@ptsize{\jsUnusualPtSize}\fi\fi\fi}
+\def\bxjs@setjbasefontsize#1{%
+ \setkeys{bxjs}{jbase=#1}}
\newif\ifjsc@mag
\newif\ifjsc@mag@xreal
\DeclareOption{8pt}{\bxjs@setbasefontsize{8pt}}
@@ -314,17 +316,9 @@
\define@key{bxjs}{enablejfam}[true]{%
\bxjs@set@keyval{enablejfam}{#1}{}}
\DeclareOption{disablejfam}{\let\bxjs@enablejfam=f}
-\let\ifjsDraft\iffalse
-\@onlypreamble\bxjs@draft
-\def\bxjs@draft#1{%
- \expandafter\let\expandafter\ifjsDraft\csname if#1\endcsname}
-\DeclareOption{draft}{\bxjs@draft{true}\setlength\overfullrule{5pt}}
-\DeclareOption{final}{\bxjs@draft{false}\setlength\overfullrule{0pt}}
-\g@addto@macro\bxjs@begin@document@hook{%
- \expandafter\ifx\csname ifdraft\endcsname\relax
- \expandafter\let\csname ifdraft\expandafter\endcsname
- \csname ifjsDraft\endcsname
- \fi}
+\newif\ifjsDraft
+\DeclareOption{draft}{\jsDrafttrue \overfullrule=5pt }
+\DeclareOption{final}{\jsDraftfalse \overfullrule=0pt }
\newif\ifbxjs@papersize
\bxjs@papersizetrue
\DeclareOption{nopapersize}{\bxjs@papersizefalse}
@@ -425,12 +419,13 @@
\def\bxjs@driver@opt{xetex}%
\let\bxjs@driver@given\bxjs@driver@@xetex}
\DeclareOption{dvipdfmx-if-dvi}{%
+ \ClassWarningNoLine\bxjs@clsname
+ {The old option 'dvipdfmx-if-dvi' is DEPRECATED\MessageBreak
+ and may be abolished in future!\MessageBreak
+ You should write 'dvi=dvipdfmx' instead}%
\setkeys{bxjs}{dvi=dvipdfmx}}
-\newif\ifbxjs@bigcode \bxjs@bigcodefalse
-\edef\bxjs@tmpa{\expandafter\noexpand\csname\endcsname}
-\def\bxjs@tmpb#1 #2#3\@nil{%
- \ifx1#2\bxjs@bigcodetrue \fi}
-\expandafter\bxjs@tmpb\meaning\bxjs@tmpa1 0\@nil
+
+\newif\ifbxjs@bigcode \bxjs@bigcodetrue
\DeclareOption{nobigcode}{%
\bxjs@bigcodefalse}
\DeclareOption{bigcode}{%
@@ -745,6 +740,12 @@
\ifx j\jsEngine
\def\bxjs@jadriver{standard}
\else
+ \ClassWarningNoLine\bxjs@clsname
+ {The option 'ja' is MISSING!!\MessageBreak
+ So 'ja=minimal' is assumed as fallback, but\MessageBreak
+ such implicit setting is now DEPRECATED!\MessageBreak
+ You should write 'ja=minimal' explicitly,\MessageBreak
+ if it is intended}
\let\bxjs@jadriver\bxjs@@minimal
\fi
\fi
@@ -1140,14 +1141,10 @@
\bxjs@postproc@layout
\g@addto@macro\bxjs@bd@pre@geometry@hook{%
\@ifpackagelater{geometry}{2010/02/12}{}{%else
- \PackageWarningNoLine\bxjs@clsname
- {The 'geometry' package installed\MessageBreak
- is too old (< v5.0)}%
- \if x\jsEngine \ifnum\mag=\@m\else
- \def\bxjs@Gm@driver{pdftex}
- \ifx\pdfhorigin\@undefined \newdimen\pdfhorigin \fi
- \ifx\pdfvorigin\@undefined \newdimen\pdfvorigin \fi
- \fi\fi}%
+ \PackageError\bxjs@clsname
+ {Your 'geometry' package is too old (< v5.0)}%
+ {\@ehc}%
+ \let\Gm@driver\relax}%
\ifjsWithpTeXng
\ifx\Gm@driver\@empty
\def\Gm@driver{pdftex}%
@@ -1711,13 +1708,13 @@
\renewcommand{\theenumiv}{\@Alph\c@enumiv}
\def\bxjs@dust{\vrule\@width\z@\@height\z@\@depth\z@}
\newcommand*{\jsInJaParen}[1]{%
- \bxjs@dust\jsInhibitGlue(\theenumii)\jsInhibitGlue\bxjs@dust}
+ \bxjs@dust\jsInhibitGlue (#1)\jsInhibitGlue\bxjs@dust}
\newcommand{\labelenumi}{\theenumi.}
-\newcommand{\labelenumii}{\jsInJaParen{(\theenumii)}}
+\newcommand{\labelenumii}{\jsInJaParen{\theenumii}}
\newcommand{\labelenumiii}{\theenumiii.}
\newcommand{\labelenumiv}{\theenumiv.}
\renewcommand{\p@enumii}{\theenumi}
-\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue(\theenumii)}
+\renewcommand{\p@enumiii}{\theenumi\jsInhibitGlue (\theenumii )}
\renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
\newcommand\labelitemi{\textbullet}
\newcommand\labelitemii{\normalfont\bfseries \textendash}
@@ -2286,67 +2283,54 @@
\@tempswafalse
\if p\jsEngine \@tempswatrue \fi
\if n\jsEngine \@tempswatrue \fi
-\if@tempswa \expandafter\@firstoftwo
-\else \expandafter\@secondoftwo
-\fi
-{%
+\bxjs@cond\if@tempswa\fi{%
\newif\ifjsSeireki \jsSeirekitrue
\def\bxjs@decl@Seireki@cmds{%
\def\西暦{\jsSeirekitrue}%
- \def\和暦{\jsSeirekifalse}}
+ \def\和暦{\jsSeirekifalse\bxjs@wareki@used}}
\def\Seireki{\jsSeirekitrue}
-\def\Wareki{\jsSeirekifalse}
-\def\bxjs@if@use@seireki{%
- \ifjsSeireki \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\jsSeirekifalse\bxjs@wareki@used}
+\def\bxjs@if@use@seireki{\bxjs@cond\ifjsSeireki\fi}
+\def\bxjs@iai{\noexpand~}
}{%
\newif\if西暦 \西暦true
\def\bxjs@decl@Seireki@cmds{%
\def\西暦{\西暦true}%
- \def\和暦{\西暦false}}
+ \def\和暦{\西暦false\bxjs@wareki@used}}
\def\Seireki{\西暦true}
-\def\Wareki{\西暦false}
-\def\bxjs@if@use@seireki{%
- \if西暦 \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo \fi}
+\def\Wareki{\西暦false\bxjs@wareki@used}
+\def\bxjs@if@use@seireki{\bxjs@cond\if西暦\fi}
+\let\bxjs@iai\@empty
}
\bxjs@decl@Seireki@cmds
\let\bxjs@unxp\@firstofone \let\bxjs@onxp\@firstofone
-\bxjs@test@engine\unexpanded{\let\bxjs@unxp\unexpanded
- \def\bxjs@onxp{\unexpanded\expandafter}}
-\if \if p\jsEngine T\else\if n\jsEngine T\else F\fi\fi T
- \def\bxjs@iai{\noexpand~}
-\else \def\bxjs@iai{}
-\fi
+\bxjs@test@engine\unexpanded{%
+ \let\bxjs@unxp\unexpanded \def\bxjs@onxp{\unexpanded\expandafter}}
\newif\ifbxjs@bxwareki@avail
\IfFileExists{bxwareki.sty}{%
\RequirePackage{bxwareki}[]%
\bxjs@bxwareki@availtrue}{}
+\ifbxjs@bxwareki@avail \let\bxjs@wareki@used\@empty
+\else
+ \bxjs@robust@def\bxjs@wareki@used{%
+ \global\let\bxjs@wareki@used\@empty
+ \ClassWarning\bxjs@clsname
+ {Wareki mode is not supported, since\MessageBreak
+ 'bxwareki' is unavailable, found}}
+ \g@addto@macro\bxjs@begin@document@hook{%
+ \let\bxjs@wareki@used\@empty}
+\fi
\ifbxjs@bxwareki@avail
\let\jayear\warekiyear
\def\bxjs@tmpa{H}\ifx\bxjs@tmpa\warekigengoinitial
\newcount\heisei \heisei=\value{warekiyear}
\fi
\else
- \@tempcnta=\the\year\two@digits\month\two@digits\day\relax
- \ifnum\@tempcnta<19890108 \else \ifnum\@tempcnta<20190501
- \newcount\heisei \heisei\year \advance\heisei-1988\relax
- \fi\fi
- \ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \edef\jayear{\bxjs@unxp{平成}\bxjs@iai \the\heisei \bxjs@iai}
- \else \edef\jayear{\the\year \bxjs@iai}
- \fi
+ \edef\jayear{\the\year \bxjs@iai}
\fi
\let\bxjs@next\relax
-\ifbxjs@bxwareki@avail
- \ifx\warekigengo\@empty\else
- \def\bxjs@next{\bxjs@onxp{\warekitoday}}
- \fi
-\else\ifnum \ifx\heisei\@undefined\z@\else\heisei\fi >\@ne
- \def\bxjs@next{%
- \bxjs@unxp{平成}\bxjs@iai\number\heisei\bxjs@iai\bxjs@unxp{年}%
- \bxjs@iai\number\month\bxjs@iai\bxjs@unxp{月}%
- \bxjs@iai\number\day\bxjs@iai\bxjs@unxp{日}}
+\ifbxjs@bxwareki@avail \ifx\warekigengo\@empty\else
+ \def\bxjs@next{\bxjs@onxp{\warekitoday}}
\fi\fi
\edef\bxjs@today{%
\if@english
@@ -2365,7 +2349,7 @@
\fi}
\let\today\bxjs@today
\g@addto@macro\bxjs@begin@document@hook{%
- \ifx\bbl@jpn@Seirekitrue\@undefined\else
+ \ifx\bbl@jpn@maybekansuji\@undefined\else
\bxjs@decl@Seireki@cmds
\g@addto@macro\datejapanese{%
\let\today\bxjs@today}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxjscls.tlpobj new/tlpkg/tlpobj/bxjscls.tlpobj
--- old/tlpkg/tlpobj/bxjscls.tlpobj 2019-03-11 02:24:52.000000000 +0100
+++ new/tlpkg/tlpobj/bxjscls.tlpobj 2020-04-12 01:55:23.000000000 +0200
@@ -1,6 +1,6 @@
name bxjscls
category Package
-revision 50318
+revision 54673
shortdesc Japanese document class collection for all major engines
relocated 1
longdesc This package provides an extended version of the Japanese
@@ -24,7 +24,6 @@
catalogue-contact-home https://github.com/zr-tex8r/BXjscls
catalogue-contact-repository https://github.com/zr-tex8r
catalogue-ctan /language/japanese/BX/bxjscls
-catalogue-date 2019-03-09 22:03:51 +0100
catalogue-license bsd2
catalogue-topics japanese class
-catalogue-version 1.9f
+catalogue-version 2.0a
++++++ bxpapersize.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxpapersize/LICENSE new/doc/latex/bxpapersize/LICENSE
--- old/doc/latex/bxpapersize/LICENSE 2017-02-08 23:19:00.000000000 +0100
+++ new/doc/latex/bxpapersize/LICENSE 2019-10-06 22:07:16.000000000 +0200
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2017 Takayuki YATO (aka. "ZR")
+Copyright (c) 2019 Takayuki YATO (aka. "ZR")
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxpapersize/README.md new/doc/latex/bxpapersize/README.md
--- old/doc/latex/bxpapersize/README.md 2017-10-09 00:42:55.000000000 +0200
+++ new/doc/latex/bxpapersize/README.md 2019-10-06 22:07:16.000000000 +0200
@@ -24,6 +24,7 @@
- ifpdf, ifxetex, ifluatex, ifvtex
- xkeyval
- atbegshi
+ - pxatbegshi (when priority setting is used on (u)pTeX)
### Installation
@@ -59,6 +60,7 @@
- `low`: Priotizes specials by others.
- `middle`/`default` (default): Does not care about priority.
- `high`: Priotizes specials by this package.
+ Note: The priority setting will be ignored in PDF mode.
* `olddvips`: Must be specified when you use dvips older than that
included in TeX Live 2017, so as to make the `priority` option
work correctly.
@@ -133,6 +135,9 @@
Revision History
----------------
+ * Version 0.4 ‹2019/10/05›
+ - Load pxatbegshi to properly handle pTeX tate mode.
+ - Remove (experimental) `adjustmag` option.
* Version 0.3b ‹2017/10/08›
- Support pTeX-ng (ApTeX) engine properly.
- (Experimental) Add `adjustmag` option.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxpapersize.doc.tlpobj new/tlpkg/tlpobj/bxpapersize.doc.tlpobj
--- old/tlpkg/tlpobj/bxpapersize.doc.tlpobj 2019-02-28 03:23:40.000000000 +0100
+++ new/tlpkg/tlpobj/bxpapersize.doc.tlpobj 2019-10-07 01:54:04.000000000 +0200
@@ -1,6 +1,6 @@
name bxpapersize.doc
category Package
-revision 45501
+revision 52304
shortdesc doc files of bxpapersize
relocated 1
docfiles size=3
++++++ bxpapersize.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxpapersize/bxpapersize.sty new/tex/latex/bxpapersize/bxpapersize.sty
--- old/tex/latex/bxpapersize/bxpapersize.sty 2017-10-09 00:42:55.000000000 +0200
+++ new/tex/latex/bxpapersize/bxpapersize.sty 2019-10-06 22:07:16.000000000 +0200
@@ -1,7 +1,7 @@
%%
%% This is file 'bxpapersize.sty'.
%%
-%% Copyright (c) 2017 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2019 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,7 +10,7 @@
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxpapersize}[2017/10/08 v0.3b]
+\ProvidesPackage{bxpapersize}[2019/10/05 v0.4]
%% preparation
\def\bxpr@pkgname{bxpapersize}
@@ -48,12 +48,13 @@
%% load packages
\RequirePackage{xkeyval}[2008/08/10]% v2.6
\RequirePackage{atbegshi}
-\RequirePackage{ifpdf,ifxetex,ifluatex,ifvtex}
+\RequirePackage{ifpdf,ifxetex,ifluatex,ifvtex,ifptex}
%% variables
\newdimen\bxpr@dima
\let\bxpr@width\relax
\let\bxpr@height\relax
+\newif\ifbxpr@pxatbegshi
%% constants
\chardef\bxpr@mode@@dvimode=0
@@ -62,11 +63,6 @@
%% unique tokens
\def\bxpr@end{\bxpr@end@}
-%% \bxpr@ptexng
-\chardef\bxpr@ptexng=0
-\edef\bxpr@tmpa{\string\ngbanner}\edef\bxpr@tmpb{\meaning\ngbanner}
-\ifx\bxpr@tmpa\bxpr@tmpb \chardef\bxpr@ptexng=1 \fi
-
%% \bxpr@pagewidth / \bxpr@pageheight
%% \bxpr@horigin / \bxpr@vorigin
\ifluatex % LuaTeX
@@ -89,7 +85,7 @@
\else\ifvtex % VTeX
\let\bxpr@pagewidth\mediawidth
\let\bxpr@pageheight\mediaheight
-\else\ifnum0\the\bxpr@ptexng\ifpdf1\fi>0 % pdfTeX in PDF mode
+\else\ifnum0\ifptexng1\fi\ifpdf1\fi>0 % pdfTeX in PDF mode
\let\bxpr@pagewidth\pdfpagewidth
\let\bxpr@pageheight\pdfpageheight
\let\bxpr@horigin\pdfhorigin
@@ -170,11 +166,6 @@
\def\bxpr@set@priority#1{% invalidate
\bxpr@err@nlprm{priority}}}
-%% 'adjustmag'
-\define@boolkey+[bxpr]{prm}{adjustmag}[true]%
- {}%
- {\bxpr@err@ivval{adjustmag}{#1}}
-
%% 'truedimen'
\define@boolkey+[bxpr]{prm}{truedimen}[true]%
{\bxpr@needs@reset@sizetrue}%
@@ -287,6 +278,18 @@
\noexpand\bxpapersizesetup{\bxpr@kvopt}%
}\bxpr@tmpa
+% if priority is not middle...
+\ifnum\bxpr@priority=\bxpr@priority@@default\else
+ \ifcase\bxpr@mode % dvi
+ \ifptex
+ \RequirePackage{pxatbegshi}[]
+ \fi
+ \or % pdf
+ \PackageWarningNoLine\bxpr@pkgname
+ {The priority setting will be ignored in PDF mdoe}
+ \fi
+\fi
+
%--------------------------------------- page hook
%% \bxpr@begindoc@first@hook
@@ -399,12 +402,7 @@
\edef\bxpr@special@chunk{\special{papersize=\bxpr@tmpb}}}%
\else %pdf
\def\bxpr@set@page@size#1#2{%
- \let\bxpr@tmpb\@empty
- \ifbxpr@prm@adjustmag
- \bxpr@let@real@mag@to\bxpr@tmpb
- \fi
- \bxpr@pagewidth=#1\relax \bxpr@pagewidth=\bxpr@tmpb\bxpr@pagewidth
- \bxpr@pageheight=#2\relax \bxpr@pageheight=\bxpr@tmpb\bxpr@pageheight
+ \bxpr@pagewidth=#1\relax \bxpr@pageheight=#2\relax
\bxDebug{papersize=\the\bxpr@pagewidth,\the\bxpr@pageheight}}%
\fi
@@ -469,79 +467,6 @@
\advance\bxpr@dima\dp\AtBeginShipoutBox
\edef\bxpr@height{\the\bxpr@dima}}
-%--------------------------------------- cope with tate-direction
-
-% In (u)pTeX engine, boxes and lists have the direction attribute,
-% and yoko boxes cannot be unboxed in tate lists (and vice versa).
-% This restriction can cause the atbegshi package to fail, and thus
-% the 'priority=low' setting results in an error when used together
-% with document classes of tate direction.
-
-% if '\tate' is invalid then quit now
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname tate\endcsname\relax
-\expandafter\endinput\fi\relax
-
-% if priority is middle then quit
-\ifnum\bxpr@priority=\bxpr@priority@@default
-\expandafter\endinput\fi\relax
-
-% check in advance
-\ifx\AtBegShi@Output\@undefined
- \PackageWarningNoLine\bxpr@pkgname
- {The patch to atbegshi failed, so\MessageBreak
- the package might not work well}
-\expandafter\endinput\fi\relax
-
-%% \ifbxpr@ddir
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname ifddir\endcsname\relax
- \bxpr@csletcs{ifbxpr@ddir}{iffalse}
-\else
- \bxpr@csletcs{ifbxpr@ddir}{ifddir}
-\fi
-
-%% \bxpr@patch
-% Patches the internal macro \AtBegShi@Output of atbegshi package,
-% so that the macro is prepended by a `\yoko` primitive and appended
-% by a direction primitive to switch back to the original.
-\@onlypreamble\bxpr@patch
-\def\bxpr@patch{%
- \expandafter\bxpr@patch@a\AtBegShi@Output\bxpr@end}
-\@onlypreamble\bxpr@patch@a
-\def\bxpr@patch@a{%
- \futurelet\bxpr@tok\bxpr@patch@b}
-\@onlypreamble\bxpr@patch@b
-\def\bxpr@patch@b{%
- \ifx\bxpr@tok\egroup \expandafter\@firstoftwo
- \else \expandafter\@secondoftwo
- \fi{\bxpr@patch@c}{\bxpr@patch@d{}}}
-\@onlypreamble\bxpr@patch@c
-\def\bxpr@patch@c#1#2{%
- \bxpr@patch@d{#1#2}}
-\@onlypreamble\bxpr@patch@d
-\def\bxpr@patch@d#1#2\bxpr@end{%
- \def\AtBegShi@Output{#1\bxpr@ABS@prehook#2\bxpr@ABS@posthook}}
-% do patch
-\bxpr@patch
-
-%% \bxpr@restore@dir
-\let\bxpr@restore@dir\relax
-
-%% \bxpr@ABS@prehook
-\def\bxpr@ABS@prehook{%
- \iftdir \yoko \let\bxpr@restore@dir\tate
- \else\ifbxpr@ddir \yoko \let\bxpr@restore@dir\dtou
- \else \let\bxpr@restore@dir\relax
- \fi\fi
- \ifx\bxpr@restore@dir\relax\else
- \bxDebug{Temporarily switching \meaning\bxpr@restore@dir
- \space to \string\yoko}%
- \fi}
-%% \bxpr@ABS@posthook
-\def\bxpr@ABS@posthook{%
- \bxpr@restore@dir}
-
%--------------------------------------- all done
\endinput
%% EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxpapersize.tlpobj new/tlpkg/tlpobj/bxpapersize.tlpobj
--- old/tlpkg/tlpobj/bxpapersize.tlpobj 2019-02-28 03:23:40.000000000 +0100
+++ new/tlpkg/tlpobj/bxpapersize.tlpobj 2019-10-07 01:54:04.000000000 +0200
@@ -1,17 +1,17 @@
name bxpapersize
category Package
-revision 45501
+revision 52304
shortdesc Synchronize output paper size with layout paper size
relocated 1
longdesc As is well known, in LaTeX processing layout paper size
longdesc specified by document class options is not automatically
longdesc applied to output paper size. This package enables LaTeX
longdesc authors to synchronize both kinds of paper sizes.
-runfiles size=5
+runfiles size=4
RELOC/tex/latex/bxpapersize/bxpapersize.sty
catalogue-contact-home https://github.com/zr-tex8r/BXpapersize
catalogue-ctan /macros/latex/contrib/bxpapersize
-catalogue-date 2017-10-08 09:59:49 +0200
+catalogue-date 2019-10-06 16:18:28 +0200
catalogue-license mit
catalogue-topics page-control
-catalogue-version 0.3b
+catalogue-version 0.4
++++++ bxpdfver.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxpdfver/LICENSE new/doc/latex/bxpdfver/LICENSE
--- old/doc/latex/bxpdfver/LICENSE 2017-02-13 00:32:25.000000000 +0100
+++ new/doc/latex/bxpdfver/LICENSE 2020-04-20 00:15:45.000000000 +0200
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2017 Takayuki YATO (aka. "ZR")
+Copyright (c) 2014-2020 Takayuki YATO (aka. "ZR")
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxpdfver/README-ja.md new/doc/latex/bxpdfver/README-ja.md
--- old/doc/latex/bxpdfver/README-ja.md 2017-02-13 00:32:25.000000000 +0100
+++ new/doc/latex/bxpdfver/README-ja.md 2020-04-20 00:15:45.000000000 +0200
@@ -35,7 +35,7 @@
利用可能なオプションは以下の通り。
- * `1.4`、`1.5`、`1.6`、`1.7`: PDF バージョンを指定する。
+ * `1.4`、`1.5`、`1.6`、`1.7`、`2.0`: PDF バージョンを指定する。
* `nocompress`: ストリームの圧縮を抑止する。
* `compress`(既定): ストリームの圧縮を抑止しない。
* `noobjcompress`: オブジェクトストリームの使用を抑止する。
@@ -47,6 +47,8 @@
+ `dvipdfmx`: dvipdfmx 用のドライバを指定する。
+ `disabled`/`nodvidriver`: 全ての機能を無効化する。
* `lenient`: サポートしない機能に対するエラーを警告に格下げする。
+ * `new-dvipdfmx`: dvipdfmx に対するバージョン検査を省略し、常に最新の
+ バージョンであると仮定する。
`compress`、`objcompress` はこのパッケージによる抑止を行わないという意味
であり、既に抑止されている場合にそれを再び有効化するものではない。
@@ -55,7 +57,7 @@
* `\setpdfversion{<バージョン>}`: 出力 PDF バージョンを指定する。
`<バージョン>` には以下の何れかを指定する。
- + `1.4`、`1.5`、`1.6`、`1.7` の何れか。その値に設定する。
+ + `1.4`、`1.5`、`1.6`、`1.7`、`2.0` の何れか。その値に設定する。
+ PDF ファイルの名前。そのファイルのバージョンと同じ値に設定する。
* `\suppresspdfcompression`: ストリームの圧縮を抑止する。
* `\suppresspdfobjcompression`: オブジェクトストリームの使用を抑止
@@ -101,6 +103,8 @@
更新履歴
--------
+ * Version 0.5 ‹2020/04/19›
+ - PDF バージョンの値として `2.0` をサポートする。
* Version 0.4 ‹2017/02/11›
- `\setpdfdecimaldigits`、`\preservepdfdestinations` を追加。
* Version 0.3 ‹2016/08/11›
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxpdfver/README.md new/doc/latex/bxpdfver/README.md
--- old/doc/latex/bxpdfver/README.md 2017-02-13 00:32:25.000000000 +0100
+++ new/doc/latex/bxpdfver/README.md 2020-04-20 00:15:45.000000000 +0200
@@ -37,7 +37,7 @@
The available options are:
- * `1.4`, `1.5`, `1.6`, or `1.7`: Sets PDF version.
+ * `1.4`, `1.5`, `1.6`, `1.7` or `2.0`: Sets PDF version.
* `nocompress`: Suppresses stream compression.
* `compress` (default): Does not suppress stream compression.
* `noobjcompress`: Suppresses use of object streams.
@@ -57,7 +57,7 @@
* `\setpdfversion{<version>}`: Sets PDF version.
Here `<version>` is either one of the following:
- + `1.4`, `1.5`, `1.6`, or `1.7`; the version itself.
+ + `1.4`, `1.5`, `1.6`, `1.7` or `2.0`; the version itself.
+ the name of a PDF file; the version is set equal to that of
the given file.
* `\suppresspdfcompression`: Suppresses stream compression.
@@ -101,6 +101,8 @@
REVISION HISTORY
----------------
+ * Version 0.5 ‹2020/04/19›
+ - Suuport PDF version value `2.0`.
* Version 0.4 ‹2017/02/11›
- Add `\setpdfdecimaldigits` and `\preservepdfdestinations`.
* Version 0.3 ‹2016/08/11›
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxpdfver.doc.tlpobj new/tlpkg/tlpobj/bxpdfver.doc.tlpobj
--- old/tlpkg/tlpobj/bxpdfver.doc.tlpobj 2019-02-28 03:23:40.000000000 +0100
+++ new/tlpkg/tlpobj/bxpdfver.doc.tlpobj 2020-04-20 01:55:50.000000000 +0200
@@ -1,6 +1,6 @@
name bxpdfver.doc
category Package
-revision 43201
+revision 54802
shortdesc doc files of bxpdfver
relocated 1
docfiles size=6
++++++ bxpdfver.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxpdfver/bxpdfver.sty new/tex/latex/bxpdfver/bxpdfver.sty
--- old/tex/latex/bxpdfver/bxpdfver.sty 2017-02-13 00:32:25.000000000 +0100
+++ new/tex/latex/bxpdfver/bxpdfver.sty 2020-04-20 00:15:45.000000000 +0200
@@ -1,8 +1,16 @@
-% bxpdfver.sty
+%%
+%% This is file 'bxpdfver.sty'.
+%%
+%% Copyright (c) 2014-2020 Takayuki YATO (aka. "ZR")
+%% GitHub: https://github.com/zr-tex8r
+%% Twitter: @zr_tex8r
+%%
+%% This package is distributed under the MIT License.
+%%
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxpdfver}[2017/02/11 v0.4]
+\ProvidesPackage{bxpdfver}[2020/04/19 v0.5]
\def\bxpv@pkgname{bxpdfver}
%% preparations
@@ -20,26 +28,17 @@
\let\bxpv@compress=t % use compression?
\let\bxpv@obj@compress=t % use object stream?
\chardef\bxpv@infolevel=2 % info-log level
+\let\bxpv@new@dvipdfmx=f % assume new dvipdfmx?
+
+%% \bxpv@valid@versions
+\def\bxpv@valid@versions{1.4,1.5,1.6,1.7,2.0}
%% options
% (PDF version)
-\DeclareOption{1.4}{%
- \edef\bxpv@version{\CurrentOption}%
-}
-\DeclareOption{1.5}{%
- \edef\bxpv@version{\CurrentOption}%
-}
-\DeclareOption{1.6}{%
- \edef\bxpv@version{\CurrentOption}%
-}
-\DeclareOption{1.7}{%
- \edef\bxpv@version{\CurrentOption}%
-}
-\DeclareOption{1.8}{%
- \edef\bxpv@version{\CurrentOption}%
-}
-\DeclareOption{1.9}{%
- \edef\bxpv@version{\CurrentOption}%
+\@for\bxpv@tmpa:=\bxpv@valid@versions\do{%
+ \DeclareOption{\bxpv@tmpa}{%
+ \edef\bxpv@version{\CurrentOption}%
+ }%
}
% (compression)
\DeclareOption{nocompress}{%
@@ -83,6 +82,11 @@
\let\bxpv@drv@type=0%
\def\bxpv@drv@name{nodvidriver}%
}
+\DeclareOption{new-dvipdfmx}{%
+ \let\bxpv@drv@type=d%
+ \let\bxpv@new@dvipdfmx=t%
+ \def\bxpv@drv@name{dvipdfmx}%
+}
% (other)
\DeclareOption{lenient}{%
\chardef\bxpv@infolevel=1
@@ -130,6 +134,12 @@
the engine/driver does not support the feature}%
}
+%% \ifbxpv@defined
+\let\ifbxpv@defined\ifdefined
+\ifx\ifbxpv@defined\@undefined \expandafter\@firstofone
+\else \expandafter\@gobble
+\fi{\let\ifbxpv@defined\iffalse}
+
%--------------------------------------- internal dispatchers
%% \bxpv@suppress@compress
@@ -142,6 +152,9 @@
\def\bxpv@suppress@obj@compress{%
\bxpv@fail@nafea{Cannot suppress object compression}%
}
+%% \bxpv@check@version
+\@onlypreamble\bxpv@check@version
+\let\bxpv@check@version\bxpv@okfalse
%% \bxpv@set@version
\@onlypreamble\bxpv@set@version
\def\bxpv@set@version{%
@@ -206,30 +219,59 @@
\global\let\bxpv@@minorversion\pdfminorversion
\global\let\bxpv@@decimaldigits\pdfdecimaldigits
\global\let\bxpv@@pkresolution\pdfpkresolution
+ \global\let\bxpv@@majorversion\pdfmajorversion
\bxpv@check@prim\pdfvariable{%
\protected\xdef\bxpv@@compresslevel{\pdfvariable compresslevel}%
\protected\xdef\bxpv@@objcompresslevel{\pdfvariable objcompresslevel}%
\protected\xdef\bxpv@@minorversion{\pdfvariable minorversion}%
\protected\xdef\bxpv@@decimaldigits{\pdfvariable decimaldigits}%
\protected\xdef\bxpv@@pkresolution{\pdfvariable pkresolution}%
+ \ifnum 0\directlua{%
+ if pdf.getmajorversion then tex.write('1') end}>\z@
+ \protected\xdef\bxpv@@majorversion{\pdfvariable majorversion}%
+ \fi
}%
% If \pdfcompresslevel is available, use it.
- \ifx\bxpv@@compresslevel\@undefined\else
+ \ifbxpv@defined\bxpv@@compresslevel
\gdef\bxpv@suppress@compress{%
\global\bxpv@@compresslevel\z@
}%
\fi
% If \pdfobjcompresslevel is available, use it.
- \ifx\bxpv@@objcompresslevel\@undefined\else
+ \ifbxpv@defined\bxpv@@objcompresslevel
\global\chardef\bxpv@org@objcompresslevel\bxpv@@objcompresslevel
\gdef\bxpv@suppress@obj@compress{%
\global\bxpv@@objcompresslevel\z@
}%
\global\let\bxpv@cancel@obj@compress\bxpv@suppress@obj@compress
\fi
- % If \pdfminorversion is available, use it.
- \ifx\bxpv@@minorversion\@undefined\else
+ % If \pdfmajorversion/\pdfminorversion is available, use it.
+ \ifbxpv@defined\bxpv@@majorversion
\global\chardef\bxpv@org@minorversion\bxpv@@minorversion
+ \global\chardef\bxpv@org@majorversion\bxpv@@majorversion
+ \global\let\bxpv@check@version\bxpv@oktrue
+ \gdef\bxpv@set@version{%
+ \ifx\bxpdfverMinorVersion\relax
+ \global\bxpv@@minorversion\bxpv@org@minorversion
+ \global\bxpv@@majorversion\bxpv@org@majorversion
+ \else
+ \global\bxpv@@minorversion\bxpdfverMinorVersion
+ \global\bxpv@@majorversion\bxpdfverMajorVersion
+ \fi
+ }%
+ \g@addto@macro\bxpv@begin@document@hook{%
+ \ifnum\bxpv@@majorversion<2 \ifnum\bxpv@@minorversion<5
+ \bxpv@cancel@obj@compress
+ \fi\fi
+ }%
+ \else\ifbxpv@defined\bxpv@@minorversion
+ \global\chardef\bxpv@org@minorversion\bxpv@@minorversion
+ \gdef\bxpv@check@version{%
+ \bxpv@oktrue
+ \ifx\bxpdfverMajorVersion\tw@
+ \bxpv@okfalse % cannot set major version 2
+ \fi
+ }
\gdef\bxpv@set@version{%
\ifx\bxpdfverMinorVersion\relax
\global\bxpv@@minorversion\bxpv@org@minorversion
@@ -242,9 +284,9 @@
\bxpv@cancel@obj@compress
\fi
}%
- \fi
+ \fi\fi
% If \pdfdecimaldigits is available, use it.
- \ifx\bxpv@@decimaldigits\@undefined\else
+ \ifbxpv@defined\bxpv@@decimaldigits
\global\chardef\bxpv@org@decimaldigits\bxpv@@decimaldigits
\gdef\bxpv@set@decimaldigits{%
\ifx\bxpdfverDecimalDigits\relax
@@ -255,7 +297,7 @@
}%
\fi
% If \pdfpkresolution is available, use it.
- \ifx\bxpv@@pkresolution\@undefined\else
+ \ifbxpv@defined\bxpv@@pkresolution
\global\mathchardef\bxpv@org@pkresolution\bxpv@@pkresolution
\gdef\bxpv@set@pkresolution{%
\ifx\bxpdfverPkResolution\relax
@@ -285,6 +327,7 @@
\else\if d\bxpv@drv@type % 'dvipdfmx'
\global\let\bxpv@suppress@compress\relax
\global\let\bxpv@suppress@obj@compress\relax
+ \global\let\bxpv@check@version\relax
\global\let\bxpv@set@version\relax
\global\let\bxpv@set@decimaldigits\relax
%\global\let\bxpv@set@pkresolution\relax
@@ -324,8 +367,13 @@
\@onlypreamble\setpdfversion
\newcommand*\setpdfversion[1]{%
\edef\bxpv@version{#1}%
- \bxpv@get@mversion
- \bxpv@set@version
+ \bxpv@set@version@values
+ \bxpv@check@version
+ \ifbxpv@ok
+ \bxpv@set@version
+ \else
+ \bxpv@fail@nafea{Cannot set PDF version to '\bxpv@version'}%
+ \fi
}
%%<*> \setpdfdecimaldigits{<number>}
@@ -362,6 +410,13 @@
\let\bxpdfverMinorVersion\relax
}
+%%<+> \bxpdfverMajorVersion
+% The PDF major version (eg. '1' for 1.4) that this package
+% will impose. It is a number constant, or \relax.
+\@ifdefinable{\bxpdfverMajorVersion}{%
+ \let\bxpdfverMajorVersion\relax
+}
+
%%<+> \bxpdfverDecimalDigits
% The PDF decimal-digits value that this package
% will impose. It is a number constant, or \relax.
@@ -418,90 +473,100 @@
%% variables
\let\bxpv@mversion\relax % minor version (temporary)
-%% \bxpv@get@mversion
-% Sets \bxpdfverMinorVersion.
-\@onlypreamble\bxpv@get@mversion
-\def\bxpv@get@mversion{%
+%% \bxpv@set@version@values
+% Sets \bxpdfverMinorVersion/\bxpdfverMajorVersion.
+\@onlypreamble\bxpv@set@version@values
+\def\bxpv@set@version@values{%
\edef\bxpv@version{\bxpv@version}%
+ \let\bxpv@tmpc\bxpv@version
\ifx\bxpv@version\@empty
\global\let\bxpdfverMinorVersion\relax % unset
+ \global\let\bxpdfverMajorVersion\relax % unset
\else
- \let\bxpv@mversion\relax
- \@tfor\bxpv@x:=456789\do{%
- \edef\bxpv@tmpa{1.\bxpv@x}%
+ \bxpv@okfalse
+ \@for\bxpv@tmpa:=\bxpv@valid@versions\do{%
\ifx\bxpv@version\bxpv@tmpa
- \chardef\bxpv@mversion=\bxpv@x\relax
+ \bxpv@oktrue
\fi
}%
- \ifx\bxpv@mversion\relax
- \bxpv@file@mversion
+ \ifbxpv@ok\else
+ \bxpv@check@file@version
+ \ifx\bxpv@version\relax
+ \bxpv@okfalse
+ \else
+ \bxpv@oktrue
+ \PackageInfo\bxpv@pkgname
+ {Output PDF version is set to \bxpv@version\MessageBreak}%
+ \fi
\fi
- \ifx\bxpv@mversion\relax
+ \ifbxpv@ok
+ \expandafter\bxpv@set@version@values@a\bxpv@version\relax
+ \else
\PackageError\bxpv@pkgname
{Invalid value given for PDF version\MessageBreak
- (value=\bxpv@version)}{%
- PDF version must be either 1.4, 1.5, ..., 1.9, or\MessageBreak
+ (value=\bxpv@tmpc)}{%
+ PDF version must be either one of the following:\MessageBreak
+ \@spaces \bxpv@valid@versions;\MessageBreak
or the name of a PDF file from which the version is pulled.%
\MessageBreak\@ehc}%
- \else
- \PackageInfo\bxpv@pkgname
- {Output PDF version is set to 1.\the\bxpv@mversion
- \MessageBreak}%
- \global\let\bxpdfverMinorVersion\bxpv@mversion
\fi
\fi
}
+\def\bxpv@set@version@values@a#1.#2\relax{%
+ \global\chardef\bxpdfverMinorVersion=#2\relax
+ \global\chardef\bxpdfverMajorVersion=#1\relax
+}
-%% \bxpv@file@mversion
-\@onlypreamble\bxpv@file@mversion
-\def\bxpv@file@mversion{%
- \let\bxpv@mversion\relax
- \expandafter\bxpv@file@mversion@a\bxpv@version\bxpv@end
+%% \bxpv@check@file@version
+\@onlypreamble\bxpv@check@file@version
+\def\bxpv@check@file@version{%
+ \expandafter\bxpv@check@file@version@a\bxpv@version\bxpv@end
}
-\@onlypreamble\bxpv@file@mversion@a
-\def\bxpv@file@mversion@a#1\bxpv@end{%
+\@onlypreamble\bxpv@check@file@version@a
+\def\bxpv@check@file@version@a#1\bxpv@end{%
\filename@parse{#1}%
\edef\bxpv@next{%
\lowercase{\def\noexpand\filename@ext{\filename@ext}}%
}\bxpv@next
\def\bxpv@tmpb{pdf}%
+ \let\bxpv@version\relax
\ifx\filename@ext\bxpv@tmpb
\global\let\bxpv@gtmpa\relax
\bxpv@read@file{#1}{%
- \bxpv@file@mversion@xa{##1 }%
+ \bxpv@check@file@version@xa{##1 }%
\bxpv@read@file@finish
}%
\ifbxpv@read@file@ok\else
\PackageWarning\bxpv@pkgname
{File '#1' not found}%
\fi
- \@tfor\bxpv@x:=456789\do{%
- \ifx\bxpv@x\bxpv@gtmpa
- \chardef\bxpv@mversion=\bxpv@x\relax
+ \@for\bxpv@tmpa:=\bxpv@valid@versions\do{%
+ \ifx\bxpv@gtmpa\bxpv@tmpa
+ \let\bxpv@version\bxpv@tmpa
\fi
}%
\fi
}
% some more subprocedures
-\@onlypreamble\bxpv@file@mversion@xa
-\@onlypreamble\bxpv@file@mversion@xb
-\@onlypreamble\bxpv@file@mversion@xc
+\@onlypreamble\bxpv@check@file@version@xa
+\@onlypreamble\bxpv@check@file@version@xb
+\@onlypreamble\bxpv@check@file@version@xc
\begingroup
\escapechar\m@ne
\def\bxpv@tmpa#1\bxpv@end{%
- \gdef\bxpv@file@mversion@xa##1{%
- \bxpv@file@mversion@xb##1#1\bxpv@end
+ \gdef\bxpv@check@file@version@xa##1{%
+ \bxpv@check@file@version@xb##1#1\bxpv@end
}%
- \gdef\bxpv@file@mversion@xb##1#1##2\bxpv@end{%
+ \gdef\bxpv@check@file@version@xb##1#1##2\bxpv@end{%
\ifx\bxpv@mt##1\bxpv@mt
- \bxpv@file@mversion@xc##2\bxpv@end
+ \bxpv@check@file@version@xc##2\bxpv@end
\fi
}%
- \gdef\bxpv@file@mversion@xc##1 ##2\bxpv@end{%
+ \gdef\bxpv@check@file@version@xc##1 ##2\bxpv@end{%
\gdef\bxpv@gtmpa{##1}%
}%
}
- \edef\bxpv(a)tmpb{{\expandafter\string\csname\string\%PDF-1.\endcsname}}%
+ \edef\bxpv@tmpb{{\expandafter\string\csname\string\%PDF-\endcsname}}%
\expandafter\bxpv@tmpa\bxpv@tmpb\bxpv@end
\endgroup
@@ -531,10 +596,26 @@
\@onlypreamble\bxpv@begin@document@dvipdfmx
\def\bxpv@begin@document@dvipdfmx{%
% PDF version
- \ifx\bxpdfverMinorVersion\relax\else
- \g@addto@macro\bxpv@page@specials{%
- \special{pdf:minorversion \the\bxpdfverMinorVersion}%
- }%
+ \ifx\bxpdfverMajorVersion\tw@
+ \bxpv@check@dvipdfmx@version{20180217}%
+ {Cannot set PDF major version}%
+ \else
+ \bxpv@oktrue
+ \fi
+ \ifbxpv@ok
+ \ifx\bxpdfverMinorVersion\relax\else
+ \g@addto@macro\bxpv@page@specials{%
+ \special{pdf:minorversion \the\bxpdfverMinorVersion}%
+ }%
+ \fi
+ \ifx\bxpdfverMinorVersion\relax\else
+ \bxpv@cache@fetch{dvipdfmxver}%
+ \ifnum\bxpv@cache@@dvipdfmxver<20180217 \else
+ \g@addto@macro\bxpv@page@specials{%
+ \special{pdf:majorversion \the\bxpdfverMajorVersion}%
+ }%
+ \fi
+ \fi
\fi
% compression
\ifbxpdfverCompressionSuppressed
@@ -806,6 +887,7 @@
\chardef\bxpv@rf@cont\@ne
\bxpv@read@file@b
\fi
+ \closein\@inputcheck
\endgroup
}
\@onlypreamble\bxpv@read@file@b
@@ -888,11 +970,13 @@
\def\next#1{\expandafter\meaning\csname if#1\endcsname}%
\typeout{**bxpdfver-----------%
^^JMinorVersion=\meaning\bxpdfverMinorVersion
+ ^^JMajorVersion=\meaning\bxpdfverMajorVersion
^^JCompressionSuppressed=\next{bxpdfverCompressionSuppressed}%
^^JObjCompressionSuppressed=\next{bxpdfverObjCompressionSuppressed}%
^^JDecimalDigits=\meaning\bxpdfverDecimalDigits
^^JPkResolution=\meaning\bxpdfverPkResolution
\do minorversion=\bxpv@@minorversion
+ \do majorversion=\bxpv@@majorversion
\do compresslevel=\bxpv@@compresslevel
\do objcompresslevel=\bxpv@@objcompresslevel
\do decimaldigits=\bxpv@@decimaldigits
@@ -912,6 +996,9 @@
\if t\bxpv@obj@compress\else
\suppresspdfobjcompression
\fi
+\if t\bxpv@new@dvipdfmx
+ \bxpv@cache@store{dvipdfmxver}{99999999}
+\fi
%--------------------------------------- all done
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxpdfver.tlpobj new/tlpkg/tlpobj/bxpdfver.tlpobj
--- old/tlpkg/tlpobj/bxpdfver.tlpobj 2019-02-28 03:23:41.000000000 +0100
+++ new/tlpkg/tlpobj/bxpdfver.tlpobj 2020-04-20 01:55:50.000000000 +0200
@@ -1,6 +1,6 @@
name bxpdfver
category Package
-revision 43201
+revision 54802
shortdesc Specify version and compression level of output PDF files
relocated 1
longdesc This package enables users to specify in their sources the
@@ -11,7 +11,6 @@
runfiles size=7
RELOC/tex/latex/bxpdfver/bxpdfver.sty
catalogue-ctan /macros/latex/contrib/bxpdfver
-catalogue-date 2017-02-14 00:26:52 +0100
catalogue-license mit
catalogue-topics pdf-feat
-catalogue-version 0.4
+catalogue-version 0.5
++++++ bxwareki.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxwareki/README.md new/doc/latex/bxwareki/README.md
--- old/doc/latex/bxwareki/README.md 2019-04-01 23:08:11.000000000 +0200
+++ new/doc/latex/bxwareki/README.md 2019-06-01 22:57:31.000000000 +0200
@@ -36,6 +36,8 @@
Revision History
----------------
+ * Version 0.6 ‹2019/06/01›
+ - The file `bxwareki2019.def` is no longer required.
* Version 0.5 ‹2019/04/01›
- Support for the new gengo “令和”.
* Version 0.4 ‹2018/10/01›
Binary files old/doc/latex/bxwareki/bxwareki.pdf and new/doc/latex/bxwareki/bxwareki.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bxwareki/bxwareki.tex new/doc/latex/bxwareki/bxwareki.tex
--- old/doc/latex/bxwareki/bxwareki.tex 2019-04-01 23:08:11.000000000 +0200
+++ new/doc/latex/bxwareki/bxwareki.tex 2019-06-01 22:57:31.000000000 +0200
@@ -3,8 +3,8 @@
\usepackage[scale=0.75]{geometry}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{0.5}
-\newcommand{\PkgDate}{2019/04/01}
+\newcommand{\PkgVersion}{0.6}
+\newcommand{\PkgDate}{2019/06/01}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\textit{#1}$\rangle$}
\newcommand{\Note}{\par\noindent\emph{Note:}\quad}
@@ -34,6 +34,8 @@
(\Ja{平成\+30\+年\+8\+月\+28\+日}).
You can choose whether the numbers are written
in Western numerals (28) or kanji numerals (\Ja{二八}).
+The package is aware of the current era name,
+\emph{Reiwa}~(\Ja{令和}).
Note that the package only deals with dates in the year 1873 or later,
where the Japanese calendar is really a Gregorian calendar
@@ -58,9 +60,7 @@
\section{Package Loading}
\label{sec:Loading}
-No options are needed in normal use%
-\footnote{See Section~\ref{ssec:download2019}
- for the \texttt{download2019} option.}.
+No options are available.
\begin{quote}\small\begin{verbatim}
\usepackage{bxwareki}
@@ -210,53 +210,6 @@
\end{itemize}
%===========================================================
-\section{Support for the kaigen planned in 2019}
-\label{sec:Kaigen}
-
-In Japan a kaigen (due to the abdication of the Emperor)
-is planned on 2019/05/01,
-and the new gengo ``\Ja{令和}'' has been announced in advance.
-(The announcement was made on 2019/04/01.)
-Thus this package has been updated to support the new gengo.
-
-%-------------------
-\subsection{The \texttt{download2019} option}
-\label{ssec:download2019}
-
-\begin{quote}\itshape
-This function is no longer necessary,
-since the new gengo is supported by default in the current version.
-The function will be removed in near future.
-\end{quote}
-
-Instead of manually downloading the new version from CTAN,
-you can get the support for the new gengo
-with a single run of {\LaTeX}
-(of course after the annoucement of the gengo):
-when you compile a document which loads this package
-with |download2019| option using {\LuaLaTeX}
-with \emph{full shell escape} enabled%
-\footnote{In most system, full shell escape is enabled
- by \texttt{-shell-escape} option.},
-then the run will download an additional file
-from the package's GitHub repository
-and install it into the user's TEXMF tree.
-
-In short: make the following dummy%
-\footnote{Using the dummy document with minimal content
-could reduce the risk of using full shell escape,
-but you need to trust me, of course.}
-document file (named |dummy.tex|)
-\begin{quote}\small\begin{verbatim}
-\documentclass{article}
-\usepackage[download2019]{bxwareki}
-\stop
-\end{verbatim}\end{quote}
-and run |lualatex -shell-escape dummy|.
-After that, the new gengo will be supported
-on any engine, without shell escape.
-
-%===========================================================
\section{Notices for {\TeX} programmers}
\label{sec:Allez}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxwareki.doc.tlpobj new/tlpkg/tlpobj/bxwareki.doc.tlpobj
--- old/tlpkg/tlpobj/bxwareki.doc.tlpobj 2019-04-02 01:24:37.000000000 +0200
+++ new/tlpkg/tlpobj/bxwareki.doc.tlpobj 2019-06-02 01:44:17.000000000 +0200
@@ -1,9 +1,9 @@
name bxwareki.doc
category Package
-revision 50696
+revision 51286
shortdesc doc files of bxwareki
relocated 1
-docfiles size=53
+docfiles size=50
RELOC/doc/latex/bxwareki/LICENSE
RELOC/doc/latex/bxwareki/README.md
RELOC/doc/latex/bxwareki/bxwareki.pdf
++++++ bxwareki.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxwareki/bxwareki-cd.def new/tex/latex/bxwareki/bxwareki-cd.def
--- old/tex/latex/bxwareki/bxwareki-cd.def 2018-10-02 03:05:54.000000000 +0200
+++ new/tex/latex/bxwareki/bxwareki-cd.def 2019-06-01 22:57:31.000000000 +0200
@@ -1,7 +1,7 @@
%%
%% This is file 'bxwareki-cd.def'.
%%
-%% Copyright (c) 2018 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2018,2019 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -12,18 +12,12 @@
%% file declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{bxwareki-cd.def}[2018/10/01 v0.4]
+\ProvidesFile{bxwareki-cd.def}[2019/06/01 v0.6]
\ifbxwy@epTeXinputencoding@ok
\epTeXinputencoding utf8
\fi
-%% branch for download mode
-\ifbxwy@download
- \long\def\bxwy@next#1\bxwy@download{}
- \expandafter\bxwy@next
-\fi
-
%--------------------------------------- helpers
%% \bxwy@burst-`>...
@@ -127,283 +121,6 @@
\def\bxwy@cdpo@@o#1#2#3{#1#2o}
\def\bxwy@cdpo@@O#1#2#3{#1#2O}
-%--------------------------------------- special procedure for LuaTeX
-\ifx\bxwy@new@gengo\@empty \ifnum\bxwy@engine=5
-
-% The process below tries to guess the name of the new gengo
-% from the result of os,date().
-\begingroup
- \catcode`\~=12 \let\0\relax \let\1\relax \let\2\relax
- \directlua{
- if not bxwareki then bxwareki = {} end
- local os = bxwareki.os or os
- function bxwareki.get_new_gengo()
- local lc_time = nil
- local ok, ret = pcall(function()
- assert(os.type == "unix")
- lc_time = os.setlocale(nil, "time")
- assert(os.setlocale("ja_JP.utf8", "time") or
- os.setlocale("ja_JP.UTF-8", "time"))
- local heisei = "\229\185\179\230\136\144"
- local kanji = "[\228-\233][\128-\191][\128-\191]"
- local gh = os.date("\037EC", 1500000000)
- local gn = os.date("\037EC", 1600000000)
- assert(gh == heisei and gn ~= heisei and
- gn:match("^"..kanji..kanji.."$"))
- return gn
- end)
- os.setlocale(lc_time, "time")
- return ok and ret or ""
- end}
- \toks@{}
- \directlua{pcall(function()
- tex.toks[0] = bxwareki.get_new_gengo()
- end)}
- \xdef\bxwy@new@gengo{\the\toks@}
-\endgroup
-
-\fi\fi
%--------------------------------------- all done
\endinput
-%=======================================
-\bxwy@download
-\begingroup
-\catcode`\^^A=14 \catcode`\^^\=0 \catcode`\^^[=1 \catcode`\^^]=2
-\endlinechar=10 \catcode10=12 \catcode96=7 \let\do\@makeother
-\dospecials``\directlua``[``A
-local ok, retcode = pcall(function()
----------------------------------------- shell availability check
-local ok = false
-if ((status and status.luatex_version) or 0) >= 68 then
- ok = (os.execute() == 1)
-end
-if not ok then return 2 end
----------------------------------------- preparations
-local url = 'https://raw.githubusercontent.com/zr-tex8r/BXwareki/master/bxwareki2019.def'
-local fdef = 'bxwareki2019.def'
-io.stderr:write("\n\n//////// START BXWAREKI DOWNLOAD PROCEDURE ////////\n")
-local function log(s)
- io.stderr:write("bxwareki: ", s, "\n")
-end
-local function info(f, ...) log(f:format(...)) end
-local function finish(s, ...) info(...); return s end
----------------------------------------- 'zrget' module
-zrget = (function(M)
- -- parameters
- M.max_trial = M.max_trial or 3
- M.interval = M.interval or 1 -- second
- M.log = M.log or true
-
- -- helpers
- local lfs = require 'lfs'
- local socket = require 'socket'
- local tempb = '__zrget'
- local win = (lfs.attributes('C:\\NUL', 'mode') ~= nil)
- local function upath(pth)
- return (win) and pth:gsub('\\', '/') or pth
- end
- local function npath(pth)
- return (win) and pth:gsub('/', '\\') or pth
- end
- local function mpath(...)
- return table.concat({...}, (win) and '\\' or '/')
- end
- local function log_print(s)
- io.stderr:write("zrget: ", s, "\n")
- end
- local function log(fmt, ...)
- if not M.log then return end
- local l = (type(M.log) == 'function') and M.log or log_print
- l(tostring(fmt):format(...))
- end
- local function file_ok(pth)
- return ((lfs.attributes(pth, 'size') or 0) > 0)
- end
- local function execute(clfmt, ...)
- local cl = clfmt:format(...)
- if M.verbose then log("RUN: %s", cl) end
- local ok = os.execute(cl)
- return (ok == true) or (ok == 0)
- end
- local badbin = '*'
- local function exefile(pth)
- pth = npath(pth..(win and '.exe' or ''))
- return (file_ok(pth) or nil) and pth
- end
- local function validate(vprc, pth)
- if not file_ok(pth) then return false end
- local h = io.open(pth, 'rb')
- local d = h and h:read('*a')
- if h then h:close() end
- local r = d and (not vprc or vprc(d))
- if not r then log("Validation failure") end
- return r
- end
-
- -- TeXLive stuffs
- local kpse
- pcall(function()
- kpse = require 'kpse'
- kpse.set_program_name('luatex')
- end)
- local tlpkg = kpse and kpse.var_value('SELFAUTOPARENT')
- tlpkg = tlpkg and tlpkg..'/tlpkg'
- local tlwget = tlpkg and exefile(tlpkg..'/installer/wget/wget')
- local tlperl = tlpkg and exefile(tlpkg..'/tlperl/bin/perl')
-
- -- methods
- local fcout, fcerr, ftdst =
- tempb..'-1.out', tempb..'-2.out', tempb..'-0.bin'
- local method_list = {
- {
- name = 'wget';
- checker = 'wget --version'; check_tag = 'Wget';
- loader = function(src)
- return execute('wget -q --no-check-certificate "%s" -O %s 2>%s',
- src, ftdst, fcerr)
- end
- },
- {
- name = 'curl';
- checker = 'curl --version'; check_tag = 'curl';
- loader = function(src)
- return execute('curl -k -s "%s" -o %s 2>%s',
- src, ftdst, fcerr)
- end
- },
- {
- name = 'tl-wget';
- checker = tlwget and tlwget..' --version'; check_tag = 'Wget';
- loader = function(src)
- return execute('%s -q --no-check-certificate "%s" -O %s 2>%s',
- tlwget, src, ftdst, fcerr)
- end
- },
- {
- name = 'powershell';
- checker = 'powershell -Help'; check_tag = 'PowerShell';
- loader = function(src)
- return execute('powershell -Command Invoke-WebRequest '..
- '"%s" -OutFile %s 2>%s',
- src, ftdst, fcerr)
- end
- },
---[[
- {
- name = 'tl-perl';
- checker = tlperl and tlperl..' --version'; check_tag = '?Perl';
- loader = function(src)
- return false -- TODO: make it
- end
- },
-]]
- }
-
- -- main procedure
- function M.download(url, dst, vprc)
- url = tostring(url):gsub('[\1-\31 \"\'<>\\`{|}]',
- function(s) return ('%%%02X'):format(string.byte(s)) end)
- if file_ok(dst) then
- log("File '%s' already exists", dst)
- return false
- end
- os.remove(dst)
- --
- local done = false
- for tc = 1, M.max_trial do
- for _, mth in ipairs(method_list) do
- repeat
- if not mth.checker or mth.pass then break end
- log("Try method '%s'...(%s)", mth.name, tc)
- -- check
- execute('%s 1>%s 2>%s', mth.checker, fcout, fcerr)
- local hso = io.open(fcout, 'rb')
- local p = (hso and hso:read('*a') or ''):find(mth.check_tag, 1, true)
- hso:close()
- if not p then
- log("Method '%s' is not available", mth.name)
- mth.pass = true
- break
- end
- -- download
- log("Try downloading...")
- os.remove(ftdst)
- if mth.loader(url) and validate(vprc, ftdst) then
- done = true; break
- end
- socket.sleep(M.interval)
- os.remove(ftdst)
- until true
- if done then break end
- end
- if done then break end
- end
- --
- if done then
- os.rename(ftdst, dst)
- log("File '%s' is successfully downloaded", dst)
- else
- log("File '%s' cannot be downloaded", dst)
- end
- --
- for _, f in ipairs {ftdst, fcerr, fcout} do
- os.remove(f)
- end
- return done
- end
-
- return M
-end)({})
----------------------------------------- make directory
-if kpse.find_file(fdef, 'tex', true) then
- return finish(0, "File '%s' already exists.", fdef)
-end
-local phome = kpse.var_value("TEXMFHOME")
-if not (phome and lfs.isdir(phome)) then
- return finish(1, "TEXMFHOME is invalid.")
-end
-local ppkg = assert(kpse.find_file('bxwareki.sty', 'tex', true))
-local pm = (ppkg:match('^.*(tex/latex.*)') or 'tex/latex/bxwareki/')
- :gsub('/[^/]*$', '')
-local pddir = phome
-for t in pm:gmatch('[^/]+') do
- pddir = pddir..'/'..t
- lfs.mkdir(pddir)
-end
-if not lfs.isdir(pddir) then
- return finish(1, "Cannot create directory '%s'", pddir)
-end
----------------------------------------- download
-zrget.log = log
-info("Target file is '%s'.", fdef)
-local ok = zrget.download(url, fdef,
- function (d) return d:match('^%x%x%x%x%x%x:%x%x%x%x:') end)
-if not ok then return 1 end
----------------------------------------- transfer
-local pddef = pddir..'/'..fdef
-local hddef = io.open(pddef, 'wb')
-if not hddef then
- return finish(1, 'Cannot open '%s' for output.', pddef)
-end
-local hsdef = assert(io.open(fdef, 'rb'))
-assert(hddef:write(assert(hsdef:read('*a'))))
-hsdef:close(); hddef:close()
-os.remove(fdef)
-info("Target file is copied to '%s'.", pddef)
----------------------------------------- last check
-if not kpse.find_file(fdef, 'tex', true) then
- return finish(1, "Target file is still not found.")
-end
-return finish(0, "Target file is installed at '%s'.", pddef)
----------------------------------------- done
-end)
-if not ok then
- io.stderr:write("\n\nINTERNAL ERROR:\n"..tostring(retcode).."\n")
- retcode = 1
-end
-tex.setcount('global', 'count@', retcode)
-``]``\endgroup%
-
-\chardef\bxwy@next=\count@
-
%% EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bxwareki/bxwareki.sty new/tex/latex/bxwareki/bxwareki.sty
--- old/tex/latex/bxwareki/bxwareki.sty 2019-04-01 23:08:11.000000000 +0200
+++ new/tex/latex/bxwareki/bxwareki.sty 2019-06-01 22:57:31.000000000 +0200
@@ -12,7 +12,7 @@
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bxwareki}[2019/04/01 v0.5]
+\ProvidesPackage{bxwareki}[2019/06/01 v0.6]
%% preparation
\def\bxwy@pkgname{bxwareki}
@@ -89,36 +89,11 @@
%--------------------------------------- options
-%% variables
-\newif\ifbxwy@download
-
%% 'download'
-\DeclareOption{download2019}{%
- \bxwy@downloadtrue}
+\DeclareOption{download2019}{}% now no-op
% dispatch
\ProcessOptions\relax
-%--------------------------------------- download mode
-
-\ifbxwy@download
- \chardef\bxwy@next=\tw@
- \ifnum\bxwy@engine=5
- \input{bxwareki-cd.def}
- \fi
- \ifcase\bxwy@next
- \PackageInfo\bxwy@pkgname
- {The installation of 'bxwareki2019.def' succeeded\@gobble}
- \or
- \PackageWarningNoLine\bxwy@pkgname
- {The installation of 'bxwareki2019.def' failed}
- \else
- \PackageWarningNoLine\bxwy@pkgname
- {Download mode is not available here and thus\MessageBreak
- the option 'download2019' is ignored}
- \fi
-\fi
-\bxwy@downloadfalse
-
%--------------------------------------- Japanese string maker
% The "combo-code" represents a single Japanese character and has
@@ -226,6 +201,10 @@
\let\bxwy@@heisei\@empty
\bxwy@add@jchar\bxwy@@heisei{E5B9B3:5E73:4A3F:jAA}
\bxwy@add@jchar\bxwy@@heisei{E68890:6210:402E:fED}
+%% \bxwy@@reiwa : kanji string 'Reiwa'
+\let\bxwy@@reiwa\@empty
+\bxwy@add@jchar\bxwy@@reiwa{E4BBA4:4EE4:4E61:l44}
+\bxwy@add@jchar\bxwy@@reiwa{E5928C:548C:4F42:l83}
%% \bxwy@@nen : kanji for 'year'
\let\bxwy@@nen\@empty
\bxwy@add@jchar\bxwy@@nen{E5B9B4:5E74:472F:i80}
@@ -304,48 +283,6 @@
\ifnum#2>\z@ \bxwy@twicex{\csname bxwy@jcd/X\endcsname}\fi
\ifnum#3>\z@ \bxwy@twicex{\csname bxwy@jcd/#3\endcsname}\fi}
-%--------------------------------------- load the new gengo
-
-%% \bxwy@new@gengo@file
-% The external data file for the new gengo.
-\def\bxwy@new@gengo@file{bxwareki2019.def}
-
-%% \bxwy@new@gengo
-% The kanji string for the new gengo if available; otherwise empty.
-\let\bxwy@new@gengo\@empty
-
-%% \bxwy@new@gengo@initial
-% The initial Latin letter for the new gengo.
-\let\bxwy@new@gengo@initial\@empty
-
-%% read the file
-\endlinechar\m@ne
-\openin\@inputcheck=\bxwy@new@gengo@file\relax
-\ifeof\@inputcheck\else % if available
- \read\@inputcheck to\bxwy@tmpa
- \ifeof\@inputcheck\else
- \edef\bxwy@next{\noexpand\bxwy@new@gengo{\bxwy@tmpa}}
- \expandafter\bxwy@add@jchar\bxwy@next
- \read\@inputcheck to\bxwy@tmpa
- \ifeof\@inputcheck
- \global\let\bxwy@new@gengo\@empty
- \else
- \edef\bxwy@next{\noexpand\bxwy@new@gengo{\bxwy@tmpa}}
- \expandafter\bxwy@add@jchar\bxwy@next
- \read\@inputcheck to\bxwy@tmpa
- \ifeof\@inputcheck
- \global\let\bxwy@new@gengo\@empty
- \else
- \let\bxwy@new@gengo@initial\bxwy@tmpa
- \fi
- \fi
- \fi
-\fi
-\endlinechar=13 %
-\def\bxwy@next#1>#2#3#4\bxwy@end{%
- \ifx#3\relax\else \let\bxwy@new@gengo@initial\@empty \fi}
-\expandafter\bxwy@next\meaning\bxwy@new@gengo@initial\relax\relax\bxwy@end
-
%--------------------------------------- calculate wareki year
%% errors
@@ -401,10 +338,8 @@
\let\bxwy@tmpb\bxwy@@heisei
\advance\@tempcntb-1988\relax
\else % the new era
- \ifx\bxwy@new@gengo\@empty\else
- \let\bxwy@tmpb\bxwy@new@gengo
- \advance\@tempcntb-2018\relax
- \fi
+ \let\bxwy@tmpb\bxwy@@reiwa
+ \advance\@tempcntb-2018\relax
\fi\fi\fi\fi\fi
%
\global\let\bxwy@g@gengo\bxwy@tmpb
@@ -418,7 +353,7 @@
\else\ifx#1\bxwy@@taisho T%
\else\ifx#1\bxwy@@showa S%
\else\ifx#1\bxwy@@heisei H%
- \else\ifx#1\bxwy@new@gengo \bxwy@new@gengo@initial
+ \else\ifx#1\bxwy@@reiwa R%
\fi\fi\fi\fi\fi\fi}
%--------------------------------------- render wareki date
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bxwareki.tlpobj new/tlpkg/tlpobj/bxwareki.tlpobj
--- old/tlpkg/tlpobj/bxwareki.tlpobj 2019-04-02 01:24:37.000000000 +0200
+++ new/tlpkg/tlpobj/bxwareki.tlpobj 2019-06-02 01:44:17.000000000 +0200
@@ -1,20 +1,23 @@
name bxwareki
category Package
-revision 50696
-shortdesc Convert dates from Gregorian to Japanase calender
+revision 51286
+shortdesc Convert dates from Gregorian to Japanese calender
relocated 1
-longdesc This package provides commands to convert from the Gregorian
-longdesc calendar (e. g. 2018/8/28) to the Japanese rendering of the
-longdesc Japanese calendar (e. g. Heisei 30 nen 8 gatsu 28 nichi;
+longdesc This LaTeX package provides commands to convert from the
+longdesc Gregorian calendar (e. g. 2018/8/28) to the Japanese rendering
+longdesc of the Japanese calendar (e. g. Heisei 30 nen 8 gatsu 28 nichi;
longdesc actually with kanji characters). You can choose whether the
-longdesc numbers are written in Western numerals or kanji numerals.
-runfiles size=10
+longdesc numbers are written in Western numerals or kanji numerals. Note
+longdesc that the package only deals with dates in the year 1873 or
+longdesc later, where the Japanese calendar is really a Gregorian
+longdesc calendar with a different notation of years.
+runfiles size=7
RELOC/tex/latex/bxwareki/bxwareki-cd.def
RELOC/tex/latex/bxwareki/bxwareki.sty
RELOC/tex/latex/bxwareki/bxwareki2019.def
catalogue-contact-repository https://github.com/zr-tex8r/BXwareki
catalogue-ctan /language/japanese/BX/bxwareki
-catalogue-date 2019-04-01 14:08:14 +0200
+catalogue-date 2019-06-01 13:19:12 +0200
catalogue-license mit
catalogue-topics calendar japanese
-catalogue-version 0.5
+catalogue-version 0.6
++++++ c90.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/c90.doc.tlpobj new/tlpkg/tlpobj/c90.doc.tlpobj
--- old/tlpkg/tlpobj/c90.doc.tlpobj 2019-02-28 03:23:42.000000000 +0100
+++ new/tlpkg/tlpobj/c90.doc.tlpobj 2020-03-04 23:49:54.000000000 +0100
@@ -1,6 +1,6 @@
name c90.doc
category Package
-revision 45666
+revision 54074
shortdesc doc files of c90
relocated 1
docfiles size=22
++++++ c90.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/c90.tlpobj new/tlpkg/tlpobj/c90.tlpobj
--- old/tlpkg/tlpobj/c90.tlpobj 2019-02-28 03:23:42.000000000 +0100
+++ new/tlpkg/tlpobj/c90.tlpobj 2020-03-04 23:49:54.000000000 +0100
@@ -1,6 +1,6 @@
name c90
category Package
-revision 45666
+revision 54074
shortdesc c90 font encoding for Thai
relocated 1
longdesc part of the CJK package, ctan.org/pkg/cjk
++++++ cabin.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cabin/README new/doc/fonts/cabin/README
--- old/doc/fonts/cabin/README 2019-04-04 22:51:45.000000000 +0200
+++ new/doc/fonts/cabin/README 2019-10-21 22:58:02.000000000 +0200
@@ -1,4 +1,4 @@
-This is the README for the cabin package, version 2019-04-04.
+This is the README for the cabin package, version 2019-10-21.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
the Cabin and Cabin Condensed families of sans serif fonts, designed by
Binary files old/doc/fonts/cabin/cabin-samples.pdf and new/doc/fonts/cabin/cabin-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cabin/cabin-samples.tex new/doc/fonts/cabin/cabin-samples.tex
--- old/doc/fonts/cabin/cabin-samples.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/cabin/cabin-samples.tex 2019-10-19 23:16:11.000000000 +0200
@@ -0,0 +1,78 @@
+\documentclass{article}
+\usepackage[LGR,T1]{fontenc}
+\usepackage[sfdefault]{cabin}
+\usepackage{textcomp}
+\usepackage{lipsum}
+\begin{document}
+
+\section*{Cabin}
+\subsection*{Regular}
+\lipsum[1]
+
+\subsection*{Italic}
+\textit{\lipsum[2]}
+
+\subsection*{Bold}
+
+\textbf{\lipsum[3]}
+
+
+
+\subsection*{Bold Italic}
+
+\textbf{\textit{\lipsum[4]}}
+
+
+
+\subsection*{Small Caps Regular}
+\textsc{\lipsum[5]}
+
+
+\subsection*{Small Caps Italic}
+\textsc{\textit{\lipsum[6]}}
+
+\subsection*{Small Caps Bold}
+\textsc{\textbf{\lipsum[7]}}
+
+\subsection*{Small Caps Bold Italic}
+
+\textsc{\textbf{\textit{\lipsum[8]}}}
+
+
+\section*{Cabin Condensed}
+
+\cabincondensed
+
+\subsection*{Regular}
+\lipsum[1]
+
+\subsection*{Italic}
+\textit{\lipsum[2]}
+
+\subsection*{Bold}
+
+\textbf{\lipsum[3]}
+
+
+
+\subsection*{Bold Italic}
+
+\textbf{\textit{\lipsum[4]}}
+
+
+
+\subsection*{Small Caps Regular}
+\textsc{\lipsum[5]}
+
+
+\subsection*{Small Caps Italic}
+\textsc{\textit{\lipsum[6]}}
+
+\subsection*{Small Caps Bold}
+\textsc{\textbf{\lipsum[7]}}
+
+\subsection*{Small Caps Bold Italic}
+
+\textsc{\textbf{\textit{\lipsum[8]}}}
+
+\end{document}
Binary files old/doc/fonts/cabin/samples-condensed.pdf and new/doc/fonts/cabin/samples-condensed.pdf differ
Binary files old/doc/fonts/cabin/samples.pdf and new/doc/fonts/cabin/samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cabin/samples.tex new/doc/fonts/cabin/samples.tex
--- old/doc/fonts/cabin/samples.tex 2018-05-20 01:27:30.000000000 +0200
+++ new/doc/fonts/cabin/samples.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,40 +0,0 @@
-\documentclass{article}
-\usepackage[T1]{fontenc}
-\usepackage[sfdefault]{cabin}
-\usepackage{textcomp}
-\usepackage{lipsum}
-\begin{document}
-
-\subsection*{Regular}
-\lipsum[1]
-
-\subsection*{Italic}
-\textit{\lipsum[2]}
-
-\subsection*{Bold}
-
-\textbf{\lipsum[3]}
-
-
-
-\subsection*{Bold Italic}
-
-\textbf{\textit{\lipsum[4]}}
-
-
-
-\subsection*{Small Caps Regular}
-\textsc{\lipsum[5]}
-
-
-\subsection*{Small Caps Italic}
-\textsc{\textit{\lipsum[6]}}
-
-\subsection*{Small Caps Bold}
-\textsc{\textbf{\lipsum[7]}}
-
-\subsection*{Small Caps Bold Italic}
-
-\textsc{\textbf{\textit{\lipsum[8]}}}
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cabin.doc.tlpobj new/tlpkg/tlpobj/cabin.doc.tlpobj
--- old/tlpkg/tlpobj/cabin.doc.tlpobj 2019-04-08 01:39:30.000000000 +0200
+++ new/tlpkg/tlpobj/cabin.doc.tlpobj 2019-10-22 16:40:31.000000000 +0200
@@ -1,11 +1,10 @@
name cabin.doc
category Package
-revision 50857
+revision 52475
shortdesc doc files of cabin
relocated 1
-docfiles size=17
+docfiles size=34
RELOC/doc/fonts/cabin/OFL.txt
RELOC/doc/fonts/cabin/README
- RELOC/doc/fonts/cabin/samples-condensed.pdf
- RELOC/doc/fonts/cabin/samples.pdf
- RELOC/doc/fonts/cabin/samples.tex
+ RELOC/doc/fonts/cabin/cabin-samples.pdf
+ RELOC/doc/fonts/cabin/cabin-samples.tex
++++++ cabin.tar.xz ++++++
++++ 5867 lines of diff (skipped)
++++++ calxxxx-yyyy.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/calxxxx-yyyy/README new/doc/latex/calxxxx-yyyy/README
--- old/doc/latex/calxxxx-yyyy/README 2018-12-31 23:09:19.000000000 +0100
+++ new/doc/latex/calxxxx-yyyy/README 2020-01-01 22:50:17.000000000 +0100
@@ -1,4 +1,4 @@
-README for calxxxx-yyyy, 2019/01/01, v20.19a
+README for calxxxx-yyyy, 2020/01/01, v20.20a
TABLE OF CONTENTS
@@ -17,8 +17,8 @@
==============
To print a calendar for some given years, use the \textsf{calxxxx-yyyy.tex}
-file. LaTeXe it, type in the year to start with (for example 2019), the
-year to end with (for example 2036), and the calendars for those years are
+file. LaTeXe it, type in the year to start with (for example 2020), the
+year to end with (for example 2037), and the calendars for those years are
produced.
It is possible to print the calendars in different languages.
@@ -50,8 +50,8 @@
Also a ZIP file is provided that contains the files:
the manual (calxxxx-yyyy-doc.tex, calxxxx-yyyy-doc.pdf),
-the compiled examples (cal2019-2036_DE.pdf, cal2019-2036_DK.pdf, and
-cal2019-2036_EN.pdf), calxxxx-yyyy.tex,
+the compiled examples (cal2020-2037_DE.pdf, cal2020-2037_DK.pdf, and
+cal2020-2037_EN.pdf), calxxxx-yyyy.tex,
and this README:
http://mirrors.ctan.org/macros/latex/contrib/calxxxx-yyyy.zip
@@ -72,8 +72,8 @@
e) Copy the documentation files to
"TDS:doc/latex/calxxxx-yyyy/":
README, calxxxx-yyyy-doc.tex, calxxxx-yyyy-doc.pdf
- (and e.g. cal2019-2036_DE.pdf, cal2019-2036_DK.pdf,
- and cal2019-2036_EN.pdf).
+ (and e.g. cal2020-2037_DE.pdf, cal2020-2037_DK.pdf,
+ and cal2020-2037_EN.pdf).
4 ADDITIONAL PACKAGES
Binary files old/doc/latex/calxxxx-yyyy/cal2019-2036_DE.pdf and new/doc/latex/calxxxx-yyyy/cal2019-2036_DE.pdf differ
Binary files old/doc/latex/calxxxx-yyyy/cal2019-2036_DK.pdf and new/doc/latex/calxxxx-yyyy/cal2019-2036_DK.pdf differ
Binary files old/doc/latex/calxxxx-yyyy/cal2019-2036_EN.pdf and new/doc/latex/calxxxx-yyyy/cal2019-2036_EN.pdf differ
Binary files old/doc/latex/calxxxx-yyyy/cal2020-2037_DE.pdf and new/doc/latex/calxxxx-yyyy/cal2020-2037_DE.pdf differ
Binary files old/doc/latex/calxxxx-yyyy/cal2020-2037_DK.pdf and new/doc/latex/calxxxx-yyyy/cal2020-2037_DK.pdf differ
Binary files old/doc/latex/calxxxx-yyyy/cal2020-2037_EN.pdf and new/doc/latex/calxxxx-yyyy/cal2020-2037_EN.pdf differ
Binary files old/doc/latex/calxxxx-yyyy/calxxxx-yyyy-doc.pdf and new/doc/latex/calxxxx-yyyy/calxxxx-yyyy-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/calxxxx-yyyy.doc.tlpobj new/tlpkg/tlpobj/calxxxx-yyyy.doc.tlpobj
--- old/tlpkg/tlpobj/calxxxx-yyyy.doc.tlpobj 2019-02-28 03:23:51.000000000 +0100
+++ new/tlpkg/tlpobj/calxxxx-yyyy.doc.tlpobj 2020-01-02 01:59:37.000000000 +0100
@@ -1,11 +1,11 @@
name calxxxx-yyyy.doc
category Package
-revision 49554
+revision 53290
shortdesc doc files of calxxxx-yyyy
relocated 1
docfiles size=109
RELOC/doc/latex/calxxxx-yyyy/README
- RELOC/doc/latex/calxxxx-yyyy/cal2019-2036_DE.pdf
- RELOC/doc/latex/calxxxx-yyyy/cal2019-2036_DK.pdf
- RELOC/doc/latex/calxxxx-yyyy/cal2019-2036_EN.pdf
+ RELOC/doc/latex/calxxxx-yyyy/cal2020-2037_DE.pdf
+ RELOC/doc/latex/calxxxx-yyyy/cal2020-2037_DK.pdf
+ RELOC/doc/latex/calxxxx-yyyy/cal2020-2037_EN.pdf
RELOC/doc/latex/calxxxx-yyyy/calxxxx-yyyy-doc.pdf
++++++ calxxxx-yyyy.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/calxxxx-yyyy/calxxxx-yyyy-doc.tex new/tex/latex/calxxxx-yyyy/calxxxx-yyyy-doc.tex
--- old/tex/latex/calxxxx-yyyy/calxxxx-yyyy-doc.tex 2018-12-31 23:09:19.000000000 +0100
+++ new/tex/latex/calxxxx-yyyy/calxxxx-yyyy-doc.tex 2020-01-01 22:50:17.000000000 +0100
@@ -16,9 +16,9 @@
]{hyperref}[2012/11/06]% v6.83m
\begin{document}
\section*{\texttt{ReadMe} for cal$xxxx-yyyy$.tex file}
-Version: v20.19a\newline
-Date: 2019/01/01\newline
-\copyright{} 2010 - 2019 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de)\newline
+Version: v20.20a\newline
+Date: 2020/01/01\newline
+\copyright{} 2010 - 2020 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de)\newline
\noindent This file explains the use of the \textsf{calxxxx-yyyy.tex} file,
available at\newline
@@ -30,7 +30,7 @@
\hspace*{-1.98471pt}To print a calendar for some given years,
use the \textsf{calxxxx-yyyy.tex} file. \LaTeXe{} it, type in the year to start with
-(for example 2019), the year to end with (for example 2036), and the calendars
+(for example 2020), the year to end with (for example 2037), and the calendars
for those years are produced.
It is possible to print the calendars in different languages. Currently
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex new/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex
--- old/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex 2018-12-31 23:09:19.000000000 +0100
+++ new/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex 2020-01-01 22:50:17.000000000 +0100
@@ -1,8 +1,8 @@
% calxxx-yyyy.tex
-% version: v20.19a
-% date: 2019/01/01
+% version: v20.20a
+% date: 2020/01/01
%
-% Copyright (C) 2010 - 2019 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de)
+% Copyright (C) 2010 - 2020 H.-Martin M\"{u}nch (Martin dot Muench at Uni-Bonn dot de)
% Portions of code copyrighted by Slobodan Jankovi\'{c}.
% This file was invented in 1999 by Slobodan Jankovi\'{c}.
% I was not able to reach him at slobodan(a)archimed.filfak.ni.ac.yu
@@ -37,8 +37,8 @@
% This work consists of the main source files
% calxxxx-yyyy.tex, README, and calxxxx-yyyy-doc.tex,
% and the derived files
-% calxxxx-yyyy-doc.pdf, cal2019-2036_DE.pdf, cal2019-2036_DK.pdf,
-% and cal2019-2036_EN.pdf.
+% calxxxx-yyyy-doc.pdf, cal2020-2037_DE.pdf, cal2020-2037_DK.pdf,
+% and cal2020-2037_EN.pdf.
%
% In memoriam
% Claudia Simone Barth + 1996/01/30
@@ -341,7 +341,7 @@
\message{^^J}\message{^^J}%
\newline%
\tiny{\indent Original calxxxx.\TeX{} \copyright{} 1999/12/19 Slobodan Jankovi\'{c}; %
-these calendars produced with calxxxx-yyyy 2019/01/01 v20.19a by \texttt{Martin.Muench(a)Uni-Bonn.de};%
+these calendars produced with calxxxx-yyyy 2020/01/01 v20.20a by \texttt{Martin.Muench(a)Uni-Bonn.de};%
\newline\indent%
\iflanguage{english}{English by Slobodan Jankovi\'{c}.}{%
\iflanguage{german}{Deutsch von H.-Martin M\"{u}nch.}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/calxxxx-yyyy.tlpobj new/tlpkg/tlpobj/calxxxx-yyyy.tlpobj
--- old/tlpkg/tlpobj/calxxxx-yyyy.tlpobj 2019-02-28 03:23:51.000000000 +0100
+++ new/tlpkg/tlpobj/calxxxx-yyyy.tlpobj 2020-01-02 01:59:39.000000000 +0100
@@ -1,6 +1,6 @@
name calxxxx-yyyy
category Package
-revision 49554
+revision 53290
shortdesc Print a calendar for a group of years
relocated 1
longdesc The package prints a calendar for two or more years, according
@@ -14,7 +14,6 @@
RELOC/tex/latex/calxxxx-yyyy/calxxxx-yyyy.tex
catalogue-also calxxxx
catalogue-ctan /macros/latex/contrib/calxxxx-yyyy
-catalogue-date 2018-12-31 17:10:11 +0100
catalogue-license lppl1.3c
catalogue-topics calendar
-catalogue-version 20.19a
+catalogue-version 20.20a
++++++ canoniclayout.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/canoniclayout/README new/doc/latex/canoniclayout/README
--- old/doc/latex/canoniclayout/README 2011-11-07 00:23:31.000000000 +0100
+++ new/doc/latex/canoniclayout/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-Canoniclayout v.04
-
-Canoniclayout is a small extension that allows to design a canonic layout based on the great circle inscribed within the page and tangent to the horizontal sides of the type block rectangle. The margins reflect the trimmed page shape ratio, therefore the type block principal diagonal coincides with the corresponding page diagonal; this layout is especially good for ISO shapes but can be used with many other traditional book page shapes.
-
-This work is released under the Latex Project Pubblic Licence v.1.3. The LPPL is distributed with any TeX system distribution and can be found also in any CTAN archive.
-
-Claudio Beccari 2011
-Author maintained
-claudio dot beccari at gmail dot com
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/canoniclayout/README.txt new/doc/latex/canoniclayout/README.txt
--- old/doc/latex/canoniclayout/README.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/canoniclayout/README.txt 2020-04-12 00:21:31.000000000 +0200
@@ -0,0 +1,51 @@
+%%
+%% This is file `README.txt',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% canoniclayout.dtx (with options: `txt')
+%% ______________________________________________________
+%% The canoniclayout package for LaTeX
+%% Copyright (C) 2010-2020 Claudio Beccari
+%% All rights reserved
+%%
+%% License information appended
+%%
+\ProvidesFile{README.txt}
+ [2020-04-09 v.0.5 Canonic layout circumscribed to a circle]
+
+
+Canoniclayout is a small extension package that allows to design
+a canonic layout based on the great circle inscribed within the
+page and tangent to the horizontal sides of the type block rectangle.
+The margins reflect the trimmed page shape ratio, therefore the
+type block principal diagonal coincides with the corresponding
+page diagonal; this layout is especially good for ISO page shapes
+but it can be used with many other traditional book page shapes.
+
+This new version is completely new, in the sense that its code
+calculations are performed by means of the 2018 xfp package
+facilities. For this reason it cannot be used with any TeX
+distribution preceding the year 2018 and updated by the end of
+that year; should this happen this very package aborts its own
+input while advising the user by means of an Error Message.
+
+This work is released under the Latex Project Public Licence
+v.1.3c. The LPPL is distributed with any TeX system distribution
+and can be found also in any CTAN archive.
+
+Claudio Beccari 2020
+claudio dot beccari at gmail dot com
+
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%%
+%% This work consists of this file canoniclayout.dtx, a README.txt file
+%% and the derived files canoniclayout.sty and canoniclayout.pdf.
+%%
+%% This work is "maintained"
+%%
+%%
+%% End of file `README.txt'.
Binary files old/doc/latex/canoniclayout/canoniclayout.pdf and new/doc/latex/canoniclayout/canoniclayout.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/canoniclayout.doc.tlpobj new/tlpkg/tlpobj/canoniclayout.doc.tlpobj
--- old/tlpkg/tlpobj/canoniclayout.doc.tlpobj 2019-02-28 03:23:52.000000000 +0100
+++ new/tlpkg/tlpobj/canoniclayout.doc.tlpobj 2020-04-16 01:56:54.000000000 +0200
@@ -1,8 +1,8 @@
name canoniclayout.doc
category Package
-revision 24523
+revision 54758
shortdesc doc files of canoniclayout
relocated 1
-docfiles size=117
- RELOC/doc/latex/canoniclayout/README
+docfiles size=119
+ RELOC/doc/latex/canoniclayout/README.txt
RELOC/doc/latex/canoniclayout/canoniclayout.pdf
++++++ canoniclayout.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/canoniclayout/canoniclayout.sty new/tex/latex/canoniclayout/canoniclayout.sty
--- old/tex/latex/canoniclayout/canoniclayout.sty 2011-11-07 00:23:31.000000000 +0100
+++ new/tex/latex/canoniclayout/canoniclayout.sty 2020-04-12 00:21:31.000000000 +0200
@@ -7,33 +7,26 @@
%% canoniclayout.dtx (with options: `package')
%% ______________________________________________________
%% The canoniclayout package for LaTeX
-%% Copyright (C) 2010-2011 Claudio Beccari
+%% Copyright (C) 2010-2020 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
\NeedsTeXFormat{LaTeX2e}[2009/01/01]
\ProvidesPackage{canoniclayout}%
- [2011/11/05 v.0.3 Canonic layout circumscribed to a circle]
+ [2020-04-09 v.0.5 Canonic layout circumscribed to a circle]
-\expandafter\ifx\csname eTeXversion\endcsname\relax
-\PackageWarning{canoniclayout}{%
-The typesetting engine is not suited\Messagebreak
-for working in extended mode.\Messagebreak}
-This package is being skipped}
-\expandafter\endinput
-\fi
-\ifnum\eTeXversion>\z@\else
-\PackageWarning{canoniclayout}{%
-The typesetting engine is not working in extended mode.\MessageBreak
-This package is being skipped}
-\expandaftter\endinput
-\fi
-\@ifclassloaded{memoir}{% }% balancing brace
-\dimen@=\dimexpr \p@ * \paperwidth / \paperheight\relax
-\edef\CLshape{\strip@pt\dimen@}
-\dimen@=\dimexpr \p@ * \p@ / \dimen@\relax
-\edef\CLinvshape{\strip@pt\dimen@}
+
+\IfFileExists{xfp.sty}{\RequirePackage{xfp}}{%
+\PackageError{canoniclayout}{\MessageBreak%
+The xfp package is not available\MessageBreak
+and this package cannot work without\MessageBreak}{
+Reading of this package is skipped\MessageBreak
+Expect a different layout form the canonical one\Messagebreak
+Update your TeX system installation!\expandafter\endinput}}
+\@ifclassloaded{memoir}{%
+\edef\CLshape{\fpeval{\paperwidth / \paperheight}}
+\edef\CLinvshape{\fpeval{1/\CLshape}}
\textheight=\paperwidth
\settypeblocksize{\textheight}{*}{\CLshape}
\setlrmargins{*}{*}{\CLinvshape}
@@ -45,64 +38,50 @@
\newlength\innermargin
\newlength\outermargin
\newlength\uppermargin
-\dimendef\CLpageratio=1256% x=b/h
-\dimendef\CLsmallratio=1258% z=x*y
-\dimendef\CLlargeratio=1260% y=(1-x)/(1+x)
-\CLpageratio=\dimexpr \p@*\paperwidth/\paperheight\relax % x
-\CLlargeratio=\dimexpr \p@*(\p@-\CLpageratio)/(\p@+\CLpageratio)\relax % y
-\CLsmallratio=\dimexpr \CLpageratio*\CLlargeratio/\p@\relax % z
-\edef\CL@pageratio{\strip@pt\CLpageratio}
-\edef\CL@smallratio{\strip@pt\CLsmallratio}
-\edef\CL@largeratio{\strip@pt\CLlargeratio}
-\textheight\paperwidth% altezza griglia
-\textwidth=\CL@pageratio\textheight
-\innermargin=\CL@smallratio\paperwidth
-\outermargin=\CL@largeratio\paperwidth
-\uppermargin=\CL@smallratio\paperheight
-\marginparwidth=\dimexpr0.8\outermargin-\marginparsep\relax
-\evensidemargin=\dimexpr\outermargin -1in\relax
-\oddsidemargin=\dimexpr\innermargin-1in\relax
-\topmargin=\dimexpr\uppermargin-1in-\headheight-\headsep\relax
-\normalfont
-\count256=\numexpr(\textheight-\topskip)/\baselineskip\relax
-\textheight=\count256\baselineskip\relax
-\textheight=\dimexpr\textheight+\topskip\relax
+\edef\CLpageratio{\fpeval{\paperwidth/\paperheight}} % x
+\edef\CLlargeratio{\fpeval{(1-\CLpageratio)/(1+\CLpageratio)}} % y
+\edef\CLsmallratio{\fpeval{\CLpageratio*\CLlargeratio}} % z
+\textheight\paperwidth
+\textwidth=\CLpageratio\textheight
+\innermargin=\CLsmallratio\paperwidth
+\outermargin=\CLlargeratio\paperwidth
+\uppermargin=\CLsmallratio\paperheight
+\marginparwidth=\fpeval{0.8\outermargin-\marginparsep}pt
+\evensidemargin=\fpeval{\outermargin -(1in)}pt
+\oddsidemargin=\fpeval{\innermargin-(1in)}pt
+\topmargin=\fpeval{\uppermargin-(1in)-\headheight-\headsep}pt
+\normalfont\textheight=%
+\fpeval{round((\textheight - \topskip)/\baselineskip, 0) * \baselineskip + \topskip}pt%
\normalbaselineskip\baselineskip
-}
+}% end of test on the class being used
\newlength\abc@width
+\settowidth\abc@width{abcdefghijklmnopqrstuvwxyz}%
+\edef\CLcharcount{\fpeval{round(\textwidth * 26 / \abc@width,0)}}
\newcommand*\currentfontletters{%
-\settowidth\abc@width{abcdefghijklmnopqrstuvwxyz}\dimen0=26\p@
-\dimen0=\dimexpr \textwidth * \dimen0 / \abc@width \relax
-\count254=\numexpr \dimen0 / \p@ \relax
\par The number of characters in one text line with the current font is
- \the\count254.\par}
-
+ \CLcharcount.\par}
\newcommand*\charactersperpage{%
-\settowidth\abc@width{abcdefghijklmnopqrstuvwxyz}\dimen0=26\p@
-\dimen0=\dimexpr \textwidth * \dimen0 / \abc@width \relax
-\count254=\numexpr \dimen0 / \p@ \relax
-\count252=\numexpr \textheight / \baselineskip \relax
-\count250=\numexpr \count252 * \count254\relax
+\edef\CLlinesperpage{\fpeval{round(\textheight / \baselineskip,0)}}
+\edef\CLcharsperpage{%
+ \fpeval{\CLcharcount * \CLlinesperpage}}
\begin{quote} The average number of characters in one text line
- with the current font is \the\count254;
- this text block contains \the\count252\ lines;
+ with the current font is \CLcharcount;
+ this text block contains \CLlinesperpage\ lines;
a rough estimate of the number of characters per page is
- \the\count250.\par
+ \CLcharsperpage.\par
This information may be useful to evaluate the total number
of pages in a document.
\end{quote}}
-%% Copyright 2011 Claudio Beccari
-%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
%% this license is at: http://www.latex-project.org/lppl.txt
%%
-%% This work is "author-maintained"
-%%
-%% This work consists of this file canoniclayout.dtx, a README file
+%% This work consists of this file canoniclayout.dtx, a README.txt file
%% and the derived files canoniclayout.sty and canoniclayout.pdf.
%%
+%% This work is "maintained"
+%%
%%
%% End of file `canoniclayout.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/canoniclayout.tlpobj new/tlpkg/tlpobj/canoniclayout.tlpobj
--- old/tlpkg/tlpobj/canoniclayout.tlpobj 2019-02-28 03:23:52.000000000 +0100
+++ new/tlpkg/tlpobj/canoniclayout.tlpobj 2020-04-16 01:56:54.000000000 +0200
@@ -1,6 +1,6 @@
name canoniclayout
category Package
-revision 24523
+revision 54758
shortdesc Create canonical page layouts with memoir
relocated 1
longdesc A canonic text layout has specified relations to a circle
@@ -9,7 +9,6 @@
runfiles size=1
RELOC/tex/latex/canoniclayout/canoniclayout.sty
catalogue-ctan /macros/latex/contrib/canoniclayout
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics geometry
-catalogue-version 0.4
+catalogue-version 0.5
++++++ cantarell.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cantarell/CHANGES new/doc/fonts/cantarell/CHANGES
--- old/doc/fonts/cantarell/CHANGES 2012-07-15 16:42:23.000000000 +0200
+++ new/doc/fonts/cantarell/CHANGES 2019-06-25 23:31:11.000000000 +0200
@@ -1,19 +1,35 @@
-Changelog for version 2.0:
- - complete rewrite of the fontinst driver file
- - rename .vf and .tfm files based on the pattern <font>-<encoding>
- - change slant angle for italics to comply with the slant of the first
- italics versions of Cantarell
- - modify paths of the archive: documentation is now in
- doc/fonts/cantarell/ and sources in source/fonts/cantarell/
+VERSION 3.2:
+ - Fix ligatures for hyphens
+
+VERSION 3.1:
+ - Fix OT1 encoding with slanted shape
+ - Fix packaging according to CTAN guidelines
+
+VERSION 3.0:
+ - Update font files to version 0.111
+ - Complete rewrite of the TeX metric file generation (otftotfm is now
+ used instead of fontinst)
+ - Support for XeLaTeX and LuaLaTeX
+ - Add support for figure variant selection
+ - Drop faked smallcaps support
+ - Add "scaled" alias option
-Changelog for version 2.1:
- - update font files to version 0.0.7
+VERSION 2.4:
+ - Update font files to version 0.0.9; Cyrillic support is included
-Changelog for version 2.2:
- - remove unneeded call to textcomp package in cantarell.sty
+VERSION 2.3:
+ - Update font files to version 0.0.8
-Changelog for version 2.3:
- - update font files to version 0.0.8
+VERSION 2.2:
+ - Remove unneeded call to textcomp package in cantarell.sty
-Changelog for version 2.4:
- - update font files to version 0.0.9; Cyrillic support is included
+VERSION 2.1:
+ - Update font files to version 0.0.7
+
+VERSION 2.0:
+ - Complete rewrite of the fontinst driver file
+ - Rename .vf and .tfm files based on the pattern <font>-<encoding>
+ - Change slant angle for italics to comply with the slant of the first
+ italics versions of Cantarell
+ - Modify paths of the archive: documentation is now in
+ doc/fonts/cantarell/ and sources in source/fonts/cantarell/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cantarell/README new/doc/fonts/cantarell/README
--- old/doc/fonts/cantarell/README 2012-07-15 16:42:23.000000000 +0200
+++ new/doc/fonts/cantarell/README 2019-06-20 23:31:24.000000000 +0200
@@ -1,18 +1,26 @@
------------------------
- Cantarell, version 2.4
+ Cantarell, version 3.1
------------------------
-Cantarell is a contemporary Humanist sans serif designed by Dave Crossland and
-Jakub Steiner. This font, delivered under the OFL version 1.1, is available on
-The GNOME download server at
-http://download.gnome.org/sources/cantarell-fonts/0.0/.
+Cantarell is a contemporary humanist sans serif, and is used by the GNOME
+project for its user interface.
-This package provides support for this font in LaTeX. It includes Type 1
-versions of the fonts, converted for this package using FontForge from its
-sources, for full support with Dvips.
+Cantarell was originally designed by Dave Crossland as part of his coursework
+for the MA Typeface Design program at the Department of Typography in the
+University of Reading, England. After the GNOME project adopted the typeface in
+November 2010, minor modifications and slight expansions were made to it over
+the years, notably by Jakub Steiner. Pooja Saxena initially worked on the
+typeface as a participant of the GNOME outreach program and later developed her
+own Devanagari typeface Cambay, which included a redesigned latin version of
+Cantarell. It was backported to the GNOME branch of Cantarell by Nikolaus
+Waxweiler, who also performed other janitorial tasks on it.
-Installation and usage instructions are described in
-doc/fonts/cantarell/cantarell.pdf.
+This font family, delivered under the OFL version 1.1, is available on the GNOME
+download server as CFF-flavored OpenType files.
+
+This package provides support for Cantarell in LaTeX, including XeLaTeX and
+LuaLaTeX. It includes the original OpenType fonts, as well as Type 1 versions,
+converted for this package using cfftot1 for full support with LaTeX and Dvips.
This package is released under the LaTeX Project Public License, either version
1.3c or above, with the exception of the .pfb and .sfd files, released under the
Binary files old/doc/fonts/cantarell/cantarell-samples.pdf and new/doc/fonts/cantarell/cantarell-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cantarell/cantarell-samples.tex new/doc/fonts/cantarell/cantarell-samples.tex
--- old/doc/fonts/cantarell/cantarell-samples.tex 2012-07-15 16:42:23.000000000 +0200
+++ new/doc/fonts/cantarell/cantarell-samples.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,76 +0,0 @@
-%% cantarell-samples.tex
-%% Copyright 2011, 2012 Mohamed El Morabity
-%
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3 of this license or (at your option)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[russian,francais,american]{babel}
-\usepackage{cantarell}
-\usepackage[T2A,T1,OT1]{fontenc}
-\usepackage[utf8x]{inputenc}
-\usepackage{microtype}
-\usepackage{textcomp}
-
-\newcommand{\latinSample}{%
- \foreignlanguage{francais}{%
- Tous les êtres humains naissent libres et égaux en dignité et en droits. Ils
- sont doués de raison et de conscience et doivent agir les uns envers les
- autres dans un esprit de fraternité.%
- }%
-}
-
-\newcommand{\cyrillicSample}{%
- \foreignlanguage{russian}{%
- Все люди рождаются свободными и равными в своем достоинстве и правах. Они
- наделены разумом и совестью и должны поступать в отношении друг друга в духе
- братства.%
- }%
-}
-
-\newcommand{\miscSample}{%
- 0123456789 ff fi fl ffi ffl \textperthousand{} \textcopyright{}
- \textregistered{} \texttrademark{} \texteuro{} \textsterling{} \textyen%
-}
-
-\newcommand{\fontSample}[2]{%
- {\usefont{T1}{fca}{#1}{#2} \latinSample}
-
- {\usefont{T2A}{fca}{#1}{#2}\cyrillicSample}
-
- {\fontfamily{fca}\fontseries{#1}\fontshape{#2}\selectfont\miscSample}\\%
-}
-
-\begin{document}
-
-\section*{Cantarell Regular}
-
-\fontSample{m}{n}
-
-\fontSample{m}{sl}
-
-\fontSample{m}{sc}
-
-\fontSample{m}{scsl}
-
-\section*{Cantarell Bold}
-
-\fontSample{b}{n}
-
-\fontSample{b}{sl}
-
-\fontSample{b}{sc}
-
-\fontSample{b}{scsl}
-
-\end{document}
Binary files old/doc/fonts/cantarell/cantarell.pdf and new/doc/fonts/cantarell/cantarell.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cantarell/cantarell.tex new/doc/fonts/cantarell/cantarell.tex
--- old/doc/fonts/cantarell/cantarell.tex 2012-07-15 16:42:23.000000000 +0200
+++ new/doc/fonts/cantarell/cantarell.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,194 +0,0 @@
-%% cantarell.tex
-%% Copyright 2011, 2012 Mohamed El Morabity
-%
-% This work may be distributed and/or modified under the conditions of the LaTeX
-% Project Public License, either version 1.3 of this license or (at your option)
-% any later version. The latest version of this license is in
-% http://www.latex-project.org/lppl.txt and version 1.3 or later is part of all
-% distributions of LaTeX version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Mohamed El Morabity
-%
-% This work consists of all files listed in manifest.txt.
-
-\documentclass{article}
-
-\usepackage[american]{babel}
-\usepackage{booktabs}
-\usepackage[default]{cantarell}
-\usepackage{microtype}
-\usepackage{multirow}
-\usepackage{path}
-\usepackage{varioref}
-\usepackage[colorlinks]{hyperref}
-
-\hypersetup{%
- pdftitle={LaTeX support for Cantarell},%
- pdfauthor={Mohamed El Morabity}%
-}%
-
-\newcommand{\acronym}[1]{\textsc{\lowercase{#1}}}
-\newcommand{\code}{\texttt}
-\newcommand{\command}{\texttt}
-\newcommand{\email}[1]{\href{mailto:#1}{\nolinkurl{#1}}}
-\newcommand{\name}{}
-\newcommand{\package}{\texttt}
-\newcommand{\parameter}[1]{\textnormal{\textit{#1}}}
-\newcommand{\program}{}
-
-\title{\LaTeX{} support for Cantarell\\Version~2.4}
-
-\author{Mohamed \name{El~Morabity}\\\email{melmorabity(a)fedoraproject.org}}
-
-\begin{document}
-
-\maketitle
-
-\tableofcontents
-
-\section{Introduction}
-
-Cantarell is a contemporary Humanist sans serif designed initially by Dave
-\name{Crossland} and maintained by Jakub \name{Steiner} (see
-figure~\vref{styles}). This font, delivered under the \acronym{OFL} version~1.1,
-is available on the \acronym{GNOME} download server~\cite{cantarell}.
-
-\begin{figure}
- \centering
- {%
- \fcafamily%
- Cantarell Regular\\
- {\bfseries Cantarell Bold}
- }
- \caption{Available styles for Cantarell}
- \label{styles}
-\end{figure}
-
-This package provides support for this font in \LaTeX{}. It includes Type~1
-versions of the fonts, converted from its sources using \program{FontForge}, for
-full support with \program{Dvips}.
-
-\section{Installation}
-
-These directions assume that your \TeX{} distribution is
-\acronym{TDS}-compliant.
-
-Once the \path|cantarell.zip| archive extracted:
-\begin{enumerate}
-\item Copy \path|doc/|, \path|fonts/|, \path|source/|, and \path|tex/|
- directories to your \path|texmf/| directory (either your local or global
- \path|texmf/| directory).
-\item Run \command{mktexlsr} to refresh the file name database and make \TeX{}
- aware of the new files.
-\item Run \command{updmap --enable Map=cantarell.map} to make \program{Dvips},
- \program{dvipdf} and \program{pdf\TeX} aware of the new fonts.
-\end{enumerate}
-
-Note that this package requires the \package{keyval}~\cite{keyval} and
-\package{slantsc}~\cite{slantsc} (to handle italic/slanted small caps) ones to
-work.
-
-\section{Usage}
-
-\subsection{Calling Cantarell}
-
-You can use the Cantarell font in a \LaTeX{} document by adding the command
-\begin{verbatim}
-\usepackage{cantarell}
-\end{verbatim}
-to the preamble. The package supplies the \code{\char`\\fcafamily} command to
-switch the current font to Cantarell.
-
-\subsection{Options}
-
-\subsubsection{Cantarell as default (sans-serif) font}
-
-You can set \LaTeX{} to use Cantarell as standard font throughout the whole
-document by passing the \code{default} option to the package:
-\begin{verbatim}
-\usepackage[default]{cantarell}
-\end{verbatim}
-To set Cantarell as default sans-serif only:
-\begin{verbatim}
-\usepackage[defaultsans]{cantarell}
-\end{verbatim}
-
-\subsubsection{Font scaling}
-
-The font can be up- and downscale by any factor. This can be used to make
-Cantarell more friendly when used in company with other type faces, e.g., to
-adapt the x-height. The package option \code{scale=\parameter{ratio}} will scale
-the font according to \parameter{ratio} (1.0 by default), for example:
-\begin{verbatim}
-\usepackage[scale=0.95]{cantarell}
-\end{verbatim}
-
-\subsection{Encodings}
-
-The following encodings are supported:
-\begin{description}
-\item[Latin] OT1, T1, TS1 (partial)
-\item[Cyrillic] T2A, T2B, T2C, X2
-% \item[Greek] LGR (monotonic only)
-\end{description}
-To use one or another encoding, give the \LaTeX{} name to the \package{fontenc}
-package as usual, as in
-\begin{verbatim}
-\usepackage[T1]{fontenc}
-\usepackage{cantarell}
-\end{verbatim}
-
-\subsection{Available weights and variants}
-
-Table~\vref{nfss} lists the available font series and shapes with their
-\acronym{NFSS} classification. Parenthesized combinations are provided via
-substitutions.
-\begin{table}
- \centering
- \begin{tabular}{llll}
- \toprule
- family&encoding&series&shape\\
- \midrule
- \multirow{3}{*}{fca}&OT1,T1,&\multirow{3}{*}{m, b (bx)}&\multirow{2}{*}{n, sl (it), sc, scsl (scit)}\\
- &T2A, T2B, T2C, X2,&&\\
-% &LGR&&\\
- \cmidrule{2-2}
- \cmidrule{4-4}
- &TS1&&n, sl (it)\\
- \bottomrule
- \end{tabular}
- \caption{Available font series and shapes for Cantarell}
- \label{nfss}
-\end{table}
-Notice that the slanted shapes are faked ones, as well as the small capitals
-(reduced to 80\%).
-
-Samples of the font are available in the
-\href{run:cantarell-samples.pdf}{\path|cantarell-samples.pdf|} file.
-
-\section{Known bugs and improvements}
-
-Please send bug reports and suggestions about the Cantarell \LaTeX{} support to
-\href{mailto:melmorabity@fedoraproject.org}{Mohamed \name{El~Morabity}}, neither
-to Dave \name{Crossland} nor the \acronym{GNOME} project. They only distribute
-the font files themselves.
-
-\section{License}
-
-This package is released under the \LaTeX{} project public license, either
-version~1.3c or above~\cite{lppl}. Anyway both the Type~1 and Fontforge source
-files are delivered under the Open Font License version~1.1~\cite{ofl}.
-
-\begin{thebibliography}{9}
-\bibitem{cantarell} \url{http://download.gnome.org/sources/cantarell-fonts/0.0/}
-\bibitem{keyval}
- \url{http://www.ctan.org/tex-archive/macros/latex/required/graphics/}
-\bibitem{slantsc}
- \url{http://www.ctan.org/tex-archive/macros/latex/contrib/slantsc/}
-\bibitem{lppl} \url{http://www.latex-project.org/lppl/lppl-1-3c.html}
-\bibitem{ofl} \url{http://scripts.sil.org/OFL_web}
-\end{thebibliography}
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/cantarell/manifest.txt new/doc/fonts/cantarell/manifest.txt
--- old/doc/fonts/cantarell/manifest.txt 2012-07-15 16:42:23.000000000 +0200
+++ new/doc/fonts/cantarell/manifest.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,153 +0,0 @@
-./README
-./manifest.txt
-./fonts/map/dvips/cantarell/cantarell.map
-./fonts/tfm/public/cantarell/Cantarell-Regular-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-02.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-x2.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-t2b.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-t2a.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-03.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-03.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-t2c.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-02.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-01.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-t2b.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ts1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-t2c.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-t2c.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-t2b.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-t2b.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-t2a.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-t2a.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-x2.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-01.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-03.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-x2.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-ts1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-t2a.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-t2c.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-x2.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-02.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-t2a.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-03.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-t2c.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-01.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t2c.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t2b.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-x2.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t2a.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-ot1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-t2b.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-01.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-x2.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-SmallCaps-t2c.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-t2a.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-02.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-SmallCaps-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-ts1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-ts1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-Slanted-t2b.tfm
-./fonts/tfm/public/cantarell/Cantarell-Regular-t1.tfm
-./fonts/tfm/public/cantarell/Cantarell-Bold-Slanted-x2.tfm
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t2b.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-ts1.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-t2b.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-t1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-t2b.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t2a.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-t2b.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-t2c.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-t2c.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-x2.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-t2a.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-t2b.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ts1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-t1.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t2b.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-t2a.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-ts1.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t2a.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t2c.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-t2c.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-t2c.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-ts1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-t2a.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-x2.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-t2a.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-x2.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-t2b.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-x2.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-t1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-t1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-t2c.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-ot1.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-x2.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t2c.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-x2.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-SmallCaps-t1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-SmallCaps-t1.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-SmallCaps-t2a.vf
-./fonts/vf/public/cantarell/Cantarell-Regular-Slanted-x2.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-t1.vf
-./fonts/vf/public/cantarell/Cantarell-Bold-Slanted-SmallCaps-t2b.vf
-./fonts/afm/public/cantarell/Cantarell-Regular.afm
-./fonts/afm/public/cantarell/Cantarell-Bold.afm
-./fonts/enc/dvips/cantarell/cantarell-02.enc
-./fonts/enc/dvips/cantarell/cantarell-03.enc
-./fonts/enc/dvips/cantarell/cantarell-01.enc
-./fonts/type1/public/cantarell/Cantarell-Bold.pfb
-./fonts/type1/public/cantarell/Cantarell-Regular.pfb
-./tex/latex/cantarell/t2cfca.fd
-./tex/latex/cantarell/x2fca.fd
-./tex/latex/cantarell/ts1fca.fd
-./tex/latex/cantarell/cantarell.sty
-./tex/latex/cantarell/t1fca.fd
-./tex/latex/cantarell/t2afca.fd
-./tex/latex/cantarell/ot1fca.fd
-./tex/latex/cantarell/t2bfca.fd
-./source/fonts/cantarell/Cantarell-Bold.sfd
-./source/fonts/cantarell/cantarell-map.tex
-./source/fonts/cantarell/cantarell-fixgreek.mtx
-./source/fonts/cantarell/Cantarell-Regular.sfd
-./source/fonts/cantarell/sfd2type1.pe
-./source/fonts/cantarell/cantarell-fixcyrillic.mtx
-./source/fonts/cantarell/cantarell-fixtextcomp.mtx
-./source/fonts/cantarell/Makefile
-./source/fonts/cantarell/cantarell-fixlatin.mtx
-./source/fonts/cantarell/cantarell-02.etx
-./source/fonts/cantarell/cantarell-drv.tex
-./source/fonts/cantarell/cantarell-03.etx
-./source/fonts/cantarell/cantarell-01.etx
-./doc/fonts/cantarell/README
-./doc/fonts/cantarell/cantarell-samples.tex
-./doc/fonts/cantarell/cantarell.tex
-./doc/fonts/cantarell/cantarell.pdf
-./doc/fonts/cantarell/cantarell-samples.pdf
-./doc/fonts/cantarell/CHANGES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cantarell.doc.tlpobj new/tlpkg/tlpobj/cantarell.doc.tlpobj
--- old/tlpkg/tlpobj/cantarell.doc.tlpobj 2019-02-28 03:23:52.000000000 +0100
+++ new/tlpkg/tlpobj/cantarell.doc.tlpobj 2020-03-24 01:56:39.000000000 +0100
@@ -1,13 +1,10 @@
name cantarell.doc
category Package
-revision 27066
+revision 54512
shortdesc doc files of cantarell
relocated 1
-docfiles size=64
+docfiles size=127
RELOC/doc/fonts/cantarell/CHANGES
RELOC/doc/fonts/cantarell/README
RELOC/doc/fonts/cantarell/cantarell-samples.pdf
- RELOC/doc/fonts/cantarell/cantarell-samples.tex
RELOC/doc/fonts/cantarell/cantarell.pdf
- RELOC/doc/fonts/cantarell/cantarell.tex
- RELOC/doc/fonts/cantarell/manifest.txt
++++++ cantarell.tar.xz ++++++
++++ 8689 lines of diff (skipped)
++++++ caption.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/caption/CHANGELOG new/doc/latex/caption/CHANGELOG
--- old/doc/latex/caption/CHANGELOG 2018-06-03 23:23:43.000000000 +0200
+++ new/doc/latex/caption/CHANGELOG 2019-11-24 22:23:07.000000000 +0100
@@ -112,6 +112,12 @@
- Corrects incorrect load order hyperref-float now (needs hyperref v6.82q or newer)
- New switch \ifsinglelinecaption for usage inside own commands added
+v3.4 (2019/09/11)
+- Label format `autodot' added (for usage within documents using KOMA-Script document class)
+- Label format `unnumbered' added
+- \ContinuedFloat renamed to \continuedfloat (since this is not a preamble command)
+- \caption will always be re-defined now, unless `compatibility' is set to `v1' (or an incompatible package is loaded)
+
bicaption package
-----------------
@@ -125,6 +131,9 @@
v1.1 (2012/12/26)
- \captionmainlanguage and \selectcaptionlanguage added
+v1.2 (2016/03/27)
+- \DeclareLangDependantCaptionOption added
+
ltcaption package
-----------------
@@ -158,15 +167,11 @@
- New caption option subrefformat=
- New command \phantomsubcaption
+v1.2 (2018/05/13)
+- Values `B' and `T' for the optional argument <outer-pos> added to the environments `subfigure' and `subtable'
-newfloat package
-----------------
-
-v1.0 (2011/10/30)
-- 1st published version
-
-v1.1 (2013/04/27)
-- New command \PrepareListOf
+v1.3 (2019/08/31)
+- New command \subfloat for easy transition from the `subfig' package
totalcount package
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/caption/README new/doc/latex/caption/README
--- old/doc/latex/caption/README 2018-10-08 22:56:18.000000000 +0200
+++ new/doc/latex/caption/README 2020-01-23 22:57:04.000000000 +0100
@@ -1,8 +1,8 @@
==========================================================================
The `caption' package bundle
-Release 2018-10-06
-Copyright (C) 1994-2018 Axel Sommerfeldt (axel.sommerfeldt(a)f-m.fm)
+Release 2020-01-22
+Copyright (C) 1994-2020 Axel Sommerfeldt (axel.sommerfeldt(a)f-m.fm)
License: LPPL = LaTeX Project Public Licence
Maintenance Status: maintained (by Axel Sommerfeldt)
@@ -29,7 +29,7 @@
--------------------------------------------------------------------------
-The `caption' package v3.3 offers customization of captions of floating
+The `caption' package v3.4 offers customization of captions of floating
environments such `figure' and `table' and cooperates with the packages
float, floatflt, fltpage, hyperref, hypcap, listings, longtable,
@@ -45,7 +45,7 @@
--------------------------------------------------------------------------
-The `bicaption' package v1.1 is a tiny package supporting the typesetting
+The `bicaption' package v1.2 is a tiny package supporting the typesetting
of bilingual captions.
User Manual: bicaption.pdf (English)
@@ -65,7 +65,7 @@
--------------------------------------------------------------------------
-The `subcaption' package v1.1 is a small package supporting typesetting
+The `subcaption' package v1.3 is a small package supporting typesetting
of sub-captions (by using the the sub-caption feature of the `caption'
package).
@@ -73,11 +73,8 @@
--------------------------------------------------------------------------
-The `newfloat' package v1.1 offers the command \DeclareFloatingEnvironment
-for defining new floating environments which behave like the existing
-floating environments "figure" and "table".
-
-User Manual: newfloat.pdf (English)
+Note: The `newfloat' package was removed from this package bundle and was
+uploaded to CTAN as stand-alone package.
==========================================================================
(The pictures cat.eps & elephant.eps were taken with permission from the
Binary files old/doc/latex/caption/bicaption.pdf and new/doc/latex/caption/bicaption.pdf differ
Binary files old/doc/latex/caption/ltcaption.pdf and new/doc/latex/caption/ltcaption.pdf differ
Binary files old/doc/latex/caption/newfloat.pdf and new/doc/latex/caption/newfloat.pdf differ
Binary files old/doc/latex/caption/subcaption.pdf and new/doc/latex/caption/subcaption.pdf differ
Binary files old/doc/latex/caption/totalcount.pdf and new/doc/latex/caption/totalcount.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/caption.doc.tlpobj new/tlpkg/tlpobj/caption.doc.tlpobj
--- old/tlpkg/tlpobj/caption.doc.tlpobj 2019-02-28 03:23:54.000000000 +0100
+++ new/tlpkg/tlpobj/caption.doc.tlpobj 2020-01-24 01:57:05.000000000 +0100
@@ -1,9 +1,9 @@
name caption.doc
category Package
-revision 48863
+revision 53517
shortdesc doc files of caption
relocated 1
-docfiles size=456
+docfiles size=444
RELOC/doc/latex/caption/CHANGELOG
RELOC/doc/latex/caption/README
RELOC/doc/latex/caption/SUMMARY
@@ -12,6 +12,5 @@
RELOC/doc/latex/caption/caption-eng.pdf
RELOC/doc/latex/caption/caption-rus.pdf
RELOC/doc/latex/caption/ltcaption.pdf
- RELOC/doc/latex/caption/newfloat.pdf
RELOC/doc/latex/caption/subcaption.pdf
RELOC/doc/latex/caption/totalcount.pdf
++++++ caption.tar.xz ++++++
++++ 3125 lines of diff (skipped)
++++++ cases.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cases/README new/doc/latex/cases/README
--- old/doc/latex/cases/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/cases/README 2020-04-12 00:52:41.000000000 +0200
@@ -0,0 +1,14 @@
+cases.sty version 3.2 2020/03/29
+
+Copyright 1993, 1994, 1995, 2000, 2002, 2020 by Donald Arseneau,
+asnd(a)triumf.ca, Vancouver, Canada.
+These macros may be freely transmitted, reproduced, or modified
+provided that this notice is left intact. Sub-equation numbering
+is based on subeqn.sty by Stephen Gildea; parts are based on LaTeX's
+eqnarray by Leslie Lamport and the LaTeX3 team; and some on
+amsmath.sty by the American Mathematical Society.
+
+This package provides a LaTeX environment "numcases" to produce
+multi-case equations with a separate equation number for each case.
+There is also a "subnumcases" environment which numbers each case
+with the overall equation number plus a letter [8a, 8b, etc.].
Binary files old/doc/latex/cases/cases.pdf and new/doc/latex/cases/cases.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cases/cases.tex new/doc/latex/cases/cases.tex
--- old/doc/latex/cases/cases.tex 2010-02-22 00:19:14.000000000 +0100
+++ new/doc/latex/cases/cases.tex 2020-04-12 00:52:41.000000000 +0200
@@ -1,148 +1,214 @@
\documentclass[DIV=9, pagesize=auto]{scrartcl}
-\usepackage{fixltx2e}
\usepackage{lmodern}
\usepackage[T1]{fontenc}
\usepackage{textcomp}
\usepackage{amsmath}
\usepackage{cases}
\usepackage{microtype}
-\usepackage{hyperref}
-
+\usepackage{shortvrb}
+\usepackage[colorlinks]{hyperref}
+\MakeShortVerb"
+\newcommand*\kp[1]{\kern#1pt}
\newcommand*{\fancybreak}{%
- \par
- \nopagebreak\medskip\nopagebreak
- \noindent\null\hfill$*\quad*\quad*\quad$\hfill\null\par
- \nopagebreak\medskip\pagebreak[0]%
+ \par \medbreak \vspace{0pt plus 1cm}\penalty 500 \vspace{0pt plus -1cm}%
}
\newcommand*{\mail}[1]{\href{mailto:#1}{\texttt{#1}}}
\newcommand*{\pkg}[1]{\textsf{#1}}
\newcommand*{\cmd}[1]{\texttt{\string#1}}
\newcommand*{\env}[1]{\texttt{#1}}
\newcommand*{\meta}[1]{\textlangle\textsl{#1}\textrangle}
+\newcommand*{\opt}[1]{\texttt{[#1]}}
-\addtokomafont{title}{\rmfamily}
+%\addtokomafont{title}{\rmfamily}
-\title{The \pkg{cases} package\thanks{This manual corresponds to \pkg{cases}~v2.5, dated~May 2002.}}
+\title{The \pkg{cases} package%
+ \textnormal{\thanks{~~This manual corresponds to \pkg{cases}~v3.2, dated 2020/03/29.}}}
\author{Donald Arseneau\\\mail{asnd(a)triumf.ca}}
-\date{May 2002}
+\date{Mar 2020}
\begin{document}
\maketitle
-\begingroup
-\small
+\begin{small}
\noindent
-Copyright \textcopyright~1993, 1994, 1995, 2000, 2002 by Donald Arseneau, \mail{asnd(a)triumf.ca}.
+Copyright \textcopyright~1993, 1994, 1995, 2000, 2002, 2020 by Donald Arseneau, \mail{asnd(a)triumf.ca}.
These macros may be freely transmitted, reproduced, or modified
provided that this notice is left intact. Sub-equation numbering
-is based on \pkg{subeqn.sty} by Stephen Gildea; most of the rest is based
-on \LaTeX's \cmd{\eqnarray} by Leslie Lamport and the \LaTeX3 team.
+is based on \pkg{subeqn.sty} by Stephen Gildea; parts are based
+on \LaTeX's \env{eqnarray} by Leslie Lamport and the \LaTeX3 team;
+and some on amsmath.sty by the American Mathematical Society.
\par
-\endgroup
+\end{small}
-\fancybreak
+\section*{Description}
-This provides a \LaTeX\ environment \verb+{numcases}+ to produce multi-case
-equations with a separate equation number for each case. There is
-also \verb+{subnumcases}+ which numbers each case with the overall equation
+The \pkg{cases} package provides a \LaTeX\ environment \env{numcases} to produce
+multi-case equations with a separate equation number for each case. There is
+also \env{subnumcases} which numbers each case with the overall equation
number plus a letter [8a, 8b, etc.]. The syntax is
%
-\begin{verbatim}
-\begin{numcases}{left_side}
- case_1 & explanation_1 \\
- case_2 & explanation_2 \\
- ...
- case_n & explanation_n
-\end{numcases}
-\end{verbatim}
-%
-Each \meta{case} is a math formula, and each \meta{explanation} is a piece of lr mode
-text (which may contain math mode in \verb+\(...\)+ or \verb+$...$+). The explanations
+\begin{flushleft}
+"\begin{numcases}{"~\meta{left side}~"}"\\
+\quad \meta{case 1\kp1} "&" \meta{explanation 1\kp1} "\\" \\
+\quad \meta{case 2\kp2} "&" \meta{explanation 2\kp2} "\\" \\
+\quad .~.~.\\
+\quad \meta{case $n$} "&" \meta{explanation $n$} \\
+"\end{numcases}"
+\end{flushleft}
+%
+Each \meta{case} is a math formula, to be typeset in display-math mode, like
+in a regular numbered equation. Each \meta{explanation} is a piece of lr-mode
+text (which may contain math mode in "\("\,\dots"\)" or "$"\,\dots"$"). The explanations
are optional. Equation numbers are inserted automatically, just as for
the \env{eqnarray} environment. In particular, the \cmd{\nonumber} command suppresses
an equation number and the \cmd{\label} command allows reference to a particular
-case. In a \env{subnumcases} environment, a \cmd{\label} in the \meta{left\_side} of the
+case. In a \env{subnumcases} environment, a \cmd{\label} in the \meta{left side} of the
equation gives the overall equation number, without any letter.
To use this package,
-include ``\verb+\usepackage{cases}+'' after ``\cmd{\documentclass}''. You may also
-specify ``\verb+\usepackage[subnum]{cases}+'' to force \emph{all} \env{numcases}
-environments to be treated as \env{subnumcases}.
+include "\usepackage{cases}" after \cmd{\documentclass}, and also after
+"\usepackage{amsmath}" if you are using that.
-\emph{Question:} Is there a \verb+{numcases*}+ environment for
+\fancybreak
+
+\noindent \emph{Question:} Is there a \env{numcases*} environment for
unnumbered cases?\\
-\emph{Answer:} There is a \verb+{cases}+
-environment in \AmS-\LaTeX, but it is just as convenient to stick
-with the canonical \LaTeX\ array:
-%
-\begin{verbatim}
-\[ left side = \left\{ \begin{array}...\end{array} \right. \]
-\end{verbatim}
-%
-Speaking of \pkg{\AmS-math}, they use an entirely different system
-of equation numbering, and this package uses ordinary \LaTeX\ %
-numbering.
+\emph{Answer:} That would have the natural name \env{cases}, and it is
+provided by \AmS-\LaTeX\ (\pkg{amsmath} package), or by this package given
+the \opt{cases} option. It can also be achieved by using an ordinary \LaTeX\ array
+between `"\left\lbrace\ "' and `"\right."'.
+
+Speaking of \pkg{amsmath} and package options, there are differences between the
+style used for this package and the cases done by \pkg{amsmath} (see below), but cases.sty
+has options to increase compatibility. Here is the full list of options for
+this package.
+\begin{description}
+\item[\opt{subnum}] Force all \env{numcases} environments to be treated as
+ \env{subnumcases}.
+\item[\opt{amsstyle}] For compatibility with \pkg{amsmath}'s \env{cases}, make \env{numcases}
+ use cramped math style (\cmd{\textstyle}), and put explanations in the same math style.
+\item[\opt{casesstyle}] Change \pkg{amsmath}'s \env{cases} environment to work in the text/math style
+ of \env{numcases}.
+\item[\opt{cases}] Define a \env{cases} environment for use without \pkg{amsmath}. (This
+ is actually the same as the \opt{casesstyle} option.)
+\item[\opt{fleqn}] Flush-left equation alignment, indented by \cmd{\mathindent}
+ or \cmd{\mathmargin}. (Usually inherited from the \cmd{\documentclass} options.)
+\item[\opt{leqno}] Left-side equation numbering (usually inherited from the \cmd{\documentclass}
+ options). This looks silly with numbered cases!
+\end{description}
-\fancybreak
+\section*{Examples}
-\noindent
A simple example is:
%
\begin{verbatim}
-\begin{numcases}{|x|=}
- x, & for $x \geq 0$\\
- -x, & for $x < 0$
-\end{numcases}
+ \begin{numcases} {|x|=}
+ x, & for $x \geq 0$\\
+ -x, & for $x < 0$
+ \end{numcases}
\end{verbatim}
%
Giving:
%
-\begin{numcases}{|x|=}
- x, & for $x \geq 0$\\
- -x, & for $x < 0$
+\begin{numcases} {|x|=}
+ x, & for $x \geq 0$\label{x}\\
+ -x, & for $x < 0$\label{-x}
\end{numcases}
\fancybreak
-
\noindent
-Another example is calculating the square root of $c+id$. First compute
-\phantomsection
-\begin{subnumcases}{\label{w} w\equiv}
- 0 & $c = d = 0$\label{wzero}\\
- \sqrt{|c|}\,\sqrt{\frac{1 + \sqrt{1+(d/c)^2}}{2}} & $|c| \geq |d|$ \\
- \sqrt{|d|}\,\sqrt{\frac{|c/d| + \sqrt{1+(c/d)^2}}{2}} & $|c| < |d|$
+Another example, employing sub-numbering, is calculating the square root
+of a complex number $c+id$. First compute
+\begin{subnumcases} {\label{weqn} w\equiv}
+ 0 & for $c = d = 0$\label{wzero}\\
+ \sqrt{|c|}\,\sqrt{\frac{1 + \sqrt{1+(d/c)^2}}{2}} & for $|c| \geq |d|$ \\
+ \sqrt{|d|}\,\sqrt{\frac{|c/d| + \sqrt{1+(c/d)^2}}{2}} & for $|c| < |d|$
\end{subnumcases}
-Then, using $w$ from eq.~(\ref{w}), the square root is
-\begin{subnumcases}{\sqrt{c+id}=}
- 0 & $w=0$ (case \ref{wzero})\\
- w+i\frac{d}{2w} & $w \neq 0$, $c \geq 0$ \\
- \frac{|d|}{2w} + iw & $w \neq 0$, $c < 0$, $d \geq 0$ \\
- \frac{|d|}{2w} - iw & $w \neq 0$, $c < 0$, $d < 0$
+Then, using $w$ from eq.~(\ref{weqn}), the square root is
+\begin{subnumcases}{\label{sqrteqn} \sqrt{c+id}=}
+ 0\,, \label{aaa} & $w=0$ (case \ref{wzero})\\
+ w+i\frac{d}{2w}\,, & $w \neq 0$, $c \geq 0$ \\
+ \frac{|d|}{2w} + iw\,, & $w \neq 0$, $c < 0$, $d \geq 0$ \\
+ \frac{|d|}{2w} - iw\,,\label{ddd} & $w \neq 0$, $c < 0$, $d < 0$
\end{subnumcases}
-
-\pagebreak[2]
-
-\noindent
-This was produced by:
-%
-\small
+These equations, eq.~(\ref{weqn}) and (\ref{sqrteqn}), were produced by:
+\begin{small}
\begin{verbatim}
-Another example is calculating the square root of $c+id$. First compute
-\begin{subnumcases}{\label{w} w\equiv}
- 0 & $c = d = 0$\label{wzero}\\
-\sqrt{|c|}\,\sqrt{\frac{1 + \sqrt{1+(d/c)^2}}{2}} & $|c| \geq |d|$ \\
-\sqrt{|d|}\,\sqrt{\frac{|c/d| + \sqrt{1+(c/d)^2}}{2}} & $|c| < |d|$
+Another example, employing sub-numbering, is calculating the square root
+of a complex number $c+id$. First compute
+\begin{subnumcases} {\label{weqn} w\equiv}
+ 0 & for $c = d = 0$\label{wzero}\\
+ \sqrt{|c|}\,\sqrt{\frac{1 + \sqrt{1+(d/c)^2}}{2}} & for $|c| \geq |d|$ \\
+ \sqrt{|d|}\,\sqrt{\frac{|c/d| + \sqrt{1+(c/d)^2}}{2}} & for $|c| < |d|$
\end{subnumcases}
-Then, using $w$ from eq.~(\ref{w}), the square root is
-\begin{subnumcases}{\sqrt{c+id}=}
-0 & $w=0$ (case \ref{wzero})\\
-w+i\frac{d}{2w} & $w \neq 0$, $c \geq 0$ \\
-\frac{|d|}{2w} + iw & $w \neq 0$, $c < 0$, $d \geq 0$ \\
-\frac{|d|}{2w} - iw & $w \neq 0$, $c < 0$, $d < 0$
+Then, using $w$ from eq.~(\ref{weqn}), the square root is
+\begin{subnumcases}{\label{sqrteqn} \sqrt{c+id}=}
+ 0\,, & $w=0$ (case \ref{wzero})\\
+ w+i\frac{d}{2w}\,, & $w \neq 0$, $c \geq 0$ \\
+ \frac{|d|}{2w} + iw\,, & $w \neq 0$, $c < 0$, $d \geq 0$ \\
+ \frac{|d|}{2w} - iw\,, & $w \neq 0$, $c < 0$, $d < 0$
\end{subnumcases}
\end{verbatim}
+\end{small}
+
+\section*{Compatibilibility with amsmath}
+
+When used in conjunction with amsmath.sty, the cases package will obey the the variant
+commands \cmd{\tag}, \cmd{\notag}, and \cmd{\mathmargin}, however the formatting details
+differ between \pkg{amsmath}'s \env{cases} environment and \env{numcases}.
+For comparison, equation~(\ref{weqn}) formatted by \pkg{amsmath} and its \env{cases} environment
+may be entered as
+\begin{flushleft}\small
+\begin{verbatim}
+\begin{equation}
+\label{wams} w \equiv
+\begin{cases}
+ 0 & \text{for}\ c = d = 0\\
+ \sqrt{|c|}\,\sqrt{\frac{1+\sqrt{1+(d/c)^2}}{2}} &\text{for}\ |c| \geq |d|\\
+ \sqrt{|d|}\,\sqrt{\frac{|c/d| + \sqrt{1+(c/d)^2}}{2}} &\text{for}\ |c|<|d|
+\end{cases}
+\end{equation}
+\end{verbatim}
+\end{flushleft}
+which produces
+\begin{equation}
+\label{wams} w\equiv
+\begin{cases}
+ 0 & \text{for }c = d = 0\\
+ \sqrt{|c|}\,\sqrt{\frac{1+\sqrt{1+(d/c)^2}}{2}} & \text{for}\ |c| \geq |d| \\
+ \sqrt{|d|}\,\sqrt{\frac{|c/d| + \sqrt{1+(c/d)^2}}{2}} & \text{for}\ |c| < |d|
+\end{cases}
+\end{equation}
+To get this more compact layout with \env{numcases} you can insert "\textstyle"
+at the beginning of each case, as needed, or use the \pkg{cases}
+package option \opt{amsstyle}.
+To have the (unnumbered) \env{cases} environment give the more open layout of
+eq.~(\ref{weqn}) you can put "\displaystyle" at the beginning of each case, or use
+the option \opt{casesstyle} for the \pkg{cases} package. (Yes these go with the
+\pkg{cases} package, they are not options for \pkg{amsmath}.)
+
+Another slight difference is that the cases within \env{numcases} can be right-justified by
+inserting \cmd{\hfill} at the beginning of each, which might be desired in rare situations,
+like maybe the absolute value example numbered (\ref{x}) and (\ref{-x}) above.
+
+For full disclosure, even without any relevant package options, cases.sty will
+slightly adjust the \env{cases} environment from \pkg{amsmath}, by adding a little
+space after the left brace.
+
+\section*{Sub-numbering}
+For control of the sub-equation-numbering style, see the
+\AmS-\LaTeX\ documentation for \env{subequations}, currently
+in section 3.11.3. If you are not using amsmath, that documentation
+still mostly applies, except the name for regular equation numbers
+is then `mainequation' instead of `parentequation'. Also, the
+sub-numbering style can be controlled more easily by defining
+\cmd{\thesubequation}. An example for capitalized letters is
+\begin{verbatim}
+\renewcommand\thesubequation{\themainequation.\Alph{equation}} % 13.C
+\end{verbatim}
+(noting that the counter to reference is `equation' not `subequation').
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cases.doc.tlpobj new/tlpkg/tlpobj/cases.doc.tlpobj
--- old/tlpkg/tlpobj/cases.doc.tlpobj 2019-02-28 03:23:59.000000000 +0100
+++ new/tlpkg/tlpobj/cases.doc.tlpobj 2020-04-12 01:55:23.000000000 +0200
@@ -1,8 +1,9 @@
name cases.doc
category Package
-revision 17123
+revision 54682
shortdesc doc files of cases
relocated 1
-docfiles size=81
+docfiles size=86
+ RELOC/doc/latex/cases/README
RELOC/doc/latex/cases/cases.pdf
RELOC/doc/latex/cases/cases.tex
++++++ cases.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cases/cases.sty new/tex/latex/cases/cases.sty
--- old/tex/latex/cases/cases.sty 2010-02-22 00:19:14.000000000 +0100
+++ new/tex/latex/cases/cases.sty 2020-04-12 00:52:41.000000000 +0200
@@ -1,11 +1,12 @@
-% C A S E S . S T Y ver 2.5 May 2002
+% C A S E S . S T Y ver 3.2 Mar 2020
%
-% Copyright (C) 1993,1994,1995,2000,2002 by Donald Arseneau
+% Copyright (C) 1993,1994,1995,2000,2002,2020 by Donald Arseneau
% asnd(a)triumf.ca
% These macros may be freely transmitted, reproduced, or modified
% provided that this notice is left intact. Sub-equation numbering
% is based on subeqn.sty by Stephen Gildea; most of the rest is based
-% on LaTeX's \eqnarray by Leslie Lamport and the LaTeX3 team.
+% on LaTeX's \eqnarray by Leslie Lamport and the LaTeX3 team,
+% and parts of amsmath.sty by the American Mathematical Society.
%
% This provides a LaTeX environment {numcases} to produce multi-case
% equations with a separate equation number for each case. There is
@@ -27,96 +28,115 @@
% case. In a subnumcases environment, a \label in the left_side of the
% equation gives the overall equation number, without any letter.
%
-% To use this package,
-% include "\usepackage{cases}" after \documentclass. You may also
-% specify "\usepackage[subnum]{cases}" to force *all* numcases
-% environments to be treated as subnumcases.
-%
-% Question: Is there a {numcases*} environment for unnumbered cases?
-% Answer: There is a {cases} environment in AMS-LaTeX, but it is just as
-% convenient to stick with the canonical LaTeX array:
-% \[ left side = \left\{ \begin{array}...\end{array} \right. \]
-%
-% Speaking of AMS-math, they use an entirely different system of equation
-% numbering, and this package uses ordinary LaTeX numbering.
-%
-% - - - - -
-% A simple example is:
-% \begin{numcases}{|x|=}
-% x, & for $x \geq 0$\\
-% -x, & for $x < 0$
-% \end{numcases}
-%
-% Giving:
-% / x for x > 0 (1)
-% |x| = < -
-% \ -x for x < 0 (2)
-%
-% - - - - -
-%
-% Another example is calculating the square root of $c+id$. First compute
-% \begin{subnumcases}{\label{w} w\equiv}
-% 0 & $c = d = 0$\label{wzero}\\
-% \sqrt{|c|}\,\sqrt{\frac{1 + \sqrt{1+(d/c)^2}}{2}} & $|c| \geq |d|$ \\
-% \sqrt{|d|}\,\sqrt{\frac{|c/d| + \sqrt{1+(c/d)^2}}{2}} & $|c| < |d|$
-% \end{subnumcases}
-% Then, using $w$ from eq.~(\ref{w}), the square root is
-% \begin{subnumcases}{\sqrt{c+id}=}
-% 0 & $w=0$ (case \ref{wzero})\\
-% w+i\frac{d}{2w} & $w \neq 0$, $c \geq 0$ \\
-% \frac{|d|}{2w} + iw & $w \neq 0$, $c < 0$, $d \geq 0$ \\
-% \frac{|d|}{2w} - iw & $w \neq 0$, $c < 0$, $d < 0$
-% \end{subnumcases}
-%
-% - - - begin definitions - - -
+% For detailed description and package options, see cases.pdf (cases.tex).
-\ProvidesPackage{cases}[2002/05/02 ver 2.5 ]
+\ProvidesPackage{cases}[2020/03/29 ver 3.2]
+
+\newdimen\numc@numwid
+
+% copy \@@eqncr but change error message and handle \tag for amsmath:
+\def\@@numc@cr{\let\reserved@a\relax
+ \ifcase\@eqcnt \def\reserved@a{& & &}\or \def\reserved@a{& &}%
+ \or \def\reserved@a{&}\else
+ \let\reserved@a\@empty
+ \@latex@error{Too many columns in numcases environment}\@ehc\fi
+ \reserved@a \if@eqnsw\@eqnnum\stepcounter{equation}\else \iftag@ \df@tag\fi\fi
+ \global\@eqnswtrue\global\@eqcnt\z@\cr}
+\let\iftag@=\iffalse
\newenvironment{numcases}[1]%
-{$$\numc@opts \setbox\z@\hbox
- {\advance\c@equation\@ne\def\@currentlabel{\p@equation\theequation}% local
- $\displaystyle {#1\null}\m@th$}%
- \numc@setsub
+{$$\numc@opts
+ \refstepcounter{equation}% Needed for LHS \label
+ \setbox\z@\hbox {% typeset LHS
+ \def\@currentlabel{\p@equation\theequation}% local def
+ $\displaystyle {#1{}}\m@th$}%
+ \numc@setsub % maybe \subequations (handling \refstepcounter)
+ \def\@currentlabel{\p@equation\theequation}%
+ \global\@eqnswtrue\m@th
+ \let\tag\numc@tag
+ \settowidth{\numc@numwid}{\ \advance\c@equation\tw@\numc@eqnnum}%
+ \@tempskipb\@centering
+ \ifx\numc@left\mathindent % fleqn:
+ \@tempskipa=\@ne\mathindent\@minus\@ne\mathindent
+ \ifx\numc@forcenumwid\z@ % leqno
+ \ifdim \numc@numwid>\mathindent % enlarge left space for equation number
+ \@tempskipa=\numc@numwid\@minus\numc@numwid
+ \fi\fi
+ \else % not fleqn:
+ \@tempskipa=\@centering
+ \advance\@tempskipa \numc@numwid\@minus\numc@numwid
+ \advance\@tempskipa \numc@numwid\@minus\numc@forcenumwid
+ \advance\@tempskipb \tw@\numc@numwid\@minus\tw@\numc@numwid
+ \advance\@tempskipb -\numc@forcenumwid\@minus-\numc@forcenumwid
+ \fi
\setbox\tw@\vbox\bgroup
- \stepcounter{equation}\def\@currentlabel{\p@equation\theequation}%
- \global\@eqnswtrue\m@th \everycr{}\tabskip\numc@left\let\\\@eqncr
- \halign to\dimen@ii \bgroup \kern\wd\z@ \kern14\p@ % assume width of brace
- \tabskip\z@skip \global\@eqcnt\@ne $\displaystyle{##}$\hfil
- &\global\@eqcnt\tw@ \skip@10\p@ \advance\skip@\tw@\arraycolsep \hskip\skip@
- ##\unskip\hfil\tabskip\@centering% \unskip removes space if no explanations
- &\global\@eqcnt\thr@@\hbox to\z@\bgroup\hss##\egroup\tabskip\z@skip\cr
-}{\@@eqncr \egroup % end \halign, which does not contain first column or brace
- \global\advance\c@equation\m@ne
-%Measure the natural width of the alignment
- \unskip\unpenalty\unskip\unpenalty \setbox\z@\lastbox % grab last line
- \nointerlineskip \copy\z@ % then put it back
- \global\dimen@i\wd\z@
- \setbox\z@\hbox{\hskip-\numc@left\unhbox\z@}% Measure its natural width
- \ifdim \wd\z@<\dimen@i \global\dimen@i\wd\z@ \fi
-\egroup% end \vbox (box\tw@, box\z@ is restored to LHS)
-\hbox to\dimen@ii{\m@th % assemble the whole equation
- \hskip\numc@left
- \hbox to\dimen@i{$\displaystyle \box\z@ % parameter #1
+ \everycr{}\let\\\@eqncr \let\@@eqncr\@@numc@cr
+ \tabskip\@tempskipa
+ \halign to \ifx\numc@left\mathindent \linewidth \else \displaywidth \fi \bgroup
+ \kern\wd\z@ \kern10\p@ % white space for LHS; assume (and force) width of brace
+ \global\let\iftag@=\iffalse % for amsmath (make sure this is not in \if block)
+ \global\@eqcnt\@ne $\numc@dispstyle ##\relax$\hfil % RHS
+ \tabskip\z@skip &% explanation
+ \global\@eqcnt\tw@
+ \numc@expstyle\quad ##\unskip\numc@expstyle\hfil % \unskip removes quad if no explanation
+ \tabskip\@tempskipb &% equation number
+ \global\@eqcnt\thr@@\hbox to\numc@forcenumwid\bgroup\hss##\egroup
+ \tabskip\z@skip\cr
+}{%
+ \@@numc@cr \egroup % end \halign, which does not contain first column or brace
+ \global\advance\c@equation\m@ne
+ % Measure the natural width of the alignment
+ \unskip\unpenalty\unskip\unpenalty \setbox\z@\lastbox % grab last line
+ \nointerlineskip \copy\z@ % then put it back
+ \global\dimen@i\wd\z@
+ \setbox\z@\hbox{\unhbox\z@}% Measure its natural width in \dimen@i
+ \global\dimen@i\wd\z@
+ \egroup% end \vbox (\tw@) box\z@ is restored to LHS; \dimen@i is retained
+ \advance\dimen@i-\@tempskipa \advance\dimen@i-\wd\z@ \advance\dimen@i-10\p@
+ \advance\dimen@i-\@tempskipb
+ % now \@dimen@i is natural width of RHS + explanation + eqno columns
+ \hbox to\wd\tw@{\m@th % assemble the whole equation stretched to display width
+ \hskip\@tempskipa
+ \box\z@ % LHS - parameter #1
+ \hbox to10\p@{\hss$\displaystyle
\dimen@\ht\tw@ \advance\dimen@\dp\tw@ % get size of brace
- \left\{\vcenter to\dimen@{\vfil}\right.\n@space % make brace
- $\hfil}\hskip\@centering % finished first part (filled whole line)
- \kern-\dimen@ii % backspace the full width
- $\vcenter{\box\tw@}$% overlay the alignment
- }% end the \hbox to\dimen@ii
+ \ifdim\dimen@<1.5em\dimen(a)=1.5em\fi % don't allow really small brace
+ \left\lbrace\vcenter to\dimen@{\vfil}\,\right.\n@space % make brace
+ $\hss}% end 10pt brace box
+ \kern\dimen@i
+ \hskip\@tempskipb
+ }% finished first part (filled whole line) end the \hbox to\wd\tw@
+ \kern-\wd\tw@ % backspace the full width
+ \vcenter{\box\tw@}% overlay the alignment
\numc@resetsub
$$\global\@ignoretrue}
+% a wrapper around \subequations so it works in cases with hyperref and amsmath
+\def\numc@subequations{% skip the \refstepcounter inside \subequations
+ \let\numc@opts\refstepcounter
+ \def\refstepcounter##1{\let\refstepcounter\numc@opts}%
+ \subequations
+ \refstepcounter{equation}}
+
\let\numc@setsub\relax
\let\numc@resetsub\relax
-\def\subnumcases{\let\numc@setsub\subequations
- \let\numc@resetsub\endsubequations \numcases}
+\def\subnumcases{%
+ \let\numc@setsub\numc@subequations
+ \let\numc@resetsub\endsubequations
+ \numcases}
\let\endsubnumcases\endnumcases
% declare subequations -- either defining them following the style of
-% Gildea's subeqn.sty, or using the syntax of AMS-LaTeX if that is loaded.
+% Gildea's subeqn.sty, or using the version from AMS-LaTeX if that is loaded.
-\@ifundefined{c@parentequation}{% No AMS, define subequations from scratch:
+\@ifundefined{c@parentequation}{% No AMS
+\def\numc@eqnnum{\@eqnnum}
+% for \tag (but not \tag*) without amsmath, using \@@numc@cr above.
+\def\numc@tag#1{\def\@currentlabel{#1}%
+ \gdef\df@tag{\def\theequation{#1}\@eqnnum}%
+ \global\let\iftag@=\iftrue
+ \nonumber}
%
% These versions of subequations follow the style of Gildea's subeqn.sty,
% but are thoroughly rewritten.
@@ -163,21 +183,82 @@
\def\@lab@subeqnarray#1#2{\begingroup
\let\@currentlabel\themainequation #1{#2}\endgroup}
%
-}{}% AMS \subequations already defined
+}{% AMS
+
+% \subequations already defined;
+% use tag format
+\def\numc@eqnnum{\tagform@{\theequation}}
+\def\numc@tag{\tag@in@align}
+
+% add little space after brace to amsmath's cases
+\def\@tempa{%
+ \let\@ifnextchar\new@ifnextchar
+ \left\lbrace
+ \def\arraystretch{1.2}%
+ \array{@{}l@{\quad}l@{}}%
+}
+\ifx \env@cases\@tempa % add a bit of space after brace in amsmath cases env
+\def\env@cases{%
+ \let\@ifnextchar\new@ifnextchar
+ \left\lbrace\hskip 2\p@
+ \def\arraystretch{1.2}%
+ \array{@{}l@{\quad}l@{}}%
+}
+\fi
+}% end amsmath branch
\def\numc@left{\@centering}
-\def\numc@opts{\dimen@ii\displaywidth}
+\def\numc@opts{}
+\def\numc@forcenumwid{\numc@numwid}
-\DeclareOption{subnum}{
- \let\numc@setsub\subequations
- \let\numc@resetsub\endsubequations }
+\DeclareOption{subnum}{%
+ \let\numc@setsub\numc@subequations
+ \let\numc@resetsub\endsubequations
+}
\DeclareOption{fleqn}{
- \def\numc@left{\mathindent}
- \def\numc@opts{\displaywidth\linewidth
- \dimen@ii\linewidth }
+ \let\numc@left\mathindent
+ \def\numc@opts{\displaywidth\linewidth}
+}
+
+\DeclareOption{leqno}{
+ \let\numc@forcenumwid\z@
+}
+
+\let\numc@expstyle\@empty
+\let\numc@dispstyle\displaystyle
+\DeclareOption{amsstyle}{
+ \def\numc@expstyle{$}% used in pairs for math-mode ($) explanation
+ \let\numc@dispstyle\textstyle
}
-\ProcessOptions
+
+\DeclareOption{casesstyle}{
+ \newcommand\@unnc@casecr[1][\z@skip]{%
+ \cr \noalign{\vskip #1}%
+ }
+ \renewenvironment{cases}{%
+ \let\@ifnextchar\new@ifnextchar
+ \left\lbrace\hskip 2\p@
+ \vcenter to1.3em{}%
+ \vcenter\bgroup
+ \let\\\@unnc@casecr
+ \openup\jot
+ \tabskip\z@skip
+ \halign \bgroup
+ $\numc@dispstyle ##\m@th$\hfil
+ &\numc@expstyle\quad ##\unskip\numc@expstyle\hfil % \unskip removes space if no explanations
+ \cr
+ }{%
+ \crcr
+ \egroup
+ \egroup
+ \right.\n@space
+ }
+}
+
+\DeclareOption{cases}{\ExecuteOptions{casesstyle}}
+
+\ProcessOptions
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cases.tlpobj new/tlpkg/tlpobj/cases.tlpobj
--- old/tlpkg/tlpobj/cases.tlpobj 2019-02-28 03:23:59.000000000 +0100
+++ new/tlpkg/tlpobj/cases.tlpobj 2020-04-12 01:55:23.000000000 +0200
@@ -1,17 +1,16 @@
name cases
category Package
-revision 17123
+revision 54682
shortdesc Numbered cases environment
relocated 1
-longdesc Define the environment numcases: equations with several
-longdesc alternative right-hand sides, with equation numbers for each
-longdesc alternative. Also environment subnumcases, where each
-longdesc alternative is a sub-number (e.g., 8a, 8b, ...) of the equation
-longdesc set as a whole.
-runfiles size=2
+longdesc This package provides a LaTeX environment "numcases" to produce
+longdesc multi-case equations with a separate equation number for each
+longdesc case. There is also a "subnumcases" environment which numbers
+longdesc each case with the overall equation number plus a letter [8a,
+longdesc 8b, etc.].
+runfiles size=3
RELOC/tex/latex/cases/cases.sty
catalogue-ctan /macros/latex/contrib/cases
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license pd
+catalogue-license other-free
catalogue-topics maths-syseqn
-catalogue-version 2.5
+catalogue-version 3.2
++++++ cbfonts-fd.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cbfonts-fd.doc.tlpobj new/tlpkg/tlpobj/cbfonts-fd.doc.tlpobj
--- old/tlpkg/tlpobj/cbfonts-fd.doc.tlpobj 2019-02-28 03:25:02.000000000 +0100
+++ new/tlpkg/tlpobj/cbfonts-fd.doc.tlpobj 2020-03-04 23:50:28.000000000 +0100
@@ -1,6 +1,6 @@
name cbfonts-fd.doc
category Package
-revision 44917
+revision 54080
shortdesc doc files of cbfonts-fd
relocated 1
docfiles size=111
++++++ cbfonts-fd.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cbfonts-fd.tlpobj new/tlpkg/tlpobj/cbfonts-fd.tlpobj
--- old/tlpkg/tlpobj/cbfonts-fd.tlpobj 2019-02-28 03:25:02.000000000 +0100
+++ new/tlpkg/tlpobj/cbfonts-fd.tlpobj 2020-03-04 23:50:28.000000000 +0100
@@ -1,12 +1,12 @@
name cbfonts-fd
category Package
-revision 44917
+revision 54080
shortdesc LaTeX font description files for the CB Greek fonts
relocated 1
longdesc The package provides font description files for all the many
longdesc shapes available from the cbfonts collection. The files provide
longdesc the means whereby the NFSS knows which fonts a LaTeX user is
-longdesc requesting.
+longdesc requesting. The package depends on cbgreek-complete.
runfiles size=13
RELOC/tex/latex/cbfonts-fd/lgrcmr.fd
RELOC/tex/latex/cbfonts-fd/lgrcmro.fd
@@ -18,8 +18,8 @@
RELOC/tex/latex/cbfonts-fd/lgrlmro.fd
RELOC/tex/latex/cbfonts-fd/lgrlmss.fd
RELOC/tex/latex/cbfonts-fd/lgrlmtt.fd
+catalogue-also cbgreek-complete
catalogue-ctan /fonts/greek/cbfonts-fd
-catalogue-date 2017-07-29 20:12:21 +0200
catalogue-license lppl1.3
catalogue-topics font-supp font-greek
catalogue-version 1.2
++++++ cbfonts.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cbfonts.doc.tlpobj new/tlpkg/tlpobj/cbfonts.doc.tlpobj
--- old/tlpkg/tlpobj/cbfonts.doc.tlpobj 2019-02-28 03:24:01.000000000 +0100
+++ new/tlpkg/tlpobj/cbfonts.doc.tlpobj 2020-03-04 23:49:54.000000000 +0100
@@ -1,6 +1,6 @@
name cbfonts.doc
category Package
-revision 31624
+revision 54080
shortdesc doc files of cbfonts
relocated 1
docfiles size=149
++++++ cbfonts.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-d/cbfonts.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-d.new.3606/cbfonts.tar.xz differ: char 65971714, line 258076
++++++ ccfonts.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ccfonts/README new/doc/latex/ccfonts/README
--- old/doc/latex/ccfonts/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/ccfonts/README 2020-04-12 00:53:44.000000000 +0200
@@ -0,0 +1,163 @@
+************************************************************
+* LaTeX support for the Concrete fonts *
+* *
+* cc.fdd: 1999/11/22 v1.0a *
+* ccfonts.dtx: 2020/03/25 v1.2 *
+* *
+************************************************************
+Copyright (c) Walter Schmidt 1997--2020
+
+This program may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either
+version 1.2 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.2 or
+later is part of all distributions of LaTeX version
+1999/12/01 or later.
+
+This program consists of the files ccfonts.dtx, cc.fdd and
+ccfonts.ins.
+
+
+
+What's new?
+===========
+2020/03/25: (UF) adapted boldsans version to new LaTeX handling of series defaults.
+ see https://github.com/latex3/latex2e/issues/299
+2000/05/30: bug fix wrt/ amsfonts.sty
+
+
+
+Overview
+========
+
+This distribution contains a LaTeX package and part of the
+the necessary fd files to use the Concrete fonts with LaTeX.
+The distributed files are:
+
+ccfonts.ins installation script
+cc.fdd documented source of the fd files
+ccfonts.dtx documented source of the LaTeX package
+readme the file you are reading now
+
+
+
+Installing the files
+====================
+
+Copy the files
+
+cc.fdd
+ccfonts.dtx
+ccfonts.ins
+
+to a temporary directory or to a directory where you keep
+documented LaTeX source files.
+
+Run the installation script ccfonts.ins through LaTeX to
+generate the font definition files and the LaTeX package.
+This will create the following files:
+
+* ccfonts.sty: The LaTeX package for using the Concrete
+fonts.
+
+* t1ccr.fd, ts1ccr.fd: The font definition files for the
+European Concrete text fonts.
+
+These files must be moved to a directory where LaTeX
+searches for style files.
+
+The latter step is not required if your "docstrip" tool has
+been configured to write directly to the TeX directories,
+and if the directory tex/latex/ccfonts exists in your TDS
+tree before running ccfonts.ins.
+
+Finally, run the file ccfonts.dtx through LaTeX to generate
+the documentation of the LaTeX package ccfonts.sty. You may
+also run cc.fdd through LaTeX, thus generating description
+of the low-level interface to the Concrete fonts.
+
+
+
+Thanks to ...
+=============
+
+... Frank Jensen for the permit to copy some ideas from
+his package beton.sty.
+
+
+
+History of changes
+==================
+*** 2000-06-30 ***
+ -- ccfonts.dtx v1.0: bug fix wrt/ using amsfonts.sty;
+ documentation update
+
+*** 1999-11-22 ***
+ -- cc.fdd v1.0a: fixed ts1ccr.fd
+
+*** 1999-06-29 ***
+ -- cc,fdd v1.0: dropped the fd files for the traditional
+ and mathematical Concrete fonts, which are to be taken
+ from Ulrik Vieth's concmath bundle now.
+ -- ccfonts.dtx v1.0: new option [boldsans]
+
+*** 1999-03-23 ***
+ -- cc.fdd 0.99: fixed font def. for OT1/ccr/m/sl
+
+*** 1999-02-22 ***
+ -- ccfonts.dtx 0.992: new option [slantedGreek]
+
+*** 1998-05-08 ***
+ -- ccfonts.dtx 0.991: fixed options processing
+
+*** 1998-01-19 ***
+ -- ccfonts.ins: now to be used with LaTeX > June 96 only;
+ oinst.ins : installation script for older versions
+ (This should - at last! - fix the problems with Unix.)
+
+*** 1997-11-04 ***
+ -- ccfonts.sry v0.99: fixed bug concerning the AMS fonts
+
+*** 1997-10-24 ***
+ -- ccfonts.sty, *.fdd, version 0.98: Added support for new
+ design sizes of the slanted and AMS fonts
+ -- ccfonts.sty, v0.98: added option `exscale'
+
+*** 1997-09-11 ***
+ -- ccfonts.sty v0.97: added \relax after \ProcessOptions
+ -- cc.fdd v0.97: removed octal numbers for possibly active
+ quote characters
+ -- removed spurious blank characters from all
+ font definitions
+ -- fixed some bugs in the documentation
+
+*** 1997-06-03
+ -- installation script v0.95a: fd files are given
+ mixed-case names if necessary (only with obsolete
+ LaTeX if running on Unix)
+
+*** 1997/04/01 v0.95 ***
+ -- extended documentation
+ -- names of fd files changed to lowercase
+ -- added missing support for text companion fonts in the
+ installation script
+ -- changed font substitutions for the missing
+ boldface font series in the fd files
+ -- cleaned up definitions for OMS and OML encoding in the
+ fd files
+
+*** 1997/03/20 v0.9 ***
+ first public version
+
+
+
+Comments, bug reports and suggestions
+=====================================
+
+... are welcome and should be addressed to the author:
+
+Walter Schmidt <walter.schmidt(a)arcormail.de>
+
+%% end of file `readme'
+
Binary files old/doc/latex/ccfonts/ccfonts.pdf and new/doc/latex/ccfonts/ccfonts.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ccfonts/readme new/doc/latex/ccfonts/readme
--- old/doc/latex/ccfonts/readme 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/ccfonts/readme 1970-01-01 01:00:00.000000000 +0100
@@ -1,161 +0,0 @@
-************************************************************
-* LaTeX support for the Concrete fonts *
-* *
-* cc.fdd: 1999/11/22 v1.0a *
-* ccfonts.dtx: 2000/06/30 v1.1 *
-* *
-************************************************************
-Copyright (c) Walter Schmidt 1997--2000
-
-This program may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either
-version 1.2 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.2 or
-later is part of all distributions of LaTeX version
-1999/12/01 or later.
-
-This program consists of the files ccfonts.dtx, cc.fdd and
-ccfonts.ins.
-
-
-
-What's new?
-===========
-2000/05/30: bug fix wrt/ amsfonts.sty
-
-
-
-Overview
-========
-
-This distribution contains a LaTeX package and part of the
-the necessary fd files to use the Concrete fonts with LaTeX.
-The distributed files are:
-
-ccfonts.ins installation script
-cc.fdd documented source of the fd files
-ccfonts.dtx documented source of the LaTeX package
-readme the file you are reading now
-
-
-
-Installing the files
-====================
-
-Copy the files
-
-cc.fdd
-ccfonts.dtx
-ccfonts.ins
-
-to a temporary directory or to a directory where you keep
-documented LaTeX source files.
-
-Run the installation script ccfonts.ins through LaTeX to
-generate the font definition files and the LaTeX package.
-This will create the following files:
-
-* ccfonts.sty: The LaTeX package for using the Concrete
-fonts.
-
-* t1ccr.fd, ts1ccr.fd: The font definition files for the
-European Concrete text fonts.
-
-These files must be moved to a directory where LaTeX
-searches for style files.
-
-The latter step is not required if your "docstrip" tool has
-been configured to write directly to the TeX directories,
-and if the directory tex/latex/ccfonts exists in your TDS
-tree before running ccfonts.ins.
-
-Finally, run the file ccfonts.dtx through LaTeX to generate
-the documentation of the LaTeX package ccfonts.sty. You may
-also run cc.fdd through LaTeX, thus generating description
-of the low-level interface to the Concrete fonts.
-
-
-
-Thanks to ...
-=============
-
-... Frank Jensen for the permit to copy some ideas from
-his package beton.sty.
-
-
-
-History of changes
-==================
-*** 2000-06-30 ***
- -- ccfonts.dtx v1.0: bug fix wrt/ using amsfonts.sty;
- documentation update
-
-*** 1999-11-22 ***
- -- cc.fdd v1.0a: fixed ts1ccr.fd
-
-*** 1999-06-29 ***
- -- cc,fdd v1.0: dropped the fd files for the traditional
- and mathematical Concrete fonts, which are to be taken
- from Ulrik Vieth's concmath bundle now.
- -- ccfonts.dtx v1.0: new option [boldsans]
-
-*** 1999-03-23 ***
- -- cc.fdd 0.99: fixed font def. for OT1/ccr/m/sl
-
-*** 1999-02-22 ***
- -- ccfonts.dtx 0.992: new option [slantedGreek]
-
-*** 1998-05-08 ***
- -- ccfonts.dtx 0.991: fixed options processing
-
-*** 1998-01-19 ***
- -- ccfonts.ins: now to be used with LaTeX > June 96 only;
- oinst.ins : installation script for older versions
- (This should - at last! - fix the problems with Unix.)
-
-*** 1997-11-04 ***
- -- ccfonts.sry v0.99: fixed bug concerning the AMS fonts
-
-*** 1997-10-24 ***
- -- ccfonts.sty, *.fdd, version 0.98: Added support for new
- design sizes of the slanted and AMS fonts
- -- ccfonts.sty, v0.98: added option `exscale'
-
-*** 1997-09-11 ***
- -- ccfonts.sty v0.97: added \relax after \ProcessOptions
- -- cc.fdd v0.97: removed octal numbers for possibly active
- quote characters
- -- removed spurious blank characters from all
- font definitions
- -- fixed some bugs in the documentation
-
-*** 1997-06-03
- -- installation script v0.95a: fd files are given
- mixed-case names if necessary (only with obsolete
- LaTeX if running on Unix)
-
-*** 1997/04/01 v0.95 ***
- -- extended documentation
- -- names of fd files changed to lowercase
- -- added missing support for text companion fonts in the
- installation script
- -- changed font substitutions for the missing
- boldface font series in the fd files
- -- cleaned up definitions for OMS and OML encoding in the
- fd files
-
-*** 1997/03/20 v0.9 ***
- first public version
-
-
-
-Comments, bug reports and suggestions
-=====================================
-
-... are welcome and should be addressed to the author:
-
-Walter Schmidt <walter.schmidt(a)arcormail.de>
-
-%% end of file `readme'
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ccfonts.doc.tlpobj new/tlpkg/tlpobj/ccfonts.doc.tlpobj
--- old/tlpkg/tlpobj/ccfonts.doc.tlpobj 2019-02-28 03:25:03.000000000 +0100
+++ new/tlpkg/tlpobj/ccfonts.doc.tlpobj 2020-04-12 01:55:23.000000000 +0200
@@ -1,8 +1,8 @@
name ccfonts.doc
category Package
-revision 17122
+revision 54686
shortdesc doc files of ccfonts
relocated 1
-docfiles size=52
+docfiles size=50
+ RELOC/doc/latex/ccfonts/README
RELOC/doc/latex/ccfonts/ccfonts.pdf
- RELOC/doc/latex/ccfonts/readme
++++++ ccfonts.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ccfonts/ccfonts.sty new/tex/latex/ccfonts/ccfonts.sty
--- old/tex/latex/ccfonts/ccfonts.sty 2006-01-13 00:52:46.000000000 +0100
+++ new/tex/latex/ccfonts/ccfonts.sty 2020-04-12 00:53:44.000000000 +0200
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}[1995/06/01]
\ProvidesPackage{ccfonts}
- [2000/06/30 v1.1 (WaS)]
+ [2020/03/25 v1.2 (WaS)]
\renewcommand{\rmdefault}{ccr}
\def\cc@baselineskip@table
{<\@viiipt>10<\@ixpt>11.5<\@xpt>13<\@xipt>14.5<\@xiipt>16}
@@ -73,7 +73,9 @@
\DeclareMathSymbol{\Omega}{\mathalpha}{letters}{10}
}
\DeclareOption{boldsans}{%
- \renewcommand{\bfdefault}{sbc}}
+ \@ifundefined{DeclareFontSeriesDefault}{%
+ \renewcommand{\bfdefault}{sbc}}{%
+ \DeclareFontSeriesDefault[rm]{bf}{sbc}}}
\ProcessOptions\relax
\DeclareSymbolFont {operators} {OT1}{ccr} {m}{n}
\DeclareSymbolFont {letters} {OML}{ccm} {m}{it}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ccfonts.tlpobj new/tlpkg/tlpobj/ccfonts.tlpobj
--- old/tlpkg/tlpobj/ccfonts.tlpobj 2019-02-28 03:25:03.000000000 +0100
+++ new/tlpkg/tlpobj/ccfonts.tlpobj 2020-04-12 01:55:23.000000000 +0200
@@ -1,6 +1,6 @@
name ccfonts
category Package
-revision 17122
+revision 54686
shortdesc Support for Concrete text and math fonts in LaTeX
relocated 1
longdesc LaTeX font definition files for the Concrete fonts and a LaTeX
@@ -13,7 +13,6 @@
RELOC/tex/latex/ccfonts/ts1ccr.fd
catalogue-also ecc
catalogue-ctan /macros/latex/contrib/ccfonts
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font-supp
-catalogue-version 1.1
+catalogue-version 1.2
++++++ ccicons.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ccicons.doc.tlpobj new/tlpkg/tlpobj/ccicons.doc.tlpobj
--- old/tlpkg/tlpobj/ccicons.doc.tlpobj 2019-02-28 03:25:03.000000000 +0100
+++ new/tlpkg/tlpobj/ccicons.doc.tlpobj 2020-03-24 01:56:41.000000000 +0100
@@ -1,6 +1,6 @@
name ccicons.doc
category Package
-revision 45646
+revision 54512
shortdesc doc files of ccicons
relocated 1
docfiles size=25
++++++ ccicons.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ccicons.tlpobj new/tlpkg/tlpobj/ccicons.tlpobj
--- old/tlpkg/tlpobj/ccicons.tlpobj 2019-02-28 03:25:03.000000000 +0100
+++ new/tlpkg/tlpobj/ccicons.tlpobj 2020-03-24 01:56:41.000000000 +0100
@@ -1,6 +1,6 @@
name ccicons
category Package
-revision 45646
+revision 54512
shortdesc LaTeX support for Creative Commons icons
relocated 1
longdesc The package provides the means to typeset Creative Commons
@@ -16,7 +16,6 @@
RELOC/tex/latex/ccicons/ccicons.sty
catalogue-contact-home https://github.com/ummels/ccicons
catalogue-ctan /fonts/ccicons
-catalogue-date 2018-01-06 12:14:59 +0100
-catalogue-license lppl1.3cofl
+catalogue-license lppl1.3c ofl
catalogue-topics font font-symbol font-type1
catalogue-version 1.6
++++++ cellprops.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cellprops/LICENSE new/doc/latex/cellprops/LICENSE
--- old/doc/latex/cellprops/LICENSE 2018-06-12 00:21:12.000000000 +0200
+++ new/doc/latex/cellprops/LICENSE 2019-09-29 23:12:55.000000000 +0200
@@ -632,7 +632,7 @@
the "copyright" line and a pointer to where the full notice is found.
cellprops
- Copyright (C) 2018 Julien "_FrnchFrgg_" RIVAUD
+ Copyright (C) 2016-2019 Julien "_FrnchFrgg_" RIVAUD
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:
- cellprops Copyright (C) 2018 Julien "_FrnchFrgg_" RIVAUD
+ cellprops Copyright (C) 2016-2019 Julien "_FrnchFrgg_" RIVAUD
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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/cellprops/README.md new/doc/latex/cellprops/README.md
--- old/doc/latex/cellprops/README.md 2018-07-19 23:11:25.000000000 +0200
+++ new/doc/latex/cellprops/README.md 2019-09-29 23:12:55.000000000 +0200
@@ -13,7 +13,7 @@
-Copyright (C) 2018 Julien "_FrnchFrgg_" RIVAUD
+Copyright (C) 2016-2019 Julien "_FrnchFrgg_" RIVAUD
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
Binary files old/doc/latex/cellprops/cellprops.pdf and new/doc/latex/cellprops/cellprops.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cellprops.doc.tlpobj new/tlpkg/tlpobj/cellprops.doc.tlpobj
--- old/tlpkg/tlpobj/cellprops.doc.tlpobj 2019-02-28 03:25:05.000000000 +0100
+++ new/tlpkg/tlpobj/cellprops.doc.tlpobj 2019-09-30 01:54:36.000000000 +0200
@@ -1,9 +1,9 @@
name cellprops.doc
category Package
-revision 48227
+revision 52205
shortdesc doc files of cellprops
relocated 1
-docfiles size=151
+docfiles size=147
RELOC/doc/latex/cellprops/LICENSE
RELOC/doc/latex/cellprops/README.md
RELOC/doc/latex/cellprops/cellprops.pdf
++++++ cellprops.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/cellprops/cellprops.sty new/tex/latex/cellprops/cellprops.sty
--- old/tex/latex/cellprops/cellprops.sty 2018-07-19 23:11:25.000000000 +0200
+++ new/tex/latex/cellprops/cellprops.sty 2019-09-29 23:12:55.000000000 +0200
@@ -6,22 +6,23 @@
%%
%% cellprops.dtx (with options: `package')
%%
-%% File: cellprops.dtx (C) Copyright 2018 RIVAUD Julien
+%% File: cellprops.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{cellprops}
\def\ExplFileDescription{CSS-like cell and table properties}
-\def\ExplFileDate{2018/07/16}
-\def\ExplFileVersion{1.4}
+\def\ExplFileDate{2019/09/29}
+\def\ExplFileVersion{1.6}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\RequirePackage{xparse}
\RequirePackage{xcolor}
+\RequirePackage{etoolbox}
\RequirePackage{mdwtab}
\cs_set_nopar:Npn \tab@pop #1 { \tl_set:Nx #1 { \tl_tail:N #1 } }
\cs_new:Nn \__cellprops_generic_setter:nnn {
@@ -60,7 +61,7 @@
\seq_map_inline:Nn \l_tmpa_seq {
\tl_if_empty:nF {##1} {
\exp_args:NNV \seq_set_split:Nnn \l_tmpb_seq \c_colon_str {##1}
- \int_compare:nNnTF {\seq_count:N \l_tmpb_seq} = \c_two {
+ \int_compare:nNnTF {\seq_count:N \l_tmpb_seq} = { 2 } {
\seq_get_left:NN \l_tmpb_seq \l_tmpa_tl
\exp_args:NNV \str_set:Nn \l_tmpa_str \l_tmpa_tl
\seq_get_right:NN \l_tmpb_seq \l_tmpa_tl
@@ -118,7 +119,7 @@
\str_if_eq:nnTF {#2} {inherit} {
\__cellprops_generic_setter:nnn \exp_not:n {#1} {\c__cellprops_inherit_color_tl}
}{
- \str_case_x:nnF { \str_range:nnn {#2} {1} {4} } {
+ \str_case_e:nnF { \str_range:nnn {#2} {1} {4} } {
{rgb(} {
\__cellprops_generic_setter:nnn \use:n {#1} {
\exp_not:n {\color[RGB]} {\str_range:nnn {#2} {5} {-2}}
@@ -463,7 +464,18 @@
\exp_args:Nx \tab@preamble
{ \exp_not:N\__cellprops_startrow: \the\tab@preamble \exp_not:N\__cellprops_endrow: }
}
+\cs_new_protected_nopar:Nn \__cellprops_update_color:Nn {
+ \__cellprops_get_property:nN {#2} \l_tmpa_tl
+ \exp_args:NV \tl_if_eq:NNF \l_tmpa_tl \c__cellprops_inherit_color_tl {
+ \tl_set_eq:NN #1 \l_tmpa_tl
+ }
+}
+\cs_new_protected_nopar:Nn \__cellprops_update_colors: {
+ \__cellprops_update_color:Nn \l__cellprops_color_tl {color}
+ \__cellprops_update_color:Nn \l__cellprops_bgcolor_tl {background-color}
+}
+\AtEndPreamble{%
\cs_set_eq:NN \__cellprops_orig_array:w \@array
\cs_set_protected_nopar:Npn \@array[#1]#2 {
\__cellprops_array_init:
@@ -484,17 +496,6 @@
\__cellprops_orig_LTarray:w [#1]{#2}
\__cellprops_array_startcontent:
}
-\cs_new_protected_nopar:Nn \__cellprops_update_color:Nn {
- \__cellprops_get_property:nN {#2} \l_tmpa_tl
- \exp_args:NV \tl_if_eq:NNF \l_tmpa_tl \c__cellprops_inherit_color_tl {
- \tl_set_eq:NN #1 \l_tmpa_tl
- }
-}
-
-\cs_new_protected_nopar:Nn \__cellprops_update_colors: {
- \__cellprops_update_color:Nn \l__cellprops_color_tl {color}
- \__cellprops_update_color:Nn \l__cellprops_bgcolor_tl {background-color}
-}
\cs_new_nopar:Nn \__cellprops_end_array:n {
\tl_if_empty:NF \g__cellprops_borders_tl { \\ }
@@ -520,7 +521,7 @@
\bool_if:NF \g__cellprops_inrow_bool {
\bool_gset_true:N \g__cellprops_inrow_bool
\int_gincr:N \g__cellprops_row_int
- \int_gset_eq:NN \g__cellprops_col_int \c_one
+ \int_gset_eq:NN \g__cellprops_col_int \c_one_int
\dim_gzero:N \g__cellprops_ht_dim
\dim_gzero:N \g__cellprops_dp_dim
}
@@ -562,6 +563,8 @@
}
}
+}
+
\cs_new_nopar:Nn \__cellprops_fix_valign_end:n {
\noalign{
\dim_set:Nn \l_tmpa_dim {#1}
@@ -569,7 +572,7 @@
\exp_args:NV \tl_if_eq:nnTF \tab@hlstate {b} {
\dim_gadd:Nn \tab@endheight { \g__cellprops_dp_dim + \l_tmpa_dim }
}{
- \int_compare:nNnT \g__cellprops_row_int = \c_one {
+ \int_compare:nNnT \g__cellprops_row_int = \c_one_int {
\dim_gadd:Nn \tab@endheight { \g__cellprops_ht_dim }
}
}
@@ -654,7 +657,7 @@
\__cellprops_begin_raw_cell:n {
#1
\hbox_set:Nw \l__cellprops_cell_box
- \str_case_x:nnF {\__cellprops_get_property:n {math-mode}} {
+ \str_case_e:nnF {\__cellprops_get_property:n {math-mode}} {
{ text } { \tab@btext }
{ math } { \tab@bmaths }
}{% any other treated as |auto|
@@ -664,7 +667,7 @@
}
\cs_new_protected_nopar:Nn \__cellprops_endcell: {
- \str_case_x:nnF {\__cellprops_get_property:n {math-mode}} {
+ \str_case_e:nnF {\__cellprops_get_property:n {math-mode}} {
{ text } { \tab@etext }
{ math } { \tab@emaths }
}{% any other treated as |auto|
@@ -715,7 +718,7 @@
#1
\hbox_set_end:
\__cellprops_end_raw_cell:
- \spewnotes\hfil
+ \spewnotes
}
\cs_new_protected_nopar:Nn \__cellprops_begin_raw_cell:n {
@@ -877,17 +880,7 @@
{\g__cellprops_dp_dim}
{\box_dp:N \l__cellprops_cell_box}
}
- % Handle hpadding and halign
- \skip_set:Nn \l_tmpa_skip {
- \dim_max:nn
- {0pt}
- { (\__cellprops_get_property:n {min-width})
- - \box_wd:N \l__cellprops_cell_box }
- }
- \skip_add:Nn \l_tmpa_skip {
- 0pt plus 1fil
- }
- % padding-left and border-left
+ % Handle padding-left and border-left
\__cellprops_get_border_info:n {left}
\skip_set:Nn \l__cellprops_left_skip
{\__cellprops_get_property:n {padding-left} + \l__cellprops_border_width_dim}
@@ -923,7 +916,17 @@
\exp_not:n { \kern \c_zero_dim }
}
}
- \str_case_x:nnF {\__cellprops_get_property:n {text-align}} {
+ % Handle hpadding and halign
+ \skip_set:Nn \l_tmpa_skip {
+ \dim_max:nn
+ {0pt}
+ { (\__cellprops_get_property:n {min-width})
+ - \box_wd:N \l__cellprops_cell_box }
+ }
+ \skip_add:Nn \l_tmpa_skip {
+ 1sp plus 1fil
+ }
+ \str_case_e:nnF {\__cellprops_get_property:n {text-align}} {
{ right } {
\skip_add:Nn \l__cellprops_left_skip { \l_tmpa_skip }
}
@@ -951,7 +954,7 @@
\group_end:
}
\skip_horizontal:N \l__cellprops_left_skip
- \box_use_clear:N \l__cellprops_cell_box
+ \box_use_drop:N \l__cellprops_cell_box
\skip_horizontal:N \l__cellprops_right_skip
\kern\c_zero_dim
\group_end:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/cellprops.tlpobj new/tlpkg/tlpobj/cellprops.tlpobj
--- old/tlpkg/tlpobj/cellprops.tlpobj 2019-02-28 03:25:05.000000000 +0100
+++ new/tlpkg/tlpobj/cellprops.tlpobj 2019-09-30 01:54:36.000000000 +0200
@@ -1,6 +1,6 @@
name cellprops
category Package
-revision 48227
+revision 52205
shortdesc Accept CSS-like selectors in tabular, array, ...
relocated 1
longdesc This package reworks the internals of tabular, array, and
@@ -12,7 +12,7 @@
catalogue-contact-bugs https://gitlab.com/frnchfrgg-latex/cellprops/issues
catalogue-contact-repository https://gitlab.com/frnchfrgg-latex/cellprops
catalogue-ctan /macros/latex/contrib/cellprops
-catalogue-date 2018-07-18 22:06:07 +0200
+catalogue-date 2019-09-29 19:44:48 +0200
catalogue-license gpl3+
catalogue-topics table
-catalogue-version 1.4
+catalogue-version 1.6
++++++ changelog.doc.tar.xz ++++++
++++ 1632 lines of diff (skipped)
++++++ changelog.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/changelog/changelog-doc.sty new/tex/latex/changelog/changelog-doc.sty
--- old/tex/latex/changelog/changelog-doc.sty 2018-12-29 23:50:33.000000000 +0100
+++ new/tex/latex/changelog/changelog-doc.sty 1970-01-01 01:00:00.000000000 +0100
@@ -1,89 +0,0 @@
-\usepackage{hypdoc}
-\PassOptionsToPackage{writefile}{listings}
-\usepackage[
- loadHyperref=false,
- createIndexEntries=false
-]{doctools}
-
-\PageIndex
-\EnableCrossrefs
-
-\usepackage{lstdoc}
-\usepackage{textcomp} % needed for listings
-\usepackage{xparse}
-\usepackage{xkeyval}
-\usepackage{changepage}
-\usepackage{mdframed}
-
-\usepackage[color]{changelog}
-
-\errorcontextlines 10
-
-\newcommand{\email}[1]{\href{mailto:#1}{\texttt{#1}}}
-\newcommand{\https}[1]{\href{https://#1}{\texttt{#1}}}
-\newcommand{\todo}[1]{\begin{itemize}\item[\textbf{To-do:}] #1 \end{itemize}}
-\newcommand{\note}[1]{\begin{itemize}\item[\textbf{Note:}] #1 \end{itemize}}
-\newcommand{\ctan}[1]{\href{https://ctan.org/pkg/#1}{\package{#1}}}
-\NewExpandableDocumentCommand{\Th}{O{l} m}
- {\multicolumn{1}{#1}{\textbf{#2}}}
-\newcommand{\ext}[1]{\texttt{.#1}}
-\newcommand{\filename}[1]{\texttt{#1}}
-\newcommand{\noterepo}[1]{\note{Browse the sources, contribute, or complain at \\
- \https{github.com/#1}}}
-
-\newcommand{\cl}{\ctan{changelog}}
-\newcommand{\keepachangelog}{\https{keepachangelog.com}}
-
-% definition copied from doc package \DescribeMacro
-\lstnewenvironment{latexfile}[1]
- {\lstset{style=lstDemoStyleLaTeXCode}%
- }
- {}
-
-\NewDocumentEnvironment{ctandescription}{}
- {\NewDocumentCommand{\pkg}{m}{\item[\ctan{##1}]}
- \begin{description}}
- {\end{description}}
-
-% a list of colors; use \color{colorname}
-\newenvironment{colorlist}
- {\begin{itemize}
- \let\old@item\item
- \renewcommand{\item}[1]{%
- \old@item[\fcolorbox{black}{##1}{\vphantom{X}\hspace{1em}}]
- \texttt{##1}
- }
- }
- {\end{itemize}}
-
-\newif\ifsidebyside@first
-\newcommand{\sidebyside@maybehfill}{%
- \ifsidebyside@first
- \hfill
- \sidebyside@firstfalse
- \fi
-}
-\newenvironment{sidebyside}{%
-
- \lstnewenvironment{code}[1][]{%
- \lstset{style=lstDemoStyleLaTeXCode,
- basicstyle=\ttfamily\small,
- frame=single,
- linewidth=0.45\linewidth,
- ##1}%
- }
- {%
- \sidebyside@maybehfill
- }%
- \newenvironment{example}{%
- \begin{mdframed}[userdefinedwidth=0.45\linewidth]
- }
- {%
- \end{mdframed}\sidebyside@maybehfill
- }%
- \sidebyside@firsttrue
- \medskip
- \noindent
- }
- {%
- }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/changelog/changelog.sty new/tex/latex/changelog/changelog.sty
--- old/tex/latex/changelog/changelog.sty 2018-12-29 23:50:33.000000000 +0100
+++ new/tex/latex/changelog/changelog.sty 2019-07-07 22:21:15.000000000 +0200
@@ -1,67 +1,93 @@
-\ProvidesPackage{changelog}[2018-12-28 1.0.0 Typesetting changelogs]
+\ProvidesPackage{changelog}[2019/07/06 2.1.0 Typesetting changelogs]
% Description: Provides the changelog environment for typesetting changelogs
-% License: GPL-3.0
+% License: LPPL 1.3c
% Homepage: https://github.com/9999years/latex-changelog
% https://ctan.org/pkg/changelog
% Maintainer: Rebecca Turner <637275(a)gmail.com>
-
-\newif\ifchangelog@color\changelog@colorfalse
-\DeclareOption{color}{\changelog@colortrue}
-\ProcessOptions
-
-\ifchangelog@color
- \RequirePackage{xcolor}
-
- \colorlet{ChangelogAdded} {green}
- \colorlet{ChangelogChanged} {blue}
- \colorlet{ChangelogDeprecated}{orange}
- \colorlet{ChangelogRemoved} {red}
- \colorlet{ChangelogFixed} {cyan}
- \colorlet{ChangelogSecurity} {magenta}
- \colorlet{ChangelogMiscellaneous}{.}
-
- \newcommand{\changelog@yanked@pre}{\color{ChangelogSecurity}}
- % parameter = item type (Added, Changed, etc.)
- \newcommand{\changelog@item@preitem}[1]{\color{Changelog#1}}
- \newcommand{\changelog@item@postitem}{\hspace{0pt}}
-\else
- \newcommand{\changelog@yanked@pre}{}
- \newcommand{\changelog@item@preitem}[1]{}
- \newcommand{\changelog@item@postitem}{}
-\fi
+%
+% 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 Rebecca Turner <637275(a)gmail.com>.
+%
+% This work consists of the files changelog.sty and changelog.tex.
+
+\RequirePackage{xparse}
+\RequirePackage{xkeyval}
+\RequirePackage{translations}
+
+% See https://github.com/olivierlacan/keep-a-changelog/issues/195
+% for a discussion about the term yanked
+
+% Fallback translations will be used if there is no translation for
+% the current document language
+\DeclareTranslationFallback{changelog-Added}{Added}
+\DeclareTranslationFallback{changelog-Changed}{Changed}
+\DeclareTranslationFallback{changelog-Deprecated}{Deprecated}
+\DeclareTranslationFallback{changelog-Removed}{Removed}
+\DeclareTranslationFallback{changelog-Fixed}{Fixed}
+\DeclareTranslationFallback{changelog-Security}{Security}
+\DeclareTranslationFallback{changelog-Miscellaneous}{Miscellaneous}
+\DeclareTranslationFallback{changelog-Unreleased}{Unreleased}
+\DeclareTranslationFallback{changelog-Yanked}{YANKED}
+% English translations
+\DeclareTranslation{English}{changelog-Added}{Added}
+\DeclareTranslation{English}{changelog-Changed}{Changed}
+\DeclareTranslation{English}{changelog-Deprecated}{Deprecated}
+\DeclareTranslation{English}{changelog-Removed}{Removed}
+\DeclareTranslation{English}{changelog-Fixed}{Fixed}
+\DeclareTranslation{English}{changelog-Security}{Security}
+\DeclareTranslation{English}{changelog-Miscellaneous}{Miscellaneous}
+\DeclareTranslation{English}{changelog-Unreleased}{Unreleased}
+\DeclareTranslation{English}{changelog-Yanked}{YANKED}
+% German translations
+% Alternative german translations as comment at the end of the line
+\DeclareTranslation{German}{changelog-Added}{Hinzugef\"{u}gt}% Neu
+\DeclareTranslation{German}{changelog-Changed}{Ge\"{a}ndert}
+\DeclareTranslation{German}{changelog-Deprecated}{Überholt}% Veraltet
+\DeclareTranslation{German}{changelog-Removed}{Entfernt}
+\DeclareTranslation{German}{changelog-Fixed}{Behoben}% Fehlerbehebung
+\DeclareTranslation{German}{changelog-Security}{Sicherheit}
+\DeclareTranslation{German}{changelog-Miscellaneous}{Verschiedenes}
+\DeclareTranslation{German}{changelog-Unreleased}{Unver\"{o}ffentlicht}
+\DeclareTranslation{German}{changelog-Yanked}{Zur{\"u}ckgezogen}
\newif\ifchangelog@versionfirst
-\newcommand{\changelog@item@pre}{%
+\newcommand{\changelog@item}[1]{%
+ \noindent
\ifchangelog@versionfirst
\changelog@versionfirstfalse
\else
\end{changelogitemize}
\fi
-}
-
-\newcommand{\changelog@item}[1]{%
- \noindent
- \changelog@item@pre
- {\changelog@item@preitem{#1}\textbf{#1}}\changelog@item@postitem
+ \textbf{#1}%
\begin{changelogitemize}%
}
-\newcommand{\changelogyanked}{{\changelog@yanked@pre\fbox{\textbf{YANKED}}}}
+\newcommand{\changelogyanked}{\fbox{\textbf{\GetTranslation{changelog-Yanked}}}}
\newcommand{\changelog@sectioncmds}{
- \newcommand{\added} {\changelog@item{Added}}
- \newcommand{\changed} {\changelog@item{Changed}}
- \newcommand{\deprecated}{\changelog@item{Deprecated}}
- \newcommand{\removed} {\changelog@item{Removed}}
- \newcommand{\fixed} {\changelog@item{Fixed}}
- \newcommand{\security} {\changelog@item{Security}}
- \newcommand{\misc} {\changelog@item{Miscellaneous}}
+ \newcommand{\added} {\changelog@item{\GetTranslation{changelog-Added}}}
+ \newcommand{\changed} {\changelog@item{\GetTranslation{changelog-Changed}}}
+ \newcommand{\deprecated}{\changelog@item{\GetTranslation{changelog-Deprecated}}}
+ \newcommand{\removed} {\changelog@item{\GetTranslation{changelog-Removed}}}
+ \newcommand{\fixed} {\changelog@item{\GetTranslation{changelog-Fixed}}}
+ \newcommand{\security} {\changelog@item{\GetTranslation{changelog-Security}}}
+ \newcommand{\misc} {\changelog@item{\GetTranslation{changelog-Miscellaneous}}}
}
\define@cmdkeys{version}{author, version, date, changes}
\define@key{version}{v}{\def\cmdKV@version@version{#1}}
\define@boolkey{version}{yanked}[true]{}
\define@boolkey{version}{simple}[true]{}
+\define@boolkey{version}{short}[true]{}
\define@cmdkeys{changelog}{sectioncmd, title, label}
\define@boolkey{changelog}{section}[true]{}
@@ -85,7 +111,7 @@
\newcommand{\changelog@shortversion@definedate}{%
\@ifundefined{cmdKV@version@version}{
\@ifundefined{cmdKV@version@date}{
- \newcommand{\cmdKV@version@version}{Unreleased}
+ \newcommand{\cmdKV@version@version}{\GetTranslation{changelog-Unreleased}}
\let\cmdKV@version@date\today
}{%
\let\cmdKV@version@version\cmdKV@version@date
@@ -118,33 +144,63 @@
\begin{changelogitemize}
\fi
}
-\newcommand{\changelog@version@post}{\end{changelogitemize}}
+\newcommand{\changelog@version@post}{%
+ \ifchangelog@versionfirst
+ \ifKV@version@simple
+ \else
+ \PackageError{changelog}{Something's wrong in version environment;
+ perhaps a missing \protect\added, \protect\changed,
+ \protect\deprecated, \protect\removed, \protect\fixed,
+ \protect\security, or \protect\misc}{A version environment needs to
+ introduce its \protect\item-ized lists with one of the provided
+ section commands; maybe you meant to use the [simple] option?}
+ \fi
+ \fi
+ \end{changelogitemize}%
+}
+\newif\ifchangelog@hadversion
\NewDocumentEnvironment{changelog}{o}
- {\IfValueT{#1}{\setkeys{changelog, version}{#1}}%
+ {\global\changelog@hadversionfalse
+ \IfValueT{#1}{\setkeys{changelog, version}{#1}}%
\changelog@section@maybe
%\today
% version environment; wraps a list
- \NewDocumentEnvironment{version}{ O{} }
+ \NewDocumentEnvironment{version}{ O{} }%
{\setkeys{version}{##1}%
\@shortversion
- \changelog@version@pre}
- {\changelog@version@post}%
+ \ifKV@version@short
+ \else
+ \changelog@version@pre
+ \fi}
+ {\ifKV@version@short
+ \else
+ \changelog@version@post
+ \fi}%
% doesn't set keys so this can share code with the version
% environment
- \NewDocumentCommand{\@shortversion}{}{{%
+ \NewDocumentCommand{\@shortversion}{}{%
\changelog@shortversion@definedate
- \item[\changelog@shortversion@item]
- \changelog@shortversion@authordate
- \@ifundefined{cmdKV@version@changes}{}{ --- \cmdKV@version@changes}
- }}
+ \global\changelog@hadversiontrue
+ \item[\changelog@shortversion@item]%
+ \changelog@shortversion@authordate
+ \ifKV@version@short
+ \ ---
+ \@ifundefined{cmdKV@version@changes}{}{\cmdKV@version@changes}%
+ \fi
+ }%
% short version; "like" a 1-bullet list
% extra braces keep command definitions local
- \NewDocumentCommand{\shortversion}{m}{{
- \setkeys{version}{##1}%
+ \NewDocumentCommand{\shortversion}{m}{{%
+ \setkeys{version}{##1, short}%
\@shortversion
- }}
+ }}%
\begin{changelogdescription}}
- {\end{changelogdescription}}
+ {\ifchangelog@hadversion
+ \else
+ \PackageError{changelog}{No versions in changelog environment body}{A
+ changelog environment must have at least one version or shortversion in
+ it.}%
+ \fi\end{changelogdescription}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/changelog.tlpobj new/tlpkg/tlpobj/changelog.tlpobj
--- old/tlpkg/tlpobj/changelog.tlpobj 2019-02-28 03:25:13.000000000 +0100
+++ new/tlpkg/tlpobj/changelog.tlpobj 2019-07-08 01:52:58.000000000 +0200
@@ -1,19 +1,18 @@
name changelog
category Package
-revision 49529
+revision 51574
shortdesc Provides a changelog environment
relocated 1
longdesc This package provides a changelog environment (which itself
longdesc provides a version environment) to represent a changelog. The
longdesc package supports multiple authors, unreleased changes, and
longdesc yanked (revoked) releases. Inspired by keepachangelog.com.
-runfiles size=3
- RELOC/tex/latex/changelog/changelog-doc.sty
+runfiles size=2
RELOC/tex/latex/changelog/changelog.sty
catalogue-contact-bugs https://github.com/9999years/latex-changelog/issues
catalogue-contact-repository https://github.com/9999years/latex-changelog
catalogue-ctan /macros/latex/contrib/changelog
-catalogue-date 2018-12-28 23:15:31 +0100
+catalogue-date 2019-07-07 05:51:34 +0200
catalogue-license gpl3
catalogue-topics version-control doc-mgmt
-catalogue-version 1.0.0
+catalogue-version 2.1.0
++++++ changes.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/changes/README new/doc/latex/changes/README
--- old/doc/latex/changes/README 2018-11-04 21:27:32.000000000 +0100
+++ new/doc/latex/changes/README 2019-07-22 23:13:59.000000000 +0200
@@ -10,10 +10,11 @@
Das Paket ermöglicht die freie Definition von Autoren und deren zugeordneten Farben.
Es erlaubt zusätzlich die Änderung des Änderungs-, Autor-, Hervorhebungs- und Kommentarmarkups.
+Autor/author: Ekkart Kleinod <ekleinod(a)edgesoft.de>
Internet: http://changes.sourceforge.net/
-This material is subject to the LaTeX Project Public License (LPPL).
+This material is subject to the LaTeX Project Public License (LPPL 1.3 or any later version).
For more details please refer to the user documentation changes.english.pdf
-Dieses Paket steht unter der LaTeX Project Public License (LPPL).
+Dieses Paket steht unter der LaTeX Project Public License (LPPL 1.3 oder jeder späteren Version).
Für Details lesen Sie bitte die Nutzerdokumentation changes.ngerman.pdf
Binary files old/doc/latex/changes/changes.english.pdf and new/doc/latex/changes/changes.english.pdf differ
Binary files old/doc/latex/changes/changes.english.withcode.pdf and new/doc/latex/changes/changes.english.withcode.pdf differ
Binary files old/doc/latex/changes/changes.ngerman.pdf and new/doc/latex/changes/changes.ngerman.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/changes/userdoc/changes.de.tex new/doc/latex/changes/userdoc/changes.de.tex
--- old/doc/latex/changes/userdoc/changes.de.tex 2019-01-27 23:48:18.000000000 +0100
+++ new/doc/latex/changes/userdoc/changes.de.tex 2019-10-28 21:56:32.000000000 +0100
@@ -167,22 +167,7 @@
Das Script entfernt alle Markierungen, indem die Änderungen angenommen oder abgelehnt werden.
Sie können die zu entfernenden Markierungen individuell im interaktiven Modus selektieren bzw.\ selektieren, indem Sie das Skript ohne Optionen starten.
-Das Skript benötigt \emph{python3}.
-
-Nutzen Sie das Skript wie folgt:
-
-\chinputlisting{, language=bash}{userdoc/script_pymergechanges}
-
-Starten Sie das Skript ohne Optionen und Dateien für eine kurze Hilfe:
-
-\chinputlisting{, language=bash}{userdoc/script_pymergechanges_empty}
-
-Bekannte Probleme:
-
-\begin{itemize}
- \item entfernt nur Markierungen, die in einer Zeile stehen, Markierungen, die mehrere Zeilen umfassen, werden ignoriert
- \item Probleme mit vernesteten Kommandos
-\end{itemize}
+Für Details lesen Sie bitte \autoref{sec:remove-markup}.
@@ -199,6 +184,9 @@
Dort finden Sie Links, wie Fehler oder Verbesserungen gemeldet werden können, wie Tips für andere Nutzerinnen angegeben werden können oder wie Sie bei der Entwicklung des Pakets mithelfen können.
+Eine Übersicht über alle mir bekannten Probleme und eventuell vorhandenen Lösungen finden Sie in \autoref{sec:known-problems}.
+Bitte sehen Sie dort zunächst nach, ob Ihr Problem schon bekannt ist und es eine Lösung gibt.
+
Sie können mir auch eine Mail schreiben an \href{mailto:ekleinod@edgesoft.de}{ekleinod@edgesoft.de}, in diesem Fall starten Sie bitte Ihr Mail-Subject mit \texttt{[changes]}.
Die Änderungsmarkierung von Text funktioniert recht gut, es können auch ganze Absätze markiert werden.
@@ -212,25 +200,10 @@
\item mehrere Absätze (manchmal)
\end{itemize}
-
Sie können versuchen, solchen Text in eine eigene Datei auszulagern, und diese mit \texttt{input} einzubinden.
Manchmal hilft das, oft ist es einen Versuch wert.
Danke an Charly Arenz für diesen Tip.
-Fußnoten oder Randnotizen werden in bestimmten Umgebungen, \zB Tabellen oder der \emph{tabbing}-Umgebung, nicht korrekt gesetzt.
-Vermeiden Sie das Markup, wenn Sie diese Umgebungen benutzen.
-
-Das Paket bietet Raum für Erweiterungen, die ich ich jedoch nicht selbst programmieren werde (weil mir Zeit und oft auch die Fähigkeit fehlt).
-Ich liste hier einige Möglichkeiten auf, die aktuelle Liste finden Sie im Issue-Tracker auf \emph{gitlab}:
-
-\begin{itemize}
- \item Auswahl der anzunehmenden/abzulehnenden Änderungen mit entsprechendem Löschen des Textes
- \item Markierung von mehreren Absätzen
- \item Markierung von Bildern und Tabellen
- \item automatische Markierung anhand von diff-Informationen (unter Berücksichtigung der Einschränkungen bzgl.\ Absätzen, Bildern, etc.)
- \item Übersetzung der sprachabhängigen Texte und der Nutzerdokumentation in andere Sprachen
-\end{itemize}
-
%^^A ---- user interface
@@ -331,6 +304,7 @@
\subsubsection{deletedmarkup}
+\label{sec:ui:options:deletedmarkup}
\chinline{usepackage_deletedmarkup_changes}
@@ -505,7 +479,6 @@
\localtableofcontents
\chnewcmd{added}
-\label{sec:ui:cmd:added}
\chinline{added}
@@ -874,6 +847,90 @@
\end{description}
+%^^A ---- Remove markup from file
+\cleardoublepage
+\section{Markierungen aus den Dateien entfernen}
+\label{sec:remove-markup}
+
+Die Entfernung der Markierungen aus dem Quelltext müssen Sie von Hand vornehmen, dafür steht auch ein Script von Yvon Cui zur Verfügung.
+Das Script liegt im Verzeichnis:
+
+\chinline[, language=bash]{path_script}
+
+Das Script entfernt alle Markierungen, indem die Änderungen angenommen oder abgelehnt werden.
+Sie können die zu entfernenden Markierungen individuell im interaktiven Modus selektieren bzw.\ selektieren, indem Sie das Skript ohne Optionen starten.
+
+Das Skript benötigt \emph{python3}.
+
+Nutzen Sie das Skript wie folgt:
+
+\chinputlisting{, language=bash}{userdoc/script_pymergechanges}
+
+Starten Sie das Skript ohne Optionen und Dateien für eine kurze Hilfe:
+
+\chinputlisting{, language=bash}{userdoc/script_pymergechanges_empty}
+
+Bekannte Probleme:
+
+\begin{itemize}
+ \item entfernt nur Markierungen, die in einer Zeile stehen, Markierungen, die mehrere Zeilen umfassen, werden ignoriert
+\end{itemize}
+
+
+
+%^^A ---- Known problems and solutions
+\cleardoublepage
+\section{Bekannte Probleme und Lösungen}
+\label{sec:known-problems}
+
+In diesem Kapitel sammle ich die häufigsten Probleme und mir dazu bekannte Lösungen.
+Wenn Ihr Problem hier nicht aufgeführt ist, sehen Sie bitte im Issue-Tracker auf gitlab nach, ob das Problem dort beschrieben ist (es gibt eine Suche):
+
+\url{https://gitlab.com/ekleinod/changes/issues}
+
+Wenn das alles zu nichts führt, öffnen Sie bitte ein neues Issue für das Problem, beschreiben Sie das Problem genau und liefern Sie, wenn möglich, eine kleine Beispieldatei mit dem problematischen Verhalten mit.
+
+\subsection{Besondere Inhalte}
+
+Die Änderungsmarkierung von Text funktioniert recht gut, es können auch ganze Absätze markiert werden.
+Die Markierung ist eingeschränkt oder nicht möglich für:
+
+\begin{itemize}
+ \item Abbildungen
+ \item Tabellen
+ \item Überschriften
+ \item manche Kommandos
+ \item mehrere Absätze (manchmal)
+\end{itemize}
+
+Sie können versuchen, solchen Text in eine eigene Datei auszulagern, und diese mit \texttt{input} einzubinden.
+Manchmal hilft das, oft ist es einen Versuch wert.
+Danke an Charly Arenz für diesen Tip.
+
+\subsection{Fußnoten und Randnotizen}
+
+Fußnoten oder Randnotizen werden in bestimmten Umgebungen, \zB Tabellen oder der \emph{tabbing}-Umgebung, nicht korrekt gesetzt.
+Vermeiden Sie das Markup, wenn Sie diese Umgebungen benutzen.
+
+\subsection{Das \chpackage{ulem}-Paket}
+
+Ich verwende standardmäßig das \chpackage{ulem}-Paket für das Durchstreichen von Text.
+Das führt bei manchen Befehlen und Umgebungen zu Problemen, \zB
+
+\begin{itemize}
+ \item im Mathemodus
+ \item bei Verwendung des \chpackage{siunitx}-Pakets
+ \item bei Nutzung der \chcommand{citet}- oder \chcommand{citep}-Befehle
+\end{itemize}
+
+In dem Fall gibt es wenig gute Möglichkeiten, am besten ist es, das Markup für Löschungen selbst zu definieren und das \chpackage{ulem}-Paket zu vermeiden.
+Siehe
+
+\begin{itemize}
+ \item \autoref{sec:ui:options:deletedmarkup}
+ \item \autoref{sec:ui:cmd:setdeletedmarkup}
+\end{itemize}
+
%^^A ---- Authors
\cleardoublepage
\section{Autorinnen und Autoren}
@@ -937,7 +994,7 @@
\>\texttt{source/latex/changes/README}\\
\>\texttt{source/latex/changes/userdoc/*.tex}\\
- \>\texttt{scripts/changes/delcmdchanges.bash}
+ \>\texttt{scripts/changes/pyMergeChanges.py}
\end{tabbing}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/changes/userdoc/changes.en.tex new/doc/latex/changes/userdoc/changes.en.tex
--- old/doc/latex/changes/userdoc/changes.en.tex 2019-01-27 23:48:18.000000000 +0100
+++ new/doc/latex/changes/userdoc/changes.en.tex 2019-10-28 21:56:32.000000000 +0100
@@ -161,30 +161,14 @@
\chinline{usepackage_final_changes}
In order to remove the markup from the \hologo{LaTeX} files, you have to remove the commands by hand or use the script by Yvon Cui.
-You find the script in the directory:
+You find the script \texttt{pyMergeChanges.py} in the directory:
\chinline[, language=bash]{path_script}
The script removes all markups either keeping or rejecting the change.
You can select or deselect markup from removal using the interactive mode by starting the script without options.
-The script requires \emph{python3}.
-
-Use the script as follows:
-
-\chinputlisting{, language=bash}{userdoc/script_pymergechanges}
-
-Run the script with no options and files for a short help text:
-
-\chinputlisting{, language=bash}{userdoc/script_pymergechanges_empty}
-
-Known issues:
-
-\begin{itemize}
- \item removes only markup that is used in one line, not markup that spans multiple lines
- \item problems with nested commands
-\end{itemize}
-
+For detailed information please refer to \autoref{sec:remove-markup}.
@@ -202,6 +186,9 @@
There you find information on how to report errors or improvements, give advice to other users, or participate in the development of the package.
+You can find a list of known problems and possible solutions in \autoref{sec:known-problems}.
+Please refer to the section first if your problem is known and is a solution exists.
+
You can write me an email too, please send it to \href{mailto:ekleinod@edgesoft.de}{ekleinod@edgesoft.de}.
In that case, please start your email subject with \texttt{[changes]}.
@@ -220,21 +207,6 @@
This works sometimes, give it a try.
Kudos to Charly Arenz for this tip.
-There is a problem of typesetting footnotes or margin notes in special environments, such as tables or tabbings.
-Avoid such markup when using these environments.
-
-There are several possibilities of enhancing the \chpackage{changes}-package.
-I will describe but a few here, I will not implement them due to lack of time and/or skill.
-You can have a look at the complete list of enhancements in the issue tracker of \emph{gitlab}.
-
-\begin{itemize}
- \item selecting of acknowledged and rejected texts; deletion of the corresponding markup
- \item markup of more than one paragraph
- \item markup of figures and tables
- \item automatic markup based on diff information (with regard to the limitations, such as markup of paragraphs, figures etc.)
- \item translation of language dependent texts and the user documentation in other languages
-\end{itemize}
-
%^^A ---- user interface
\cleardoublepage
@@ -336,6 +308,7 @@
\subsubsection{deletedmarkup}
+\label{sec:ui:options:deletedmarkup}
\chinline{usepackage_deletedmarkup_changes}
@@ -878,6 +851,92 @@
\end{description}
+%^^A ---- Remove markup from file
+\cleardoublepage
+\section{Remove markup from file}
+\label{sec:remove-markup}
+
+In order to remove the markup from the \hologo{LaTeX} files, you have to remove the commands by hand or use the script by Yvon Cui.
+You find the script in the directory:
+
+\chinline[, language=bash]{path_script}
+
+The script removes all markups either keeping or rejecting the change.
+You can select or deselect markup from removal using the interactive mode by starting the script without options.
+
+The script requires \emph{python3}.
+
+Use the script as follows:
+
+\chinputlisting{, language=bash}{userdoc/script_pymergechanges}
+
+Run the script with no options and files for a short help text:
+
+\chinputlisting{, language=bash}{userdoc/script_pymergechanges_empty}
+
+Known issues:
+
+\begin{itemize}
+ \item removes only markup that is used in one line, not markup that spans multiple lines
+\end{itemize}
+
+
+%^^A ---- Known problems and solutions
+\cleardoublepage
+\section{Known problems and solutions}
+\label{sec:known-problems}
+
+This section contains known problems and their solutions as far as I know some.
+If your problem is not listed here, please see the issue tracker on gitlab if it contains your problem (a search exists):
+
+\url{https://gitlab.com/ekleinod/changes/issues}
+
+If your problem is not listed, please open a new issue for your problem.
+Describe your problem as specific as possible, if possible, include a small example file with the problematic behavior.
+
+\subsection{Special content}
+
+Change markup of texts works well, it is possible to markup whole paragraphs.
+You cannot markup:
+
+\begin{itemize}
+ \item figures
+ \item tables
+ \item headings
+ \item some commands
+ \item several paragraphs (sometimes)
+\end{itemize}
+
+You can try putting such text in an extra file and include in with \texttt{input}.
+This works sometimes, give it a try.
+Kudos to Charly Arenz for this tip.
+
+\subsection{Footnotes and margin notes}
+
+There is a problem of typesetting footnotes or margin notes in special environments, such as tables or tabbings.
+Avoid such markup when using these environments.
+
+
+\subsection{The \chpackage{ulem} package}
+
+I am using the \chpackage{ulem} package for striking out text as default.
+This leads to problems with some commands or environments, e.g.
+
+\begin{itemize}
+ \item in math mode
+ \item when using the \chpackage{siunitx} package
+ \item when using the \chcommand{citet} or \chcommand{citep} command
+\end{itemize}
+
+In that case there are only a few good solutions, the best way is to avoid using the \chpackage{ulem} package by defining your own deletion markup.
+See
+
+\begin{itemize}
+ \item \autoref{sec:ui:options:deletedmarkup}
+ \item \autoref{sec:ui:cmd:setdeletedmarkup}
+\end{itemize}
+
+
%^^A -- Authors -------------------------------------------------------------
\cleardoublepage
\section{Authors}
@@ -941,7 +1000,7 @@
\>\texttt{source/latex/changes/README}\\
\>\texttt{source/latex/changes/userdoc/*.tex}\\
- \>\texttt{scripts/changes/delcmdchanges.bash}
+ \>\texttt{scripts/changes/pyMergeChanges.py}
\end{tabbing}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/changes.doc.tlpobj new/tlpkg/tlpobj/changes.doc.tlpobj
--- old/tlpkg/tlpobj/changes.doc.tlpobj 2019-02-28 03:25:13.000000000 +0100
+++ new/tlpkg/tlpobj/changes.doc.tlpobj 2019-11-18 01:54:57.000000000 +0100
@@ -1,9 +1,9 @@
name changes.doc
category Package
-revision 49837
+revision 52838
shortdesc doc files of changes
relocated 1
-docfiles size=389
+docfiles size=394
RELOC/doc/latex/changes/README
RELOC/doc/latex/changes/changes.english.pdf
RELOC/doc/latex/changes/changes.english.withcode.pdf
++++++ changes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scripts/changes/pyMergeChanges.py new/scripts/changes/pyMergeChanges.py
--- old/scripts/changes/pyMergeChanges.py 2018-12-17 22:34:06.000000000 +0100
+++ new/scripts/changes/pyMergeChanges.py 2019-10-28 21:56:32.000000000 +0100
@@ -30,6 +30,7 @@
If no option is given, runs interactively.
Created on Wed Dec 5 20:28:40 2018
+Revised on Tue Aug 27 17:51:58 2019
"""
@@ -131,11 +132,11 @@
print('Input File and Output File must be different.')
sys.exit(1)
-RE_ADDED = re.compile(r'\\added(\[[^\]]*\]){0,1}\{([^\}]*)\}')
-RE_DELETED = re.compile(r'\\deleted(\[[^\]]*\]){0,1}\{([^\}]*)\}')
-RE_REPLACED = re.compile(r'\\replaced(\[[^\]]*\]){0,1}\{([^\}]*)\}\{([^\}]*)\}')
-RE_HIGHLIGHT = re.compile(r'\\highlight(\[[^\]]*\]){0,1}\{([^\}]*)\}')
-RE_COMMENT = re.compile(r'\\comment(\[[^\]]*\]){0,1}\{([^\}]*)\}')
+RE_ADDED = re.compile(r'(\\added)(\[[^\]]*\])?\{(([^\}]?(\{[^\}]*\})?)*)\}')
+RE_DELETED = re.compile(r'(\\deleted)(\[[^\]]*\])?\{(([^\}]?(\{[^\}]*\})?)*)\}')
+RE_REPLACED = re.compile(r'(\\replaced)(\[[^\]]*\])?\{(([^\}]?(\{[^\}]*\})?)*)\}\{(([^\}]?(\{[^\}]*\})?)*)\}')
+RE_HIGHLIGHT = re.compile(r'(\\highlight)(\[[^\]]*\])?\{(([^\}]?(\{[^\}]*\})?)*)\}')
+RE_COMMENT = re.compile(r'(\\comment)(\[[^\]]*\])?\{(([^\}]?(\{[^\}]*\})?)*)\}')
codecs.open(OUTPUTFILE, mode='w', encoding='utf8').close()
with codecs.open(INPUTFILE, mode='r', encoding='utf8') as fin, \
@@ -164,9 +165,9 @@
answer = ask1()
if answer == 'a':
lineout = (lineout[:matchAdded.start(0)]
- + matchAdded.group(2) + lineout[matchAdded.end(0):])
+ + matchAdded.group(3) + lineout[matchAdded.end(0):])
lineout = trim_space(lineout, matchAdded.start(0)
- + len(matchAdded.group(2)))
+ + len(matchAdded.group(3)))
lineout = trim_space(lineout, matchAdded.start(0))
elif answer == 'r':
lineout = (lineout[:matchAdded.start(0)] + lineout[matchAdded.end(0):])
@@ -189,7 +190,7 @@
lineout = (lineout[:matchDeleted.start(0)] + lineout[matchDeleted.end(0):])
lineout = trim_space(lineout, matchDeleted.start(0))
elif answer == 'r':
- lineout = (lineout[:matchDeleted.start(0)] + matchDeleted.group(2)
+ lineout = (lineout[:matchDeleted.start(0)] + matchDeleted.group(3)
+ lineout[matchDeleted.end(0):])
elif answer == 'k':
lineout = lineout
@@ -207,15 +208,15 @@
answer = ask1()
if answer == 'a':
lineout = (lineout[:matchReplaced.start(0)]
- + matchReplaced.group(2) + lineout[matchReplaced.end(0):])
+ + matchReplaced.group(3) + lineout[matchReplaced.end(0):])
lineout = trim_space(lineout, matchReplaced.start(0)
- + len(matchReplaced.group(2)))
+ + len(matchReplaced.group(3)))
lineout = trim_space(lineout, matchReplaced.start(0))
elif answer == 'r':
lineout = (lineout[:matchReplaced.start(0)]
- + matchReplaced.group(3) + lineout[matchReplaced.end(0):])
+ + matchReplaced.group(6) + lineout[matchReplaced.end(0):])
lineout = trim_space(lineout, matchReplaced.start(0)
- + len(matchReplaced.group(3)))
+ + len(matchReplaced.group(6)))
lineout = trim_space(lineout, matchReplaced.start(0))
elif answer == 'k':
lineout = lineout
@@ -233,9 +234,9 @@
answer = ask2()
if answer == 'r':
lineout = (lineout[:matchHighlight.start(0)]
- + matchHighlight.group(2) + lineout[matchHighlight.end(0):])
+ + matchHighlight.group(3) + lineout[matchHighlight.end(0):])
lineout = trim_space(lineout, matchHighlight.start(0)
- + len(matchHighlight.group(2)))
+ + len(matchHighlight.group(3)))
lineout = trim_space(lineout, matchHighlight.start(0))
elif answer == 'k':
lineout = lineout
@@ -252,10 +253,7 @@
print('\n** comment commit ** \n' + matchComment.group())
answer = ask2()
if answer == 'r':
- lineout = (lineout[:matchComment.start(0)]
- + matchComment.group(2) + lineout[matchComment.end(0):])
- lineout = trim_space(lineout, matchComment.start(0)
- + len(matchComment.group(2)))
+ lineout = (lineout[:matchComment.start(0)] + lineout[matchComment.end(0):])
lineout = trim_space(lineout, matchComment.start(0))
elif answer == 'k':
lineout = lineout
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/changes/changes.sty new/tex/latex/changes/changes.sty
--- old/tex/latex/changes/changes.sty 2019-01-27 23:48:18.000000000 +0100
+++ new/tex/latex/changes/changes.sty 2019-11-17 23:32:18.000000000 +0100
@@ -41,8 +41,8 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{changes}
-[2019/01/26 v3.1.2 changes package]
-\typeout{*** changes package 2019/01/26 v3.1.2 ***}
+[2019/11/17 v3.2.1 changes package]
+\typeout{*** changes package 2019/11/17 v3.2.1 ***}
\RequirePackage{xkeyval}
\RequirePackage{xifthen}
\RequirePackage{xstring}
@@ -285,6 +285,10 @@
title=\@empty,
show=all,
}{}
+\ExecuteOptionsX{
+ulem={normalem,normalbf},
+truncate={breakall,fit}
+}
\ProcessOptionsX*\relax
\newtest{\isColored}{%
\not\equal{\Changes@optionmarkup}{nocolor}%
@@ -292,7 +296,6 @@
\ifthenelse{\isColored}
{
\RequirePackage{xcolor}
-\RequirePackage{pdfcolmk}
}
{}
\ifthenelse{
@@ -312,7 +315,7 @@
\equal{\Changes@optionhighlightmarkup}{uuline}\or
\equal{\Changes@optionhighlightmarkup}{uwave}
}
-{\RequirePackage[normalem,normalbf]{ulem}}
+{\RequirePackage{ulem}}
{}
\ifthenelse{
\equal{\Changes@optioncommentmarkup}{todo}
@@ -789,7 +792,7 @@
{\changescommentname}%
{#2}%
}
-\RequirePackage[breakall,fit]{truncate}
+\RequirePackage{truncate}
\renewcommand\TruncateMarker{ [\dots\negthinspace]\ }
\def\changes@chopline#1;#2;#3;#4;#5;#6;#7;#8 \\{%
\def\Changes@InID{#1}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/changes.tlpobj new/tlpkg/tlpobj/changes.tlpobj
--- old/tlpkg/tlpobj/changes.tlpobj 2019-02-28 03:25:14.000000000 +0100
+++ new/tlpkg/tlpobj/changes.tlpobj 2019-11-18 01:54:57.000000000 +0100
@@ -1,6 +1,6 @@
name changes
category Package
-revision 49837
+revision 52838
shortdesc Manual change markup
relocated 1
longdesc The package allows the user to manually markup changes of text,
@@ -19,7 +19,7 @@
catalogue-contact-repository https://gitlab.com/ekleinod/changes/
catalogue-contact-support https://gitlab.com/ekleinod/changes/issues
catalogue-ctan /macros/latex/contrib/changes
-catalogue-date 2019-01-27 11:54:46 +0100
+catalogue-date 2019-11-17 17:35:43 +0100
catalogue-license lppl1.3
catalogue-topics editorial doc-tool
-catalogue-version 3.1.2
+catalogue-version 3.2.1
1
0
Hello community,
here is the log from the commit of package texlive-specs-c for openSUSE:Factory checked in at 2020-05-29 21:16:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-c (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-c.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-c"
Fri May 29 21:16:56 2020 rev:40 rq:806883 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-c/texlive-specs-c.changes 2019-11-07 23:09:53.448091078 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-c.new.3606/texlive-specs-c.changes 2020-05-29 21:22:50.956046991 +0200
@@ -1,0 +2,60 @@
+Mon May 18 08:47:10 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Wed May 6 11:27:35 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Scan *.def files as well for RequirePackage
+
+-------------------------------------------------------------------
+Tue May 5 13:55:07 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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:
----
bezos.doc.tar.xz
bezos.tar.xz
bgreek.doc.tar.xz
bgreek.tar.xz
New:
----
beamerauxtheme.doc.tar.xz
beamerauxtheme.tar.xz
bearwear.doc.tar.xz
bearwear.tar.xz
biblatex-ajc2020unofficial.doc.tar.xz
biblatex-ajc2020unofficial.tar.xz
biblatex-apa6.doc.tar.xz
biblatex-apa6.tar.xz
biblatex-german-legal.doc.tar.xz
biblatex-german-legal.tar.xz
biblatex-jura2.doc.tar.xz
biblatex-jura2.tar.xz
biblatex2bibitem.doc.tar.xz
biblatex2bibitem.tar.xz
bigintcalc.doc.tar.xz
bigintcalc.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-c.spec ++++++
++++ 11995 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-c/texlive-specs-c.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-c.new.3606/texlive-specs-c.spec
++++++ beamer-rl.doc.tar.xz ++++++
Binary files old/doc/lualatex/beamer-rl/Example-of-use-ar.pdf and new/doc/lualatex/beamer-rl/Example-of-use-ar.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/beamer-rl/Example-of-use-ar.tex new/doc/lualatex/beamer-rl/Example-of-use-ar.tex
--- old/doc/lualatex/beamer-rl/Example-of-use-ar.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/lualatex/beamer-rl/Example-of-use-ar.tex 2019-10-04 22:49:11.000000000 +0200
@@ -0,0 +1,292 @@
+\documentclass[babel={layout=lists}]{beamer-rl}
+\usepackage{hologo} % pdflatex, xelatex, lualatex logos
+
+\babelprovide[import=ar-DZ, main]{arabic}
+\babelfont{sf}{Amiri}
+
+% Themes without Navigation Bars
+%\mode<presentation>{\usetheme{default}}
+%\mode<presentation>{\usetheme{boxes}}
+%\mode<presentation>{\usetheme{Bergen}}
+%\mode<presentation>{\usetheme{Boadilla}}
+%\mode<presentation>{\usetheme{Madrid}}
+%\mode<presentation>{\usetheme{AnnArbor}}
+\mode<presentation>{\usetheme{CambridgeUS}}
+%\mode<presentation>{\usetheme{EastLansing}}
+%\mode<presentation>{\usetheme{Pittsburgh}}
+%\mode<presentation>{\usetheme{Rochester}}
+
+% Themes with a Tree-Like Navigation Bar
+%\mode<presentation>{\usetheme{Antibes}}
+%\mode<presentation>{\usetheme{JuanLesPins}}
+%\mode<presentation>{\usetheme{Montpellier}}
+
+% Themes with a Table of Contents Sidebar
+%\mode<presentation>{\usetheme{Berkeley}}
+%\mode<presentation>{\usetheme{PaloAlto}}
+%\mode<presentation>{\usetheme{Goettingen}}
+%\mode<presentation>{\usetheme{Hannover}}
+
+% Themes with a Mini Frame Navigation
+%\mode<presentation>{\usetheme{Berlin}}
+%\mode<presentation>{\usetheme{Ilmenau}}
+%\mode<presentation>{\usetheme{Dresden}}
+%\mode<presentation>{\usetheme{Darmstadt}}
+%\mode<presentation>{\usetheme{Frankfurt}}
+%\mode<presentation>{\usetheme{Singapore}}
+%\mode<presentation>{\usetheme{Szeged}}
+
+% Themes with Section and Subsection Tables
+%\mode<presentation>{\usetheme{Copenhagen}}
+%\mode<presentation>{\usetheme{Luebeck}}
+%\mode<presentation>{\usetheme{Malmoe}}
+%\mode<presentation>{\usetheme{Warsaw}}
+
+\usecolortheme{spruce}
+
+\title{{\ttfamily beamer-rl} class}
+
+\author{Salim Bou}
+
+\institute[]{%
+{\color{blue} Repository: } https://github.com/seloumi/beamer-rl \par
+{\color{blue} Bug tracker: } https://github.com/seloumi/beamer-rl/issues
+}
+
+\date{\today}
+
+\setbeamercovered{transparent=10}
+\newtheorem*{thm}{.}
+
+\def\cs#1{\babelsublr{\texttt{\textbackslash#1}}}
+
+\begin{document}
+
+\parskip=6pt
+
+\begin{frame}
+\titlepage
+\end{frame}
+
+\begin{frame}
+\frametitle{\contentsname}
+\tableofcontents
+\end{frame}
+
+\section{}
+
+\begin{frame}[fragile]
+\frametitle{}
+ ( )
+ \hologo{pdfLaTeX} \hologo{XeLaTeX} ~.
+
+ \hologo{LuaTeX}
+
+\textit{Javier~Bezos}
+
+\verb|babel| (\verb|bidi| writing)
+
+ (class) beamer ( ) \verb|babel|
+\verb|bidi=basic-r|
+
+\hologo{LuaLaTeX}
+
+\end{frame}
+
+\section{ }
+
+\begin{frame}[fragile]
+\frametitle{ }
+
+\selectlanguage{nil}
+
+\begin{verbatim}
+\documentclass{beamer-rl}
+\babelprovide[import=ar-DZ, main]{arabic}
+\babelfont{sf}{Amiri}
+
+\mode<presentation>{\usetheme{Warsaw}}
+\begin{document}
+...
+\end{document}
+
+\end{verbatim}
+
+\end{frame}
+
+\section{}
+\subsection{}
+
+\begin{frame}[fragile]
+\frametitle{}
+
+{\selectlanguage{nil}
+\verb:\setbeamertemplate{blocks}[default]:
+}
+
+\setbeamertemplate{blocks}[default]
+
+
+\begin{block}{}
+ 21 1820
+
+ .
+\end{block}
+
+{\selectlanguage{nil}
+\verb:\setbeamertemplate{blocks}[rounded][shadow=true]:
+}
+
+\setbeamertemplate{blocks}[rounded][shadow=true]
+
+\begin{block}{}
+ 21 1820
+
+ .
+\end{block}
+
+\end{frame}
+
+\subsection{}
+
+\begin{frame}[fragile]
+\frametitle{enumerate, itemize}
+
+\begin{enumerate}
+\item
+\item
+\item
+\end{enumerate}
+
+\setbeamertemplate{itemize item}[triangle]
+
+{\selectlanguage{nil}
+\verb|\setbeamertemplate{itemize item}[triangle]|
+}
+
+\begin{itemize}
+\item
+\item
+\item
+\end{itemize}
+
+\selectlanguage{nil}
+
+
+\begin{itemize}
+\item first item
+\item second item
+\item third item
+\end{itemize}
+
+\end{frame}
+
+\subsection{}
+
+\begin{frame}
+\frametitle{}
+\begin{itemize}
+\item<1-> .
+\item<2-> .
+\item<3-> .
+\end{itemize}
+\hyperlink{jumptosecond}{\beamerreturnbutton{ }}
+\hypertarget<2>{jumptosecond}{}
+
+\end{frame}
+
+
+\subsection{}
+
+\begin{frame}
+\frametitle{}
+
+\framesubtitle{The proof uses \textit{reductio ad absurdum}.}
+\begin{thm}
+There is no largest prime number.
+\end{thm}
+\begin{proof}
+\begin{enumerate}[<+-| alert@+>]
+\item Suppose $p$ were the largest prime number.
+\item Let $q$ be the product of the first $p$ numbers.
+\item Then $q+1$ is not divisible by any of them.
+\item But $q + 1$ is greater than $1$, thus divisible by some prime
+number not in the first $p$ numbers.\qedhere
+\end{enumerate}
+\end{proof}
+
+\end{frame}
+
+\subsection{}
+
+\begin{frame}[fragile]
+\frametitle{}
+
+\framezoom<1><2>[border=2](2cm,2cm)(2cm,2cm)
+\pgfimage[height=5cm]{example-image}
+
+\selectlanguage{nil}
+
+\begin{verbatim}
+\framezoom<1><2>[border=2](2cm,2cm)(2cm,2cm)
+\pgfimage[height=5cm]{example-image}
+\end{verbatim}
+\end{frame}
+
+\section{ }
+
+\begin{frame}[fragile]
+\frametitle{ }
+
+\begin{itemize}
+\item
+ \verb:beamer: \verb:beamer-rl:
+
+
+ \verb:babel:
+ \verb:beamer-rl: :
+
+\medskip
+
+{\selectlanguage{nil}
+\verb:\documentclass[babel={<babel options>}]{beamer-rl}:
+}
+
+\medskip
+
+\item
+
+ \verb:beamer-rl: \cs{blacktriangleright} \cs{blacktriangleleft}
+
+\bigskip
+
+{\selectlanguage{nil}
+\centering
+\begin{tabular}{c|cc}
+\hline
+ & \verb:\blacktriangleright: & \verb:\blacktriangleleft: \\
+\hline
+LTR context & \blacktriangleright & \blacktriangleleft \\
+\hline
+RTL context & {\selectlanguage{arabic}\blacktriangleright} & {\selectlanguage{arabic}\blacktriangleleft} \\
+\hline
+\end{tabular}
+\par
+}
+
+\bigskip
+
+
+\item
+
+ \cs{babelsublr} \verb:bebel:
+ ()
+
+ \verb:pspicture: .
+\end{itemize}
+
+
+\end{frame}
+
+\end{document}
+\ No newline at end of file
Binary files old/doc/lualatex/beamer-rl/Example-of-use-en.pdf and new/doc/lualatex/beamer-rl/Example-of-use-en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/beamer-rl/Example-of-use-en.tex new/doc/lualatex/beamer-rl/Example-of-use-en.tex
--- old/doc/lualatex/beamer-rl/Example-of-use-en.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/lualatex/beamer-rl/Example-of-use-en.tex 2019-10-04 22:49:11.000000000 +0200
@@ -0,0 +1,283 @@
+\documentclass[babel={layout=lists}]{beamer-rl}
+\usepackage{hologo} % pdflatex, xelatex, lualatex logos
+
+\babelprovide[import=ar-DZ, main]{arabic}
+\babelprovide[import,language=Default]{english}
+\babelfont{sf}{Amiri}
+
+% Themes without Navigation Bars
+%\mode<presentation>{\usetheme{default}}
+%\mode<presentation>{\usetheme{boxes}}
+%\mode<presentation>{\usetheme{Bergen}}
+%\mode<presentation>{\usetheme{Boadilla}}
+\mode<presentation>{\usetheme{Madrid}}
+%\mode<presentation>{\usetheme{AnnArbor}}
+%\mode<presentation>{\usetheme{CambridgeUS}}
+%\mode<presentation>{\usetheme{EastLansing}}
+%\mode<presentation>{\usetheme{Pittsburgh}}
+%\mode<presentation>{\usetheme{Rochester}}
+
+% Themes with a Tree-Like Navigation Bar
+%\mode<presentation>{\usetheme{Antibes}}
+%\mode<presentation>{\usetheme{JuanLesPins}}
+%\mode<presentation>{\usetheme{Montpellier}}
+
+% Themes with a Table of Contents Sidebar
+%\mode<presentation>{\usetheme{Berkeley}}
+%\mode<presentation>{\usetheme{PaloAlto}}
+%\mode<presentation>{\usetheme{Goettingen}}
+%\mode<presentation>{\usetheme{Hannover}}
+
+% Themes with a Mini Frame Navigation
+%\mode<presentation>{\usetheme{Berlin}}
+%\mode<presentation>{\usetheme{Ilmenau}}
+%\mode<presentation>{\usetheme{Dresden}}
+%\mode<presentation>{\usetheme{Darmstadt}}
+%\mode<presentation>{\usetheme{Frankfurt}}
+%\mode<presentation>{\usetheme{Singapore}}
+%\mode<presentation>{\usetheme{Szeged}}
+
+% Themes with Section and Subsection Tables
+%\mode<presentation>{\usetheme{Copenhagen}}
+%\mode<presentation>{\usetheme{Luebeck}}
+%\mode<presentation>{\usetheme{Malmoe}}
+%\mode<presentation>{\usetheme{Warsaw}}
+%\usetheme{Cuerna}\usecolortheme{default}
+
+\title{The beamer-rl class}
+
+\author{Salim Bou}
+
+\institute[]{%
+{\color{blue} Repository: } https://github.com/seloumi/beamer-rl \par
+{\color{blue} Bug tracker: } https://github.com/seloumi/beamer-rl/issues
+}
+
+
+\date{{\selectlanguage{english} \today}}
+
+\setbeamercovered{transparent=10}
+\newtheorem*{prf}{Proof}
+
+
+\begin{document}
+
+\parskip=6pt
+
+\begin{frame}
+\titlepage
+\end{frame}
+
+\begin{frame}
+\frametitle{\selectlanguage{english}\contentsname}
+\tableofcontents
+\end{frame}
+
+
+\section{Introduction}
+
+\begin{frame}[fragile]
+\frametitle{Introduction}
+Creating beamer presentation for right to left language (like arabic) using \hologo{pdfLaTeX} or \hologo{XeLaTeX} still poses many problems due to bugs not currently resolved especially for colors and hyperlinks
+
+The \hologo{LuaTeX} team set solutions for these issues thanks to them and to \textit{Javier~Bezos} for his works on the package \verb|babel| and \verb|bidi| writing
+
+This class provides patchs of some beamer templates and commands
+for right to left presentation, this package call babel with \verb|bidi=basic-r| option and require lualatex engine
+
+\end{frame}
+
+\section{How to use beamer-rl}
+
+\begin{frame}[fragile]
+\frametitle{How to use beamer-rl}
+
+\selectlanguage{nil}
+
+\begin{verbatim}
+\documentclass{beamer-rl}
+\babelprovide[import=ar-DZ, main]{arabic}
+\babelfont{sf}{Amiri}
+
+\mode<presentation>{\usetheme{Warsaw}}
+\begin{document}
+...
+\end{document}
+
+\end{verbatim}
+
+\end{frame}
+
+\section{Examples}
+\subsection{Blocks}
+
+\begin{frame}[fragile]
+\frametitle{Blocks}
+
+{\selectlanguage{nil}
+\verb:\setbeamertemplate{blocks}[default]:
+}
+
+\setbeamertemplate{blocks}[default]
+
+
+\begin{block}{Lorem}
+ \selectlanguage{nil}
+ On 21 April 1820, during a lecture, rsted
+ noticed a compass needle deflected from magnetic north when an
+ electric current from a battery was switched on and off.
+\end{block}
+
+{\selectlanguage{nil}
+\verb:\setbeamertemplate{blocks}[rounded][shadow=true]:
+}
+
+\setbeamertemplate{blocks}[rounded][shadow=true]
+
+\begin{block}{Lorem}
+ \selectlanguage{nil}
+ On 21 April 1820, during a lecture, rsted
+ noticed a compass needle deflected from magnetic north when an
+ electric current from a battery was switched on and off.
+\end{block}
+
+\end{frame}
+
+\subsection{Lists}
+
+\begin{frame}[fragile]
+\frametitle{enumerate, itemize}
+
+\begin{enumerate}
+\item first item
+\item second item
+\item third item
+\end{enumerate}
+
+\setbeamertemplate{itemize item}[triangle]
+
+{\selectlanguage{nil}
+\verb|\setbeamertemplate{itemize item}[triangle]|
+}
+
+
+\begin{itemize}
+\item first item
+\item second item
+\item third item
+\end{itemize}
+
+\selectlanguage{nil}
+
+\begin{itemize}
+\item first item
+\item second item
+\item third item
+\end{itemize}
+
+
+\end{frame}
+
+\subsection{Hyperlinks}
+
+\begin{frame}
+\frametitle{Hyperlinks}
+\begin{itemize}
+\item<1-> First item.
+\item<2-> Second item.
+\item<3-> Third item.
+\end{itemize}
+\hyperlink{jumptosecond}{\beamergotobutton{return to second slide}}
+\hypertarget<2>{jumptosecond}{}
+\end{frame}
+
+
+\subsection{Theorems}
+
+\begin{frame}
+\frametitle{Theorems}
+
+\framesubtitle{The proof uses \textit{reductio ad absurdum}.}
+\begin{theorem}
+There is no largest prime number.
+\end{theorem}
+\begin{prf}
+\begin{enumerate}[<+-| alert@+>]
+\item Suppose $p$ were the largest prime number.
+\item Let $q$ be the product of the first $p$ numbers.
+\item Then $q+1$ is not divisible by any of them.
+\item But $q + 1$ is greater than $1$, thus divisible by some prime
+number not in the first $p$ numbers.\qedhere
+\end{enumerate}
+\end{prf}
+
+\end{frame}
+
+\subsection{Zooming}
+
+\begin{frame}[fragile]
+\frametitle{Zooming}
+
+\framezoom<1><2>[border=2](2cm,2cm)(2cm,2cm)
+\pgfimage[height=5cm]{example-image}
+
+\selectlanguage{nil}
+
+\begin{verbatim}
+\framezoom<1><2>[border=2](2cm,2cm)(2cm,2cm)
+\pgfimage[height=5cm]{example-image}
+\end{verbatim}
+\end{frame}
+
+\section{Some notes}
+
+\begin{frame}[fragile]
+\frametitle{Some notes}
+
+\begin{itemize}
+
+\item
+
+All options provided by \verb:beamer: can be added with \verb:beamer-rl:
+
+Additional options can also be passed to package
+ \verb:babel:
+ with \verb:beamer-rl: like this
+
+\medskip
+
+{\selectlanguage{nil}
+\verb:\documentclass[babel={<babel options>}]{beamer-rl}:
+}
+
+\medskip
+
+\item
+The \verb:beamer-rl: class swap the definition of \verb:\blacktriangleright: with \verb:\blacktriangleleft: in RTL context
+
+\bigskip
+
+{\selectlanguage{nil}
+\centering
+\begin{tabular}{c|cc}
+\hline
+ & \verb:\blacktriangleright: & \verb:\blacktriangleleft: \\
+\hline
+LTR context & \blacktriangleright & \blacktriangleleft \\
+\hline
+RTL context & {\selectlanguage{arabic}\blacktriangleright} & {\selectlanguage{arabic}\blacktriangleleft} \\
+\hline
+\end{tabular}
+\par
+}
+
+\bigskip
+
+\item
+In some cases you need to use \verb:\babelsublr: command from \verb:bebel:
+package to insert a left to right text within your right to left text, e.g if you need to insert a \verb:pspicture: drawing in RTL context
+\end{itemize}
+
+\end{frame}
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/beamer-rl/README.txt new/doc/lualatex/beamer-rl/README.txt
--- old/doc/lualatex/beamer-rl/README.txt 2019-03-29 22:11:44.000000000 +0100
+++ new/doc/lualatex/beamer-rl/README.txt 2019-10-04 22:49:11.000000000 +0200
@@ -1,7 +1,7 @@
-The beamer-rl package
-v1.1
+The beamer-rl class
+v1.3
-This package provides patchs of some beamer templates and commands
+This class provides patchs of some beamer templates and commands
for right to left presentation, this package require babel with lualatex engine
If you want to report any bugs or typos and corrections in the
documentation then
@@ -9,7 +9,7 @@
<https://github.com/seloumi/beamer-rl/issues>
-Current version release date: 2019/03/28
+Current version release date: 2019/10/04
___________________
Salim Bou
@@ -20,4 +20,4 @@
this license is at: http://www.latex-project.org/lppl.txt
This work is author-maintained (as per LPPL maintenance status)
-by Salim Bou.
+by Salim Bou.
\ No newline at end of file
Binary files old/doc/lualatex/beamer-rl/test-beamer-rl.pdf and new/doc/lualatex/beamer-rl/test-beamer-rl.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/beamer-rl/test-beamer-rl.tex new/doc/lualatex/beamer-rl/test-beamer-rl.tex
--- old/doc/lualatex/beamer-rl/test-beamer-rl.tex 2019-03-29 22:11:44.000000000 +0100
+++ new/doc/lualatex/beamer-rl/test-beamer-rl.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,234 +0,0 @@
-\documentclass[hyperref=unicode]{beamer}
-\usepackage{hologo} % pdflatex, xelatex, lualatex logos
-
-\usepackage[nil,bidi=basic-r,layout=counters]{babel}
-\babelprovide[import=ar-DZ, main]{arabic}
-\babelprovide[import,language=Default]{english}
-\babelfont{sf}{Amiri}
-
-
-\usepackage{beamer-rl}
-
-% Themes without Navigation Bars
-%\mode<presentation>{\usetheme{default}}
-%\mode<presentation>{\usetheme{boxes}}
-%\mode<presentation>{\usetheme{Bergen}}
-%\mode<presentation>{\usetheme{Boadilla}}
-\mode<presentation>{\usetheme{Madrid}}
-%\mode<presentation>{\usetheme{AnnArbor}}
-%\mode<presentation>{\usetheme{CambridgeUS}}
-%\mode<presentation>{\usetheme{EastLansing}}
-%\mode<presentation>{\usetheme{Pittsburgh}}
-%\mode<presentation>{\usetheme{Rochester}}
-
-% Themes with a Tree-Like Navigation Bar
-%\mode<presentation>{\usetheme{Antibes}}
-%\mode<presentation>{\usetheme{JuanLesPins}}
-%\mode<presentation>{\usetheme{Montpellier}}
-
-% Themes with a Table of Contents Sidebar
-%\mode<presentation>{\usetheme{Berkeley}}
-%\mode<presentation>{\usetheme{PaloAlto}}
-%\mode<presentation>{\usetheme{Goettingen}}
-%\mode<presentation>{\usetheme{Hannover}}
-
-% Themes with a Mini Frame Navigation
-%\mode<presentation>{\usetheme{Berlin}}
-%\mode<presentation>{\usetheme{Ilmenau}}
-%\mode<presentation>{\usetheme{Dresden}}
-%\mode<presentation>{\usetheme{Darmstadt}}
-%\mode<presentation>{\usetheme{Frankfurt}}
-%\mode<presentation>{\usetheme{Singapore}}
-%\mode<presentation>{\usetheme{Szeged}}
-
-% Themes with Section and Subsection Tables
-%\mode<presentation>{\usetheme{Copenhagen}}
-%\mode<presentation>{\usetheme{Luebeck}}
-%\mode<presentation>{\usetheme{Malmoe}}
-%\mode<presentation>{\usetheme{Warsaw}}
-
-
-\usepackage{tikz}
-
-\title{The beamer-rl package}
-
-\author{Salim Bou}
-
-\institute[]{%
-{\color{blue} Repository: } https://github.com/seloumi/beamer-rl \par
-{\color{blue} Bug tracker: } https://github.com/seloumi/beamer-rl/issues
-}
-
-
-\date{{\selectlanguage{english} \today}}
-
-\setbeamercovered{transparent=10}
-\newtheorem*{thm}{.}
-
-
-\begin{document}
-
-\begin{frame}
-\titlepage
-\end{frame}
-
-\begin{frame}
-\frametitle{\selectlanguage{english}\contentsname}
-\tableofcontents
-\end{frame}
-
-\section{Introduction}
-
-\begin{frame}[fragile]
-\frametitle{Introduction}
-Creating beamer presentation for right to left language (like arabic) using \hologo{pdfLaTeX} or \hologo{XeLaTeX} still poses many problems due to bugs not currently resolved especially for colors and hyperlinks
-
-The \hologo{LuaTeX} team set solutions for these issues thanks to them and to \textit{Javier Bezos} for his works on the package \verb|babel| and \verb|bidi| writing
-
-
-\end{frame}
-
-\section{How to use beamer-rl}
-
-\begin{frame}[fragile]
-\frametitle{How to use beamer-rl}
-
-\selectlanguage{nil}
-
-\begin{verbatim}
-\documentclass{beamer}
-\usepackage[nil,bidi=basic-r,layout=counters]{babel}
-\babelprovide[import=ar-DZ, main]{arabic}
-\babelfont{sf}{Amiri}
-\usepackage{beamer-rl}
-
-\mode<presentation>{\usetheme{Warsaw}}
-\begin{document}
-...
-\end{document}
-
-\end{verbatim}
-
-\end{frame}
-
-\section{Examples}
-\subsection{Blocks}
-
-\begin{frame}[fragile]
-\frametitle{Blocks}
-
-{\selectlanguage{nil}
-\verb:\setbeamertemplate{blocks}[default]:
-}
-
-\setbeamertemplate{blocks}[default]
-
-
-\begin{block}{Lorem}
- \selectlanguage{nil}
- On 21 April 1820, during a lecture, rsted
- noticed a compass needle deflected from magnetic north when an
- electric current from a battery was switched on and off.
-\end{block}
-
-{\selectlanguage{nil}
-\verb:\setbeamertemplate{blocks}[rounded][shadow=true]:
-}
-
-\setbeamertemplate{blocks}[rounded][shadow=true]
-
-\begin{block}{}
- 21 1820
-
- .
-\end{block}
-
-\end{frame}
-
-\subsection{enumerate, itemize}
-
-\begin{frame}
-\frametitle{enumerate, itemize}
-
-\begin{enumerate}
-\item
-\item
-\item
-\end{enumerate}
-
-
-\begin{itemize}
-\item
-\item
-\item
-\end{itemize}
-\end{frame}
-
-\subsection{hyperlinks}
-
-\begin{frame}
-\frametitle{hyperlinks}
-\begin{itemize}
-\item<1-> First item.
-\item<2-> Second item.
-\item<3-> Third item.
-\end{itemize}
-\hyperlink{jumptosecond}{\beamergotobutton{ }}
-\hypertarget<2>{jumptosecond}{}
-\end{frame}
-
-
-\subsection{Theorems}
-
-\begin{frame}
-\frametitle{Theorems}
-
-\framesubtitle{The proof uses \textit{reductio ad absurdum}.}
-\begin{thm}
-There is no largest prime number.
-\end{thm}
-\begin{proof}
-\begin{enumerate}[<+-| alert@+>]
-\item Suppose $p$ were the largest prime number.
-\item Let $q$ be the product of the first $p$ numbers.
-\item Then $q+1$ is not divisible by any of them.
-\item But $q + 1$ is greater than $1$, thus divisible by some prime
-number not in the first $p$ numbers.\qedhere
-\end{enumerate}
-\end{proof}
-
-\end{frame}
-
-\subsection{zooming}
-
-\begin{frame}[fragile]
-\frametitle{zooming}
-
-\framezoom<1><2>[border=2](2cm,2cm)(2cm,2cm)
-\pgfimage[height=5cm]{example-image}
-
-\selectlanguage{nil}
-
-\begin{verbatim}
-\framezoom<1><2>[border=2](2cm,2cm)(2cm,2cm)
-\pgfimage[height=5cm]{example-image}
-\end{verbatim}
-\end{frame}
-
-\section{Some notes}
-
-\begin{frame}[fragile]
-\frametitle{Some notes}
-
-\begin{itemize}
-\item
-The \verb:beamer-rl: package modify the definition of \verb:\blacktriangleright: so it have the same meaning as\verb:\blacktriangleleft:, if you need to use the original command you can use \verb:\blackTriangleright:
-\item
-In some cases you need to use \verb:\babelsublr: command from \verb:bebel:
-package to insert a left to right text within your right to left text.
-\end{itemize}
-
-\end{frame}
-
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamer-rl.doc.tlpobj new/tlpkg/tlpobj/beamer-rl.doc.tlpobj
--- old/tlpkg/tlpobj/beamer-rl.doc.tlpobj 2019-03-30 02:23:59.000000000 +0100
+++ new/tlpkg/tlpobj/beamer-rl.doc.tlpobj 2019-10-05 01:54:33.000000000 +0200
@@ -1,9 +1,11 @@
name beamer-rl.doc
category Package
-revision 50643
+revision 52284
shortdesc doc files of beamer-rl
relocated 1
-docfiles size=29
+docfiles size=63
+ RELOC/doc/lualatex/beamer-rl/Example-of-use-ar.pdf
+ RELOC/doc/lualatex/beamer-rl/Example-of-use-ar.tex
+ RELOC/doc/lualatex/beamer-rl/Example-of-use-en.pdf
+ RELOC/doc/lualatex/beamer-rl/Example-of-use-en.tex
RELOC/doc/lualatex/beamer-rl/README.txt
- RELOC/doc/lualatex/beamer-rl/test-beamer-rl.pdf
- RELOC/doc/lualatex/beamer-rl/test-beamer-rl.tex
++++++ beamer-rl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/beamer-rl/beamer-rl.cls new/tex/lualatex/beamer-rl/beamer-rl.cls
--- old/tex/lualatex/beamer-rl/beamer-rl.cls 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/lualatex/beamer-rl/beamer-rl.cls 2019-10-04 22:49:11.000000000 +0200
@@ -0,0 +1,493 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{beamer-rl}
+[2019/10/04 v1.3 LaTeX class to patch beamer for right to left presentation with babel]
+
+\RequirePackage{kvoptions}
+\RequirePackage{kvsetkeys}
+
+\SetupKeyvalOptions{
+ family=beamer-rl,
+ prefix=beamer-rl@,
+ setkeys=\kvsetkeys,
+}
+
+% babel options:
+\define@key{beamer-rl}{babel}{%
+ \PassOptionsToPackage{#1}{babel}%
+}
+
+\DeclareDefaultOption{%
+ \PassOptionsToClass{\CurrentOption}{beamer}%
+}
+
+\ProcessKeyvalOptions*\relax
+
+\RequirePackage{ifluatex}
+
+\ifluatex
+\else
+\ClassError{beamer-rl}{beamer-rl require luatex}
+\fi
+
+\LoadClass[hyperref={unicode}]{beamer}
+
+\RequirePackage[nil,bidi=basic-r]{babel}
+
+\def\reset@temp#1#2{\expandafter\let\csname beamer@@tmpop@#1@#2\endcsname\relax}
+\def\@@defbeamertemplate#1#2{\reset@temp{#1}{#2}\defbeamertemplate{#1}{#2}}
+\def\@defbeamertemplate#1#2{\reset@temp{#1}{#2}\defbeamertemplate*{#1}{#2}}
+
+\def\redefbeamertemplate{%
+ \@ifstar{\@defbeamertemplate}{\@@defbeamertemplate}%
+}
+
+\let\old@blacktriangleright\blacktriangleright
+\let\old@blacktriangleleft\blacktriangleleft
+
+\def\blacktriangleright{%
+ \ifcase\bbl@thepardir \old@blacktriangleright\else\old@blacktriangleleft\fi}
+\def\blacktriangleleft{%
+ \ifcase\bbl@thepardir \old@blacktriangleleft\else\old@blacktriangleright\fi}
+
+
+\let\oldpgfpicture\pgfpicture
+\let\oldendpgfpicture\endpgfpicture
+
+\def\pgfpicture{\babelsublr\bgroup\oldpgfpicture}
+\def\endpgfpicture{\oldendpgfpicture\egroup}
+
+\let\oldpgfuseshading\pgfuseshading
+\def\pgfuseshading#1{\babelsublr{\oldpgfuseshading{#1}}}
+
+
+%% beamerbasebox
+
+\newdimen\bmb@dimc
+
+\renewcommand\beamerboxesrounded[2][]{%
+ \global\let\beamer@firstlineitemizeunskip=\relax%
+ \vbox\bgroup%
+ \setkeys{beamerboxes}{upper=block title,lower=block body,width=\textwidth,shadow=false}%
+ \setkeys{beamerboxes}{#1}%
+ {%
+ \usebeamercolor{\bmb@lower}%
+ \globalcolorstrue%
+ \colorlet{lower.bg}{bg}%
+ }%
+ {%
+ \usebeamercolor{\bmb@upper}%
+ \globalcolorstrue%
+ \colorlet{upper.bg}{bg}%
+ }%
+ %
+ % Typeset head
+ %
+ \vskip4bp
+ \setbox\bmb@box=\hbox{%
+ \begin{minipage}[b]{\bmb@width}%
+ \usebeamercolor[fg]{\bmb@upper}%
+ #2%
+ \end{minipage}}%
+ \ifdim\wd\bmb@box=0pt%
+ \setbox\bmb@box=\hbox{}%
+ \ht\bmb(a)box=1.5pt%
+ \bmb(a)prevheight=-4.5pt%
+ \else%
+ \wd\bmb@box=\bmb@width%
+ \bmb@temp=\dp\bmb@box%
+ \ifdim\bmb@temp<1.5pt%
+ \bmb(a)temp=1.5pt%
+ \fi%
+ \setbox\bmb@box=\hbox{\raise\bmb@temp\hbox{\box\bmb@box}}%
+ \dp\bmb@box=0pt%
+ \bmb@prevheight=\ht\bmb@box%
+ \fi%
+ \bmb@temp=\bmb@width%
+ \bmb@dima=\bmb@temp\advance\bmb@dima by2.2bp%
+ \bmb@dimb=\bmb@temp\advance\bmb@dimb by4bp%
+ \bmb@dimc=0pt%
+ \ifdim\wd\bmb@box=0pt
+ \bmb@dimc=\bmb@width%
+ \fi
+ \hbox{%
+ \textdir TLT\begin{pgfpicture}{0bp}{+-\ht\bmb@box}{\bmb@dimc}{+-\ht\bmb@box}
+ \ifdim\wd\bmb@box=0pt%
+ \color{lower.bg}%
+ \else%
+ \color{upper.bg}%
+ \fi%
+ \pgfpathqmoveto{-4bp}{-1bp}
+ \pgfpathqcurveto{-4bp}{1.2bp}{-2.2bp}{3bp}{0bp}{3bp}
+ \pgfpathlineto{\pgfpoint{\bmb@temp}{3bp}}
+ \pgfpathcurveto%
+ {\pgfpoint{\bmb@dima}{3bp}}%
+ {\pgfpoint{\bmb(a)dimb}{1.2bp}}%
+ {\pgfpoint{\bmb@dimb}{-1bp}}%
+ \bmb@dima=-\ht\bmb@box%
+ \advance\bmb@dima by-2pt%
+ \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
+ \pgfpathlineto{\pgfpoint{-4bp}{\bmb@dima}}
+ \pgfusepath{fill}
+ \end{pgfpicture}%
+ \copy\bmb@box%
+ }%
+ \nointerlineskip%
+ \vskip-1pt%
+ \ifdim\wd\bmb@box=0pt%
+ \else%
+ \hbox{%
+ \begin{pgfpicture}{0pt}{0pt}{\bmb@width}{6pt}
+ \bmb@dima=\bmb@width%
+ \advance\bmb@dima by8bp%
+ \pgfpathrectangle{\pgfpoint{-4bp}{-1bp}}{\pgfpoint{\bmb@dima}{8bp}}
+ \pgfusepath{clip}
+ {\pgftransformshift{\pgfpoint{-4bp}{0bp}}\pgftext[left,base]{\pgfuseshading{bmb@transition}}}%
+ \end{pgfpicture}%
+ }%
+ \nointerlineskip%
+ \vskip-0.5pt%
+ \fi%
+ \ifbmb@shadow%
+ \setbox\bmb@boxshadow=\hbox{\pgfuseshading{bmb@shadow}}%
+ \setbox\bmb@boxshadowball=\hbox{\pgfuseshading{bmb@shadowball}}%
+ \setbox\bmb@boxshadowballlarge=\hbox{\pgfuseshading{bmb@shadowballlarge}}%
+ \fi%
+ \setbox\bmb(a)colorbox=\hbox{{\pgfpicturetrue\pgfsetcolor{lower.bg}}}%
+ \setbox\bmb@box=\hbox\bgroup\begin{minipage}[b]{\bmb@width}%
+ \vskip2pt%
+ \usebeamercolor[fg]{\bmb@lower}%
+ \colorlet{beamerstructure}{upper.bg}%
+ \colorlet{structure}{upper.bg}%
+ %\color{.}%
+ }
+
+ \def\endbeamerboxesrounded{%
+ \end{minipage}\egroup%
+ \wd\bmb@box=\bmb@width%
+ \bmb@temp=\dp\bmb@box%
+ \advance\bmb@temp by.5pt%
+ \setbox\bmb@box=\hbox{\raise\bmb@temp\hbox{\box\bmb@box}}%
+ \dp\bmb@box=0pt%
+ \bmb@temp=\wd\bmb@box%
+ \bmb@dima=\bmb@temp\advance\bmb@dima by2.2bp%
+ \bmb@dimb=\bmb@temp\advance\bmb@dimb by4bp%
+ \hbox{%
+ \textdir TLT\begin{pgfpicture}{0bp}{0bp}{0bp}{0bp}
+ \ifbmb@shadow%
+ {\pgftransformshift{\pgfpoint{4bp}{-3bp}}\pgftext{\copy\bmb@boxshadowball}}
+ \begin{pgfscope}
+ {%
+ \advance\bmb@temp by-1bp%
+ \pgfpathrectangle{\pgfpoint{\bmb@temp}{-7bp}}{\pgfpoint{9bp}{9bp}}%
+ \pgfusepath{clip}
+ }%
+ {\pgftransformshift{\pgfpoint{\bmb@temp}{1bp}}\pgftext{\box\bmb@boxshadowballlarge}}
+ \end{pgfscope}
+ \begin{pgfscope}
+ \advance\bmb@temp by-4bp%
+ \pgfpathrectangle{\pgfpoint{4bp}{-7bp}}{\pgfpoint{\bmb@temp}{5bp}}
+ \pgfusepath{clip}
+ {\pgftransformshift{\pgfpoint{4bp}{-7bp}}\pgftext[left,base]{\copy\bmb@boxshadow}}%
+ \end{pgfscope}
+ \begin{pgfscope}
+ \advance\bmb@temp by 4bp%
+ \bmb@dima=\ht\bmb@box%
+ \advance\bmb@dima by\bmb@prevheight%
+ \advance\bmb@dima by 4bp%
+ \pgfpathrectangle{\pgfpoint{\bmb@temp}{1bp}}{\pgfpoint{4bp}{\bmb@dima}}
+ \pgfusepath{clip}
+ \advance\bmb@dima by-4bp%
+ {\pgftransformshift{\pgfpoint{\bmb@temp}{\bmb@dima}}\pgftext{\box\bmb@boxshadowball}}
+ \advance\bmb@dima by-1bp%
+ \pgfpathrectangle{\pgfpoint{\bmb@temp}{1bp}}{\pgfpoint{4bp}{\bmb@dima}}
+ \pgfusepath{clip}
+ \advance\bmb@temp by4bp%
+ {\pgftransformshift{\pgfpoint{\bmb@temp}{-3bp}}%
+ \pgftransformrotate{90}%
+ \pgftext[left,base]{\box\bmb@boxshadow}}%
+ \end{pgfscope}
+ \fi%
+ \unhbox\bmb@colorbox%
+ \pgfpathqmoveto{-4bp}{1bp}
+ \pgfpathqcurveto{-4bp}{-1.2bp}{-2.2bp}{-3bp}{0bp}{-3bp}
+ \pgfpathlineto{\pgfpoint{\the\bmb@temp}{-3bp}}
+ \pgfpathcurveto%
+ {\pgfpoint{\the\bmb@dima}{-3bp}}%
+ {\pgfpoint{\the\bmb(a)dimb}{-1.2bp}}%
+ {\pgfpoint{\the\bmb@dimb}{1bp}}%
+ {
+ \bmb@dima=\ht\bmb@box%
+ \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
+ \pgfpathlineto{\pgfpoint{-4bp}{\bmb@dima}}
+ \pgfusepath{fill}
+ }
+ \ifbmb@shadow%
+ {
+ \color{black!50!bg}
+ \pgfsetlinewidth{0pt}
+ \pgfpathmoveto{\pgfpoint{\bmb(a)dimb}{-.5bp}}
+ \bmb@dima=\ht\bmb@box%
+ \advance\bmb@dima by\bmb@prevheight%
+ \advance\bmb@dima by 1bp%
+ \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
+ \pgfusepath{stroke}
+ \bmb@temp=\bmb@dima
+ \advance\bmb@dima by 1bp%
+ \color{black!31!bg}
+ \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}}
+ \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
+ \pgfusepath{stroke}
+ \advance\bmb@dima by 1bp%
+ \advance\bmb@temp by 1bp%
+ \color{black!19!bg}
+ \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}}
+ \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
+ \pgfusepath{stroke}
+ \advance\bmb@dima by 1bp%
+ \advance\bmb@temp by 1bp%
+ \color{black!6!bg}
+ \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}}
+ \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
+ \pgfusepath{stroke}
+ \advance\bmb@dima by 1.5bp%
+ \advance\bmb@temp by 1bp%
+ \color{bg}
+ \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}}
+ \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
+ \pgfusepath{stroke}
+ }
+ \fi
+ \end{pgfpicture}%
+ \box\bmb@box%
+ }%
+ \ifbmb@shadow%
+ \vskip4bp minus 2bp%
+ \else%
+ \vskip2bp%
+ \fi%
+ \egroup% of \vbox\bgroup
+}
+
+
+%% beamerbaseauxtemplates
+
+
+% (sub-)section in toc: subsections numbered
+
+\redefbeamertemplate{subsection in toc}{subsections numbered}
+{\leavevmode\leftskip=2em\rlap{\hskip-2em \inserttocsectionnumber\hbox{.}\inserttocsubsectionnumber}\inserttocsubsection\par}
+
+
+%% beamerinnerthemedefault
+
+\redefbeamertemplate*{button}{default}
+{%
+ \setbox\beamer@tempbox=\hbox{{\insertbuttontext}}%
+ \ht\beamer@tempbox=6pt%
+ \dp\beamer@tempbox=0pt%
+ \setbox\beamer@tempbox=\vbox{\box\beamer@tempbox\vskip2pt}%
+ \beamer@tempdim=\wd\beamer@tempbox%
+ \beamer@dima=\beamer@tempdim\advance\beamer@dima by2.2pt
+ \beamer@dimb=\beamer@tempdim\advance\beamer@dimb by4pt
+ \textdir TLT\begin{pgfpicture}{-4pt}{0pt}{\the\beamer@tempdim}{8pt}
+ \color{bg}
+ \pgfsetlinewidth{0.8pt}
+ \pgfpathqmoveto{0pt}{0pt}
+ \pgfpathqcurveto{-2.2pt}{0pt}{-4pt}{1.8pt}{-4pt}{4pt}
+ \pgfpathqcurveto{-4pt}{6.2pt}{-2.2pt}{8pt}{0pt}{8pt}
+ \pgfpathlineto{\pgfpoint{\the\beamer@tempdim}{8pt}}
+ \pgfpathcurveto%
+ {\pgfpoint{\the\beamer@dima}{8pt}}%
+ {\pgfpoint{\the\beamer(a)dimb}{6.2pt}}%
+ {\pgfpoint{\the\beamer@dimb}{4pt}}
+ \pgfpathcurveto%
+ {\pgfpoint{\the\beamer(a)dimb}{1.8pt}}%
+ {\pgfpoint{\the\beamer@dima}{0pt}}%
+ {\pgfpoint{\the\beamer@tempdim}{0pt}}
+ \pgfpathclose
+ \pgfusepathqfill
+ \colorlet{bg}{parent.bg}
+ \usebeamercolor[fg]{button border}
+ \pgfpathqmoveto{0pt}{0pt}
+ \pgfpathqcurveto{-2.2pt}{0pt}{-4pt}{1.8pt}{-4pt}{4pt}
+ \pgfpathqcurveto{-4pt}{6.2pt}{-2.2pt}{8pt}{0pt}{8pt}
+ \pgfpathlineto{\pgfpoint{\the\beamer@tempdim}{8pt}}
+ \pgfpathcurveto%
+ {\pgfpoint{\the\beamer@dima}{8pt}}%
+ {\pgfpoint{\the\beamer(a)dimb}{6.2pt}}%
+ {\pgfpoint{\the\beamer@dimb}{4pt}}
+ \pgfpathcurveto%
+ {\pgfpoint{\the\beamer(a)dimb}{1.8pt}}%
+ {\pgfpoint{\the\beamer@dima}{0pt}}%
+ {\pgfpoint{\the\beamer@tempdim}{0pt}}
+ \pgfpathclose
+ \pgfusepathqstroke
+ \end{pgfpicture}%
+ \hskip-\beamer@tempdim%
+ \box\beamer@tempbox%
+ \kern4pt%
+}
+
+%% beamerbasenavigation
+
+% User Buttons
+
+\pgfdefobject{beamergotosymbol}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{5pt}{5pt}}
+{
+ \pgfpathqmoveto{1.5bp}{0.5bp}
+ \pgfpathqlineto{3.5bp}{2bp}
+ \pgfpathqlineto{1.5bp}{3.5bp}
+ \pgfusepathqfill
+}
+
+\def\insertgotosymbol{%
+ \begin{pgfpicture}{1pt}{0pt}{6pt}{5pt}
+ \pgfuseobject{\ifcase\bbl@thepardir beamergotosymbol\else beamerreturnsymbol\fi}%
+\end{pgfpicture}}
+
+\pgfdefobject{beamerreturnsymbol}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{5pt}{5pt}}
+{
+ \pgfpathqmoveto{3.5bp}{0.5bp}
+ \pgfpathqlineto{1.5bp}{2bp}
+ \pgfpathqlineto{3.5bp}{3.5bp}
+ \pgfusepathqfill
+}
+
+\def\insertreturnsymbol{%
+ \begin{pgfpicture}{1pt}{0pt}{6pt}{5pt}
+ \pgfuseobject{\ifcase\bbl@thepardir beamerreturnsymbol\else beamergotosymbol\fi}%
+\end{pgfpicture}}
+
+
+\pgfdefobject{beamerskipsymbolrl}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{7pt}{5pt}}
+{
+ \pgfpathqmoveto{3.5bp}{0.5bp}
+ \pgfpathqlineto{1.5bp}{2bp}
+ \pgfpathqlineto{3.5bp}{3.5bp}
+ \pgfpathqmoveto{5.5bp}{0.5bp}
+ \pgfpathqlineto{3.5bp}{2bp}
+ \pgfpathqlineto{5.5bp}{3.5bp}
+ \pgfusepathqfill
+}
+
+\pgfdefobject{beamerskipsymbol}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{7pt}{5pt}}
+{
+ \pgfpathqmoveto{1.5bp}{0.5bp}
+ \pgfpathqlineto{3.5bp}{2bp}
+ \pgfpathqlineto{1.5bp}{3.5bp}
+ \pgfpathqmoveto{3.5bp}{0.5bp}
+ \pgfpathqlineto{5.5bp}{2bp}
+ \pgfpathqlineto{3.5bp}{3.5bp}
+ \pgfusepathqfill
+}
+
+\def\insertskipsymbol{%
+ \begin{pgfpicture}{-1pt}{0pt}{6pt}{5pt}
+ \pgfuseobject{\ifcase\bbl@thepardir beamerskipsymbol\else beamerskipsymbolrl\fi}%
+\end{pgfpicture}}
+
+\def\beamergotobutton#1{\beamerbutton{\insertgotosymbol\ #1}}
+\def\beamerreturnbutton#1{\beamerbutton{\insertreturnsymbol\ #1}}
+\def\beamerskipbutton#1{\beamerbutton{\insertskipsymbol\ #1}}
+
+%% beamerbaseframesize
+
+%
+% Zoom stuff
+%
+
+\def\beamer@framezoom<#1><#2>[#3](#4,#5)(#6,#7){%
+ \par\nointerlineskip%
+ \global\beamer@slidehaszoomtrue%
+ \advance\beamer@zoomcount by1\relax%
+ \def\beamer@zoomborderwidth{0}%
+ \edef\beamer@labelzoomed{beamer@labelzoomed@\the\beamer@zoomframecount @\the\beamer@zoomcount}%
+ \setkeys{beamerzoom}{#3}%
+ \only<#1>{%
+ {\hypersetup{pdfhighlight={/P},pdfborder={0 0 \beamer@zoomborderwidth}}%
+ \global\setbox\@tempboxa=\vbox{\hyperlink{\beamer@labelzoomed}{\vbox to #7{\hbox
+ to#6{\hfil}\vfil}}}}%
+ \ht\@tempboxa=0pt%
+ \wd\@tempboxa=0pt%
+ \dp\@tempboxa=0pt%
+ \setbox\@tempboxa=\vbox{\moveright#4\hbox{\lower#5\vbox{\box\@tempboxa}}}%
+ \ht\@tempboxa=0pt%
+ \wd\@tempboxa=0pt%
+ \dp\@tempboxa=0pt%
+ \global\setbox\beamer@zoombox=\vbox to0pt{\unvbox\beamer@zoombox\box\@tempboxa}%
+ }%
+ \only<#2>{%
+ \pardir TLT%
+ \@ifundefined{\beamer@labelzoomed}%
+ {%
+ \hypertarget{\beamer@labelzoomed}{}%
+ \expandafter\gdef\csname\beamer@labelzoomed\endcsname{}%
+ }{}%
+ \gdef\beamer@zoomer{%
+ % compute zoom factor
+ \@tempdima=\beamer@frametextheight%
+ \@tempdimb=#7\relax%
+ \@tempcnta=\@tempdimb%
+ \divide\@tempcnta by4096\relax%
+ \multiply\@tempdima by16\relax%
+ \divide\@tempdima by\@tempcnta%
+ \@tempdimb=\paperwidth%
+ \ifbeamer@plainframe%
+ \else%
+ \advance\@tempdimb by-\beamer@leftsidebar%
+ \advance\@tempdimb by-\beamer@rightsidebar\relax%
+ \fi%
+ \@tempdimc=#6\relax%
+ \@tempcntb=\@tempdimc%
+ \divide\@tempcntb by4096\relax%
+ \multiply\@tempdimb by16\relax%
+ \divide\@tempdimb by\@tempcntb%
+ \ifdim\@tempdimb<\@tempdima%
+ \@tempdima=\@tempdimb%
+ \fi%
+ \edef\beamer@temp{\strip@pt\@tempdima}%
+ \@tempdimc=\beamer@frametextheight%
+ \advance\@tempdimc by4pt%
+ \@tempdimb=\paperwidth%
+ \ifbeamer@plainframe%
+ \else%
+ \advance\@tempdimb by-\beamer@leftsidebar%
+ \advance\@tempdimb by-\beamer@rightsidebar\relax%
+ \fi%
+ \setbox\@tempboxa=\vbox{\hsize=\@tempdimb\Acrobatmenu{GoBack}{\vbox to
+ \beamer@frametextheight{\hbox to\@tempdimb{\hfil}\vfil}}}%
+ \ht\@tempboxa=0pt%
+ \wd\@tempboxa=0pt%
+ \dp\@tempboxa=0pt%
+ \setbox\beamer@framebox=\vbox to\beamer@frametextheight{{%
+ \ifbeamer@plainframe\beamer@leftmargin=\Gm@lmargin\fi%
+ \pardir TLT%
+ \begin{pgfpicture}{\beamer@leftmargin}{-\beamer@frametextheight}{\beamer@leftmargin}{0pt}
+ \pgftext[left,top]{\box\@tempboxa}
+ \pgfpathrectangle{\pgfpoint{0pt}{-\@tempdimc}}{\pgfpoint{\@tempdimb}{\@tempdimc}}%
+ \pgfusepath{clip}
+ \begingroup
+ \pgftransformscale{\beamer@temp}
+ \@tempdima=#4\relax%
+ \@tempdimb=#5\relax%
+ {\pgftransformshift{\pgfpoint{-\@tempdima}{\@tempdimb}}%
+ \pgftext[left,top]{\vbox{\vbox{}\nointerlineskip\unvbox\beamer@framebox}}}
+ \endgroup
+ \end{pgfpicture}%
+ }}%
+
+ \setbox\beamer@framebox=\vbox{%
+ \nobreak\vbox{}\nobreak\par\nobreak\beamer@entrycode\nobreak%
+ \nointerlineskip\unvbox\beamer@frametitlebox%
+ \nobreak%
+ \box\beamer@framebox %
+ \nobreak%
+ \vss%
+ \beamer@exitcode%
+ }%
+ \global\setbox\beamer@footins=\box\voidb@x% no footnotes in zoomed slides
+ }%
+ }%
+}
+
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/beamer-rl/beamer-rl.sty new/tex/lualatex/beamer-rl/beamer-rl.sty
--- old/tex/lualatex/beamer-rl/beamer-rl.sty 2019-03-29 22:11:44.000000000 +0100
+++ new/tex/lualatex/beamer-rl/beamer-rl.sty 1970-01-01 01:00:00.000000000 +0100
@@ -1,447 +0,0 @@
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamer-rl}
-[2019/03/28 v1.1 LaTeX package to patch beamer for right to left presentation]
-
-\def\reset@temp#1#2{\expandafter\let\csname beamer@@tmpop@#1@#2\endcsname\relax}
-\def\@@defbeamertemplate#1#2{\reset@temp{#1}{#2}\defbeamertemplate{#1}{#2}}
-\def\@defbeamertemplate#1#2{\reset@temp{#1}{#2}\defbeamertemplate*{#1}{#2}}
-
-\def\redefbeamertemplate{%
- \@ifstar{\@defbeamertemplate}{\@@defbeamertemplate}%
-}
-
-\let\blackTriangleright\blacktriangleright
-\let\blacktriangleright\blacktriangleleft
-
-\let\oldpgfpicture\pgfpicture
-\let\oldendpgfpicture\endpgfpicture
-
-\def\pgfpicture{\babelsublr\bgroup\oldpgfpicture}
-\def\endpgfpicture{\oldendpgfpicture\egroup}
-
-\let\oldpgfuseshading\pgfuseshading
-\def\pgfuseshading#1{\babelsublr{\oldpgfuseshading{#1}}}
-
-%% beamerbasebox
-
-\newdimen\bmb@dimc
-
-\renewcommand\beamerboxesrounded[2][]{%
- \global\let\beamer@firstlineitemizeunskip=\relax%
- \vbox\bgroup%
- \setkeys{beamerboxes}{upper=block title,lower=block body,width=\textwidth,shadow=false}%
- \setkeys{beamerboxes}{#1}%
- {%
- \usebeamercolor{\bmb@lower}%
- \globalcolorstrue%
- \colorlet{lower.bg}{bg}%
- }%
- {%
- \usebeamercolor{\bmb@upper}%
- \globalcolorstrue%
- \colorlet{upper.bg}{bg}%
- }%
- %
- % Typeset head
- %
- \vskip4bp
- \setbox\bmb@box=\hbox{%
- \begin{minipage}[b]{\bmb@width}%
- \usebeamercolor[fg]{\bmb@upper}%
- #2%
- \end{minipage}}%
- \ifdim\wd\bmb@box=0pt%
- \setbox\bmb@box=\hbox{}%
- \ht\bmb(a)box=1.5pt%
- \bmb(a)prevheight=-4.5pt%
- \else%
- \wd\bmb@box=\bmb@width%
- \bmb@temp=\dp\bmb@box%
- \ifdim\bmb@temp<1.5pt%
- \bmb(a)temp=1.5pt%
- \fi%
- \setbox\bmb@box=\hbox{\raise\bmb@temp\hbox{\box\bmb@box}}%
- \dp\bmb@box=0pt%
- \bmb@prevheight=\ht\bmb@box%
- \fi%
- \bmb@temp=\bmb@width%
- \bmb@dima=\bmb@temp\advance\bmb@dima by2.2bp%
- \bmb@dimb=\bmb@temp\advance\bmb@dimb by4bp%
- \ifdim\wd\bmb@box=0pt
- \bmb@dimc=\bmb@width%
- \else
- \bmb@dimc=0pt%
- \fi
- \hbox{%
- \textdir TLT\begin{pgfpicture}{0bp}{+-\ht\bmb@box}{\bmb@dimc}{+-\ht\bmb@box}
- \ifdim\wd\bmb@box=0pt%
- \color{lower.bg}%
- \else%
- \color{upper.bg}%
- \fi%
- \pgfpathqmoveto{-4bp}{-1bp}
- \pgfpathqcurveto{-4bp}{1.2bp}{-2.2bp}{3bp}{0bp}{3bp}
- \pgfpathlineto{\pgfpoint{\bmb@temp}{3bp}}
- \pgfpathcurveto%
- {\pgfpoint{\bmb@dima}{3bp}}%
- {\pgfpoint{\bmb(a)dimb}{1.2bp}}%
- {\pgfpoint{\bmb@dimb}{-1bp}}%
- \bmb@dima=-\ht\bmb@box%
- \advance\bmb@dima by-2pt%
- \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
- \pgfpathlineto{\pgfpoint{-4bp}{\bmb@dima}}
- \pgfusepath{fill}
- \end{pgfpicture}%
- \copy\bmb@box%
- }%
- \nointerlineskip%
- \vskip-1pt%
- \ifdim\wd\bmb@box=0pt%
- \else%
- \hbox{%
- \begin{pgfpicture}{0pt}{0pt}{\bmb@width}{6pt}
- \bmb@dima=\bmb@width%
- \advance\bmb@dima by8bp%
- \pgfpathrectangle{\pgfpoint{-4bp}{-1bp}}{\pgfpoint{\bmb@dima}{8bp}}
- \pgfusepath{clip}
- {\pgftransformshift{\pgfpoint{-4bp}{0bp}}\pgftext[left,base]{\pgfuseshading{bmb@transition}}}%
- \end{pgfpicture}%
- }%
- \nointerlineskip%
- \vskip-0.5pt%
- \fi%
- \ifbmb@shadow%
- \setbox\bmb@boxshadow=\hbox{\pgfuseshading{bmb@shadow}}%
- \setbox\bmb@boxshadowball=\hbox{\pgfuseshading{bmb@shadowball}}%
- \setbox\bmb@boxshadowballlarge=\hbox{\pgfuseshading{bmb@shadowballlarge}}%
- \fi%
- \setbox\bmb(a)colorbox=\hbox{{\pgfpicturetrue\pgfsetcolor{lower.bg}}}%
- \setbox\bmb@box=\hbox\bgroup\begin{minipage}[b]{\bmb@width}%
- \vskip2pt%
- \usebeamercolor[fg]{\bmb@lower}%
- \colorlet{beamerstructure}{upper.bg}%
- \colorlet{structure}{upper.bg}%
- %\color{.}%
- }
-
- \def\endbeamerboxesrounded{%
- \end{minipage}\egroup%
- \wd\bmb@box=\bmb@width%
- \bmb@temp=\dp\bmb@box%
- \advance\bmb@temp by.5pt%
- \setbox\bmb@box=\hbox{\raise\bmb@temp\hbox{\box\bmb@box}}%
- \dp\bmb@box=0pt%
- \bmb@temp=\wd\bmb@box%
- \bmb@dima=\bmb@temp\advance\bmb@dima by2.2bp%
- \bmb@dimb=\bmb@temp\advance\bmb@dimb by4bp%
- \hbox{%
- \textdir TLT\begin{pgfpicture}{0bp}{0bp}{0bp}{0bp}
- \ifbmb@shadow%
- {\pgftransformshift{\pgfpoint{4bp}{-3bp}}\pgftext{\copy\bmb@boxshadowball}}
- \begin{pgfscope}
- {%
- \advance\bmb@temp by-1bp%
- \pgfpathrectangle{\pgfpoint{\bmb@temp}{-7bp}}{\pgfpoint{9bp}{9bp}}%
- \pgfusepath{clip}
- }%
- {\pgftransformshift{\pgfpoint{\bmb@temp}{1bp}}\pgftext{\box\bmb@boxshadowballlarge}}
- \end{pgfscope}
- \begin{pgfscope}
- \advance\bmb@temp by-4bp%
- \pgfpathrectangle{\pgfpoint{4bp}{-7bp}}{\pgfpoint{\bmb@temp}{5bp}}
- \pgfusepath{clip}
- {\pgftransformshift{\pgfpoint{4bp}{-7bp}}\pgftext[left,base]{\copy\bmb@boxshadow}}%
- \end{pgfscope}
- \begin{pgfscope}
- \advance\bmb@temp by 4bp%
- \bmb@dima=\ht\bmb@box%
- \advance\bmb@dima by\bmb@prevheight%
- \advance\bmb@dima by 4bp%
- \pgfpathrectangle{\pgfpoint{\bmb@temp}{1bp}}{\pgfpoint{4bp}{\bmb@dima}}
- \pgfusepath{clip}
- \advance\bmb@dima by-4bp%
- {\pgftransformshift{\pgfpoint{\bmb@temp}{\bmb@dima}}\pgftext{\box\bmb@boxshadowball}}
- \advance\bmb@dima by-1bp%
- \pgfpathrectangle{\pgfpoint{\bmb@temp}{1bp}}{\pgfpoint{4bp}{\bmb@dima}}
- \pgfusepath{clip}
- \advance\bmb@temp by4bp%
- {\pgftransformshift{\pgfpoint{\bmb@temp}{-3bp}}%
- \pgftransformrotate{90}%
- \pgftext[left,base]{\box\bmb@boxshadow}}%
- \end{pgfscope}
- \fi%
- \unhbox\bmb@colorbox%
- \pgfpathqmoveto{-4bp}{1bp}
- \pgfpathqcurveto{-4bp}{-1.2bp}{-2.2bp}{-3bp}{0bp}{-3bp}
- \pgfpathlineto{\pgfpoint{\the\bmb@temp}{-3bp}}
- \pgfpathcurveto%
- {\pgfpoint{\the\bmb@dima}{-3bp}}%
- {\pgfpoint{\the\bmb(a)dimb}{-1.2bp}}%
- {\pgfpoint{\the\bmb@dimb}{1bp}}%
- {
- \bmb@dima=\ht\bmb@box%
- \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
- \pgfpathlineto{\pgfpoint{-4bp}{\bmb@dima}}
- \pgfusepath{fill}
- }
- \ifbmb@shadow%
- {
- \color{black!50!bg}
- \pgfsetlinewidth{0pt}
- \pgfpathmoveto{\pgfpoint{\bmb(a)dimb}{-.5bp}}
- \bmb@dima=\ht\bmb@box%
- \advance\bmb@dima by\bmb@prevheight%
- \advance\bmb@dima by 1bp%
- \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
- \pgfusepath{stroke}
- \bmb@temp=\bmb@dima
- \advance\bmb@dima by 1bp%
- \color{black!31!bg}
- \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}}
- \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
- \pgfusepath{stroke}
- \advance\bmb@dima by 1bp%
- \advance\bmb@temp by 1bp%
- \color{black!19!bg}
- \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}}
- \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
- \pgfusepath{stroke}
- \advance\bmb@dima by 1bp%
- \advance\bmb@temp by 1bp%
- \color{black!6!bg}
- \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}}
- \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
- \pgfusepath{stroke}
- \advance\bmb@dima by 1.5bp%
- \advance\bmb@temp by 1bp%
- \color{bg}
- \pgfpathmoveto{\pgfpoint{\bmb@dimb}{\bmb@temp}}
- \pgfpathlineto{\pgfpoint{\bmb@dimb}{\bmb@dima}}
- \pgfusepath{stroke}
- }
- \fi
- \end{pgfpicture}%
- \box\bmb@box%
- }%
- \ifbmb@shadow%
- \vskip4bp minus 2bp%
- \else%
- \vskip2bp%
- \fi%
- \egroup% of \vbox\bgroup
-}
-
-
-%% beamerbaseauxtemplates
-
-
-% (sub-)section in toc: ball
-
-\redefbeamertemplate{subsection in toc}{subsections numbered}
-{\leavevmode\leftskip=2em\rlap{\hskip-2em \inserttocsectionnumber\hbox{.}\inserttocsubsectionnumber}\inserttocsubsection\par}
-
-
-%% beamerinnerthemedefault
-
-\redefbeamertemplate*{button}{default}
-{%
- \setbox\beamer@tempbox=\hbox{{\insertbuttontext}}%
- \ht\beamer@tempbox=6pt%
- \dp\beamer@tempbox=0pt%
- \setbox\beamer@tempbox=\vbox{\box\beamer@tempbox\vskip2pt}%
- \beamer@tempdim=\wd\beamer@tempbox%
- \beamer@dima=\beamer@tempdim\advance\beamer@dima by2.2pt
- \beamer@dimb=\beamer@tempdim\advance\beamer@dimb by4pt
- \textdir TLT\begin{pgfpicture}{-4pt}{0pt}{\the\beamer@tempdim}{8pt}
- \color{bg}
- \pgfsetlinewidth{0.8pt}
- \pgfpathqmoveto{0pt}{0pt}
- \pgfpathqcurveto{-2.2pt}{0pt}{-4pt}{1.8pt}{-4pt}{4pt}
- \pgfpathqcurveto{-4pt}{6.2pt}{-2.2pt}{8pt}{0pt}{8pt}
- \pgfpathlineto{\pgfpoint{\the\beamer@tempdim}{8pt}}
- \pgfpathcurveto%
- {\pgfpoint{\the\beamer@dima}{8pt}}%
- {\pgfpoint{\the\beamer(a)dimb}{6.2pt}}%
- {\pgfpoint{\the\beamer@dimb}{4pt}}
- \pgfpathcurveto%
- {\pgfpoint{\the\beamer(a)dimb}{1.8pt}}%
- {\pgfpoint{\the\beamer@dima}{0pt}}%
- {\pgfpoint{\the\beamer@tempdim}{0pt}}
- \pgfpathclose
- \pgfusepathqfill
- \colorlet{bg}{parent.bg}
- \usebeamercolor[fg]{button border}
- \pgfpathqmoveto{0pt}{0pt}
- \pgfpathqcurveto{-2.2pt}{0pt}{-4pt}{1.8pt}{-4pt}{4pt}
- \pgfpathqcurveto{-4pt}{6.2pt}{-2.2pt}{8pt}{0pt}{8pt}
- \pgfpathlineto{\pgfpoint{\the\beamer@tempdim}{8pt}}
- \pgfpathcurveto%
- {\pgfpoint{\the\beamer@dima}{8pt}}%
- {\pgfpoint{\the\beamer(a)dimb}{6.2pt}}%
- {\pgfpoint{\the\beamer@dimb}{4pt}}
- \pgfpathcurveto%
- {\pgfpoint{\the\beamer(a)dimb}{1.8pt}}%
- {\pgfpoint{\the\beamer@dima}{0pt}}%
- {\pgfpoint{\the\beamer@tempdim}{0pt}}
- \pgfpathclose
- \pgfusepathqstroke
- \end{pgfpicture}%
- \hskip-\beamer@tempdim%
- \box\beamer@tempbox%
- \kern4pt%
-}
-
-
-%% beamerbasenavigation
-
-% User Buttons
-
-\pgfdefobject{beamergotosymbol}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{5pt}{5pt}}
-{
- \pgfpathqmoveto{3.5bp}{0.5bp}
- \pgfpathqlineto{1.5bp}{2bp}
- \pgfpathqlineto{3.5bp}{3.5bp}
- \pgfusepathqfill
-}
-
-
-\def\insertgotosymbol{%
- \begin{pgfpicture}{-1pt}{0pt}{4pt}{5pt}
- \pgfuseobject{beamergotosymbol}%
-\end{pgfpicture}}
-
-\pgfdefobject{beamerskipsymbol}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{7pt}{5pt}}
-{
- \pgfpathqmoveto{3.5bp}{0.5bp}
- \pgfpathqlineto{1.5bp}{2bp}
- \pgfpathqlineto{3.5bp}{3.5bp}
- \pgfpathqmoveto{5.5bp}{0.5bp}
- \pgfpathqlineto{3.5bp}{2bp}
- \pgfpathqlineto{5.5bp}{3.5bp}
- \pgfusepathqfill
-}
-
-\def\insertskipsymbol{%
- \begin{pgfpicture}{-1pt}{0pt}{8pt}{5pt}
- \pgfuseobject{beamerskipsymbol}%
-\end{pgfpicture}}
-
-
-\pgfdefobject{beamerreturnsymbol}{\pgfpoint{0pt}{-1pt}}{\pgfpoint{5pt}{5pt}}
-{
- \pgfpathqmoveto{1.5bp}{0.5bp}
- \pgfpathqlineto{3.5bp}{2bp}
- \pgfpathqlineto{1.5bp}{3.5bp}
- \pgfusepathqfill
-}
-
-\def\insertreturnsymbol{%
- \begin{pgfpicture}{-1pt}{0pt}{6pt}{5pt}
- \pgfuseobject{beamerreturnsymbol}%
-\end{pgfpicture}}
-
-
-%% beamerbaseframesize
-
-
-%
-% Zoom stuff
-%
-
-\def\framezoom<#1><#2>{\@ifnextchar[{\beamer@framezoom<#1><#2>}{\beamer@framezoom<#1><#2>[]}}
-\def\beamer@framezoom<#1><#2>[#3](#4,#5)(#6,#7){%
- \par\nointerlineskip%
- \global\beamer@slidehaszoomtrue%
- \advance\beamer@zoomcount by1\relax%
- \def\beamer@zoomborderwidth{0}%
- \edef\beamer@labelzoomed{beamer@labelzoomed@\the\beamer@zoomframecount @\the\beamer@zoomcount}%
- \setkeys{beamerzoom}{#3}%
- \only<#1>{%
- {\hypersetup{pdfhighlight={/P},pdfborder={0 0 \beamer@zoomborderwidth}}%
- \global\setbox\@tempboxa=\vbox{\hyperlink{\beamer@labelzoomed}{\vbox to #7{\hbox
- to#6{\hfil}\vfil}}}}%
- \ht\@tempboxa=0pt%
- \wd\@tempboxa=0pt%
- \dp\@tempboxa=0pt%
- \setbox\@tempboxa=\vbox{\moveright#4\hbox{\lower#5\vbox{\box\@tempboxa}}}%
- \ht\@tempboxa=0pt%
- \wd\@tempboxa=0pt%
- \dp\@tempboxa=0pt%
- \global\setbox\beamer@zoombox=\vbox to0pt{\unvbox\beamer@zoombox\box\@tempboxa}%
- }%
- \only<#2>{%
- \@ifundefined{\beamer@labelzoomed}%
- {%
- \hypertarget{\beamer@labelzoomed}{}%
- \expandafter\gdef\csname\beamer@labelzoomed\endcsname{}%
- }{}%
- \gdef\beamer@zoomer{%
- % compute zoom factor
- \@tempdima=\beamer@frametextheight%
- \@tempdimb=#7\relax%
- \@tempcnta=\@tempdimb%
- \divide\@tempcnta by4096\relax%
- \multiply\@tempdima by16\relax%
- \divide\@tempdima by\@tempcnta%
- \@tempdimb=\paperwidth%
- \ifbeamer@plainframe%
- \else%
- \advance\@tempdimb by-\beamer@leftsidebar%
- \advance\@tempdimb by-\beamer@rightsidebar\relax%
- \fi%
- \@tempdimc=#6\relax%
- \@tempcntb=\@tempdimc%
- \divide\@tempcntb by4096\relax%
- \multiply\@tempdimb by16\relax%
- \divide\@tempdimb by\@tempcntb%
- \ifdim\@tempdimb<\@tempdima%
- \@tempdima=\@tempdimb%
- \fi%
- \edef\beamer@temp{\strip@pt\@tempdima}%
- \@tempdimc=\beamer@frametextheight%
- \advance\@tempdimc by4pt%
- \@tempdimb=\paperwidth%
- \ifbeamer@plainframe%
- \else%
- \advance\@tempdimb by-\beamer@leftsidebar%
- \advance\@tempdimb by-\beamer@rightsidebar\relax%
- \fi%
- \setbox\@tempboxa=\vbox{\hsize=\@tempdimb\Acrobatmenu{GoBack}{\vbox to
- \beamer@frametextheight{\hbox to\@tempdimb{\hfil}\vfil}}}%
- \ht\@tempboxa=0pt%
- \wd\@tempboxa=0pt%
- \dp\@tempboxa=0pt%
- \setbox\beamer@framebox=\vbox to\beamer@frametextheight{{%
- \ifbeamer@plainframe\beamer@leftmargin=\Gm@lmargin\fi%
- \let\pgfpicture\oldpgfpicture
- \let\endpgfpicture\oldendpgfpicture
- \textdir TLT
- \begin{pgfpicture}{\beamer@leftmargin}{-\beamer@frametextheight}{\beamer@leftmargin}{0pt}
- \pgftext[left,top]{\box\@tempboxa}
- \pgfpathrectangle{\pgfpoint{-\@tempdimb}{-\@tempdimc}}{\pgfpoint{\@tempdimb}{\@tempdimc}}%
- \pgfusepath{clip}
- \begingroup
- \pgftransformscale{\beamer@temp}
- \@tempdima=#4\relax%
- \@tempdimb=#5\relax%
- {\pgftransformshift{\pgfpoint{-\@tempdima}{\@tempdimb}}%
- \pgftext[left,top]{\vbox{\vbox{}\nointerlineskip\unvbox\beamer@framebox}}}
- \endgroup
- \end{pgfpicture}%
- }}%
-
- \setbox\beamer@framebox=\vbox{%
- \nobreak\vbox{}\nobreak\par\nobreak\beamer@entrycode\nobreak%
- \nointerlineskip\unvbox\beamer@frametitlebox%
- \nobreak%
- \box\beamer@framebox %
- \nobreak%
- \vss%
- \beamer@exitcode%
- }%
- \global\setbox\beamer@footins=\box\voidb@x% no footnotes in zoomed slides
- }%
- }%
-}
-
-\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamer-rl.tlpobj new/tlpkg/tlpobj/beamer-rl.tlpobj
--- old/tlpkg/tlpobj/beamer-rl.tlpobj 2019-03-30 02:23:59.000000000 +0100
+++ new/tlpkg/tlpobj/beamer-rl.tlpobj 2019-10-05 01:54:33.000000000 +0200
@@ -1,18 +1,17 @@
name beamer-rl
category Package
-revision 50643
+revision 52284
shortdesc Right to left presentation with beamer and babel
relocated 1
longdesc This package provides patches of some beamer templates and
longdesc commands for presentation from right to left. It requires Babel
-longdesc with the LuaLaTeX engine.
+longdesc with the LuaTeX engine.
runfiles size=4
- RELOC/tex/lualatex/beamer-rl/beamer-rl.sty
+ RELOC/tex/lualatex/beamer-rl/beamer-rl.cls
catalogue-contact-bugs https://github.com/seloumi/beamer-rl/issues
-catalogue-contact-home https://github.com/seloumi/beamer-rl
catalogue-contact-repository https://github.com/seloumi/beamer-rl
catalogue-ctan /macros/luatex/latex/beamer-rl
-catalogue-date 2019-03-28 22:47:03 +0100
+catalogue-date 2019-10-04 17:26:52 +0200
catalogue-license lppl1.3c
-catalogue-topics multilingual presentation
-catalogue-version 1.1
+catalogue-topics class presentation bidi multilingual luatex
+catalogue-version 1.3
++++++ beamer.doc.tar.xz ++++++
++++ 11772 lines of diff (skipped)
++++++ beamer.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamer/beamer.cls new/tex/latex/beamer/beamer.cls
--- old/tex/latex/beamer/beamer.cls 2018-12-02 23:24:51.000000000 +0100
+++ new/tex/latex/beamer/beamer.cls 2019-09-30 23:49:03.000000000 +0200
@@ -12,7 +12,7 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesClass{beamer}
- [2018/12/02 v3.55 A class for typesetting presentations]
+ [2019/09/29 v3.57 A class for typesetting presentations]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamer/beamerarticle.sty new/tex/latex/beamer/beamerarticle.sty
--- old/tex/latex/beamer/beamerarticle.sty 2018-12-02 23:24:51.000000000 +0100
+++ new/tex/latex/beamer/beamerarticle.sty 2019-09-30 23:49:03.000000000 +0200
@@ -12,7 +12,7 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesPackage{beamerarticle}
- [2018/12/02 v3.55 beamer input in article mode]
+ [2019/09/29 v3.57 beamer input in article mode]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamer/beamerbasecolor.sty new/tex/latex/beamer/beamerbasecolor.sty
--- old/tex/latex/beamer/beamerbasecolor.sty 2018-09-20 23:15:06.000000000 +0200
+++ new/tex/latex/beamer/beamerbasecolor.sty 2019-09-30 23:49:03.000000000 +0200
@@ -184,6 +184,7 @@
\ifdim\beamer@colbox@colseps>\z@\vskip\beamer@colbox@colseps\fi%
\fi%
\egroup\color@endgroup\egroup%
+ \wd\beamer@tempbox=\beamer@colbox@wd%
\ifx\beamer@colbox@ht\@empty\else\ht\beamer@tempbox=\beamer@colbox@ht\fi%
\ifx\beamer@colbox@dp\@empty\else\dp\beamer@tempbox=\beamer@colbox@dp\fi%
\ifbeamer@colbox@rounded%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamer/beamerbasedecode.sty new/tex/latex/beamer/beamerbasedecode.sty
--- old/tex/latex/beamer/beamerbasedecode.sty 2018-08-23 23:58:14.000000000 +0200
+++ new/tex/latex/beamer/beamerbasedecode.sty 2019-07-23 22:58:24.000000000 +0200
@@ -26,6 +26,7 @@
% all of the lines here have to be terminated with "%". The two-step
% setup for \beamer@@@temp makes sure everything is expanded and removes
% all of the spaces at this stage.
+\newbox\beamer@decode@box
\begingroup
\catcode`\|=\active
\catcode`\:=\active
@@ -38,7 +39,7 @@
\catcode`\ =\active
\xdef\beamer@masterdecode#1{%
\noexpand\beamer@localanotherslidefalse%
-\setbox0=\hbox{%
+\setbox\beamer@decode@box=\hbox{%
\unexpanded{%
\ifnum\catcode`\|=\active\edef|{\string|}\fi%
\ifnum\catcode`\:=\active\edef:{\string:}\fi%
@@ -177,8 +178,10 @@
{\beamer@relnumber}{\beamer@relnumber(0)}}
\def\beamer@relnumber(#1){%
\beamer@plusencounteredtrue
+ \@tempcnta=\numexpr #1 + \value{beamerpauses}\relax%
+ \ifnum\@tempcnta<0\@tempcnta=0\fi%
\edef\beamer@spec
- {\beamer@spec\number\numexpr #1 + \value{beamerpauses}\relax}%
+ {\beamer@spec\number\@tempcnta}%
\beamer@@decodeplus}
\def\beamer@decodedot{%
@@ -190,8 +193,10 @@
\kernel@ifnextchar(%)
{\beamer@relnumberdot}{\beamer@relnumberdot(0)}}
\def\beamer@relnumberdot(#1){%
+ \@tempcnta=\numexpr #1 + \value{beamerpauses} -1\relax%
+ \ifnum\@tempcnta<0\@tempcnta=0\fi%
\edef\beamer@spec
- {\beamer@spec\number\numexpr #1 + \value{beamerpauses} -1\relax}%
+ {\beamer@spec\number\@tempcnta}%
\beamer@@decodedot}
\def\beamer@@decodefound{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamer/beamerbaseframe.sty new/tex/latex/beamer/beamerbaseframe.sty
--- old/tex/latex/beamer/beamerbaseframe.sty 2018-12-02 23:24:51.000000000 +0100
+++ new/tex/latex/beamer/beamerbaseframe.sty 2019-07-23 22:58:24.000000000 +0200
@@ -493,6 +493,7 @@
\def\gobble@onslide@@aux<#1>{\@firstofone}
\def\beamer@donoframe{%
\beamer@slideinframe=1\relax%
+ \global\c@beamerpauses=1\relax%
\setbox\beamer@tempbox\vbox\bgroup%
\beamer@inframetrue%
\beamer@framenotesbegin%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamer/beamerbaselocalstructure.sty new/tex/latex/beamer/beamerbaselocalstructure.sty
--- old/tex/latex/beamer/beamerbaselocalstructure.sty 2018-12-02 23:24:51.000000000 +0100
+++ new/tex/latex/beamer/beamerbaselocalstructure.sty 2019-09-30 23:49:03.000000000 +0200
@@ -107,7 +107,7 @@
\begin{actionenv}#2%
\def\insertblocktitle{#1}%
\par%
- \mode<presentation>{%\usebeamerfont{block}%
+ \only<presentation>{%\usebeamerfont{block}%
\setbeamercolor{local structure}{parent=alerted text}}%
\usebeamertemplate{block alerted begin}}
{\par%
@@ -118,7 +118,7 @@
\begin{actionenv}#2%
\def\insertblocktitle{#1}%
\par%
- \mode<presentation>{%\usebeamerfont{block}%
+ \only<presentation>{%\usebeamerfont{block}%
\setbeamercolor{local structure}{parent=example text}}%
\usebeamertemplate{block example begin}}
{\par%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamer/beamerbaseoverlay.sty new/tex/latex/beamer/beamerbaseoverlay.sty
--- old/tex/latex/beamer/beamerbaseoverlay.sty 2018-02-22 00:34:07.000000000 +0100
+++ new/tex/latex/beamer/beamerbaseoverlay.sty 2019-07-23 22:58:24.000000000 +0200
@@ -617,9 +617,14 @@
{
\renewcommand<>{\textbf}{\only#1{\beameroriginal{\textbf}}}
\renewcommand<>{\textit}{\only#1{\beameroriginal{\textit}}}
- \renewcommand<>{\textsl}{\only#1{\beameroriginal{\textsl}}}
- \renewcommand<>{\textsf}{\only#1{\beameroriginal{\textsf}}}
+ \renewcommand<>{\textmd}{\only#1{\beameroriginal{\textmd}}}
+ \renewcommand<>{\textnormal}{\only#1{\beameroriginal{\textnormal}}}
\renewcommand<>{\textrm}{\only#1{\beameroriginal{\textrm}}}
+ \renewcommand<>{\textsc}{\only#1{\beameroriginal{\textsc}}}
+ \renewcommand<>{\textsf}{\only#1{\beameroriginal{\textsf}}}
+ \renewcommand<>{\textsl}{\only#1{\beameroriginal{\textsl}}}
+ \renewcommand<>{\texttt}{\only#1{\beameroriginal{\texttt}}}
+ \renewcommand<>{\textup}{\only#1{\beameroriginal{\textup}}}
}
\renewcommand<>{\hypertarget}[2]{\only#3{\beameroriginal{\hypertarget}{#1}{#2}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamer/beamerbasetitle.sty new/tex/latex/beamer/beamerbasetitle.sty
--- old/tex/latex/beamer/beamerbasetitle.sty 2018-09-02 23:14:31.000000000 +0200
+++ new/tex/latex/beamer/beamerbasetitle.sty 2019-07-23 22:58:24.000000000 +0200
@@ -261,7 +261,7 @@
\fi
\providecommand\and{\unskip, }
- \providecommand\inst[1]{\textsuperscript{#1}}
+ \providecommand\inst[1]{}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamer/beamerinnerthemeinmargin.sty new/tex/latex/beamer/beamerinnerthemeinmargin.sty
--- old/tex/latex/beamer/beamerinnerthemeinmargin.sty 2017-12-19 01:09:01.000000000 +0100
+++ new/tex/latex/beamer/beamerinnerthemeinmargin.sty 2019-07-23 22:58:24.000000000 +0200
@@ -32,7 +32,7 @@
\newcommand\beamer@putleft[2]{%
\hbox to 0pt{\hss\vtop{%
\normalsize%
- \(a)tempdima=.25\paperwidth%
+ \@tempdima=\beamer@leftsidebar%
\advance\@tempdima by-3ex%
\hsize=\@tempdima%
\leftskip=0pt plus 1fill%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamer/beamerouterthemesplit.sty new/tex/latex/beamer/beamerouterthemesplit.sty
--- old/tex/latex/beamer/beamerouterthemesplit.sty 2018-08-23 23:58:14.000000000 +0200
+++ new/tex/latex/beamer/beamerouterthemesplit.sty 2019-09-30 23:49:03.000000000 +0200
@@ -68,7 +68,7 @@
\usebeamerfont{author in head/foot}\insertshortauthor
\end{beamercolorbox}%
\begin{beamercolorbox}[wd=.5\paperwidth,ht=2.5ex,dp=1.125ex,leftskip=.3cm,rightskip=.3cm plus1fil]{title in head/foot}%
- \usebeamerfont{title in head/foot}\insertshorttitle\hfill\usebeamercolor[fg]{page number in head/foot}\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot}
+ \usebeamerfont{title in head/foot}\insertshorttitle\nobreak\hfill\usebeamercolor[fg]{page number in head/foot}\usebeamerfont{page number in head/foot}\usebeamertemplate{page number in head/foot}
\end{beamercolorbox}}%
\vskip0pt%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamer/beamerpatchparalist.sty new/tex/latex/beamer/beamerpatchparalist.sty
--- old/tex/latex/beamer/beamerpatchparalist.sty 2018-02-22 00:34:07.000000000 +0100
+++ new/tex/latex/beamer/beamerpatchparalist.sty 2019-09-30 23:49:03.000000000 +0200
@@ -9,7 +9,7 @@
\mode<presentation>
-\if@plnewitem
+\if@plnewenum
\def\enumerate{%
\ifnum \@enumdepth >\tw@
\@toodeep
@@ -42,6 +42,45 @@
\raggedright%
\beamer@firstlineitemizeunskip%
}
+\fi
+\def\compactenum{%
+ \ifnum \@enumdepth >\tw@
+ \@toodeep
+ \else
+ \advance\@enumdepth \@ne
+ \edef\@enumctr{enum\romannumeral\the\@enumdepth}%
+ \advance\@itemdepth \@ne%
+ \fi
+ \def\@enum@widestlabel{7}%
+ \beamer@computepref\@enumdepth%
+ \expandafter\edef\csname label\@enumctr\endcsname{\noexpand\usebeamertemplate{enumerate \beameritemnestingprefix item}}%
+ \@ifnextchar[{\beamer@@cenum@}{\beamer@compactenum@}}
+\def\beamer@@cenum@[{\@ifnextchar<{\beamer@cenumdefault[}{\beamer@@@cenum@[}}
+\def\beamer@cenumdefault[#1]{\def\beamer@defaultospec{#1}%
+ \@ifnextchar[{\beamer@@@cenum@}{\beamer@compactenum@}}
+\def\beamer@@@cenum@[#1]{\@enumlabel@{\beamer@compactenum@}[[#1]} % Here a token is gobbled in paralist package
+\def\beamer@compactenum@{%
+ \beamer@computepref\@itemdepth%
+ \usebeamerfont{itemize/enumerate \beameritemnestingprefix body}%
+ \usebeamercolor[fg]{itemize/enumerate \beameritemnestingprefix body}%
+ \@adjust@enum@labelwidth
+ \expandafter\list\csname label\@enumctr\endcsname{%
+ \usecounter{\@enumctr}%
+ \parsep\plparsep
+ \itemsep\plitemsep
+ \topsep\pltopsep
+ \partopsep\plpartopsep
+ \labelwidth
+ \csname leftmargin\romannumeral\@listdepth\endcsname
+ \advance\labelwidth-\labelsep
+ \let\makelabel\enumlabel}%
+ \beamer@cramped%
+ \raggedright%
+ \beamer@firstlineitemizeunskip%
+}
+\def\endcompactenum{\ifhmode\par\fi\endlist}
+
+\if@plnewitem
\def\itemize{%
\ifnum \@itemdepth >\tw@
\@toodeep
@@ -71,6 +110,39 @@
\beamer@firstlineitemizeunskip%
}
\fi
+\def\compactitem{%
+ \ifnum \@itemdepth >\tw@
+ \@toodeep
+ \else
+ \advance\@itemdepth\@ne
+ \edef\@itemitem{labelitem\romannumeral\the\@itemdepth}%
+ \fi
+ \beamer@computepref\@itemdepth%
+ \expandafter\edef\csname\@itemitem\endcsname{\noexpand\usebeamertemplate{itemize \beameritemnestingprefix item}}%
+ \@ifnextchar[{\beamer@@citem@}{\beamer@compactitem@}}%
+\def\beamer@@citem@[{\@ifnextchar<{\beamer@citemdefault[}{\beamer@@@citem@[}}
+\def\beamer@citemdefault[#1]{\def\beamer@defaultospec{#1}%
+ \@ifnextchar[{\beamer@@@citem@}{\beamer@compactitem@}}
+\def\beamer@@@citem@[#1]{\@itemlabel@{\beamer@compactitem@}[#1]}
+\def\beamer@compactitem@{%
+ \usebeamerfont{itemize/enumerate \beameritemnestingprefix body}%
+ \usebeamercolor[fg]{itemize/enumerate \beameritemnestingprefix body}%
+ \@adjust@item@labelwidth
+ \expandafter\list\csname\@itemitem\endcsname{%
+ \parsep\plparsep
+ \itemsep\plitemsep
+ \topsep\pltopsep
+ \partopsep\plpartopsep
+ \labelwidth
+ \csname leftmargin\romannumeral\@listdepth\endcsname
+ \advance\labelwidth-\labelsep
+ \let\makelabel\itemlabel}%
+ \beamer@cramped%
+ \raggedright%
+ \beamer@firstlineitemizeunskip%
+}
+\def\endcompactitem{\ifhmode\par\fi\endlist}
+
\if@plflushright
\def\enumlabel#1{{\usebeamerfont*{enumerate \beameritemnestingprefix item}%
\usebeamercolor[fg]{enumerate \beameritemnestingprefix item}\hss#1}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamer.tlpobj new/tlpkg/tlpobj/beamer.tlpobj
--- old/tlpkg/tlpobj/beamer.tlpobj 2019-02-28 03:17:43.000000000 +0100
+++ new/tlpkg/tlpobj/beamer.tlpobj 2020-04-19 18:09:42.000000000 +0200
@@ -1,6 +1,6 @@
name beamer
category Package
-revision 49306
+revision 54795
shortdesc A LaTeX class for producing presentations and slides
relocated 1
longdesc The beamer LaTeX class can be used for producing slides. The
@@ -19,9 +19,14 @@
longdesc for use in other language environments. Beamer depends on the
longdesc following other packages: atbegshi, etoolbox, hyperref, ifpdf,
longdesc pgf, and translator.
+depend atbegshi
+depend etoolbox
+depend hyperref
+depend iftex
depend pgf
+depend translator
depend xcolor
-runfiles size=252
+runfiles size=253
RELOC/tex/latex/beamer/beamer.cls
RELOC/tex/latex/beamer/beamerarticle.sty
RELOC/tex/latex/beamer/beamerbasearticle.sty
@@ -153,7 +158,6 @@
catalogue-contact-bugs https://github.com/josephwright/beamer/issues
catalogue-contact-repository https://github.com/josephwright/beamer
catalogue-ctan /macros/latex/contrib/beamer
-catalogue-date 2018-12-02 14:06:22 +0100
-catalogue-license lppl1.3cgpl2+fdl
+catalogue-license lppl1.3c gpl2+ fdl
catalogue-topics presentation class
-catalogue-version 3.55
+catalogue-version 3.57
++++++ beamerposter.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamerposter.doc.tlpobj new/tlpkg/tlpobj/beamerposter.doc.tlpobj
--- old/tlpkg/tlpobj/beamerposter.doc.tlpobj 2019-02-28 03:17:49.000000000 +0100
+++ new/tlpkg/tlpobj/beamerposter.doc.tlpobj 2020-03-24 01:56:36.000000000 +0100
@@ -1,6 +1,6 @@
name beamerposter.doc
category Package
-revision 47508
+revision 54512
shortdesc doc files of beamerposter
relocated 1
docfiles size=22
++++++ beamerposter.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamerposter.tlpobj new/tlpkg/tlpobj/beamerposter.tlpobj
--- old/tlpkg/tlpobj/beamerposter.tlpobj 2019-02-28 03:17:49.000000000 +0100
+++ new/tlpkg/tlpobj/beamerposter.tlpobj 2020-03-24 01:56:36.000000000 +0100
@@ -1,6 +1,6 @@
name beamerposter
category Package
-revision 47508
+revision 54512
shortdesc Extend beamer and a0poster for custom sized posters
relocated 1
longdesc The package enables the user to use beamer style operations on
@@ -29,7 +29,6 @@
catalogue-contact-repository https://github.com/deselaers/latex-beamerposter
catalogue-contact-support https://groups.google.com/forum/#!forum/beamerposter
catalogue-ctan /macros/latex/contrib/beamerposter
-catalogue-date 2018-04-23 11:03:46 +0200
-catalogue-license lpplgpl
+catalogue-license lppl gpl
catalogue-topics poster presentation
catalogue-version 1.13
++++++ beamerswitch.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/beamerswitch/README.md new/doc/latex/beamerswitch/README.md
--- old/doc/latex/beamerswitch/README.md 2019-01-28 23:04:15.000000000 +0100
+++ new/doc/latex/beamerswitch/README.md 2020-01-20 23:24:53.000000000 +0100
@@ -88,7 +88,7 @@
## Licence
-Copyright 20162019 Alex Ball.
+Copyright 20162020 Alex Ball.
This work consists of the file beamerswitch.dtx and a Makefile.
Binary files old/doc/latex/beamerswitch/beamerswitch-example-article.pdf and new/doc/latex/beamerswitch/beamerswitch-example-article.pdf differ
Binary files old/doc/latex/beamerswitch/beamerswitch-example-handout.pdf and new/doc/latex/beamerswitch/beamerswitch-example-handout.pdf differ
Binary files old/doc/latex/beamerswitch/beamerswitch-example-trans.pdf and new/doc/latex/beamerswitch/beamerswitch-example-trans.pdf differ
Binary files old/doc/latex/beamerswitch/beamerswitch-example.pdf and new/doc/latex/beamerswitch/beamerswitch-example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/beamerswitch/beamerswitch-example.tex new/doc/latex/beamerswitch/beamerswitch-example.tex
--- old/doc/latex/beamerswitch/beamerswitch-example.tex 2019-01-28 23:04:15.000000000 +0100
+++ new/doc/latex/beamerswitch/beamerswitch-example.tex 2020-01-20 23:24:53.000000000 +0100
@@ -77,6 +77,6 @@
Happy {\LaTeX}ing!
\end{document}
%%
-%% Copyright (C) 2016-2019 by Alex Ball <ab318(a)bath.ac.uk>
+%% Copyright (C) 2016-2020 by Alex Ball <ab318(a)bath.ac.uk>
%%
%% End of file `beamerswitch-example.tex'.
Binary files old/doc/latex/beamerswitch/beamerswitch.pdf and new/doc/latex/beamerswitch/beamerswitch.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamerswitch.doc.tlpobj new/tlpkg/tlpobj/beamerswitch.doc.tlpobj
--- old/tlpkg/tlpobj/beamerswitch.doc.tlpobj 2019-02-28 03:17:49.000000000 +0100
+++ new/tlpkg/tlpobj/beamerswitch.doc.tlpobj 2020-01-21 01:56:22.000000000 +0100
@@ -1,9 +1,9 @@
name beamerswitch.doc
category Package
-revision 49849
+revision 53467
shortdesc doc files of beamerswitch
relocated 1
-docfiles size=75
+docfiles size=74
RELOC/doc/latex/beamerswitch/README.md
RELOC/doc/latex/beamerswitch/beamerswitch-example-article.pdf
RELOC/doc/latex/beamerswitch/beamerswitch-example-handout.pdf
++++++ beamerswitch.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamerswitch/beamerswitch.cls new/tex/latex/beamerswitch/beamerswitch.cls
--- old/tex/latex/beamerswitch/beamerswitch.cls 2019-01-28 23:04:15.000000000 +0100
+++ new/tex/latex/beamerswitch/beamerswitch.cls 2020-01-20 23:24:53.000000000 +0100
@@ -15,7 +15,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{beamerswitch}
- [2019/01/28 v1.5 Convenient mode selection in Beamer documents]
+ [2020/01/20 v1.6.1 Convenient mode selection in Beamer documents]
\RequirePackage{xkeyval,xkvltxp,etoolbox,xstring,shellesc,iftex}
\define@boolkey[DC]{beamerswitch}{beamer}[true]{%
\ifbool{DC@beamerswitch@beamer}{%
@@ -88,16 +88,22 @@
}%
}%
}
-\IfEndWith*{\jobname}{\BeamerSuffix}{%
+\IfBeginWith*{\jobname}{"}{%
+ \IfEndWith*{\jobname}{"}{%
+ \StrGobbleLeft{\jobname}{1}[\JobName]%
+ \StrGobbleRight{\JobName}{1}[\JobName]%
+ }{\let\JobName\jobname}%
+}{\let\JobName\jobname}
+\IfEndWith*{\JobName}{\BeamerSuffix}{%
\setkeys[DC]{beamerswitch}{beamer=true}
}{%
- \IfEndWith*{\jobname}{\TransSuffix}{%
+ \IfEndWith*{\JobName}{\TransSuffix}{%
\setkeys[DC]{beamerswitch}{trans=true}
}{%
- \IfEndWith*{\jobname}{\HandoutSuffix}{%
+ \IfEndWith*{\JobName}{\HandoutSuffix}{%
\setkeys[DC]{beamerswitch}{handout=true}
}{%
- \IfEndWith*{\jobname}{\ArticleSuffix}{%
+ \IfEndWith*{\JobName}{\ArticleSuffix}{%
\setkeys[DC]{beamerswitch}{article=true}
}{%
\ifbool{DC@beamerswitch@alsobeamer}{%
@@ -1131,7 +1137,7 @@
\NewDocumentCommand{\bsw@punct@test}{m}{\l_bsw_punct_test:n {#1}}
\cs_new_protected:Nn \l_bsw_punct_test:n
{
- \str_case_x:nnTF { \str_item:nn {#1} {-1} }
+ \str_case_e:nnTF { \str_item:nn {#1} {-1} }
{
{ , } { }
{ ; } { }
@@ -1236,6 +1242,6 @@
}%
}
%%
-%% Copyright (C) 2016-2019 by Alex Ball <ab318(a)bath.ac.uk>
+%% Copyright (C) 2016-2020 by Alex Ball <ab318(a)bath.ac.uk>
%%
%% End of file `beamerswitch.cls'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamerswitch.tlpobj new/tlpkg/tlpobj/beamerswitch.tlpobj
--- old/tlpkg/tlpobj/beamerswitch.tlpobj 2019-02-28 03:17:50.000000000 +0100
+++ new/tlpkg/tlpobj/beamerswitch.tlpobj 2020-01-21 01:56:22.000000000 +0100
@@ -1,6 +1,6 @@
name beamerswitch
category Package
-revision 49849
+revision 53467
shortdesc Convenient mode selection in Beamer documents
relocated 1
longdesc This class is a wrapper around the beamer class to make it
@@ -17,7 +17,6 @@
catalogue-contact-bugs https://github.com/alex-ball/beamerswitch/issues
catalogue-contact-repository https://github.com/alex-ball/beamerswitch
catalogue-ctan /macros/latex/contrib/beamer-contrib/beamerswitch
-catalogue-date 2019-01-28 18:28:39 +0100
catalogue-license lppl1.3c
catalogue-topics presentation class
-catalogue-version 1.5
+catalogue-version 1.6.1
++++++ beamertheme-focus.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/beamertheme-focus/README.md new/doc/latex/beamertheme-focus/README.md
--- old/doc/latex/beamertheme-focus/README.md 2019-01-18 23:36:53.000000000 +0100
+++ new/doc/latex/beamertheme-focus/README.md 2020-04-16 23:01:46.000000000 +0200
@@ -1,4 +1,4 @@
-# Focus v2.3
+# Focus v2.6
A presentation theme for LaTeX Beamer that aims at a clean and minimalist design,
so to minimize distractions and put the focus directly on the content.
@@ -14,7 +14,7 @@
A full demo is available. Refer to `demo.tex` and `demo.pdf`.
![](https://github.com/elauksap/focustheme/blob/master/demo-screenshots/demo-titlepage.jpg)
-![](https://github.com/elauksap/focustheme/blob/master/demo-screenshots/demo-sectionpage.jpg)
+![](https://github.com/elauksap/focustheme/blob/master/demo-screenshots/demo-subsectionpage.jpg)
![](https://github.com/elauksap/focustheme/blob/master/demo-screenshots/demo-typeset.jpg)
![](https://github.com/elauksap/focustheme/blob/master/demo-screenshots/demo-focus.jpg)
![](https://github.com/elauksap/focustheme/blob/master/demo-screenshots/demo-references.jpg)
Binary files old/doc/latex/beamertheme-focus/demo-screenshots/demo-sectionpage.jpg and new/doc/latex/beamertheme-focus/demo-screenshots/demo-sectionpage.jpg differ
Binary files old/doc/latex/beamertheme-focus/demo-screenshots/demo-subsectionpage.jpg and new/doc/latex/beamertheme-focus/demo-screenshots/demo-subsectionpage.jpg differ
Binary files old/doc/latex/beamertheme-focus/demo.pdf and new/doc/latex/beamertheme-focus/demo.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/beamertheme-focus/demo.tex new/doc/latex/beamertheme-focus/demo.tex
--- old/doc/latex/beamertheme-focus/demo.tex 2019-01-18 23:36:53.000000000 +0100
+++ new/doc/latex/beamertheme-focus/demo.tex 2019-06-27 22:58:17.000000000 +0200
@@ -16,7 +16,10 @@
\maketitle
\end{frame}
+ % Use starred version (e.g. \section*{Section name})
+ % to disable (sub)section page.
\section{Section 1}
+ \subsection{Subsection 1.1}
\begin{frame}{Simple frame}
This is a simple frame.
\end{frame}
@@ -25,6 +28,7 @@
This is a frame with plain style and it is numbered.
\end{frame}
+ \subsection{Subsection 1.2}
\begin{frame}[t]
This frame has an empty title and is aligned to top.
\end{frame}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamertheme-focus.doc.tlpobj new/tlpkg/tlpobj/beamertheme-focus.doc.tlpobj
--- old/tlpkg/tlpobj/beamertheme-focus.doc.tlpobj 2019-02-28 03:17:53.000000000 +0100
+++ new/tlpkg/tlpobj/beamertheme-focus.doc.tlpobj 2020-04-17 01:55:22.000000000 +0200
@@ -1,15 +1,15 @@
name beamertheme-focus.doc
category Package
-revision 49748
+revision 54772
shortdesc doc files of beamertheme-focus
relocated 1
-docfiles size=150
+docfiles size=156
RELOC/doc/latex/beamertheme-focus/LICENSE
RELOC/doc/latex/beamertheme-focus/README.md
RELOC/doc/latex/beamertheme-focus/demo-screenshots/demo-appendix.jpg
RELOC/doc/latex/beamertheme-focus/demo-screenshots/demo-focus.jpg
RELOC/doc/latex/beamertheme-focus/demo-screenshots/demo-references.jpg
- RELOC/doc/latex/beamertheme-focus/demo-screenshots/demo-sectionpage.jpg
+ RELOC/doc/latex/beamertheme-focus/demo-screenshots/demo-subsectionpage.jpg
RELOC/doc/latex/beamertheme-focus/demo-screenshots/demo-titlepage-color.jpg
RELOC/doc/latex/beamertheme-focus/demo-screenshots/demo-titlepage.jpg
RELOC/doc/latex/beamertheme-focus/demo-screenshots/demo-typeset.jpg
++++++ beamertheme-focus.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamertheme-focus/beamercolorthemefocus.sty new/tex/latex/beamertheme-focus/beamercolorthemefocus.sty
--- old/tex/latex/beamertheme-focus/beamercolorthemefocus.sty 2019-01-18 23:36:53.000000000 +0100
+++ new/tex/latex/beamertheme-focus/beamercolorthemefocus.sty 2020-04-16 23:01:46.000000000 +0200
@@ -1,4 +1,4 @@
-% Copyright (C) 2018-2019 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018-2020 Pasquale Claudio Africa and the LaTeX community.
% A full list of contributors can be found at
%
% https://github.com/elauksap/focus-beamertheme
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamertheme-focus/beamerfontthemefocus.sty new/tex/latex/beamertheme-focus/beamerfontthemefocus.sty
--- old/tex/latex/beamertheme-focus/beamerfontthemefocus.sty 2019-01-18 23:36:53.000000000 +0100
+++ new/tex/latex/beamertheme-focus/beamerfontthemefocus.sty 2020-04-16 23:01:46.000000000 +0200
@@ -1,4 +1,4 @@
-% Copyright (C) 2018-2019 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018-2020 Pasquale Claudio Africa and the LaTeX community.
% A full list of contributors can be found at
%
% https://github.com/elauksap/focus-beamertheme
@@ -30,6 +30,7 @@
\setbeamerfont{date}{size=\large, shape=\scshape}
\setbeamerfont{sectiontitle}{size=\huge, series=\scshape\bfseries}
+\setbeamerfont{subsectiontitle}{size=\Large, series=\scshape\bfseries}
\setbeamerfont{frametitle}{size=\Large, shape=\scshape}
\setbeamerfont{footline}{size=\scriptsize}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamertheme-focus/beamerinnerthemefocus.sty new/tex/latex/beamertheme-focus/beamerinnerthemefocus.sty
--- old/tex/latex/beamertheme-focus/beamerinnerthemefocus.sty 2019-01-18 23:36:53.000000000 +0100
+++ new/tex/latex/beamertheme-focus/beamerinnerthemefocus.sty 2020-04-16 23:01:46.000000000 +0200
@@ -1,4 +1,4 @@
-% Copyright (C) 2018-2019 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018-2020 Pasquale Claudio Africa and the LaTeX community.
% A full list of contributors can be found at
%
% https://github.com/elauksap/focus-beamertheme
@@ -77,12 +77,14 @@
\vspace*{\baselineskip}
\begin{minipage}[t]{\textwidth}
- \usebeamerfont{date}{\insertdate}
+ \usebeamerfont{date}
+ \insertdate
\end{minipage}
\vspace*{0pt plus 100fill}
\addtocounter{framenumber}{-1}
+ \addtocounter{realframenumber}{-1}
}
% Section page.
@@ -100,8 +102,13 @@
\usebeamercolor[fg]{frametitle}
\let\hyperlink\@secondoftwo\insertsection
\end{minipage}
-
- \vspace*{0pt plus 100fill}
+
+ \vspace{1.5\baselineskip}
+ \begin{minipage}[t][0.55\paperheight]{\textwidth}
+ \usebeamerfont{subsectiontitle}
+ \usebeamercolor[bg]{frametitle}
+ \insertsubsection
+ \end{minipage}
}
\AtBeginSection[]{%
@@ -110,4 +117,34 @@
\end{frame}%
}
+% Subsection page.
+\defbeamertemplate*{subsection page}{focus}{%
+ {%
+ \usebeamercolor{frametitle}\colorlet{focus@@temp}{bg}%
+ \begin{tikzpicture}[overlay, remember picture]
+ \fill[color=focus@@temp] (current page.north west) rectangle ([shift = {(0, -0.45\paperheight)}] current page.north east);
+ \end{tikzpicture}%
+ }
+
+ \vspace{-2.5\baselineskip}
+ \begin{minipage}[b][0.45\paperheight]{\textwidth}
+ \usebeamerfont{sectiontitle}
+ \usebeamercolor[fg]{frametitle}
+ \let\hyperlink\@secondoftwo\insertsection
+ \end{minipage}
+
+ \vspace{1.5\baselineskip}
+ \begin{minipage}[t][0.55\paperheight]{\textwidth}
+ \usebeamerfont{subsectiontitle}
+ \usebeamercolor[bg]{frametitle}
+ \insertsubsection
+ \end{minipage}
+}
+
+\AtBeginSubsection[]{%
+ \begin{frame}[plain, noframenumbering]{}
+ \subsectionpage
+ \end{frame}%
+}
+
\mode<all>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamertheme-focus/beamerouterthemefocus.sty new/tex/latex/beamertheme-focus/beamerouterthemefocus.sty
--- old/tex/latex/beamertheme-focus/beamerouterthemefocus.sty 2019-01-18 23:36:53.000000000 +0100
+++ new/tex/latex/beamertheme-focus/beamerouterthemefocus.sty 2020-04-16 23:01:46.000000000 +0200
@@ -1,4 +1,4 @@
-% Copyright (C) 2018-2019 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018-2020 Pasquale Claudio Africa and the LaTeX community.
% A full list of contributors can be found at
%
% https://github.com/elauksap/focus-beamertheme
@@ -37,11 +37,12 @@
\RequirePackage{etoolbox} % \BeforeBeginEnvironment.
\RequirePackage{tikz}
+\newcounter{realframenumber}
% FRAMETITLE TEMPLATES. --------------------------------------------------------
\defbeamertemplate*{frametitle}{focus}{%
% If not title page.
- \ifnum\value{framenumber}>0%
+ \ifnum\value{realframenumber}>0%
\vspace{-1pt}%
\begin{beamercolorbox}[wd=\paperwidth,leftskip=0.55cm,rightskip=0.55cm,sep=0.2cm]{frametitle}%
\strut\insertframetitle\strut%
@@ -50,9 +51,9 @@
}
% Plain header.
-\defbeamertemplate{frametitle}{plain}{%
+\defbeamertemplate*{frametitle}{plain}{%
% If not title page.
- \ifnum\value{framenumber}>0%
+ \ifnum\value{realframenumber}>0%
\vspace{-1pt}%
\begin{beamercolorbox}[wd=\paperwidth,leftskip=0.55cm,rightskip=0.55cm,sep=0.2cm,ignorebg]{frametitle}%
\strut%
@@ -78,8 +79,8 @@
\addtolength{\focus@pbar@rightoffset}{1.5em}%
%
% If not title page.
- \ifnum\c@framenumber>0%
- \ifnum\c@framenumber<\inserttotalframenumber%
+ \ifnum\value{realframenumber}>0%
+ \ifnum\value{framenumber}<\inserttotalframenumber%
\begin{tikzpicture}[inner xsep=0.5em, inner ysep=0.5ex]\usebeamerfont{footline}
\pgfmathsetmacro{\focus@pbar@progress}%
{(\paperwidth-\focus@pbar@leftoffset-\focus@pbar@rightoffset)*(\insertframenumber/\inserttotalframenumber)}
@@ -108,7 +109,7 @@
}
% Full bar footline.
-\defbeamertemplate{footline}{fullbar}{%
+\defbeamertemplate*{footline}{fullbar}{%
% If not appendix.
\ifnum\mainend<0% From package appendixnumberbeamer.
%
@@ -119,7 +120,7 @@
\addtolength{\focus@pbar@rightoffset}{1.5em}%
%
% If not title page.
- \ifnum\c@framenumber>0%
+ \ifnum\value{realframenumber}>0%
\begin{tikzpicture}[inner xsep=0.5em, inner ysep=0.5ex]
\clip (0,0) rectangle ++(\paperwidth,\the\focus@pbar@height);
\fill[footline.bg] (0,0) rectangle ++(\paperwidth,\the\focus@pbar@height);
@@ -133,7 +134,7 @@
}
% Empty footline.
-\defbeamertemplate{footline}{none}{}
+\defbeamertemplate*{footline}{none}{}
\DeclareOptionBeamer{numbering}{\def\beamer@focus@numbering{#1}}
\ExecuteOptionsBeamer{numbering=progressbar}
@@ -152,14 +153,14 @@
\end{tikzpicture}%
}
-\defbeamertemplate{background canvas}{focusplain}{%
+\defbeamertemplate*{background canvas}{focusplain}{%
\begin{tikzpicture}
\clip (0,0) rectangle ++(\paperwidth,\paperheight);
\fill[normal text.bg] (0,0) rectangle ++(\paperwidth,\paperheight);
\end{tikzpicture}%
}
-\defbeamertemplate{background canvas}{focusframe}{%
+\defbeamertemplate*{background canvas}{focusframe}{%
\begin{tikzpicture}
\clip (0,0) rectangle ++(\paperwidth,\paperheight);
\fill[frametitle.bg] (0,0) rectangle ++(\paperwidth,\paperheight);
@@ -169,6 +170,7 @@
% HOOKS FOR CREATING FRAMES. ---------------------------------------------------
\BeforeBeginEnvironment{frame}{%
+ \stepcounter{realframenumber}
\setbeamertemplate{background canvas}[focus]%
\setbeamertemplate{frametitle}[focus]%
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beamertheme-focus/beamerthemefocus.sty new/tex/latex/beamertheme-focus/beamerthemefocus.sty
--- old/tex/latex/beamertheme-focus/beamerthemefocus.sty 2019-01-18 23:36:53.000000000 +0100
+++ new/tex/latex/beamertheme-focus/beamerthemefocus.sty 2020-04-16 23:01:46.000000000 +0200
@@ -1,4 +1,4 @@
-% Copyright (C) 2018-2019 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018-2020 Pasquale Claudio Africa and the LaTeX community.
% A full list of contributors can be found at
%
% https://github.com/elauksap/focus-beamertheme
@@ -19,7 +19,7 @@
% along with beamerthemefocus. If not, see <http://www.gnu.org/licenses/>.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemefocus}[2019/01/18 v2.3 Focus Beamer theme]
+\ProvidesPackage{beamerthemefocus}[2020/04/15 v2.6 Focus Beamer theme]
\mode<presentation>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamertheme-focus.tlpobj new/tlpkg/tlpobj/beamertheme-focus.tlpobj
--- old/tlpkg/tlpobj/beamertheme-focus.tlpobj 2019-02-28 03:17:53.000000000 +0100
+++ new/tlpkg/tlpobj/beamertheme-focus.tlpobj 2020-04-17 01:55:22.000000000 +0200
@@ -1,12 +1,12 @@
name beamertheme-focus
category Package
-revision 49748
+revision 54772
shortdesc A minimalist presentation theme for LaTeX Beamer
relocated 1
longdesc A presentation theme for LaTeX Beamer that aims at a clean and
longdesc minimalist design, so to minimize distractions and put the
longdesc focus directly on the content.
-runfiles size=7
+runfiles size=8
RELOC/tex/latex/beamertheme-focus/beamercolorthemefocus.sty
RELOC/tex/latex/beamertheme-focus/beamerfontthemefocus.sty
RELOC/tex/latex/beamertheme-focus/beamerinnerthemefocus.sty
@@ -15,7 +15,6 @@
catalogue-contact-bugs https://github.com/elauksap/focus-beamertheme/issues
catalogue-contact-repository https://github.com/elauksap/focus-beamertheme
catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/beamertheme-focus
-catalogue-date 2019-01-18 11:41:18 +0100
catalogue-license gpl3
catalogue-topics presentation
-catalogue-version 2.3
+catalogue-version 2.6
++++++ beamertheme-npbt.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamertheme-npbt.doc.tlpobj new/tlpkg/tlpobj/beamertheme-npbt.doc.tlpobj
--- old/tlpkg/tlpobj/beamertheme-npbt.doc.tlpobj 2019-02-28 03:17:54.000000000 +0100
+++ new/tlpkg/tlpobj/beamertheme-npbt.doc.tlpobj 2020-03-24 01:56:36.000000000 +0100
@@ -1,6 +1,6 @@
name beamertheme-npbt.doc
category Package
-revision 48424
+revision 54512
shortdesc doc files of beamertheme-npbt
relocated 1
docfiles size=113
++++++ beamertheme-npbt.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beamertheme-npbt.tlpobj new/tlpkg/tlpobj/beamertheme-npbt.tlpobj
--- old/tlpkg/tlpobj/beamertheme-npbt.tlpobj 2019-02-28 03:17:54.000000000 +0100
+++ new/tlpkg/tlpobj/beamertheme-npbt.tlpobj 2020-03-24 01:56:36.000000000 +0100
@@ -1,6 +1,6 @@
name beamertheme-npbt
category Package
-revision 48424
+revision 54512
shortdesc A collection of LaTeX beamer themes
relocated 1
longdesc "NPBT" stands for "Norman's Pandoc Beamer Themes". Currently
@@ -35,7 +35,6 @@
catalogue-contact-bugs https://github.com/NMarkgraf/NPBT/issues
catalogue-contact-repository https://github.com/NMarkgraf/NPBT
catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/beamertheme-npbt
-catalogue-date 2018-08-18 05:26:33 +0200
-catalogue-license gpl3pd
+catalogue-license gpl3 pd
catalogue-topics presentation
catalogue-version 4.1
++++++ beebe.tar.xz ++++++
++++ 170767 lines of diff (skipped)
++++++ beilstein.doc.tar.xz ++++++
Binary files old/doc/latex/beilstein/BJNANO_Technical_Handbook.pdf and new/doc/latex/beilstein/BJNANO_Technical_Handbook.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/beilstein/CHANGELOG.md new/doc/latex/beilstein/CHANGELOG.md
--- old/doc/latex/beilstein/CHANGELOG.md 2018-01-31 22:59:54.000000000 +0100
+++ new/doc/latex/beilstein/CHANGELOG.md 2020-02-26 23:07:31.000000000 +0100
@@ -4,19 +4,40 @@
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
+## 2.0 - 2020-02-22
+
+### Added
+- Support for field `doi` in `@WWW`
+
+### Changed
+- New font scheme: `newtxtext`, `newtxtt` and `newtxmath`
+- `utf8` is now the standard encoding for `inputenc`
+- CODEN strings were removed from the BiBTeX style file
+- Update documentation
+
+
+## 1.5 - 2019-10-30
+
+### Added
+- New environment `funding`
+
+### Changed
+- Update documentation
+
+
## 1.4 - 2018-01-29
### Added
- New manuscript type `suppinfo`
### Changed
-- Documentation updated
+- Update documentation
## 1.3 - 2017-11-09
### Changed
-- Loading of `cleveref` was postponed till the end of the preamble in order to avoid problems with `hyperref`
+- Loading of `cleveref` postponed till the end of the preamble in order to avoid problems with `hyperref`
## 1.2 - 2017-08-21
@@ -25,7 +46,7 @@
- Structure modified and files added for CTAN publication
### Changed
-- Updated documentation
+- Update documentation
### Fixed
- Option handling now compatible to recent `babel` versions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/beilstein/README.md new/doc/latex/beilstein/README.md
--- old/doc/latex/beilstein/README.md 2018-01-31 22:59:54.000000000 +0100
+++ new/doc/latex/beilstein/README.md 2020-02-26 23:07:31.000000000 +0100
@@ -2,8 +2,8 @@
beilstein -- Support for submissions to the ``Beilstein Journal
of Nanotechnology'' published by the Beilstein-Institut
- for the Advancement of Chemical Sciences
- Version: 1.4
+ zur Foerderung der Chemischen Wissenschaften
+ Version: 2.0
E-mail: journals-support(a)beilstein-institut.de
License: Released under the LaTeX Project Public License v1.3c or later
See http://www.latex-project.org/lppl.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/beilstein/beilstein-template.bib new/doc/latex/beilstein/beilstein-template.bib
--- old/doc/latex/beilstein/beilstein-template.bib 2017-09-10 22:56:37.000000000 +0200
+++ new/doc/latex/beilstein/beilstein-template.bib 2020-02-26 23:07:31.000000000 +0100
@@ -6,12 +6,12 @@
@ARTICLE{Constantino2001,
author = {Constantino, M. G. and V. Lacerda, Jr. and Aragao, V.},
year ={2001},
-journal = Molecules,
+journal = {Molecules},
volume = 6,
pages = {770--776}
}
-@COMMENT{Article within a journal with non-continuos (i.e.\ issue-based) pagination}
+@COMMENT{Article within a journal with non-continuos (i.e., issue-based) pagination}
@ARTICLE{Groeger2000,
author = {Gr\"{o}ger, H. and Sans, J. and G\"{u}thner, T.},
journal = {Chim. Oggi},
@@ -67,12 +67,11 @@
}
@COMMENT{Patent}
-@COMMENT{``pages'' holds the patent number, ``journal'' the type of patent}
+@COMMENT{``pages'' holds the patent number}
@PATENT{Schimmel,
author = {Schimmel, T. and Xie, F. and Obermair, C.},
title = {Gate controlled atomic switch},
- journal = {U.S. Pat. Appl.},
- pages = {20090195300},
+ pages = {US20100128342A1},
year = {Aug 6, 2009}
}
@@ -217,7 +216,7 @@
@ARTICLE{Masse1995,
author = {Masse, C. E. and Panek, J. S.},
- journal = chreay,
+ journal = {Chem. Rev. (Washington, DC, U. S.)},
year = 1995,
volume = 95,
pages = {1293--1316}
@@ -226,7 +225,7 @@
@ARTICLE{Jian1995,
author = {Jian, J. and Smith, D. T. and Weinreb, S. M.},
year ={1995},
-journal = joceah,
+journal = {J. Org. Chem.},
volume = 60,
pages = {5366--5367}
}
@@ -234,14 +233,14 @@
@ARTICLE{Weinreb1998,
author = {Weinreb, S. M. and Smith, D. T. and Jian, J.},
year ={1998},
-journal = syntbf,
+journal = {Synthesis},
pages = {509--521}
}
@ARTICLE{Danheiser1980,
author = {Danheiser, R. L. and Carini, D. J.},
year ={1980},
-journal = joceah,
+journal = {J. Org. Chem.},
volume = 45,
pages = {3925--3927}
}
@@ -249,7 +248,7 @@
@ARTICLE{Danheiser1986,
author = {Danheiser, R. L. and Carini, D. J. and Kwasigroch, C. A.},
year ={1986},
-journal = joceah,
+journal = {J. Org. Chem.},
volume = 51,
pages = {3870--3878}
}
@@ -257,7 +256,7 @@
@ARTICLE{Danheiser1985,
author = {Danheiser, R. L. and Kwasigroch, C. A. and Tsai, Y.-M.},
year ={1985},
-journal = jacsat,
+journal = {J. Am. Chem. Soc.},
volume = 107,
pages = {7233--7235}
}
@@ -273,14 +272,14 @@
@ARTICLE{Daidouji2005,
author = {Daidouji, K. and Fuchibe, K. and Akiyama, T.},
year ={2005},
-journal = orlef7,
+journal = {Org. Lett.},
volume = 7,
pages = {1051--1053}
}
@ARTICLE{Danheiser1981,
author = {Danheiser, R. L. and Carini, D. J. and Basak, A.},
year ={1981},
-journal = jacsat,
+journal = {J. Am. Chem. Soc.},
volume = 103,
pages = {1604--1606}
}
@@ -288,7 +287,7 @@
@ARTICLE{Danheiser1983,
author = {Danheiser, R. L. and Carini, D. J. and Fink, D. M.},
year ={1983},
-journal = tetrab,
+journal = {Tetrahedron},
volume = 39,
pages = {935--947}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/beilstein/beilstein-template.tex new/doc/latex/beilstein/beilstein-template.tex
--- old/doc/latex/beilstein/beilstein-template.tex 2018-01-31 22:59:54.000000000 +0100
+++ new/doc/latex/beilstein/beilstein-template.tex 2020-02-26 23:07:31.000000000 +0100
@@ -1,3 +1,12 @@
+%% !TeX TS-program = pdflatex
+%% !BIB TS-program = bibtex
+%% !TeX spellcheck = en_US
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% Many modern TeX editors understand the above lines to overwrite %
+%% globally set settings for individual documents. Just leave one %
+%% percent sign at the beginning of the line to activate that meta %
+%% comment. %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% This is a (brief) example using the beilstein class.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -27,15 +36,13 @@
%% british, english -> British English.
%%
%% For the input encoding:
-%% latin1 (default),
-%% utf8,
+%% latin1,
+%% utf8 (default),
%% applemac.
%%
-%% The defaults are [manuscript=fullresearchpaper,american,latin1].
-%% Please note, that you should consider using the utf8 option as this
-%% is the standard encoding nowadays.
+%% The defaults are [manuscript=fullresearchpaper,american,utf8].
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[utf8]{beilstein}
+\documentclass[]{beilstein}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Place any additional packages needed here. Only include packages
@@ -63,12 +70,17 @@
%% Meta-data block
%% ---------------
%% The title of the article is given with the usual \title command.
+%% The title of an article should be clear, concise and comprehensible to all
+%% readers with the purpose of quickly identifying the focus of the reported
+%% work. It should be brief and contain the most important keywords for search
+%% engine optimization. The use of capitals should be restricted to the first
+%% word and proper nouns. As far as possible abbreviations should be avoided.
%%
-%% If you write a file for supporting information using manuscript=suppinfo,
+%% If you write a file for Supporting Information using manuscript=suppinfo,
%% you should give an additional title using the macro \sititle or the
%% optional argument of \title
%%
-%% Each author should be given as a separate \author command.
+%% Each author needs to be given with a separate \author command.
%%
%% For corresponding authors please use \author* and give the email
%% address as a second mandatory argument.
@@ -94,20 +106,32 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% The document should begin with an abstract, if appropriate. If one
%% is given and should not be, a warning is issued.
-%%
-%% For the three parts of the abstract, ``Background'', ``Results''
-%% and ``Conclusions'', the corresponding commands should be used.
+%% The abstract should summarize the context and purpose of the study,
+%% the main findings and provide a brief summary and potential
+%% implications. Abbreviations should be used sparingly in the abstract.
+%% Citations and references should not be given in abstracts. Only
+%% standard characters are allowed.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{abstract}
-\background Allenylsilanes are useful intermediates in organic synthesis. An attractive,
-convergent but little used approach for their synthesis is the alkylidenation of stable silylketenes. Reactions thus far have been limited to the use of unsubstituted silylketenes (or equivalents) with stabilised or semi-stabilised ylides only. The current study explores the reactions of substituted ketenes prepared through rhodium(II)-mediated rearrangement of silylated diazoketones.
-\results A range of novel 1,3-disubstituted and 1,3,3-trisubstituted allenylsilanes were prepared using stabilised and semi-stabilised ylides. Alkylidenation with non-stabilised phosphorus ylides was not viable, but the use of titanium-based methylenating reagents was successful, allowing access to 1-substituted allenylsilanes.
-\conclusion Many novel allenylsilanes may be accessed by alkylidenation of substituted silylketenes. Importantly, for the first time, simple methylenation of silylketenes has been achieved using titanium carbenoid-based reagents.
+Allenylsilanes are useful intermediates in organic synthesis. An attractive,
+convergent but little used approach for their synthesis is the alkylidenation
+of stable silylketenes. Reactions thus far have been limited to the use of
+unsubstituted silylketenes (or equivalents) with stabilised or semi-stabilised
+ylides only. The current study explores the reactions of substituted ketenes
+prepared through rhodium(II)-mediated rearrangement of silylated diazoketones.
+A range of novel 1,3-disubstituted and 1,3,3-trisubstituted allenylsilanes were
+prepared using stabilised and semi-stabilised ylides. Alkylidenation with
+non-stabilised phosphorus ylides was not viable, but the use of titanium-based
+methylenating reagents was successful, allowing access to 1-substituted
+allenylsilanes. Many novel allenylsilanes may be accessed by alkylidenation of
+substituted silylketenes. Importantly, for the first time, simple methylenation
+of silylketenes has been achieved using titanium carbenoid-based reagents.
\end{abstract}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Keywords can be given with the \keywords command which takes five
-%% arguments. The arguments have to be sorted.
+%% Keywords can be given with the \keywords command. Any number of
+%% keywords can be given, but a number of at least five keywords is
+%% recommended. The arguments are to be sorted alphabetically.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\keywords{allenylsilanes; rhodium(II) octanoate-mediated rearrangement; silylketenes; titanium carbenoids; ylide}
@@ -159,7 +183,7 @@
[\ldots]
-With the requisite silylketenes in hand, attention turned to their reaction with the carboethoxy-stabilised phosphoranes \CN{4} and \CN{5}. At the outset, it was by no means certain that these would react efficiently with substituted silylketenes \CN{1} since it is well documented that nucleophiles attack silylketenes \textit{anti} to the silicon, i.e.\ the phosphoranes would be approaching from the same side as the \chem{R^1}-substituent. Since in all previous examples this substituent has been a hydrogen atom, the extension to bulkier substituents could not be taken for granted. In the event, however, we were pleased to find that in nearly all cases the desired allenylsilanes were formed in moderate to excellent yield (\cref{scheme:2}, \cref{tab:1}, see \cref{si:1} for full experimental data).
+With the requisite silylketenes in hand, attention turned to their reaction with the carboethoxy-stabilised phosphoranes \CN{4} and \CN{5}. At the outset, it was by no means certain that these would react efficiently with substituted silylketenes \CN{1} since it is well documented that nucleophiles attack silylketenes \textit{anti} to the silicon, i.e., the phosphoranes would be approaching from the same side as the \chem{R^1}-substituent. Since in all previous examples this substituent has been a hydrogen atom, the extension to bulkier substituents could not be taken for granted. In the event, however, we were pleased to find that in nearly all cases the desired allenylsilanes were formed in moderate to excellent yield (\cref{scheme:2}, \cref{tab:1}, see \cref{si:1} for full experimental data).
\begin{scheme}
\includegraphics[width=8.2cm,keepaspectratio]{scheme2}
\caption{Reaction of substituted silylketenes with ester-stabilised phosphoranes.}
@@ -220,23 +244,25 @@
\end{suppinfo}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% The "Acknowledgements" section can be given in all manuscripts.
-%% This should be done within the ``acknowledgements'' environment,
-%% which will make the correct section title.
+%% The sections "Acknowledgements" and "Funding" can be given in all
+%% manuscripts.
+%% This should be done within the environments ``acknowledgements''
+%% and ``funding'', which will produce the correct section titles.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{acknowledgements}
-We acknowledge EPSRC grant GR/L60135/01 (PCD) and generous unrestricted research funding from Pfizer for financial support.
+We acknowledge Prof. H. Vlassov for the helpful discussions of the results and J. Martin for assistance with the synthesis.
\end{acknowledgements}
+\begin{funding}
+The following sources of funding are acknowledged: National Natural Science Foundation of China (S.P.M.; Grant Nos. 51502240, 11674273, U1856203), Wellcome Trust (S.P.M., Award No. 094542/Z/12/Z, EPSRC (P.C.D.; Grant No. GR/L60135/01 (PCD)), and both authors thank the generous research funding from Pfizer for financial support.
+\end{funding}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% The appropriate \bibliography command should be placed here.
%% Notice that the class file automatically sets \bibliographystyle
%% and also names the section correctly.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\bibliography{beilstein-template}
-\vspace{3cm}
-This article is published in full length in \textit{Beilstein J. Org. Chem.}
-\textbf{2005}, \textit{1}, No. 5.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% That's it. Ending the document finishes the article. Happy TeXing!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beilstein.doc.tlpobj new/tlpkg/tlpobj/beilstein.doc.tlpobj
--- old/tlpkg/tlpobj/beilstein.doc.tlpobj 2019-02-28 03:17:58.000000000 +0100
+++ new/tlpkg/tlpobj/beilstein.doc.tlpobj 2020-02-27 01:55:30.000000000 +0100
@@ -1,9 +1,9 @@
name beilstein.doc
category Package
-revision 46503
+revision 53925
shortdesc doc files of beilstein
relocated 1
-docfiles size=186
+docfiles size=178
RELOC/doc/latex/beilstein/BJNANO_Technical_Handbook.pdf
RELOC/doc/latex/beilstein/CHANGELOG.md
RELOC/doc/latex/beilstein/README.md
++++++ beilstein.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/beilstein/bjnano.bst new/bibtex/bst/beilstein/bjnano.bst
--- old/bibtex/bst/beilstein/bjnano.bst 2018-01-31 22:59:54.000000000 +0100
+++ new/bibtex/bst/beilstein/bjnano.bst 2020-02-26 23:07:31.000000000 +0100
@@ -8,8 +8,8 @@
%% ----------------------------------------------------------------
%% beilstein -- Support for submissions to the ``Beilstein Journal
%% of Nanotechnology'' published by the Beilstein-Institut
-%% for the Advancement of Chemical Sciences
-%% Version: 1.4
+%% zur Foerderung der Chemischen Wissenschaften
+%% Version: 2.0
%% E-mail: journals-support(a)beilstein-institut.de
%% License: Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
@@ -1243,6 +1243,7 @@
format.url output
after.item 'output.state :=
format.urldate output
+ format.doi output
fin.entry
}
@@ -1287,72 +1288,6 @@
FUNCTION {default.type} {misc}
-MACRO {jan} {"Jan."}
-MACRO {feb} {"Feb."}
-MACRO {mar} {"Mar."}
-MACRO {apr} {"Apr."}
-MACRO {may} {"May"}
-MACRO {jun} {"June"}
-MACRO {jul} {"July"}
-MACRO {aug} {"Aug."}
-MACRO {sep} {"Sept."}
-MACRO {oct} {"Oct."}
-MACRO {nov} {"Nov."}
-MACRO {dec} {"Dec."}
-
-%% The ACS journals by CODEN
-MACRO {achre4} {"Acc.\ Chem.\ Res."}
-MACRO {acbcct} {"ACS Chem.\ Biol."}
-MACRO {ancac3} {"ACS Nano"}
-MACRO {ancham} {"Anal.\ Chem."}
-MACRO {armcbi} {"Annu.\ Rep.\ Med.\ Chem."}
-MACRO {bichaw} {"Biochemistry"}
-MACRO {bcches} {"Bioconjugate Chem."}
-MACRO {bjocbh} {"Beilstein J.~Org.\ Chem."}
-MACRO {bomaf6} {"Biomacromolecules"}
-MACRO {bipret} {"Biotechnol.\ Prog."}
-MACRO {ccccak} {"Collect.\ Czech.\ Chem.\ Commun."}
-MACRO {crtoec} {"Chem.\ Res.\ Toxicol."}
-MACRO {chlsac} {"Chem.\ Listy"}
-MACRO {chreay} {"Chem.\ Rev."}
-MACRO {cmatex} {"Chem.\ Mater."}
-MACRO {cmltag} {"Chem.\ Lett."}
-MACRO {cgdefu} {"Cryst.\ Growth Des."}
-MACRO {enfuem} {"Energy Fuels"}
-MACRO {eoider} {"Expert Opin.\ Invest.\ Drugs"}
-MACRO {eotpeg} {"Expert Opin.\ Ther.\ Pat."}
-MACRO {esthag} {"Environ.\ Sci.\ Technol."}
-MACRO {htcyam} {"Heterocycles"}
-MACRO {iechad} {"Ind.\ Eng.\ Chem.\ Res."}
-MACRO {inoraj} {"Inorg.\ Chem."}
-MACRO {jafcau} {"J.~Agric.\ Food Chem."}
-MACRO {jceaax} {"J.~Chem.\ Eng.\ Data"}
-MACRO {jcisd8} {"J.~Chem.\ Inf.\ Model."}
-MACRO {jctcce} {"J.~Chem.\ Theory Comput."}
-MACRO {jcchff} {"J. Comb. Chem."}
-MACRO {jmcmar} {"J. Med. Chem."}
-MACRO {jnprdf} {"J. Nat. Prod."}
-MACRO {joceah} {"J.~Org.\ Chem."}
-MACRO {jpcafh} {"J.~Phys.\ Chem.~A"}
-MACRO {jpcbfk} {"J.~Phys.\ Chem.~B"}
-MACRO {jpccck} {"J.~Phys.\ Chem.~C"}
-MACRO {jprobs} {"J.~Proteome Res."}
-MACRO {jacsat} {"J.~Am.\ Chem.\ Soc."}
-MACRO {langd5} {"Langmuir"}
-MACRO {mamobx} {"Macromolecules"}
-MACRO {mpohbp} {"Mol.\ Pharm."}
-MACRO {nalefd} {"Nano Lett."}
-MACRO {namefi} {"Nat.\ Med."}
-MACRO {obcrak} {"Org.\ Biomol.\ Chem."}
-MACRO {orlef7} {"Org.\ Lett."}
-MACRO {oprdfk} {"Org.\ Proc.\ Res.\ Dev."}
-MACRO {orgnd7} {"Organometallics"}
-MACRO {pachas} {"Pure Appl.\ Chem."}
-MACRO {phreeb} {"Pharm.\ Res."}
-MACRO {syntbf} {"Synthesis"}
-MACRO {teleay} {"Tetrahedron Lett."}
-MACRO {tetrab} {"Tetrahedron"}
-
READ
FUNCTION {initialize.controls}
@@ -1383,7 +1318,8 @@
'skip$
{ s #2 "{ff }{vv }{ll}{ jj}" format.name$ "others" =
{ bbl.etal space.connect }
- { bbl.and space.connect s #2 "{vv~}{ll}" format.name$ space.connect }
+ { bbl.and space.connect s #2 "{vv~}{ll}" format.name$ space.connect
+ }
if$
}
if$
@@ -1534,7 +1470,7 @@
EXECUTE {end.bib}
%%
%% Originally developed by Martin Sievers (info(a)schoenerpublizieren.de)
-%% Copyright (C) 2009-2018 by Beilstein-Institut for the Advancement of Chemical Sciences (Beilstein)
+%% Copyright (C) 2009-2020 by Beilstein-Institut zur Foerderung der Chemischen Wissenschaften (Beilstein)
%%
%% Part of this bundle is derived from cite.sty, to which the
%% following license applies:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/beilstein/beilstein.cls new/tex/latex/beilstein/beilstein.cls
--- old/tex/latex/beilstein/beilstein.cls 2018-01-31 22:59:54.000000000 +0100
+++ new/tex/latex/beilstein/beilstein.cls 2020-02-26 23:07:31.000000000 +0100
@@ -8,8 +8,8 @@
%% ----------------------------------------------------------------
%% beilstein -- Support for submissions to the ``Beilstein Journal
%% of Nanotechnology'' published by the Beilstein-Institut
-%% for the Advancement of Chemical Sciences
-%% Version: 1.4
+%% zur Foerderung der Chemischen Wissenschaften
+%% Version: 2.0
%% E-mail: journals-support(a)beilstein-institut.de
%% License: Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
@@ -17,7 +17,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{beilstein}
-[2018/01/29 v1.4 Template for submissions to the ``Beilstein Journal %
+[2020/02/22 v2.0 Template for submissions to the ``Beilstein Journal %
of Nanotechnology'' (BJNANO)]
\RequirePackage{xkeyval}
\RequirePackage{ifthen}
@@ -34,7 +34,7 @@
\DeclareOptionX<beilstein>{latin1}{\def\beilstein@inputenc{latin1}}
\DeclareOptionX<beilstein>{utf8}{\def\beilstein@inputenc{utf8}}
\DeclareOptionX<beilstein>{applemac}{\def\beilstein@inputenc{applemac}}
-\ExecuteOptionsX<beilstein>{american,latin1}
+\ExecuteOptionsX<beilstein>{american,utf8}
\newcommand*\beilstein@manuscript{fullresearchpaper}
\define@cmdkey{beilstein}[beilstein@]{manuscript}{}
\define@boolkey{beilstein}[beilstein@]{sectionnumbering}[true]{}
@@ -63,7 +63,7 @@
}%
\let\beilstein@manuscript\beilstein@type@default
\fi
-}
+}
\LoadClass[12pt,a4paper,oneside,onecolumn,titlepage]{article}
\iflangamerican
\RequirePackage[american]{babel}%
@@ -73,12 +73,15 @@
\ClassInfo{beilstein}{Language has been set to British English}%
\fi%
\RequirePackage[\beilstein@inputenc]{inputenc}
-\ClassInfo{beilstein}{Input encoding has been set to \beilstein@inputenc}\RequirePackage{inputenc}
+\ClassInfo{beilstein}{Input encoding has been set to \beilstein@inputenc}
\RequirePackage[T1]{fontenc}
-\RequirePackage{mathptmx}
-\RequirePackage[scaled=0.91]{helvet}
-\RequirePackage{courier}
-\RequirePackage{textcomp}
+\RequirePackage[full]{textcomp}
+\RequirePackage[scale]{tgheros}
+\RequirePackage[intlimits,sumlimits,namelimits,fleqn]{amsmath}
+\RequirePackage{amssymb}
+\RequirePackage{newtxtext}
+\RequirePackage[zerostyle=a]{newtxtt}
+\RequirePackage{newtxmath}
\RequirePackage[%
textheight=23cm,%
textwidth=16.8cm,%
@@ -154,9 +157,7 @@
\renewcommand\subparagraph{
\ClassError{beilstein}{The sectioning command \string\paragraph\space
\MessageBreak is not supported by the beilstein class}{You can only use \string\section\space \string\subsection\space and \string\subsubsection}}
-\RequirePackage[intlimits,sumlimits,namelimits,fleqn]{amsmath}
\setlength{\mathindent}{1.6cm}%
-\RequirePackage{amssymb}
\DeclareFontFamily{U}{eur}{\skewchar\font'177}
\DeclareFontShape{U}{eur}{m}{n}{%
<-6> eurm5 <6-8> eurm7 <8-> eurm10}{}
@@ -499,7 +500,8 @@
\else
\ifcase\NAT@ctype
\ifx\NAT@last@nm\NAT@nm \NAT@yrsep\NAT@penalty\NAT@space\else
- \@citea \NAT@test{\@ne}\NAT@spacechar\NAT@mbox{\NAT@super@kern\NAT@@open}%
+ \@citea
+ \NAT@test{\@ne}\NAT@spacechar\NAT@mbox{\NAT@super@kern\NAT@@open}%
\fi
\if*#1*\else#1\NAT@spacechar\fi
\NAT@mbox{\NAT@hyper@{{\citenumfont{\NAT@num}}}}%
@@ -754,14 +756,20 @@
\ifthenelse{\boolean{corauth}}%
{}%
{\ifthenelse{\value{c@totauthor}>1}%
- {\ClassError{beilstein}{At least one corresponding author has to be given.\MessageBreak Please use \string\author*\space for that}%
- {Please use at least one \string\author* command to set information %
- about the corresponding author.\MessageBreak Have a look at the %
+ {\ClassError{beilstein}{At least one corresponding author has to be
+ given.\MessageBreak Please use \string\author*\space for that}%
+ {Please use at least one \string\author* command to set
+ information %
+ about the corresponding author.\MessageBreak Have a look at
+ the %
documentation for more details}%
}%
{\ifthenelse{\equal{\emails}{}}%
- {\ClassError{beilstein}{The author has been made corresponding author.\MessageBreak Therefore please provide an email address for the author}%
- {Use the second optional argument for that or use \string\author* instead}}{}%
+ {\ClassError{beilstein}{The author has been made corresponding
+ author.\MessageBreak Therefore please provide an email address
+ for the author}%
+ {Use the second optional argument for that or use
+ \string\author* instead}}{}%
}%
}%
\ifthenelse{\value{c@totaffiliation}>1}%
@@ -791,14 +799,21 @@
\par\vskip2ex%
\ifthenelse{\boolean{corauth}}{}%
{\ifthenelse{\value{c@totauthor}>1}%
- {\ClassError{beilstein}{At least one corresponding author has to be given.\MessageBreak Please use \string\author*\space for that}%
- {Please use at least one \string\author* command to set information %
- about the corresponding author.\MessageBreak Have a look at the %
+ {\ClassError{beilstein}{At least one corresponding author has to
+ be given.\MessageBreak Please use \string\author*\space for
+ that}%
+ {Please use at least one \string\author* command to set
+ information %
+ about the corresponding author.\MessageBreak Have a look
+ at the %
documentation for more details}%
}%
{\ifthenelse{\equal{\emails}{}}%
- {\ClassError{beilstein}{The author has been made corresponding author.\MessageBreak Therefore please provide an email address for the author}%
- {Use the second optional argument for that or use \string\author* instead}}{}%
+ {\ClassError{beilstein}{The author has been made
+ corresponding author.\MessageBreak Therefore please provide
+ an email address for the author}%
+ {Use the second optional argument for that or use
+ \string\author* instead}}{}%
}%
}%
\ifthenelse{\value{c@totaffiliation}>1}%
@@ -826,7 +841,8 @@
}%
{%
\renewenvironment{abstract}{\ClassWarning{beilstein}{An abstract %
- should not be part of the chosen document type \beilstein@manuscript}}{}%
+ should not be part of the chosen document type
+ \beilstein@manuscript}}{}%
\newcommand*{\background}{\relax}%
\newcommand*{\results}{\relax}%
\newcommand*{\conclusion}{\relax}%
@@ -839,6 +855,7 @@
\ClassWarning{beilstein}{Keywords should not be part of the
chosen document type \beilstein@manuscript}}}
\newenvironment{acknowledgements}{\par\textbf{\large Acknowledgements\\*}}{}
+\newenvironment{funding}{\par\textbf{\large Funding\\*}}{}
\newenvironment{suppinfo}%
{\FloatBarrier%
\par\vskip2ex%
@@ -934,7 +951,7 @@
\vfuzz \hfuzz
%%
%% Originally developed by Martin Sievers (info(a)schoenerpublizieren.de)
-%% Copyright (C) 2009-2018 by Beilstein-Institut for the Advancement of Chemical Sciences (Beilstein)
+%% Copyright (C) 2009-2020 by Beilstein-Institut zur Foerderung der Chemischen Wissenschaften (Beilstein)
%%
%% Part of this bundle is derived from cite.sty, to which the
%% following license applies:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/beilstein.tlpobj new/tlpkg/tlpobj/beilstein.tlpobj
--- old/tlpkg/tlpobj/beilstein.tlpobj 2019-02-28 03:17:58.000000000 +0100
+++ new/tlpkg/tlpobj/beilstein.tlpobj 2020-02-27 01:55:30.000000000 +0100
@@ -1,6 +1,6 @@
name beilstein
category Package
-revision 46503
+revision 53925
shortdesc Support for submissions to the "Beilstein Journal of Nanotechnology"
relocated 1
longdesc The package provides a LaTeX class file and a BibTeX style file
@@ -9,12 +9,11 @@
longdesc be used for any kind of document, they have only been designed
longdesc and tested to be suitable for submissions to the Beilstein
longdesc Journal of Nanotechnology.
-runfiles size=17
+runfiles size=16
RELOC/bibtex/bst/beilstein/bjnano.bst
RELOC/tex/latex/beilstein/beilstein.cls
catalogue-contact-home https://www.beilstein-journals.org/bjnano/
catalogue-ctan /macros/latex/contrib/beilstein
-catalogue-date 2018-01-30 22:19:12 +0100
catalogue-license lppl1.3c
catalogue-topics journalpub
-catalogue-version 1.4
+catalogue-version 2.0
++++++ bezierplot.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/bezierplot/README new/doc/lualatex/bezierplot/README
--- old/doc/lualatex/bezierplot/README 2018-09-11 23:39:54.000000000 +0200
+++ new/doc/lualatex/bezierplot/README 2019-06-19 00:29:39.000000000 +0200
@@ -8,7 +8,7 @@
number of used points.
VERSION:
-1.3 2018-09-03
+1.4 2019-06-18
LICENSE:
The package and the program are distributed on CTAN under the terms of
Binary files old/doc/lualatex/bezierplot/bezierplot-doc.pdf and new/doc/lualatex/bezierplot/bezierplot-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/bezierplot/bezierplot-doc.tex new/doc/lualatex/bezierplot/bezierplot-doc.tex
--- old/doc/lualatex/bezierplot/bezierplot-doc.tex 2018-09-11 23:39:54.000000000 +0200
+++ new/doc/lualatex/bezierplot/bezierplot-doc.tex 2019-06-19 00:29:39.000000000 +0200
@@ -23,7 +23,7 @@
\section{Introduction}
\texttt{bezierplot} is a Lua program as well as a (Lua)\LaTeX{} package. This document describes both.
-Given a smooth function, \texttt{bezierplot} returns a smooth bezier path written in Ti\emph{k}Z notation (which also matches \MP{}) that approximates the graph of the function. For polynomial functions of degree $\leq 3$ and inverses of them, the approximation is exact. \texttt{bezierplot} finds special graph points such as extreme points and inflection points and reduces the number of used points.
+Given a smooth function, \texttt{bezierplot} returns a smooth bezier path written in Ti\emph{k}Z notation (which also matches \MP{}) that approximates the graph of the function. For polynomial functions of degree $\leq 3$ and inverses of them, the approximation is exact (up to numeric precision). \texttt{bezierplot} finds special graph points such as extreme points and inflection points and reduces the number of used points.
The following example will show a comparison of \textsc{gnuplot} with \verb|bezierplot| for the function $y=\sqrt{x}$ for $0\leq x \leq 5$:
\begin{center}
@@ -39,7 +39,7 @@
\end{scope}
\end{tikzpicture}
\end{center}
-\textsc{gnuplot} used 51 samples (no smoothing) and is still quite inexact at the beginning, whereas \verb|bezierplot| uses 4 points only and is exact!
+\textsc{gnuplot} used 51 samples (no smoothing) and is still quite inexact at the beginning, whereas \verb|bezierplot| uses 4 points only and is exact (up to numeric precision)!
\section{Installation}
As \texttt{bezierplot} is written in Lua, the installation depends whether you are using Lua\LaTeX{} or another \LaTeX{} engine.
\subsection{Installation For Lua\LaTeX{}}
@@ -179,7 +179,7 @@
\newpage
%
\section{Examples of \texttt{bezierplot} in Comparison with \textsc{gnuplot}}
-The following graphs are drawn with \texttt{bezierplot} (black) and \textsc{gnuplot} (red). \textsc{gnuplot} used 1000 samples per example. The functions are given below the pictures (left: bezierplot, right: \textsc{gnuplot}).
+The following graphs are drawn with \texttt{bezierplot} (black) and \textsc{gnuplot} (red). You may not recognize the red behind the black unless you zoom in. \textsc{gnuplot} used 1000 samples per example. The functions are given below the pictures (left: bezierplot, right: \textsc{gnuplot}).
\begin{multicols}{3}
\graphcomparison{0.32*x-0.7}{0.32*x-0.7}
\graphcomparison{-x^2+4}{-x**2+4}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bezierplot.doc.tlpobj new/tlpkg/tlpobj/bezierplot.doc.tlpobj
--- old/tlpkg/tlpobj/bezierplot.doc.tlpobj 2019-02-28 03:18:04.000000000 +0100
+++ new/tlpkg/tlpobj/bezierplot.doc.tlpobj 2019-06-19 01:38:42.000000000 +0200
@@ -1,6 +1,6 @@
name bezierplot.doc
category Package
-revision 48644
+revision 51398
shortdesc doc files of bezierplot
relocated 1
docfiles size=66
++++++ bezierplot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/bezierplot/bezierplot.lua new/tex/lualatex/bezierplot/bezierplot.lua
--- old/tex/lualatex/bezierplot/bezierplot.lua 2018-09-11 23:39:54.000000000 +0200
+++ new/tex/lualatex/bezierplot/bezierplot.lua 2019-06-19 00:29:39.000000000 +0200
@@ -1,6 +1,6 @@
#!/usr/bin/env lua
-- Linus Romer, published 2018 under LPPL Version 1.3c
--- version 1.3 2018-09-03
+-- version 1.4 2019-06-18
abs = math.abs
acos = math.acos
asin = math.asin
@@ -15,6 +15,24 @@
tan = math.tan
huge = math.huge
+-- just a helper for debugging:
+local function printdifftable(t)
+ for i = 1,#t do
+ for j = 1, 6 do
+ if j < 5 then
+ io.write(t[i][j].." ")
+ else
+ if t[i][j] then
+ io.write("true ")
+ else
+ io.write("false ")
+ end
+ end
+ end
+ io.write("\n")
+ end
+end
+
-- cube root defined for all real numbers x
function cbrt(x)
if x < 0 then
@@ -66,7 +84,7 @@
local l = #graph
if l < 4 then -- this is not worth the pain...
for i = 1, l do
- table.insert(dgraph,{graph[i][1],graph[i][2],0,0,0,0})
+ table.insert(dgraph,{graph[i][1],graph[i][2],0,0,false,false})
end
else
local yh = func(graph[1][1]-h)
@@ -540,7 +558,12 @@
err = abs(ya-f(xa))
end
end
- if err <= maxerror then
+ if (err <= maxerror)
+ and qx > -math.huge and qx < math.huge
+ and qy > -math.huge and qy < math.huge
+ and rx > -math.huge and ry < math.huge
+ and sx > -math.huge and sy < math.huge
+ then
return {qx,qy,rx,ry,sx,sy}
else
-- search for an intermediate point where the graph has the same
@@ -561,7 +584,11 @@
end
return left
end
- else
+ elseif qx > -math.huge and qx < math.huge
+ and qy > -math.huge and qy < math.huge
+ and rx > -math.huge and ry < math.huge
+ and sx > -math.huge and sy < math.huge
+ then
return {qx,qy,rx,ry,sx,sy}
end
end
@@ -586,16 +613,6 @@
end
end
--- just for debugging:
-local function printtable(t)
- for i = 1,#t do
- for j = 1, #t[i] do
- io.write(t[i][j].." ")
- end
- io.write("\n")
- end
-end
-
-- main function
function bezierplot(functionstring,xminstring,xmaxstring,yminstring,ymaxstring,samplesstring,notation)
local fstringreplaced = string.gsub(functionstring, "%*%*", "^")
@@ -840,6 +857,7 @@
-- go through the connected parts
for part = 1, #graphs do
local dg = diffgraph(f,graphs[part],xstep)
+ --printdifftable(dg) -- for debugging
bezierpoints[#bezierpoints+1] = {dg[1][1],dg[1][2]}
local startindex = 1
for k = 2, #dg do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/bezierplot/bezierplot.sty new/tex/lualatex/bezierplot/bezierplot.sty
--- old/tex/lualatex/bezierplot/bezierplot.sty 2018-09-11 23:39:54.000000000 +0200
+++ new/tex/lualatex/bezierplot/bezierplot.sty 2019-06-19 00:29:39.000000000 +0200
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bezierplot}[2018/09/03 bezierplot]
+\ProvidesPackage{bezierplot}[2019/06/18 bezierplot]
\RequirePackage{xparse}
\RequirePackage{iftex}
\ifLuaTeX
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bezierplot.tlpobj new/tlpkg/tlpobj/bezierplot.tlpobj
--- old/tlpkg/tlpobj/bezierplot.tlpobj 2019-02-28 03:18:04.000000000 +0100
+++ new/tlpkg/tlpobj/bezierplot.tlpobj 2019-06-19 01:38:42.000000000 +0200
@@ -1,6 +1,6 @@
name bezierplot
category Package
-revision 48644
+revision 51398
shortdesc Approximate smooth function graphs with cubic bezier splines for use with TikZ or MetaPost
relocated 1
longdesc This package consists of a Lua program as well as a (Lua)LaTeX
@@ -16,7 +16,7 @@
RELOC/tex/lualatex/bezierplot/bezierplot.sty
catalogue-contact-repository https://github.com/linusromer/bezierplot
catalogue-ctan /macros/luatex/latex/bezierplot
-catalogue-date 2018-09-11 17:29:23 +0200
+catalogue-date 2019-06-18 19:37:08 +0200
catalogue-license lppl1.3c
catalogue-topics luatex use-lua graphics-plot graphics-plotfn
-catalogue-version 1.3
+catalogue-version 1.4
++++++ bgteubner.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bgteubner.doc.tlpobj new/tlpkg/tlpobj/bgteubner.doc.tlpobj
--- old/tlpkg/tlpobj/bgteubner.doc.tlpobj 2019-02-28 03:18:06.000000000 +0100
+++ new/tlpkg/tlpobj/bgteubner.doc.tlpobj 2020-03-04 23:49:28.000000000 +0100
@@ -1,6 +1,6 @@
name bgteubner.doc
category Package
-revision 44205
+revision 54080
shortdesc doc files of bgteubner
relocated 1
docfiles size=821
++++++ bgteubner.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bgteubner.tlpobj new/tlpkg/tlpobj/bgteubner.tlpobj
--- old/tlpkg/tlpobj/bgteubner.tlpobj 2019-02-28 03:18:07.000000000 +0100
+++ new/tlpkg/tlpobj/bgteubner.tlpobj 2020-03-04 23:49:28.000000000 +0100
@@ -1,6 +1,6 @@
name bgteubner
category Package
-revision 44205
+revision 54080
shortdesc Class for producing books for the publisher "Teubner Verlag"
relocated 1
longdesc The bgteubner document class has been programmed by order of
@@ -10,10 +10,10 @@
longdesc class is intended to generate a unique layout, many things
longdesc (layout etc.) are fixed and cannot be altered by the user. If
longdesc you want to use the document class for another purpose than
-longdesc publishing with the Teubner Verlag, this may arrise unwanted
-longdesc restrictions (For instance, the document class provides only
-longdesc two paper sizes: DIN A-5 and 17cm x 24cm; only two font
-longdesc families are supported: Times and European Computer Modern).
+longdesc publishing with the Teubner Verlag, this may arouse unwanted
+longdesc restrictions (for instance, the document class provides only
+longdesc two paper sizes: DIN A5 and 17cm x 24cm; only two font families
+longdesc are supported: Times and European Computer Modern).
runfiles size=70
RELOC/bibtex/bst/bgteubner/bgteuabbr.bst
RELOC/bibtex/bst/bgteubner/bgteuabbr2.bst
@@ -28,7 +28,6 @@
RELOC/tex/latex/bgteubner/hhsubfigure.sty
RELOC/tex/latex/bgteubner/ptmxcomp.sty
catalogue-ctan /macros/latex/contrib/bgteubner
-catalogue-date 2017-05-05 00:16:32 +0200
catalogue-license lppl
catalogue-topics class book-pub publisher
catalogue-version 2.11
++++++ bib2gls.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/bib2gls/CHANGES new/texmf-dist/doc/support/bib2gls/CHANGES
--- old/texmf-dist/doc/support/bib2gls/CHANGES 2018-12-01 23:46:56.000000000 +0100
+++ new/texmf-dist/doc/support/bib2gls/CHANGES 2020-03-24 21:54:02.000000000 +0100
@@ -1,14 +1,169 @@
+v2.3 (2020-03-23):
+
+ * New sort methods: recordcount and recordcount-reverse
+ (both require --record-count).
+
+ * Resource option 'selection' now also allows the values
+ 'deps but not recorded' and 'ancestors but not recorded'
+
+ * New resource options:
+
+ custom-sort-fallbacks
+ field-concat-sep
+
+ * The sort fallback resource options custom-sort-fallbacks,
+ entry-sort-fallback, symbol-sort-fallback,
+ abbreviation-sort-fallback and bibtexentry-sort-fallback
+ now allow 'id' or 'original id' as values or values that are
+ field concatenations.
+
+ * New command line switches:
+
+ --provide-glossaries
+ --no-provide-glossaries
+
+v2.2 (2020-03-16):
+
+ * Bug fix (texparserlib.jar):
+
+ - "Files located in local texmf path are not determined
+ correctly" issue #3
+ https://github.com/nlct/bib2gls/issues/3
+
+v2.1 (2020-02-28):
+
+ * Only trigger error exit code for bib parser exceptions
+ (just warn for interpreter and aux parser exceptions).
+
+ * Bug fix (texparserlib.jar):
+
+ - "Fails to parse \@writefile{lot}{\egroup }" issue #2
+ https://github.com/nlct/texparser/issues/2
+
+v2.0 (2020-02-12):
+
+ * New command line options:
+
+ --trim-only-fields
+ --trim-except-fields
+
+ * New resource option:
+
+ interpret-fields-action
+ prefix-fields
+ append-prefix-field
+ append-prefix-field-cs
+ append-prefix-field-exceptions
+ append-prefix-field-cs-exceptions
+ append-prefix-field-nbsp-match
+ save-sibling-count
+
+ * New values for 'identical-sort-action' option: 'def' and 'use'
+
+ * New value for 'selection' option: 'recorded and deps and see not also'
+
+ * New internal fields: dualprefix, dualprefixplural,
+ dualprefixfirst, dualprefixfirstplural, siblingcount,
+ siblinglist
+
+ * Dual prefix mappings now added if the prefix field is defined
+ (provided by glosssaries-prefix.sty).
+
+ * Interpreter now supports \nobreakspace and it obeys
+ --break-space and --no-break-space in the same way as ~
+
+ * Added support for nonumberlist
+
+ * Bug fixes:
+
+ - corrected interpret-fields
+ - corrected selection={recorded and deps and see}
+ - corrected plural for entries where the name is inherited from
+ the parent
+
+
+ * convertgls2bib:
+
+ - new command line options:
+
+ --ignore-type
+ --no-ignore-type
+ --split-on-type (-p)
+ --no-split-on-type
+ --ignore-category
+ --no-ignore-category
+ --split-on-category (-c)
+ --no-split-on-category
+ --ignore-fields (-f)
+ --overwrite
+ --no-overwrite
+ --preamble-only (-p)
+ --no-preamble-only
+ --index-conversion (-i)
+ --no-index-conversion
+ --absorb-see
+ --no-absorb-see
+
+ - added check for see=[\alsoname] in addition to
+ see=[\seealsoname]
+
+v1.9 (2019-04-09):
+
+ * manual:
+
+ - added section "Logical Divisions: type vs group vs parent"
+
+ * new resource option:
+
+ compact-ranges
+ progenitor-type
+ adopted-parent-field
+ unknown-entry-alias
+ save-original-entrytype
+ field-case-change
+ no-case-change-cs
+ encapsulate-fields
+ encapsulate-fields*
+ interpret-fields
+ replicate-missing-field-action
+ entry-sort-fallback
+
+ * new entry types:
+
+ @progenitor
+ @spawnindex
+ @spawnindexplural
+ @spawnentry
+ @spawnsymbol
+ @spawnnumber
+ @spawnabbreviation
+ @spawnacronym
+
+ * New command line options:
+
+ --warn-non-bib-fields
+ --no-warn-non-bib-fields
+ --warn-unknown-entry-types
+ --no-warn-unknown-entry-types
+
+ * The `type` option (and similar options that assign the `type`
+ field) now accepts the special setting "same as parent".
+
+ * The `group` option no longer requires the --group switch.
+
+ * The `match` and `not-match` options now accept `original entrytype`.
+
v1.8 (2018-11-30):
* new resource options:
- --save-primary-locations
- --primary-location-formats
- --long-case-change
- --dual-long-case-change
- --word-boundaries
- --sort-label-list
- --dependency-fields
+ save-primary-locations
+ primary-location-formats
+ long-case-change
+ dual-long-case-change
+ word-boundaries
+ sort-label-list
+ dependency-fields
* added support for the new glossaries-extra package option
record=nameref (introduced to glossaries-extra v1.37).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/bib2gls/README.md new/texmf-dist/doc/support/bib2gls/README.md
--- old/texmf-dist/doc/support/bib2gls/README.md 2018-05-10 00:21:20.000000000 +0200
+++ new/texmf-dist/doc/support/bib2gls/README.md 2020-02-28 23:31:09.000000000 +0100
@@ -3,18 +3,26 @@
Command line application to convert `.bib` files to
`glossaries-extra.sty` resource files.
-Author: Nicola Talbot (http://www.dickimaw-books.com/)
+Author: Nicola Talbot (https://www.dickimaw-books.com/contact)
-Application Home Page: http://www.dickimaw-books.com/software/bib2gls
+Application Home Page: https://www.dickimaw-books.com/software/bib2gls
# Licence
-Copyright (C) 2017-2018 Nicola L. C. Talbot (www.dickimaw-books.com)
+Copyright (C) 2017-2020 Nicola L. C. Talbot (www.dickimaw-books.com)
+
License GPLv3+: GNU GPL version 3 or later
http://gnu.org/licenses/gpl.html
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
+# Requirements
+
+ - Java Runtime Environment (at least Java 8).
+
+ - TeX distribution that includes `glossaries-extra.sty`
+ and dependent packages (such as `glossaries.sty`).
+
# Summary
This application may be used to extract glossary information
@@ -130,6 +138,7 @@
- *TEXMF*`/scripts/bib2gls/convertgls2bib.sh` (Unix-like systems
only.)
- *TEXMF*`/doc/support/bib2gls/bib2gls.pdf` (User manual.)
+ - *TEXMF*`/doc/support/bib2gls/bib2gls-begin.pdf` (Introductory Guide.)
- *TEXMF*`/doc/support/bib2gls/examples/` (example files)
Note that `texparserlib.jar` isn't an application. It's
Binary files old/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf and new/texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/bib2gls/bib2gls.1 new/texmf-dist/doc/support/bib2gls/bib2gls.1
--- old/texmf-dist/doc/support/bib2gls/bib2gls.1 2018-12-01 23:46:56.000000000 +0100
+++ new/texmf-dist/doc/support/bib2gls/bib2gls.1 2020-03-24 21:54:02.000000000 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.12 (Pod::Simple 3.39)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "BIB2GLS 1"
-.TH BIB2GLS 1 "2018-08-25" "perl v5.28.0" "bib2gls"
+.TH BIB2GLS 1 "2020-03-18" "perl v5.30.2" "bib2gls"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -201,16 +201,30 @@
Don't try interpreting (La)TeX commands.
.IP "\fB\-\-break\-space\fR" 4
.IX Item "--break-space"
-Interpret tilde character as a normal space.
+Interpret \f(CW\*(C`~\*(C'\fR (tilde) character and \f(CW\*(C`\enobreakspace\*(C'\fR as a normal space.
.IP "\fB\-\-no\-break\-space\fR" 4
.IX Item "--no-break-space"
-Interpret tilde as a non-breaking space (default).
+Interpret \f(CW\*(C`~\*(C'\fR (tilde) and \f(CW\*(C`\enobreakspace\*(C'\fR as a non-breaking space (default).
.IP "\fB\-\-cite\-as\-record\fR" 4
.IX Item "--cite-as-record"
-Treat \fB\ecitation\fR as an ignored record.
+Treat \f(CW\*(C`\ecitation\*(C'\fR as an ignored record.
.IP "\fB\-\-no\-cite\-as\-record\fR" 4
.IX Item "--no-cite-as-record"
-Don't check for instances of \fB\ecitation\fR in the \fB.aux\fR file (default).
+Don't check for instances of \f(CW\*(C`\ecitation\*(C'\fR in the \fI.aux\fR file (default).
+.IP "\fB\-\-warn\-non\-bib\-fields\fR" 4
+.IX Item "--warn-non-bib-fields"
+Warn if internal non-bib fields are found in the \fI.bib\fR file.
+.IP "\fB\-\-no\-warn\-non\-bib\-fields\fR" 4
+.IX Item "--no-warn-non-bib-fields"
+Don't warn if internal non-bib fields are found in the \fI.bib\fR file.
+The use of these internal fields can cause unexpected results, so
+only use this option if you have taken appropriate precautions.
+.IP "\fB\-\-warn\-unknown\-entry\-types\fR" 4
+.IX Item "--warn-unknown-entry-types"
+Warn if any unknown entry types are found in the \fI.bib\fR file.
+.IP "\fB\-\-no\-warn\-unknown\-entry\-types\fR" 4
+.IX Item "--no-warn-unknown-entry-types"
+Don't warn if any unknown entry types are found in the \fI.bib\fR file.
.IP "\fB\-\-merge\-wrglossary\-records\fR" 4
.IX Item "--merge-wrglossary-records"
Merge an entry's \fBwrglossary\fR records for the same page locations.
@@ -220,8 +234,8 @@
Don't merge an entry's \fBwrglossary\fR records.
.IP "\fB\-\-merge\-nameref\-on\fR \fIrule\fR" 4
.IX Item "--merge-nameref-on rule"
-Rule for merging locations created with the record=nameref package option
-(requires glossaries\-extra.sty version 1.37+). The \fIrule\fR may be
+Rule for merging locations created with the \fBrecord=nameref\fR package option
+(requires \fIglossaries\-extra.sty\fR version 1.37+). The \fIrule\fR may be
one of: \fBhcounter\fR, \fBhref\fR, \fBtitle\fR or \fBlocation\fR.
.IP "\fB\-\-force\-cross\-resource\-refs\fR or \fB\-x\fR" 4
.IX Item "--force-cross-resource-refs or -x"
@@ -231,15 +245,15 @@
Don't force cross-resource referencing mode on (default).
.IP "\fB\-\-support\-unicode\-script\fR" 4
.IX Item "--support-unicode-script"
-Text superscript (\etextsuperscript) or subscripts (\etextsubscript)
+Text superscript (\f(CW\*(C`\etextsuperscript\*(C'\fR) or subscripts (\f(CW\*(C`\etextsubscript\*(C'\fR)
will use Unicode superscript/subscript characters if available.
-For example, \etextsuperscript{2} will be converted to U+00B2
+For example, \f(CW\*(C`\etextsuperscript{2}\*(C'\fR will be converted to U+00B2
(superscript two).
.IP "\fB\-\-no\-support\-unicode\-script\fR" 4
.IX Item "--no-support-unicode-script"
-Text superscript (\etextsuperscript) or subscripts (\etextsubscript)
+Text superscript (\f(CW\*(C`\etextsuperscript\*(C'\fR) or subscripts (\f(CW\*(C`\etextsubscript\*(C'\fR)
won't be converted to Unicode superscript/subscript characters.
-For example, \etextsuperscript{2} will be converted to <sup>2</sup>
+For example, \f(CW\*(C`\etextsuperscript{2}\*(C'\fR will be converted to \f(CW\*(C`<sup>2</sup>\*(C'\fR
and the markup will be stripped leaving just the character 2.
.IP "\fB\-\-packages\fR \fIlist\fR (or \fB\-p\fR \fIlist\fR)" 4
.IX Item "--packages list (or -p list)"
@@ -272,7 +286,7 @@
.IP "\fB\-\-mfirstuc\-protection\fR \fIfields\fR|\fBall\fR (or \fB\-u\fR \fIfields\fR|\fBall\fR)" 4
.IX Item "--mfirstuc-protection fields|all (or -u fields|all)"
Insert an empty group if fields start with certain problematic
-commands to protect against case-changing commands like \eGls.
+commands to protect against case-changing commands like \f(CW\*(C`\eGls\*(C'\fR.
.Sp
The default is to do this for all fields. To do this for only a
subset of fields, set \fIfields\fR to a comma-separated list of fields
@@ -282,11 +296,11 @@
Switch off the auto-insertion of an empty group for all fields.
.IP "\fB\-\-mfirstuc\-math\-protection\fR" 4
.IX Item "--mfirstuc-math-protection"
-Switch on the auto-insertion of an empty group for math-shift ($).
+Switch on the auto-insertion of an empty group for math-shift (\f(CW\*(C`$\*(C'\fR).
This option will be overridden by \fB\-\-no\-mfirstuc\-protection\fR.
.IP "\fB\-\-no\-mfirstuc\-math\-protection\fR" 4
.IX Item "--no-mfirstuc-math-protection"
-Switch off the auto-insertion of an empty group for math-shift ($).
+Switch off the auto-insertion of an empty group for math-shift (\f(CW\*(C`$\*(C'\fR).
.IP "\fB\-\-nested\-link\-check\fR \fIlist\fR|\fBnone\fR" 4
.IX Item "--nested-link-check list|none"
Check each field listed in \fIlist\fR for potentially problematic
@@ -309,10 +323,10 @@
Set location format mappings.
.IP "\fB\-\-group\fR or \fB\-g\fR" 4
.IX Item "--group or -g"
-Add 'group' field to entries.
+Add \fBgroup\fR field to entries.
.IP "\fB\-\-no\-group\fR" 4
.IX Item "--no-group"
-Don't add 'group' field to entries (default).
+Don't add \fBgroup\fR field to entries (default).
.IP "\fB\-\-record\-count\fR or \fB\-c\fR" 4
.IX Item "--record-count or -c"
Add record count fields to entries.
@@ -329,16 +343,40 @@
Don't add unit record count field to entries (default).
.IP "\fB\-\-trim\-fields\fR" 4
.IX Item "--trim-fields"
-Trim leading and trailing spaces from fields.
+Trim leading and trailing spaces from all fields.
+This option cancels \fB\-\-trim\-only\-fields\fR and \fB\-\-no\-trim\-fields\fR.
+.IP "\fB\-\-trim\-only\-fields\fR \fIlist\fR" 4
+.IX Item "--trim-only-fields list"
+Trim leading and trailing spaces from only the listed fields.
+This option is cumulative but is cancelled by \fB\-\-trim\-fields\fR
+and \fB\-\-no\-trim\-fields\fR. This option may not be used with
+\&\fB\-\-trim\-except\-fields\fR.
+.IP "\fB\-\-trim\-except\-fields\fR \fIlist\fR" 4
+.IX Item "--trim-except-fields list"
+Trim leading and trailing spaces from all fields except those listed.
+This option is cumulative but is cancelled by \fB\-\-trim\-fields\fR
+and \fB\-\-no\-trim\-fields\fR. This option may not be used with
+\&\fB\-\-trim\-only\-fields\fR.
.IP "\fB\-\-no\-trim\-fields\fR" 4
.IX Item "--no-trim-fields"
Don't trim leading and trailing spaces from fields (default).
+This option cancels \fB\-\-trim\-only\-fields\fR and \fB\-\-trim\-fields\fR.
.IP "\fB\-\-expand\-fields\fR" 4
.IX Item "--expand-fields"
-Don't write \fB\eglsnoexpandfields\fR to the \fB.glstex\fR file.
+Don't write \f(CW\*(C`\eglsnoexpandfields\*(C'\fR to the \fI.glstex\fR file.
.IP "\fB\-\-no\-expand\-fields\fR" 4
.IX Item "--no-expand-fields"
-Write \fB\eglsnoexpandfields\fR to the \fB.glstex\fR file (default).
+Write \f(CW\*(C`\eglsnoexpandfields\*(C'\fR to the \fI.glstex\fR file (default).
+.IP "\fB\-\-provide\-glossaries\fR" 4
+.IX Item "--provide-glossaries"
+Write \f(CW\*(C`\eprovideignoredglossary*\*(C'\fR to the \fI.glstex\fR file to provide
+unknown glossaries.
+.IP "\fB\-\-no\-provide\-glossaries\fR" 4
+.IX Item "--no-provide-glossaries"
+Don't write \f(CW\*(C`\eprovideignoredglossary*\*(C'\fR to the \fI.glstex\fR file to
+provide unknown glossaries except in documented situations
+(\fBmaster\fR, \fBsecondary\fR and \fBtrigger-type\fR resource options).
+This setting is the default.
.SH "REQUIRES"
.IX Header "REQUIRES"
Java 7 or later and a TeX distribution.
@@ -370,4 +408,4 @@
.SH "AUTHOR"
.IX Header "AUTHOR"
Nicola L. C. Talbot,
-<http://www.dickimaw\-books.com/>
+<https://www.dickimaw\-books.com/>
Binary files old/texmf-dist/doc/support/bib2gls/bib2gls.pdf and new/texmf-dist/doc/support/bib2gls/bib2gls.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/bib2gls/convertgls2bib.1 new/texmf-dist/doc/support/bib2gls/convertgls2bib.1
--- old/texmf-dist/doc/support/bib2gls/convertgls2bib.1 2018-05-10 00:21:20.000000000 +0200
+++ new/texmf-dist/doc/support/bib2gls/convertgls2bib.1 2020-03-24 21:54:02.000000000 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.12 (Pod::Simple 3.39)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -54,16 +54,20 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
-.if !\nF .nr F 0
-.if \nF>0 \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{\
+. if \nF \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
-. if !\nF==2 \{\
-. nr % 0
-. nr F 2
+. if !\nF==2 \{\
+. nr % 0
+. nr F 2
+. \}
. \}
.\}
+.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -129,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "CONVERTGLS2BIB 1"
-.TH CONVERTGLS2BIB 1 "2018-03-04" "perl v5.26.1" "convertgls2bib"
+.TH CONVERTGLS2BIB 1 "2020-02-11" "perl v5.30.2" "convertgls2bib"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -140,7 +144,7 @@
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"
Converts a \fB.tex\fR file containing glossary definitions using
-commands like \fB\enewglossaryentry\fR and \fB\enewacronym\fR to
+commands like \f(CW\*(C`\enewglossaryentry\*(C'\fR and \f(CW\*(C`\enewacronym\*(C'\fR to
a \fB.bib\fR file in the format required for \fBbib2gls\fR.
.SH "OPTIONS"
.IX Header "OPTIONS"
@@ -171,8 +175,77 @@
.IP "\fB\-\-no\-ignore\-sort\fR" 4
.IX Item "--no-ignore-sort"
Don't ignore the \fBsort\fR field.
-.IP "\fB\-\-space\-sub\fR \fIvalue\fR" 4
-.IX Item "--space-sub value"
+.IP "\fB\-\-ignore\-type\fR" 4
+.IX Item "--ignore-type"
+Omit the \fBtype\fR field. Default if \fB\-\-split\-on\-type\fR.
+.IP "\fB\-\-no\-ignore\-type\fR" 4
+.IX Item "--no-ignore-type"
+Don't omit the \fBtype\fR field. Default unless \fB\-\-split\-on\-type\fR.
+.IP "\fB\-\-split\-on\-type\fR or \fB\-t\fR" 4
+.IX Item "--split-on-type or -t"
+Split the entries into separate files according to the \fBtype\fR field.
+This option automatically implements \fB\-\-ignore\-type\fR and
+\&\fB\-\-no\-overwrite\fR.
+.IP "\fB\-\-no\-split\-on\-type\fR" 4
+.IX Item "--no-split-on-type"
+Don't split the entries into separate files according to the \fBtype\fR
+field (default).
+.IP "\fB\-\-ignore\-category\fR" 4
+.IX Item "--ignore-category"
+Omit the \fBcategory\fR field. Default if \fB\-\-split\-on\-category\fR.
+.IP "\fB\-\-no\-ignore\-category\fR" 4
+.IX Item "--no-ignore-category"
+Don't omit the \fBcategory\fR field. Default unless \fB\-\-split\-on\-category\fR.
+.IP "\fB\-\-split\-on\-category\fR or \fB\-t\fR" 4
+.IX Item "--split-on-category or -t"
+Split the entries into separate files according to the \fBcategory\fR field.
+This option automatically implements \fB\-\-ignore\-category\fR and
+\&\fB\-\-no\-overwrite\fR.
+.IP "\fB\-\-no\-split\-on\-category\fR" 4
+.IX Item "--no-split-on-category"
+Don't split the entries into separate files according to the \fBcategory\fR
+field (default).
+.IP "\fB\-\-ignore\-fields\fR \fIlist\fR or \fB\-f\fR \fIlist\fR" 4
+.IX Item "--ignore-fields list or -f list"
+Ignore all the fields in the comma-separated \fIlist\fR. If the
+list includes \fBsort\fR, \fBtype\fR or \fBcategory\fR it will automatically
+implement the corresponding \fB\-\-ignore\-sort\fR, \fB\-\-ignore\-type\fR or
+\&\fB\-\-ignore\*(--category\fR option.
+.Sp
+This option isn't cumulative. An empty list will clear a previously
+set list but won't undo the sort, type or category ignore options.
+.IP "\fB\-\-overwrite\fR" 4
+.IX Item "--overwrite"
+Overwrite existing .bib files. Default unless \fB\-\-split\-on\-type\fR
+used.
+.IP "\fB\-\-no\-overwrite\fR" 4
+.IX Item "--no-overwrite"
+Don't overwrite existing .bib files. Default if \fB\-\-split\-on\-type\fR
+used.
+.IP "\fB\-\-index\-conversion\fR or \fB\-i\fR" 4
+.IX Item "--index-conversion or -i"
+Any entries that would normally be converted to \f(CW@entry\fR that don't
+have a description or just have the description set to
+\&\f(CW\*(C`\enopostdesc\*(C'\fR or \f(CW\*(C`\eglsxtrnopostpunc\*(C'\fR will be converted to \f(CW@index\fR
+and the \fBdescription\fR field will be omitted.
+.IP "\fB\-\-no\-index\-conversion\fR" 4
+.IX Item "--no-index-conversion"
+Don't use \f(CW@index\fR instead of \f(CW@entry\fR if the description is empty or
+just \f(CW\*(C`\enopostdesc\*(C'\fR or \f(CW\*(C`\eglsxtrnopostpunc\*(C'\fR (default).
+.IP "\fB\-\-absorb\-see\fR" 4
+.IX Item "--absorb-see"
+Absorb \f(CW\*(C`\eglssee\*(C'\fR and \f(CW\*(C`\eglsxtrindexseealso\*(C'\fR into the data (default).
+.IP "\fB\-\-no\-absorb\-see\fR" 4
+.IX Item "--no-absorb-see"
+Don't absorb \f(CW\*(C`\eglssee\*(C'\fR and \f(CW\*(C`\eglsxtrindexseealso\*(C'\fR into the data.
+.IP "\fB\-\-preamble\-only\fR or \fB\-p\fR" 4
+.IX Item "--preamble-only or -p"
+Only parse the document preamble.
+.IP "\fB\-\-no\-preamble\-only\fR" 4
+.IX Item "--no-preamble-only"
+Parse the entire document (default).
+.IP "\fB\-\-space\-sub\fR \fIvalue\fR or \fB\-s\fR \fIvalue\fR" 4
+.IX Item "--space-sub value or -s value"
Substitute spaces in labels with \fIvalue\fR.
.IP "\fB\-\-locale\fR \fIlang tag\fR" 4
.IX Item "--locale lang tag"
@@ -181,7 +254,7 @@
(English) file will be used.
.SH "REQUIRES"
.IX Header "REQUIRES"
-Java 7 and a TeX distribution.
+Java 8 and a TeX distribution.
.SH "LICENSE"
.IX Header "LICENSE"
License GPLv3+: \s-1GNU GPL\s0 version 3 or later
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/bib2gls/examples/miscsymbols.bib new/texmf-dist/doc/support/bib2gls/examples/miscsymbols.bib
--- old/texmf-dist/doc/support/bib2gls/examples/miscsymbols.bib 2017-11-27 00:27:56.000000000 +0100
+++ new/texmf-dist/doc/support/bib2gls/examples/miscsymbols.bib 2019-05-05 20:06:25.000000000 +0200
@@ -1,5 +1,5 @@
% This file is public domain. See the "Examples" chapter
-% in the bib2gls user manual for a more detailed icondescription
+% in the bib2gls user manual for a more detailed description
% of this file.
% Encoding: UTF-8
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-authors.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-authors.pdf differ
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-bacteria.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-bacteria.pdf differ
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-chemical.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-chemical.pdf differ
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-citations.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-citations.pdf differ
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-constants.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-constants.pdf differ
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.tex new/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.tex
--- old/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.tex 2020-03-24 21:54:02.000000000 +0100
@@ -0,0 +1,31 @@
+% This file is public domain. See the "Examples" chapter
+% in the bib2gls user manual for a more detailed description
+% of this file.
+
+\documentclass[12pt,a4paper]{article}
+
+\usepackage[T1]{fontenc}
+\usepackage[colorlinks]{hyperref}
+
+\usepackage[record,% use bib2gls
+ nostyles,% don't load default styles
+ postdot,% add a full stop after the description
+% load glossary-tree.sty and patch styles:
+ stylemods={tree},
+ style=treegroup]{glossaries-extra}
+
+\GlsXtrLoadResources[
+ src={terms,animals,minerals,vegetables},% data these .bib files
+ field-aliases={identifier=parent}
+]
+
+\begin{document}
+Some sample terms: \gls{duck}, \gls{sealion}, \gls{armadillo},
+\gls{seal}, \gls{aardvark}, \gls{amethyst}, \gls{aquamarine},
+\gls{diamond}, \gls{dolomite}, \gls{chalcedony}, \gls{citrine},
+\gls{quetzalcoatlite}, \gls{cabbage}, \gls{cauliflower},
+\gls{artichoke}, \gls{courgette}.
+
+\GlsXtrSetDefaultNumberFormat{glsignore}% ignore records in the glossary
+\printunsrtglossary
+\end{document}
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf differ
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-maths.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-maths.pdf differ
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-media.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-media.pdf differ
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-msymbols.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-msymbols.pdf differ
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-multi1.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-multi1.pdf differ
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-multi2.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-multi2.pdf differ
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-nested.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-nested.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/bib2gls/examples/sample-nested.tex new/texmf-dist/doc/support/bib2gls/examples/sample-nested.tex
--- old/texmf-dist/doc/support/bib2gls/examples/sample-nested.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/bib2gls/examples/sample-nested.tex 2020-03-24 21:54:02.000000000 +0100
@@ -0,0 +1,49 @@
+% This file is public domain. See the "Examples" chapter
+% in the bib2gls user manual for a more detailed description
+% of this file.
+
+\documentclass[12pt,a4paper]{article}
+
+\usepackage[T1]{fontenc}
+\usepackage[colorlinks]{hyperref}
+
+\usepackage[record,% use bib2gls
+ nostyles,% don't load default styles
+ postdot,% add a full stop after the description
+% load glossary-tree.sty and patch styles:
+ stylemods={tree},
+ style=treegroup]{glossaries-extra}
+
+\GlsXtrLoadResources[src={terms},sort={en-reverse}]
+
+\GlsXtrLoadResources[
+ src={animals,minerals,vegetables},
+ field-aliases={identifier=type},
+ dependency-fields=type,
+ sort={en}
+]
+
+\newcommand{\nestedhandler}[1]{%
+ \glsxtrunsrtdo{#1}%
+% Is there a glossary whose label (type) matches this entry's label?
+ \ifglossaryexists*{#1}%
+ {%
+ \printunsrtinnerglossary[type={#1},leveloffset=++1,groups=false]{}{}%
+ }%
+ {}%
+}
+
+\begin{document}
+Some sample terms: \gls{duck}, \gls{sealion}, \gls{armadillo},
+\gls{seal}, \gls{aardvark}, \gls{amethyst}, \gls{aquamarine},
+\gls{diamond}, \gls{dolomite}, \gls{chalcedony}, \gls{citrine},
+\gls{quetzalcoatlite}, \gls{cabbage}, \gls{cauliflower},
+\gls{artichoke}, \gls{courgette}.
+
+\GlsXtrSetDefaultNumberFormat{glsignore}% ignore records in the glossary
+
+\printunsrtglossary*{%
+ \let\printunsrtglossaryhandler\nestedhandler
+}
+
+\end{document}
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-people.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-people.pdf differ
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.tex new/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.tex
--- old/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.tex 2017-11-27 00:27:56.000000000 +0100
+++ new/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.tex 2019-05-05 20:06:25.000000000 +0200
@@ -1,7 +1,8 @@
% This file is public domain. See the "Examples" chapter
% in the bib2gls user manual for a more detailed description
% of this file.
-
+% Compare this file with sample-textsymbols2.tex which uses
+% a hierarchical approach.
\documentclass[a4paper]{article}
\usepackage[T1]{fontenc}
@@ -18,7 +19,7 @@
\usepackage[record,% using bib2gls
nostyles,% don't load default styles
postdot,% append a dot after descriptions
- stylemods={tree},% load glossary-mcols.sty and patch
+ stylemods={tree},% load glossary-tree.sty and patch
style=alttreegroup]{glossaries-extra}
\GlsXtrLoadResources[
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.tex new/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.tex
--- old/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.tex 2019-05-05 20:06:25.000000000 +0200
@@ -0,0 +1,41 @@
+% This file is public domain. See the "Examples" chapter
+% in the bib2gls user manual for a more detailed description
+% of this file.
+
+\documentclass[a4paper]{article}
+
+\usepackage[T1]{fontenc}
+
+\usepackage{etoolbox}
+\usepackage{marvosym}
+
+% package conflict, need to undefine conflicting commands
+\undef\Sun
+\undef\Lightning
+
+\usepackage[weather]{ifsym}
+
+\usepackage[record,% using bib2gls
+ nostyles,% don't load default styles
+ postdot,% append a dot after descriptions
+ stylemods={tree,topic},% load glossary-tree.sty and glossary-topic.sty
+ style=topic]{glossaries-extra}
+
+\GlsXtrLoadResources[
+ src={topics,miscsymbols},
+% make @icon behave like @symbol:
+ entry-type-aliases={icon=symbol},
+ field-aliases={
+ identifier=parent,
+ icon=name,
+ icondescription=description
+ },
+ symbol-sort-fallback={description},
+ set-widest,
+ selection=all
+]
+
+\begin{document}
+\printunsrtglossaries
+\end{document}
+
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-units1.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-units1.pdf differ
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-units2.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-units2.pdf differ
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-units3.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-units3.pdf differ
Binary files old/texmf-dist/doc/support/bib2gls/examples/sample-usergroups.pdf and new/texmf-dist/doc/support/bib2gls/examples/sample-usergroups.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/bib2gls/examples/topics.bib new/texmf-dist/doc/support/bib2gls/examples/topics.bib
--- old/texmf-dist/doc/support/bib2gls/examples/topics.bib 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/bib2gls/examples/topics.bib 2019-05-05 20:06:25.000000000 +0200
@@ -0,0 +1,9 @@
+% This file is public domain. See the "Examples" chapter
+% in the bib2gls user manual for a more detailed description
+% of this file.
+
+% Encoding: UTF-8
+
+@index{information}
+@indexplural{mediacontrol,text={media control}}
+@indexplural{weather,text={weather symbol}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bib2gls.doc.tlpobj new/tlpkg/tlpobj/bib2gls.doc.tlpobj
--- old/tlpkg/tlpobj/bib2gls.doc.tlpobj 2019-02-28 03:18:09.000000000 +0100
+++ new/tlpkg/tlpobj/bib2gls.doc.tlpobj 2020-03-25 16:13:06.000000000 +0100
@@ -1,8 +1,8 @@
name bib2gls.doc
category Package
-revision 49293
+revision 54525
shortdesc doc files of bib2gls
-docfiles size=1598
+docfiles size=1824
texmf-dist/doc/support/bib2gls/CHANGES
texmf-dist/doc/support/bib2gls/README.md
texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf
@@ -40,6 +40,8 @@
texmf-dist/doc/support/bib2gls/examples/sample-citations.tex
texmf-dist/doc/support/bib2gls/examples/sample-constants.pdf
texmf-dist/doc/support/bib2gls/examples/sample-constants.tex
+ texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.pdf
+ texmf-dist/doc/support/bib2gls/examples/sample-hierarchical.tex
texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.pdf
texmf-dist/doc/support/bib2gls/examples/sample-markuplanguages.tex
texmf-dist/doc/support/bib2gls/examples/sample-maths.pdf
@@ -52,10 +54,14 @@
texmf-dist/doc/support/bib2gls/examples/sample-multi1.tex
texmf-dist/doc/support/bib2gls/examples/sample-multi2.pdf
texmf-dist/doc/support/bib2gls/examples/sample-multi2.tex
+ texmf-dist/doc/support/bib2gls/examples/sample-nested.pdf
+ texmf-dist/doc/support/bib2gls/examples/sample-nested.tex
texmf-dist/doc/support/bib2gls/examples/sample-people.pdf
texmf-dist/doc/support/bib2gls/examples/sample-people.tex
texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.pdf
texmf-dist/doc/support/bib2gls/examples/sample-textsymbols.tex
+ texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.pdf
+ texmf-dist/doc/support/bib2gls/examples/sample-textsymbols2.tex
texmf-dist/doc/support/bib2gls/examples/sample-units1.pdf
texmf-dist/doc/support/bib2gls/examples/sample-units1.tex
texmf-dist/doc/support/bib2gls/examples/sample-units2.pdf
@@ -65,6 +71,7 @@
texmf-dist/doc/support/bib2gls/examples/sample-usergroups.pdf
texmf-dist/doc/support/bib2gls/examples/sample-usergroups.tex
texmf-dist/doc/support/bib2gls/examples/terms.bib
+ texmf-dist/doc/support/bib2gls/examples/topics.bib
texmf-dist/doc/support/bib2gls/examples/unaryoperators.bib
texmf-dist/doc/support/bib2gls/examples/usergroups.bib
texmf-dist/doc/support/bib2gls/examples/vegetables.bib
++++++ bib2gls.tar.xz ++++++
Binary files old/texmf-dist/scripts/bib2gls/bib2gls.jar and new/texmf-dist/scripts/bib2gls/bib2gls.jar differ
Binary files old/texmf-dist/scripts/bib2gls/convertgls2bib.jar and new/texmf-dist/scripts/bib2gls/convertgls2bib.jar differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/bib2gls/convertgls2bib.sh new/texmf-dist/scripts/bib2gls/convertgls2bib.sh
--- old/texmf-dist/scripts/bib2gls/convertgls2bib.sh 2017-09-11 00:10:52.000000000 +0200
+++ new/texmf-dist/scripts/bib2gls/convertgls2bib.sh 2019-05-05 20:06:25.000000000 +0200
@@ -1,12 +1,15 @@
#!/bin/sh
+# Adapted from tlcockpit.sh to ensure the script works with cygwin
-kernel=`uname -s`
-if test "${kernel#*CYGWIN}" != "$kernel"
-then
- jarpath=`cygpath -w $(kpsewhich --progname=convertgls2bib --format=texmfscripts convertgls2bib.jar)`
-else
- jarpath=`kpsewhich --progname=convertgls2bib --format=texmfscripts convertgls2bib.jar`
-fi
+scriptname=`basename "$0" .sh`
+jar="$scriptname.jar"
+jarpath=`kpsewhich --progname="$scriptname" --format=texmfscripts "$jar"`
-java -jar "$jarpath" "$@"
+kernel=`uname -s 2>/dev/null`
+if echo "$kernel" | grep CYGWIN >/dev/null; then
+ CYGWIN_ROOT=`cygpath -w /`
+ export CYGWIN_ROOT
+ jarpath=`cygpath -w "$jarpath"`
+fi
+exec java -jar "$jarpath" "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml new/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml
--- old/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml 2018-12-01 23:46:56.000000000 +0100
+++ new/texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml 2020-03-24 21:54:02.000000000 +0100
@@ -49,6 +49,14 @@
<entry key="syntax.no.force.cross.resource.refs">{0}
Don''t force cross-resource referencing mode on
(default).</entry>
+<entry key="syntax.warn.non.bib.fields">{0}
+ Warn if internal non-bib fields are found in .bib file.</entry>
+<entry key="syntax.no.warn.non.bib.fields">{0}
+ Don''t warn if internal non-bib fields are found in .bib file.</entry>
+<entry key="syntax.warn.unknown.entry.types">{0}
+ Warn if unknown entry types are found in .bib file.</entry>
+<entry key="syntax.no.warn.unknown.entry.types">{0}
+ Don''t warn if unknown entry types are found in .bib file.</entry>
<entry key="syntax.merge.nameref.on">{0} <rule>
Rule for merging locations with record=nameref
@@ -132,6 +140,12 @@
<entry key="syntax.no.trim.fields">{0}
Don''t trim leading and trailing spaces from fields
(default).</entry>
+<entry key="syntax.trim.only.fields">{0} <list>
+ Only trim leading and trailing spaces from listed fields.
+ (Cumulative.)</entry>
+<entry key="syntax.trim.except.fields">{0} <list>
+ Trim leading and trailing spaces from all fields except those listed.
+ (Cumulative.)</entry>
<entry key="syntax.expand.fields">{0}
Don''t write \glsnoexpandfields to the .glstex file.</entry>
<entry key="syntax.no.expand.fields">{0}
@@ -150,6 +164,13 @@
the listed packages.</entry>
<entry key="syntax.list.known.packages">{0}
List the packages known to the interpreter.</entry>
+<entry key="syntax.provide.glossaries">{0}
+ Define any unknown glossaries with
+ \provideignoredglossary*.</entry>
+<entry key="syntax.no.provide.glossaries">{0}
+ Don''t define unknown glossaries with
+ \provideignoredglossary* except in certain situations
+ (default).</entry>
<entry key="message.reading">Reading {0}</entry>
<entry key="message.writing">Writing {0}</entry>
@@ -181,6 +202,7 @@
<entry key="message.field.notset">Field {0} not set for entry {1}</entry>
<entry key="message.selection.mode">Selection mode: {0}</entry>
<entry key="message.ignore.fields">Ignoring fields:</entry>
+<entry key="message.ignore.field">Ignoring field ''{0}'' for entry ''{1}''</entry>
<entry key="message.sort.mode">Sort mode: {0}</entry>
<entry key="message.sort.field">Sort field: {0}</entry>
<entry key="message.sort.date.locale">Date/time sort locale: {0}</entry>
@@ -207,6 +229,9 @@
<entry key="message.dual.indexabbrv.mappings">Dual index-abbreviation mappings:</entry>
<entry key="message.process.result">Processed returned: {0}</entry>
<entry key="message.truncated">Truncating according to limit={0}.</entry>
+<entry key="message.entry.already.added">Entry ''{0}'' has already been added, ignoring.
+(Original entry: @{1}{2}. This entry: @{3}{4})</entry>
+<entry key="message.entry.lost.field">Entry ''{0}'' has lost its ''{1}'' field.</entry>
<entry key="message.log.file">Transcript written to {0}.</entry>
<entry key="message.written">{0} written to {1}.</entry>
@@ -233,6 +258,7 @@
<entry key="message.cross-resource.notallowed">Cross-resource references can''t be supported for resource set {0}.</entry>
<entry key="message.checking.read">Checking read access for {0}</entry>
<entry key="message.checking.write">Checking write access for {0}</entry>
+<entry key="message.parsing.fields">Parsing fields for entry ''{0}''</entry>
<entry key="message.setting.sort">Initialising collation keys (strength={0}, decomposition={1})</entry>
<entry key="message.non_unique_sort">Sort value ''{0}'' (entry ''{1}'') not unique for the entry''s hierarchical level.</entry>
<entry key="message.sort_suffix">Appending suffix ''{0}'' to the sort value ''{1}'' for entry ''{2}''.</entry>
@@ -274,12 +300,19 @@
<entry key="message.clearing.entry.aliases">Clearing entry type aliases.</entry>
<entry key="message.setting.entry.aliases">Setting entry type aliases.</entry>
<entry key="message.removing.missing.parent">Stripping missing parent ''{0}'' from entry {1}</entry>
+<entry key="message.removing.entry.with.records">Removing ''{0}'' because it has records (''{1}={2}'' in effect).</entry>
<entry key="message.missing.sort.fallback">Entry ''{0}'' missing sort field ''{1}''. Falling back on field ''{2}''.</entry>
<entry key="message.list.known.packages.auto">Automatic support for: </entry>
<entry key="message.list.known.packages.extra">Support available for: </entry>
<entry key="message.list.known.packages.info">Support may be quite limited in some cases.</entry>
<entry key="message.created.missing.parent">Created missing parent ''{0}'' for entry ''{1}''</entry>
<entry key="message.found_entry_in_resource">Found entry ''{0}'' in resource set: {1}</entry>
+<entry key="message.spawning">Spawning ''{0}'' (from ''{1}'')</entry>
+<entry key="message.append.prefix.space">Appending {0} for prefix field ''{1}''</entry>
+<entry key="message.append.prefix.nospace">Not appending anything for prefix field ''{0}'' (ends with exception character code {1})</entry>
+<entry key="message.append.prefix.cs.nospace">Not appending anything for prefix field ''{0}'' (ends with exception control sequence \{1})</entry>
+<entry key="message.append.prefix.no.excp">Appending {0} for prefix field ''{1}'' (''{2}'' doesn''t fit exception rules)</entry>
+<entry key="message.append.prefix.nbsp.match">Append nbsp for prefix field ''{0}'': matched ''{1}'' in ''{2}'' (pattern ''{3}'')</entry>
<entry key="tag.page">Page</entry>
<entry key="tag.pages">Pages</entry>
@@ -305,8 +338,10 @@
<entry key="warning.cant.parse.file">Can''t parse {0}
{1}</entry>
<entry key="warning.ignoring.unknown.entry.type">Ignoring unknown entry type: {0}</entry>
+<entry key="warning.private.entry.type">Private entry type ''{0}'' found. Did you mean ''{1}''?</entry>
<entry key="warning.ignoring.unknown.encoding">Ignoring unknown encoding: {0}</entry>
<entry key="warning.ignoring.unknown.field">Ignoring unknown field: {0}</entry>
+<entry key="warning.non_bib_field">Found internal non bib-field ''{0}'' in ''{1}.bib'' file for entry ''{2}''. Unexpected results may occur.</entry>
<entry key="warning.entry.already.defined">Entry {0} is being defined in {1} but it has already been defined in a previous .glstex file.</entry>
<entry key="warning.can.find.arg">Can''t detect argument for: \{0}</entry>
<entry key="warning.no.default.sort">Can''t determine sort value for: {0}
@@ -323,6 +358,10 @@
<entry key="warning.missing.field">Entry ''{0}'' missing required field: {1}</entry>
<entry key="warning.potential.nested.link">Entry ''{0}'' has potentially nested link text in field: {1}
Consider using \glsps'{'{3}'}' or \glspt'{'{3}'}' instead of {2}'{'{3}'}'</entry>
+<entry key="warning.glsadd.in.field">Entry ''{0}'' contains \glsadd in field: {1}
+Consider using a dual entry or add ''{2}'' to one of the cross-referencing fields instead.
+(With a dual entry type, you don''t need to link a primary to its dual
+with \glsadd. They are automatically dependent on each other.)</entry>
<entry key="warning.dir.no.write">Directory not writable: {0}
Using TEXMFOUTPUT instead: {1}</entry>
<entry key="warning.conflicting.range.format">Entry location conflict for formats: {0} and {1}
@@ -365,6 +404,8 @@
<entry key="warning.identical">Identical sort values for ''{0}'' and ''{1}''</entry>
<entry key="warning.identical.id">Falling back on ID</entry>
<entry key="warning.identical.original_id">Falling back on original ID</entry>
+<entry key="warning.identical.def">Falling back on order of definition</entry>
+<entry key="warning.identical.use">Falling back on order of use</entry>
<entry key="warning.identical.none">No fallback</entry>
<entry key="warning.identical.field">Falling back on ''{0}'' field (''{1}'' <=> ''{2}'' = {3})</entry>
<entry key="warning.unknown.widest.fortype">Can''t determine widest level {0} entry for glossary type ''{1}''. Using fallback method.</entry>
@@ -400,6 +441,7 @@
{0}</entry>
<entry key="error.invalid.sort.value">Invalid sort method ''{0}'' given in option: {1}</entry>
<entry key="error.invalid.opt.value">Invalid ''{0}'' value: {1}</entry>
+<entry key="error.invalid.opt.intorbool.value">Invalid ''{0}'' value: {1} (number or boolean required)</entry>
<entry key="error.invalid.opt.int.value">Invalid ''{0}'' value: {1} (number required)</entry>
<entry key="error.invalid.opt.minint.value">Invalid ''{0}'' value: {1} (can''t be less than {2,number})</entry>
<entry key="error.invalid.choice.value">Invalid ''{0}'' value: {1} (allowed values: {2})</entry>
@@ -408,8 +450,12 @@
<entry key="error.invalid.opt.keylist.value">Invalid ''{0}'' value ''{1}'' (within option ''{2}'')</entry>
<entry key="error.invalid.opt.keylist.key">Invalid key ''{0}'' within option ''{1}''</entry>
<entry key="error.invalid.opt.keylist.pattern">Invalid pattern ''{1}'' in {0}='{'{1}'}' (within option ''{2}'')</entry>
+<entry key="error.invalid.opt.pattern">Invalid pattern ''{0}'' in option ''{1}''</entry>
<entry key="error.missing.value">Missing value for: {0}</entry>
<entry key="error.option.clash">Option clash: {0} and {1}</entry>
+<entry key="error.append.prefix.field">Invalid {0} found in {1} (value should be a sequence of characters only)</entry>
+<entry key="error.append.prefix.field.cs">Invalid {0} found in {1} (value should be a sequence of commands only)</entry>
+<entry key="error.append.prefix.field.spacecs">Invalid value ''{0}'' for option {1} (value should be a single command)</entry>
<entry key="error.invalid.dual.map">Invalid mapping: {0}={1}
The size of the first list ({2,number}) is not the same as the size of
the second list ({3,number}).</entry>
@@ -454,16 +500,73 @@
Use {1} {0} instead.</entry>
<entry key="error.create.missing.parent.failed">Attempt to create missing parent ''{0}'' for entry ''{1}'' caused a problem:
{2}</entry>
+<entry key="error.option.requires.interpreter">Interpreter needed for setting {0}</entry>
+<entry key="error.sort.requires.switch">Sort method ''{0}'' requires {1} switch.</entry>
<!--
The following messages are used by convertgls2bib
-->
+<entry key="gls2bib.missing.encoding.value">Missing <encoding> after {0}</entry>
+<entry key="gls2bib.missing.arg.value">Missing <value> after {0}</entry>
+<entry key="gls2bib.unknown.arg">Unknown option: {0}
+Use {1} for help.</entry>
+<entry key="gls2bib.toomany.arg">Too many arguments.
+Use {0} for help.</entry>
+<entry key="gls2bib.missing.tex.arg">Missing <tex file>.
+Syntax: {0}
+Use {1} for help.</entry>
+<entry key="gls2bib.missing.bib.arg">Missing <bib file>
+Syntax: {0}
+Use {1} for help.</entry>
+<entry key="gls2bib.syntax">{0} [<options>] <tex file> <bib file></entry>
+
+<entry key="gls2bib.syntax.options">Options:</entry>
+<entry key="gls2bib.syntax.options.general">General:</entry>
+<entry key="gls2bib.syntax.options.locale">Encoding and Localisation:</entry>
+<entry key="gls2bib.syntax.options.filter">Filtering:</entry>
+<entry key="gls2bib.syntax.options.io">Output Files:</entry>
+<entry key="gls2bib.syntax.options.adjust">Adjustments:</entry>
+<entry key="gls2bib.syntax.version">{0} (or {1}) Display version information</entry>
+<entry key="gls2bib.syntax.help">{0} (or {1}) Display help</entry>
+<entry key="gls2bib.syntax.texenc">{0} <encoding> .tex file encoding</entry>
+<entry key="gls2bib.syntax.bibenc">{0} <encoding> .bib file encoding</entry>
+<entry key="gls2bib.syntax.ignore-sort">{0} Ignore sort field (default)</entry>
+<entry key="gls2bib.syntax.no-ignore-sort">{0} Don''t ignore sort field</entry>
+<entry key="gls2bib.syntax.ignore-type">{0} Omit type field</entry>
+<entry key="gls2bib.syntax.no-ignore-type">{0} Don''t omit type field (default)</entry>
+<entry key="gls2bib.syntax.split-on-type">{0} or {1} Split entries into separate files according to type field</entry>
+<entry key="gls2bib.syntax.no-split-on-type">{0} Don''t split entries according to type field (default)</entry>
+<entry key="gls2bib.syntax.ignore-category">{0} Omit category field</entry>
+<entry key="gls2bib.syntax.no-ignore-category">{0} Don''t omit category field (default)</entry>
+<entry key="gls2bib.syntax.split-on-category">{0} or {1} Split entries into separate files according to category field</entry>
+<entry key="gls2bib.syntax.no-split-on-category">{0} Don''t split entries according to category field (default)</entry>
+<entry key="gls2bib.syntax.ignore-fields">{0} <list> or {1} <list>
+ Ignore the fields contained in the comma-separated <list></entry>
+<entry key="gls2bib.syntax.overwrite">{0} Overwrite files (default unless {1} or {2})</entry>
+<entry key="gls2bib.syntax.no-overwrite">{0} Don''t overwrite files</entry>
+<entry key="gls2bib.syntax.preamble-only">{0} or {1} Only parse the preamble</entry>
+<entry key="gls2bib.syntax.no-preamble-only">{0} Parse the entire document (default).</entry>
+<entry key="gls2bib.syntax.space-sub">{0} <val> or {1} <val> Substitute spaces in labels with <val></entry>
+<entry key="gls2bib.syntax.index-conversion">{0} or {1} Convert @entry to @index if no description.</entry>
+<entry key="gls2bib.syntax.no-index-conversion">{0} Don''t convert @entry to @index.</entry>
+<entry key="gls2bib.syntax.absorb-see">{0} Absorb \glssee and \glsxtrindexseealso into the data (default).</entry>
+<entry key="gls2bib.syntax.no-absorb-see">{0} Don''t absorb \glssee and \glsxtrindexseealso into the data.</entry>
+<entry key="gls2bib.syntax.locale">{0} <iso tag> Use language resource file given by <iso tag> for messages.</entry>
+<entry key="gls2bib.syntax.silent">{0} Suppress messages.</entry>
+<entry key="gls2bib.syntax.verbose">{0} Normal messages.</entry>
+<entry key="gls2bib.syntax.debug">{0} Debug mode.</entry>
+
<entry key="gls2bib.override.newdualentry">Overriding default definition of \newdualentry with custom
definition. (Change \newcommand to \providecommand if you want
\newdualentry[options]'{'label'}{'short'}{'long'}{'description'}'
converted to @dualabbreviationentry.)</entry>
+<entry key="gls2bib.absorbsee">Absorbing {0}</entry>
+<entry key="gls2bib.absorbsee.entryundef">Unable to absorb {0}: can''t find entry ''{1}''</entry>
+<entry key="gls2bib.absorbsee.failed">Unable to absorb {0} into {1}</entry>
+<entry key="gls2bib.discarding.field">Discarding field ''{0}={1}'' for entry {2}</entry>
+
<!--
The following messages are used by various parts of
texparserlib.jar only a few of them may actually be generated by
@@ -486,6 +589,7 @@
<entry key="error.syntax.batch.missing_out">Output directory required for batch mode</entry>
<entry key="error.syntax.batch.unknown_format">Unknown format ''{0}''</entry>
<entry key="error.exists">{0} already exists</entry>
+<entry key="error.file_exists.nooverwrite">Can''t write to ''{0}'': file already exists (use {1} to force overwrite)</entry>
<entry key="tex.error.bad_param">Parameter digit 1 to 9 expected. Found ''{0}''</entry>
<entry key="tex.error.no_eg">Missing end group</entry>
@@ -503,9 +607,9 @@
<entry key="tex.error.dimen_expected">Dimension expected</entry>
<entry key="tex.error.missing_unit">Missing unit</entry>
<entry key="tex.error.expected">Expected {0}</entry>
-<entry key="tex.error.undefined">Undefined command \{0}</entry>
+<entry key="tex.error.undefined">Undefined command {0}</entry>
<entry key="tex.error.undefined_char">Undefined active character ''{0}''</entry>
-<entry key="tex.error.cs_expected">Control sequence expected (found ''{0}'')</entry>
+<entry key="tex.error.cs_expected">Control sequence expected (found ''{0}'', class ''{1}'')</entry>
<entry key="tex.error.number_expected">Number expected (found ''{0}'')</entry>
<entry key="tex.error.register_undef">Unknown register ''{0}''</entry>
<entry key="tex.error.syntax">Invalid syntax for {0}</entry>
@@ -542,6 +646,8 @@
<entry key="latex.class.error">Class {0} Error: {1}</entry>
<entry key="latex.illegal.argtype">Illegal argument type {0}</entry>
<entry key="latex.package.not.loaded">Package ''{0}'' has not been loaded</entry>
+<entry key="latex.error.counter.too.large">Counter too large</entry>
+<entry key="latex.error.counter.out.of.range">Counter value {0} out of valid range ({1})</entry>
<entry key="bibtex.error.missing_value">Missing value</entry>
<entry key="bibtex.error.expecting">Expecting ''{0}''</entry>
@@ -556,7 +662,7 @@
<entry key="bibtex.error.illegal_end">Illegal end</entry>
<entry key="bibtex.error.missing">Missing</entry>
<entry key="bibtex.error.too_many_commas">Too many commas in name ''{0}''</entry>
-<entry key="bibtex.error.string_name_undefined">String name ''{0}'' undefined</entry>
+<entry key="bibtex.error.string_name_undefined">String name ''{0}'' undefined (did you forget braces or quotes?)</entry>
<entry key="bibtex.error.repeated_entry">Repeated entry ''{0}''</entry>
<!-- Package messages -->
@@ -580,6 +686,7 @@
<entry key="datatool.header.doesnt_exist">Header ''{0}'' doesn''t exist.</entry>
<entry key="datatool.row.not.found">Row index ''{0}'' doesn''t exist.</entry>
<entry key="datatool.loaddb.message">Database ''{0}'' loaded from ''{1}'' (column count={2}, row count={3}).</entry>
+<entry key="datatool.index.outofrange">List index ''{0}'' out of range.</entry>
<!-- ifthen messages -->
Binary files old/texmf-dist/scripts/bib2gls/texparserlib.jar and new/texmf-dist/scripts/bib2gls/texparserlib.jar differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bib2gls.tlpobj new/tlpkg/tlpobj/bib2gls.tlpobj
--- old/tlpkg/tlpobj/bib2gls.tlpobj 2019-02-28 03:18:11.000000000 +0100
+++ new/tlpkg/tlpobj/bib2gls.tlpobj 2020-03-25 16:13:08.000000000 +0100
@@ -1,6 +1,6 @@
name bib2gls
category Package
-revision 49293
+revision 54525
shortdesc Command line application to convert .bib files to glossaries-extra.sty resource files
longdesc This Java command line application may be used to extract
longdesc glossary information stored in a .bib file and convert it into
@@ -17,17 +17,17 @@
longdesc containing definitions (\newglossaryentry etc.) to the .bib
longdesc format required by bib2gls.
depend bib2gls.ARCH
-runfiles size=311
+runfiles size=334
texmf-dist/scripts/bib2gls/bib2gls.jar
texmf-dist/scripts/bib2gls/bib2gls.sh
texmf-dist/scripts/bib2gls/convertgls2bib.jar
texmf-dist/scripts/bib2gls/convertgls2bib.sh
texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml
texmf-dist/scripts/bib2gls/texparserlib.jar
-catalogue-contact-home http://www.dickimaw-books.com/software/bib2gls/
+catalogue-contact-bugs https://github.com/nlct/bib2gls/issues
+catalogue-contact-home https://www.dickimaw-books.com/software/bib2gls/
catalogue-contact-repository https://github.com/nlct/bib2gls
catalogue-ctan /support/bib2gls
-catalogue-date 2018-11-30 22:37:53 +0100
catalogue-license gpl3+
catalogue-topics bibtex-util glossary
-catalogue-version 1.8
+catalogue-version 2.3
++++++ bibarts.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibarts.doc.tlpobj new/tlpkg/tlpobj/bibarts.doc.tlpobj
--- old/tlpkg/tlpobj/bibarts.doc.tlpobj 2019-03-05 02:23:33.000000000 +0100
+++ new/tlpkg/tlpobj/bibarts.doc.tlpobj 2020-03-04 23:49:29.000000000 +0100
@@ -1,6 +1,6 @@
name bibarts.doc
category Package
-revision 50226
+revision 54080
shortdesc doc files of bibarts
relocated 1
docfiles size=449
++++++ bibarts.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibarts.tlpobj new/tlpkg/tlpobj/bibarts.tlpobj
--- old/tlpkg/tlpobj/bibarts.tlpobj 2019-03-05 02:23:34.000000000 +0100
+++ new/tlpkg/tlpobj/bibarts.tlpobj 2020-03-04 23:49:29.000000000 +0100
@@ -1,29 +1,29 @@
name bibarts
category Package
-revision 50226
+revision 54080
shortdesc "Arts"-style bibliographical information
relocated 1
longdesc BibArts is a LaTeX package to assist in making bibliographical
-longdesc features common in the arts, and the humanities (history,
+longdesc features common in the arts and the humanities (history,
longdesc political science, philosophy, etc.). bibarts.sty provides
-longdesc commands for quotation, abbreviations, and especially for a
+longdesc commands for quotations, abbreviations, and especially for a
longdesc formatted citation of literature, journals (periodicals),
-longdesc edited sources, and archive sources. In difference to its
-longdesc forerunner, it helps to use slanted fonts (italics), and is
-longdesc able to set ibidem automatically in footnotes. It will also
+longdesc edited sources, and archive sources. In difference to earlier
+longdesc versions, BibArts 2.x helps to use slanted fonts (italics) and
+longdesc is able to set ibidem automatically in footnotes. It will also
longdesc copy all citation information, abbreviations, and register key
-longdesc words into lists for an automatically generated appendix. That
-longdesc lists could refer to page and footnote numbers. BibArts has
-longdesc nothing to do with BibTeX. The lists are created by bibsort.
-longdesc BibArts requires a program, for which source and Windows
-longdesc executable are provided. The program creates the bibliography
-longdesc without using MakeIndex or BibTeX. Its source is not written
-longdesc for a certain operating system. A summary of contents is in
-longdesc English; the full documentation is in German.
+longdesc words into lists for an automatically generated appendix. These
+longdesc lists may refer to page and footnote numbers. BibArts has
+longdesc nothing to do with BibTeX. The lists are created by bibsort
+longdesc (see below). BibArts requires the program bibsort, for which
+longdesc the sources and a Windows executable are provided. This program
+longdesc creates the bibliography without using MakeIndex or BibTeX. Its
+longdesc source is not written with any specific operating system in
+longdesc mind. A summary of contents is in English; the full
+longdesc documentation is in German.
runfiles size=35
RELOC/tex/latex/bibarts/bibarts.sty
catalogue-ctan /macros/latex/contrib/bibarts
-catalogue-date 2019-03-04 09:44:09 +0100
catalogue-license gpl
catalogue-topics bibtex-supp humanities
catalogue-version 2.2
++++++ biber.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/bibtex/biber/biber.pdf and new/texmf-dist/doc/bibtex/biber/biber.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biber.doc.tlpobj new/tlpkg/tlpobj/biber.doc.tlpobj
--- old/tlpkg/tlpobj/biber.doc.tlpobj 2019-03-03 02:24:49.000000000 +0100
+++ new/tlpkg/tlpobj/biber.doc.tlpobj 2019-12-09 01:54:42.000000000 +0100
@@ -1,6 +1,6 @@
name biber.doc
category Package
-revision 50203
+revision 53064
shortdesc doc files of biber
docfiles size=65
texmf-dist/doc/bibtex/biber/biber.pdf
++++++ biblatex-apa.doc.tar.xz ++++++
++++ 6974 lines of diff (skipped)
++++++ biblatex-apa.tar.xz ++++++
++++ 8587 lines of diff (skipped)
++++++ biblatex-archaeology.doc.tar.xz ++++++
++++ 2302 lines of diff (skipped)
++++++ biblatex-archaeology.tar.xz ++++++
++++ 6525 lines of diff (skipped)
++++++ biblatex-bath.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bath/Makefile new/doc/latex/biblatex-bath/Makefile
--- old/doc/latex/biblatex-bath/Makefile 2018-10-18 22:33:24.000000000 +0200
+++ new/doc/latex/biblatex-bath/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,64 +0,0 @@
-STYLE = bath
-NAME = biblatex-$(STYLE)
-SHELL = bash
-PWD = $(shell pwd)
-TEMP := $(shell mktemp -d -t tmp.XXXXXXXXXX)
-TDIR = $(TEMP)/$(NAME)
-VERS = $(shell ltxfileinfo -v $(NAME).dtx)
-LOCAL = $(shell kpsewhich --var-value TEXMFLOCAL)
-UTREE = $(shell kpsewhich --var-value TEXMFHOME)
-
-.PHONY: source clean distclean inst install uninst uninstall zip ctan
-
-all: $(NAME).pdf clean
- @exit 0
-
-source: $(NAME).dtx
- luatex -interaction=batchmode $(NAME).dtx >/dev/null
-
-$(STYLE).bbx $(STYLE).cbx $(STYLE).dbx american-$(STYLE).lbx british-$(STYLE).lbx $(NAME).bib: source
-
-$(NAME).pdf: source
- latexmk -silent -lualatex -interaction=batchmode $(NAME).dtx >/dev/null
- @echo "Compilation complete."
-
-clean:
- rm -f $(NAME).{aux,bbl,bcf,blg,doc,fdb_latexmk,fls,glo,gls,hd,idx,ilg,ind,listing,log,nav,out,run.xml,snm,synctex.gz,tcbtemp,toc,vrb}
- rm -f $(NAME).markdown.in
- rm -rf _markdown_$(NAME)
-
-distclean: clean
- rm -f $(NAME).{pdf,bib,ins} $(STYLE).{b,c,d}bx {american,british}-$(STYLE).lbx
-
-
-inst: all
- mkdir -p $(UTREE)/{source,tex,doc}/latex/$(NAME)
- cp $(NAME).dtx $(NAME).ins $(UTREE)/source/latex/$(NAME)
- cp $(NAME).{bib,pdf} $(UTREE)/doc/latex/$(NAME)
- cp $(STYLE).{b,c,d}bx {american,british}-$(STYLE).lbx $(UTREE)/tex/latex/$(NAME)
- mktexlsr
-
-uninst:
- rm -r $(UTREE)/{source,tex,doc}/latex/$(NAME)
- mktexlsr
-
-install: all
- sudo mkdir -p $(LOCAL)/{source,tex,doc}/latex/$(NAME)
- sudo cp $(NAME).dtx $(NAME).ins $(LOCAL)/source/latex/$(NAME)
- sudo cp $(NAME).{bib,pdf} $(LOCAL)/doc/latex/$(NAME)
- sudo cp $(STYLE).{b,c,d}bx {american,british}-$(STYLE).lbx $(LOCAL)/tex/latex/$(NAME)
- mktexlsr
-
-uninstall:
- sudo rm -r $(LOCAL)/{source,tex,doc}/latex/$(NAME)
- mktexlsr
-
-zip: all
- mkdir $(TDIR)
- cp $(NAME).{dtx,bib,pdf} $(STYLE).{b,c,d}bx {american,british}-$(STYLE).lbx README.md Makefile $(TDIR)
- cd $(TEMP); zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME)
-
-ctan: all
- mkdir $(TDIR)
- cp $(NAME).{dtx,pdf} README.md Makefile $(TDIR)
- cd $(TEMP); zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bath/README.md new/doc/latex/biblatex-bath/README.md
--- old/doc/latex/biblatex-bath/README.md 2018-10-18 22:33:24.000000000 +0200
+++ new/doc/latex/biblatex-bath/README.md 2020-01-16 22:57:10.000000000 +0100
@@ -5,12 +5,24 @@
## Installation
+The files you need are included in the zip archive available from [GitHub].
+If you use the zip archive from [CTAN], you will need to run `luatex
+biblatex-bath.dtx` to generate them.
+
You can use this style simply by copying all the `.bbx`, `.cbx`, `.dbx` and
`.lbx` files into your working directory, that is, the directory holding the
main `.tex` file for your document. If you want the style to be available for
all your documents without having to copy the files over each time, you can
install them using the instructions below.
+### Managed way
+
+The latest stable release of biblatex-bath has been packaged for TeX Live and
+MiKTeX. If you are running TeX Live and have `tlmgr` installed, you can install
+the package simply by running `tlmgr install biblatex-bath`. If you are running
+MiKTeX, you can install the package by running `mpm --install=biblatex-bath`.
+Both `tlmgr` and `mpm` have GUI versions that you might find friendlier.
+
### Automated way
A makefile is provided which you can use with the Make utility on
@@ -19,10 +31,12 @@
* Running `make source` generates the derived files
- `README.md`
- `bath.bbx`, `bath.cbx`, `bath.dbx`
- - `american-bath.lbx`, `british-bath.lbx`
+ - `english-bath.lbx`, `british-bath.lbx`
- `biblatex-bath.bib`
- `biblatex-bath.ins`
- * Running `make` generates the above files and also biblatex-bath.pdf.
+ * Running `make` generates the above files and also `biblatex-bath.pdf`.
+ Ensure you have (at least) the [luatexja], [adobemapping] and [ipaex]
+ packages installed first.
* Running `make inst` installs the files in the user's TeX tree.
You can undo this with `make uninst`.
* Running `make install` installs the files in the local TeX tree.
@@ -30,9 +44,9 @@
### Manual way
-You only need to follow the first two steps if you have made your own
-changes to the .dtx file. The compiled files you need are included in
-the zip archive.
+You do not need to follow the first step if you downloaded the zip archive from
+[GitHub]. You do not need to follow the second step if you already have the PDF
+documentation.
1. Run `luatex biblatex-bath.dtx` to generate the source files.
@@ -61,7 +75,7 @@
`bath.bbx`,
`bath.cbx`,
`bath.dbx`,
- `american-bath.lbx`,
+ `english-bath.lbx`,
`british-bath.lbx`
- `doc/latex/biblatex-bath`:
`biblatex-bath.pdf`,
@@ -70,8 +84,10 @@
5. You may then have to update your installation's file name database
before TeX and friends can see the files.
-[bath-harvard]: http://www.bath.ac.uk/library/infoskills/referencing-plagiarism/harvard-bat…
+[bath-harvard]: https://library.bath.ac.uk/referencing/harvard-bath
[biblatex]: http://ctan.org/pkg/biblatex
+[GitHub]: https://github.com/alex-ball/bathbib/releases
+[CTAN]: http://ctan.org/pkg/biblatex-bath
[LuaLaTeX]: http://ctan.org/pkg/lualatex-doc
[Biber]: http://ctan.org/pkg/biber
[luatexja]: http://ctan.org/pkg/luatexja
@@ -80,7 +96,7 @@
## Licence
-Copyright 2016 University of Bath.
+Copyright 2016-2020 University of Bath.
This work consists of the documented LaTeX file biblatex-bath.dtx and a Makefile.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bath/biblatex-bath.bib new/doc/latex/biblatex-bath/biblatex-bath.bib
--- old/doc/latex/biblatex-bath/biblatex-bath.bib 2018-10-18 22:33:24.000000000 +0200
+++ new/doc/latex/biblatex-bath/biblatex-bath.bib 2020-01-16 22:57:10.000000000 +0100
@@ -18,18 +18,6 @@
edition = {3},
address = {Philadelphia, Pa.},
publisher = {Lippincott Williams \& Wilkins}}
-@book{oed1989,
- title = {Oxford {English} Dictionary},
- year = {1989},
- edition = {2},
- address = {Oxford},
- publisher = {Clarendon Press}}
-@book{merckNDidx,
- title = {The {Merck} Index Online},
- address = {London},
- publisher = {RSC Publishing},
- url = {http://www.rsc.org/Merck-Index},
- urldate = {2016-06-16}}
@book{haynes2014crc,
editor = {Haynes, W. M.},
year = {2014},
@@ -85,7 +73,7 @@
author = {Newman, R.},
year = {2010},
title = {Malaria control beyond 2010},
- journal = {Brit.\@ Med.\@ J.},
+ journal = {{Brit.\@ Med.\@ J.\isdot}},
volume = {341},
number = {7765},
pages = {157-208}}
@@ -98,6 +86,15 @@
volume = {10},
url = {http://www.ariadne.ac.uk/issue10/edd/},
urldate = {1997-12-05}}
+(a)article{liontou.etal2019dra,
+ author = {Liontou, C. and Kontopodis, E. and Oikonomidis, N. and Maniotis, C. and
+ Tassopoulos, A. and Tsiafoutis, I. and Lazaris, E. and Koutouzis, M.},
+ year = {2019},
+ title = {Distal Radial Access: a Review Article},
+ journal = {Cardiovascular Revascularization Medicine},
+ pubstate = {inpress},
+ url = {https://www.sciencedirect.com/science/article/pii/S1553838919303367},
+ urldate = {2019-06-19}}
@report{shah.corrick2016hsc,
author = {Shah, I. and Corrick, I.},
year = {2016},
@@ -111,13 +108,13 @@
author = {Haurant, S.},
date = {2004-07-29},
title = {Britain's Borrowing Hits \pounds 1 Trillion},
- journal = {The Guardian},
+ journal = {{The Guardian}},
pages = {16c}}
@article{independent1992pub,
author = {{The Independent}},
date = {1992-06-04},
title = {Picking Up the Bills},
- journal = {The Independent},
+ journal = {{The Independent}},
pages = {28a}}
@inproceedings{crawford1965oim,
author = {Crawford, G. I.},
@@ -145,7 +142,7 @@
author = {Burrell, J. G.},
year = {1973},
title = {The Importance of School Tours in Education},
- type = {Thesis ({M.A.})},
+ type = {Thesis \parentext{M.A.}},
school = {Queen's University, Belfast}}
@report{unesco1993gip,
author = {{UNESCO}},
@@ -154,17 +151,47 @@
address = {Paris},
institution = {UNESCO},
number = {PGI-93/WS/22}}
+@techreport{bre2007dqb,
+ author = {{BRE}},
+ year = {2007},
+ title = {Designing Quality Buildings: a {BRE} Guide},
+ address = {Bracknell},
+ institution = {BRE},
+ type = {Report},
+ number = {497}}
@standard{bs5605:1990,
- number = {BS~5605:1990},
- sortyear = {1990},
- title = {Recommendations for citing and referencing published material},
+ author = {{BSI}},
+ year = {1990},
+ title = {{BS}~5605:1990 {Recommendations} for Citing and Referencing Published Material},
+ address = {London},
organization = {BSI}}
+(a)standard{astm.d1655,
+ author = {{ASTM}},
+ year = {2019},
+ title = {{ASTM~D1655} - 19 {Standard} Specification for Aviation Turbine Fuels},
+ address = {West Conshohocken, Pa.},
+ organization = {ASTM}}
@patent{pm1981opa,
author = {{Phillipp Morris Inc.}},
year = {1981},
title = {Optical perforating apparatus and system},
type = {European patent application},
number = {0021165A1. 1981-01-07}}
+@unpublished{harris2013fgr,
+ author = {Harris, G.},
+ year = {2013},
+ title = {Focus group recommendations: internal task group report}}
+@unpublished{hadley2015bir,
+ author = {Hadley, S.},
+ year = {2015},
+ title = {Biomechanics: introductory reading, {BM289}: sport biomechanics},
+ howpublished = {University of Bath}}
+@unpublished{thomas2015wcr,
+ author = {Thomas, D.},
+ year = {2015},
+ title = {Word count and referencing style},
+ booktitle = {Frequently asked questions discussion board: {PHYS} 2011: housing studies},
+ howpublished = {University of Bath}}
@image{nasa2015nat,
author = {{NASA}},
year = {2015},
@@ -187,7 +214,7 @@
title = {Prototype electric bicycle displayed at the \enquote{Britain Can Make It} exhibition
organised by the {Council} of {Industrial} {Design} and held at the {Victoria} and {Albert}
{Museum}, {London}, 1946. {Designed} by {B.~G.} {Bowden}},
- titleaddon = {photograph},
+ titleaddon = {Photograph},
address = {London},
library = {Design Council Slide Collection}}
@manual{andrews.dury1773wilts,
@@ -207,7 +234,7 @@
@video{moran2016sol,
author = {Moran, C.},
year = {2016},
- title = {Save {Our} {Libraries}},
+ title = {Save Our Libraries},
url = {https://www.youtube.com/watch?v=gKTfCz4JtVE&feature=youtu.be},
urldate = {2016-04-29}}
@video{uob2015wie,
@@ -216,9 +243,15 @@
title = {What is Engineering?},
url = {https://www.youtube.com/watch?v=NoyZarq-Zbo},
urldate = {2016-01-12}}
+@audio{chakrabarti2016hac,
+ author = {Chakrabarti, V.},
+ year = {2016},
+ title = {How Architecture and City Planning Can Combat Social Inequality},
+ url = {https://www.curbed.com/2016/5/5/11593058/vishaan-chakrabarti-pau-curbed-appeal-podcast},
+ urldate = {2019-03-28}}
@video{rsfo2006ep5,
date = {2006-08-23T20:30:00},
- title = {Rick {Stein's} {French} {Odyssey}},
+ title = {Rick {Stein's} {French} Odyssey},
subtitle = {{Episode} 5},
type = {TV},
publisher = {BBC2}}
@@ -241,14 +274,6 @@
organization = {Bournemouth University},
url = {http://www.bournemouth.ac.uk/library/using/guide_to_citing_internet_sourc.html},
urldate = {2002-11-04}}
-@online{wiltshire2015gww,
- author = {{Wiltshire Council}},
- year = {2015},
- title = {Get {Wiltshire} walking},
- address = {Trowbridge},
- organization = {Wiltshire Council},
- url = {http://www.wiltshire.gov.uk/leisureandrecreation/sportphysicalactivity/getwiltshirewalking.html},
- urldate = {2015-08-19}}
@letter{clark2004euk,
author = {Clark, T.},
date = {2004-07-05},
@@ -256,27 +281,22 @@
journal = {Lis-link},
url = {lis-link(a)jiscmail.ac.uk},
urldate = {2004-07-30}}
-@letter{alston2004sah,
- author = {Alston, S.},
- date = {2004-07-19},
- title = {Society of {Architectural} {Historians} of {GB}},
- howpublished = {Email to K.M. Jordan}}
-@online{bvd2008bt,
+@dataset{bvd2008bt,
author = {{Bureau van Dijk}},
year = {2008},
title = {{BT} {Group} PLC Company Report},
library = {FAME},
address = {London},
- organization = {Bureau van Dijk},
+ publisher = {Bureau van Dijk},
url = {http://www.portal.euromonitor.com},
urldate = {2014-11-06}}
-@online{wilson2013rgc,
+@dataset{wilson2013rgc,
author = {Wilson, D.},
year = {2013},
title = {Real Geometry and Connectedness via Triangular Description},
subtitle = {{CAD} Example Bank},
address = {Bath},
- organization = {University of Bath},
+ publisher = {University of Bath},
doi = {10.15125/BATH-00069},
urldate = {2016-04-20}}
@software{screencasto,
@@ -332,6 +352,13 @@
author+an = {1=cjk},
year = {2001},
title = {Lorem ipsum}}
+@book{pamporov2006rvb,
+ author = {Pamporov, A.},
+ year = {2006},
+ title = {Romskoto vsekidnevie v {Balgariya}},
+ titleaddon = {Roma everyday life in Bulgaria},
+ address = {Veliko Tarnovo},
+ publisher = {Faber}}
@legislation{gb.wa1735,
title = {Witchcraft {Act}},
year = {1735},
@@ -372,7 +399,7 @@
@report{gb.hl1986/87-66,
author = {{Great Britain. Parliament. House of Lords}},
year = {1987},
- title = {Social Fund ({Maternity} and {Funeral} {Expenses}) {Bill}},
+ title = {Social Fund (Maternity and Funeral Expenses) Bill},
address = {London},
publisher = {HMSO},
series = {HL 1986/87},
@@ -386,16 +413,15 @@
publisher = {TSO},
series = {Cm},
number = {6041}}
-(a)legislation{eu.dir2015/413,
- title = {Directive ({EU}) 2015/413 of the {European} {Parliament} and of the {Council} of
- 11th {March} 2015 Facilitating Cross-Border Exchange of Information on Road-Safety-Related
- Traffic Offences},
- shorttitle = {Directive ({EU}) 2015/413},
- year = {2015},
+(a)legislation{eu.dir1984/2003,
+ title = {Council {Regulation} ({EC}) 1984/2003 of 8 {April} 2003 Introducing a System for
+ the Statistical Monitoring of Trade in Bluefin Tuna, Swordfish and Big Eye Tuna within
+ the {Community}},
+ shorttitle = {Council {Regulation} \parentext{EC} 1984/2003},
+ year = {2003},
journal = {OJ},
series = {L},
- volume = {68},
- pages = {9}}
+ volume = {295}}
@report{ec2015gra,
author = {{European Commission}},
year = {2015},
@@ -403,7 +429,7 @@
address = {Luxembourg},
publisher = {Publications Office of the European Union}}
@jurisdiction{seldon-v-c.w.j2012,
- title = {Seldon v {Clarkson} {Wright} \& {Jakes}},
+ title = {Seldon v.~{Clarkson} {Wright} \& {Jakes}},
year = {2012},
journal = {UKSC},
pages = {16}}
Binary files old/doc/latex/biblatex-bath/biblatex-bath.pdf and new/doc/latex/biblatex-bath/biblatex-bath.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-bath.doc.tlpobj new/tlpkg/tlpobj/biblatex-bath.doc.tlpobj
--- old/tlpkg/tlpobj/biblatex-bath.doc.tlpobj 2019-02-28 03:20:13.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-bath.doc.tlpobj 2020-01-17 01:54:50.000000000 +0100
@@ -1,10 +1,9 @@
name biblatex-bath.doc
category Package
-revision 48943
+revision 53424
shortdesc doc files of biblatex-bath
relocated 1
-docfiles size=111
- RELOC/doc/latex/biblatex-bath/Makefile
+docfiles size=127
RELOC/doc/latex/biblatex-bath/README.md
RELOC/doc/latex/biblatex-bath/biblatex-bath.bib
RELOC/doc/latex/biblatex-bath/biblatex-bath.pdf
++++++ biblatex-bath.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-bath/american-bath.lbx new/tex/latex/biblatex-bath/american-bath.lbx
--- old/tex/latex/biblatex-bath/american-bath.lbx 2018-10-18 22:33:24.000000000 +0200
+++ new/tex/latex/biblatex-bath/american-bath.lbx 1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-%%
-%% This is file `american-bath.lbx',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% biblatex-bath.dtx (with options: `lbx-us')
-%% ----------------------------------------------------------------
-%% biblatex-bath --- Harvard referencing style as recommended by the University of Bath Library
-%% Author: Alex Ball
-%% E-mail: a.j.ball(a)bath.ac.uk
-%% License: Released under the LaTeX Project Public License v1.3c or later
-%% See: http://www.latex-project.org/lppl.txt
-%% ----------------------------------------------------------------
-%%
-\InheritBibliographyExtras{american}
-\DeclareBibliographyExtras{%
- \renewrobustcmd*{\bibdatetimesep}{\addperiod\space}%
- }
-
-\DeclareBibliographyStrings
-{inherit = {american}
-,urlseen = {{Accessed}{Accessed}}
-,version = {{version~}{v\adddot}}
-,january = {{January}{January}}
-,february = {{February}{February}}
-,march = {{March}{March}}
-,april = {{April}{April}}
-,may = {{May}{May}}
-,june = {{June}{June}}
-,july = {{July}{July}}
-,august = {{August}{August}}
-,september = {{September}{September}}
-,october = {{October}{October}}
-,november = {{November}{November}}
-,december = {{December}{December}}
-,patreq = {{patent application}{pat\adddot\ appl\adddot}}
-,patreqde = {{German patent application}{German pat\adddot\ appl\adddot}}
-,patreqeu = {{European patent application}{European pat\adddot\ appl\adddot}}
-,patreqfr = {{French patent application}{French pat\adddot\ appl\adddot}}
-,patrequk = {{British patent application}{British pat\adddot\ appl\adddot}}
-,patrequs = {{U.S\adddotspace patent application}{U.S\adddotspace pat\adddot\ appl\adddot}}
-,online = {{Online}{Online}}
-,hours = {{hours}{hrs\adddot}}
-,at = {{at}{at}}
-,legalchapter = {{chapter}{c\adddot}}
-}
-
-%%
-%% Copyright (C) 2018 by University of Bath
-%%
-%% End of file `american-bath.lbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-bath/bath.bbx new/tex/latex/biblatex-bath/bath.bbx
--- old/tex/latex/biblatex-bath/bath.bbx 2018-10-19 22:34:48.000000000 +0200
+++ new/tex/latex/biblatex-bath/bath.bbx 2020-01-16 22:57:10.000000000 +0100
@@ -13,9 +13,19 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
+\def\Version{2020/01/16 v3.2}
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesFile{bath.bbx}
+ [\Version\space Biblography style as recommended by the University of Bath Library]
\RequirePackage{xpatch}
\RequirePackage{xstring}
-\DeclareLanguageMappingSuffix{-bath}
+\RequirePackage{etoolbox}
+\ifcsdef{DeclareLanguageMappingSuffix}{%
+ \DeclareLanguageMappingSuffix{-bath}
+}{%
+ \DeclareLanguageMapping{english}{english-bath}
+ \DeclareLanguageMapping{british}{british-bath}
+}
\RequireBibliographyStyle{authoryear}
\ExecuteBibliographyOptions{%
maxcitenames=3,maxbibnames=9999,isbn=false,giveninits=true,dashed=false,
@@ -23,16 +33,34 @@
\ExecuteBibliographyOptions[audio,video,music,movie]{%
useeditor=false}
\NewBibliographyString{%
- online, hours, at, legalchapter,
+ online, hours, at, unpublished, legalchapter,
director, performer, reader, conductor,
directors, performers, readers, conductors,
bydirector, byperformer, byreader, byconductor,
}
\setlength{\bibitemsep}{1em plus 0.2em minus 0.2em}
\renewcommand*{\bibfont}{\normalfont\normalsize}
+\ifcsdef{letbibmacro}{}{%
+ \def\letbibmacro#1#2{%
+ \ifcsundef{abx@macro@#2}
+ {\blx@error
+ {Bibliography macro '#2' undefined}
+ {Use '\string\newbibmacro' to define this macro}}
+ {\csletcs{abx@macro@#1}{abx@macro@#2}}}
+}
+\ifcsdef{iflabeldateisdate}{}{%
+ \def\iflabeldateisdate{%
+ \ifboolexpr{%
+ togl {blx@labeldateparts}
+ and not test {\iffieldundef{labeldatesource}}
+ and
+ (test {\iffieldequalstr{labeldatesource}{}}
+ or test {\iffieldequalstr{labeldatesource}{year}})}}%
+}
\DeclareNameAlias{author}{family-given}
\DeclareNameAlias{editor}{family-given}
+\DeclareNameAlias{bookeditor}{given-family}
\renewcommand*{\bibinitdelim}{}
\newbibmacro*{name:cjk-given-family}[3]{%
\ifitemannotation{cjk}{%
@@ -195,8 +223,8 @@
{\setunit{\addspace}%
\printtext[parens]{%
\printnames[#1]{translator}%
- \newunit
- \bibstring{translator}%
+ \setunit{\addcomma\space}%
+ \bibcpstring{translator}%
\clearname{translator}}}}
\renewbibmacro*{byeditor+others}[1][byeditor]{%
@@ -222,8 +250,8 @@
{\setunit{\addspace}%
\printtext[parens]{%
\printnames[bytranslator]{translator}%
- \newunit
- \bibstring{translator}%
+ \setunit{\addcomma\space}%
+ \bibcpstring{translator}%
\clearname{translator}%
\newunit
\usebibmacro{withothers}}}}
@@ -231,7 +259,7 @@
\newbibmacro*{bookeditor}{%
\ifnameundef{editor}{}{%
\printnames[bookeditor]{editor}%
- \setunit*{\addspace}%
+ \setunit*{\addcomma\space}%
\usebibmacro{editor+othersstrg}%
\clearname{editor}%
}}
@@ -243,12 +271,17 @@
[article,inbook,incollection,inproceedings]%
{title}{#1}
\DeclareFieldFormat
- [patent,thesis,unpublished]%
+ [patent,thesis]%
{title}{\mkbibemph{#1}}
+\DeclareFieldFormat
+ [unpublished]%
+ {title}{\iffieldundef{booktitle}{\mkbibemph{#1}}{#1}}
\newtoggle{bbx:onlineshown}
\newbibmacro*{isonline}{%
\ifboolexpr{(
+ test {\iffieldundef{doi}}
+ and
test {\iffieldundef{url}}
and
not test {\ifentrytype{online}}
@@ -267,35 +300,47 @@
}}
\renewbibmacro*{title}{%
- \printtext{%
+ \ifboolexpr{
+ test {\iffieldundef{title}}
+ and
+ test {\iffieldundef{subtitle}}
+ }{}{%
+ \printtext[title]{%
+ \printfield[sentencecase]{title}%
+ \setunit{\subtitlepunct}%
+ \printfield[midsentencecase]{subtitle}%
+ \setunit{\addspace}%
+ }%
+ \printfield{version}%
+ \clearfield{version}%
+ \setunit*{\addspace}%
+ \printfield{titleaddon}%
\ifboolexpr{
- test {\iffieldundef{title}}
+ test {\iffieldundef{journaltitle}}
and
- test {\iffieldundef{subtitle}}
- }{}{%
- \printtext[title]{%
- \printfield[sentencecase]{title}%
- \setunit{\subtitlepunct}%
- \printfield[midsentencecase]{subtitle}%
- \setunit{\addspace}%
- }%
- \printfield{version}%
- \clearfield{version}%
+ test {\iffieldundef{booktitle}}
+ and
+ test {\iffieldundef{library}}
+ and
+ not test {\ifentrytype{software}}
+ and (
+ test {\iffieldundef{type}}
+ or
+ test {\nottoggle{bbx:labelistitle}}
+ or
+ not (
+ test {\ifentrytype{audio}}
+ or
+ test {\ifentrytype{video}}
+ or
+ test {\ifentrytype{music}}
+ or
+ test {\ifentrytype{movie}}
+ ))
+ }{%
\setunit*{\addspace}%
- \printfield{titleaddon}%
- \ifboolexpr{
- test {\iffieldundef{journaltitle}}
- and
- test {\iffieldundef{booktitle}}
- and
- test {\iffieldundef{library}}
- and
- not test {\ifentrytype{software}}
- }{%
- \setunit*{\addspace}%
- \usebibmacro{isonline}%
- }{}%
- }%
+ \usebibmacro{isonline}%
+ }{}%
}%
}
@@ -372,6 +417,18 @@
test {\ifentrytype{image}}
) and
not test {\ifentrytype{software}}
+ and (
+ test {\iffieldundef{type}}
+ or
+ not (
+ test {\ifentrytype{audio}}
+ or
+ test {\ifentrytype{video}}
+ or
+ test {\ifentrytype{music}}
+ or
+ test {\ifentrytype{movie}}
+ ))
}{%
\setunit*{\addspace}%
\usebibmacro{isonline}%
@@ -436,7 +493,7 @@
}{%
\addcomma\space}}}
\DeclareDelimFormat{nonameyeardelim}{\dononameyeardelim}
-\DeclareDelimFormat[bib,biblist]{nonameyeardelim}{\dononameyeardelim}
+\DeclareDelimFormat*[bib,biblist]{nonameyeardelim}{\dononameyeardelim}
\DeclareDelimFormat[parencite]{nonameyeardelim}{%
\ifboolexpr{
test {\ifentrytype{jurisdiction}}
@@ -474,15 +531,29 @@
'true' (=compact)%
}{%
'year', 'true' (=year)%
-}{}{}
-\DeclareTypeOption[boolean]{mergedate}[true]{%
- \ifcsdef{bbx@opt@mergedate@#1}{%
- \csuse{bbx@opt@mergedate@#1}%
- }{%
- \PackageError{biblatex}
- {Invalid option 'mergedate=#1'}
- {Valid values are 'maximum', 'compact', 'basic', 'minimum',\MessageBreak
- 'year', 'true' (=year), and 'false'.}}}
+}{}{\wlog{WARNING: biblatex-bath failed to patch KV@blx@opt@pre@datemerge}}
+\ifdefined\KV@blx@opt@typ@mergedate
+ \xpatchcmd{\KV@blx@opt@typ@mergedate}{%
+ 'true' (=compact)%
+ }{%
+ 'year', 'true' (=year)%
+ }{}{\wlog{WARNING: biblatex-bath failed to patch KV@blx@opt@typ@datemerge}}
+\else
+ \DeclareTypeOption[boolean]{mergedate}[true]{%
+ \ifcsdef{bbx@opt@mergedate@#1}{%
+ \csuse{bbx@opt@mergedate@#1}%
+ }{%
+ \PackageError{biblatex}
+ {Invalid option 'mergedate=#1'}
+ {Valid values are 'maximum', 'compact', 'basic', 'minimum',\MessageBreak
+ 'year', 'true' (=year), and 'false'.}}}
+\fi
+\xpatchcmd{\KV@blx@opt@ent@mergedate}{%
+ 'true' (=compact)%
+}{%
+ 'year', 'true' (=year)%
+}{}{\wlog{WARNING: biblatex-bath failed to patch KV@blx@opt@ent@datemerge}}
+
\DeclareFieldFormat{datelabel}{#1}
\xpatchcmd{\bbx@opt@mergedate@maximum}{%
\iffieldundef{labelyear}%
@@ -491,12 +562,12 @@
togl {bbx:nonodate}
and
not test {\iflabeldateisdate}}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch bbx@opt@mergedate@maximum}}
\xpatchcmd{\bbx@opt@mergedate@maximum}{%
\printtext[parens]%
}{%
\printtext[datelabel]%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch bbx@opt@mergedate@maximum}}
\xpatchcmd{\bbx@opt@mergedate@compact}{%
\iffieldundef{labelyear}%
}{%
@@ -504,12 +575,12 @@
togl {bbx:nonodate}
and
not test {\iflabeldateisdate}}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch bbx@opt@mergedate@compact}}
\xpatchcmd{\bbx@opt@mergedate@compact}{%
\printtext[parens]%
}{%
\printtext[datelabel]%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch bbx@opt@mergedate@compact}}
\xpatchcmd{\bbx@opt@mergedate@basic}{%
\iffieldundef{labelyear}%
}{%
@@ -517,12 +588,12 @@
togl {bbx:nonodate}
and
not test {\iflabeldateisdate}}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch bbx@opt@mergedate@basic}}
\xpatchcmd{\bbx@opt@mergedate@basic}{%
\printtext[parens]%
}{%
\printtext[datelabel]%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch bbx@opt@mergedate@basic}}
\xpatchcmd{\bbx@opt@mergedate@minimum}{%
\iffieldundef{labelyear}%
}{%
@@ -530,12 +601,12 @@
togl {bbx:nonodate}
and
not test {\iflabeldateisdate}}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch bbx@opt@mergedate@minimum}}
\xpatchcmd{\bbx@opt@mergedate@minimum}{%
\printtext[parens]%
}{%
\printtext[datelabel]%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch bbx@opt@mergedate@minimum}}
\xpatchcmd{\bbx@opt@mergedate@false}{%
\iffieldundef{labelyear}%
}{%
@@ -543,11 +614,23 @@
togl {bbx:nonodate}
and
not test {\iflabeldateisdate}}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch bbx@opt@mergedate@false}}
\xpatchcmd{\bbx@opt@mergedate@false}{%
\printtext[parens]%
}{%
\printtext[datelabel]%
+}{}{\wlog{WARNING: biblatex-bath failed to patch bbx@opt@mergedate@false}}
+\xpatchcmd{\bbx@opt@mergedate@maximum}{%
+ \iffieldsequal{year}{labelyear}
+ {\printlabeldateextra}%
+ {\printfield{labelyear}%
+ \printfield{extrayear}}%
+}{%
+ \iflabeldateisdate
+ {\printfield{issue}%
+ \setunit*{\addspace}%
+ \printdateextra}
+ {\printlabeldateextra}%
}{}{}
\def\bbx@opt@mergedate@year{%
@@ -563,6 +646,9 @@
\iflabeldateisdate{%
\clearfield{year}%
}{}}}
+ \ifcsundef{abx@macro@date+extrayear}{}{%
+ \renewbibmacro*{date+extrayear}{\usebibmacro{date+extradate}}%
+ }
\renewbibmacro*{issue+date}{%
\ifboolexpr{
test {\iffieldundef{issue}}
@@ -643,27 +729,55 @@
\csuse{mkbibseasondate#1}{}{#2endseason}}%
\enddateuncertainprint}}}}}
\xpatchcmd{\mkdaterangefull}{%
- \iffieldundef{#2year} {}%
+ \iffieldundef{#2year} {\blx@nounit}%
}{%
\iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}%
-}{}{}
-\xpatchcmd{\mkdaterangetrunc}{%
- \iffieldundef{#2year} {}%
+}{\@tempswafalse}{\@tempswatrue}%
+\if@tempswa
+ \xpatchcmd{\mkdaterangefull}{%
+ \iffieldundef{#2year} {}%
+ }{%
+ \iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}%
+ }{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangefull}}%
+\fi
+\xpatchcmd{\mkdaterangetrunc@i}{%
+ \iffieldundef{#2year} {\blx@nounit}%
}{%
\iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}%
-}{}{}
+}{\@tempswafalse}{\@tempswatrue}%
+\if@tempswa
+ \xpatchcmd{\mkdaterangetrunc}{%
+ \iffieldundef{#2year} {}%
+ }{%
+ \iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}%
+ }{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangetrunc@i}}%
+\fi
\xpatchcmd{\mkdaterangefullextra}{%
- \iffieldundef{#2year} {}%
+ \iffieldundef{#2year} {\blx@nounit}%
}{%
\iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}%
-}{}{}
-\xpatchcmd{\mkdaterangetruncextra}{%
- \iffieldundef{#2year} {}%
+}{\@tempswafalse}{\@tempswatrue}%
+\if@tempswa
+ \xpatchcmd{\mkdaterangefullextra}{%
+ \iffieldundef{#2year} {}%
+ }{%
+ \iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}%
+ }{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangefullextra}}%
+\fi
+\xpatchcmd{\mkdaterangetruncextra@i}{%
+ \iffieldundef{#2year} {\blx@nounit}%
}{%
\iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}%
-}{}{}
+}{\@tempswafalse}{\@tempswatrue}%
+\if@tempswa
+ \xpatchcmd{\mkdaterangetruncextra}{%
+ \iffieldundef{#2year} {}%
+ }{%
+ \iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}%
+ }{}{\wlog{WARNING: biblatex-bath failed to patch mkdaterangetruncextra@i}}%
+\fi
-\DeclareFieldFormat{version}{\mkbibparens{\bibstring{version}#1}}
+\DeclareFieldFormat{version}{\mkbibparens{\biblcsstring{version}#1}}
\DeclareFieldFormat{type}{\ifbibstring{#1}{\biblstring{#1}}{#1}}
\renewbibmacro*{event+venue+date}{%
\printfield{eventtitle}%
@@ -677,42 +791,26 @@
{}
{\setunit{\addcomma\space}%
\printeventdate
- \setunit*{\addspace}%
+ \setunit*{\addcomma\space}%
\printfield{venue}%
\newunit}}
+\letbibmacro{plain:institution+location+date}{institution+location+date}
\renewbibmacro*{institution+location+date}{%
- \printlist{location}%
\iflistundef{publisher}{%
- \iflistundef{institution}{%
- \setunit*{\addcomma\space}%
- }{%
- \setunit*{\addcolon\space}%
- \printlist{institution}%
- }%
+ \usebibmacro{plain:institution+location+date}%
}{%
- \setunit*{\addcolon\space}%
- \printlist{publisher}%
- }%
- \setunit*{\addcomma\space}%
- \usebibmacro{date}%
- \newunit}
+ \printlist{institution}%
+ \newunit
+ \usebibmacro{publisher+location+date}}}
+\letbibmacro{plain:organization+location+date}{organization+location+date}
\renewbibmacro*{organization+location+date}{%
- \printlist{location}%
\iflistundef{publisher}{%
- \iflistundef{organization}{%
- \setunit*{\addcomma\space}%
- }{%
- \setunit*{\addcolon\space}%
- \printlist{organization}%
- }%
+ \usebibmacro{plain:organization+location+date}%
}{%
- \setunit*{\addcolon\space}%
- \printlist{publisher}%
- }%
- \setunit*{\addcomma\space}%
- \usebibmacro{date}%
- \newunit}
+ \printlist{organization}%
+ \newunit
+ \usebibmacro{publisher+location+date}}}
\DeclareFieldFormat{library}{\mkbibemph{#1}}
\newbibmacro*{library}{%
@@ -736,6 +834,12 @@
\iftoggle{bbx:url}
{\usebibmacro{url+urldate}}
{}}
+\xpatchbibdriver{online}{%
+ \iftoggle{bbx:doi}
+ {\printfield{doi}}
+ {}%
+}{}{}{\wlog{WARNING: biblatex-bath failed to remove extra DOI from online driver}}
+
\renewbibmacro*{url}{%
\iffieldundef{doi}%
{\printfield{url}}%
@@ -746,7 +850,22 @@
\usebibmacro{in:}\usebibmacro{journal+issuetitle}%
}{%
\usebibmacro{journal+issuetitle}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch article driver}}
+\xpatchbibdriver{article}{%
+ \usebibmacro{addendum+pubstate}%
+}{%
+ \printfield{addendum}%
+}{}{\wlog{WARNING: biblatex-bath failed to patch article driver}}
+\xpatchbibmacro{journal}{%
+ \printfield[titlecase]{journaltitle}%
+}{%
+ \printfield[sentencecase]{journaltitle}%
+}{}{\wlog{WARNING: biblatex-bath failed to patch journal macro}}
+\xpatchbibmacro{journal}{%
+ \printfield[titlecase]{journalsubtitle}%
+}{%
+ \printfield[sentencecase]{journalsubtitle}%
+}{}{\wlog{WARNING: biblatex-bath failed to patch journal macro}}
\renewbibmacro*{journal+issuetitle}{%
\usebibmacro{journal}%
\setunit*{\addspace}%
@@ -762,6 +881,8 @@
\usebibmacro{issue+date}%
\setunit{\addcolon\space}%
\usebibmacro{issue}%
+ \setunit{\addcomma\space}%
+ \printfield{pubstate}%
\newunit}
\renewbibmacro*{volume+number+eid}{%
\printfield{volume}%
@@ -775,7 +896,7 @@
}{%
\setunit{\addcomma\space}%
\usebibmacro{series+number}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch book driver}}
\xpatchbibdriver{collection}{%
\newunit\newblock
@@ -783,7 +904,7 @@
}{%
\setunit{\addcomma\space}%
\usebibmacro{series+number}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch collection driver}}
\xpatchbibdriver{inbook}{%
\newunit\newblock
@@ -791,7 +912,7 @@
}{%
\setunit{\addcomma\space}%
\usebibmacro{series+number}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch inbook driver}}
\xpatchbibdriver{incollection}{%
\newunit\newblock
@@ -799,7 +920,7 @@
}{%
\setunit{\addcomma\space}%
\usebibmacro{series+number}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch incollection driver}}
\xpatchbibdriver{inproceedings}{%
\newunit\newblock
@@ -807,7 +928,7 @@
}{%
\setunit{\addcomma\space}%
\usebibmacro{series+number}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch inproceedings driver}}
\xpatchbibdriver{proceedings}{%
\newunit\newblock
@@ -815,7 +936,7 @@
}{%
\setunit{\addcomma\space}%
\usebibmacro{series+number}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch proceedings driver}}
\xpatchbibdriver{incollection}{%
\usebibmacro{in:}%
@@ -828,7 +949,7 @@
\newunit\newblock
\usebibmacro{maintitle+booktitle}%
\usebibmacro{byeditor+others}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch incollection driver}}
\xpatchbibdriver{inproceedings}{%
\usebibmacro{in:}%
@@ -845,15 +966,27 @@
\usebibmacro{byeditor+others}%
\newunit
\usebibmacro{event+venue+date}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch inproceedings driver}}
+
+\xpatchbibdriver{dataset}{%
+ \printlist{organization}%
+ \newunit
+ \usebibmacro{publisher+location+date}%
+}{%
+ \usebibmacro{library}%
+ \newunit\newblock
+ \usebibmacro{organization+location+date}%
+}{}{\wlog{WARNING: biblatex-bath failed to patch dataset driver}}
\xpatchbibdriver{online}{%
\printlist{organization}%
+ \newunit\newblock
+ \usebibmacro{date}%
}{%
\usebibmacro{library}%
\newunit\newblock
\usebibmacro{organization+location+date}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch online driver}}
\DeclareFieldFormat{forceparens}{(#1)}
\newbibmacro{series+type+number}{%
@@ -893,14 +1026,11 @@
\newunit\newblock
\usebibmacro{byauthor}%
\newunit\newblock
+ \usebibmacro{series+type+number}%
+ \newunit\newblock
\printfield{note}%
\newunit\newblock
\usebibmacro{institution+location+date}%
- \iffieldundef{series}{%
- \setunit{\addcomma\space}%
- }{%
- \setunit{\addspace}}%
- \usebibmacro{series+type+number}%
\newunit\newblock
\usebibmacro{chapter+pages}%
\newunit
@@ -944,7 +1074,14 @@
\printfield{type}%
}{%
\usebibmacro{manual:series+type+number}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch manual driver}}
+\xpatchbibdriver{manual}{%
+ \printlist{organization}%
+ \newunit
+ \usebibmacro{publisher+location+date}%
+}{%
+ \usebibmacro{organization+location+date}%
+}{}{\wlog{WARNING: biblatex-bath failed to patch manual driver}}
\DeclareStyleSourcemap{%
\maps[datatype=bibtex]{%
@@ -965,6 +1102,15 @@
}}
\ExecuteBibliographyOptions[standard]{useeditor=false}
+\newbibmacro*{type+online}{%
+ \printfield{type}%
+ \ifboolexpr{
+ test {\iffieldundef{type}}
+ or
+ test {\nottoggle{bbx:labelistitle}}
+ }{}{%
+ \setunit{\addspace}%
+ \usebibmacro{isonline}}}
\DeclareBibliographyDriver{audio}{%
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
@@ -974,7 +1120,7 @@
\newunit
\printlist{language}%
\newunit\newblock
- \printfield{type}%
+ \usebibmacro{type+online}%
\newunit\newblock
\usebibmacro{byauthor}[given-family:full]%
\newunit\newblock
@@ -1178,21 +1324,45 @@
\DeclareFieldFormat[legislation]{datelabel}{%
\iftoggle{bbx:eu-oj}{%
\mkbibbrackets{#1}%
- }{%
- #1}}
+ }{#1}}
\DeclareFieldFormat[legislation]{labeldate}{%
- \iftoggle{bbx:labelistitle}{\mkbibemph{#1}}{#1}}
+ \iftoggle{bbx:labelistitle}{\printtext[title]{#1}}{#1}}
\DeclareFieldFormat[legislation]{chapter}{\biblcsstring{legalchapter}#1}
-\newbibmacro*{series+chapter}{%
- \iffieldundef{chapter}{}{%
- \iffieldundef{series}{%
- \printfield{chapter}%
+\newbibmacro*{journal+series+volume+number+chapter+pages}{%
+ \iftoggle{bbx:eu-oj}{%
+ \setunit{\addspace}%
+ \usebibmacro{eu:journal+series+volume+pages}%
+ }{%
+ \iffieldequalstr{entrysubtype}{secondary}{%
+ \setunit{\addcomma\space}%
+ \printfield{number}%
+ \clearfield{number}%
+ \printunit{\addcomma\space}%
}{%
- \printtext[parens]{%
- \printfield{series}%
- \setunit{\addcomma\space}%
- \printfield{chapter}}}%
- \clearfield{series}}}
+ \ifboolexpr{
+ test {\iffieldundef{series}}
+ and
+ test {\iffieldundef{type}}
+ }{%
+ \iffieldundef{number}{%
+ \setunit{\addcomma\space}%
+ \printfield{chapter}%
+ }{%
+ \setunit{\addspace}%
+ \printtext[parens]{%
+ \printfield{number}%
+ \setunit*{\addcomma\space}%
+ \printfield{chapter}}}%
+ }{%
+ \iffieldundef{chapter}{}{\setunit{\addspace}}%
+ \printtext[parens]{%
+ \printfield{series}%
+ \setunit{\addcomma\space}%
+ \printfield{type}%
+ \setunit*{\addspace}%
+ \printfield{number}%
+ \setunit*{\addcomma\space}%
+ \printfield{chapter}}}}}}
\DeclareBibliographyDriver{legislation}{%
\usebibmacro{bibindex}%
@@ -1205,28 +1375,12 @@
\printlist{language}%
\newunit\newblock
\usebibmacro{byauthor}%
- \iffieldequalstr{entrysubtype}{secondary}{%
- \setunit{\addcomma\space}%
- \printfield{number}%
- \clearfield{number}%
- \printunit{\addcomma\space}%
- }{%
- \setunit{\addcomma\space}%
- }%
+ \newunit\newblock
+ \usebibmacro{journal+series+volume+number+chapter+pages}
+ \newunit\newblock
\printfield{note}%
- \iffieldundef{series}{%
- \setunit{\addcomma\space}%
- }{%
- \setunit{\addspace}}%
- \iftoggle{bbx:eu-oj}{%
- \usebibmacro{eu:journal+series+volume+pages}%
- }{%
- \usebibmacro{series+chapter}%
- }
\newunit\newblock
\usebibmacro{institution+location+date}%
- \setunit{\addspace}%
- \usebibmacro{series+type+number}%
\newunit\newblock
\printfield{pagetotal}%
\newunit\newblock
@@ -1384,10 +1538,55 @@
}%
}
+\newbibmacro*{isunpublished}{%
+ \bibstring{unpublished}%
+}
+\DeclareBibliographyDriver{unpublished}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author}%
+ \setunit{\printdelim{nametitledelim}}\newblock
+ \usebibmacro{title}%
+ \newunit
+ \printlist{language}%
+ \newunit\newblock
+ \usebibmacro{byauthor}%
+ \newunit\newblock
+ \ifnameundef{editor}{}{\usebibmacro{in:}}%
+ \usebibmacro{bookeditor}%
+ \newunit\newblock
+ \usebibmacro{maintitle+booktitle}%
+ \usebibmacro{byeditor+others}%
+ \newunit\newblock
+ \printfield{howpublished}%
+ \newunit\newblock
+ \printfield{type}%
+ \newunit\newblock
+ \usebibmacro{event+venue+date}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \usebibmacro{location+date}%
+ \newunit\newblock
+ \usebibmacro{isunpublished}%
+ \newunit\newblock
+ \iftoggle{bbx:url}
+ {\usebibmacro{url+urldate}}
+ {}%
+ \newunit\newblock
+ \usebibmacro{addendum+pubstate}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}}
+
\DeclareBibliographyAlias{standard}{manual}
-\DeclareBibliographyAlias{dataset}{online}
%%
-%% Copyright (C) 2018 by University of Bath
+%% Copyright (C) 2020 by University of Bath
%%
%% End of file `bath.bbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-bath/bath.cbx new/tex/latex/biblatex-bath/bath.cbx
--- old/tex/latex/biblatex-bath/bath.cbx 2018-10-18 22:33:24.000000000 +0200
+++ new/tex/latex/biblatex-bath/bath.cbx 2020-01-16 22:57:10.000000000 +0100
@@ -13,6 +13,10 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
+\def\Version{2020/01/16 v3.2}
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesFile{bath.cbx}
+ [\Version\space Citation style as recommended by the University of Bath Library]
\RequireCitationStyle{authoryear-comp}
\ExecuteBibliographyOptions{uniquename=init}
\renewcommand*{\compcitedelim}{\addsemicolon\space}
@@ -23,16 +27,16 @@
togl {bbx:nonodate}
and
not test {\iflabeldateisdate}}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch cite:labeldate+extradate}}
\providetoggle{bbx:labelistitle}
\xpatchbibmacro{cite:label}{%
\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}%
}{%
\printtext[bibhyperref]{\printfield[citetitle]{labeltitle}}%
\toggletrue{bbx:labelistitle}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-bath failed to patch cite:label}}
%%
-%% Copyright (C) 2018 by University of Bath
+%% Copyright (C) 2020 by University of Bath
%%
%% End of file `bath.cbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-bath/bath.dbx new/tex/latex/biblatex-bath/bath.dbx
--- old/tex/latex/biblatex-bath/bath.dbx 2018-10-18 22:33:24.000000000 +0200
+++ new/tex/latex/biblatex-bath/bath.dbx 2020-01-16 22:57:10.000000000 +0100
@@ -13,9 +13,13 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
+\def\Version{2020/01/16 v3.2}
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesFile{bath.dbx}
+ [\Version\space Data model required by the biblatex-bath style]
\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,cjk}
%%
-%% Copyright (C) 2018 by University of Bath
+%% Copyright (C) 2020 by University of Bath
%%
%% End of file `bath.dbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-bath/british-bath.lbx new/tex/latex/biblatex-bath/british-bath.lbx
--- old/tex/latex/biblatex-bath/british-bath.lbx 2018-10-18 22:33:24.000000000 +0200
+++ new/tex/latex/biblatex-bath/british-bath.lbx 2020-01-16 22:57:10.000000000 +0100
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% biblatex-bath.dtx (with options: `lbx')
+%% biblatex-bath.dtx (with options: `lbx-gb')
%% ----------------------------------------------------------------
%% biblatex-bath --- Harvard referencing style as recommended by the University of Bath Library
%% Author: Alex Ball
@@ -13,6 +13,10 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
+\def\Version{2020/01/16 v3.2}
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesFile{british-bath.lbx}
+ [\Version\space British English conventions required by the biblatex-bath style]
\InheritBibliographyExtras{british}
\DeclareBibliographyExtras{%
\protected\def\mkbibdatelong#1#2#3{%
@@ -32,46 +36,10 @@
}
\DeclareBibliographyStrings
-{inherit = {british}
-,urlseen = {{Accessed}{Accessed}}
-,version = {{version~}{v\adddot}}
-,january = {{January}{January}}
-,february = {{February}{February}}
-,march = {{March}{March}}
-,april = {{April}{April}}
-,may = {{May}{May}}
-,june = {{June}{June}}
-,july = {{July}{July}}
-,august = {{August}{August}}
-,september = {{September}{September}}
-,october = {{October}{October}}
-,november = {{November}{November}}
-,december = {{December}{December}}
-,patreq = {{patent application}{pat\adddot\ appl\adddot}}
-,patreqde = {{German patent application}{German pat\adddot\ appl\adddot}}
-,patreqeu = {{European patent application}{European pat\adddot\ appl\adddot}}
-,patreqfr = {{French patent application}{French pat\adddot\ appl\adddot}}
-,patrequk = {{British patent application}{British pat\adddot\ appl\adddot}}
-,patrequs = {{U.S\adddotspace patent application}{U.S\adddotspace pat\adddot\ appl\adddot}}
-,online = {{Online}{Online}}
-,hours = {{hours}{hrs\adddot}}
-,at = {{at}{at}}
-,legalchapter = {{chapter}{c\adddot}}
-,director = {{director}{dir\adddot}}
-,directors = {{directors}{dir\adddot}}
-,bydirector = {{directed by}{directed by}}
-,performer = {{}{}}
-,performers = {{}{}}
-,byperformer = {{}{}}
-,reader = {{reader}{reader}}
-,readers = {{readers}{readers}}
-,byreader = {{read by}{read by}}
-,conductor = {{conductor}{cond\adddot}}
-,conductors = {{conductors}{cond\adddot}}
-,byconductor = {{conducted by}{conducted by}}
+{inherit = {english}
}
%%
-%% Copyright (C) 2018 by University of Bath
+%% Copyright (C) 2020 by University of Bath
%%
%% End of file `british-bath.lbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-bath/english-bath.lbx new/tex/latex/biblatex-bath/english-bath.lbx
--- old/tex/latex/biblatex-bath/english-bath.lbx 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/biblatex-bath/english-bath.lbx 2020-01-16 22:57:10.000000000 +0100
@@ -0,0 +1,68 @@
+%%
+%% This is file `english-bath.lbx',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% biblatex-bath.dtx (with options: `lbx')
+%% ----------------------------------------------------------------
+%% biblatex-bath --- Harvard referencing style as recommended by the University of Bath Library
+%% Author: Alex Ball
+%% E-mail: a.j.ball(a)bath.ac.uk
+%% License: Released under the LaTeX Project Public License v1.3c or later
+%% See: http://www.latex-project.org/lppl.txt
+%% ----------------------------------------------------------------
+%%
+\def\Version{2020/01/16 v3.2}
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesFile{english-bath.lbx}
+ [\Version\space Generic English conventions required by the biblatex-bath style]
+\InheritBibliographyExtras{english}
+\DeclareBibliographyStrings
+{inherit = {english}
+,editors = {{editors}{eds}}
+,version = {{version~}{v\adddot}}
+,inpreparation = {{preprint}{preprint}}
+,submitted = {{preprint}{preprint}}
+,urlseen = {{Accessed}{Accessed}}
+,january = {{January}{January}}
+,february = {{February}{February}}
+,march = {{March}{March}}
+,april = {{April}{April}}
+,may = {{May}{May}}
+,june = {{June}{June}}
+,july = {{July}{July}}
+,august = {{August}{August}}
+,september = {{September}{September}}
+,october = {{October}{October}}
+,november = {{November}{November}}
+,december = {{December}{December}}
+,patreq = {{patent application}{pat\adddot\ appl\adddot}}
+,patreqde = {{German patent application}{German pat\adddot\ appl\adddot}}
+,patreqeu = {{European patent application}{European pat\adddot\ appl\adddot}}
+,patreqfr = {{French patent application}{French pat\adddot\ appl\adddot}}
+,patrequk = {{British patent application}{British pat\adddot\ appl\adddot}}
+,patrequs = {{U.S\adddotspace patent application}{U.S\adddotspace pat\adddot\ appl\adddot}}
+,online = {{Online}{Online}}
+,hours = {{hours}{hrs\adddot}}
+,at = {{at}{at}}
+,unpublished = {{unpublished}{unpublished}}
+,legalchapter = {{chapter}{c\adddot}}
+,director = {{director}{dir\adddot}}
+,directors = {{directors}{dir\adddot}}
+,bydirector = {{directed by}{directed by}}
+,performer = {{}{}}
+,performers = {{}{}}
+,byperformer = {{}{}}
+,reader = {{reader}{reader}}
+,readers = {{readers}{readers}}
+,byreader = {{read by}{read by}}
+,conductor = {{conductor}{cond\adddot}}
+,conductors = {{conductors}{cond\adddot}}
+,byconductor = {{conducted by}{conducted by}}
+}
+
+%%
+%% Copyright (C) 2020 by University of Bath
+%%
+%% End of file `english-bath.lbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-bath.tlpobj new/tlpkg/tlpobj/biblatex-bath.tlpobj
--- old/tlpkg/tlpobj/biblatex-bath.tlpobj 2019-02-28 03:20:13.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-bath.tlpobj 2020-01-17 01:54:50.000000000 +0100
@@ -1,22 +1,21 @@
name biblatex-bath
category Package
-revision 48943
+revision 53424
shortdesc Harvard referencing style as recommended by the University of Bath Library
relocated 1
longdesc This package provides a BibLaTeX style to format reference
longdesc lists in the Harvard style recommended by the University of
longdesc Bath Library.
-runfiles size=13
- RELOC/tex/latex/biblatex-bath/american-bath.lbx
+runfiles size=15
RELOC/tex/latex/biblatex-bath/bath.bbx
RELOC/tex/latex/biblatex-bath/bath.cbx
RELOC/tex/latex/biblatex-bath/bath.dbx
RELOC/tex/latex/biblatex-bath/british-bath.lbx
+ RELOC/tex/latex/biblatex-bath/english-bath.lbx
catalogue-also bath-bst
catalogue-contact-bugs https://github.com/alex-ball/bathbib/issues
catalogue-contact-home https://github.com/alex-ball/bathbib
catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-bath
-catalogue-date 2018-10-19 06:33:44 +0200
catalogue-license lppl1.3c
catalogue-topics biblatex
-catalogue-version 2.0.1
+catalogue-version 3.2
++++++ biblatex-bookinother.doc.tar.xz ++++++
Binary files old/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.pdf and new/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex new/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex
--- old/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex 2017-11-19 23:18:21.000000000 +0100
+++ new/doc/latex/biblatex-bookinother/documentation/biblatex-bookinother.tex 2020-03-02 22:40:39.000000000 +0100
@@ -24,8 +24,8 @@
subtitle={New data types},
email={maieul <at> maieul <dot> net},
author={Maeul Rouquette},
- revision={2.3.1},
- date={19/11/2017},
+ revision={2.3.3},
+ date={02/03/2020},
url={https://github.com/maieul/biblatex-bookinarticle}}
% biblatex
@@ -48,19 +48,19 @@
\section{Introduction}
\subsection{Aim}
-The default \biblatex's styles provide an entry type called \bibtype{bookinbook}.
-However, it can happen, especially in classical philology, that a book is edited in other entry type.
+The default \biblatex's styles provide an entry type called \bibtype{bookinbook}.
+However, it can happen, especially in classical philology, that a book is edited in other entry type.
For example a book can be edited in article, in proceedings, in a thesis etc.
This package provides new bibliographic entry types.
\subsection{History}
-Originally, the package was called \pkg{biblatex-bookinarticle}, because it provided only a new \bibtype{bookinarticle} entry type.
-However, many new types were added.
+Originally, the package was called \pkg{biblatex-bookinarticle}, because it provided only a new \bibtype{bookinarticle} entry type.
+However, many new types were added.
Changing the name was required, and when the loading's way has changed, a good occasion happened.
\subsection{Credits}
-This package was created for Maeul Rouquette's phd dissertation\footnote{\url{http://apocryphes.hypothese.org}.} in 2014. It is licensed on the \emph{\LaTeX\ Project Public License}\footnote{\url{http://latex-project.org/lppl/lppl-1-3c.html}.}.
+This package was created for Maeul Rouquette's phd dissertation\footnote{\url{http://apocryphes.hypothese.org}.} in 2014. It is licensed on the \emph{\LaTeX\ Project Public License}\footnote{\url{http://latex-project.org/lppl/lppl-1-3c.html}.}.
All issues can be submitted, in French or English, in the GitHub issues page\footnote{\url{https://github.com/maieul/biblatex-bookinarticle/issues}….
@@ -70,9 +70,9 @@
The package provides:
\begin{itemize}
- \item New entry types.
- \item Inheritance's mechanism for these entry types.
- \item Integration of the entry types following the standard bibliography's styles of biblatex.
+ \item New entry types.
+ \item Inheritance's mechanism for these entry types.
+ \item Integration of the entry types following the standard bibliography's styles of biblatex.
\item Integration of the new fields of the \pkg{biblatex-morenames} package.
\item New fields when required and not defined in \pkg{biblatex-morenames} package.
\end{itemize}
@@ -81,10 +81,10 @@
\section{Loading package}
The package requires \emph{biblatex} 3.4 or later.
-
+
As the package defines new fields, you must load it as a \verb+bibstyle+ option of \biblatex package.
-
+
\begin{minted}{latex}
\usepackage[citestyle=yourcitationstyle,bibstyle=bookinother]{biblatex}
\end{minted}
@@ -92,9 +92,9 @@
Notes that the \namebibstyle{bookinother} bibliography's style automatically loads \namebibstyle{verbose} bibliography's style, which means it is compatible with all the \emph{verbose-xxx} and \namebibstyle{authortitle-xxx} bibliography's styles of \biblatex, because all of them are identical to the \namebibstyle{verbose} \textbf{bibliography style}.
Hoewever, if you want to use an other bibliography's style, you can use the \pkg{biblatex-multiple-dm} package, but the uniformity can't be assured.
-
+
In any case, you can choose your own \textbf{citation style}.
-
+
\label{morenames}If you need to use this package with package which also requires loading \emph{via} the \verb+bibstyle+ option, as for example \pkg{biblatex-morenames}, just use the \pkg{biblatex-multiple-dm} package, in the following way:
\begin{minted}{latex}
@@ -116,14 +116,14 @@
The package provides new entry types in the form of \bibtype{bookin\meta{othertype}}.
The best way to manage these entry types is to use the crossref mechanism of biber.
- So the \bibfield{crossref} field of a \bibtype{bookin\meta{othertype}} entry should refers to the main \bibtype{\meta{othertype}} entry.
+ So the \bibfield{crossref} field of a \bibtype{bookin\meta{othertype}} entry should refers to the main \bibtype{\meta{othertype}} entry.
The package also provides new \bibtype{in\meta{othertype}} entry types.
The only differences with the \bibtype{bookin\meta{othertype}} entry types is that the \bibfield{title} is, with standard styles, printed in roman font and wrapped in quotation marks.
-
+
\subsection{Fields}
-In the following parts of this handbook, we will describe, for each entry type, the fields inheritance mechanism.
+In the following parts of this handbook, we will describe, for each entry type, the fields inheritance mechanism.
Here is a list of fields which are NOT inherited :
\begin{itemize}
@@ -131,17 +131,17 @@
\item \bibfield{bookineditor} means the editor of the edited (ancient) book. If this field is equal to the \bibfield{editor} field, the last one is not printed.
\item \bibfield{title} means the title of the edited (ancient) book.
\item \bibfield{subtitle} means the subtitle of the edited (ancient) book.
-
+
\end{itemize}
If you use the \bibfield{ineditor} field of the \pkg{biblatex-morenames} package, it will be inherited as \bibfield{bookeditor} field.
Note that the package takes account of the \bibfield{maineditor} field of the \pkg{biblatex-morenames} package, if loaded.
-Also note that the \bibfield{bookineditor} field is not added in the style of the \bibtype{bookinbook} entry type, because that is a standard \biblatex\ entry type.
+Also note that the \bibfield{bookineditor} field is not added in the style of the \bibtype{bookinbook} entry type, because that is a standard \biblatex\ entry type.
Use the \pkg{biblatex-morenames} package to add this field to the style of \bibtype{bookinbook}.
-
-
+
+
% Here, a loop on the entry type, to automatically generate the handbook
\def\firstofthree#1#2#3{#1}
@@ -155,9 +155,9 @@
\subsubsection{Meaning}
For book edited in a \bibtype{\entrytype} entry.
\subsubsection{.bib example}
-
+
\inputminted[breaklines]{latex}{example-bookin\entrytype.bib}
-
+
\subsubsection{Fields inheritance}
The graph~\ref{example-bookin\entrytype} shows the fields inheritance.
\begin{figure}
@@ -165,12 +165,12 @@
\includegraphics[height=0.9\textheight]{example-bookin\entrytype.pdf}
\label{example-bookin\entrytype}
\caption{Inheritance related to the \bibtype{bookin\entrytype} entry type}
- \end{figure}
+ \end{figure}
\subsubsection{Output example}
\begin{quotation}
\cite{\entrykey}
\end{quotation}
- \entrymore
+ \entrymore
}
% For each entry of the csvlist:
@@ -221,6 +221,12 @@
\begin{changelog}
+\begin{release}{2.3.3}{2020-03-02}
+ \item Fix spurious spaces.
+\end{release}
+\begin{release}{2.3.2}{2020-01-20}
+ \item Declare correctly the new entrytypes to Biber.
+\end{release}
\begin{release}{2.3.1}{2017-11-19}
\item Fix volume format for \bibtype{bookinjournal} type.
\end{release}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.bib new/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.bib
--- old/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.bib 2016-04-07 22:51:23.000000000 +0200
+++ new/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.bib 2020-03-02 22:40:39.000000000 +0100
@@ -1,6 +1,5 @@
@article{VanDeun1990,
Author = {Van Deun, Peter},
- Ineditor = {Article Editor},
Journaltitle = {Analecta Bollandiana},
Number = {108},
Pages = {323-335},
@@ -8,7 +7,7 @@
Title = {Un mmoire anonyme sur saint Barnab (BHG 226e)},
Year = {1990}}
@bookinarticle{BHG226e,
- bookineditor = {Book Editor},
+ bookineditor = {Van Deun, Peter},
Crossref = {VanDeun1990},
Pages = {326-335},
Title = {Mmoire sur le saint aptre Barnab}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.dot new/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.dot
--- old/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.dot 2016-06-11 01:20:07.000000000 +0200
+++ new/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.dot 2020-03-02 22:40:39.000000000 +0100
@@ -15,7 +15,6 @@
fillcolor="#a0d0ff";
"section0/BHG226e/bookauthor" [ label="BOOKAUTHOR" ]
- "section0/BHG226e/bookeditor" [ label="BOOKEDITOR" ]
"section0/BHG226e/bookineditor" [ label="BOOKINEDITOR" ]
"section0/BHG226e/crossref" [ label="CROSSREF" ]
"section0/BHG226e/journaltitle" [ label="JOURNALTITLE" ]
@@ -34,7 +33,6 @@
fillcolor="#a0d0ff";
"section0/VanDeun1990/author" [ label="AUTHOR" ]
- "section0/VanDeun1990/ineditor" [ label="INEDITOR" ]
"section0/VanDeun1990/journaltitle" [ label="JOURNALTITLE" ]
"section0/VanDeun1990/number" [ label="NUMBER" ]
"section0/VanDeun1990/pages" [ label="PAGES" ]
@@ -46,7 +44,6 @@
"section0/VanDeun1990/author" -> "section0/BHG226e/bookauthor" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/BOOKAUTHOR inherited via CROSSREF from VanDeun1990/AUTHOR" ]
- "section0/VanDeun1990/ineditor" -> "section0/BHG226e/bookeditor" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/BOOKEDITOR inherited via CROSSREF from VanDeun1990/INEDITOR" ]
"section0/VanDeun1990/journaltitle" -> "section0/BHG226e/journaltitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/JOURNALTITLE inherited via CROSSREF from VanDeun1990/JOURNALTITLE" ]
"section0/VanDeun1990/number" -> "section0/BHG226e/number" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/NUMBER inherited via CROSSREF from VanDeun1990/NUMBER" ]
"section0/VanDeun1990/subtitle" -> "section0/BHG226e/mainsubtitle" [ penwidth="2.0", color="#7d7879", tooltip="BHG226e/MAINSUBTITLE inherited via CROSSREF from VanDeun1990/SUBTITLE" ]
Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookinarticle.pdf differ
Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookincollection.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookincollection.pdf differ
Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookininarticle.pdf differ
Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookininbook.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookininbook.pdf differ
Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookinincollection.pdf differ
Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookininproceedings.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookininproceedings.pdf differ
Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookinjournal.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookinjournal.pdf differ
Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookinproceedings.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookinproceedings.pdf differ
Binary files old/doc/latex/biblatex-bookinother/documentation/example-bookinthesis.pdf and new/doc/latex/biblatex-bookinother/documentation/example-bookinthesis.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-bookinother.doc.tlpobj new/tlpkg/tlpobj/biblatex-bookinother.doc.tlpobj
--- old/tlpkg/tlpobj/biblatex-bookinother.doc.tlpobj 2019-02-28 03:20:17.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-bookinother.doc.tlpobj 2020-03-02 23:08:46.000000000 +0100
@@ -1,6 +1,6 @@
name biblatex-bookinother.doc
category Package
-revision 45856
+revision 54015
shortdesc doc files of biblatex-bookinother
relocated 1
docfiles size=143
++++++ biblatex-bookinother.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-bookinother/bookinother.bbx new/tex/latex/biblatex-bookinother/bookinother.bbx
--- old/tex/latex/biblatex-bookinother/bookinother.bbx 2017-11-19 23:18:21.000000000 +0100
+++ new/tex/latex/biblatex-bookinother/bookinother.bbx 2020-03-02 22:40:39.000000000 +0100
@@ -9,12 +9,12 @@
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is Maeul Rouquette
%0. Preamble
\ProvidesFile{bookinother.bbx}
-[2017/11/19 v2.3.1 biblatex bibliography style to have entry type for book edited in other entry type (MR)]
+[2020/03/02 v2.3.3 biblatex bibliography style to have entry type for book edited in other entry type (MR)]
\RequireBiber
\RequirePackage{xpatch}
@@ -62,7 +62,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
-
+
\DeclareBibliographyDriver{ininarticle}{%
\usebibmacro{bibindex}%
@@ -106,7 +106,7 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\usebibmacro{finentry}}
-
+
\DeclareBibliographyDriver{ininbook}{%
@@ -242,7 +242,7 @@
\newunit
\usebibmacro{bybookineditor}%
\newunit\newblock
- \usebibmacro{in:}%
+ \usebibmacro{in:}%
\usebibmacro{bybookauthor}%
\setunit{\printdelim{nametitledelim}}\newblock
\usebibmacro{booktitle}%
@@ -417,7 +417,7 @@
{}%
}
{}
- {\bookinother@patch@failed{article}}
+ {\bookinother@patch@failed{article}}
@@ -491,7 +491,7 @@
% 5. Inheritance
\DeclareDataInheritance{article}{bookinarticle,inarticle}{
- \inherit{author}{bookauthor}%
+ \inherit{author}{bookauthor}%
\inherit{ineditor}{bookeditor}%
\inherit{title}{maintitle}%
\inherit{subtitle}{mainsubtitle}%
@@ -550,7 +550,7 @@
}
\DeclareDataInheritance{thesis,phdthesis,mathesis}{bookinthesis,inthesis,inphdthesis,inmathesis,bookinphdthesis,bookinmathesis}{
- \inherit{author}{bookauthor}%
+ \inherit{author}{bookauthor}%
\inherit{title}{booktitle}%
\inherit{titleaddon}{booktitleaddon}%
\inherit{subtitle}{booksubtitle}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-bookinother/bookinother.dbx new/tex/latex/biblatex-bookinother/bookinother.dbx
--- old/tex/latex/biblatex-bookinother/bookinother.dbx 2017-11-19 23:18:21.000000000 +0100
+++ new/tex/latex/biblatex-bookinother/bookinother.dbx 2020-03-02 22:40:39.000000000 +0100
@@ -9,11 +9,25 @@
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is Maeul Rouquette
% This work consists of the files realauthor.dbx, realauthor.bbx
\ProvidesFile{bookinother.dbx}
-[2017/11/19 v2.3.1 biblatex bibliography style to have entry type for book edited in other entry type (MR)]
+[2020/03/02 v2.3.3 biblatex bibliography style to have entry type for book edited in other entry type (MR)]
+
+%0. New entrytypes
+\DeclareDatamodelEntrytypes{
+ bookinarticle,
+ inarticle,
+ bookinthesis, bookinmathesis, bookinphdthesis,
+ inthesis, inmathesis, inphdthesis,
+ bookincollection, bookinproceedings, bookinreference,
+ bookinincollection, bookininproceedings, bookininreference,
+ inincollection, ininproceedings, ininreference,
+ bookinjournal,
+ ininbook, bookininbook,
+ ininarticle, bookininarticle,
+}
%1. New fields
@@ -34,7 +48,7 @@
inincollection,ininproceedings,ininreference%
]{%
bookeditor,
- bookineditor
+ bookineditor,
}
\DeclareDatamodelEntryfields[
@@ -45,20 +59,20 @@
bookinjournal,%
ininbook,bookininbook,%
]{%
- bookineditor
+ bookineditor,
}
\DeclareDatamodelEntryfields[%
ininarticle,bookininarticle%
]{%
bookineditor,
- mainauthor,%
+ mainauthor,
}
%3. For standard entry type
\DeclareDatamodelEntryfields[
bookincollection,bookinproceedings,bookinreference
]{%
bookeditor,
- bookineditor
+ bookineditor,
}
%4. Fields declared by morenames.dbx, for bookinother entrytypes
\DeclareDatamodelEntryfields[%
@@ -66,7 +80,7 @@
bookinincollection,bookininproceedings,bookininreference,%
inincollection,ininproceedings,ininreference%
]{
- maineditor
+ maineditor,
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-bookinother.tlpobj new/tlpkg/tlpobj/biblatex-bookinother.tlpobj
--- old/tlpkg/tlpobj/biblatex-bookinother.tlpobj 2019-02-28 03:20:18.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-bookinother.tlpobj 2020-03-02 23:08:47.000000000 +0100
@@ -1,6 +1,6 @@
name biblatex-bookinother
category Package
-revision 45856
+revision 54015
shortdesc Manage book edited in other entry type
relocated 1
longdesc This package provides new BibLaTeX entry types and fields for
@@ -11,7 +11,6 @@
RELOC/tex/latex/biblatex-bookinother/bookinother.bbx
RELOC/tex/latex/biblatex-bookinother/bookinother.dbx
catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-bookinother
-catalogue-date 2017-11-19 17:23:13 +0100
catalogue-license lppl1.3
catalogue-topics humanities biblatex
-catalogue-version 2.3.1
+catalogue-version 2.3.3
++++++ biblatex-caspervector.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-caspervector/ChangeLog.txt new/doc/latex/biblatex-caspervector/ChangeLog.txt
--- old/doc/latex/biblatex-caspervector/ChangeLog.txt 2018-07-02 22:39:36.000000000 +0200
+++ new/doc/latex/biblatex-caspervector/ChangeLog.txt 2019-11-15 22:35:23.000000000 +0100
@@ -1,7 +1,27 @@
-2018-06-29, v0.3.3
+2019-11-13, v0.3.4
+
+ * API changes:
+ - Add support for both Chinese and English `authortype'/`editortype'/...
+ - Add the `cparen' option to use Chinese parentheses in citations.
* Changes to package code:
+ - Facilitate customisation of the character before `', `' etc.
+ - Use more common words (""/"retrieve" -> ""/"access").
+
+ * Changes to documentation:
+ - Migrate to latexmk.
+ - caspervector-ay.bbx: use upstreamed `bbx:ifmergeddate'.
+
+ * Misc:
+ - README: migrate to Gitea, "for obvious reasons".
+ - Minor fixes and cosmetics.
+
+2018-06-29, v0.3.3
+
+ * API changes:
- Add support for the `edition' field.
+
+ * Changes to package code:
- Refine `maxcitenames'/`mincitenames'.
- blx-caspervector-base.def: fix "et al" for citations.
- blx-caspervector-base.def: improve spacing between `title' and `type'.
@@ -45,9 +65,9 @@
2018-05-28. v0.3.0
* API changes:
- - Added the caspervector-ay style (`dashed' and `mergedate' supported).
- - sorting: nty -> nyt.
- - Reduced tolerance in `year'/`date'; `note' added for compensation.
+ - Add the caspervector-ay style (`dashed' and `mergedate' supported).
+ - Sorting: nty -> nyt.
+ - Reduced tolerance in `year'/`date'; `note' added in compensation.
- Support `useauthor'-related functionalities.
* Changes to package code:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-caspervector/Makefile new/doc/latex/biblatex-caspervector/Makefile
--- old/doc/latex/biblatex-caspervector/Makefile 2018-07-02 22:39:36.000000000 +0200
+++ new/doc/latex/biblatex-caspervector/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-# Copyright (c) 2011-2013,2015-2016,2018 Casper Ti. Vector
-# Public domain.
-
-JOB = caspervector
-
-doc:
- latex $(JOB)
- biber -l zh__pinyin --output-safechars $(JOB)
- xelatex $(JOB)
- xelatex $(JOB)
-
-clean:
- rm -f $(JOB).aux $(JOB).bbl $(JOB).bcf $(JOB).blg $(JOB).dvi $(JOB).log \
- $(JOB).run.xml $(JOB).out missfont.log texput.log
-
-distclean: clean
- rm -f $(JOB).pdf
-
-# vim:ts=4:sw=4
Binary files old/doc/latex/biblatex-caspervector/caspervector-ay.pdf and new/doc/latex/biblatex-caspervector/caspervector-ay.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-caspervector/caspervector-ay.tex new/doc/latex/biblatex-caspervector/caspervector-ay.tex
--- old/doc/latex/biblatex-caspervector/caspervector-ay.tex 2018-07-02 22:39:36.000000000 +0200
+++ new/doc/latex/biblatex-caspervector/caspervector-ay.tex 2019-11-15 22:35:23.000000000 +0100
@@ -45,14 +45,17 @@
\begin{center}
\begin{tabular}{ll}\hline
& \\\hline
-\verb|\cite{10-5, 10-6}| & \cite{10-5, 10-6} \\
+\verb|\cite{10-7, 10-8}| & \cite{10-7, 10-8} \\
\verb|\parencite[][ 4 ]{perelman}| & \parencite[][ 4 ]{perelman} \\
\verb|\parencite{6-1, blx-gb7714-2015}| & \parencite{6-1, blx-gb7714-2015} \\
\verb|\textcite{biblatex, a2-3}| & \textcite{biblatex, a2-3} \\\hline
-\multicolumn{2}{l}{ \texttt{texdoc 50-style-authoryear}} \\
\end{tabular}
\end{center}
+ \verb|texdoc 50-style-authoryear| v0.3.4
+\verb|caspervector| \verb|cparen|
+\verb|cparen = true|
+
\printbibliography[category = cited, title = {}]
\printbibliography[notcategory = cited, title = {%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-caspervector/caspervector.bib new/doc/latex/biblatex-caspervector/caspervector.bib
--- old/doc/latex/biblatex-caspervector/caspervector.bib 2018-07-02 22:39:36.000000000 +0200
+++ new/doc/latex/biblatex-caspervector/caspervector.bib 2019-11-15 22:35:23.000000000 +0100
@@ -52,6 +52,16 @@
language = {english},
}
+@book{liuxie,
+ author = {},
+ title = {},
+ editor = { and },
+ editortype = {},
+ publisher = {},
+ date = {1995},
+ language = {chinese},
+}
+
@book{1-1,
author = {},
title = {},
@@ -183,7 +193,7 @@
}
@incollection{2-2,
- author = { and and and },
+ author = { and and and },
title = {},
type = {M},
bookauthor = {},
@@ -529,7 +539,29 @@
language = {chinese},
}
-@article{10-5,
+@book{10-5,
+ author = {Crane, D.},
+ title = {Invisible college},
+ type = {M},
+ location = {Chicago},
+ publisher = {Univ. of Chicago Press},
+ year = {1972},
+ language = {english},
+}
+
+@article{10-6,
+ author = {Stieg, M. F.},
+ title = {The information needs of historians},
+ type = {J},
+ journal = {College and Research Libraries},
+ year = {1981},
+ volume = {42},
+ number = {6},
+ pages = {549-560},
+ language = {english},
+}
+
+@article{10-7,
author = {Kennedy, W. J. and Garrison, R. E.},
title = {Morphology and genesis of nodular chalks and hardgrounds in the Upper Cretaceous of southern England},
type = {J},
@@ -540,7 +572,7 @@
language = {english},
}
-@article{10-6,
+@article{10-8,
author = {Kennedy, W. J. and Garrison, R. E.},
title = {Morphology and genesis of nodular phosphates in the Cenomanian of south-east England},
type = {J},
Binary files old/doc/latex/biblatex-caspervector/caspervector.pdf and new/doc/latex/biblatex-caspervector/caspervector.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-caspervector/caspervector.tex new/doc/latex/biblatex-caspervector/caspervector.tex
--- old/doc/latex/biblatex-caspervector/caspervector.tex 2018-07-02 22:39:36.000000000 +0200
+++ new/doc/latex/biblatex-caspervector/caspervector.tex 2019-11-15 22:35:23.000000000 +0100
@@ -1,6 +1,6 @@
% Documentation for biblatex-caspervector
%
-% Copyright (c) 2012-2016,2018 Casper Ti. Vector
+% Copyright (c) 2012-2016,2018-2019 Casper Ti. Vector
%
% 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
@@ -23,29 +23,37 @@
backend = biber, style = caspervector, utf8,
giveninits = true, sortgiveninits = true
]{biblatex}
-\usepackage{fancyhdr, hyperref, enumitem, fancyvrb, hologo}
+\usepackage{iftex, fancyhdr, hyperref, enumitem, fancyvrb, hologo}
\hypersetup{colorlinks = true, allcolors = blue}
\pagestyle{fancy}\fancyhf{}\cfoot{\thepage}
-\renewcommand{\headrulewidth}{0pt}
-\setlist{nolistsep}
-\setlength{\hfuzz}{3pt}
+\renewcommand*{\headrulewidth}{0pt}
\ctexset{linestretch = {\maxdimen}}
-\renewcommand{\bibfont}{\small}
+\setlength{\hfuzz}{3pt}
+\setlist{nolistsep}
+\renewcommand*{\bibfont}{\small}
+
+\newcommand*{\cupercite}[1]{\supercite{#1}\mbox{}}
\newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}}
+\RecustomVerbatimEnvironment{Verbatim}{Verbatim}%
+ {frame = single, tabsize = 4, formatcom = {\ifXeTeX\xeCJKVerbAddon\fi}}
+\RecustomVerbatimCommand{\VerbatimInput}{VerbatimInput}{
+ fontsize = {\small}, baselinestretch = 1,
+ tabsize = 4, formatcom = {\ifXeTeX\xeCJKVerbAddon\fi}
+}
\DeclareBibliographyCategory{cited}
\AtEveryCitekey{\addtocategory{cited}{\thefield{entrykey}}}
\addbibresource{caspervector.bib}
\begin{document}
-\title{\textbf{biblatex \texttt{caspervector} v0.3.3}}
+\title{\textbf{biblatex \texttt{caspervector} v0.3.4}}
\author{%
Casper Ti.\ Vector\thanks{\ %
\href{mailto:CasperVector@gmail.com}{\texttt{CasperVector@gmail.com}}.%
}%
}
-\date{2018/06/29}
+\date{2019/11/13}
\maketitle
\section{}
@@ -55,7 +63,7 @@
\hologo{TeX}
-biblatex\supercite{biblatex}/biber\supercite{biber}
+biblatex\cupercite{biblatex}/biber\cupercite{biber}
\hologo{TeX}
\verb|bbx| \verb|cbx|
\hologo{LaTeX}
@@ -64,28 +72,27 @@
\verb|caspervector| biblatex
- GB/T 7714--2005\supercite{gbt7714-2005}
+ GB/T 7714--2005\cupercite{gbt7714-2005}
biblatex
-\verb|gb7714-2015|\supercite{blx-gb7714-2015}
+\verb|gb7714-2015|\cupercite{blx-gb7714-2015}
\section{}
- \copyright\ 2012--2018 Casper Ti.\ Vector%
+ \copyright\ 2012--2019 Casper Ti.\ Vector%
\verb|caspervector|
\hologo{LaTeX} Project Public License\footnote{\ %
\url{https://www.latex-project.org/lppl/}.%
}%
\verb|caspervector|
-\section{}
-\subsection{}
+\section{}
\begin{itemize}
\item biblatex 2.0 %
\verb|caspervector| biblatex
- \item biber biblatex
+ \item biber biblatex
biber
\item %
\verb|caspervector|
@@ -100,7 +107,7 @@
\verb|caspervector|
-- \verb|caspervector| \verb|caspervector-ay|
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
% utf8gbk
% ...
\usepackage[
@@ -108,7 +115,7 @@
]{biblatex}
\end{Verbatim}
\verb|sorting|
- biblatex \supercite{biblatex}%
+ biblatex \cupercite{biblatex}%
\verb|caspervector| \verb|cenyt| \verb|ecnyt|
\verb|caspervector| \verb|none|
@@ -126,7 +133,7 @@
\verb|\addbibresource| %
\myemph{ \texttt{.bib}}
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
\addbibresource{caspervector.bib}
\end{Verbatim}
\verb|\addbibresource|
@@ -137,7 +144,7 @@
\verb|caspervector| biblatex
\verb|\supercite|\verb|\parencite| \verb|\cite|
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
% prenote postnote
\citecommand[prenote][postnote]{key}
\end{Verbatim}
@@ -154,14 +161,14 @@
%
\verb|\parencite{gbt7714-2005}| \parencite{gbt7714-2005}
\cite[][ 4 ]{gbt7714-2005}
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
\cite[][ 4 ]{gbt7714-2005}
\end{Verbatim}
\subsection{}
\verb|\printbibliography|
-\supercite{biblatex}
+\cupercite{biblatex}
\begin{itemize}
\item \verb|title = |
@@ -174,14 +181,14 @@
\end{itemize}
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
\printbibliography[title = {}, heading = bibnumbered]
\end{Verbatim}
\subsection{}
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
# texfile TeX .tex
# pdflatex TeX latex dvipdfmx
pdflatex texfile
@@ -218,7 +225,7 @@
v0.3.2 \texttt{caspervector} \texttt{edition}
\texttt{title} %
} 2 2nd ed.
- \item \verb|type|\supercite{gbt7714-2005}
+ \item \verb|type|\cupercite{gbt7714-2005}
\item \verb|location| \verb|@patent|
\item \verb|publisher|
\item \verb|journal|/\verb|journaltitle|
@@ -243,9 +250,11 @@
\item \verb|language|
\verb|chinese|
+ \item \verb|authortype|\verb|editortype|
+ \ref{sec:editortype}
\item \verb|note| \ref{sec:faq}
\item \verb|userf|\verb|caspervector|
- \item biblatex \supercite{biblatex}
+ \item biblatex \cupercite{biblatex}
\end{itemize}
\section{}\label{sec:entries}
@@ -341,14 +350,14 @@
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
% category
\DeclareBibliographyCategory{cited}
% \nocite \cite cited
\AtEveryCitekey{\addtocategory{cited}{\thefield{entrykey}}}
\end{Verbatim}
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
% cited
\begin{refcontext}[sorting = none]
\printbibliography[category = cited, ..., title = {References}]
@@ -365,7 +374,7 @@
\texttt{\string\cite}
} \verb|\end{document}|
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
% .bib cited
% \printbibliography
\nocite{*}
@@ -373,7 +382,7 @@
biblatex 2.x
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
% cited
\printbibliography[category = cited, ..., sorting = none, title = {References}]
% cited
@@ -384,6 +393,44 @@
\url{https://tex.stackexchange.com/questions/250548/}%
}
+\section{}\label{sec:editortype}
+
+ \verb|author|/\verb|editor| /
+ \verb|authortype|/\verb|editortype| /
+ \parencite{liuxie} \verb|.bib|
+\begin{Verbatim}
+@book{liuxie,
+ author = {},
+ title = {},
+ editor = { and },
+ editortype = {},
+ ...
+}
+\end{Verbatim}
+ biblatex
+\verb|editora|/\verb|editoratype|\verb|editorb|/\verb|editorbtype|%
+\verb|editorc|/\verb|editorctype|
+
+ \verb|editortype| \verb|translatoran|
+biblatex \supercite{biblatex}
+
+\begin{Verbatim}
+\NewBibliographyString{translatoran, bytranslatoran}
+\DefineBibliographyStrings{english}{
+ translatoran = {trans\adddot\ and annot\adddot},
+ bytranslatoran = {trans\adddot\ and annot\adddot\ by},
+}
+\end{Verbatim}
+\verb|editortype|
+\verb|cn| \verb|translatoran|
+\begin{Verbatim}
+\NewBibliographyString{cntranslatoran}
+\DefineBibliographyStrings{english}{cntranslatoran = {}}
+\end{Verbatim}
+ \verb|bytranslatoran|
+
+ \verb|editortype|
+
\section{FAQ }\label{sec:faq}
@@ -394,11 +441,11 @@
\verb|eid| \verb|\printtext|
biblatex \parencite{perelman}
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
eid = {\printtext[eprint:arxiv]{math/0211159}},
\end{Verbatim}
\verb|arxiv| \verb|eprinttype|
- biblatex \supercite{biblatex}
+ biblatex \cupercite{biblatex}
DOI \verb|doi|%
\myemph{%
@@ -409,7 +456,7 @@
\verb|@article|
\textbf{2018}\textit{14}(\hologo{TeX} )
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
year = {2018},
volume = {14},
number = {\hologo{TeX} },
@@ -425,7 +472,7 @@
\texttt{year} --
\texttt{caspervector} %
}
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
origdate = {1845},
note = {\textbf{1845}\emph{}},
\end{Verbatim}
@@ -442,7 +489,7 @@
\parencite{3-2}
\verb|origdate| \ref{sec:faq}
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
@periodical{3-2,
author = {},
title = {},
@@ -455,7 +502,7 @@
}
\end{Verbatim}
-\begin{Verbatim}[frame = single]
+\begin{Verbatim}
@customf{3-2,
author = {},
title = {},
@@ -480,7 +527,7 @@
\end{refcontext}
\section{}
-\VerbatimInput[tabsize = 4, fontsize = {\small}, baselinestretch = 1]{ChangeLog.txt}
+\VerbatimInput{ChangeLog.txt}
\nocite{*}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-caspervector/latexmkrc new/doc/latex/biblatex-caspervector/latexmkrc
--- old/doc/latex/biblatex-caspervector/latexmkrc 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/biblatex-caspervector/latexmkrc 2019-11-15 22:35:23.000000000 +0100
@@ -0,0 +1,9 @@
+# Copyright (c) 2019 Casper Ti. Vector
+# Public domain.
+
+@default_files = ('caspervector', 'caspervector-ay');
+$pdf_mode = 5;
+$bibtex_use = 1.5;
+$biber = "biber -l zh__pinyin --output-safechars %O %S";
+$clean_ext = "run.xml";
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-caspervector.doc.tlpobj new/tlpkg/tlpobj/biblatex-caspervector.doc.tlpobj
--- old/tlpkg/tlpobj/biblatex-caspervector.doc.tlpobj 2019-02-28 03:20:19.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-caspervector.doc.tlpobj 2019-11-16 01:54:32.000000000 +0100
@@ -1,13 +1,13 @@
name biblatex-caspervector.doc
category Package
-revision 48122
+revision 52802
shortdesc doc files of biblatex-caspervector
relocated 1
-docfiles size=159
+docfiles size=163
RELOC/doc/latex/biblatex-caspervector/ChangeLog.txt
- RELOC/doc/latex/biblatex-caspervector/Makefile
RELOC/doc/latex/biblatex-caspervector/caspervector-ay.pdf
RELOC/doc/latex/biblatex-caspervector/caspervector-ay.tex
RELOC/doc/latex/biblatex-caspervector/caspervector.bib
RELOC/doc/latex/biblatex-caspervector/caspervector.pdf
RELOC/doc/latex/biblatex-caspervector/caspervector.tex
+ RELOC/doc/latex/biblatex-caspervector/latexmkrc
++++++ biblatex-caspervector.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-caspervector/blx-caspervector-base.def new/tex/latex/biblatex-caspervector/blx-caspervector-base.def
--- old/tex/latex/biblatex-caspervector/blx-caspervector-base.def 2018-07-02 22:39:36.000000000 +0200
+++ new/tex/latex/biblatex-caspervector/blx-caspervector-base.def 2019-11-15 22:35:23.000000000 +0100
@@ -1,6 +1,6 @@
% Casper Ti. Vector's biblatex style
%
-% Copyright (c) 2012-2018 Casper Ti. Vector
+% Copyright (c) 2012-2019 Casper Ti. Vector
%
% 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
@@ -23,17 +23,19 @@
% blx-caspervector-utf8.def
\ProvidesFile{blx-caspervector-base.def}%
- [2018/06/29 v0.3.3 Casper Ti. Vector's biblatex library]
+ [2019/11/13 v0.3.4 Casper Ti. Vector's biblatex library]
\RequireBiber[3]
\newtoggle{bbx:gbk}
\newtoggle{bbx:ugly}
+\newtoggle{bbx:cparen}
\newtoggle{bbx:bfdate}\toggletrue{bbx:bfdate}
\DeclareBibliographyOption{utf8}[true]{\togglefalse{bbx:gbk}}
\DeclareBibliographyOption{gbk}[true]{\toggletrue{bbx:gbk}}
\DeclareBibliographyOption{ugly}[true]{\settoggle{bbx:ugly}{#1}}
+\DeclareBibliographyOption{cparen}[true]{\settoggle{bbx:cparen}{#1}}
\ExecuteBibliographyOptions{%
- gbk, ugly = false, autopunct = false, alldates = iso,
+ gbk, ugly = false, cparen = false, autopunct = false, alldates = iso,
minnames = 3, minitems = 3, maxcitenames = 2, mincitenames = 1%
}
\AtEndOfPackage{%
@@ -88,10 +90,17 @@
}}%
}
+\NewBibliographyString{cnauthor, cneditor, cntranslator}
\newcommand*{\bbx@cetext}[2]{\iffieldequalstr{userf}{zh}{#1}{#2}}
-\newcommand*{\bbx@cietext}[2]{\ifboolexpr{%
+\newcommand*{\bbx@cietext}[2]{\ifboolexpr{
test {\ifcitation} or test {\iffieldequalstr{userf}{zh}}
}{#1}{#2}}
+\newcommand*{\bbx@cieparen}[2]{\ifboolexpr{
+ test {\ifcitation} and test {\iftoggle{bbx:cparen}}
+}{#1}{#2}}
+\newcommand*{\bbx@ifstrg}[3]{\ifboolexpr{%
+ test {\ifstrequal{#1}{author}} and test {\iffieldundef{authortype}}
+}{#3}{#2}}
\newcommand*{\bbx@cecomma}{\bbx@cepunct{\bbx@cncomma}{\addcomma\addspace}}
\newcommand*{\bbx@cecolon}{\bbx@cepunct{\bbx@cncolon}{\addcolon\addspace}}
\newcommand*{\bbx@cescolon}{\bbx@cepunct{\bbx@cnscolon}{\addsemicolon\addspace}}
@@ -109,9 +118,12 @@
\DefineBibliographyExtras{english}{%
\renewcommand*{\finalandcomma}{}%
}
+\renewcommand*{\bibleftparen}{\bbx@cieparen{\bbx@cnlparen}{\blx@postpunct(}}
+\renewcommand*{\bibrightparen}%
+ {\bbx@cieparen{\bbx@cnrparen}{\blx@postpunct)\midsentence}}
+\DeclareDelimFormat[textcite]{nameyeardelim}{\bbx@cieparen{}{\addspace}}
+\DeclareDelimFormat[textcite]{nonameyeardelim}{\bbx@cieparen{}{\addspace}}
-\DefineBibliographyStrings{english}%
- {bibliography = {\bbx@cnbib}, references = {\bbx@cnbib}}
\DeclareFieldFormat*{pages}{#1}
\DeclareFieldFormat*{url}{\url{#1}}
\DeclareFieldFormat*{urldate}{#1}
@@ -124,51 +136,79 @@
{\ifinteger{#1}{\mkbibordedition{#1}~\bibstring{edition}}{#1\isdot}}%
}
\newcommand*{\bbx@print}[1]{\iffieldundef{#1}{}{\printfield{#1}}}
-\newcommand*{\bbx@byspace}[1]%
- {\ifnumgreater{\value{#1}}{\value{maxnames}}{}{\addspace}}
+\newbibmacro*{cntypedelim}[1]{\ifandothers{#1}{}{\printtext{\andothersdelim}}}
\newbibmacro*{cein:}%
{\printtext{\bbx@cetext{\bbx@cnin}{In}\bbx@cecolon}\printtext{}}
-\newbibmacro*{ceedtrans}[1]{%
+\newbibmacro*{cnauedstrg}[2]{%
+ \printtext[#1type]{\iffieldundef{#1type}{\bibstring{cn#2}}{%
+ \ifbibxstring{cn\thefield{#1type}}%
+ {\bibstring{cn\thefield{#1type}}}{\thefield{#1type}}%
+ }}%
+}
+\newbibmacro*{cnauthorstrg}{\usebibmacro{cnauedstrg}{author}{author}}
+\newbibmacro*{cneditorstrg}{\usebibmacro{cnauedstrg}{editor}{editor}}
+\newbibmacro*{cntranslatorstrg}{\printtext{\bibstring{cntranslator}}}
+
+\newbibmacro*{ceauedtrans}[1]{%
\ifboolexpr{test {\iftoggle{blx@use#1}} and not test {\ifnameundef{#1}}}{%
- \printnames{#1}%
- \bbx@cetext%
- {\printtext{\bbx@byspace{#1}\@nameuse{bbx@cn#1}}}%
- {\setunit{\printdelim{#1typedelim}}\usebibmacro{#1strg}}%
- \clearname{#1}%
+ \printnames{#1}\bbx@ifstrg{#1}{%
+ \bbx@cetext%
+ {\usebibmacro{cntypedelim}{#1}\usebibmacro{cn#1strg}}%
+ {\setunit{\printdelim{#1typedelim}}\usebibmacro{#1strg}}%
+ }{}\ifstrequal{#1}{author}{}{\clearname{#1}}%
}{}%
}
-\renewbibmacro*{editor}{\usebibmacro{ceedtrans}{editor}}
-\renewbibmacro*{translator}{\usebibmacro{ceedtrans}{translator}}
+\renewbibmacro*{author}{\usebibmacro{ceauedtrans}{author}}
+\renewbibmacro*{editor}{\usebibmacro{ceauedtrans}{editor}}
+\renewbibmacro*{translator}{\usebibmacro{ceauedtrans}{translator}}
\newbibmacro*{bookauthor/editor}{%
\ifnameundef{bookauthor}%
- {\usebibmacro{ceedtrans}{editor}}{\printnames{bookauthor}}%
+ % Differs from `\usebibmacro{editor}' in caspervector-ay.
+ {\usebibmacro{ceauedtrans}{editor}}{\printnames{bookauthor}}%
}
-\newbibmacro*{cebyauthx}[1]{%
- \ifboolexpr{
- test {\ifnameundef{#1}} or
- (test {\ifstrequal{#1}{author}} and test {\ifuseauthor})
- }{}{%
+\newbibmacro*{cebyauedbase}[2]{%
+ \bbx@cetext{%
+ \printnames[by#1]{#1}\usebibmacro{cntypedelim}{#1}%
+ \usebibmacro{cnauedstrg}{#1}{#2}%
+ }{%
+ \usebibmacro{bytypestrg}{#1}{#2}%
+ \setunit{\addspace}\printnames[by#1]{#1}%
+ }%
+}
+\renewbibmacro*{byauthor}{%
+ \ifboolexpr{test {\ifuseauthor} or test {\ifnameundef{author}}}%
+ {}{\usebibmacro{cebyauedbase}{author}{author}}%
+}
+\renewbibmacro*{byeditor}{%
+ \ifnameundef{editor}{}%
+ {\usebibmacro{cebyauedbase}{editor}{editor}\setunit*{\bbx@cescolon}}%
+ \ifnameundef{editora}{}%
+ {\usebibmacro{cebyauedbase}{editora}{editor}\setunit*{\bbx@cescolon}}%
+ \ifnameundef{editorb}{}%
+ {\usebibmacro{cebyauedbase}{editorb}{editor}\setunit*{\bbx@cescolon}}%
+ \ifnameundef{editorc}{}%
+ {\usebibmacro{cebyauedbase}{editorc}{editor}\setunit*{\bbx@cescolon}}%
+}
+\renewbibmacro*{bytranslator}{%
+ \ifnameundef{translator}{}{%
\bbx@cetext{%
- \printnames[by#1]{#1}%
- \printtext{\bbx@byspace{#1}\@nameuse{bbx@cn#1}}%
+ \printnames[bytranslator]{translator}%
+ \usebibmacro{cntypedelim}{translator}\usebibmacro{cntranslatorstrg}%
}{%
- \bibstring{by#1}\setunit{\addspace}%
- \printnames[by#1]{#1}%
+ \printtext{\bibstring{bytranslator}}%
+ \setunit{\addspace}\printnames[bytranslator]{translator}%
}%
}%
}
-\renewbibmacro*{byauthor}{\usebibmacro{cebyauthx}{author}}
-\renewbibmacro*{byeditor}{\usebibmacro{cebyauthx}{editor}}
-\renewbibmacro*{bytranslator}{\usebibmacro{cebyauthx}{translator}}
\newbibmacro*{byauthor+byeditor+bytranslator}{%
\usebibmacro{byauthor}\setunit*{\bbx@cescolon}%
\usebibmacro{byeditor}\setunit*{\bbx@cescolon}%
\usebibmacro{bytranslator}%
}
-\providebibmacro*{bbx:ifnodate}[2]{#2}
+\providebibmacro*{bbx:ifmergeddate}[2]{#2}
\newbibmacro*{journaltitle/title}{%
\iffieldundef{journaltitle}%
{\bbx@print{title}}{\printfield[title]{journaltitle}}%
@@ -178,8 +218,8 @@
\ifboolexpr{test {\iflistundef{location}} and test {\iflistundef{publisher}}}%
{}{\setunit{\bbx@cecomma}}%
\usebibmacro{date}\setunit*{\bbx@cecomma}\printfield{note}%
- \ifboolexpr{%
- (test {\usebibmacro{bbx:ifnodate}} or test {\ifdateunknown}) and
+ \ifboolexpr{
+ (test {\usebibmacro{bbx:ifmergeddate}} or test {\ifdateunknown}) and
test {\iffieldundef{note}}
}{}{\setunit{\bbx@cecolon}}%
\printfield{pages}%
@@ -188,8 +228,8 @@
\usebibmacro{date}%
\iffieldundef{volume}{}{\setunit*{\bbx@cecomma}\printfield{volume}}%
\bbx@print{number}\setunit*{\bbx@cecomma}\printfield{note}%
- \ifboolexpr{%
- (test {\usebibmacro{bbx:ifnodate}} or test {\ifdateunknown}) and
+ \ifboolexpr{
+ (test {\usebibmacro{bbx:ifmergeddate}} or test {\ifdateunknown}) and
test {\iffieldundef{volume}} and test {\iffieldundef{number}} and
test {\iffieldundef{note}}
}{}{\setunit{\bbx@cecolon}}%
@@ -199,7 +239,7 @@
\printfield{eid}\setunit*{\bbx@cecomma}%
\printfield{url}\setunit*{\bbx@cecomma}%
\iffieldundef{urlyear}{}{%
- \printtext{\bbx@cetext{\bbx@cnretr}{retrieved on}\addspace}%
+ \printtext{\bbx@cetext{\bbx@cnretr}{accessed on}\addspace}%
\printurldate%
}%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-caspervector/blx-caspervector-gbk.def new/tex/latex/biblatex-caspervector/blx-caspervector-gbk.def
--- old/tex/latex/biblatex-caspervector/blx-caspervector-gbk.def 2018-07-02 22:39:36.000000000 +0200
+++ new/tex/latex/biblatex-caspervector/blx-caspervector-gbk.def 2019-11-15 22:35:23.000000000 +0100
@@ -1,6 +1,6 @@
% Casper Ti. Vector's biblatex style
%
-% Copyright (c) 2012-2016,2018 Casper Ti. Vector
+% Copyright (c) 2012-2016,2018-2019 Casper Ti. Vector
%
% 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
@@ -23,7 +23,7 @@
% blx-caspervector-utf8.def
\ProvidesFile{blx-caspervector-gbk.def}%
- [2018/06/29 v0.3.3 Chinese punctuations and captions in GBK]
+ [2019/11/13 v0.3.4 Chinese punctuations and captions in GBK]
\newcommand*\bbx@cnldquot{}
\newcommand*\bbx@cnrdquot{}
@@ -32,14 +32,20 @@
\newcommand*\bbx@cnscolon{}
\newcommand*\bbx@cncolon{}
\newcommand*\bbx@cnperiod{}
+\newcommand*\bbx@cnlparen{}
+\newcommand*\bbx@cnrparen{}
\newcommand*\bbx@cnetal{}
-\newcommand*\bbx@cnauthor{}
-\newcommand*\bbx@cneditor{}
-\newcommand*\bbx@cntranslator{}
\newcommand*\bbx@cnnr{}
\newcommand*\bbx@cnedition{}
\newcommand*\bbx@cnin{}
-\newcommand*\bbx@cnretr{}
-\newcommand*\bbx@cnbib{}
+\newcommand*\bbx@cnretr{}
+
+\DefineBibliographyStrings{english}{
+ cnauthor = {},
+ cneditor = {},
+ cntranslator = {},
+ bibliography = {},
+ references = {},
+}
% vim:ft=tex:ts=2:sw=2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-caspervector/blx-caspervector-utf8.def new/tex/latex/biblatex-caspervector/blx-caspervector-utf8.def
--- old/tex/latex/biblatex-caspervector/blx-caspervector-utf8.def 2018-07-02 22:39:36.000000000 +0200
+++ new/tex/latex/biblatex-caspervector/blx-caspervector-utf8.def 2019-11-15 22:35:23.000000000 +0100
@@ -1,6 +1,6 @@
% Casper Ti. Vector's biblatex style
%
-% Copyright (c) 2012-2016,2018 Casper Ti. Vector
+% Copyright (c) 2012-2016,2018-2019 Casper Ti. Vector
%
% 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
@@ -23,7 +23,7 @@
% blx-caspervector-utf8.def
\ProvidesFile{blx-caspervector-utf8.def}%
- [2018/06/29 v0.3.3 Chinese punctuations and captions in UTF-8]
+ [2019/11/13 v0.3.4 Chinese punctuations and captions in UTF-8]
\newcommand*\bbx@cnldquot{}
\newcommand*\bbx@cnrdquot{}
@@ -32,14 +32,20 @@
\newcommand*\bbx@cnscolon{}
\newcommand*\bbx@cncolon{}
\newcommand*\bbx@cnperiod{}
+\newcommand*\bbx@cnlparen{}
+\newcommand*\bbx@cnrparen{}
\newcommand*\bbx@cnetal{}
-\newcommand*\bbx@cnauthor{}
-\newcommand*\bbx@cneditor{}
-\newcommand*\bbx@cntranslator{}
\newcommand*\bbx@cnnr{}
\newcommand*\bbx@cnedition{}
\newcommand*\bbx@cnin{}
-\newcommand*\bbx@cnretr{}
-\newcommand*\bbx@cnbib{}
+\newcommand*\bbx@cnretr{}
+
+\DefineBibliographyStrings{english}{
+ cnauthor = {},
+ cneditor = {},
+ cntranslator = {},
+ bibliography = {},
+ references = {},
+}
% vim:ft=tex:ts=2:sw=2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-caspervector/caspervector-ay.bbx new/tex/latex/biblatex-caspervector/caspervector-ay.bbx
--- old/tex/latex/biblatex-caspervector/caspervector-ay.bbx 2018-07-02 22:39:36.000000000 +0200
+++ new/tex/latex/biblatex-caspervector/caspervector-ay.bbx 2019-11-15 22:35:23.000000000 +0100
@@ -1,6 +1,6 @@
% Casper Ti. Vector's biblatex style
%
-% Copyright (c) 2012-2018 Casper Ti. Vector
+% Copyright (c) 2012-2019 Casper Ti. Vector
%
% 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
@@ -23,31 +23,15 @@
% blx-caspervector-utf8.def
\ProvidesFile{caspervector-ay.bbx}%
- [2018/06/29 v0.3.3 Casper Ti. Vector's author-year biblatex bibstyle]
+ [2019/11/13 v0.3.4 Casper Ti. Vector's author-year biblatex bibstyle]
\RequireBibliographyStyle{authoryear-comp}
\input{blx-caspervector-base.def}
-\appto\bbx@opt@mergedate@maximum{\renewbibmacro*{bbx:ifnodate}[2]{%
- \iflabeldateisdate{#1}{#2}%
-}\togglefalse{bbx:bfdate}}
-\appto\bbx@opt@mergedate@compact{\renewbibmacro*{bbx:ifnodate}[2]{%
- \iflabeldateisdate{#1}{#2}%
-}\togglefalse{bbx:bfdate}}
-\appto\bbx@opt@mergedate@basic{\renewbibmacro*{bbx:ifnodate}[2]{%
- \ifboolexpr{
- test {\iflabeldateisdate} and
- not test {\ifdateshavedifferentprecision{label}{}}
- }{#1}{#2}%
-}\toggletrue{bbx:bfdate}}
-\appto\bbx@opt@mergedate@minimum{\renewbibmacro*{bbx:ifnodate}[2]{%
- \ifboolexpr{
- test {\iflabeldateisdate} and test {\iffieldundef{extradate}} and
- not test {\ifdateshavedifferentprecision{label}{}}
- }{#1}{#2}%
-}\toggletrue{bbx:bfdate}}
-\appto\bbx@opt@mergedate@false%
- {\renewbibmacro*{bbx:ifnodate}[2]{#2}\toggletrue{bbx:bfdate}}
-\renewbibmacro*{date}{\usebibmacro{bbx:ifnodate}{}{\printdate}}
+\appto\bbx@opt@mergedate@maximum{\togglefalse{bbx:bfdate}}
+\appto\bbx@opt@mergedate@compact{\togglefalse{bbx:bfdate}}
+\appto\bbx@opt@mergedate@basic{\toggletrue{bbx:bfdate}}
+\appto\bbx@opt@mergedate@minimum{\toggletrue{bbx:bfdate}}
+\appto\bbx@opt@mergedate@false{\toggletrue{bbx:bfdate}}
\ExecuteBibliographyOptions%
{labeldate = year, mergedate = basic, dashed = false, sorting = ecnyt}
@@ -55,21 +39,24 @@
\DeclareNameAlias{editor}{default}
\DeclareNameAlias{translator}{default}
-\newbibmacro*{ayedtrans}[1]{%
+\newbibmacro*{ayauedtrans}[1]{%
\ifboolexpr{test {\iftoggle{blx@use#1}} and not test {\ifnameundef{#1}}}{%
\usebibmacro{bbx:dashcheck}{\bibnamedash}{%
- \printnames{#1}%
- \bbx@cetext%
- {\printtext{\bbx@byspace{#1}}}{\setunit{\printdelim{#1typedelim}}}%
- \usebibmacro{bbx:savehash}%
- }\bbx@cetext{\printtext{\@nameuse{bbx@cn#1}}}{\usebibmacro{#1strg}}%
- \setunit{\printdelim{nameyeardelim}}\clearname{#1}%
+ \usebibmacro{bbx:savehash}\printnames{#1}\bbx@ifstrg{#1}{%
+ \bbx@cetext%
+ {\usebibmacro{cntypedelim}{#1}}{\setunit{\printdelim{#1typedelim}}}%
+ }{\setunit{\printdelim{nameyeardelim}}}%
+ }\bbx@ifstrg{#1}{%
+ \bbx@cetext{\usebibmacro{cn#1strg}}{\usebibmacro{#1strg}}%
+ \setunit{\printdelim{nameyeardelim}}%
+ }{}\ifstrequal{#1}{author}{}{\clearname{#1}}%
}{%
\global\undef\bbx@lasthash
\usebibmacro{labeltitle}\setunit*{\printdelim{nonameyeardelim}}%
}\usebibmacro{date+extradate}%
}
-\renewbibmacro*{editor}{\usebibmacro{ayedtrans}{editor}}
-\renewbibmacro*{translator}{\usebibmacro{ayedtrans}{translator}}
+\renewbibmacro*{author}{\usebibmacro{ayauedtrans}{author}}
+\renewbibmacro*{editor}{\usebibmacro{ayauedtrans}{editor}}
+\renewbibmacro*{translator}{\usebibmacro{ayauedtrans}{translator}}
% vim:ft=tex:ts=2:sw=2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-caspervector/caspervector-ay.cbx new/tex/latex/biblatex-caspervector/caspervector-ay.cbx
--- old/tex/latex/biblatex-caspervector/caspervector-ay.cbx 2018-07-02 22:39:36.000000000 +0200
+++ new/tex/latex/biblatex-caspervector/caspervector-ay.cbx 2019-11-15 22:35:23.000000000 +0100
@@ -23,7 +23,7 @@
% blx-caspervector-utf8.def
\ProvidesFile{caspervector-ay.cbx}%
- [2018/06/29 v0.3.3 Casper Ti. Vector's author-year biblatex citestyle]
+ [2019/11/13 v0.3.4 Casper Ti. Vector's author-year biblatex citestyle]
\RequireCitationStyle{authoryear-comp}
\renewcommand*{\compcitedelim}{\bbx@citebcomma}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-caspervector/caspervector.bbx new/tex/latex/biblatex-caspervector/caspervector.bbx
--- old/tex/latex/biblatex-caspervector/caspervector.bbx 2018-07-02 22:39:36.000000000 +0200
+++ new/tex/latex/biblatex-caspervector/caspervector.bbx 2019-11-15 22:35:23.000000000 +0100
@@ -23,7 +23,7 @@
% blx-caspervector-utf8.def
\ProvidesFile{caspervector.bbx}%
- [2018/06/29 v0.3.3 Casper Ti. Vector's numeric biblatex bibstyle]
+ [2019/11/13 v0.3.4 Casper Ti. Vector's numeric biblatex bibstyle]
\RequireBibliographyStyle{numeric-comp}
\input{blx-caspervector-base.def}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-caspervector/caspervector.cbx new/tex/latex/biblatex-caspervector/caspervector.cbx
--- old/tex/latex/biblatex-caspervector/caspervector.cbx 2018-07-02 22:39:36.000000000 +0200
+++ new/tex/latex/biblatex-caspervector/caspervector.cbx 2019-11-15 22:35:23.000000000 +0100
@@ -23,7 +23,7 @@
% blx-caspervector-utf8.def
\ProvidesFile{caspervector.cbx}%
- [2018/06/29 v0.3.3 Casper Ti. Vector's numeric biblatex citestyle]
+ [2019/11/13 v0.3.4 Casper Ti. Vector's numeric biblatex citestyle]
\RequireCitationStyle{numeric-comp}
\ExecuteBibliographyOptions{autocite = superscript}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-caspervector.tlpobj new/tlpkg/tlpobj/biblatex-caspervector.tlpobj
--- old/tlpkg/tlpobj/biblatex-caspervector.tlpobj 2019-02-28 03:20:19.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-caspervector.tlpobj 2019-11-16 01:54:33.000000000 +0100
@@ -1,6 +1,6 @@
name biblatex-caspervector
category Package
-revision 48122
+revision 52802
shortdesc A simple citation style for Chinese users
relocated 1
longdesc The package provides a simple and easily extensible
@@ -14,9 +14,9 @@
RELOC/tex/latex/biblatex-caspervector/caspervector-ay.cbx
RELOC/tex/latex/biblatex-caspervector/caspervector.bbx
RELOC/tex/latex/biblatex-caspervector/caspervector.cbx
-catalogue-contact-repository https://gitlab.com/CasperVector/biblatex-caspervector
+catalogue-contact-repository https://gitea.com/CasperVector/biblatex-caspervector
catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-caspervector
-catalogue-date 2018-07-02 05:37:57 +0200
+catalogue-date 2019-11-15 16:40:36 +0100
catalogue-license lppl1.3
catalogue-topics biblatex chinese
-catalogue-version 0.3.3
+catalogue-version 0.3.4
++++++ biblatex-chem.doc.tar.xz ++++++
Binary files old/doc/latex/biblatex-chem/biblatex-chem-acs.pdf and new/doc/latex/biblatex-chem/biblatex-chem-acs.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-chem/biblatex-chem-acs.tex new/doc/latex/biblatex-chem/biblatex-chem-acs.tex
--- old/doc/latex/biblatex-chem/biblatex-chem-acs.tex 2018-09-06 22:46:44.000000000 +0200
+++ new/doc/latex/biblatex-chem/biblatex-chem-acs.tex 2019-08-25 22:44:07.000000000 +0200
@@ -20,7 +20,7 @@
\input{biblatex-chem-common.tex}
%%
-%% Copyright (C) 2010-2014,2016-2018 by
+%% Copyright (C) 2010-2014,2016-2019 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
Binary files old/doc/latex/biblatex-chem/biblatex-chem-angew.pdf and new/doc/latex/biblatex-chem/biblatex-chem-angew.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-chem/biblatex-chem-angew.tex new/doc/latex/biblatex-chem/biblatex-chem-angew.tex
--- old/doc/latex/biblatex-chem/biblatex-chem-angew.tex 2018-09-06 22:46:44.000000000 +0200
+++ new/doc/latex/biblatex-chem/biblatex-chem-angew.tex 2019-08-25 22:44:07.000000000 +0200
@@ -19,7 +19,7 @@
\input{biblatex-chem-common.tex}
%%
-%% Copyright (C) 2010-2014,2016-2018 by
+%% Copyright (C) 2010-2014,2016-2019 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
Binary files old/doc/latex/biblatex-chem/biblatex-chem-biochem.pdf and new/doc/latex/biblatex-chem/biblatex-chem-biochem.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-chem/biblatex-chem-biochem.tex new/doc/latex/biblatex-chem/biblatex-chem-biochem.tex
--- old/doc/latex/biblatex-chem/biblatex-chem-biochem.tex 2018-09-06 22:46:44.000000000 +0200
+++ new/doc/latex/biblatex-chem/biblatex-chem-biochem.tex 2019-08-25 22:44:07.000000000 +0200
@@ -20,7 +20,7 @@
\input{biblatex-chem-common.tex}
%%
-%% Copyright (C) 2010-2014,2016-2018 by
+%% Copyright (C) 2010-2014,2016-2019 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
Binary files old/doc/latex/biblatex-chem/biblatex-chem-rsc.pdf and new/doc/latex/biblatex-chem/biblatex-chem-rsc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-chem/biblatex-chem-rsc.tex new/doc/latex/biblatex-chem/biblatex-chem-rsc.tex
--- old/doc/latex/biblatex-chem/biblatex-chem-rsc.tex 2018-09-06 22:46:44.000000000 +0200
+++ new/doc/latex/biblatex-chem/biblatex-chem-rsc.tex 2019-08-25 22:44:07.000000000 +0200
@@ -19,7 +19,7 @@
\input{biblatex-chem-common.tex}
%%
-%% Copyright (C) 2010-2014,2016-2018 by
+%% Copyright (C) 2010-2014,2016-2019 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-chem/biblatex-chem.bib new/doc/latex/biblatex-chem/biblatex-chem.bib
--- old/doc/latex/biblatex-chem/biblatex-chem.bib 2018-01-25 22:52:12.000000000 +0100
+++ new/doc/latex/biblatex-chem/biblatex-chem.bib 2019-08-25 22:44:07.000000000 +0200
@@ -466,7 +466,7 @@
}
%%
-%% Copyright (C) 2010-2014,2016-2018 by
+%% Copyright (C) 2010-2014,2016-2019 by
%% Joseph Wright <joseph.wright at morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
Binary files old/doc/latex/biblatex-chem/biblatex-chem.pdf and new/doc/latex/biblatex-chem/biblatex-chem.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-chem/biblatex-chem.tex new/doc/latex/biblatex-chem/biblatex-chem.tex
--- old/doc/latex/biblatex-chem/biblatex-chem.tex 2018-10-19 22:35:06.000000000 +0200
+++ new/doc/latex/biblatex-chem/biblatex-chem.tex 2019-12-03 23:04:35.000000000 +0100
@@ -21,8 +21,8 @@
{\texttt{joseph.wright(a)morningstar2.co.uk}}}}
\title{\pkg{biblatex-chem} -- A set of \pkg{biblatex} implementations of
chemistry-related bibliography styles%
- \footnote{This file describes v1.1w, last revised 2018/10/18.}}
-\date{Released 2018/10/18}
+ \footnote{This file describes v1.1y, last revised 2019/12/03.}}
+\date{Released 2019/12/03}
\providecommand*{\opt}[1]{\texttt{#1}}
\providecommand*{\pkg}[1]{\textsf{#1}}
@@ -229,13 +229,15 @@
\changes{v1.1v}{2018/09/06}{Documentation tweaks}
\changes{v1.1w}{2018/10/18}{Bring \texttt{related} support in line with
\pkg{biblatex} core}
+\changes{v1.1x}{2019-08-24}{Better formatting when article titles are included}
+\changes{v1.1y}{2019-12-03}{Add a missing space}
\PrintChanges
\end{document}
%%
-%% Copyright (C) 2010-2014,2016-2018 by
+%% Copyright (C) 2010-2014,2016-2019 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-chem.doc.tlpobj new/tlpkg/tlpobj/biblatex-chem.doc.tlpobj
--- old/tlpkg/tlpobj/biblatex-chem.doc.tlpobj 2019-02-28 03:20:19.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-chem.doc.tlpobj 2019-12-04 01:54:23.000000000 +0100
@@ -1,6 +1,6 @@
name biblatex-chem.doc
category Package
-revision 48944
+revision 53012
shortdesc doc files of biblatex-chem
relocated 1
docfiles size=382
++++++ biblatex-chem.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-chem/chem-acs.bbx new/tex/latex/biblatex-chem/chem-acs.bbx
--- old/tex/latex/biblatex-chem/chem-acs.bbx 2018-10-19 22:35:06.000000000 +0200
+++ new/tex/latex/biblatex-chem/chem-acs.bbx 2019-12-03 23:04:35.000000000 +0100
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{chem-acs.bbx}[2018/10/18 v1.1w biblatex bibliography style]
+\ProvidesFile{chem-acs.bbx}[2019/12/03 v1.1y biblatex bibliography style]
% Load the standard style to avoid copy-pasting unnecessary material
\RequireBibliographyStyle{numeric-comp}
@@ -100,14 +100,14 @@
\DeclareFieldFormat{doi}{%
DOI\addcolon\space
\ifhyperref
- {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
+ {\href{https://doi.org/#1}{\nolinkurl{#1}}}
{\nolinkurl{#1}}%
}
\DeclareFieldFormat{labelnumberwidth}{\mkbibparens{#1}}
\DeclareFieldFormat[article]{pages}{%
\iftoggle{bbx:pageranges}{#1}{\mkfirstpage{#1}}%
}
-\DeclareFieldFormat*{title}{#1\adddot}
+\DeclareFieldFormat*{title}{#1}
\DeclareFieldFormat[report]{title}{\mkbibitalic{#1}}
\DeclareFieldFormat[book, collection, inproceedings]{title}{\mkbibitalic{#1}}
\DeclareFieldFormat{url}{\url{#1}}
@@ -286,7 +286,7 @@
\iftoggle{bbx:articletitle}
{%
\usebibmacro{title}%
- \newunit
+ \printunit{\adddot\addspace}%
}
{}%
\usebibmacro{byauthor}%
@@ -733,7 +733,7 @@
}
%%
-%% Copyright (C) 2010-2014,2016-2018 by
+%% Copyright (C) 2010-2014,2016-2019 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-chem/chem-acs.cbx new/tex/latex/biblatex-chem/chem-acs.cbx
--- old/tex/latex/biblatex-chem/chem-acs.cbx 2018-10-19 22:35:06.000000000 +0200
+++ new/tex/latex/biblatex-chem/chem-acs.cbx 2019-12-03 23:04:35.000000000 +0100
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{chem-acs.cbx}[2018/10/18 v1.1w biblatex citation style]
+\ProvidesFile{chem-acs.cbx}[2019/12/03 v1.1y biblatex citation style]
\RequireCitationStyle{numeric-comp}
@@ -20,7 +20,7 @@
}
%%
-%% Copyright (C) 2010-2014,2016-2018 by
+%% Copyright (C) 2010-2014,2016-2019 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-chem/chem-angew.bbx new/tex/latex/biblatex-chem/chem-angew.bbx
--- old/tex/latex/biblatex-chem/chem-angew.bbx 2018-10-19 22:35:06.000000000 +0200
+++ new/tex/latex/biblatex-chem/chem-angew.bbx 2019-12-03 23:04:35.000000000 +0100
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{chem-angew.bbx}[2018/10/18 v1.1w biblatex bibliography style]
+\ProvidesFile{chem-angew.bbx}[2019/12/03 v1.1y biblatex bibliography style]
% Load the standard style to avoid copy-pasting unnecessary material
\RequireBibliographyStyle{numeric-comp}
@@ -81,7 +81,7 @@
\DeclareFieldFormat{doi}{%
DOI\space
\ifhyperref
- {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
+ {\href{https://doi.org/#1}{\nolinkurl{#1}}}
{\nolinkurl{#1}}%
}
\DeclareFieldFormat{journaltitle}{\mkbibitalic{#1}\isdot}
@@ -703,7 +703,7 @@
}
%%
-%% Copyright (C) 2010-2014,2016-2018 by
+%% Copyright (C) 2010-2014,2016-2019 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-chem/chem-angew.cbx new/tex/latex/biblatex-chem/chem-angew.cbx
--- old/tex/latex/biblatex-chem/chem-angew.cbx 2018-10-19 22:35:06.000000000 +0200
+++ new/tex/latex/biblatex-chem/chem-angew.cbx 2019-12-03 23:04:35.000000000 +0100
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{chem-angew.cbx}[2018/10/18 v1.1w biblatex citation style]
+\ProvidesFile{chem-angew.cbx}[2019/12/03 v1.1y biblatex citation style]
\RequireCitationStyle{numeric-comp}
@@ -38,7 +38,7 @@
{\usebibmacro{cite:dump}}
%%
-%% Copyright (C) 2010-2014,2016-2018 by
+%% Copyright (C) 2010-2014,2016-2019 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-chem/chem-biochem.bbx new/tex/latex/biblatex-chem/chem-biochem.bbx
--- old/tex/latex/biblatex-chem/chem-biochem.bbx 2018-10-19 22:35:06.000000000 +0200
+++ new/tex/latex/biblatex-chem/chem-biochem.bbx 2019-12-03 23:04:35.000000000 +0100
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{chem-biochem.bbx}[2018/10/18 v1.1w biblatex bibliography style]
+\ProvidesFile{chem-biochem.bbx}[2019/12/03 v1.1y biblatex bibliography style]
% Load the standard style to avoid copy-pasting unnecessary material
\RequireBibliographyStyle{numeric-comp}
@@ -82,14 +82,14 @@
\DeclareFieldFormat{doi}{%
DOI\addcolon\space
\ifhyperref
- {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
+ {\href{https://doi.org/#1}{\nolinkurl{#1}}}
{\nolinkurl{#1}}%
}
\DeclareFieldFormat{labelnumberwidth}{\mkbibparens{#1}}
\DeclareFieldFormat[article]{pages}{%
\iftoggle{bbx:pageranges}{#1}{\mkfirstpage{#1}}%
}
-\DeclareFieldFormat*{title}{#1\adddot}
+\DeclareFieldFormat*{title}{#1}
\DeclareFieldFormat[book, collection, inproceedings]{title}{\mkbibitalic{#1}}
\DeclareFieldFormat{url}{\url{#1}}
\DeclareFieldFormat[article]{volume}{\mkbibitalic{#1}}
@@ -298,7 +298,7 @@
\iftoggle{bbx:articletitle}
{%
\usebibmacro{title}%
- \newunit
+ \printunit{\adddot\space}%
}
{}%
\usebibmacro{byauthor}%
@@ -705,7 +705,7 @@
}
%%
-%% Copyright (C) 2010-2014,2016-2018 by
+%% Copyright (C) 2010-2014,2016-2019 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-chem/chem-biochem.cbx new/tex/latex/biblatex-chem/chem-biochem.cbx
--- old/tex/latex/biblatex-chem/chem-biochem.cbx 2018-10-19 22:35:06.000000000 +0200
+++ new/tex/latex/biblatex-chem/chem-biochem.cbx 2019-12-03 23:04:35.000000000 +0100
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{chem-biochem.cbx}[2018/10/18 v1.1w biblatex citation style]
+\ProvidesFile{chem-biochem.cbx}[2019/12/03 v1.1y biblatex citation style]
\RequireCitationStyle{numeric-comp}
@@ -19,7 +19,7 @@
\renewcommand*\bibrightbracket{)\midsentence}
%%
-%% Copyright (C) 2010-2014,2016-2018 by
+%% Copyright (C) 2010-2014,2016-2019 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-chem/chem-rsc.bbx new/tex/latex/biblatex-chem/chem-rsc.bbx
--- old/tex/latex/biblatex-chem/chem-rsc.bbx 2018-10-19 22:35:06.000000000 +0200
+++ new/tex/latex/biblatex-chem/chem-rsc.bbx 2019-12-03 23:04:35.000000000 +0100
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{chem-rsc.bbx}[2018/10/18 v1.1w biblatex bibliography style]
+\ProvidesFile{chem-rsc.bbx}[2019/12/03 v1.1y biblatex bibliography style]
% Load the standard style to avoid copy-pasting unnecessary material
\RequireBibliographyStyle{numeric-comp}
@@ -80,7 +80,7 @@
\DeclareFieldFormat{doi}{%
DOI\addcolon\space
\ifhyperref
- {\href{http://dx.doi.org/#1}{\nolinkurl{#1}}}
+ {\href{https://doi.org/#1}{\nolinkurl{#1}}}
{\nolinkurl{#1}}%
}
\DeclareFieldFormat{journaltitle}{\mkbibitalic{#1}\isdot}
@@ -636,7 +636,7 @@
}
%%
-%% Copyright (C) 2010-2014,2016-2018 by
+%% Copyright (C) 2010-2014,2016-2019 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-chem/chem-rsc.cbx new/tex/latex/biblatex-chem/chem-rsc.cbx
--- old/tex/latex/biblatex-chem/chem-rsc.cbx 2018-10-19 22:35:06.000000000 +0200
+++ new/tex/latex/biblatex-chem/chem-rsc.cbx 2019-12-03 23:04:35.000000000 +0100
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{chem-rsc.cbx}[2018/10/18 v1.1w biblatex citation style]
+\ProvidesFile{chem-rsc.cbx}[2019/12/03 v1.1y biblatex citation style]
\RequireCitationStyle{numeric-comp}
@@ -20,7 +20,7 @@
}
%%
-%% Copyright (C) 2010-2014,2016-2018 by
+%% Copyright (C) 2010-2014,2016-2019 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-chem.tlpobj new/tlpkg/tlpobj/biblatex-chem.tlpobj
--- old/tlpkg/tlpobj/biblatex-chem.tlpobj 2019-02-28 03:20:20.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-chem.tlpobj 2019-12-04 01:54:24.000000000 +0100
@@ -1,6 +1,6 @@
name biblatex-chem
category Package
-revision 48944
+revision 53012
shortdesc A set of BibLaTeX implementations of chemistry-related bibliography styles
relocated 1
longdesc The bundle offers a set of styles to allow chemists to use
@@ -18,7 +18,7 @@
RELOC/tex/latex/biblatex-chem/chem-rsc.bbx
RELOC/tex/latex/biblatex-chem/chem-rsc.cbx
catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-chem
-catalogue-date 2018-10-19 10:22:36 +0200
-catalogue-license lppl1.3
+catalogue-date 2019-12-03 17:44:42 +0100
+catalogue-license lppl1.3c
catalogue-topics biblatex chemistry journalpub
-catalogue-version 1.1w
+catalogue-version 1.1y
++++++ biblatex-ext.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-ext/CHANGES.md new/doc/latex/biblatex-ext/CHANGES.md
--- old/doc/latex/biblatex-ext/CHANGES.md 2019-04-04 22:56:06.000000000 +0200
+++ new/doc/latex/biblatex-ext/CHANGES.md 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,58 @@
# Changelog
+## Version 0.8d (2020-03-15)
+
+See <https://github.com/moewew/biblatex-ext/compare/v0.8c...v0.8d>
+
+### Fixed
+- Avoid an error about the bibmacro `labeltitle` being undefined
+ in some contexts.
+ Define and use `tabular:labeltitle` in 'tabular:sortname`.
+ If available `tabular:labeltitle` is just `labeltitle`,
+ if not we recreate the definition from `authoryear.bbx`.
+
+## Version 0.8c (2019-11-30)
+
+See <https://github.com/moewew/biblatex-ext/compare/v0.8b...v0.8c>
+
+### Changed
+- The Unpaywall API queries don't include a sanity check for
+ the DOI to DOI.org any more, since DOI.org only serves HTTPS
+ now and Lua(TeX) doesn't easily do SSL.
+ Fortunately, there were no user-level or even author-level
+ macros documented that would expose the answer of the DOI.org
+ query, so we can simply drop that function.
+
+## Version 0.8b (2019-11-01)
+
+See <https://github.com/moewew/biblatex-ext/compare/v0.8a...v0.8b>
+
+### Fixed
+- Call to removed option in `ext-verbose-trad2`.
+
+## Version 0.8a (2019-10-31)
+
+See <https://github.com/moewew/biblatex-ext/compare/v0.8...v0.8a>
+
+### Fixed
+- The default value of `\servoldelim` was documented as
+ and should be `\jourvoldelim`.
+ Previous versions had `\addspace` (the default value of
+ `\jourvoldelim`) instead.
+- Reenabled visible space in documentation.
+- Typo in `ext-authoryear-tiecomp.cbx`.
+
+
+## Version 0.8 (2019-08-25)
+See <https://github.com/moewew/biblatex-ext/compare/v0.7a...v0.8>
+
+### Added
+- `\AtIntrocite` to customise initialisation code for introcite
+ citations.
+
+### Changed
+- Require `biblatex` v3.13 (some backwards compatiblity is in place).
+
## Version 0.7a (2019-04-04)
See <https://github.com/moewew/biblatex-ext/compare/v0.7...v0.7a>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-ext/README.md new/doc/latex/biblatex-ext/README.md
--- old/doc/latex/biblatex-ext/README.md 2019-04-04 22:56:06.000000000 +0200
+++ new/doc/latex/biblatex-ext/README.md 2020-03-15 22:31:31.000000000 +0100
@@ -83,7 +83,7 @@
## Licence
-Copyright 2017-2019 Moritz Wemheuer
+Copyright 2017-2020 Moritz Wemheuer
This work consists of the `.bbx`, `.cbx`, `.def`, `.sty` and `.lua`
files mentioned above.
Binary files old/doc/latex/biblatex-ext/biblatex-ext.pdf and new/doc/latex/biblatex-ext/biblatex-ext.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-ext/biblatex-ext.tex new/doc/latex/biblatex-ext/biblatex-ext.tex
--- old/doc/latex/biblatex-ext/biblatex-ext.tex 2019-04-04 22:56:06.000000000 +0200
+++ new/doc/latex/biblatex-ext/biblatex-ext.tex 2020-03-15 22:31:31.000000000 +0100
@@ -1,14 +1,6 @@
\documentclass[DIV=9]{scrartcl}
-\usepackage{ifxetex,ifluatex}
-\newif\iffontspec
-\ifxetex
- \fontspectrue
-\else\ifluatex
- \fontspectrue
-\else
- \fontspecfalse
-\fi\fi
-\iffontspec
+\usepackage{iftex}
+\iftutex
\usepackage{fontspec}
\else
\usepackage[T1]{fontenc}
@@ -19,11 +11,11 @@
\usepackage[french,ngerman,british]{babel}
\usepackage{csquotes}
\usepackage[useregional]{datetime2}
-\iffontspec\else
+\iftutex\else
\usepackage{lmodern}
\fi
\usepackage[mono=false]{libertinus}
-\iffontspec
+\iftutex
\setmonofont[Scale=0.78]{Bitstream Vera Sans Mono}
\usepackage{unicode-math}
\setmathfont[Scale=MatchUppercase]{libertinusmath-regular.otf}
@@ -116,6 +108,7 @@
@collection,@commentary,@customa,@customb,@customc,@customd,%
@custome,@customf,@inbook,@incollection,@inproceedings,%
@inreference,@image,@jurisdiction,@legal,@legislation,@letter,%
+ @dataset,
@manual,@misc,@movie,@music,@mvcollection,@mvreference,%
@mvproceedings,@mvbook,@online,@patent,@performance,@periodical,%
@proceedings,@reference,@report,@review,@set,@software,@standard,%
@@ -195,7 +188,7 @@
colframe=red, colback=red!5!white,
underlay={%
\path[draw=none] (interior.south east)
- rectangle node{\warnsymbol}
+ rectangle node {\warnsymbol}
([xshift=15mm,yshift=.1cm]interior.north east);},
#1}
@@ -204,7 +197,7 @@
colframe=yellow, colback=yellow!5!white,
underlay={%
\path[draw=none] (interior.south east)
- rectangle node{\dbendsymbol}
+ rectangle node {\dbendsymbol}
([xshift=15mm,yshift=.1cm]interior.north east);},
#1}
@@ -462,20 +455,20 @@
\newcommand*{\ctan}{\mkbibacro{CTAN}}
\newcommand*{\gitbaseurl}{https://github.com/moewew/biblatex-ext}
-\newcommand*{\extblxversion}{0.7a}
+\newcommand*{\extblxversion}{0.8d}
\newcommand*{\biber}{Biber}
\newcommand*{\gitissuelink}[1]{%
\href{\gitbaseurl/issues/#1}{issue \##1 on github}}
\newrobustcmd*{\CSdelim}{%
- \textcolor{spot}{\margnotefont context sensitive}}
+ \textcolor{spot}{\margnotefont\footnotesize context sensitive}}
\newrobustcmd*{\CSdelimMark}{%
\leavevmode\marginpar{\CSdelim}}
\newcommand*{\mpdl}{$\langle$}
\newcommand*{\mpdr}{$\rangle$}
-\iffontspec
+\iftutex
\newcommand*{\hmpdl}{$\langle$}
\newcommand*{\hmpdr}{$\rangle$}
\else
@@ -483,14 +476,12 @@
\newcommand*{\hmpdr}{$\bm{\rangle}$}
\fi
-\iffontspec
\def\textvisiblespace{%
\raisebox{-2.2pt}{%
\mbox{\kern.04em\vrule \(a)height.5ex \(a)width.12ex}%
\vbox{\hrule \(a)width.2em \(a)height.12ex}%
\hbox{\vrule \(a)height.5ex \(a)width.12ex}%
\kern.04em}}
-\fi
% Bourbaki dangerous bend symbol by Heiko Oberdiek
% https://tex.stackexchange.com/users/16967/heiko-oberdiek
@@ -512,14 +503,21 @@
\sbox{\dbendsymbol@box}{\dbendsymbol@tikz}
\newcommand*{\dbendsymbol}{\usebox{\dbendsymbol@box}}
-\newcommand{\warnsymbol}{%
- \makebox[2em][c]{%
- \makebox[0pt][c]{\raisebox{.26em}{\LARGE\bfseries!}}%
- \makebox[0pt][c]{%
- \fontsize{40}{40}\selectfont\color{red}$\bigtriangleup$}}}
+\newcommand*{\warnsymbol@tikz}{%
+ \begin{tikzpicture}[
+ line cap=but,
+ line join=round,
+ line width=2pt,
+ rounded corners=1.5pt,]
+ \node[regular polygon, regular polygon sides=3,
+ scale=1.2, inner sep=-.22em,
+ draw=red]
+ {\raisebox{.26em}{\LARGE\bfseries !}};
+ \end{tikzpicture}}
-\newcommand*{\marginwarn}{%
- \leavevmode\marginpar{\raisebox{-1.5em}{\warnsymbol}}}
+\newsavebox{\warnsymbol@box}
+\sbox{\warnsymbol@box}{\warnsymbol@tikz}
+\newcommand*{\warnsymbol}{\usebox{\warnsymbol@box}}
\makeatother
@@ -530,7 +528,7 @@
author = {Moritz Wemheuer},
link = {mwemheu(a)gmail.com},%
revision = {\extblxversion},
- date = {\DTMDate{2019-04-04}},
+ date = {\DTMDate{2020-03-15}},
}
\hypersetup{%
@@ -695,7 +693,7 @@
\fnurl{https://www.latex-project.org/lppl/lppl-1-3c.txt}
or (at your option) any later version%
\fnurl{https://www.latex-project.org/lppl.txt}.
-This bundle is maintained by Moritz Wemheuer (\textcopyright 2017--2019).
+This bundle is maintained by Moritz Wemheuer (\textcopyright 2017--2020).
\subsection{Feedback}\label{sec:feedback}
@@ -743,8 +741,8 @@
If you read German you may be interested in Dominik Waenhoven's two-part
series \foreignlanguage{ngerman}{\emph{Bibliographien erstellen mit
\sty{biblatex}}} in \foreignlanguage{ngerman}{\emph{Die \TeX nische Komdie}}
-2/2008\fnurl{https://www.dante.de/DTK/Ausgaben/2008-2.pdf} (pp.~53--75)
-and 4/2008\fnurl{https://www.dante.de/DTK/Ausgaben/dtk08-4.pdf} (pp.~31--51).
+2/2008\fnurl{https://archiv.dante.de/DTK/PDF/komoedie_2008_2.pdf} (pp.~53--75)
+and 4/2008\fnurl{https://archiv.dante.de/DTK/PDF/komoedie_2008_4.pdf} (pp.~31--51).
Please keep in mind that some of these texts were written a while ago and
that \sty{biblatex} is actively developed: technical details may have changed
and new features make some things easier.
@@ -982,7 +980,7 @@
Sigfridsson and Ryde \quad ibid. \quad Knuth 1984, 1986
\end{bibexample}
-\styleitem{ext-authoryear-teicomp}
+\styleitem{ext-authoryear-tiecomp}
A compact author-year citation style that combines
\blxstyle{ext-authoryear-ticomp} and \blxstyle{ext-authoryear-iecomp}.
\begin{bibexample}
@@ -1007,6 +1005,9 @@
Whether or not to display \enquote{in:} before the journal information in
\bibtype{article} entries.
All other entry types are not affected by this option.
+If it is desired to remove the \enquote{in:} for more entry types or
+a more specific behaviour is required, then it is still going to be
+necessary to modify the bibmacro~\bibmacro{in:}.
\begingroup
\makeatletter
@@ -1039,15 +1040,20 @@
This option controls if \bibtype{inbook}, \bibtype{incollection} and
\bibtype{inproceedings} entries that are tied to a parent entry with
\bibfield{xref} or \bibfield{crossref} should cite their parent in the
-bibliography if the parent is listed in the bibliography as a separate entry.
-With the default setting \kvopt{citexref}{false} the parent is not cited, the
-entry is shown as in the standard styles. If the option is set to
-\optval{true}, the block following the \enquote{in:} is replaced by a citation
-to the parent entry.
-The option itself does \emph{not} cause the parent entry to be added to the
-bibliography, this needs to happen either explicitly by citing the parent
-(this includes \cmd{nocite}) or implicitly via the \opt{minxrefs} or
-\opt{mincrossrefs} option.
+bibliography \emph{if} the parent is listed in the bibliography as a
+separate entry.
+With the default setting \kvopt{citexref}{false} the parent is not
+cited, the entry is shown as in the standard styles.
+If the option is set to \optval{true}, the block following the
+\enquote{in:} is replaced by a citation to the parent entry.
+
+\begin{remindbox}
+The option itself does \emph{not} cause the parent entry to be added
+to the bibliography automatically.
+This needs to happen either explicitly by citing the parent
+(possibly with \cmd{nocite})
+or implicitly via the \opt{minxrefs} or \opt{mincrossrefs} option.
+\end{remindbox}
\nocite{westfahl:frontier}
\begin{bibexample}[title={\kvopt{citexref}{true}}]
@@ -1132,7 +1138,8 @@
This option only has an effect if \hyperopt{innamebeforetitle} is set to
\optval{true}.
-\begin{bibexample}[title={\kvopt{innameidem}{true}}]
+\begin{bibexample}[title={\kvopt{innameidem}{true}}
+ {\small (and \kvopt{innamebeforetitle}{true})}]
\togglefalse{bbx:isbn}
\makeatletter
\renewbibmacro*{bbx:in:editor}[1]{%
@@ -1154,7 +1161,8 @@
\exampleprintbib{gaonkar:in}
\end{bibexample}
-\begin{bibexample}[title={\kvopt{innameidem}{false}}]
+\begin{bibexample}[title={\kvopt{innameidem}{false}}
+ {\small (and \kvopt{innamebeforetitle}{true})}]
\togglefalse{bbx:isbn}
\makeatletter
\renewbibmacro*{bbx:in:editor}[1]{%
@@ -1388,13 +1396,14 @@
\makeatother
\endgroup
+
The label produced by the \optval{plain} option can be customised as follows.
\begin{ltxsyntax}
\csitem{introcitepunct}
-The punctuation insterted between the label and the
- rest of the entry with \kvopt{introcite}{plain}.
- The default value is a colon followed by a space.
+The punctuation inserted between the label and the
+rest of the entry with \kvopt{introcite}{plain}.
+The default value is a colon followed by a space.
\begin{bibexample}
\togglefalse{bbx:doi}
\renewcommand*{\introcitepunct}{\highlight{\textbf{\addcolon}\textvisiblespace}}
@@ -1493,6 +1502,22 @@
\end{bibexample}
\makeatother
+In order to reproduce the citation label accurately in the bibliography,
+some initialisation and housekeeping needs to be done.
+\begin{ltxsyntax}
+\cmditem{AtIntrocite}{code}
+\cmditem*{AtIntrocite}*{code}
+
+Appends the \prm{code} to an internal hook executed when initializing
+\cmd{introcite}.
+The starred variant of the command clears the initialisation hook,
+so the defaults can be overwritten.
+The default settings execute the internal macro
+\cs{extblx@introcite@init}, which makes sure that the label produced
+for introcite takes into account the citation settings and suppresses
+unwanted citation tracking and hyperlinks.
+\end{ltxsyntax}
+
The appearance of the citation label can be customised mostly as if it were
produced by a true citation command called \cmd{bbx@introcite}.
The delimiter context is \gencode{bbx@introcite}, the inner citation delimiters
@@ -1586,8 +1611,9 @@
perusing this section of the manual.
\subsection{Field formats}\label{sec:opt:field}
-In a few places where the standard styles employ hard-coded formatting
-directives the styles of this bundle offer customisable formats instead.
+The styles of this bundle offer customisable field formats
+in a few places where the standard styles employ hard-coded formatting
+directives instead.
Field formats can be modified with \cmd{DeclareFieldFormat}.
\begin{bibfieldformatlist}
@@ -1700,10 +1726,15 @@
\begin{bibexample}
\toggletrue{bbx:innamebeforetitle}
\togglefalse{bbx:isbn}
+\DeclareFieldFormat{editortype}{\mkbibparens{#1}}
+\DeclareDelimFormat{editortypedelim}{\addspace}
\DeclareDelimFormat[bib,biblist]{innametitledelim}{\highlight{\textbf{%
\addperiod}\textvisiblespace}\bibsentence}% <- hacky & hard-coded!
\exampleprintbib{pines}
\end{bibexample}
+Note that \bibfieldformat{editortype} and \cmd{editortypedelim}
+were changed for this example to avoid punctuation clashes.
+
Since \cmd{nametitledelim} and \cmd{innametitledelim} are independent,
the following output is easily achieved.
Note that the optional argument to \cmd{DeclareDelimFormat} is used
@@ -1859,15 +1890,17 @@
\csitem{publocdelim}
-The delimiter between \bibfield{publisher}\slash\bibfield{organization}\slash
+The delimiter between \bibfield{publisher}\slash
+\bibfield{organization}\slash
\bibfield{institution} and \bibfield{location}.
The default is a comma followed by a space.
-This delimiter is not used by the default style, since the standard order of
-fields is \bibfield{location}, \bibfield{publisher}\slash
+This delimiter is not used by the default style, since the standard
+order of fields is \bibfield{location}, \bibfield{publisher}\slash
\bibfield{organization}\slash\bibfield{institution}, \bibfield{date}.
-You could use \cmd{publocdelim} if you changed the order of these fields to
-\bibfield{publisher}\slash\bibfield{organization}\slash\bibfield{institution},
-\bibfield{location} \bibfield{date} with
+You could use \cmd{publocdelim} if you changed the order of these
+fields to \bibfield{publisher}\slash\bibfield{organization}\slash
+\bibfield{institution}, \bibfield{location} \bibfield{date} by
+redefining the bibmacro~\bibmacro{pubinstorg+location+date} as follows.
\begin{biblatexcode}
\renewbibmacro*{pubinstorg+location+date}[1]{%
\printlist{#1}%
@@ -1945,8 +1978,8 @@
The delimiters are set up to work as paired delimiters, but you are free to
use non-matching pairs or to leave the opening or closing delimiter empty.
If you want to add punctuation, the context-sensitive delimiters
-\gencode{nameyeardelim}, \gencode{nametitledelim} and friends as well as
-the context-insensitive \cmd{postnotedelim} and friends are more approriate.
+\gencode{nameyeardelim}, \gencode{nametitledelim},
+\gencode{postnotedelim} and friends are more approriate.
\begin{remindbox}
Although the outer delimiters can be set up using \cmd{DeclareCiteCommand}'s
@@ -2222,7 +2255,7 @@
This bibliography macro has one mandatory argument: the name of a list field,
sensible values are \bibfield{publisher}, \bibfield{institution} and
\bibfield{organization}.
-
+By default the macro is defined and used as follows.
\begin{biblatexcode}
\newbibmacro*{pubinstorg+location+date}[1]{%
\printlist{location}%
@@ -2370,8 +2403,8 @@
The package also defines two helpful bibliography macros.
\begin{keymarglistbook}
- \item[tabular:sortname] Prints the labelname/sortname.
- \item[tabular:omitsortname] Suppresses the labelname/sortname in the current
+ \keyitem[tabular:sortname] Prints the labelname/sortname.
+ \keyitem[tabular:omitsortname] Suppresses the labelname/sortname in the current
group.
\end{keymarglistbook}
@@ -2489,14 +2522,16 @@
\usepackage[(*@\prm{\sty{biblatex-ext-oa} options}@*)]{biblatex-ext-oa}
\end{biblatexcode}
-The package may load the support packages \hypersty{biblatex-ext-oa-doiapi},
-\hypersty{biblatex-ext-oasymb-pict2e}, \hypersty{biblatex-ext-oasymb-l3draw}
- and \hypersty{biblatex-ext-oasymb-tikz}.
-The preferred way to load these packages is via \sty{biblatex-ext-oa}'s
-package options.
+The package may load the support packages
+\hypersty{biblatex-ext-oa-doiapi},
+\hypersty{biblatex-ext-oasymb-pict2e},
+\hypersty{biblatex-ext-oasymb-l3draw}
+and \hypersty{biblatex-ext-oasymb-tikz}.
+The preferred way to use those packages is to have them loaded
+automatically via \sty{biblatex-ext-oa}'s package options.
It should usually not be necessary to load any of these support packages
-directly with \cmd{usepackage}, but it is possible to use them as stand-alone
-packages should the need arise in other situations.
+directly with \cmd{usepackage}, but it is possible to use them as
+stand-alone packages should the need arise in other situations.
\begin{warnbox}
Note that the macro \hypercmd{oasymbol} must be defined and should contain an
@@ -2569,10 +2604,11 @@
The available options can be found in \cref{sec:oa:symbol}.
\begin{warnbox}
-Note that this option is only available if \hypercmd{symbolpackage} has been
-set to a valid value different from \optval{false} or one of the open access
-symbol packages has been loaded manually (the latter is usually not recommended,
-the option \hypercmd{symbolpackage} is the preferred way to load those
+Note that this option is only available if the
+option~\hyperopt{symbolpackage} has been set to a valid value different
+from \optval{false} or one of the open access symbol packages has
+been loaded manually (the latter is usually not recommended, the
+option~\hyperopt{symbolpackage} is the preferred way to load those
packages).
\end{warnbox}
@@ -2670,7 +2706,8 @@
The heart of the package \sty{biblatex-ext-oa} is the bibliography option
\hyperopt{openaccess}, which can be set globally, per type or per entry.
-A short example document can be found at
+A longer example document exploring various aspects of open access
+detection can be found at
\url{https://github.com/moewew/biblatex-ext/blob/master/oaslinks.tex}.
\begin{optionlist}
@@ -2683,8 +2720,9 @@
\hyperopt{enable} option set to \optval{false} in which case the initial
value changes to \optval{none}.
-All following values are valid at all three levels (global, per-type and
-per-entry), but it may not be useful to use a particular option at all levels.
+All of the following values are valid at all three levels (global,
+per-type and per-entry), but not all options may be useful at all
+available levels.
\begin{valuelist}
\item[auto] Use a semi-automatic heuristic to find the best open access URL.
@@ -2732,7 +2770,7 @@
\item[\prm{open access field}] Specifies that the open access version is given
by \prm{open access field}.
- This value would normally be used only on a per-enry level.
+ This value would normally be used only on a per-entry level.
Any field for which \hypercmd{DeclareOpenAccessFieldUrl} has declared a URL
specification is a valid \enquote{open access field}.
@@ -2796,8 +2834,9 @@
\DeclareOpenAccessEprintUrl[always]{arxiv}{%
https://arxiv.org/\abx@arxivpath/\thefield{eprint}}
\end{biblatexcode}
-Note the optional argument \texttt{always} for \bibfield{arxiv}, because
-articles on the arXiv are always open access.
+Since articles on the arXiv are always open access, the declaration
+for \bibfield{arxiv} features the optional \prm{openness} argument
+\texttt{always}.
\cmditem{DeclareOpenAccessEprintAlias}{alias}{eprinttype}
@@ -2850,8 +2889,9 @@
\end{itemize}
\end{itemize}
-For \optval{auto}-detection, an open access article with DOI would ideally
-look like this.
+For \optval{auto}-detection, an open access article with DOI would
+ideally use the field annotation \texttt{openaccess}
+(\lstinline[style=extblxstylebibtex]|{doi+an = {=openaccess},|).
% cipriani
\inputexamplebibfile[listing options={linerange={27-38},
style = extblxstylebibtex}]
@@ -2902,7 +2942,7 @@
This package can only be used with \lualatex{} and needs online
access.
Furthermore the Unpaywall API requires an email address and asks to limit
-calls to 100000 per day\fnurl{https://unpaywall.org/products/api}.
+requests to 100,000 calls per day\fnurl{https://unpaywall.org/products/api}.
\end{warnbox}
To avoid too many calls to the API, the package caches its information in the
@@ -2923,7 +2963,7 @@
There is no predefined default email address.
If the package is loaded and no email was provided until the
beginning of the document (as tested in an \cmd{AtEndPreamble} hook)
-you will recieve a warning.
+you will receive a warning.
A fatal error will be thrown if you try to query the Unpaywall database
without an email address.
\end{warnbox}
@@ -2953,30 +2993,30 @@
\subsection{Open access symbols}\label{sec:oa:symbol}
-Currently, this bundle offers three options to provide the open access
+Currently, this bundle offers three methods of drawing the open access
symbols.
+Each method is packed up in a little sub-package, end users are not
+expected to load these packages manually, instead they should use
+the option~\hyperopt{symbolpackage} of \hypersty{biblatex-ext-oa}.
+
The package \hypersty{biblatex-ext-oasymb-pict2e} draws the symbols using
\sty{pict2e}'s \env{picture} environment.
The package \hypersty{biblatex-ext-oasymb-tikz}
uses \pgftikz's \env{tikzpicture}.
The package \hypersty{biblatex-ext-oasymb-l3draw} finally
uses \LaTeX3's \sty{l3draw} package.
-The main purpose of these packages is to define the macro \cmd{oasymbol} for
-use with \sty{biblatex-ext-oa}.
+The main purpose of these packages is to define the macro \cmd{oasymbol}
+for use with \sty{biblatex-ext-oa}.
-The packages should usually not have to be loaded explicitly, instead
-they are loaded via the \hyperopt{symbolpackage} option of
-\hypersty{biblatex-ext-oa}.
-
-All packages define a similar set of macros, so they can not be loaded
-together.
+All packages define a similar set of macros, so they are not indended to
+be loaded together.
If used as stand-alone packages, all packages only have one option.
\begin{optionlist}
\optitem[plos]{symbol}{\optval{plos}, \optval{oanet}}
-This options determines which of the two provided symbols is going to be used
-for \hypercmd{oasymbol}.
+This options determines which of the two available symbols is going to
+be used for \hypercmd{oasymbol}.
The possible values are
\begin{valuelist}
@@ -3136,8 +3176,28 @@
The numbers on the right indicate the relevant section of the manual.
\begin{changelog}
+\begin{release}{0.8d}{2020-03-15}
+ \item Fixed issue with \hyperbibmacro{tabular:sortname}\see{sec:tabularbib}
+\end{release}
+\begin{release}{0.8c}{2019-11-30}
+ \item Stopped querying \url{https://doi.org} API for DOI
+ verification\see{sec:oa:doiapi}
+\end{release}
+\begin{release}{0.8b}{2019-11-01}
+ \item Fixed bug in \blxstyle{ext-verbose-trad2}%
+ \see{sec:styles:standard}
+\end{release}
+\begin{release}{0.8a}{2019-10-31}
+ \item Fixed default value of \hypercmd{servoldelim}\see{sec:opt:punct}
+ \item Fixed bug in \blxstyle{ext-authoryear-tiecomp}%
+ \see{sec:styles:new}
+\end{release}
+\begin{release}{0.8}{2019-08-25}
+ \item Added \hypercmd{AtIntrocite} \see{sec:opt:style}
+ \item Require \sty{biblatex} v3.13 (2010/08/17)\see{sec:req}
+\end{release}
\begin{release}{0.7a}{2019-04-04}
- \item Fix bug in the \opt{env} option of \hypercmd{printbibtabular}%
+ \item Fixed bug in the \opt{env} option of \hypercmd{printbibtabular}%
\see{sec:tabularbib}
\end{release}
\begin{release}{0.7}{2019-02-08}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-ext.doc.tlpobj new/tlpkg/tlpobj/biblatex-ext.doc.tlpobj
--- old/tlpkg/tlpobj/biblatex-ext.doc.tlpobj 2019-04-06 23:32:27.000000000 +0200
+++ new/tlpkg/tlpobj/biblatex-ext.doc.tlpobj 2020-03-16 02:21:15.000000000 +0100
@@ -1,9 +1,9 @@
name biblatex-ext.doc
category Package
-revision 50759
+revision 54327
shortdesc doc files of biblatex-ext
relocated 1
-docfiles size=207
+docfiles size=174
RELOC/doc/latex/biblatex-ext/CHANGES.md
RELOC/doc/latex/biblatex-ext/README.md
RELOC/doc/latex/biblatex-ext/biblatex-ext-examples.bib
++++++ biblatex-ext.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/biblatex-ext-oa-doiapi.sty new/tex/latex/biblatex-ext/biblatex-ext-oa-doiapi.sty
--- old/tex/latex/biblatex-ext/biblatex-ext-oa-doiapi.sty 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/biblatex-ext-oa-doiapi.sty 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oa-doiapi}
- [2019/04/04 v0.7a Obtain open access information from DOI via
+ [2020/03/15 v0.8d Obtain open access information from DOI via
unpaywall.org and doi.org (MW)]
\RequirePackage{etoolbox}
@@ -7,16 +7,16 @@
\protected\def\extblx@oa@api@error#1#2{%
\PackageError{biblatex-ext-oa-doiapi}{#1}{#2.}}
-\protected\def\extblx@oa@api@warning@noline#1{%
- \PackageWarningNoLine{biblatex-ext-oa-doiapi}{#1}}
+\protected\def\extblx@oa@api@warning@noline{%
+ \PackageWarningNoLine{biblatex-ext-oa-doiapi}}
\protected\def\extblx@oa@api@info@noline#1{%
\PackageInfo{biblatex-ext-oa-doiapi}{#1\@gobble}}
\let\extblx@oa@api@warning\extblx@oa@api@warning@noline
\AtEndOfPackage{%
- \protected\def\extblx@oa@api@warning#1{%
- \PackageWarning{biblatex-ext-oa-doiapi}{#1}}}
+ \protected\def\extblx@oa@api@warning{%
+ \PackageWarning{biblatex-ext-oa-doiapi}}}
% LuaLaTeX only!
\ifundef\luatexversion
@@ -43,8 +43,8 @@
% OA data
\IfFileExists{\jobname.oai}
{\extblx@oa@api@info@noline{%
- Load OA database from\MessageBreak
- \jobname.oai}%
+ Loading OA database from\MessageBreak
+ \jobname.oai ...}%
\directlua{dofile(\extblx@oa@api@luastring{\jobname.oai})}}
{\extblx@oa@api@info@noline{%
No OA database file present at\MessageBreak
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/biblatex-ext-oa.sty new/tex/latex/biblatex-ext/biblatex-ext-oa.sty
--- old/tex/latex/biblatex-ext/biblatex-ext-oa.sty 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/biblatex-ext-oa.sty 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,7 @@
\ProvidesPackage{biblatex-ext-oa}
- [2019/04/04 v0.7a mark open access in biblatex bibliographies (MW)]
+ [2020/03/15 v0.8d mark open access in biblatex bibliographies (MW)]
+
+\RequirePackage{etoolbox}
\protected\def\extblx@oa@error#1#2{%
\PackageError{biblatex-ext-oa}{#1}{#2.}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/biblatex-ext-oasymb-l3draw.sty new/tex/latex/biblatex-ext/biblatex-ext-oasymb-l3draw.sty
--- old/tex/latex/biblatex-ext/biblatex-ext-oasymb-l3draw.sty 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/biblatex-ext-oasymb-l3draw.sty 2020-03-15 22:31:31.000000000 +0100
@@ -1,7 +1,7 @@
\RequirePackage{expl3}
\ProvidesExplPackage {biblatex-ext-oasymb-l3draw}
- {2019/04/04} {0.7a}
+ {2020/03/15} {0.8d}
{open access symbols with l3draw (MW)}
\RequirePackage{xparse}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/biblatex-ext-oasymb-pict2e.sty new/tex/latex/biblatex-ext/biblatex-ext-oasymb-pict2e.sty
--- old/tex/latex/biblatex-ext/biblatex-ext-oasymb-pict2e.sty 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/biblatex-ext-oasymb-pict2e.sty 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oasymb-pict2e}
- [2019/04/04 v0.7a open access symbols with pict2e (MW)]
+ [2020/03/15 v0.8d open access symbols with pict2e (MW)]
\RequirePackage{etoolbox}
\RequirePackage{kvoptions}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/biblatex-ext-oasymb-tikz.sty new/tex/latex/biblatex-ext/biblatex-ext-oasymb-tikz.sty
--- old/tex/latex/biblatex-ext/biblatex-ext-oasymb-tikz.sty 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/biblatex-ext-oasymb-tikz.sty 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-oasymb-tikz}
- [2019/04/04 v0.7a open access symbols with TikZ (MW)]
+ [2020/03/15 v0.8d open access symbols with TikZ (MW)]
\RequirePackage{etoolbox}
\RequirePackage{kvoptions}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/biblatex-ext-tabular.sty new/tex/latex/biblatex-ext/biblatex-ext-tabular.sty
--- old/tex/latex/biblatex-ext/biblatex-ext-tabular.sty 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/biblatex-ext-tabular.sty 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesPackage{biblatex-ext-tabular}
- [2019/04/04 v0.7a tabular bibliographies for biblatex (MW)]
+ [2020/03/15 v0.8d tabular bibliographies for biblatex (MW)]
% Code based on Audrey's
% (https://tex.stackexchange.com/users/4483/audrey)
@@ -96,7 +96,6 @@
% underlying macros
\def\extblxtab@bibtabular#1{%
- \blx@langstrings
\blx@bibheading\blx@theheading\blx@thetitle
\blx@bibnote\blx@theprenote
\begingroup
@@ -244,7 +243,7 @@
% appropriate
\newbibmacro*{tabular:sortname}{%
\ifnameundef{labelname}
- {\usebibmacro{labeltitle}}
+ {\usebibmacro{tabular:labeltitle}}
{\printnames[sortname]{labelname}%
\iffieldequalstr{labelnamesource}{editor}
{\setunit{\printdelim{editortypedelim}}%
@@ -261,6 +260,20 @@
{}
{\clearname{\thefield{labelnamesource}}}}
+% as it turns out 'labeltitle' is only defined in authoryear.bbx
+% so we need a replacement if we can't have it
+\ifbibmacroundef{labeltitle}
+ {\newbibmacro*{tabular:labeltitle}{%
+ \iffieldundef{label}
+ {\iffieldundef{shorttitle}
+ {\printfield{title}%
+ \clearfield{title}}
+ {\printfield[title]{shorttitle}}}
+ {\printfield{label}}}}
+ {\ifundef\letbibmacro
+ {\newbibmacro*{tabular:labeltitle}{\usebibmacro{labeltitle}}}
+ {\letbibmacro{tabular:labeltitle}{labeltitle}}}
+
\endinput
%
% This file is part of the biblatex-ext bundle.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/blxextdoiapi.lua new/tex/latex/biblatex-ext/blxextdoiapi.lua
--- old/tex/latex/biblatex-ext/blxextdoiapi.lua 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/blxextdoiapi.lua 2020-03-15 22:31:31.000000000 +0100
@@ -2,8 +2,8 @@
local blxextdoiapi_module = {
name = "blxextdoiapi",
- version = "v0.7a",
- date = "2019/04/04",
+ version = "v0.8d",
+ date = "2020/03/15",
description = "Obtain open access information from DOI via unpaywall.org",
author = "Moritz Wemheuer",
license = "LPPL v1.3c",
@@ -119,8 +119,13 @@
return nil, code
end
+-- DISABLED for now :-(
+-- doi.org only serves via HTTPS, but Lua(TeX) has no built-in
+-- support for SLL at the moment, so we can't query the API
+-- as we only get 301 response
+--[[
local function get_doi_info(doi)
- local req_url = "https://doi.org/api/handles/" .. url.escape(doi)
+ local req_url = "http://doi.org/api/handles/" .. url.escape(doi)
local doi_info, code = query_json_api(req_url)
if doi_info then
@@ -143,6 +148,7 @@
return get_doi_info(doi)
end
+]]--
-- email is required, error out if not given
-- Unfortunately, this gives a weird Lua dump as well and one has to scroll
@@ -150,16 +156,17 @@
-- a usual TeX error instead of the generic LuaTeX error provided by ltluatex.
-- Only makes sense if the DOI is valid.
local function get_unpaywall_info(doi)
- if not is_valid_doi(doi) then
- return nil
- elseif not blxextdoiapi.mail or blxextdoiapi.mail == "" then
+ -- if not is_valid_doi(doi) then
+ -- return nil
+ -- elseif not blxextdoiapi.mail or blxextdoiapi.mail == "" then
+ if not blxextdoiapi.mail or blxextdoiapi.mail == "" then
error("No mail address supplied.\n" ..
"You must give a valid email address\n" ..
"to be able to use the Unpaywall API\n")
return nil
end
- local req_url = "https://api.unpaywall.org/v2/" .. doi
+ local req_url = "http://api.unpaywall.org/v2/" .. doi
.. "?email=" .. blxextdoiapi.mail
local upw_info, code = query_json_api(req_url)
@@ -204,14 +211,17 @@
return get_unpaywall_info(doi)
end
--- returns false if there is no open access URL since the RHS ~= nil
-local function openaccess_url_is_doi(doi)
- return get_openaccess_url(doi) == "https://doi.org/" .. doi
+-- Has \url hard-coded, people probably shouldn't be using this,
+-- but it's documented now
+local function get_openaccess_url_tex(doi)
+ local oa_url = get_openaccess_url(doi)
+ if oa_url then
+ texsprint("\\url{")
+ texwrite(oa_url)
+ texsprint("}")
+ end
end
-local function is_openaccess(doi)
- return get_openaccess_url(doi) ~= nil
-end
-- For TeX. I'd have liked this better in the .sty, but the whole \ escape
-- malarkey made that a pain, so the function is here now.
@@ -224,6 +234,16 @@
end
end
+-- returns false if there is no open access URL since the RHS ~= nil
+local function openaccess_url_is_doi(doi)
+ return get_openaccess_url(doi) == "https://doi.org/" .. doi
+end
+
+local function is_openaccess(doi)
+ return get_openaccess_url(doi) ~= nil
+end
+
+
-- make conditionals usable as \<...>{<true>}{<false>} directly
local function texify_conditional(cond)
if cond then
@@ -237,9 +257,10 @@
return {
module = module,
cache_expire = cache_expire,
- is_valid_doi = is_valid_doi,
+ -- is_valid_doi = is_valid_doi,
is_openaccess = is_openaccess,
get_openaccess_url = get_openaccess_url,
+ get_openaccess_url_tex = get_openaccess_url_tex,
assign_openaccess_url_to = assign_openaccess_url_to,
openaccess_url_is_doi = openaccess_url_is_doi,
texify_conditional = texify_conditional,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx new/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx
--- old/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-alphabetic-verb.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic-verb.bbx}
- [2019/04/04 v0.7a extended biblatex alphabetic-verb
+ [2020/03/15 v0.8d extended biblatex alphabetic-verb
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx new/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx
--- old/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-alphabetic-verb.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic-verb.cbx}
- [2019/04/04 v0.7a extended biblatex alphabetic-verb citation style
+ [2020/03/15 v0.8d extended biblatex alphabetic-verb citation style
(MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-alphabetic.bbx new/tex/latex/biblatex-ext/ext-alphabetic.bbx
--- old/tex/latex/biblatex-ext/ext-alphabetic.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-alphabetic.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic.bbx}
- [2019/04/04 v0.7a extended biblatex alphabetic bibliography style (MW)]
+ [2020/03/15 v0.8d extended biblatex alphabetic bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{alphabetic}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-alphabetic.cbx new/tex/latex/biblatex-ext/ext-alphabetic.cbx
--- old/tex/latex/biblatex-ext/ext-alphabetic.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-alphabetic.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-alphabetic.cbx}
- [2019/04/04 v0.7a extended biblatex alphabetic citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex alphabetic citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authortitle-common.bbx new/tex/latex/biblatex-ext/ext-authortitle-common.bbx
--- old/tex/latex/biblatex-ext/ext-authortitle-common.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authortitle-common.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-common.bbx}
- [2019/04/04 v0.7a common files for extended biblatex
+ [2020/03/15 v0.8d common files for extended biblatex
authortitle bibliography styles (MW)]
\RequireBibliographyStyle{ext-dashed-common}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authortitle-comp.bbx new/tex/latex/biblatex-ext/ext-authortitle-comp.bbx
--- old/tex/latex/biblatex-ext/ext-authortitle-comp.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authortitle-comp.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-comp.bbx}
- [2019/04/04 v0.7a extended biblatex authortitle-comp
+ [2020/03/15 v0.8d extended biblatex authortitle-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authortitle-comp.cbx new/tex/latex/biblatex-ext/ext-authortitle-comp.cbx
--- old/tex/latex/biblatex-ext/ext-authortitle-comp.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authortitle-comp.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-comp.cbx}
- [2019/04/04 v0.7a extended biblatex authortitle-comp
+ [2020/03/15 v0.8d extended biblatex authortitle-comp
citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
@@ -70,9 +70,9 @@
\ifnameundef{labelname}
{\setunit{%
\global\booltrue{cbx:parens}%
- \extpostnotedelim
+ \printdelim{extpostnotedelim}%
\csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}
- {\setunit{\postnotedelim}}%
+ {\setunit{\printdelim{postnotedelim}}}%
\printfield{postnote}%
\ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
{\setunit{}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx new/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx
--- old/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authortitle-ibid.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ibid.bbx}
- [2019/04/04 v0.7a extended biblatex authortitle-ibid
+ [2020/03/15 v0.8d extended biblatex authortitle-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx new/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx
--- old/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authortitle-ibid.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ibid.cbx}
- [2019/04/04 v0.7a extended biblatex authortitle-ibid
+ [2020/03/15 v0.8d extended biblatex authortitle-ibid
citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
@@ -22,7 +22,7 @@
\DeclareFieldFormat{extblx@innerfootcitedelims}{%
\csuse{mkinner\blx@delimcontext delims}{#1}}
-\newbibmacro*{textcite}{%
+\renewbibmacro*{textcite}{%
\global\boolfalse{cbx:loccit}%
\printnames{labelname}%
\setunit*{%
@@ -43,14 +43,14 @@
\printtext[bibhyperref]{%
\printfield[citetitle]{labeltitle}}}}
-\newbibmacro*{textcite:postnote}{%
+\renewbibmacro*{textcite:postnote}{%
\ifthenelse{\iffieldundef{postnote}\OR\boolean{cbx:loccit}}
{\ifbool{cbx:parens}
{\csuse{extblx@citedelim@\blx@delimcontext @inner@close}}
{}}
{\ifbool{cbx:parens}
- {\postnotedelim}
- {\extpostnotedelim
+ {\printdelim{postnotedelim}}
+ {\printdelim{extpostnotedelim}%
\csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
\printfield{postnote}%
\csuse{extblx@citedelim@\blx@delimcontext @inner@close}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx new/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx
--- old/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authortitle-icomp.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-icomp.bbx}
- [2019/04/04 v0.7a extended biblatex authortitle-icomp
+ [2020/03/15 v0.8d extended biblatex authortitle-icomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx new/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx
--- old/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authortitle-icomp.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-icomp.cbx}
- [2019/04/04 v0.7a extended biblatex authortitle-icomp
+ [2020/03/15 v0.8d extended biblatex authortitle-icomp
citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
@@ -78,9 +78,9 @@
{\ifnameundef{labelname}
{\setunit{%
\global\booltrue{cbx:parens}%
- \extpostnotedelim
+ \printdelim{extpostnotedelim}%
\csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}
- {\setunit{\postnotedelim}}%
+ {\setunit{\printdelim{postnotedelim}}}%
\printfield{postnote}}%
\ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
{\setunit{}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx new/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx
--- old/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authortitle-tcomp.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-tcomp.bbx}
- [2019/04/04 v0.7a extended biblatex authortitle-tcomp
+ [2020/03/15 v0.8d extended biblatex authortitle-tcomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx new/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx
--- old/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authortitle-tcomp.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-tcomp.cbx}
- [2019/04/04 v0.7a extended biblatex authortitle-tcomp
+ [2020/03/15 v0.8d extended biblatex authortitle-tcomp
citation style (MW)]
\RequireCitationStyle{ext-authortitle-comp}
@@ -82,10 +82,10 @@
\renewbibmacro*{textcite:postnote}{%
\ifbool{cbx:parens}
- {\setunit{\postnotedelim}}
+ {\setunit{\printdelim{postnotedelim}}}
{\setunit{%
\global\booltrue{cbx:parens}%
- \extpostnotedelim
+ \printdelim{extpostnotedelim}%
\csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}%
\printfield{postnote}%
\ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authortitle-terse.bbx new/tex/latex/biblatex-ext/ext-authortitle-terse.bbx
--- old/tex/latex/biblatex-ext/ext-authortitle-terse.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authortitle-terse.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-terse.bbx}
- [2019/04/04 v0.7a extended biblatex authortitle-terse
+ [2020/03/15 v0.8d extended biblatex authortitle-terse
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authortitle-terse.cbx new/tex/latex/biblatex-ext/ext-authortitle-terse.cbx
--- old/tex/latex/biblatex-ext/ext-authortitle-terse.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authortitle-terse.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-terse.cbx}
- [2019/04/04 v0.7a extended biblatex authortitle-terse
+ [2020/03/15 v0.8d extended biblatex authortitle-terse
citation style (MW)]
\RequireCitationStyle{ext-authortitle}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx new/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx
--- old/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authortitle-ticomp.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ticomp.bbx}
- [2019/04/04 v0.7a extended biblatex authortitle-ticomp
+ [2020/03/15 v0.8d extended biblatex authortitle-ticomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx new/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx
--- old/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authortitle-ticomp.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle-ticomp.cbx}
- [2019/04/04 v0.7a extended biblatex authortitle-ticomp citation style
+ [2020/03/15 v0.8d extended biblatex authortitle-ticomp citation style
(MW)]
\RequireCitationStyle{ext-authortitle-icomp}
@@ -93,10 +93,10 @@
\renewbibmacro*{textcite:postnote}{%
\ifbool{cbx:parens}
- {\setunit{\postnotedelim}}
+ {\setunit{\printdelim{postnotedelim}}}
{\setunit{%
\global\booltrue{cbx:parens}%
- \extpostnotedelim
+ \printdelim{extpostnotedelim}%
\csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}%
\ifbool{cbx:loccit}
{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authortitle.bbx new/tex/latex/biblatex-ext/ext-authortitle.bbx
--- old/tex/latex/biblatex-ext/ext-authortitle.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authortitle.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle.bbx}
- [2019/04/04 v0.7a extended biblatex authortitle
+ [2020/03/15 v0.8d extended biblatex authortitle
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authortitle.cbx new/tex/latex/biblatex-ext/ext-authortitle.cbx
--- old/tex/latex/biblatex-ext/ext-authortitle.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authortitle.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authortitle.cbx}
- [2019/04/04 v0.7a extended biblatex authortitle citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex authortitle citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
@@ -45,8 +45,8 @@
{\csuse{extblx@citedelim@\blx@delimcontext @inner@close}}
{}}
{\ifbool{cbx:parens}
- {\postnotedelim}
- {\extpostnotedelim
+ {\printdelim{postnotedelim}}
+ {\printdelim{extpostnotedelim}%
\csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
\printfield{postnote}%
\csuse{extblx@citedelim@\blx@delimcontext @inner@close}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-common.bbx new/tex/latex/biblatex-ext/ext-authoryear-common.bbx
--- old/tex/latex/biblatex-ext/ext-authoryear-common.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-common.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-common.bbx}
- [2019/04/04 v0.7a common files for extended biblatex
+ [2020/03/15 v0.8d common files for extended biblatex
authoryear bibliography styles (MW)]
\RequireBibliographyStyle{ext-dashed-common}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-comp.bbx new/tex/latex/biblatex-ext/ext-authoryear-comp.bbx
--- old/tex/latex/biblatex-ext/ext-authoryear-comp.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-comp.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-comp.bbx}
- [2019/04/04 v0.7a extended biblatex authoryear-comp
+ [2020/03/15 v0.8d extended biblatex authoryear-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-comp.cbx new/tex/latex/biblatex-ext/ext-authoryear-comp.cbx
--- old/tex/latex/biblatex-ext/ext-authoryear-comp.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-comp.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-comp.cbx}
- [2019/04/04 v0.7a extended biblatex authoryear-comp
+ [2020/03/15 v0.8d extended biblatex authoryear-comp
citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-ecomp.bbx new/tex/latex/biblatex-ext/ext-authoryear-ecomp.bbx
--- old/tex/latex/biblatex-ext/ext-authoryear-ecomp.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-ecomp.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ecomp.bbx}
- [2019/04/04 v0.7a biblatex authoryear-ecomp
+ [2020/03/15 v0.8d biblatex authoryear-ecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-ecomp.cbx new/tex/latex/biblatex-ext/ext-authoryear-ecomp.cbx
--- old/tex/latex/biblatex-ext/ext-authoryear-ecomp.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-ecomp.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ecomp.cbx}
- [2019/04/04 v0.7a biblatex authoryear-ecomp
+ [2020/03/15 v0.8d biblatex authoryear-ecomp
citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx new/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx
--- old/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-ibid.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ibid.bbx}
- [2019/04/04 v0.7a extended biblatex authoryear-ibid
+ [2020/03/15 v0.8d extended biblatex authoryear-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx new/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx
--- old/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-ibid.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ibid.cbx}
- [2019/04/04 v0.7a extended biblatex authoryear-ibid
+ [2020/03/15 v0.8d extended biblatex authoryear-ibid
citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
@@ -68,8 +68,8 @@
{\csuse{extblx@citedelim@\blx@delimcontext @inner@close}}
{}}
{\ifbool{cbx:parens}
- {\postnotedelim}
- {\extpostnotedelim
+ {\printdelim{postnotedelim}}
+ {\printdelim{extpostnotedelim}%
\csuse{extblx@citedelim@\blx@delimcontext @inner@open}}%
\printfield{postnote}%
\csuse{extblx@citedelim@\blx@delimcontext @inner@close}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx new/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx
--- old/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-icomp.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-icomp.bbx}
- [2019/04/04 v0.7a extended biblatex authoryear-icomp
+ [2020/03/15 v0.8d extended biblatex authoryear-icomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx new/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx
--- old/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-icomp.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-icomp.cbx}
- [2019/04/04 v0.7a extended biblatex authoryear-icomp
+ [2020/03/15 v0.8d extended biblatex authoryear-icomp
citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-iecomp.bbx new/tex/latex/biblatex-ext/ext-authoryear-iecomp.bbx
--- old/tex/latex/biblatex-ext/ext-authoryear-iecomp.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-iecomp.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-iecomp.bbx}
- [2019/04/04 v0.7a biblatex authoryear-iecomp
+ [2020/03/15 v0.8d biblatex authoryear-iecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-iecomp.cbx new/tex/latex/biblatex-ext/ext-authoryear-iecomp.cbx
--- old/tex/latex/biblatex-ext/ext-authoryear-iecomp.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-iecomp.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-iecomp.cbx}
- [2019/04/04 v0.7a biblatex authoryear-iecomp
+ [2020/03/15 v0.8d biblatex authoryear-iecomp
citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx new/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx
--- old/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-tcomp.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tcomp.bbx}
- [2019/04/04 v0.7a extended biblatex authoryear-tcomp
+ [2020/03/15 v0.8d extended biblatex authoryear-tcomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx new/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx
--- old/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-tcomp.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tcomp.cbx}
- [2019/04/04 v0.7a extended biblatex authoryear-tcomp
+ [2020/03/15 v0.8d extended biblatex authoryear-tcomp
citation style (MW)]
\RequireCitationStyle{ext-authoryear-comp}
@@ -104,10 +104,10 @@
\renewbibmacro*{textcite:postnote}{%
\ifbool{cbx:parens}
- {\setunit{\postnotedelim}}
+ {\setunit{\printdelim{postnotedelim}}}
{\setunit{%
\global\booltrue{cbx:parens}%
- \extpostnotedelim
+ \printdelim{extpostnotedelim}%
\csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}%
\printfield{postnote}%
\ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-tecomp.bbx new/tex/latex/biblatex-ext/ext-authoryear-tecomp.bbx
--- old/tex/latex/biblatex-ext/ext-authoryear-tecomp.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-tecomp.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tecomp.bbx}
- [2019/04/04 v0.7a extended biblatex authoryear-tecomp
+ [2020/03/15 v0.8d extended biblatex authoryear-tecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-tecomp.cbx new/tex/latex/biblatex-ext/ext-authoryear-tecomp.cbx
--- old/tex/latex/biblatex-ext/ext-authoryear-tecomp.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-tecomp.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tecomp.cbx}
- [2019/04/04 v0.7a extended biblatex authoryear-tecomp
+ [2020/03/15 v0.8d extended biblatex authoryear-tecomp
citation style (MW)]
\RequireCitationStyle{ext-authoryear-ecomp}
@@ -122,10 +122,10 @@
\renewbibmacro*{textcite:postnote}{%
\ifbool{cbx:parens}
- {\setunit{\postnotedelim}}
+ {\setunit{\printdelim{postnotedelim}}}
{\setunit{%
\global\booltrue{cbx:parens}%
- \extpostnotedelim
+ \printdelim{extpostnotedelim}%
\csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}%
\printfield{postnote}%
\ifnumequal{\value{multicitecount}}{\value{multicitetotal}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-terse.bbx new/tex/latex/biblatex-ext/ext-authoryear-terse.bbx
--- old/tex/latex/biblatex-ext/ext-authoryear-terse.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-terse.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-terse.bbx}
- [2019/04/04 v0.7a extended biblatex authoryear-terse
+ [2020/03/15 v0.8d extended biblatex authoryear-terse
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-terse.cbx new/tex/latex/biblatex-ext/ext-authoryear-terse.cbx
--- old/tex/latex/biblatex-ext/ext-authoryear-terse.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-terse.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-terse.cbx}
- [2019/04/04 v0.7a extended biblatex authoryear-terse
+ [2020/03/15 v0.8d extended biblatex authoryear-terse
citation style (MW)]
\RequireCitationStyle{ext-authoryear}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx new/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx
--- old/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-ticomp.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ticomp.bbx}
- [2019/04/04 v0.7a extended biblatex authoryear-ticomp
+ [2020/03/15 v0.8d extended biblatex authoryear-ticomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx new/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx
--- old/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-ticomp.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-ticomp.cbx}
- [2019/04/04 v0.7a extended biblatex authoryear-ticomp citation style
+ [2020/03/15 v0.8d extended biblatex authoryear-ticomp citation style
(MW)]
\RequireCitationStyle{ext-authoryear-icomp}
@@ -112,10 +112,10 @@
\renewbibmacro*{textcite:postnote}{%
\ifbool{cbx:parens}
- {\setunit{\postnotedelim}}
+ {\setunit{\printdelim{postnotedelim}}}
{\setunit{%
\global\booltrue{cbx:parens}%
- \extpostnotedelim
+ \printdelim{extpostnotedelim}%
\csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}%
\ifbool{cbx:loccit}
{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-tiecomp.bbx new/tex/latex/biblatex-ext/ext-authoryear-tiecomp.bbx
--- old/tex/latex/biblatex-ext/ext-authoryear-tiecomp.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-tiecomp.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear-tiecomp.bbx}
- [2019/04/04 v0.7a extended biblatex authoryear-tiecomp
+ [2020/03/15 v0.8d extended biblatex authoryear-tiecomp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear-tiecomp.cbx new/tex/latex/biblatex-ext/ext-authoryear-tiecomp.cbx
--- old/tex/latex/biblatex-ext/ext-authoryear-tiecomp.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear-tiecomp.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,8 +1,8 @@
\ProvidesFile{ext-authoryear-tiecomp.cbx}
- [2019/04/04 v0.7a extended biblatex authoryear-tiecomp citation style
+ [2020/03/15 v0.8d extended biblatex authoryear-tiecomp citation style
(MW)]
-\RequireCitationStyle{ext-authoryear-icomp}
+\RequireCitationStyle{ext-authoryear-iecomp}
\ExecuteBibliographyOptions{singletitle, uniquename, uniquelist,
autocite=inline}
@@ -130,10 +130,10 @@
\renewbibmacro*{textcite:postnote}{%
\ifbool{cbx:parens}
- {\setunit{\postnotedelim}}
+ {\setunit{\printdelim{postnotedelim}}}
{\setunit{%
\global\booltrue{cbx:parens}%
- \extpostnotedelim
+ \printdelim{extpostnotedelim}%
\csuse{extblx@citedelim@\blx@delimcontext @inner@open}}}%
\ifbool{cbx:loccit}
{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear.bbx new/tex/latex/biblatex-ext/ext-authoryear.bbx
--- old/tex/latex/biblatex-ext/ext-authoryear.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear.bbx}
- [2019/04/04 v0.7a extended biblatex authoryear bibliography style (MW)]
+ [2020/03/15 v0.8d extended biblatex authoryear bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{authoryear}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-authoryear.cbx new/tex/latex/biblatex-ext/ext-authoryear.cbx
--- old/tex/latex/biblatex-ext/ext-authoryear.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-authoryear.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-authoryear.cbx}
- [2019/04/04 v0.7a extended biblatex authoryear citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex authoryear citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
@@ -60,8 +60,8 @@
{\csuse{extblx@citedelim@\blx@delimcontext @inner@close}}
{}}
{\ifbool{cbx:parens}
- {\setunit{\postnotedelim}}
- {\setunit{\extpostnotedelim
+ {\setunit{\printdelim{postnotedelim}}}
+ {\setunit{\printdelim{extpostnotedelim}%
\csuse{extblx@citedelim@\blx@delimcontext
@inner@open}}}%
\printfield{postnote}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-biblatex-aux.def new/tex/latex/biblatex-ext/ext-biblatex-aux.def
--- old/tex/latex/biblatex-ext/ext-biblatex-aux.def 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-biblatex-aux.def 2020-03-15 22:31:31.000000000 +0100
@@ -1,16 +1,16 @@
\ProvidesFile{ext-biblatex-aux.def}
- [2019/04/04 v0.7a auxiliaries for extended biblatex citation style
+ [2020/03/15 v0.8d auxiliaries for extended biblatex citation style
(MW)]
-\def\extblx(a)requiredbiblatexversion{3.12}
-\def\extblx@requiredbiblatexdate{2018/11/02}
+\def\extblx(a)requiredbiblatexversion{3.14}
+\def\extblx@requiredbiblatexdate{2019/12/01}
-\newrobustcmd*{\extblx@info}{\PackageInfo{biblatex-ext}}
-\newrobustcmd*{\extblx@warning}{\PackageWarning{biblatex-ext}}
-\newrobustcmd*{\extblx@warning@noline}{%
+\protected\def\extblx@info{\PackageInfo{biblatex-ext}}
+\protected\def\extblx@warning{\PackageWarning{biblatex-ext}}
+\protected\def\extblx@warning@noline{%
\PackageWarningNoLine{biblatex-ext}}
-\newrobustcmd*{\extblx(a)error}[2]{\PackageError{biblatex-ext}{#1}{#2.}}
+\protected\def\extblx(a)error#1#2{\PackageError{biblatex-ext}{#1}{#2.}}
\@ifpackagelater{biblatex}{\extblx@requiredbiblatexdate}
{}
@@ -20,15 +20,6 @@
(\extblx@requiredbiblatexdate) or later.\MessageBreak
I found '\csuse{abx@version} (\csuse{abx@date})'}}
-\newrobustcmd*{\extblx@DeclareBTEOption}[2][boolean]{%
- \@ifnextchar[%]
- {\extblx@DeclareBTEOption@i[#1]{#2}}
- {\extblx@DeclareBTEOption@i[#1]{#2}[]}}
-
-\def\extblx@DeclareBTEOption@i[#1]#2[#3]#4{%
- \DeclareBibliographyOption[#1]{#2}[#3]{#4}%
- \DeclareTypeOption[#1]{#2}[#3]{#4}
- \DeclareEntryOption[#1]{#2}[#3]{#4}}
%{<context>}{<opening delim>}{<closing delim>}
\newrobustcmd*{\DeclareOuterCiteDelims}{%
@@ -140,6 +131,7 @@
\def\extblx@thisdelimcontext{footcite}%
#1}}}
+%% Compatibility with older biblatex-ext
% Legacy names
% Compability for versions <= 0.3
@@ -230,6 +222,62 @@
Please use 'bbx@introcite' instead}}%
}
+% Compatibility with older biblatex
+
+% \DeclareBiblatexOption (biblatex 3.13)
+% we emulate \DeclareBiblatexOption only as far as we need it
+% i.e. with scope 'global,type,entry' hard-coded
+% we'll see for how long this is viable
+\ifcsundef{DeclareBiblatexOption}
+ {\newcommand*{\extblx@DeclareBiblatexOption}[1]{%
+ \ifstrequal{#1}{global,type,entry}
+ {\ifundef\extblx@warn@emulate@declarebiblatexoption
+ {\global\let\extblx@warn@emulate@declarebiblatexoption\@empty
+ \extblx@warning@noline{%
+ Using biblatex-ext emulation of\MessageBreak
+ \string\DeclareBiblatexOption\MessageBreak
+ The scope argument 'global,type,entry' is hard-\MessageBreak
+ coded and can't be changed.\MessageBreak
+ Please update to biblatex 3.13 or above.\MessageBreak
+ This warning can be silenced by defining\MessageBreak
+ \string\extblx@warn@emulate@declarebiblatexoption}}
+ {}}
+ {\extblx@error
+ {Emulation of \string\DeclareBiblatexOption\space only%
+ \MessageBreak
+ supports hard-coded scope argument\MessageBreak
+ 'global,type,entry'.\MessageBreak
+ Update to biblatex 3.13 or above to use the real\MessageBreak
+ definition instead of a cheap imitation}
+ {This isn't actually \string\DeclareBiblatexOption,
+ it is only the biblatex-ext\MessageBreak
+ emulation.\MessageBreak
+ The scope 'global,type,entry' is hard-coded and can't be changed.%
+ \MessageBreak
+ If you force compilation despite this error, 'global,type,entry'%
+ \MessageBreak
+ will be assumed.\MessageBreak
+ That may cause further errors or undesirable and unexpected
+ behaviour.\MessageBreak
+ Update to biblatex 3.13 or above to use the real definition%
+ \MessageBreak
+ instead of a cheap imitation.\MessageBreak
+ This emulation may be removed in a future version of biblatex-ext}}%
+ \extblx@DeclareBiblatexOption@i}
+ \newcommand*{\extblx@DeclareBiblatexOption@i}[2][boolean]{%
+ \@ifnextchar[%]
+ {\extblx@DeclareBiblatexOption@ii[#1]{#2}}
+ {\extblx@DeclareBiblatexOption@iii[#1]{#2}}}
+ \def\extblx@DeclareBiblatexOption@ii[#1]#2[#3]#4{%
+ \DeclareBibliographyOption[#1]{#2}[#3]{#4}%
+ \DeclareTypeOption[#1]{#2}[#3]{#4}%
+ \DeclareEntryOption[#1]{#2}[#3]{#4}}
+ \def\extblx@DeclareBiblatexOption@iii[#1]#2#3{%
+ \DeclareBibliographyOption[#1]{#2}{#3}%
+ \DeclareTypeOption[#1]{#2}{#3}%
+ \DeclareEntryOption[#1]{#2}{#3}}%
+ \let\DeclareBiblatexOption\extblx@DeclareBiblatexOption}
+ {}
\endinput
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-dashed-common.bbx new/tex/latex/biblatex-ext/ext-dashed-common.bbx
--- old/tex/latex/biblatex-ext/ext-dashed-common.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-dashed-common.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-dashed-common.bbx}
- [2019/04/04 v0.7a common files for extended biblatex
+ [2020/03/15 v0.8d common files for extended biblatex
dashed bibliography styles (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
@@ -19,7 +19,7 @@
or later}}
{\listcsremove{blx@globalopts@boolean}{dashed}}
-\extblx@DeclareBTEOption[string]{dashed}[true]{%
+\DeclareBiblatexOption{global,type,entry}[string]{dashed}[true]{%
\ifcsdef{extblx@opt@dashed@#1}
{\csuse{extblx@opt@dashed@#1}}
{\extblx@warning@noline{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-numeric-comp.bbx new/tex/latex/biblatex-ext/ext-numeric-comp.bbx
--- old/tex/latex/biblatex-ext/ext-numeric-comp.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-numeric-comp.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-comp.bbx}
- [2019/04/04 v0.7a extended biblatex numeric-comp
+ [2020/03/15 v0.8d extended biblatex numeric-comp
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-numeric-comp.cbx new/tex/latex/biblatex-ext/ext-numeric-comp.cbx
--- old/tex/latex/biblatex-ext/ext-numeric-comp.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-numeric-comp.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-comp.cbx}
- [2019/04/04 v0.7a extended biblatex numeric-comp citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex numeric-comp citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-numeric-verb.bbx new/tex/latex/biblatex-ext/ext-numeric-verb.bbx
--- old/tex/latex/biblatex-ext/ext-numeric-verb.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-numeric-verb.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-verb.bbx}
- [2019/04/04 v0.7a extended biblatex numeric-verb
+ [2020/03/15 v0.8d extended biblatex numeric-verb
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-numeric-verb.cbx new/tex/latex/biblatex-ext/ext-numeric-verb.cbx
--- old/tex/latex/biblatex-ext/ext-numeric-verb.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-numeric-verb.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric-verb.cbx}
- [2019/04/04 v0.7a extended biblatex numeric-verb citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex numeric-verb citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-numeric.bbx new/tex/latex/biblatex-ext/ext-numeric.bbx
--- old/tex/latex/biblatex-ext/ext-numeric.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-numeric.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric.bbx}
- [2019/04/04 v0.7a extended biblatex numeric bibliography style (MW)]
+ [2020/03/15 v0.8d extended biblatex numeric bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{numeric}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-numeric.cbx new/tex/latex/biblatex-ext/ext-numeric.cbx
--- old/tex/latex/biblatex-ext/ext-numeric.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-numeric.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-numeric.cbx}
- [2019/04/04 v0.7a extended biblatex numeric citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex numeric citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-standard.bbx new/tex/latex/biblatex-ext/ext-standard.bbx
--- old/tex/latex/biblatex-ext/ext-standard.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-standard.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,9 +1,9 @@
-% biblatex-ext v0.7a (2019-04-04)
+% biblatex-ext v0.8d (2020-03-15)
% Maintainer: Moritz Wemheuer
% Licence: LaTeX Project Public License v1.3c or later
%
\ProvidesFile{ext-standard.bbx}
- [2019/04/04 v0.7a extended biblatex standard style (MW)]
+ [2020/03/15 v0.8d extended biblatex standard style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
@@ -19,20 +19,20 @@
\newtoggle{bbx:maintitleaftertitle}
\newtoggle{bbx:introcite:plain:keeprelated}
-\extblx@DeclareBTEOption[boolean]{citexref}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{citexref}[true]{%
\settoggle{bbx:citexref}{#1}}
-\extblx@DeclareBTEOption[boolean]{citeinxref}[true]{%
- \blx@warning{The option 'citeinxref' is deprecated.\MessageBreak
+\DeclareBiblatexOption{global,type,entry}[boolean]{citeinxref}[true]{%
+ \extblx@warning{The option 'citeinxref' is deprecated.\MessageBreak
Use 'citexref' (without in) instead.\MessageBreak
Setting 'citexref' now}%
\settoggle{bbx:citexref}{#1}}
-\extblx@DeclareBTEOption[boolean]{innamebeforetitle}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{innamebeforetitle}[true]{%
\settoggle{bbx:innamebeforetitle}{#1}}
-\extblx@DeclareBTEOption[boolean]{innameidem}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{innameidem}[true]{%
\settoggle{bbx:innameidem}{#1}}
-\extblx@DeclareBTEOption[boolean]{articlein}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{articlein}[true]{%
\settoggle{bbx:articlein}{#1}}
-\extblx@DeclareBTEOption[boolean]{maintitleaftertitle}[true]{%
+\DeclareBiblatexOption{global,type,entry}[boolean]{maintitleaftertitle}[true]{%
\settoggle{bbx:maintitleaftertitle}{#1}}
\def\extblx@opt@introcite@false{0}
@@ -97,21 +97,33 @@
\newlength{\introcitesep}
\setlength{\introcitesep}{\biblabelsep}
+\newrobustcmd*{\AtIntrocite}{%
+ \@ifstar
+ {\global\undef\extblx@hook@introcite
+ \gappto\extblx@hook@introcite}
+ {\gappto\extblx@hook@introcite}}
+
+\newcommand*{\extblx@introcite@init}{%
+ \iftoggle{blx@citation}
+ {}
+ {\togglefalse{blx@bibliography}%
+ \toggletrue{blx@citation}}%
+ \delimcontext{bbx@introcite}%
+ \csuse{blx@hook@cite}%
+ \csuse{blx@hook@citekey}%
+ \DeclareFieldFormat{bibhyperref}{##1}%
+ \undef\cbx@lasthash
+ \undef\cbx@lastyear
+ \citetrackerfalse\pagetrackerfalse\backtrackerfalse
+ \defcounter{maxnames}{\blx@maxcitenames}%
+ \defcounter{minnames}{\blx@mincitenames}%
+}
+
+\AtIntrocite{\extblx@introcite@init}
+
\newbibmacro{introcite:typeset}{%
\begingroup
- \iftoggle{blx@citation}
- {}
- {\togglefalse{blx@bibliography}%
- \toggletrue{blx@citation}}%
- \delimcontext{bbx@introcite}%
- \csuse{blx@hook@cite}%
- \csuse{blx@hook@citekey}%
- \DeclareFieldFormat{bibhyperref}{##1}%
- \undef\cbx@lasthash
- \undef\cbx@lastyear
- \citetrackerfalse\pagetrackerfalse\backtrackerfalse
- \defcounter{maxnames}{\blx@maxcitenames}%
- \defcounter{minnames}{\blx@mincitenames}%
+ \csuse{extblx@hook@introcite}%
\printtext[bbx@introcite]{\usebibmacro{bbx:introcite}}%
\endgroup
}
@@ -529,6 +541,47 @@
\usebibmacro{finentry}}
+\DeclareBibliographyDriver{dataset}{%
+ \usebibmacro{introcite:plain}%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor+others/translator+others}%
+ \setunit{\printdelim{nametitledelim}}\newblock
+ \usebibmacro{title}%
+ \newunit
+ \printlist{language}%
+ \newunit\newblock
+ \usebibmacro{byauthor}%
+ \newunit\newblock
+ \usebibmacro{byeditor+others}%
+ \newunit\newblock
+ \printfield{type}%
+ \newunit
+ \usebibmacro{edition}%
+ \newunit
+ \usebibmacro{version}%
+ \newunit\newblock
+ \usebibmacro{series+number}%
+ \newunit\newblock
+ \usebibmacro{note}%
+ \newunit\newblock
+ \printlist{organization}%
+ \newunit
+ \usebibmacro{publisher+location+date}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newunit\newblock
+ \usebibmacro{addendum+pubstate}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}}
+
+
\DeclareBibliographyDriver{manual}{%
\usebibmacro{introcite:plain}%
\usebibmacro{bibindex}%
@@ -596,6 +649,10 @@
\newunit\newblock
\usebibmacro{organization+location+date}%
\newunit\newblock
+ \iftoggle{bbx:doi}
+ {\printfield{doi}}
+ {}%
+ \newunit\newblock
\iftoggle{bbx:eprint}
{\usebibmacro{eprint}}
{}%
@@ -1043,7 +1100,7 @@
\newcommand*{\jourvoldelim}{\addspace}
\newcommand*{\jourserdelim}{\newunitpunct}
-\newcommand*{\servoldelim}{\addspace}
+\newcommand*{\servoldelim}{\jourvoldelim}
\newcommand*{\volnumdatedelim}{\addspace}
\renewbibmacro*{journal+issuetitle}{%
@@ -1208,7 +1265,7 @@
\endinput
-% Copyright 2017-2019 Moritz Wemheuer
+% Copyright 2017-2020 Moritz Wemheuer
%
% This work consists of the `.bbx`, `.cbx`, `.def`, `.sty` and `.lua`
% files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-verbose-ibid.bbx new/tex/latex/biblatex-ext/ext-verbose-ibid.bbx
--- old/tex/latex/biblatex-ext/ext-verbose-ibid.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-verbose-ibid.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-ibid.bbx}
- [2019/04/04 v0.7a extended biblatex verbose-ibid
+ [2020/03/15 v0.8d extended biblatex verbose-ibid
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-verbose-ibid.cbx new/tex/latex/biblatex-ext/ext-verbose-ibid.cbx
--- old/tex/latex/biblatex-ext/ext-verbose-ibid.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-verbose-ibid.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-ibid.cbx}
- [2019/04/04 v0.7a extended biblatex verbose-ibid citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex verbose-ibid citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-verbose-inote.bbx new/tex/latex/biblatex-ext/ext-verbose-inote.bbx
--- old/tex/latex/biblatex-ext/ext-verbose-inote.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-verbose-inote.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-inote.bbx}
- [2019/04/04 v0.7a extended biblatex verbose-inote
+ [2020/03/15 v0.8d extended biblatex verbose-inote
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-verbose-inote.cbx new/tex/latex/biblatex-ext/ext-verbose-inote.cbx
--- old/tex/latex/biblatex-ext/ext-verbose-inote.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-verbose-inote.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-inote.cbx}
- [2019/04/04 v0.7a extended biblatex verbose-inote citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex verbose-inote citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-verbose-note.bbx new/tex/latex/biblatex-ext/ext-verbose-note.bbx
--- old/tex/latex/biblatex-ext/ext-verbose-note.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-verbose-note.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-note.bbx}
- [2019/04/04 v0.7a extended biblatex verbose-note
+ [2020/03/15 v0.8d extended biblatex verbose-note
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-verbose-note.cbx new/tex/latex/biblatex-ext/ext-verbose-note.cbx
--- old/tex/latex/biblatex-ext/ext-verbose-note.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-verbose-note.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-note.cbx}
- [2019/04/04 v0.7a extended biblatex verbose-note citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex verbose-note citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-verbose-trad1.bbx new/tex/latex/biblatex-ext/ext-verbose-trad1.bbx
--- old/tex/latex/biblatex-ext/ext-verbose-trad1.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-verbose-trad1.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad1.bbx}
- [2019/04/04 v0.7a extended biblatex verbose-trad1
+ [2020/03/15 v0.8d extended biblatex verbose-trad1
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-verbose-trad1.cbx new/tex/latex/biblatex-ext/ext-verbose-trad1.cbx
--- old/tex/latex/biblatex-ext/ext-verbose-trad1.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-verbose-trad1.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad1.cbx}
- [2019/04/04 v0.7a extended biblatex verbose-trad1 citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex verbose-trad1 citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-verbose-trad2.bbx new/tex/latex/biblatex-ext/ext-verbose-trad2.bbx
--- old/tex/latex/biblatex-ext/ext-verbose-trad2.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-verbose-trad2.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,14 +1,10 @@
\ProvidesFile{ext-verbose-trad2.bbx}
- [2019/04/04 v0.7a extended biblatex verbose-trad2
+ [2020/03/15 v0.8d extended biblatex verbose-trad2
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
\RequireBibliographyStyle{verbose-trad2}
-\ExecuteBibliographyOptions{
- inxref=false,
-}
-
\endinput
%
% This file is part of the biblatex-ext bundle.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-verbose-trad2.cbx new/tex/latex/biblatex-ext/ext-verbose-trad2.cbx
--- old/tex/latex/biblatex-ext/ext-verbose-trad2.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-verbose-trad2.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad2.cbx}
- [2019/04/04 v0.7a extended biblatex verbose-trad2 citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex verbose-trad2 citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-verbose-trad3.bbx new/tex/latex/biblatex-ext/ext-verbose-trad3.bbx
--- old/tex/latex/biblatex-ext/ext-verbose-trad3.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-verbose-trad3.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad3.bbx}
- [2019/04/04 v0.7a extended biblatex verbose-trad3
+ [2020/03/15 v0.8d extended biblatex verbose-trad3
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-verbose-trad3.cbx new/tex/latex/biblatex-ext/ext-verbose-trad3.cbx
--- old/tex/latex/biblatex-ext/ext-verbose-trad3.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-verbose-trad3.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose-trad3.cbx}
- [2019/04/04 v0.7a extended biblatex verbose-trad3 citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex verbose-trad3 citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-verbose.bbx new/tex/latex/biblatex-ext/ext-verbose.bbx
--- old/tex/latex/biblatex-ext/ext-verbose.bbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-verbose.bbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose.bbx}
- [2019/04/04 v0.7a extended biblatex verbose
+ [2020/03/15 v0.8d extended biblatex verbose
bibliography style (MW)]
\RequireBibliographyStyle{ext-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ext/ext-verbose.cbx new/tex/latex/biblatex-ext/ext-verbose.cbx
--- old/tex/latex/biblatex-ext/ext-verbose.cbx 2019-04-04 22:56:06.000000000 +0200
+++ new/tex/latex/biblatex-ext/ext-verbose.cbx 2020-03-15 22:31:31.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{ext-verbose.cbx}
- [2019/04/04 v0.7a extended biblatex verbose citation style (MW)]
+ [2020/03/15 v0.8d extended biblatex verbose citation style (MW)]
\blx(a)inputonce{ext-biblatex-aux.def}{auxiliary code for ext-biblatex}
{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-ext.tlpobj new/tlpkg/tlpobj/biblatex-ext.tlpobj
--- old/tlpkg/tlpobj/biblatex-ext.tlpobj 2019-04-06 23:32:27.000000000 +0200
+++ new/tlpkg/tlpobj/biblatex-ext.tlpobj 2020-03-16 02:21:15.000000000 +0100
@@ -1,6 +1,6 @@
name biblatex-ext
category Package
-revision 50759
+revision 54327
shortdesc Extended BibLaTeX standard styles
relocated 1
longdesc The BibLaTeX-ext bundle provides styles that slightly extend
@@ -86,7 +86,6 @@
catalogue-contact-bugs https://github.com/moewew/biblatex-ext/issues
catalogue-contact-home https://github.com/moewew/biblatex-ext
catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-ext
-catalogue-date 2019-04-04 14:55:48 +0200
catalogue-license lppl1.3c
catalogue-topics biblatex
-catalogue-version 0.7a
+catalogue-version 0.8d
++++++ biblatex-gb7714-2015.doc.tar.xz ++++++
++++ 3764 lines of diff (skipped)
++++++ biblatex-gb7714-2015.tar.xz ++++++
++++ 3256 lines of diff (skipped)
++++++ biblatex-gost.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-gost/biblatex-gost-examples.bib new/doc/latex/biblatex-gost/biblatex-gost-examples.bib
--- old/doc/latex/biblatex-gost/biblatex-gost-examples.bib 2017-02-17 01:23:24.000000000 +0100
+++ new/doc/latex/biblatex-gost/biblatex-gost-examples.bib 2020-02-24 15:28:54.000000000 +0100
@@ -52,7 +52,7 @@
ids = {lakatos_do},
author = { },
translator = {. . },
- title = { . },
+ title = { . {} },
shorttitle = { },
year = 1967,
publisher = {},
@@ -152,7 +152,7 @@
@Book{jones-fogelin:tcqd,
ids = {jones-fogelin_tcqd},
- title = {The Twentieth Century to Quine and Derrida},
+ title = {The Twentieth Century to {Quine} and {Derrida}},
author = {Jones, W. T. and Fogelin, R. J.},
isbn = 9780155003798,
lccn = 96078916,
@@ -217,7 +217,7 @@
@Book{durkheim:spmp,
ids = {durkheim_spmp},
- title = {. , , },
+ title = {. {} , , },
author = {, .},
isbn = 9785275018202,
year = 2008,
@@ -256,8 +256,8 @@
@Book{marcuse:ecoc,
ids = {marcuse_ecoc},
- title = { . :
- },
+ title = { . {} },
+ subtitle = { },
shorttitle = { . },
author = { },
translator = {, . .},
@@ -330,7 +330,8 @@
ids = {kristeva_it},
author = { },
translator = {. . and . . },
- title = { : },
+ title = { },
+ subtitle = { },
shorttitle = { },
year = 2004,
publisher = { ()},
@@ -383,6 +384,19 @@
langid = {russian},
}
+@COLLECTION{semiotika2ed,
+ title = {. },
+ editor = {, . .},
+ editortype = {compiler},
+ edition = {2-, . .},
+ year = 2001,
+ publisher = { ; : },
+ pagetotal = 702,
+ location = {.},
+ language = {russian},
+ langid = {russian},
+}
+
@InCollection{barthes:os,
ids = {barthes_os},
crossref = {szp},
@@ -565,7 +579,7 @@
ids = {barthes_ir},
author = { },
title = { },
- subtitle = {. },
+ subtitle = {. {}},
_credits = {., . . . . . . },
editor = {. . },
editortype = {gecompiler},
@@ -604,7 +618,7 @@
crossref = {derrida:gf},
author = { },
translator = {. . },
- title = { : },
+ title = { : {}},
year = 1999,
pages = {9--137},
origlanguage = {french},
@@ -684,7 +698,7 @@
crossref = {james:vv-book},
author = {, .},
title = {},
- subtitle = { .
+ subtitle = { . {}
},
origtitle = {Pragmatism},
origyear = 1907,
@@ -789,10 +803,10 @@
@Book{brentano:msa,
ids = {brentano_msa},
author = {, },
- title = { },
+ title = { {}},
isbn = {978-5-900291-30-7},
year = 2012,
- pagetotal = {LXIV, 247},
+ pagetotal = {LXIV, 247 .},
publisher = {- - },
location = {.},
credits = {. . . ~; . . . ~;
@@ -837,7 +851,7 @@
@Book{althusser:zm,
ids = {althusser_zm},
author = { },
- title = { },
+ title = { {}},
year = 2006,
publisher = {},
location = {.},
@@ -902,8 +916,8 @@
editor = {. . },
editortype = {geneditor},
afterword = {. . },
- title = { . .
- . . },
+ title = {{} {}. . {}
+ {}. {}. {}},
location = {.},
publisher = { },
year = 2002,
@@ -935,7 +949,7 @@
ids = {motroshilova_dzh},
crossref = {fmh},
author = {, . .},
- title = { , },
+ title = { , {} {}},
year = 1991,
pages = {3---52},
language = {russian},
@@ -945,7 +959,7 @@
@Collection{fmh,
editor = {, . .},
_editortype = {. .},
- title = { },
+ title = { {} {} },
location = {.},
publisher = {},
year = 1991,
@@ -1025,7 +1039,7 @@
ids = {husserl_ideen2005},
crossref = {husserl:ir},
author = { },
- title = { . I},
+ title = { . {} I},
pages = {241-282},
year = 2005,
translator = {. . },
@@ -1209,7 +1223,7 @@
author = {John Austin},
editor = {J. O. Urmson},
title = {How to do Things with Words},
- subtitle = {The William James Lectures delivered at Harvard University in 1955},
+ subtitle = {The {William} {James} Lectures delivered at {Harvard} {University} in 1955},
location = {Oxford},
publisher = {Clarendon},
year = 1962,
@@ -1238,11 +1252,9 @@
}
@Collection{alm,
- title = {Autour de \emph{Logiques des mondes d'Alain Badiou}},
+ title = {Autour de \emph{{Logiques} des mondes d'{Alain} {Badiou}}},
editor = {Rabouin, D. and Feltham, O. and Lincoln, L.},
isbn = 9782813000248,
- eprint = {yJfh4V-iLskC},
- eprinttype = {googlebooks},
year = 2011,
pagetotal = 182,
location = {Paris},
@@ -1319,7 +1331,7 @@
@Collection{fe,
editor = { . },
- title = { . Erkenntnis (). },
+ title = { . {Erkenntnis} ({}). {}},
location = {.},
publisher = {-, + },
year = 2010,
@@ -1903,7 +1915,6 @@
author = {Preston, Aaron},
isbn = 9781441131966,
series = {Bloomsbury Studies in Philosophy},
- url = {http://books.google.ru/books?id=p96pelDACZcC},
year = 2010,
pagetotal = 208,
publisher = {CONTINUUM},
@@ -1939,6 +1950,19 @@
langid = {russian},
}
+@INBOOK{frege:mli,
+ crossref = {frege:lls},
+ author = {, },
+ title = {. },
+ pages = {326-342},
+ year = 2000,
+ origyear = 1919,
+ origtitle = {Der Gedanke. Eine logische Untersuchung},
+ origlanguage = {german},
+ language = {russian},
+ langid = {russian},
+}
+
@InBook{frege:ip,
crossref = {frege:lls},
author = {, },
@@ -2472,7 +2496,7 @@
}
@Book{Pluth:bpn,
- title = {Badiou: A Philosophy of the New},
+ title = {{Badiou}: A Philosophy of the New},
series = {Key Contemporary Thinkers},
author = {Ed Pluth},
publisher = {Polity},
@@ -3616,10 +3640,12 @@
title = {Logiques des mondes},
year = 2006,
_volume = 2,
- subtitle = {L'tre et l'vnement, 2},
+ subtitle = {L'\/tre et l'\/vnement, 2},
language = {french},
publisher = {Seuil},
location = {P.},
+ pagetotal = 638,
+ series = {Collection L'\/Ordre philosophique},
isbn = {978-2-02-084324-9},
langid = {french},
_shorttitle = {L'tre et l'vnement},
@@ -3657,11 +3683,13 @@
@Book{badiou:ee,
ids = {badiou_ee},
author = {Badiou, Alain},
- title = {L'tre et l'vnement},
+ title = {L'\/tre et l'\/vnement},
year = 1988,
language = {french},
publisher = {Seuil},
location = {P.},
+ pagetotal = 560,
+ series = {Collection L'\/Ordre philosophique},
isbn = 2020098628,
langid = {french},
shorttitle = {L'tre et l'vnement},
@@ -3878,7 +3906,7 @@
editor = {A. J. Bartlett and Justin Clemens},
introduction = {A. J. Bartlett and Justin Clemens},
afterword = {A. J. Bartlett and Justin Clemens},
- title = {Alain Badiou},
+ title = {Alain {Badiou}},
subtitle = {Key Concepts},
year = 2010,
publisher = {Acumen},
@@ -4402,7 +4430,7 @@
@Article{osullivan:sts,
ids = {osullivan_sts},
author = {O'Sullivan, Simon},
- title = {The strange temporality of the subject: Badiou and Deleuze between the
+ title = {The strange temporality of the subject: {Badiou} and Deleuze between the
finite and the infinite},
journaltitle = {Subjectivity},
date = {2009-07},
@@ -4543,7 +4571,7 @@
langid = {russian},
}
-@MVBook{arist:soch,
+@MVBOOK{aristotle:soch,
ids = {arist_soch},
author = {},
title = { 4-~.},
@@ -4554,6 +4582,62 @@
langid = {russian},
}
+@BOOK{aristotle:soch-1,
+ crossref = {aristotle:soch},
+ author = {},
+ volume = 1,
+ editor = {. . },
+ date = {1976},
+ language = {russian},
+ langid = {russian},
+}
+
+@BOOK{aristotle:soch-2,
+ crossref = {aristotle:soch},
+ author = {},
+ volume = 2,
+ editor = {. . },
+ date = {1978},
+ language = {russian},
+ langid = {russian},
+}
+
+@BOOK{aristotle:soch-4,
+ crossref = {aristotle:soch},
+ author = {},
+ volume = 4,
+ credits = {. .; . . . . .},
+ date = {1983},
+ pagetotal = 830,
+ language = {russian},
+ langid = {russian},
+}
+
+@INBOOK{aristotle:metaphysica-soch,
+ crossref = {aristotle:soch-1},
+ author = {},
+ title = {},
+ credits = {. . . , . . },
+ date = {1976},
+ pages = {64-368},
+ language = {russian},
+ langid = {russian},
+}
+
+@INBOOK{aristotle:oso,
+ crossref = {aristotle:soch-2},
+ title = { },
+ date = 1978,
+ pages = {533--593},
+ langid = {russian},
+}
+
+@INBOOK{aristotle:od,
+ crossref = {aristotle:soch-1},
+ title = { },
+ pages = {369--447},
+ langid = {russian},
+}
@Book{badiou:deleuze,
ids = {badiou_deleuze},
author = {, },
@@ -5298,8 +5382,8 @@
translator = {. . },
language = {russian},
origlanguage = {german},
- publisher = { - },
- location = {-},
+ publisher = { "= },
+ location = {"=},
isbn = {5-900291-19-7},
langid = {russian},
}
@@ -5733,7 +5817,7 @@
langid = {english},
}
-(a)Periodical{critical_inquiry2011.37.4,
+(a)PERIODICAL{critical-inquiry2011.37.4,
year = 2011,
title = {Critical Inquiry},
language = {english},
@@ -5743,8 +5827,8 @@
issue = {Summer},
}
-@Article{nirenberg_nirenberg:bn,
- crossref = {critical_inquiry2011.37.4},
+@ARTICLE{nirenberg:nirenberg:bn,
+ crossref = {critical-inquiry2011.37.4},
author = {Ricardo L. Nirenberg and David Nirenberg},
title = {Badiou's Number},
subtitle = {A Critique of Mathematics as Ontology},
@@ -5758,7 +5842,7 @@
_urldate = {2012-08-27},
}
-@Collection{it_ft,
+@COLLECTION{it-ft,
title = { },
subtitle = { },
location = {},
@@ -5768,7 +5852,7 @@
langid = {russian},
}
-@Collection{it_ntp,
+@COLLECTION{it-ntp,
title = { },
subtitle = { },
location = {},
@@ -5788,8 +5872,6 @@
year = 2010,
pagetotal = 168,
isbn = 9785757703527,
- eprint = {ncSYkgEACAAJ},
- eprinttype = {googlebooks},
language = {russian},
langid = {russian},
}
@@ -5823,8 +5905,8 @@
@Article{veilahti:abm,
author = {Antti Veilahti},
- title = {Alain Badiou's Mistake~--- Two Postulates of Dialectic Materialism},
- shorttitle = {Alain Badiou's Mistake},
+ title = {Alain {Badiou}'s Mistake~--- Two Postulates of Dialectic Materialism},
+ shorttitle = {Alain {Badiou}'s Mistake},
date = {2013-01-10},
eprinttype = {arXiv},
eprint = {1301.1203v2},
@@ -5952,8 +6034,6 @@
isbn = 9783764375249,
lccn = 2007920230,
series = {Science Networks. Historical Studies, 32},
- eprinttype = {googlebook},
- eprint = {nVVsp3\_Jw0sC},
year = 2007,
publisher = {Birkh{\"a}user},
location = {Basel and Boston and Berlin},
@@ -5970,8 +6050,6 @@
pagetotal = 91,
language = {german},
langid = {german},
- eprint = {http://books.google.ru/books?id=9HoIAQAAIAAJ},
- eprinttype = {googlebooks},
}
@InBook{heidegger:psz,
@@ -5987,7 +6065,7 @@
@Article{plotnitsky:ewo,
author = {Plotnitsky, Arkady},
title = {Experimenting with ontologies},
- subtitle = {sets, spaces, and topoi with Badiou and Grothendieck},
+ subtitle = {sets, spaces, and topoi with {Badiou} and Grothendieck},
shorttitle = {Experimenting with ontologies},
volume = 30,
doi = {10.1068/d6610},
@@ -6073,8 +6151,6 @@
title = {Bergson and Philosophy},
author = {Mullarkey, John},
isbn = 9780748609574,
- eprint = {mcQ0A8gRu1cC},
- eprinttype = {googlebooks},
year = 1999,
publisher = {Edinburgh University Press},
pagetotal = 206,
@@ -6151,8 +6227,6 @@
author = {Moran, Dermot},
isbn = 9780203196632,
lccn = 16008648,
- eprint = {ouELk-xPkGQC},
- eprinttype = {googlebooks},
year = 2002,
publisher = {Taylor \& Francis},
pagetotal = 592,
@@ -6165,8 +6239,6 @@
author = {Gander, H.H.},
isbn = 9783534164936,
lccn = 2010395262,
- eprint = {PZNlPgAACAAJ},
- eprinttype = {googlebooks},
year = 2010,
publisher = {WBG, Wissenschaftliche Buchgesellschaft},
language = {german},
@@ -6184,8 +6256,6 @@
lccn = 96010139,
series = {Marquette studies in philosophy},
number = 10,
- eprint = {6-jaAAAAMAAJ},
- eprinttype = {googlebooks},
year = 1996,
publisher = {Marquette University Press},
language = {english},
@@ -6652,6 +6722,7 @@
origyear = 1979,
location = {},
publisher = {- . -},
+ pagetotal = {XIX, 297~.},
isbn = {5-7615-0404-9},
origlanguage = {english},
language = {russian},
@@ -7306,7 +7377,7 @@
origlanguage = {french},
language = {russian},
langid = {russian},
- number = {\bibstring{number}~5, 6},
+ number = {5, 6},
pages = {102-114},
}
@@ -7501,8 +7572,6 @@
author = {Baudrillard, Jean},
isbn = 9782718603957,
lccn = 91186846,
- eprint = {u95oQgAACAAJ},
- eprinttype = {googlebooks},
year = 1991,
publisher = {Galile},
location = {P.},
@@ -7536,13 +7605,13 @@
}
@InBook{aristotle:ne,
- crossref = {arist:soch},
+ crossref = {aristotle:soch-4},
author = {},
translator = {. . },
title = { },
year = 1983,
pages = {53-293},
- origlanguage = {greek},
+ _origlanguage = {greek},
language = {russian},
langid = {russian},
}
@@ -7706,11 +7775,13 @@
@Book{whitehead:icp,
author = {A. N. Whitehead},
- title = {An Inquiry Concerning the Principles of Natural Knowledge},
+ title = {An Inquiry Concerning the Principles of Natural
+ Knowledge},
year = 1919,
+ pagetotal = 216,
language = {english},
langid = {english},
- publisher = {Camb. Univ. Press},
+ publisher = {Cambridge University Press},
location = {Cambridge}
}
@@ -7720,7 +7791,7 @@
year = 1920,
language = {english},
langid = {english},
- publisher = {Camb. Univ. Press},
+ publisher = {Cambridge University Press},
location = {Cambridge},
url = {http://www.gutenberg.org/files/18835/18835-h/18835-h.htm},
}
@@ -7888,7 +7959,7 @@
@Article{shiver:hdys,
author = {Anthony Shiver},
- title = {How do you say everything is ultimately composed of atoms?},
+ title = {How do you say `everything is ultimately composed of atoms?},
journaltitle = {Philosophical Studies},
year = 2015,
language = {english},
@@ -7899,7 +7970,7 @@
doi = {10.1007/s11098-014-0321-0},
}
-@MVBook{russell_whitehead:pm,
+@MVBook{russell:whitehead:pm,
author = {Russell, Bertrand and Whitehead, Alfred North},
title = {Principia Mathematica},
date = {1910/1913},
@@ -7917,8 +7988,6 @@
author = {Roy T. Cook},
pagetotal = 208,
isbn = 9780191648380,
- eprint = {DGeVAwAAQBAJ},
- eprinttype = {googlebooks},
year = 2014,
publisher = {OUP Oxford},
language = {english},
@@ -7983,7 +8052,6 @@
editor = {Norman Madarasz},
introduction = {Norman Madarasz},
isbn = {978-0-7914-6803-6},
- url = {https://books.google.ru/books?id=7HNkAT\_NFksC},
publisher = {SUNY Press},
location = {NY},
pagetotal = 190,
@@ -7997,7 +8065,7 @@
@Book{badiou:ctot,
author = {Badiou, Alain},
title = {Court trait d'ontologie transitoire},
- series = {Ordre philosophique},
+ series = {Collection L'\/Ordre philosophique},
year = 1998,
publisher = {Seuil},
location = {P.},
@@ -8013,6 +8081,7 @@
publisher = {Bradford Books/The MIT Press},
location = {Cambridge, Mass.},
year = 1986,
+ pagetotal = 195,
language = {english},
langid = {english},
}
@@ -9050,8 +9119,6 @@
author = {Fitting, Melvin},
title = {Intuitionistic logic, model theory and forcing},
series = {Studies in logic and the foundations of mathematics},
- eprint = {KLZLAAAAMAAJ},
- eprinttype = {googlebooks},
year = 1969,
publisher = {North-Holland Pub. Co.},
location = {Amsterdam and London},
@@ -9091,8 +9158,8 @@
@Article{weyl:ml,
author = {Weyl, Hermann},
title = {Mathematics and logic},
- subtitle = { A brief survey serving as a preface to a review of The Philosophy of
- Bertrand Russell},
+ subtitle = {A brief survey serving as a preface to a review of ``The Philosophy of
+ Bertrand Russell''},
journal = {Amer. math, monthly},
year = 1946,
volume = 53,
@@ -9186,8 +9253,8 @@
independence results, and derived rules) are obtained for such systems},
}
-@Book{htt,
- shorthand = {HoTT},
+@Book{hott-book,
+ _shorthand = {HoTT},
author = {{Univalent Foundations Program, The}},
title = {Homotopy Type Theory},
subtitle = {Univalent Foundations of Mathematics},
@@ -9195,6 +9262,7 @@
publisher = {\url{http://homotopytypetheory.org/book}},
location = {Institute for Advanced Study},
year = 2013,
+ pagetotal = 589,
language = {english},
langid = {english},
}
@@ -9331,7 +9399,7 @@
series = {Grundlehren Der Mathematischen Wissenschaften},
number = 279,
publisher = {Springer-Verlag},
- location = {Berlin Heidelberg NewYork Tokyo},
+ location = {Berlin Heidelberg},
pagetotal = 477
}
@@ -9485,10 +9553,11 @@
subtitle = {Notes by Giovanni Sambin of a series of lectures given in Padua, June
1980},
author = {Per Martin-Lf},
- publisher = {Biliopolis},
+ publisher = {Bibliopolis},
location = {Napoli},
isbn = {88-7088-105-9},
year = 1984,
+ pagetotal = 91,
language = {english},
langid = {english},
series = {Studies in Proof Theory},
@@ -9508,7 +9577,7 @@
@Article{hovda:wcm,
author = {Paul Hovda},
title = {What is Classical Mereology?},
- journaltitle = {J. Philos. Logic},
+ journaltitle = {Journal of Philosophical Logic},
year = 2009,
language = {english},
volume = 38,
@@ -9526,6 +9595,7 @@
publisher = {Birkhuser},
series = {Frontiers in Mathematics},
location = {Basel},
+ pagetotal = 420,
language = {english},
langid = {english},
doi = {10.1007/978-3-0348-0154-6},
@@ -9617,6 +9687,7 @@
pages = {185--217},
language = {french},
langid = {french},
+ url = {http://library.msri.org/books/sga/sga/4-1/4-1t_185.html},
}
@Article{shulman:stct,
@@ -9655,7 +9726,7 @@
}
@InCollection{lawvere:etcc,
- author = {F. W. Lawvere},
+ author = {F. William Lawvere},
title = {The Category of Categories as a Foundation for Mathematics},
year = 1966,
booktitle = {Proceedings of the Conference on Categorical Algebra - La Jolla 1965},
@@ -9703,6 +9774,7 @@
volume = 165,
language = {english},
langid = {english},
+ doi = {10.1016/j.apal.2013.06.004}
}
@Article{marquis:ctf,
@@ -9789,7 +9861,10 @@
year = 2003,
language = {english},
langid = {english},
- doi = {10.2307/3109884},
+ doi = {10.2178/bsl/1058448677},
+ eprinttype = {arxiv},
+ eprintclass = {math.LO},
+ eprint = {math/0305282},
issn = 10798986,
abstract = {Following F. William Lawvere, we show that many self-referential
paradoxes, incompleteness theorems and fixed point theorems fall out of
@@ -9806,6 +9881,7 @@
location = {Cambridge},
isbn = {0-521-55830-1},
year = 1995,
+ pagetotal = 123,
series = {London Mathematical Society Lecture Note Series},
number = 220,
language = {english},
@@ -9924,6 +10000,7 @@
commentary},
year = 1969,
pages = {134-145},
+ doi = "10.1007/BFb0080769",
language = {english},
langid = {english},
}
@@ -9931,9 +10008,10 @@
@Proceedings{ctht2,
title = {Category Theory, Homology Theory and their Applications II},
titleaddon = {Proceedings of the Conference held at the Seattle Research Center of the
- Battelle Memorial Institute, June 24 - July 19,1968 Volume Two},
+ Battelle Memorial Institute, June~24--July~19, 1968 Volume Two},
editor = {Michael Barr (auth.)},
publisher = {Springer-Verlag Berlin Heidelberg},
+ location = {Berlin, Heidelberg},
year = 1969,
series = {Lecture Notes in Mathematics},
number = 92,
@@ -9998,7 +10076,7 @@
}
@Article{lawvere:af,
- author = {Lawvere, F. W.},
+ author = {F. William Lawvere},
title = {Adjointness in Foundations},
journaltitle = {Dialectica},
year = 1969,
@@ -10026,13 +10104,13 @@
note = "Towards Computer Aided Mathematics",
issn = "1570-8683",
doi = "http://dx.doi.org/10.1016/j.jal.2005.10.011",
- abstract = "This paper presents Automath encodings (which are also valid in
- LF/lambdaP) of various kinds of foundations of mathematics. Then it
- compares these encodings according to their size, to find out which
- foundation is the simplest. The systems analyzed in this way are two
- kinds of set theory (ZFC and NF), two systems based on Church's higher
- order logic (Isabelle/Pure and HOL), three kinds of type theory (the
- calculus of constructions, Luo's extended calculus of constructions, and
+ abstract = "This paper presents Automath encodings (which are also valid in LF/lambdaP)
+ of various kinds of foundations of mathematics. Then it compares these
+ encodings according to their size, to find out which foundation is the
+ simplest. The systems analyzed in this way are two kinds of set theory
+ (ZFC and NF), two systems based on Church's higher order logic
+ (Isabelle/Pure and HOL), three kinds of type theory (the calculus of
+ constructions, Luo's extended calculus of constructions, and
Martin-Lf's predicative type theory) and one foundation based on
category theory. The conclusions of this paper are that the simplest
system is type theory (the calculus of constructions), but that type
@@ -10098,6 +10176,19 @@
year = 1989,
language = {english},
langid = {english},
+ abstract = {In this paper, we show that non-well-founded sets can be defined
+ constructively by formalizing Hallns' limit definition of these within
+ Martin-Lf's theory of types. A system is a type W together with an
+ assignment of U and W to each W. We show that for any
+ system W we can define an equivalence relation =<sub>w</sub> such that
+ =<sub>w</sub> U and =<sub>w</sub> is the maximal
+ bisimulation. Aczel's proof that CZF can be interpreted in the type V of
+ iterative sets shows that if the system W satisfies an additional
+ condition (*), then we can interpret CZF minus the set induction scheme
+ in W. W is then extended to a complete system W<sup>*</sup> by taking
+ limits of approximation chains. We show that in W<sup>*</sup> the
+ antifoundation axiom AFA holds as well as the axioms of
+ CFZ<sup>-</sup>.},
}
@Book{jech:st2006,
@@ -10115,7 +10206,7 @@
@Book{fraenkel-bar-hillel-levy:fst,
title = {Foundations of set theory},
- author = {A.A. Fraenkel and Y. Bar\-Hillel and A. Levy},
+ author = {A.A. Fraenkel and Y. Bar-Hillel and A. Levy},
publisher = {Noord-Hollandsche U.M},
isbn = {0720422701,9780720422702,9780080887050},
year = 1973,
Binary files old/doc/latex/biblatex-gost/biblatex-gost-examples.pdf and new/doc/latex/biblatex-gost/biblatex-gost-examples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-gost/biblatex-gost-examples.tex new/doc/latex/biblatex-gost/biblatex-gost-examples.tex
--- old/doc/latex/biblatex-gost/biblatex-gost-examples.tex 2017-02-06 00:18:52.000000000 +0100
+++ new/doc/latex/biblatex-gost/biblatex-gost-examples.tex 2020-02-24 15:28:54.000000000 +0100
@@ -1,7 +1,15 @@
\documentclass[a4paper,10pt]{article}
\usepackage[margin=2cm]{geometry}
-\usepackage[T1,T2A]{fontenc}
-\usepackage[utf8]{inputenx}
+\usepackage{fontspec}
+\defaultfontfeatures{%Mapping=tex-text,
+ Ligatures=TeX,
+ % Scale=MatchLowercase,
+}
+\usepackage{luatexbase}
+\setmainfont{CMU Serif}
+\setsansfont{CMU Sans Serif}
+\setmonofont{CMU Typewriter Text}
+
\usepackage[british,american,spanish,greek,french,german,polish,english,russian]{babel}
\usepackage{csquotes}
\usepackage{multicol}
Binary files old/doc/latex/biblatex-gost/biblatex-gost.pdf and new/doc/latex/biblatex-gost/biblatex-gost.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-gost/biblatex-gost.tex new/doc/latex/biblatex-gost/biblatex-gost.tex
--- old/doc/latex/biblatex-gost/biblatex-gost.tex 2018-02-22 00:36:43.000000000 +0100
+++ new/doc/latex/biblatex-gost/biblatex-gost.tex 2020-02-24 15:28:54.000000000 +0100
@@ -1,11 +1,11 @@
% -*- mode: LaTeX; coding: utf-8; fill-column: 80 -*-
-\input glyphtounicode.tex %these three lines are
-\input glyphtounicode-cmr.tex %needed for russian search/copy
-\pdfgentounicode=1 %(cmap)
\documentclass[10pt,a4paper,headings=small,numbers=enddot,english,russian]{ltxdockit}
\usepackage[vscale=0.8,hdivide={0.2\paperwidth,*,0.1\paperwidth}]{geometry}
-\usepackage[T1,T2A]{fontenc}
-\usepackage[utf8]{inputenc}
+\RequirePackage{fontspec}
+\RequirePackage{luatexbase}
+\setmainfont{PT Serif}
+\setsansfont{PT Sans}
+\setmonofont{PT Mono}
\usepackage{btxdockit}
\usepackage{babel}
\usepackage[strict]{csquotes}
@@ -20,7 +20,6 @@
bibstyle=gost-standard,
]{biblatex} % to receive \bbx@gost@version, etc.
\usepackage{indentfirst}
-\usepackage{paratype}
\usepackage{wrapfig}
\usepackage[labelsep=period,hypcap=true]{caption}
\DeclareCaptionLabelFormat{continued}{#1~#2 ()}
@@ -42,8 +41,8 @@
{http://mirror.ctan.org/macros/latex/contrib/biblatex-contrib/biblatex-gost/}
\makeatletter
-\usepackage{datetime}
-\def\blx@gost@printdateTeX#1/#2/#3//{\formatdate{#3}{#2}{#1}}
+\usepackage[useregional]{datetime2}
+\def\blx@gost@printdateTeX#1/#2/#3//{\DTMdisplaydate{#1}{#2}{#3}{-1}}
\newcommand*{\printdateTeX}[1]{\expandafter\blx@gost@printdateTeX#1//}
\titlepage{%
@@ -183,10 +182,10 @@
\biblatexgost \makeatletter\bbx@gost@version\makeatother\
, ,
-\biblatex~3.11%
-\fnurl{http://sourceforge.net/projects/biblatex/files/biblatex-3.11/}
- \biber~2.11%
-\fnurl{http://sourceforge.net/projects/biblatex-biber/files/biblatex-biber/2.11/}.
+\biblatex~3.14%
+\fnurl{http://sourceforge.net/projects/biblatex/files/biblatex-3.14/}
+ \biber~2.14%
+\fnurl{http://sourceforge.net/projects/biblatex-biber/files/biblatex-biber/2.14/}.
%( CTAN).
.
@@ -197,6 +196,20 @@
.
. \Apxref{apx:changelog}.
+\subsubsection*{ 1.18}
+
+\begin{trivlist}
+\item \biblatex ( 3.14 )
+ ; . :
+ \url{https://github.com/odomanov/biblatex-gost/issues/22},
+ \url{https://github.com/plk/biblatex/issues/960}.
+ \biblatexgost~1.18 .
+ , .
+\item \biblatex 3.14.
+\item : ( \bibsty{\textellipsis-min})
+ \bibfield{pagetotal} ( ).
+\end{trivlist}
+
\subsubsection*{ 1.16}
\begin{trivlist}
@@ -218,14 +231,14 @@
\end{lstlisting}
\end{trivlist}
-\subsubsection*{ 1.14}
+% \subsubsection*{ 1.14}
-\begin{trivlist}
-\item (.~\secref{sec:gostbibliography})
- "--- \gostbibname.
-\item .
- . \opt{otherlangs}, \secref{sec:newoptions}.
-\end{trivlist}
+% \begin{trivlist}
+% \item (.~\secref{sec:gostbibliography})
+% "--- \gostbibname.
+% \item .
+% . \opt{otherlangs}, \secref{sec:newoptions}.
+% \end{trivlist}
% \subsubsection*{ 1.12}
@@ -825,8 +838,9 @@
\item / . . . . // / . . . . ; \ldots
\end{bibexample}
- \bibfield{bookoriglanguage}, \biblatex \bibfield{origlanguage},
- . , ,
+ \biblatexgost 1.15 \bibfield{bookoriglanguage} "---
+ \bibfield{origlanguage} \biblatex 3.7 "---
+ . , ,
\bibfield{bookcredits} \bibfield{credits} (. ).
\fielditem{books, parts, issues}{number/literal}
@@ -1340,9 +1354,9 @@
18uu & [18\bibrangedash\addnbspace\bibrangedash] \\
% 17uu? & [17\bibrangedash\addnbspace\bibrangedash?] \\
% 17uu? & "--- \\
- 1999-uu & "--- \\
- 1999-01-uu & "--- \\
- 1999-uu-uu & "--- \\
+ 1999-uu & --- \\
+ 1999-01-uu & --- \\
+ 1999-uu-uu & --- \\
% 1993/2002? & [19932002?] \\
% 1993/2002\textasciitilde & [1993\bibrangedash . 2002] \\
% 1993?\textasciitilde/2002? & [. 1993?\bibrangedash 2002?] \\
@@ -2182,19 +2196,36 @@
.
, \secref{sec:whatfor}.
-, , ,
-\texttt{gostbibliography}
+ \texttt{gostbibliography} :
+\begin{lstlisting}[style=latex]
+\defbibenvironment{gostbibliography}
+ {\list
+ {}
+ {\toggletrue{bbx:gostbibliography}%
+ \renewcommand*{\revsdnamepunct}{\addcomma}%
+ \renewcommand*{\labelnamepunct}{\addperiod\space}%
+ \setlength{\bibitemsep}{0pt}%
+ \setlength{\leftmargin}{\bibhang}%
+ \setlength{\itemindent}{-\leftmargin}%
+ \setlength{\itemsep}{\bibitemsep}%
+ \setlength{\parsep}{\bibparsep}}}
+ {\endlist}
+ {\item}
+\end{lstlisting}
+ , ,
+
\begin{lstlisting}[style=latex]
\toggletrue{bbx:gostbibliography}
\end{lstlisting}
-
+ .
+
.
- \gostbibname,
- (, , \kvopt{style}{gost-numeric})
- .
+ \gostbibname,
+ (, ,
+\kvopt{style}{gost-numeric}) .
, \bibsty{gost-authoryear},
-\gostbibname ,
- .
+\gostbibname ,
+ .
-,
\bibsty{gost-alphabetic}.
@@ -2478,6 +2509,17 @@
\begin{changelog}
+ \begin{release}{1.18}{23-02-2020}
+ \item \biblatex 3.14.
+ . \url{https://github.com/odomanov/biblatex-gost/issues/22},
+ \url{https://github.com/plk/biblatex/issues/960}.
+ \item \biblatex 3.14.
+ \item : ( \bibsty{\textellipsis-min})
+ \bibfield{pagetotal} ( ).
+ \item
+ \texttt{gostbibliography}\see{sec:gostbibliography}
+ \end{release}
+
\begin{release}{1.17}{20-02-2018}
\item \bibfield{media} ( )
, .
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-gost/ltxdockit.cfg new/doc/latex/biblatex-gost/ltxdockit.cfg
--- old/doc/latex/biblatex-gost/ltxdockit.cfg 2016-08-31 00:07:48.000000000 +0200
+++ new/doc/latex/biblatex-gost/ltxdockit.cfg 2020-02-24 15:28:54.000000000 +0100
@@ -1,12 +1,6 @@
\ProvidesFile{ltxdockit.cfg}
%[ltxdockit configuration]
-\RequirePackage[T1,T2A]{fontenc}
-\RequirePackage[utf8]{inputenc}
-%\RequirePackage{lmodern}
-%\RequirePackage{helvet}
-%\RequirePackage{charter}
-
\catcode`\"=\active
\AtEndPreamble{%
\@ifpackageloaded{babel}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-gost/ltxdockit.cls new/doc/latex/biblatex-gost/ltxdockit.cls
--- old/doc/latex/biblatex-gost/ltxdockit.cls 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/biblatex-gost/ltxdockit.cls 2020-02-25 23:08:25.000000000 +0100
@@ -0,0 +1,140 @@
+% $Id: ltxdockit.cls,v 1.2d 2011/03/25 20:33:14 lehman stable $
+%
+% Copyright (c) 2008-2011 Philipp Lehman.
+%
+% Permission is granted to copy, distribute and/or modify this
+% software under the terms of the LaTeX Project Public License
+% (LPPL), version 1.3.
+%
+% The LPPL maintenance status of this software is
+% 'author-maintained'.
+%
+% This software is provided 'as is', without warranty of any kind,
+% either expressed or implied, including, but not limited to, the
+% implied warranties of merchantability and fitness for a
+% particular purpose.
+
+\def\ltd@rcsid$#1: #2 #3 #4 #5${#4 v#3}
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{ltxdockit}
+[\ltd@rcsid $Id: ltxdockit.cls,v 1.2d 2011/03/25 20:33:14 lehman stable $
+ LaTeX documentation kit]
+
+\input{ltxdockit.def}
+
+\RequirePackage{etoolbox}
+\RequirePackage{multicol}
+\RequirePackage{keyval}
+\RequirePackage{ltxdockit}
+\RequirePackage{hyperref}
+\RequirePackage[all]{hypcap}
+
+\newrobustcmd*{\fnurl}[1][]{\hyper@normalise\ltd@fnurl{#1}}
+\def\ltd@fnurl#1#2{\footnote{#1\hyper@linkurl{\Hurl{#2}}{#2}}}
+
+\newrobustcmd*{\email}{\hyper@normalise\ltd@email}
+\def\ltd@email#1{\href{mailto:#1}{#1}}
+
+\hypersetup{%
+ colorlinks=true,
+ linkcolor=spot,
+ urlcolor=spot,
+ bookmarks=true,
+ bookmarksopen=false,
+ bookmarksnumbered=false,
+ hyperfootnotes=false,
+ plainpages=false,
+ pdfpagelabels=true,
+ pdfpagemode=UseOutlines,
+ pdfview=FitH,
+ pdfstartview=FitH}
+
+% title
+
+\providecommand*{\titlepage}{}
+\providecommand*{\titlefont}{}
+\renewrobustcmd*{\titlepage}[1]{\setkeys{ltd@ttp}{#1}}
+\renewcommand*{\titlefont}{\bfseries}
+\define@key{ltd@ttp}{title}{\def\ltd@title@title{#1}}
+\define@key{ltd@ttp}{subtitle}{\def\ltd@title@subtitle{#1}}
+\define@key{ltd@ttp}{url}{\def\ltd@title@url{#1}}
+\define@key{ltd@ttp}{author}{\def\ltd@title@author{#1}}
+\define@key{ltd@ttp}{email}{\def\ltd@title@email{#1}}
+\define@key{ltd@ttp}{revision}{\def\ltd@title@revision{#1}}
+\define@key{ltd@ttp}{date}{\def\ltd@title@date{#1}}
+
+\providecommand*{\printtitlepage}{}
+\renewrobustcmd*{\printtitlepage}{%
+ \begingroup
+ \centering\titlefont
+ \begingroup\LARGE
+ \ifundef\ltd@title@url
+ {\ltd@title@title}
+ {\href{\ltd@title@url}{\ltd@title@title}}%
+ \par
+ \endgroup
+ \vspace{0.25\baselineskip}
+ \begingroup\large
+ \ltd@title@subtitle\par
+ \endgroup
+ \vspace{0.25\baselineskip}
+ \begin{multicols}{2}
+ \raggedleft
+ \ltd@title@author\par
+ \expandafter\email\expandafter{\ltd@title@email}\par
+ \raggedright
+ Version \ltd@title@revision\par\ltd@title@date
+ \end{multicols}
+ \endgroup}
+
+% rcs tags
+
+\providecommand*{\rcsfile}{[rcsfile]}
+\providecommand*{\rcsrevision}{[revision]}
+\providecommand*{\rcsdate}{[date]}
+\providecommand*{\rcstime}{[time]}
+\providecommand*{\rcsstate}{[state]}
+\providecommand*{\rcsauthor}{[author]}
+\providecommand*{\rcslocker}{[unlocked]}
+\providecommand*{\rcstoday}{\today}
+
+\providecommand*{\rcsid}[1]{%
+ \ifblank{#1}{}{\ltd@rcsid@i#1}}
+\def\ltd@rcsid@i$Id#1${%
+ \ifblank{#1}{}{\ltd@rcsid@ii#1&}}
+\def\ltd@rcsid@ii#1#2&{%
+ \ifblank{#1}{}{\ltd@rcsid@iii#2&}}
+\def\ltd@rcsid@iii#1 #2 #3 #4&{%
+ \write\@auxout{%
+ \detokenize{\gdef\rcsfile{#2}}^^J%
+ \detokenize{\gdef\rcsrevision{#3}}}%
+ \ltd@rcsid@iv#4&}
+\def\ltd@rcsid@iv#1/#2/#3 #4:#5:#6 #7&{%
+ \write\@auxout{%
+ \detokenize{\gdef\rcsdate{#1/#2/#3}}^^J%
+ \detokenize{\gdef\rcstime{#4:#5:#6}}^^J%
+ \detokenize{\ltd@setdate{#1}{#2}{#3}{#4}{#5}}}%
+ \ltd@rcsid@v#7&}
+\def\ltd@rcsid@v#1 #2 #3&{%
+ \write\@auxout{%
+ \detokenize{\gdef\rcsauthor{#1}}^^J%
+ \detokenize{\gdef\rcsstate{#2}}}%
+ \ifblank{#3}{}{\ltd@rcsid@vi#3&}}
+\def\ltd@rcsid@vi#1 &{%
+ \write\@auxout{%
+ \detokenize{\gdef\rcslocker{#1}}}}
+
+\def\ltd@setdate#1#2#3#4#5{%
+ \global\year=#1
+ \global\month=#2
+ \global\day=#3
+ \global\time=#4
+ \global\multiply\time by 60
+ \global\advance\time by #5}
+
+% config file
+
+\InputIfFileExists{ltxdockit.cfg}{}{}
+
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-gost.doc.tlpobj new/tlpkg/tlpobj/biblatex-gost.doc.tlpobj
--- old/tlpkg/tlpobj/biblatex-gost.doc.tlpobj 2019-02-28 03:20:26.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-gost.doc.tlpobj 2020-02-26 01:54:37.000000000 +0100
@@ -1,9 +1,9 @@
name biblatex-gost.doc
category Package
-revision 46709
+revision 53916
shortdesc doc files of biblatex-gost
relocated 1
-docfiles size=388
+docfiles size=356
RELOC/doc/latex/biblatex-gost/README.md
RELOC/doc/latex/biblatex-gost/biblatex-gost-examples.bib
RELOC/doc/latex/biblatex-gost/biblatex-gost-examples.pdf
@@ -11,3 +11,4 @@
RELOC/doc/latex/biblatex-gost/biblatex-gost.pdf
RELOC/doc/latex/biblatex-gost/biblatex-gost.tex
RELOC/doc/latex/biblatex-gost/ltxdockit.cfg
+ RELOC/doc/latex/biblatex-gost/ltxdockit.cls
++++++ biblatex-gost.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/american-gost.lbx new/tex/latex/biblatex-gost/american-gost.lbx
--- old/tex/latex/biblatex-gost/american-gost.lbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/american-gost.lbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{american-gost.lbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\InheritBibliographyExtras{american}
\InheritBibliographyStrings{american}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/biblatex-gost.dbx new/tex/latex/biblatex-gost/biblatex-gost.dbx
--- old/tex/latex/biblatex-gost/biblatex-gost.dbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/biblatex-gost.dbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{biblatex-gost.dbx}
-[2018/02/20\space v1.17\space biblatex-gost data model]
+[2020/02/23\space v1.18\space biblatex-gost data model]
% Biblatex-GOST data model
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/biblatex-gost.def new/tex/latex/biblatex-gost/biblatex-gost.def
--- old/tex/latex/biblatex-gost/biblatex-gost.def 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/biblatex-gost.def 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{biblatex-gost.def}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
% these declarations should be here, not in lbx, to be initialized for all languages
\NewBibliographyString{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/brazilian-gost.lbx new/tex/latex/biblatex-gost/brazilian-gost.lbx
--- old/tex/latex/biblatex-gost/brazilian-gost.lbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/brazilian-gost.lbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{brazilian-gost.lbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\InheritBibliographyExtras{brazilian}
\InheritBibliographyStrings{brazilian}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/british-gost.lbx new/tex/latex/biblatex-gost/british-gost.lbx
--- old/tex/latex/biblatex-gost/british-gost.lbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/british-gost.lbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{british-gost.lbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\InheritBibliographyExtras{british}
\InheritBibliographyStrings{british}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/catalan-gost.lbx new/tex/latex/biblatex-gost/catalan-gost.lbx
--- old/tex/latex/biblatex-gost/catalan-gost.lbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/catalan-gost.lbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{catalan-gost.lbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\InheritBibliographyExtras{catalan}
\InheritBibliographyStrings{catalan}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/croatian-gost.lbx new/tex/latex/biblatex-gost/croatian-gost.lbx
--- old/tex/latex/biblatex-gost/croatian-gost.lbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/croatian-gost.lbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{croatian-gost.lbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\InheritBibliographyExtras{croatian}
\InheritBibliographyStrings{croatian}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/english-gost.lbx new/tex/latex/biblatex-gost/english-gost.lbx
--- old/tex/latex/biblatex-gost/english-gost.lbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/english-gost.lbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{english-gost.lbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\InheritBibliographyExtras{english}
\InheritBibliographyStrings{english}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/french-gost.lbx new/tex/latex/biblatex-gost/french-gost.lbx
--- old/tex/latex/biblatex-gost/french-gost.lbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/french-gost.lbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{french-gost.lbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\InheritBibliographyExtras{french}
\InheritBibliographyStrings{french}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/galician-gost.lbx new/tex/latex/biblatex-gost/galician-gost.lbx
--- old/tex/latex/biblatex-gost/galician-gost.lbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/galician-gost.lbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{galician-gost.lbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\InheritBibliographyExtras{galician}
\InheritBibliographyStrings{galician}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/german-gost.lbx new/tex/latex/biblatex-gost/german-gost.lbx
--- old/tex/latex/biblatex-gost/german-gost.lbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/german-gost.lbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{german-gost.lbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\InheritBibliographyExtras{german}
\InheritBibliographyStrings{german}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-alphabetic-min.bbx new/tex/latex/biblatex-gost/gost-alphabetic-min.bbx
--- old/tex/latex/biblatex-gost/gost-alphabetic-min.bbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-alphabetic-min.bbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-alphabetic-min.bbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireBibliographyStyle{gost-alphabetic}
\AtEveryBibitem{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-alphabetic-min.cbx new/tex/latex/biblatex-gost/gost-alphabetic-min.cbx
--- old/tex/latex/biblatex-gost/gost-alphabetic-min.cbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-alphabetic-min.cbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-alphabetic-min.cbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireCitationStyle{gost-alphabetic}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-alphabetic-min.dbx new/tex/latex/biblatex-gost/gost-alphabetic-min.dbx
--- old/tex/latex/biblatex-gost/gost-alphabetic-min.dbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-alphabetic-min.dbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-alphabetic-min.dbx}
-[2018/02/20\space v1.17\space biblatex-gost data model]
+[2020/02/23\space v1.18\space biblatex-gost data model]
\blx(a)inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-alphabetic.bbx new/tex/latex/biblatex-gost/gost-alphabetic.bbx
--- old/tex/latex/biblatex-gost/gost-alphabetic.bbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-alphabetic.bbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-alphabetic.bbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireBibliographyStyle{gost-standard}
\ExecuteBibliographyOptions{labelalpha,sorting=anyvt}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-alphabetic.cbx new/tex/latex/biblatex-gost/gost-alphabetic.cbx
--- old/tex/latex/biblatex-gost/gost-alphabetic.cbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-alphabetic.cbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-alphabetic.cbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireCitationStyle{alphabetic}
\ExecuteBibliographyOptions{labelalpha,autocite=inline}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-alphabetic.dbx new/tex/latex/biblatex-gost/gost-alphabetic.dbx
--- old/tex/latex/biblatex-gost/gost-alphabetic.dbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-alphabetic.dbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-alphabetic.dbx}
-[2018/02/20\space v1.17\space biblatex-gost data model]
+[2020/02/23\space v1.18\space biblatex-gost data model]
\blx(a)inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-authoryear-min.bbx new/tex/latex/biblatex-gost/gost-authoryear-min.bbx
--- old/tex/latex/biblatex-gost/gost-authoryear-min.bbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-authoryear-min.bbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-authoryear-min.bbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireBibliographyStyle{gost-authoryear}
\AtEveryBibitem{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-authoryear-min.cbx new/tex/latex/biblatex-gost/gost-authoryear-min.cbx
--- old/tex/latex/biblatex-gost/gost-authoryear-min.cbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-authoryear-min.cbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-authoryear-min.cbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireCitationStyle{gost-authoryear}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-authoryear-min.dbx new/tex/latex/biblatex-gost/gost-authoryear-min.dbx
--- old/tex/latex/biblatex-gost/gost-authoryear-min.dbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-authoryear-min.dbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-authoryear-min.dbx}
-[2018/02/20\space v1.17\space biblatex-gost data model]
+[2020/02/23\space v1.18\space biblatex-gost data model]
\blx(a)inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-authoryear.bbx new/tex/latex/biblatex-gost/gost-authoryear.bbx
--- old/tex/latex/biblatex-gost/gost-authoryear.bbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-authoryear.bbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-authoryear.bbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireBibliographyStyle{gost-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-authoryear.cbx new/tex/latex/biblatex-gost/gost-authoryear.cbx
--- old/tex/latex/biblatex-gost/gost-authoryear.cbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-authoryear.cbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-authoryear.cbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\ExecuteBibliographyOptions{dashed=false,citetracker=constrict,loccittracker=constrict,
dropdates=false,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-authoryear.dbx new/tex/latex/biblatex-gost/gost-authoryear.dbx
--- old/tex/latex/biblatex-gost/gost-authoryear.dbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-authoryear.dbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-authoryear.dbx}
-[2018/02/20\space v1.17\space biblatex-gost data model]
+[2020/02/23\space v1.18\space biblatex-gost data model]
\blx(a)inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-footnote-min.bbx new/tex/latex/biblatex-gost/gost-footnote-min.bbx
--- old/tex/latex/biblatex-gost/gost-footnote-min.bbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-footnote-min.bbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-footnote-min.bbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireBibliographyStyle{gost-inline-min}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-footnote-min.cbx new/tex/latex/biblatex-gost/gost-footnote-min.cbx
--- old/tex/latex/biblatex-gost/gost-footnote-min.cbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-footnote-min.cbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-footnote-min.cbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireCitationStyle{gost-footnote}
\renewbibmacro*{cite:clearfields}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-footnote-min.dbx new/tex/latex/biblatex-gost/gost-footnote-min.dbx
--- old/tex/latex/biblatex-gost/gost-footnote-min.dbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-footnote-min.dbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-footnote-min.dbx}
-[2018/02/20\space v1.17\space biblatex-gost data model]
+[2020/02/23\space v1.18\space biblatex-gost data model]
\blx(a)inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-footnote.bbx new/tex/latex/biblatex-gost/gost-footnote.bbx
--- old/tex/latex/biblatex-gost/gost-footnote.bbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-footnote.bbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-footnote.bbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireBibliographyStyle{gost-inline}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-footnote.cbx new/tex/latex/biblatex-gost/gost-footnote.cbx
--- old/tex/latex/biblatex-gost/gost-footnote.cbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-footnote.cbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-footnote.cbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireCitationStyle{gost-inline}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-footnote.dbx new/tex/latex/biblatex-gost/gost-footnote.dbx
--- old/tex/latex/biblatex-gost/gost-footnote.dbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-footnote.dbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-footnote.dbx}
-[2018/02/20\space v1.17\space biblatex-gost data model]
+[2020/02/23\space v1.18\space biblatex-gost data model]
\blx(a)inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-inline-min.bbx new/tex/latex/biblatex-gost/gost-inline-min.bbx
--- old/tex/latex/biblatex-gost/gost-inline-min.bbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-inline-min.bbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-inline-min.bbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireBibliographyStyle{gost-inline}
\AtEveryBibitem{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-inline-min.cbx new/tex/latex/biblatex-gost/gost-inline-min.cbx
--- old/tex/latex/biblatex-gost/gost-inline-min.cbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-inline-min.cbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-inline-min.cbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireCitationStyle{gost-inline}
\renewbibmacro*{cite:clearfields}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-inline-min.dbx new/tex/latex/biblatex-gost/gost-inline-min.dbx
--- old/tex/latex/biblatex-gost/gost-inline-min.dbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-inline-min.dbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-inline-min.dbx}
-[2018/02/20\space v1.17\space biblatex-gost data model]
+[2020/02/23\space v1.18\space biblatex-gost data model]
\blx(a)inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-inline.bbx new/tex/latex/biblatex-gost/gost-inline.bbx
--- old/tex/latex/biblatex-gost/gost-inline.bbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-inline.bbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-inline.bbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireBibliographyStyle{gost-standard}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-inline.cbx new/tex/latex/biblatex-gost/gost-inline.cbx
--- old/tex/latex/biblatex-gost/gost-inline.cbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-inline.cbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-inline.cbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\DeclareLabelname
[inbook,incollection,inproceedings,inreference,suppbook,suppcollection,suppperiodical,bookinbook]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-inline.dbx new/tex/latex/biblatex-gost/gost-inline.dbx
--- old/tex/latex/biblatex-gost/gost-inline.dbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-inline.dbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-inline.dbx}
-[2018/02/20\space v1.17\space biblatex-gost data model]
+[2020/02/23\space v1.18\space biblatex-gost data model]
\blx(a)inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-numeric-min.bbx new/tex/latex/biblatex-gost/gost-numeric-min.bbx
--- old/tex/latex/biblatex-gost/gost-numeric-min.bbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-numeric-min.bbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-numeric-min.bbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireBibliographyStyle{gost-numeric}
\AtEveryBibitem{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-numeric-min.cbx new/tex/latex/biblatex-gost/gost-numeric-min.cbx
--- old/tex/latex/biblatex-gost/gost-numeric-min.cbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-numeric-min.cbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-numeric-min.cbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireCitationStyle{gost-numeric}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-numeric-min.dbx new/tex/latex/biblatex-gost/gost-numeric-min.dbx
--- old/tex/latex/biblatex-gost/gost-numeric-min.dbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-numeric-min.dbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-numeric-min.dbx}
-[2018/02/20\space v1.17\space biblatex-gost data model]
+[2020/02/23\space v1.18\space biblatex-gost data model]
\blx(a)inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-numeric.bbx new/tex/latex/biblatex-gost/gost-numeric.bbx
--- old/tex/latex/biblatex-gost/gost-numeric.bbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-numeric.bbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-numeric.bbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireBibliographyStyle{gost-standard}
\ExecuteBibliographyOptions{labelnumber,bibisbn,biburl,bibdoi,bibeprint}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-numeric.cbx new/tex/latex/biblatex-gost/gost-numeric.cbx
--- old/tex/latex/biblatex-gost/gost-numeric.cbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-numeric.cbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-numeric.cbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\RequireCitationStyle{numeric-comp}
\ExecuteBibliographyOptions{dashed=false,citeisbn,citeurl,citedoi,citeeprint}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-numeric.dbx new/tex/latex/biblatex-gost/gost-numeric.dbx
--- old/tex/latex/biblatex-gost/gost-numeric.dbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-numeric.dbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{gost-numeric.dbx}
-[2018/02/20\space v1.17\space biblatex-gost data model]
+[2020/02/23\space v1.18\space biblatex-gost data model]
\blx(a)inputonce{biblatex-gost.dbx}{biblatex-gost data model}{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/gost-standard.bbx new/tex/latex/biblatex-gost/gost-standard.bbx
--- old/tex/latex/biblatex-gost/gost-standard.bbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/gost-standard.bbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,18 +1,24 @@
\ProvidesFile{gost-standard.bbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
-\def\bbx@gost@date{2018/02/20}
-\def\bbx@gost@version{1.17}
+\def\bbx@gost@date{2020/02/23}
+\def\bbx@gost@version{1.18}
-\@ifpackagelater{biblatex}{2016/12/06}
+\@ifpackagelater{biblatex}{2019/09/01}
{}
{\PackageError{biblatex}
{Outdated 'biblatex' package}
- {This version of 'biblatex-gost' requires biblatex v3.8 or
+ {This version of 'biblatex-gost' requires biblatex v3.14 or
later.\MessageBreak You are using: '\csuse{ver(a)biblatex.sty}'.\MessageBreak
This is a fatal error. I'm aborting now.}%
\endinput}
+\ifpdftex
+ \PackageWarningNoLine{biblatex-gost}{Applying temporary patch for
+ Unicode symbols.\MessageBreak For details see biblatex issue \protect#960}
+ \AtEndPreamble{\DefineBibliographyStrings{russian}{number={\textnumero}}}
+\fi
+
\AtEndOfPackage{%
\ifboolexpr{
test {\ifdefstring{\blx@opt@movenames}{true}}
@@ -460,8 +466,8 @@
% FORMATTING COMMANDS
-\newbibmacro*{//}{%
- \nopunct\printtext{\addnbspace\mbox{//}\addspace}}
+\newcommand*{\blxgostdblslash}{\nopunct\printtext{\addnbspace\mbox{//}\addspace}}
+\newbibmacro*{//}{\blxgostdblslash}
\renewcommand*{\labelnamepunct}{\addperiod\space}
\renewcommand*{\intitlepunct}{\addspace}
\renewcommand*{\finalnamedelim}{\addcomma\space}
@@ -2502,7 +2508,6 @@
\clearlist{editioncredits}%
\clearlist{specdata}%
\clearfield{media}%
- \clearfield{pagetotal}%
\clearfield{titleaddon}%
\clearfield{booktitleaddon}%
\clearfield{maintitleaddon}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/greek-gost.lbx new/tex/latex/biblatex-gost/greek-gost.lbx
--- old/tex/latex/biblatex-gost/greek-gost.lbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/greek-gost.lbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{greek-gost.lbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\InheritBibliographyExtras{greek}
\InheritBibliographyStrings{greek}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/icelandic-gost.lbx new/tex/latex/biblatex-gost/icelandic-gost.lbx
--- old/tex/latex/biblatex-gost/icelandic-gost.lbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/icelandic-gost.lbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{icelandic-gost.lbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\InheritBibliographyExtras{icelandic}
\InheritBibliographyStrings{icelandic}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/italian-gost.lbx new/tex/latex/biblatex-gost/italian-gost.lbx
--- old/tex/latex/biblatex-gost/italian-gost.lbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/italian-gost.lbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{italian-gost.lbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\InheritBibliographyExtras{italian}
\InheritBibliographyStrings{italian}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/portuguese-gost.lbx new/tex/latex/biblatex-gost/portuguese-gost.lbx
--- old/tex/latex/biblatex-gost/portuguese-gost.lbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/portuguese-gost.lbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{portuguese-gost.lbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\InheritBibliographyExtras{portuguese}
\InheritBibliographyStrings{portuguese}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/russian-gost.lbx new/tex/latex/biblatex-gost/russian-gost.lbx
--- old/tex/latex/biblatex-gost/russian-gost.lbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/russian-gost.lbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{russian-gost.lbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\InheritBibliographyExtras{russian}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/slovene-gost.lbx new/tex/latex/biblatex-gost/slovene-gost.lbx
--- old/tex/latex/biblatex-gost/slovene-gost.lbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/slovene-gost.lbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{slovene-gost.lbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\InheritBibliographyExtras{slovene}
\InheritBibliographyStrings{slovene}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-gost/spanish-gost.lbx new/tex/latex/biblatex-gost/spanish-gost.lbx
--- old/tex/latex/biblatex-gost/spanish-gost.lbx 2018-02-22 00:36:43.000000000 +0100
+++ new/tex/latex/biblatex-gost/spanish-gost.lbx 2020-02-24 15:28:54.000000000 +0100
@@ -1,5 +1,5 @@
\ProvidesFile{spanish-gost.lbx}
-[2018/02/20\space v1.17\space biblatex-gost styles]
+[2020/02/23\space v1.18\space biblatex-gost styles]
\InheritBibliographyExtras{spanish}
\InheritBibliographyStrings{spanish}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-gost.tlpobj new/tlpkg/tlpobj/biblatex-gost.tlpobj
--- old/tlpkg/tlpobj/biblatex-gost.tlpobj 2019-02-28 03:20:27.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-gost.tlpobj 2020-02-26 01:54:38.000000000 +0100
@@ -1,6 +1,6 @@
name biblatex-gost
category Package
-revision 46709
+revision 53916
shortdesc BibLaTeX support for GOST standard bibliographies
relocated 1
longdesc The package provides BibLaTeX support for Russian bibliography
@@ -58,7 +58,6 @@
catalogue-also gost
catalogue-contact-repository https://github.com/odomanov/biblatex-gost/
catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-gost
-catalogue-date 2018-02-21 09:43:10 +0100
catalogue-license lppl1.3c
catalogue-topics biblatex std-conform russian
-catalogue-version 1.17
+catalogue-version 1.18
++++++ biblatex-ieee.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-ieee/LICENSE.md new/doc/latex/biblatex-ieee/LICENSE.md
--- old/doc/latex/biblatex-ieee/LICENSE.md 2016-04-16 23:19:37.000000000 +0200
+++ new/doc/latex/biblatex-ieee/LICENSE.md 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-Released under the [LaTeX Project Public
-License](http://www.latex-project.org/lppl.txt), v1.3c or later.
-
-The package has status 'maintained': the current maintainer is
-[Joseph Wright](joseph.wright(a)morningstar2.co.uk).
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-ieee/README.md new/doc/latex/biblatex-ieee/README.md
--- old/doc/latex/biblatex-ieee/README.md 2016-04-16 23:19:37.000000000 +0200
+++ new/doc/latex/biblatex-ieee/README.md 2019-06-19 22:33:40.000000000 +0200
@@ -11,5 +11,5 @@
A demonstration database is provided to show how to format input
for the style.
-The `biblatex-ieee` style requires `biblatex` 2.7 or later, and
+The `biblatex-ieee` style requires `biblatex` 3.8 or later, and
works with both BibTeX and Biber as the database back-end.
Binary files old/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf and new/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex new/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex
--- old/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex 2018-08-21 23:52:01.000000000 +0200
+++ new/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex 2020-02-26 23:09:56.000000000 +0100
@@ -24,8 +24,8 @@
\href{mailto:joseph.wright@morningstar2.co.uk}
{\texttt{joseph.wright(a)morningstar2.co.uk}}}}
\title{The \pkg{ieee-alphabetic} bibliography style for \pkg{biblatex}%
- \footnote{This file describes v1.3, last revised 2018/08/20.}}
-\date{Released 2018/08/20}
+ \footnote{This file describes v1.3b, last revised 2020/02/26.}}
+\date{Released 2020/02/26}
\providecommand*{\pkg}[1]{\textsf{#1}}
@@ -55,7 +55,7 @@
\end{document}
%%
-%% Copyright (C) 2011-2013,2015-2018 by
+%% Copyright (C) 2011-2013,2015-2020 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-ieee/biblatex-ieee.bib new/doc/latex/biblatex-ieee/biblatex-ieee.bib
--- old/doc/latex/biblatex-ieee/biblatex-ieee.bib 2018-08-21 23:52:01.000000000 +0200
+++ new/doc/latex/biblatex-ieee/biblatex-ieee.bib 2020-02-26 23:09:56.000000000 +0100
@@ -386,7 +386,7 @@
}
%%
-%% Copyright (C) 2011-2013,2015-2018 by
+%% Copyright (C) 2011-2013,2015-2020 by
%% Joseph Wright <joseph.wright at morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
Binary files old/doc/latex/biblatex-ieee/biblatex-ieee.pdf and new/doc/latex/biblatex-ieee/biblatex-ieee.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-ieee/biblatex-ieee.tex new/doc/latex/biblatex-ieee/biblatex-ieee.tex
--- old/doc/latex/biblatex-ieee/biblatex-ieee.tex 2018-08-21 23:52:01.000000000 +0200
+++ new/doc/latex/biblatex-ieee/biblatex-ieee.tex 2020-02-26 23:09:56.000000000 +0100
@@ -24,8 +24,8 @@
\href{mailto:joseph.wright@morningstar2.co.uk}
{\texttt{joseph.wright(a)morningstar2.co.uk}}}}
\title{The \pkg{ieee} bibliography style for \pkg{biblatex}%
- \footnote{This file describes v1.3, last revised 2018/08/20.}}
-\date{Released 2018/08/20}
+ \footnote{This file describes v1.3b, last revised 2020/02/26.}}
+\date{Released 2020/02/26}
\providecommand*{\opt}[1]{\texttt{#1}}
\providecommand*{\pkg}[1]{\textsf{#1}}
@@ -140,13 +140,14 @@
\changes{v1.2c}{2017/03/25}{Fix formatting for volume in some entry types}
\changes{v1.2d}{2017/03/26}{Subtle adjustment for volume string}
\changes{v1.3}{2018/08/20}{Hungarian localisation}
+\changes{v1.3b}{2020/02/26}{Add quotes to website titles}
\PrintChanges
\end{document}
%%
-%% Copyright (C) 2011-2013,2015-2018 by
+%% Copyright (C) 2011-2013,2015-2020 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-ieee.doc.tlpobj new/tlpkg/tlpobj/biblatex-ieee.doc.tlpobj
--- old/tlpkg/tlpobj/biblatex-ieee.doc.tlpobj 2019-02-28 03:20:28.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-ieee.doc.tlpobj 2020-02-27 01:55:30.000000000 +0100
@@ -1,10 +1,9 @@
name biblatex-ieee.doc
category Package
-revision 48448
+revision 53931
shortdesc doc files of biblatex-ieee
relocated 1
-docfiles size=175
- RELOC/doc/latex/biblatex-ieee/LICENSE.md
+docfiles size=174
RELOC/doc/latex/biblatex-ieee/README.md
RELOC/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.pdf
RELOC/doc/latex/biblatex-ieee/biblatex-ieee-alphabetic.tex
++++++ biblatex-ieee.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ieee/ieee-alphabetic.bbx new/tex/latex/biblatex-ieee/ieee-alphabetic.bbx
--- old/tex/latex/biblatex-ieee/ieee-alphabetic.bbx 2018-08-21 23:52:01.000000000 +0200
+++ new/tex/latex/biblatex-ieee/ieee-alphabetic.bbx 2020-02-26 23:09:56.000000000 +0100
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{ieee-alphabetic.bbx}[2018/08/20 v1.3 biblatex bibliography style]
+\ProvidesFile{ieee-alphabetic.bbx}[2020/02/26 v1.3b biblatex bibliography style]
\RequireBibliographyStyle{ieee}
@@ -53,7 +53,7 @@
{\item}
%%
-%% Copyright (C) 2011-2013,2015-2018 by
+%% Copyright (C) 2011-2013,2015-2020 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ieee/ieee-alphabetic.cbx new/tex/latex/biblatex-ieee/ieee-alphabetic.cbx
--- old/tex/latex/biblatex-ieee/ieee-alphabetic.cbx 2018-08-21 23:52:01.000000000 +0200
+++ new/tex/latex/biblatex-ieee/ieee-alphabetic.cbx 2020-02-26 23:09:56.000000000 +0100
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{ieee-alphabetic.cbx}[2018/08/20 v1.3 biblatex citation style]
+\ProvidesFile{ieee-alphabetic.cbx}[2020/02/26 v1.3b biblatex citation style]
\RequireCitationStyle{alphabetic}
@@ -45,7 +45,7 @@
}
%%
-%% Copyright (C) 2011-2013,2015-2018 by
+%% Copyright (C) 2011-2013,2015-2020 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ieee/ieee.bbx new/tex/latex/biblatex-ieee/ieee.bbx
--- old/tex/latex/biblatex-ieee/ieee.bbx 2018-08-21 23:52:01.000000000 +0200
+++ new/tex/latex/biblatex-ieee/ieee.bbx 2020-02-26 23:09:56.000000000 +0100
@@ -1,14 +1,14 @@
%% ---------------------------------------------------------------
-%% biblatex-ieee --- A biblatex implementation of the IEEE
+%% biblatex-ieee --- A biblatex implementation of the IEEE
%% bibliography style
%% Maintained by Joseph Wright
%% E-mail: joseph.wright(a)morningstar2.co.uk
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
-%%
+%%
-\ProvidesFile{ieee.bbx}[2018/08/20 v1.3 biblatex bibliography style]
+\ProvidesFile{ieee.bbx}[2020/02/26 v1.3b biblatex bibliography style]
% Load the standard style to avoid copy-pasting unnecessary material
\RequireBibliographyStyle{numeric-comp}
@@ -30,9 +30,12 @@
\uspunctuation
% Load language-specific customizations
-\DeclareLanguageMappingSuffix{-ieee}
+\DeclareLanguageMapping{magyar}{magyar-ieee}
+% If more language-specific customizations besides magyar should get
+% added, the above explicit mapping per language can be replaced with:
+% \DeclareLanguageMappingSuffix{-ieee}
-% Custom field formats
+% Custom field formats
\DeclareFieldFormat[article]{number}{\bibstring{number}\addnbspace#1}
\DeclareFieldFormat[patent]{number}{\mkonepagegrouped{#1}}
\DeclareFieldFormat{pages}{%
@@ -41,8 +44,7 @@
\DeclareFieldFormat{sentencecase}{\bbx@colon@search{\MakeSentenceCase*}{#1}}
\DeclareFieldFormat[book,inbook,incollection,inproceedings]{series}
{\bibstring{jourser}\addnbspace#1}
-\DeclareFieldFormat[online]{title}{#1\isdot}
-\DeclareFieldFormat[report]{title}{\mkbibquote{#1\isdot}}
+\DeclareFieldFormat[online,report]{title}{\mkbibquote{#1\isdot}}
\DeclareFieldFormat{url}{\bibstring{url}\addcolon\space\url{#1}}
\DeclareFieldFormat*{volume}
{\bibstring{volume}\addnbspace#1}
@@ -63,15 +65,16 @@
chapter = ch\adddot ,
editor = Ed\adddot ,
editors = Eds\adddot ,
- mathesis = Master's thesis ,
+ mathesis = M\adddot S\adddot\addspace thesis ,
patentjp = Japanese Patent ,
patentus = U\adddot S\adddot\addspace Patent ,
+ phdthesis = Ph\adddot D\adddot\addspace dissertation,
presentedat = presented at the\addspace ,
techreport = Tech\adddot\addspace Rep\adddot ,
url = [Online]\adddot\addspace Available ,
}
-\DefineBibliographyStrings{english}{
+\DefineBibliographyStrings{english}{
june = Jun\adddot ,
july = Jul\adddot ,
september = Sep\adddot ,
@@ -93,7 +96,7 @@
\iffieldequals{fullhash}{\bbx@lasthash}
{\bibnamedash\addcomma\space}
{\printnames{author}}%
- \usebibmacro{bbx:savehash}%
+ \usebibmacro{bbx:savehash}%
\iffieldundef{authortype}
{}
{%
@@ -139,8 +142,8 @@
\setunit{\adddot\addspace}%
\iftoggle{bbx:eprint}
{\usebibmacro{eprint}}
- {}%
- \setunit{\adddot\addspace}%
+ {}%
+ \setunit{\adddot\addspace}%
\iftoggle{bbx:url}
{\usebibmacro{url+urldate}}
{}%
@@ -182,7 +185,7 @@
\usebibmacro{date}%
\newunit
}
-
+
\renewbibmacro*{issue+date}{%
\printtext{%
\iffieldundef{issue}
@@ -207,7 +210,7 @@
\printfield[titlecase]{journalsubtitle}%
}%
}%
- \midsentence
+ \midsentence
}
\renewbibmacro*{journal+issuetitle}{%
@@ -230,7 +233,7 @@
{%
\usebibmacro{maintitle}%
\newunit\newblock
- }%
+ }%
\usebibmacro{booktitle}%
\newunit
}
@@ -252,7 +255,7 @@
\usebibmacro{maintitle+booktitle}%
\clearfield{eventtitle}%
\clearfield{number}%
- }%
+ }%
}
\renewbibmacro*{maintitle+title}{%
@@ -314,7 +317,7 @@
}%
\printfield{titleaddon}%
}
-
+
\renewbibmacro*{volume+number+eid}{%
\printfield{volume}%
\newunit
@@ -373,7 +376,7 @@
{%
\bibrangessep
\mkpagegrouped@second@auxii#2&%
- }%
+ }%
}
\newcommand*{\mkpagegrouped@second@auxii}{}
@@ -478,9 +481,11 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related}%
- \usebibmacro{finentry}%
-}
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}}
\DeclareBibliographyDriver{book}{%
\usebibmacro{bibindex}%
@@ -522,9 +527,11 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related}%
- \usebibmacro{finentry}%
-}
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}}
\DeclareBibliographyDriver{inbook}{%
\usebibmacro{bibindex}%
@@ -568,9 +575,11 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related}%
- \usebibmacro{finentry}%
-}
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}}
\DeclareBibliographyDriver{incollection}{%
\usebibmacro{bibindex}%
@@ -615,9 +624,11 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related}%
- \usebibmacro{finentry}%
-}
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}}
\DeclareBibliographyDriver{inproceedings}{%
\usebibmacro{bibindex}%
@@ -661,9 +672,11 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related}%
- \usebibmacro{finentry}%
-}
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}}
\DeclareBibliographyDriver{online}{%
\usebibmacro{bibindex}%
@@ -696,9 +709,11 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related}%
- \usebibmacro{finentry}%
-}
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}}
\DeclareBibliographyDriver{patent}{%
\usebibmacro{bibindex}%
@@ -725,9 +740,11 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related}%
- \usebibmacro{finentry}%
-}
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}}
\DeclareBibliographyDriver{report}{%
\usebibmacro{bibindex}%
@@ -766,24 +783,26 @@
\setunit{\bibpagerefpunct}\newblock
\usebibmacro{pageref}%
\newunit\newblock
- \usebibmacro{related}%
- \usebibmacro{finentry}%
-}
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}}
-%%
-%% Copyright (C) 2011-2013,2015-2018 by
+%%
+%% Copyright (C) 2011-2013,2015-2020 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
-%%
+%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
%% this license or (at your option) any later version. The latest
%% version of this license is in the file:
-%%
+%%
%% http://www.latex-project.org/lppl.txt
-%%
+%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Joseph Wright.
-%%
+%%
%% This work consists of the files biblatex-ieee.bib,
%% biblatex-ieee.tex,
%% ieee.bbx,
@@ -793,6 +812,6 @@
%% magyar-ieee.lbx,
%% and the derived files biblatex-ieee.pdf and
%% biblatex-ieee-alphabetic.pdf.
-%%
+%%
%%
%% End of file `ieee.bbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ieee/ieee.cbx new/tex/latex/biblatex-ieee/ieee.cbx
--- old/tex/latex/biblatex-ieee/ieee.cbx 2018-08-21 23:52:01.000000000 +0200
+++ new/tex/latex/biblatex-ieee/ieee.cbx 2020-02-26 23:09:56.000000000 +0100
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{ieee.cbx}[2018/08/20 v1.3 biblatex citation style]
+\ProvidesFile{ieee.cbx}[2020/02/26 v1.3b biblatex citation style]
\RequireCitationStyle{numeric-comp}
@@ -61,7 +61,7 @@
\DeclareMultiCiteCommand{\cites}{\cite}{\multicitedelim}
%%
-%% Copyright (C) 2011-2013,2015-2018 by
+%% Copyright (C) 2011-2013,2015-2020 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-ieee/magyar-ieee.lbx new/tex/latex/biblatex-ieee/magyar-ieee.lbx
--- old/tex/latex/biblatex-ieee/magyar-ieee.lbx 2018-08-21 23:52:01.000000000 +0200
+++ new/tex/latex/biblatex-ieee/magyar-ieee.lbx 2020-02-26 23:09:56.000000000 +0100
@@ -1,23 +1,24 @@
%% ---------------------------------------------------------------
-%% biblatex-ieee --- A biblatex implementation of the IEEE
+%% biblatex-ieee --- A biblatex implementation of the IEEE
%% bibliography style
%% Maintained by Joseph Wright
%% E-mail: joseph.wright at morningstar2.co.uk
%% Released under the LaTeX Project Public License v1.3c or later
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
-%%
+%%
\ProvidesFile{magyar-ieee.lbx}
\InheritBibliographyExtras{magyar}
\DeclareBibliographyStrings{inherit={magyar}}
-\DeclareBibliographyExtras{
+\DeclareBibliographyExtras{%
\savefieldformat{number}%
\savefieldformat{volume}%
\savefieldformat{series}%
- \DeclareFieldFormat[article, periodical]{number}{\mkbibordinal{#1}\addnbspace\bibstring{number}}%
+ \DeclareFieldFormat[article, periodical]{number}{%
+ \mkbibordinal{#1}\addnbspace\bibstring{number}}%
\DeclareFieldFormat[book,inbook,incollection,inproceedings]{series}{%
\ifnumerals{#1}{\mkbibordinal{#1}}{#1}\addnbspace\bibstring{jourser}}%
\DeclareFieldFormat*{volume}{%
@@ -32,20 +33,20 @@
\restorefieldformat{series}%
}
-%%
-%% Copyright (C) 2011-2013,2015-2018 by
+%%
+%% Copyright (C) 2011-2013,2015-2020 by
%% Joseph Wright <joseph.wright at morningstar2.co.uk>
-%%
+%%
%% It may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License (LPPL), either version 1.3c of
%% this license or (at your option) any later version. The latest
%% version of this license is in the file:
-%%
+%%
%% http://www.latex-project.org/lppl.txt
-%%
+%%
%% This work is "maintained" (as per LPPL maintenance status) by
%% Joseph Wright.
-%%
+%%
%% This work consists of the files biblatex-ieee.bib,
%% biblatex-ieee.tex,
%% ieee.bbx,
@@ -55,6 +56,6 @@
%% magyar-ieee.lbx,
%% and the derived files biblatex-ieee.pdf and
%% biblatex-ieee-alphabetic.pdf.
-%%
+%%
%%
%% End of file `biblatex-ieee.bib'.
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-ieee.tlpobj new/tlpkg/tlpobj/biblatex-ieee.tlpobj
--- old/tlpkg/tlpobj/biblatex-ieee.tlpobj 2019-02-28 03:20:28.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-ieee.tlpobj 2020-02-27 01:55:30.000000000 +0100
@@ -1,6 +1,6 @@
name biblatex-ieee
category Package
-revision 48448
+revision 53931
shortdesc IEEE style files for BibLaTeX
relocated 1
longdesc This is a BibLaTeX style that implements the bibliography style
@@ -18,7 +18,6 @@
RELOC/tex/latex/biblatex-ieee/ieee.cbx
RELOC/tex/latex/biblatex-ieee/magyar-ieee.lbx
catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-ieee
-catalogue-date 2018-08-21 09:59:57 +0200
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
catalogue-topics biblatex journalpub
-catalogue-version 1.3
+catalogue-version 1.3b
++++++ biblatex-iso690.doc.tar.xz ++++++
++++ 1965 lines of diff (skipped)
++++++ biblatex-iso690.tar.xz ++++++
++++ 2548 lines of diff (skipped)
++++++ biblatex-juradiss.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-juradiss/Changes new/doc/latex/biblatex-juradiss/Changes
--- old/doc/latex/biblatex-juradiss/Changes 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/biblatex-juradiss/Changes 2020-03-24 21:50:17.000000000 +0100
@@ -0,0 +1,33 @@
+
+0.21 2020-03-24 - do not use a biber.conf file, definition now in *.bbx (hv)
+0.2 2020-03-17 - updated all macros for using with biblatex 3.7 (hv)
+0.1g 2013-02-28 - Aktualisierung der readme wg. Einstellung der weiteren Entwicklung
+
+0.1f 2011-09-30 - singletitle-Funktion kommt nur zum Einsatz, wenn notwendig, also bei book und online
+ - shortitle wird bei online stets angezeigt, falls vorhanden
+ - Darstellung von jurisdiction bei juris als Fundstelle korrigiert
+
+0.1e 2011-09-21 - Dokumentation beigefuegt
+
+0.1d 2011-09-11 - Weitere Regressions von 0.1b fixed
+ - Fehler in README korrigiert
+ - Neuer Zitierstil fr Zeitungsartikel (entrysubtype=newspaper)
+
+0.1c 2011-09-10 - Regression von 0.1b fixed
+0.1b 2011-09-09 - Umstellung des Eintragstyps von Kommentaren von customa auf commentary
+ - Umstellung des Eintragstyps von Urteilen von customb auf jurisdiction
+ - Einfuehrung des Zitationsstils fuer offizielle Dokumente,
+ wie Bundestagsdrucksachen: legal
+ - statt "besucht am" steht nun vor dem urldate "abgerufen am"
+ - Querverweis-Befehl wurde ueberarbeitet (\qverweis)
+ - Code bereinigt
+ - custom-fields fuer jurisdiction mit biber implementiert
+ - Begr. oder aehnliches ist nun auch beim Feld author moeglich,
+ nicht nur bei editor
+ - Statt "besucht am" steht nun vor dem Datum des letzten Abrufs
+ bei Onlinedokumenten im LitVerz "abgerufen am"
+ - Eigener Stil fuer inbook wieder entfernt, neben incollection unnoetig
+0.1a 2011-07-27 - Ueberarbeitung der README
+ - Kleinere Bugfixes
+ - Hinzufuegen des Stils inbook
+0.1 2011/07/23 - Erstveroeffentlichung
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-juradiss/README new/doc/latex/biblatex-juradiss/README
--- old/doc/latex/biblatex-juradiss/README 2013-03-02 01:05:28.000000000 +0100
+++ new/doc/latex/biblatex-juradiss/README 2020-03-24 21:50:17.000000000 +0100
@@ -1,6 +1,5 @@
-biblatex-juradiss 2012/07/17 v0.1f
-Copyright (c) 2012 Dr. Tobias Schwan <tobias.schwan(aat)gmx.de>
-
+Copyright (c) 2012 Tobias Schwan <tobias.schwan(aat)gmx.de>
+ 2020 Herbert Vo hvoss(a)tug.org
****************************************************************
This is biblatex-juradiss,
@@ -16,19 +15,10 @@
working on German law. Thats why the comments, explaining the
style are in german.
-I created this package while writing my PhD. After I have
-finished it, I am not sure if I will work on it further. So if
-you are interested in developing it further, or translate the
-(coming) documentation in other languages, do not hesitate to
-contact me.
-
This material is subject to the LaTeX Project Public License.
-See
-http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
+See https://latex-project.org/lppl/
for the details of that license.
-This work has the LPPL maintenance status 'unmaintained'.
-
The former Maintainer of this work was Tobias Schwan.
-----------------------------------------------------------------
@@ -43,117 +33,3 @@
biblatex-dw. Empfehlenswert ist ausserdem die Verwendung von
jurabook als Dokumentenklasse, sowie biber zum Verarbeiten der
Literaturdatenbank.
-
-Eine Dokumentation ist ebenfalls vorhanden (biblatex-juradiss.pdf
-bzw. als Quellcode biblatex-juradiss.tex).
-
-Hier die wichtigsten Infos zur Verwendung des Stils:
-
-1. Installation
-Die Dateien biblatex-juradiss.cbx und biblatex-juradiss.bbx in
-<TEXMFLOCAL>/tex/latex/biblatex-juradiss kopieren, wobei
-<TEXMFLOCAL> der Wurzelpfad der TeX-Installation ist. Danach den
-Datei-hash aktualisieren.
-Die biber.conf-Datei einfach in den gleichen Ordner, wie die
-tex-Datei legen.
-
-2. Einbindung im Dokument
-biblatex-juradiss setzt auf biblatex auf. Das Paket wird von LaTeX
-durch die Paketoption style=biblatex-juradiss des Pakets biblatex
-zu Beginn des Dokuments eingebunden, z.B.:
-\usepackage[%
-uniquename=true,% <----Beispiel
-sorting=nyvt,% <----Beispiel
-style=biblatex-juradiss,% <--- notwendig
-backend=biber,% <--- empfohlen
-]{biblatex}
-
-3. Enthaltene Zitierstile
-Der Stil beinhaltet derzeit die angepassten Stile
-- article fuer juristische Zeitschriftenaufsaetze (zB aus der NJW)
-- article:newspaper fuer Zeitungsartikel (zB FAZ oder SZ)
-- book fuer Monografien (zB Lehrbuecher, Dissertationen usw.)
-- commentary fuer Gesetzeskommentare (zB Palandt)
-- jurisdiction fuer Gerichtsentscheidungen (zB Urteile des BGH)
-- legal fuer staatliche Dokumente (zB BT-Drs, BMF-Schreiben)
-- incollection fuer Festschriften
-- online fuer Online-Dokumente
-- periodical fuer Archivzeitschriften, zB die AcP
-
-
-4. Bei Problemen:
-Dieser Stil baut auf biblatex, biblatex-dw und biber auf, es
-empfiehlt sich daher die Dokus dieser Pakete zu lesen, um deren
-Funktionsweise zu verstehen, so ist auch dieses Paket entstanden.
-Ansonsten freue ich mich stets ueber Rueckmeldungen.
-
-5. (Alte) Plaene fuer die Entwicklung:
-Alle wesentlichen Funktionen, die das Paket fuer meine Beduernisse
-haben soll, sind nun integriert. Allein die idem-Unterstuetzung
-fuer juristische Kommentare ist noch nicht perfekt, in der
-Umsetzung aber auch sehr schwierig. Fuer die naehere Zukunft ist
-auf jeden Fall noch die Erstellung einer ausfuehrlichen Doku
-geplant, sowie das Finden und Beseitigen von Bugs.
-
-Falls sich Mitstreiter finden koennte auch eine Erweiterung fuer
-andere Dokumentenarten (zB. Hausarbeiten, Zeitschriftenartikel,
-Urteile, usw.) ins Auge gefasst werden.
-
-6. Ich habe nun meine Doktorarbeit fertig gestellt und derzeit
-leider keine Zeit mehr, mich dem Projekt weiter zu widmen,
-insbesondere bugfixes einzupflegen oder aehnliches. Soweit jemand
-an der Fortsetzung dieses Projekts Interesse hat wuerde ich mich
-sehr freuen.
-
-Viel Spass
-Tobias
-
-Version: 0.1f
-Stand: 2013-02-28
-
-Versionsgeschichte:
-2013-02-28
-- Aktualisierung der readme wg. Einstellung der weiteren Entwicklung
-
-Ver. 0.1f (2011-09-30)
-- singletitle-Funktion kommt nur zum Einsatz, wenn notwendig, also bei book und online
-- shortitle wird bei online stets angezeigt, falls vorhanden
-- Darstellung von jurisdiction bei juris als Fundstelle korrigiert
-
-Ver. 0.1e (2011-09-21)
-- Dokumentation beigefuegt
-
-Ver. 0.1d (2011-09-11)
-- Weitere Regressions von 0.1b fixed
-- Fehler in README korrigiert
-- Neuer Zitierstil fr Zeitungsartikel (entrysubtype=newspaper)
-
-Ver. 0.1c (2011-09-10)
-- Regression von 0.1b fixed
-
-Ver. 0.1b (2011-09-09)
-- Umstellung des Eintragstyps von Kommentaren von customa auf
-commentary
-- Umstellung des Eintragstyps von Urteilen von customb auf
-jurisdiction
-- Einfuehrung des Zitationsstils fuer offizielle Dokumente,
-wie Bundestagsdrucksachen: legal
-- statt "besucht am" steht nun vor dem urldate "abgerufen am"
-- Querverweis-Befehl wurde ueberarbeitet (\qverweis)
-- Code bereinigt
-- custom-fields fuer jurisdiction mit biber implementiert
-- Begr. oder aehnliches ist nun auch beim Feld author moeglich,
-nicht nur bei editor
-- Statt "besucht am" steht nun vor dem Datum des letzten Abrufs
-bei Onlinedokumenten im LitVerz "abgerufen am"
-- Eigener Stil fuer inbook wieder entfernt, neben incollection
-unnoetig
-
-Ver. 0.1a (2011-07-27)
-- Ueberarbeitung der README
-- Kleinere Bugfixes
-- Hinzufuegen des Stils inbook
-
-
-Ver. 0.1 (2011/07/23)
-Erstveroeffentlichung
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-juradiss/biber.conf new/doc/latex/biblatex-juradiss/biber.conf
--- old/doc/latex/biblatex-juradiss/biber.conf 2012-07-27 20:20:57.000000000 +0200
+++ new/doc/latex/biblatex-juradiss/biber.conf 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-% biber.conf [2011/07/17 v0.1f biblatex-juradiss]
-% Release Notes can be found in the README.txt
-
-
-<map>
- <bibtex>
- <globalfield>
- decision usera
- sign userb
- officialvolume userc
- officialpages userd
- journalyear usere
- decisionname userf
- </globalfield>
- </bibtex>
-</map>
Binary files old/doc/latex/biblatex-juradiss/biblatex-juradiss.pdf and new/doc/latex/biblatex-juradiss/biblatex-juradiss.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-juradiss/biblatex-juradiss.tex new/doc/latex/biblatex-juradiss/biblatex-juradiss.tex
--- old/doc/latex/biblatex-juradiss/biblatex-juradiss.tex 2012-07-27 20:20:57.000000000 +0200
+++ new/doc/latex/biblatex-juradiss/biblatex-juradiss.tex 2020-03-24 21:50:17.000000000 +0100
@@ -1,12 +1,11 @@
% biblatex-juradiss documentation 2012/07/17 v0.1f
%
-% Copyright (c) 2012 Dr. Tobias Schwan <tobias.schwan(aat)gmx.de>
-
-\begin{filecontents*}{Literaturbeispiele.bib}
-
+% Copyright (c) 2012 Tobias Schwan <tobias.schwan(aat)gmx.de>
+% 2020 Herbert Vo hvoss(a)tug.org
+\begin{filecontents}[force,noheader]{\jobname.bib}
@ARTICLE{Mustermann1999,
author = {Mustermann, Michael},
- title = {Gestaltungsmglichkeiten bei Anreizsystemen},
+ title = {Gestaltungsmglichkeiten bei Anreizsystemen},
journal = {NZG},
year = {1999},
pages = {797-900},
@@ -14,11 +13,11 @@
}
@BOOK{Bruemmerhoff2007,
- author = {Br"ummerhoff, Dieter},
+ author = {Brmmerhoff, Dieter},
gender = {sm},
title = {Finanzwissenschaft},
edition = {9},
- location = {Mnchen u.a.},
+ location = {Mnchen u.a.},
year = {2007},
stand = {ok},
version = {1}
@@ -35,13 +34,13 @@
version = {1}
}
-@BOOK{birk1994,
+@BOOK{Birk1994,
author = {Birk, Dieter},
gender = {sm},
title = {Allgemeines Steuerrecht},
shorttitle = {Allg. Steuerrecht},
edition = {2},
- location = {Mnchen},
+ location = {Mnchen},
year = {1994},
version = {1}
}
@@ -52,7 +51,7 @@
title = {Notwendige Erwerbsaufwendungen},
location = {Berlin},
year = {1998},
- addendum = {zugl.: Diss. jur. Univ. Mnster 1997},
+ addendum = {zugl.: Diss. jur. Univ. Mnster 1997},
}
@COMMENTARY{Duck2009,
@@ -60,7 +59,7 @@
gender = {sm},
title = {Spannendesgesetz, Kommentar},
edition = {2},
- location = {Mnchen},
+ location = {Mnchen},
year = {2009},
}
@@ -69,20 +68,20 @@
editora = {Pantoffel, Frank},
editoratype = {founder},
gender = {pm},
- title = {Handbuch des Rechts, des sonstigen Rechts und briger Gesetze, Kommentar},
+ title = {Handbuch des Rechts, des sonstigen Rechts und briger Gesetze, Kommentar},
shorthand = {Handbuch des Rechts},
edition = {2},
- location = {Mnchen},
+ location = {Mnchen},
year = {2002},
}
@INCOLLECTION{Schwaiger2004,
author = {Schwaiger, Gregor},
- editor = {Grundmann, Stefanie and Haar, Brigitte and Merkt, Hans and Mlbert,
+ editor = {Grundmann, Stefanie and Haar, Brigitte and Merkt, Hans and Mlbert,
Peter and Wellenhof, Marina},
title = {Aufsichtsrat und Autonomie},
pages = {337},
- booktitle = {Unternehmen und Verantwortung, Festschrift fr Klaus J. Hauptmann},
+ booktitle = {Unternehmen und Verantwortung, Festschrift fr Klaus J. Hauptmann},
location = {Berlin},
year = {2004},
stand = {ok},
@@ -92,7 +91,7 @@
@PERIODICAL{Lutz1995,
author = {Lutz, Martin},
gender = {sm},
- title = {Mglichkeiten der Verbesserung},
+ title = {Mglichkeiten der Verbesserung},
journal = {ZHR},
year = {1995},
volume = {159},
@@ -113,7 +112,7 @@
@ONLINE{Hirte2009,
author = {Hirte, Heribert},
title = {Stellungnahme zum Fraktionsentwurf eines Gesetzes zur Angemessenheit
- der Vorstandsvergtung (VorstAG) fr den Deutschen Bundestag},
+ der Vorstandsvergtung (VorstAG) fr den Deutschen Bundestag},
url = {http://www.jura.uni-augsburg.de/fakultaet/lehrstuehle/moellers/materialien/materialdateien/040_deutsche_gesetzgebungsgeschichte/gesetz_angemessenheit_vorstandsverguetung/pdf/stellungnahme_3.pdf},
urldate = {2011-04-03}
}
@@ -121,7 +120,7 @@
@JURISDICTION{bverfg:jubilaeum,
author = {BVerfG},
gender = {sn},
- title = {Jubilumsrckstellung},
+ title = {Jubilumsrckstellung},
decision = {Beschluss},
date = {2009-05-12},
sign = {2 BvL 1/00},
@@ -130,7 +129,7 @@
journaltitle = {FR},
journalyear = {2009},
pages = {873},
- decisionname = {Jubilumsrckstellung},
+ decisionname = {Jubilumsrckstellung},
}
@LEGAL{bt16-12278,
@@ -156,60 +155,44 @@
pages = {3},
gender = {sm},
}
+\end{filecontents}
-\end{filecontents*}
-
+\documentclass[toc=graduated,parskip=half-,DIV=13,fontsize=11pt,paper=a4]{scrartcl}
-\documentclass[ngerman,toc=graduated]{scrartcl}
-
-%
-%
-% Laden der benoetigten Klassen:
-%
-%
-\usepackage{listings}
-\usepackage[T1]{fontenc} % Damit LaTex Umlaute usw. erkennt
-\usepackage[latin1]{inputenc} % Damit klappt die wechselnde Bearbeitung unter
\usepackage{eurosym} % Damit das Euro-Symbol dargestellt werden kann
-\usepackage[german]{babel}
-%\usepackage[usenames]{color}
-\usepackage{ifthen}
-\clubpenalty10000 % gegen Hurenkinder und Schusterjungen, http://de.wikipedia.org/wiki/Hurenkind_und_Schusterjunge
-\widowpenalty10000
-\raggedbottom % Abstaende zwischen Absaetzen nicht zu gross werden lassen
-
-% vbox/hbox-Warnungen reduzieren
-\emergencystretch20pt
-\tolerance2000
+\usepackage{libertinus-otf} % Damit LaTex Umlaute usw. erkennt
+\setmonofont[Scale=MatchLowercase,FakeStretch=0.9]{AnonymousPro}
+\usepackage[ngerman]{babel}
+\usepackage{xurl}
+\usepackage{listings}
+\lstset{basicstyle=\ttfamily}
+\usepackage{dtk-logos}
+\usepackage{enumitem}
+\setlist{nosep}
+%\raggedbottom % Abstaende zwischen Absaetzen nicht zu gross werden lassen
+\usepackage[babel,german=guillemets]{csquotes}
%%%
%%% Hier werden die package-Optionen fuer biblatex gesetzt:
%%%
\usepackage[%
-backend=biber,
-uniquename=true,% Kommt ein Nachname eines Autors mehrfach vor, so wird dieser mit Initialen zitiert.
-singletitle=true,%
-sorting=nyvt,% Sortierreihenfolge im LitVerz: Zuerst nach Name, beim gleichen Autor nach Jahr, Volume und Titel
-sortcites=true,%
-maxnames=3,%
-idemtracker=constrict,%
-style=biblatex-juradiss,% Nutzung des biblatex-Stils biblatex-juradiss
-ibidtracker=false,% Kein ebenda
-datezeros=false,% Keine fhrende Null vor Datumsziffern: 9. 2. 1982 statt 09.02.1988
-date=short,% Datum als Ziffern, keine ausgeschriebenen Monatsnamen
+ uniquename=true,% Kommt ein Nachname eines Autors mehrfach vor, so wird dieser mit Initialen zitiert.
+ singletitle=true,
+ sorting=nyvt,% Sortierreihenfolge im LitVerz: Zuerst nach Name, beim gleichen Autor nach Jahr, Volume und Titel
+ sortcites=true,
+ maxnames=3,
+ idemtracker=constrict,%
+ style=biblatex-juradiss,% Nutzung des biblatex-Stils biblatex-juradiss
+ ibidtracker=false,% Kein ebenda
+ datezeros=false,% Keine fhrende Null vor Datumsziffern: 9. 2. 1982 statt 09.02.1988
+ date=short,% Datum als Ziffern, keine ausgeschriebenen Monatsnamen
]{biblatex}
+\usepackage{xspace}
+\addbibresource{\jobname.bib}
-\bibliography{Literaturbeispiele}
-
-\usepackage[babel,german=guillemets]{csquotes}
-
-
-% Setzt den Erstzeileneinzug im gesamten Dokument auf Null.
-\setlength{\parindent}{0pt}
-
-%%% Kategorien fr die einzelnen Literaturverzeichnisbeispiele
+%%% Kategorien fr die einzelnen Literaturverzeichnisbeispiele
%%% zum Darstellen der LitVerz-Ausgabe beim jew. Beispiel
\DeclareBibliographyCategory{1}
\addtocategory{1}{Mustermann1999}
@@ -241,6 +224,23 @@
\DeclareBibliographyCategory{10}
\addtocategory{10}{Hirte2009}
+\def\b-j{\texttt{biblatex-juradiss}\xspace}
+\def\bib{\texttt{biblatex}\xspace}
+\def\cs#1{\texttt{\textbackslash#1}}
+
+\usepackage{mdframed,xcolor}
+\def\showbib#1{%
+\begin{mdframed}[
+ leftmargin=0pt,
+ rightmargin=0pt,
+ linecolor=black,
+ backgroundcolor=black!10]
+\vspace{-\normalbaselineskip}
+\printbibliography[category=#1]
+\end{mdframed}}
+
+\usepackage[colorlinks,linktocpage,draft]{hyperref}
+
\begin{document}
@@ -249,112 +249,183 @@
%%%%%
\title{biblatex-juradiss}
-\subtitle{Ver. 0.1f}
-\author{Dr. Tobias Schwan}
-\date{17. 7. 2012}
+\subtitle{Ver. 0.21}
+\author{Tobias Schwan \and Herbert Vo}
\maketitle
\tableofcontents
-%%%%%
-% Mainmatter - der Text
-%%%%%
-
-
+\newpage
\section{Einleitung}
-Diese Dokumentation erklrt in kurzen Worten die Anpassungen des Stils biblatex-juradiss und wie man sie nutzen kann. Indirekt werden dabei auch einige Funktionen von biblatex erlutert, auf das biblatex-juradiss aufsetzt. Grundstzlich sollte man bei Fragen zu den Funktionen von biblatex die sehr gute und ausfhrliche Dokumentation von biblatex konsultieren. Ohne zumindest das berfliegen des User-Guide in der biblatex-Dokumentation lsst sich biblatex und biblatex-juradiss nicht sinnvoll verwenden. Inzwischen gibt es auch eine deutsche Fassung.
-
-Zum Schnelleinstieg werden im Kapitel Kurzanleitung die Voraussetzungen zur Verwendung von biblatex-juradiss kurz erlutert. Danach erfolgt die Darstellung der Zitierstile der unterschiedlichen Dokumentenarten mit Beispielen.
+Diese Dokumentation erklrt in kurzen Worten die Anpassungen des Stils \b-j und wie man sie
+nutzen kann. Indirekt werden dabei auch einige Funktionen von \bib erlutert, auf das
+aufsetzt. Grundstzlich sollte man bei Fragen zu den Funktionen von \bib die sehr gute und
+ausfhrliche Dokumentation von \bib konsultieren. Ohne zumindest das berfliegen des
+User-Guide in der \bib"=Dokumentation lsst sich \bib und \b-j nicht sinnvoll verwenden.
+Inzwischen gibt es auch eine deutsche Fassung.
+
+Zum Schnelleinstieg werden im folgenden Abschnitt Kurzanleitung die Voraussetzungen zur Verwendung von \b-j
+kurz erlutert. Danach erfolgt die Darstellung der Zitierstile der unterschiedlichen Dokumentenarten
+mit Beispielen.
-Diese Doku fge ich meinem Paket auch als .tex-Datei an, damit die Funktionsweise des Stils anhand eines konkreten Beispiels besser nachvollzogen werden kann.
+Dieser Dokumentation fge ich meinem Paket auch als \texttt{.tex}-Datei an, damit die Funktionsweise des Stils
+anhand eines konkreten Beispiels besser nachvollzogen werden kann.
\section{Kurzanleitung}
-Anleitung zur Installation von biblatex-juradiss (unter Windows)
+Anleitung zur Installation von \texttt{biblatex-juradiss} (unter Windows), falls man keine offizielle
+Installation von \MiKTeX oder \TeXLive hat; dann wre ohnehin alles vorhanden:
-1. Installation von MikTex\\
-\\
-2. Installation von packages ber den Package Manager:
+1. Installation von Mik\TeX/\TeX Live
+
+2. Installation von packages ber den PackageManager:
\begin{itemize}
-\item biblatex
-\item biblatex-dw
-\item etoolbox
-\item logreq
-\item csquotes
-\\
-\item juramisc (wenn man die Dokumentenklasse hiervon benutzen mchte)
+\item \texttt{biblatex}
+\item \texttt{biblatex-dw}
+\item \texttt{etoolbox}
+\item \texttt{logreq}
+\item \texttt{csquotes}
+\item \texttt{juramisc} (wenn man die Dokumentenklasse hiervon benutzen mchte)
\end{itemize}
\section{Installation}
-
-biblatex-juradiss setzt auf den Paketen biblatex und biblatex-dw auf. Grund hierfr ist, dass biblatex alle Funktionen erst bereitstellt, die es ermglichen individuelle Zitierstile zu entwickeln. Die Zitierweise deutscher Juristen ist allerdings so speziell im Vergleich zu dem sonst blichen, dass es noch zustzlich weiterer Funktionen bedarf, diese vollstndig abzubilden. Diese finden sich in biblatex-dw. Zwar htte man diese auch aus dem Paket herausnehmen und in biblatex-juradiss integrieren knnen, aber der Aufwand hierfr erschien mir zu gro. Zudem ist mit dem gut gepflegten Paket biblatex-dw sichergestellt, dass die von diesem bereitgestellten Funktionen auch trotz der sehr schnellen Entwicklung von biblatex zuverlssig erhalten und kompatibel bleiben.
-
-Dies fhrt dazu, dass zur Verwendung von biblatex-juradiss auch das Paket biblatex-dw vorhanden sein muss. Dessen Funktionen werden ber biblatex-juradiss direkt eingebunden, es muss nicht erst per Paketoption ber biblatex geladen werden.
-
-Um biblatex-juradiss zu verwenden muss dieses als Paketoption von biblatex eingebunden werden. Dies geschieht durch die Option \textbackslash usepackage[style=biblatex-juradiss]\{biblatex\}.
-
-Sofern man die Dateien nicht ber eine TeX-Distribution, wie TeX Live oder MikTeX installiert, kopiert man sie die Dateien biblatex-juradiss.cbx und biblatex-juradiss.bbx in <TEXMFLOCAL>/tex/latex/biblatex-juradiss, wobei
-
-<TEXMFLOCAL> der Wurzelpfad der TeX-Installation ist. Danach muss man den Datei-hash aktualisieren.
-
-Die biber.conf-Datei legt man einfach in den gleichen Ordner, wie die tex-Datei.
+\b-j setzt auf den Paketen \bib und biblatex-dw auf. Grund hierfr ist, dass \bib alle
+Funktionen erst bereitstellt, die es ermglichen individuelle Zitierstile zu entwickeln. Die Zitierweise
+deutscher Juristen ist allerdings so speziell im Vergleich zu dem sonst blichen, dass es noch
+zustzlich weiterer Funktionen bedarf, diese vollstndig abzubilden. Diese finden sich in
+\texttt{biblatex-dw}.
+Zwar htte man diese auch aus dem Paket herausnehmen und in \b-j integrieren knnen, aber der
+Aufwand hierfr erschien mir zu gro. Zudem ist mit dem gut gepflegten Paket \texttt{biblatex-dw}
+sichergestellt, dass die von diesem bereitgestellten Funktionen auch trotz der sehr schnellen
+Entwicklung von \bib zuverlssig erhalten und kompatibel bleiben.
+
+Dies fhrt dazu, dass zur Verwendung von \b-j auch das Paket \texttt{biblatex-dw} vorhanden sein
+muss.
+Dessen Funktionen werden ber \b-j direkt eingebunden, es muss nicht erst per Paketoption ber
+\bib geladen werden.
+
+Um \b-j zu verwenden muss dieses als Paketoption von \bib eingebunden werden. Dies geschieht
+durch die Anweisung
+
+\cs{usepackage[style=biblatex-juradiss]\{biblatex\}}
+
+Sofern man die Dateien nicht ber eine \TeX"=Distribution, wie \TeXLive oder Mik\TeX\ installiert,
+kopiert man die Dateien \texttt{biblatex-juradiss.cbx} und \texttt{biblatex-juradiss.bbx} in das
+Verzeichnis
+
+\texttt{<TEXMFLOCAL>/tex/latex/biblatex-juradiss}
+
+wobei
+\texttt{<TEXMFLOCAL>} der Wurzelpfad der \TeX"=Installation ist. Danach muss man die Dateiliste
+bei \MiKTeX ber das Men oder allgemein durch Ausfhren von \texttt{texhash}
+aktualisieren.
\section{Dokumentenklasse}
-Ich habe fr die Erstellung meiner Doktorarbeit die Dokumentenklasse jurabook aus dem Paket juramisc verwendet. Das Paket bietet viele ntzliche Optionen und integriert bereits die von Juristen verwendete Bezeichnung der Gliederungsebenen (A., I., 1., a), aa), aaa), (1), (a)).
-
-Leider wird das Paket seit einiger Zeit nicht mehr gepflegt, weshalb es inzwischen vielleicht nicht mehr uneingeschrnkt zu empfehlen ist.
+Ich habe fr die Erstellung meiner Doktorarbeit die Dokumentenklasse \texttt{jurabook} aus dem
+Paket \texttt{juramisc} verwendet. Das Paket bietet viele ntzliche Optionen und integriert bereits die
+von Juristen verwendete Bezeichnung der Gliederungsebenen (A., I., 1., a), aa), aaa), (1), (a)).
+
+Leider wird das Paket seit einiger Zeit nicht mehr gepflegt, weshalb es inzwischen vielleicht nicht mehr uneingeschrnkt zu empfehlen ist.
+
+Eine Alternative ist die Verwendung der Dokumentenklasse \texttt{book} und die individuelle
+Anpassung des Inhaltsverzeichnisses. Gerade mit dem Paket \texttt{titletoc} ist das keine groe
+Kunst. Will man seine Doktorarbeit spter in einem Verlag verffentlichen empfielt sich das ohnehin.
+Denn dieser hat oftmals seine eigene LaTeX-Vorlage, die Fragen wie Funotenumbruch und
+Formatierung der Kopfzeilen selbst regelt. Hier kann die Umstellung von \texttt{jurabook} auf die
+verlagsspezifische Vorlage umstndlicher sein, als wenn man das zuvor selbst angepasst hat (so war
+es jedenfalls bei mir), denn dann kann man die eigenen Anpassungen durch die des Verlags ersetzen,
+bei \texttt{jurabook} wusste ich im Nachhinein nicht mehr, welche Anpassung auf \texttt{jurabook}
+abzielte und welche auf generelle Dinge, wie den Funotenumbruch.
+
+
+\section{Verhltnis zu \texttt{biblatex-jura}}
+
+
+\texttt{biblatex-jura} hat ebenso wie dieses Paket das Ziel das Schreiben juristischer Texte mit
+\LaTeX{} zu
+ermglichen. Dementsprechend hatte ich zu Beginn auch dieses Paket verwendet und versucht, es fr
+meine Bedrfnisse anzupassen. Mit der Zeit musste ich allerdings feststellen, dass es mit der
+weiteren Entwicklung von \bib nicht Schritt hlt. Irgendwann hatte ich es soweit modifiziert, dass es
+sinnvoller wurde, die eigenen Anpassungen direkt auf Basis von \bib zu schreiben.
+
+Eine Mithilfe bei \texttt{biblatex-jura} schien ebenfalls nicht sinnvoll, da dieses sich an den
+Zitiervorgaben
+des Nomos-Verlags orientiert, mein Stil aber meinen Vorstellungen einer Doktorarbeit entsprechen
+sollte. Auerdem verwendet \texttt{biblatex-jura} teilweise interne Funktionen von \bib, die nicht
+dafr
+da sind, durch externe Pakete verwendet oder gendert zu werden. Das fhrte in der Vergangenheit
+zu Inkompatibilitten von \texttt{biblatex-jura} zu neueren Versionen von \bib. Bei meinem Stil setze
+ich
+(nahezu) ausschlielich auf Funktionen von \bib auf, die dieses hierfr anbietet, was die
+Kompatibilitt langfristig erhalten sollte.
-Eine Alternative ist die Verwendung der Dokumentenklasse book und die individuelle Anpassung des Inhaltsverzeichnisses. Gerade mit dem Paket titletoc ist das keine groe Kunst. Will man seine Doktorarbeit spter in einem Verlag verffentlichen empfielt sich das ohnehin. Denn dieser hat oftmals seine eigene LaTeX-Vorlage, die Fragen wie Funotenumbruch und Formatierung der Kopfzeilen selbst regelt. Hier kann die Umstellung von jurabook auf die verlagsspezifische Vorlage umstndlicher sein, als wenn man das zuvor selbst angepasst hat (so war es jedenfalls bei mir), denn dann kann man die eigenen Anpassungen durch die des Verlags ersetzen, bei jurabook wusste ich im Nachhinein nicht mehr, welche Anpassung auf jurabook abzielte und welche auf generelle Dinge, wie den Funotenumbruch.
+\section{Einzelne Eintragstypen}
-\section{Verhltnis zu biblatex-jura}
+Hier stelle ich anhand von Beispielen die einzelnen Eintragstypen vor, die ich fr meinen Stil angepasst habe:
-biblatex-jura hat ebenso wie dieses Paket das Ziel das Schreiben juristischer Texte mit \LaTeX{} zu ermglichen. Dementsprechend hatte ich zu Beginn auch dieses Paket verwendet und versucht, es fr meine Bedrfnisse anzupassen. Mit der Zeit musste ich allerdings feststellen, dass es mit der weiteren Entwicklung von biblatex nicht Schritt hlt. Irgendwann hatte ich es soweit modifziert, dass es sinnvoller wurde, die eigenen Anpassungen direkt auf Basis von biblatex zu schreiben.
-Eine Mithilfe bei biblatex-jura schien ebenfalls nicht sinnvoll, da dieses sich an den Zitiervorgaben des Nomos-Verlags orientiert, mein Stil aber meinen Vorstellungen einer Doktorarbeit entsprechen sollte. Auerdem verwendet biblatex-jura teilweise interne Funktionen von biblatex, die nicht dafr da sind, durch externe Pakete verwendet oder gendert zu werden. Das fhrte in der Vergangenheit zu Inkompatibilitten von biblatex-jura zu neueren Versionen von biblatex. Bei meinem Stil setze ich (nahezu) ausschlielich auf Funktionen von biblatex auf, die dieses hierfr anbietet, was die Kompatibilitt langfristig erhalten sollte.
+\subsection{Eintragstyp \texttt{article}}
-\section{Einzelne Eintragstypen}
+Zeitschriftenartikel werden als Funote\footcite[800]{Mustermann1999}, im laufenden Text als
+\cite[800]{Mustermann1999} oder am Ende so ausgegeben.~\parencite[800]{Mustermann1999}
+\begin{lstlisting}[frame=single,xleftmargin=\fboxsep,xrightmargin=\fboxsep]
+Zeitschriftenartikel werden als Funote\footcite[800]{Mustermann1999}, im
+laufenden Text als \cite[800]{Mustermann1999} oder am Ende so
+ausgegeben.~\parencite[800]{Mustermann1999}
+\end{lstlisting}
+
+Es gibt zwar auch die Mglichkeit die konkrete Fundstelle (hier in runden Klammern) einfach nur
+durch ein Komma zu trennen, aber gerade wenn man mehrere Zitate hintereinander setzt, helfen die
+runden Klammern m.E. beim Trennen der einzelnen Zitate. Die kursive Schrift von Personen frdert
+bei Funoten mit vielen Belegen zudem die Lesbarkeit.
-Hier stelle ich anhand von Beispielen die einzelnen Eintragstypen vor, die ich fr meinen Stil angepasst habe:
+Der Literaturverzeichniseintrag sieht so aus:
+%\hrulefill\vspace{-\normalbaselineskip}
+%\printbibliography[category=1]
+%\hrulefill
+\showbib{1}
-\subsection{Eintragstyp article}
+Teilweise wird inzwischen empfohlen im Literaturverzeichnis nicht nur die Anfangs-, sondern auch
+die Endseite eines Beitrags anzugeben, um zu zeigen, dass man nicht lediglich blind zitiert hat,
+sondern den Beitrag zumindest mal selbst in der Hand hatte. Im naturwissenschaftlichen Bereich ist
+das wohl blicher. Ich finde die Idee nicht schlecht, jedenfalls untersttzt \b-j das auch seit Version
+0.1f.
-Zeitschriftenartikel werden in der Funote so ausgegeben:\footcite[800]{Mustermann1999}\\
-\\
-\cite[800]{Mustermann1999}\\
-\\
-Es gibt zwar auch die Mglichkeit die konkrete Fundstelle (hier in runden Klammern) einfach nur durch ein Komma zu trennen, aber gerade wenn man mehrere Zitate hintereinander setzt, helfen die runden Klammern m.E. beim Trennen der einzelnen Zitate. Die kursive Schrift von Personen frdert bei Funoten mit vielen Belegen zudem die Lesbarkeit.\\
-\\
-Der Literaturverzeichniseintrag sieht so aus:
-\printbibliography[category=1]
+\subsection{Eintragssubtyp \texttt{newsletter}}
-Teilweise wird inzwischen empfohlen im Literaturverzeichnis nicht nur die Anfangs-, sondern auch die Endseite eines Beitrags anzugeben, um zu zeigen, dass man nicht lediglich blind zitiert hat, sondern den Beitrag zumindest mal selbst in der Hand hatte. Im naturwissenschaftlichen Bereich ist das wohl blicher. Ich finde die Idee nicht schlecht, jedenfalls untersttzt biblatex-juradiss das auch seit Version 0.1f.
+Nicht oft, aber manchmal kommt es durchaus vor, dass man in juristischen Texten auch
+Tageszeitungen zitiert (zB die SZ oder die FAZ, in Dissertationen kommt auch schon mal die TAZ vor..)
-\subsection{Eintragssubtyp newsletter}
+Fr Tageszeitungen sieht \bib keinen eigenen Stil vor. Es besteht aber die Mglichkeit eigene Stile fr
+Unterarten von Eintragstypen zu definieren. Ein Eintrag wird einem bestimmten \texttt{entrysubtitle}
+zugeordnet, indem man dem jeweiligen Eintrag in der Literaturdatenbank das Feld
+\texttt{entrysubtype}
+hinzufgt und in diesem den entsprechenden Subtyp angibt.
+Fr Tageszeitungen habe ich das ber den Typ \texttt{newsletter} gemacht. In diesem gibt man bei
+Tageszeitungen neben dem Autor und dem Namen der Zeitschrift das Datum der Ausgabe (Feld
+\texttt{date}, Format: \texttt{JJJJ-MM-TT}), sowie deren Nummer (Feld \texttt{volume}) an.
-Nicht oft, aber manchmal kommt es durchaus vor, dass man in juristischen Texten auch Tageszeitungen zitiert (zB die SZ oder die FAZ, in Disserationen kommt auch schon mal die TAZ vor..)
+\clearpage
-Fr Tageszeitungen sieht biblatex keinen eigenen Stil vor. Es besteht aber die Mglichkeit eigene Stile fr Unterarten von Eintragstypen zu definieren. Ein Eintrag wird einem bestimmten entrysubtitle zugeordnet, indem man dem jeweiligen Eintrag in der Literaturdatenbank das Feld entrysubtype hinzufgt und in diesem den entsprechenden Subtyp angibt.
-Fr Tageszeitungen habe ich das ber den Typ newsletter gemacht. In diesem gibt man bei Tageszeitungen neben dem Autor und dem Namen der Zeitschrift das Datum der Ausgabe (Feld date, Format: JJJJ-MM-TT), sowie deren Nummer (Feld volume) an.\\
-\\
Beispielseintrag:
\begin{lstlisting}
@@ -370,28 +441,37 @@
}
\end{lstlisting}
-Funote:\footcite{Oldag2011}
-\\
-\cite{Oldag2011}\\
-\\
+Ausgabe als Funote\footcite{Oldag2011}, im laufenden Text als
+\cite{Oldag2011} oder am Ende so ausgegeben.~\parencite{Oldag2011}
+
Literaturverzeichniseintrag:
-\printbibliography[category=9]
+
+%\hrulefill\vspace{-\normalbaselineskip}
+%\printbibliography[category=9]
+%\hrulefill
+\showbib{9}
-\subsection{Eintragstyp book}
+\subsection{Eintragstyp \texttt{book}}
-Monografien, also beispielsweise Lehrbcher oder Dissertationen werden in der Funote so ausgegeben:\footcite[55]{Bruemmerhoff2007} \\
-\cite[55]{Bruemmerhoff2007}
-\\
+Monografien, also beispielsweise Lehrbcher oder Dissertationen
+als Funote\footcite[55]{Bruemmerhoff2007}, im laufenden Text als
+\cite[55]{Bruemmerhoff2007} oder am Ende so ausgegeben.~\parencite[55]{Bruemmerhoff2007}
+
Der Literaturverzeichniseintrag sieht so aus:
-\printbibliography[category=2]
-Disserationen sehen in der Funote wie normale Bcher aus:\footcite[231]{Hausmann1998}
-\\
-\cite[231]{Hausmann1998}\\
-\\
-Nur im Literaturverzeichnis fge ich die Universitt der Dissertation usw. in das Feld addendum ein:
+%\hrulefill\vspace{-\normalbaselineskip}
+%\printbibliography[category=2]
+%\hrulefill
+
+\showbib{2}
+
+Disserationen sehen in der Funote\footcite[231]{Hausmann1998}, im laufenden Text
+\cite[231]{Hausmann1998} und am Ende wie normale Bcher aus.~\parencite[231]{Hausmann1998}
+
+Nur im Literaturverzeichnis fge ich die Universitt der Dissertation usw. in das Feld
+\texttt{addendum} ein:
\begin{lstlisting}
@BOOK{Hausmann1998,
@@ -400,49 +480,101 @@
title = {Notwendige Erwerbsaufwendungen},
location = {Berlin},
year = {1998},
- addendum = {zugl.: Diss. jur. Univ. Mnster 1997},
+ addendum = {zugl.: Diss. jur. Univ. Mnster 1997},
}
\end{lstlisting}
-Das wird dann im LitVerz-Eintrag einfach hinten angefgt:
-\printbibliography[category=3]
-
+Das wird dann im LitVerz-Eintrag einfach hinten angefgt:
-Gibt es vom gleichen Autor mehrere Eintrge, wird in die Funote zur Unterscheidung der Titel des Buchs geschrieben, wenn die Funote sonst nicht eindeutig ist.
+%\hrulefill\vspace{-\normalbaselineskip}
+%\printbibliography[category=3]
+%\hrulefill
+\showbib{3}
-Ist bei Monografien das Feld shorttitle definiert, so wird dessen Inhalt genommen, was idR besser aussieht.
-Keine Zuordnungsprobleme bestehen, wenn der weitere Eintrag ein Zeitschriften- oder Festschriftenbeitrag ist, denn diese sind ber den Namen der Zeitschrift oder der Festschrift, der in der Funote stets mit zitiert wird, bereits eindeutig unterscheidbar.\\
-\\
-Beispiel fr zwei Funoten von zwei Monografien eines Autors:\footcites[231]{Birk2008}[34]{Birk1994}\\
-\\
-\cites[231]{Birk2008}[34]{Birk1994}\\
-\\
-Im Literaturverzeichnis wird entsprechend angegeben, wie das jeweilige Werk zitiert wird, der Zusatz \glqq{}zitiert als\grqq{} erscheint bei Zeitschrifen nie, bei Festschriften immer: \printbibliography[category=4]
+Gibt es vom gleichen Autor mehrere Eintrge, wird in die Funote zur Unterscheidung der Titel des Buchs
+geschrieben, wenn die Funote sonst nicht eindeutig ist.
+Ist bei Monografien das Feld \texttt{shorttitle} definiert, so wird dessen Inhalt genommen, was in der
+Regel besser aussieht.
-\subsection{Eintragstyp commentary}
+Keine Zuordnungsprobleme bestehen, wenn der weitere Eintrag ein Zeitschriften- oder
+Festschriftenbeitrag ist, denn diese sind ber den Namen der Zeitschrift oder der Festschrift, der in
+der Funote stets mit zitiert wird, bereits eindeutig unterscheidbar.
+Beispiel fr eine Funote von zwei Monografien eines
+Autors\footcites[231]{Birk2008}[34]{Birk1994}, im laufenden Text als \cites[231]{Birk2008}[34]{Birk1994}
+und am Ende.~\parencites[231]{Birk2008}[34]{Birk1994}
-Die Zitation von juristischen Kommentaren ist die grte Herausforderung fr meinen Stil gewesen.
+\begin{lstlisting}[frame=single,xleftmargin=\fboxsep,xrightmargin=\fboxsep]
+Beispiel fr eine Funote von zwei Monografien eines
+Autors\footcites[231]{Birk2008}[34]{Birk1994}, im laufenden Text als
+\cites[231]{Birk2008}[34]{Birk1994} und am
+Ende.~\parencites[231]{Birk2008}[34]{Birk1994}
+\end{lstlisting}
+Im Literaturverzeichnis wird entsprechend angegeben, wie das jeweilige Werk zitiert wird, der Zusatz
+zitiert als erscheint bei Zeitschriften nie, bei Festschriften immer:
-Zitiert wird ein Kommentar, indem das prenote-Feld genutzt wird. Der cite-Befehl von biblatex kennt ein pre- und ein postnote-Feld. Bei dem Befehl \textbackslash cite[50]\{bibtexkey\} wird das postnote-Feld mit dem Inhalt der eckigen Klammer gefllt (hier die 50). Dessen Inhalt kommt an das Ende des jeweiligen Zitats (deshalb POSTnote-Feld). Das prenote-Feld wird mit dem Inhalt der ersten eckigen Klammer gefllt, wenn man dem bibtex-Schlssel im \textbackslash cite-Befehl zwei eckige Klammern voranstellt: \textbackslash cite[\emph{Bearbeiter}][50]\{bibtexkey\}.\footnote{Mehr zu der Funktionsweise von pre- und postnote-Feldern ist in der Dokumentation von biblatex zu finden.}
+%\hrulefill\vspace{-\normalbaselineskip}
+%\printbibliography[category=4]
+%\hrulefill
+\showbib{4}
+
+
+\subsection{Eintragstyp \texttt{commentary}}
+
+
+Die Zitation von juristischen Kommentaren ist die grte Herausforderung fr meinen Stil gewesen.
+Zitiert wird ein Kommentar, indem das \texttt{prenote}-Feld genutzt wird. Der \cs{cite}-Befehl von
+\bib kennt ein
+\texttt{prenote} und ein \texttt{postnote}-Feld. Bei dem Befehl \cs{cite[50]\{bibtexkey\}} wird das
+\texttt{postnote}-Feld mit dem Inhalt der eckigen Klammer gefllt (hier die 50). Dessen Inhalt kommt
+an das
+Ende des jeweiligen Zitats (deshalb POSTnote-Feld). Das \texttt{prenote}-Feld wird mit dem Inhalt
+der ersten
+eckigen Klammer gefllt, wenn man dem \texttt{bibtex}-Schlssel im \cs{cite}-Befehl zwei eckige
+Klammern voranstellt: \cs{cite[\emph{Bearbeiter}][50]\{bibtexkey\}}.\footnote{Mehr zu der
+Funktionsweise von \texttt{prenote} und \texttt{postnote}-Feldern ist in der Dokumentation von \bib
+zu finden.}
+
+Wird bei Kommentaren die Auflagenzahl angegeben, so wird diese als kleine hochgestellte Zahl
+hinter den Herausgeber, oder den Kommentarnamen geschrieben. So lassen sich Zitate von
+Kommentar"=Bearbeitern aus unterschiedlichen Auflagen recht einfach voneinander unterscheiden.
+
+Das Zitat eines juristischen Kommentars als Funote\footcite[Donald][~4 Rn.~443]{Duck2009},
+im laufenden Text als \cite[Donald][~4 Rn.~443]{Duck2009} oder am Ende.~\parencite[Donald][~4 Rn.~443]{Duck2009}
+
+% Hier habe ich den Code manuell eingegeben, da die Darstellung des Stils danach differenziert,
+%ob er sich in einer Funote befindet oder nicht, das ist hier bei der Doku halt nicht der Fall.
+%Fr diesen Sonderfall wollte ich aber nicht den Stil nochmal umbasteln...
+%\emph{Donald}, in: \emph{Duck\textsuperscript{\tiny{2}}}, ~4 Rn.~443
-Wird bei Kommentaren die Auflagenzahl angegeben, so wird diese als kleine hochgestellte Zahl hinter den Herausgeber, oder den Kommentarnamen geschrieben. So lassen sich Zitate von Kommentar-Bearbeitern aus unterschiedlichen Auflagen recht einfach voneinander unterscheiden.\\
-\\
-Das Zitat eines juristischen Kommentars sieht dann folgendermaen aus:\footcite[Donald][~4 Rn.~443]{Duck2009}\\
-\\
-% Hier habe ich den Code manuell eingegeben, da die Darstellung des Stils danach differenziert, ob er sich in einer Funote befindet oder nicht, das ist hier bei der Doku halt nicht der Fall. Fr diesen Sonderfall wollte ich aber nicht den Stil nochmal umbasteln...
-\emph{Donald}, in: \emph{Duck\textsuperscript{\tiny{2}}}, ~4 Rn.~443\\
-\\
Im Literaturverzeichnis sieht dieser wie folgt aus:
-\printbibliography[category=5]
-Kommentare werden blicherweise mit den Namen der Herausgeber zitiert, genauso blich ist es aber auch, den Namen eines alten Herausgebers als Zitat zu verwenden, oder einen Eigennamen. Hierfr ist das Feld shorthand da. Ist es nicht leer, so wird dessen Inhalt statt die Namen der Herausgeber fr das Funotenzitat verwendet. Will man einem oder mehreren Herausgebern oder Autoren eine bestimmte Eigenschaft zuordnen z.B. Begrnder oder Fortfhrer, so kann man dies, indem man dem Eintrag in der Literaturdatenbank das Feld editortype hinzufgt und in dieses beispielsweise founder schreibt. Unterschiedliche Arten kann man unterscheiden, indem man diese dann in das Feld editora (mit editoratype) usw. eintrgt.\footnote{Mehr hierzu ist in der Dokumentation von biblatex zu finden.} Bei Autoren geht das genauso, nur dass es hier kein authora gibt, sondern stattdessen namea usw.\\
-\\
-Hier ein Kommentar, bei dem ein Herausgeber zugleich Begrnder des Werks war. Auerdem ist es bei diesem blich, ihn mit einem Eigennamen, statt den Herausgebern zu zitieren.
+%\hrulefill\vspace{-\normalbaselineskip}
+%\printbibliography[category=5]
+%\hrulefill
+\showbib{5}
+
+Kommentare werden blicherweise mit den Namen der Herausgeber zitiert, genauso blich ist es
+aber auch, den Namen eines alten Herausgebers als Zitat zu verwenden, oder einen Eigennamen.
+Hierfr ist das Feld \texttt{shorthand} da. Ist es nicht leer, so wird dessen Inhalt statt die Namen der
+Herausgeber fr das Funotenzitat verwendet. Will man einem oder mehreren Herausgebern oder
+Autoren eine bestimmte Eigenschaft zuordnen z.\,B. Begrnder oder Fortfhrer, so kann man dies,
+indem man dem Eintrag in der Literaturdatenbank das Feld \texttt{editortype} hinzufgt und in
+dieses
+beispielsweise \texttt{founder} schreibt. Unterschiedliche Arten kann man unterscheiden, indem man
+diese
+dann in das Feld \texttt{editora} (mit \texttt{editoratype}) usw. eintrgt.\footnote{Mehr hierzu ist in
+der
+Dokumentation von \bib zu finden.} Bei Autoren geht das genauso, nur dass es hier kein
+\texttt{authora} gibt,
+sondern stattdessen \texttt{namea} usw.
+
+Hier ein Kommentar, bei dem ein Herausgeber zugleich Begrnder des Werks war. Auerdem ist es bei
+diesem blich, ihn mit einem Eigennamen, statt den Herausgebern zu zitieren.
-Der Beispielseintrag sieht dann so aus:
+Der Beispieleintrag sieht dann so aus:
\begin{lstlisting}
@COMMENTARY{Gans2002,
@@ -450,206 +582,256 @@
editora = {Pantoffel, Frank},
editoratype = {founder},
gender = {pm},
- title = {Handbuch des Rechts, des sonstigen Rechts und briger
+ title = {Handbuch des Rechts, des sonstigen Rechts und briger
Gesetze, Kommentar},
shorthand = {Handbuch des Rechts},
edition = {2},
- location = {Mnchen},
+ location = {Mnchen},
year = {2002},
}
\end{lstlisting}
-In der Funote sieht der Eintrag dann so aus:\footcite[Schneider][~4 Rn.~443]{Gans2002}
-\\
-% Hier habe ich den Code manuell eingegeben, da die Darstellung des Stils danach differenziert, ob er sich in einer Funote befindet oder nicht, das ist hier bei der Doku halt nicht der Fall. Fr diesen Sonderfall wollte ich aber nicht den Stil nochmal umbasteln...
-\emph{Schneider}, in: \emph{Handbuch des Rechts\textsuperscript{\tiny{2}}}, ~4 Rn.~443.\\
-\\
-Im Literaturverzeichnis sieht dieser wie folgt aus:
-\printbibliography[category=6]
+Der Eintrag als Funote\footcite[Schneider][~4 Rn.~443]{Gans2002}, oder im laufenden
+Text als \cite[Schneider][~4 Rn.~443]{Gans2002}, beziehungsweise ganz am Ende.~\parencite[Schneider][~4 Rn.~443]{Gans2002}
+% Hier habe ich den Code manuell eingegeben, da die Darstellung des Stils danach differenziert,
+%ob er sich in einer Funote befindet oder nicht, das ist hier bei der Doku halt nicht der Fall.
+%Fr diesen Sonderfall wollte ich aber nicht den Stil nochmal umbasteln...
+%\emph{Schneider}, in: \emph{Handbuch des Rechts\textsuperscript{\tiny{2}}}, ~4 Rn.~443.
-\subsection{Eintragstyp incollection}
+Im Literaturverzeichnis sieht dieser wie folgt aus:
+%\hrulefill\vspace{-\normalbaselineskip}
+%\printbibliography[category=6]
+%\hrulefill
+\showbib{6}
-Festschriften haben folgende notwendige Felder im Literaturdatenbank-Eintrag:\\
-author = Name des Festschriftautors\\
-title = Titel der Festschrift\\
-pages = Seitenzahl, an der der Beitrag beginnt\\
-editor = Name des Herausgebers der Festschrift\\
-booktitle = Name der Festschrift\\
-shorttitle = Abkrzung fr die Funote (zB FS Lutter)\\
-\\
-Optional (wie bei allen Monografien), zB:\\
-location = Erscheinungsort der Festschrift\\
-year = Erscheinungsjahr\\
-Hat eine Festschrift viele Herausgeber, kann man einstellen, dass im Literaturverzeichnis nur der erste mit dem Zusatz u.a. genannt wird. Die Anzahl, bis zu der alle Herausgeber genannt werden sollen definiert man ber die Paketoption von biblatex maxnames (ich verwende maxnames=3).\\
-\\
-So sieht die Funote aus:\footcite{Schwaiger2004}\\
-\\
-\cite{Schwaiger2004}\\
-\\
-Im Literaturverzeichnis sieht der Eintrag einer Festschrift mit 5 Herausgebern wie folgt aus:
-\printbibliography[category=7]
-
-
-\subsection{Eintragstyp periodical}
-
-
-Der Eintragstyp periodical ist an sich eine Abwandlung des Eintragstyps article. Er ist gedacht fr Archivzeitschriften, die neben dem Jahrgang auch zustzlich eine laufende Nummer fr das jeweilige Jahr verwenden (zB AR, AcP, ZHR, und fr den Steuerrechtler: DStJG). Die Jahrgangsnummer wird in das Feld Volume eingetragen.\\
-\\
-Funote:\footcite{Lutz1995}
-\\
-\cite{Lutz1995}\\
-\\
-Literaturverzeichniseintrag:
-\printbibliography[category=8]
+\subsection{Eintragstyp \texttt{incollection}}
-\subsection{Eintragstyp online}
+Festschriften haben folgende notwendige Felder im Literaturdatenbank-Eintrag:
+\texttt{author} = Name des Festschriftautors\\
+\texttt{title} = Titel der Festschrift\\
+\texttt{pages} = Seitenzahl, an der der Beitrag beginnt\\
+\texttt{editor} = Name des Herausgebers der Festschrift\\
+\texttt{booktitle} = Name der Festschrift\\
+\texttt{shorttitle} = Abkrzung fr die Funote (zB FS Lutter)
-Dieser Eintragstyp ist fr Dokumente, die nur online zugnglich sind, z.B. Pressemitteilungen oder Stellungnahmen von Verbnden oder Professoren zu Gesetzesvorhaben etc.
+Optional (wie bei allen Monografien), zB:\\
+\texttt{location} = Erscheinungsort der Festschrift\\
+\texttt{year} = Erscheinungsjahr
-Derzeit sieht dieser Eintragstyp lediglich die Felder author, title, shorttitle, sowie url und urldate vor. Die URL wird nur im LitVerz angezeigt, zusammen mit dem Datum des letzten Abrufs (urldate, Format: JJJJ-MM-TT). Wenn ein Shorttitle eingetragen wird, so wird dieser auch in der Funote aufgefhrt.
+Hat eine Festschrift viele Herausgeber, kann man einstellen, dass im Literaturverzeichnis nur der
+erste mit dem Zusatz u.a. genannt wird. Die Anzahl, bis zu der alle Herausgeber genannt werden
+sollen definiert man ber die Paketoption von \bib maxnames (ich verwende \texttt{maxnames=3}).
-Die Ausgabe als Funote erfolgt so:\footcite[3]{Hirte2009}
-\\
-\cite[3]{Hirte2009}\\
-\\
-Der Eintrag im Literaturverzeichnis sieht so aus:
-\printbibliography[category=10]
+So sieht es als Funote\footcite{Schwaiger2004}, so im laufenden Text \cite{Schwaiger2004} und
+so am Ende eines Satzes.~\parencite{Schwaiger2004}
+%\cite{Schwaiger2004}
-\subsection{Eintragstyp jurisdiction}
+Im Literaturverzeichnis sieht der Eintrag einer Festschrift mit fnf Herausgebern wie folgt aus:
+%\hrulefill\vspace{-\normalbaselineskip}
+%\printbibliography[category=7]
+%\hrulefill
+\showbib{7}
-Ein kleines Alleinstellungsmerkmal dieses Stils ist die Untersttzung eines Zitationsstils fr juristische Literatur UND fr Gerichtsurteile, sowie offizielle Dokumente. Hierfr gibt es zwar auch das Paket jurarsp. Es wurde aber in den letzten Jahren nicht mehr weiterentwickelt. In seiner Funktionsvielfalt ist es meinem Stil zwar in vielen Bereichen berlegen und auch den ein oder anderen Darstellungsfehler wegen inzwischen eingetretener Inkompatibilitt konnte ich durch nderung der Paketdateien erreichen. Aber biblatex und jurarsp arbeiten nicht zusammen. So sieht biblatex nicht, dass zwischen zwei Literaturzitaten ein Rechtsprechungszitat ist und wendet die idem-Funktion an. Auch in die \textbackslash cite-Befehle kann man die Rechtsprechungszitate nicht integrieren. Auerdem musste man bibtex immer einmal separat ber die Rechtsprechungs-Bib-Datei laufen lassen. Diese Nachteile haben mich veranlasst einen eigenen Stil fr Rechtsprechungszitate zu schreiben. Dafr dient der Eintragstyp jurisdiction. Genauso wie der Eintragstyp legal ist er von biblatex zwar vorgesehen, enthlt aber keine Zitiervorgaben.
-Der Eintragstyp jurisdiction hat folgende Felder:
-
-\begin{itemize}
+\subsection{Eintragstyp \texttt{periodical}}
-\item author = Name des Gerichts (zB BFH, BVerfG, BGH etc.)
-\item gender = Fr die idem-Funktion (zB dass. bei Eintrag: "'sn"', zB fr das BVerfG, oder ders., dann Eintrag: "'sm"', zB fr den BGH)\footnote{Ausfhrliche Erklrung zu gender in der biblatex-Dokumentation.}
+Der Eintragstyp \texttt{periodical} ist an sich eine Abwandlung des Eintragstyps \texttt{article}. Er ist
+gedacht fr Archivzeitschriften, die neben dem Jahrgang auch zustzlich eine laufende Nummer fr
+das jeweilige Jahr verwenden (zB AR, AcP, ZHR, und fr den Steuerrechtler: DStJG). Die
+Jahrgangsnummer wird in das Feld \texttt{volume} eingetragen.
-\item date = Urteilsdatum in der Form JJJJ-MM-TT
+Als Funote\footcite{Lutz1995}, im laufenden Text als \cite{Lutz1995} und am Ende eines Satzes.~\parencite{Lutz1995}
-\item decision = fr Art der Entscheidung, zB Urteil oder Beschluss
+Literaturverzeichniseintrag:
-\item sign = Aktenzeichen
+%\hrulefill\vspace{-\normalbaselineskip}
+%\printbibliography[category=8]
+%\hrulefill
+\showbib{8}
-\item officialvolume = Name der Entscheidungssammlung oder der Zeitschrift der primren Fundstelle inkl. Band oder Jahrgang (zB BGHZ 31 oder BVerfGE 13, aber auch NJW 2011 oder juris (nv)) Die primre Fundstelle ist oftmals eine Entscheidungssammlung. Hier ist es dann manchmal blich, eine weitere Fundstelle in einer juristischen Zeitschrift anzugeben. Zu diesem Zweck gibt es die Mglichkeit die zweite Fundstelle als sekundre Fundstelle anzugeben. Das ist aber optional.
-\item officialpages = Erste Seite der Entscheidung in der primren Fundstelle
+\subsection{Eintragstyp \texttt{online}}
-\item pages = Erste Seite des Urteils in der sekundren Fundstelle
-\item journaltitle = Zeitschriftenname in der sekundren Fundstelle
+Dieser Eintragstyp ist fr Dokumente, die nur online zugnglich sind, z.\,B. Pressemitteilungen oder
+Stellungnahmen von Verbnden oder Professoren zu Gesetzesvorhaben etc.
-\item journalyear = Zeitschriftenjahrgang in der sekundren Fundstelle
+Derzeit sieht dieser Eintragstyp lediglich die Felder \texttt{author}, \texttt{title}, \texttt{shorttitle},
+sowie \texttt{url} und \texttt{urldate} vor. Die URL wird nur im LitVerz angezeigt, zusammen mit dem
+Datum des letzten Abrufs (\texttt{urldate}, Format: \texttt{JJJJ-MM-TT}). Wenn ein \texttt{shorttitle}
+eingetragen wird, so wird dieser auch in der Funote aufgefhrt.
-\item decisionname = Entscheidungsname (zB. Centros oder Herrenreiter)
+Ausgabe als Funote\footcite[3]{Hirte2009}, im laufenden Text als \cite[3]{Hirte2009} oder am Ende
+eines Satzes.~\parencite[3]{Hirte2009}
-\end{itemize}
+%\cite[3]{Hirte2009}
-Will man die obigen Feldnamen (also decision und sign usw.) in seiner Literaturdatenbank verwenden, so muss man biblatex zwingend mit biber benutzen und nicht mit bibtex. Denn biblatex bringt zwar von Hause aus den Eintragstyp jurisdiction mit, aber keine Felder die speziell fr diesen Eintragstyp bentigt werden, also Felder fr das Aktenzeichen, die primre und sekundre Fundstelle usw. Um benutzerdefinierte Felder verwenden zu knnen bietet biblatex nur die Mglichkeit die Felder user[a-f] zu verwenden. Da der Typ jurisdiction fast nur aus benutzerdefinierten Feldern besteht, wrde das die Eingabe von Eintrgen in die Literaturdatenbank schwierig machen. biber bietet dafr die Mglichkeit in der Literaturdatenbank eigene Feldnamen zu verwenden, die dann bei Erstellung des LaTeX-Dokuments in die internen Feldnamen von biblatex umbenannt werden. Intern arbeitet mein Stil daher mit user[a-f], in der Literaturdatenbank knnen aber die aussagekrftigen Namen verwendet werden.
+Der Eintrag im Literaturverzeichnis sieht so aus:
-Damit das klappt, muss man biber aktivieren:
+%\hrulefill\vspace{-\normalbaselineskip}
+%\printbibliography[category=10]
+%\hrulefill
+\showbib{10}
+
+
+\subsection{Eintragstyp \texttt{jurisdiction}}
+
+
+Ein kleines Alleinstellungsmerkmal dieses Stils ist die Untersttzung eines Verweisstils fr
+juristische Literatur UND fr Gerichtsurteile, sowie offizielle Dokumente. Hierfr gibt es zwar auch
+das Paket \texttt{jurarsp}. Es wurde aber in den letzten Jahren nicht mehr weiterentwickelt. In seiner
+Funktionsvielfalt ist es meinem Stil zwar in vielen Bereichen berlegen und auch den ein oder
+anderen Darstellungsfehler wegen inzwischen eingetretener Inkompatibilitt konnte ich durch
+nderung der Paketdateien erreichen. Aber \bib und \texttt{jurarsp} arbeiten nicht zusammen. So
+sieht \bib
+nicht, dass zwischen zwei Literaturzitaten ein Rechtsprechungszitat ist und wendet die
+idem-Funktion an. Auch in die \cs{cite}-Befehle kann man die Rechtsprechungszitate nicht
+integrieren. Auerdem musste man \texttt{bibtex} immer einmal separat ber die
+Rechtsprechungs"=Bibdatei laufen lassen. Diese Nachteile haben mich veranlasst einen eigenen Stil
+fr Rechtsprechungszitate zu schreiben. Dafr dient der Eintragstyp \texttt{jurisdiction}. Genauso wie
+der
+Eintragstyp legal ist er von \bib zwar vorgesehen, enthlt aber keine Zitiervorgaben.
-\begin{lstlisting}
+Der Eintragstyp jurisdiction hat folgende Felder:
-\usepackage[%
-backend=biber, %
+\begin{itemize}
-[...]
+\item \texttt{author} = Name des Gerichts (zB BFH, BVerfG, BGH etc.)
+\item \texttt{gender} = Fr die idem-Funktion (zB dass. bei Eintrag: "'sn"', zB fr das BVerfG, oder
+ders., dann Eintrag: "'sm"', zB fr den BGH)\footnote{Ausfhrliche Erklrung zu \texttt{gender} in der
+\bib"=Dokumentation.}
+\item \texttt{date} = Urteilsdatum in der Form JJJJ-MM-TT
+\item \texttt{decision} = fr Art der Entscheidung, zB Urteil oder Beschluss
+\item \texttt{sign} = Aktenzeichen
+\item \texttt{officialvolume} = Name der Entscheidungssammlung oder der Zeitschrift der primren
+Fundstelle inkl. Band oder Jahrgang (zB BGHZ 31 oder BVerfGE 13, aber auch NJW 2011 oder juris
+(nv)) Die primre Fundstelle ist oftmals eine Entscheidungssammlung. Hier ist es dann manchmal
+blich, eine weitere Fundstelle in einer juristischen Zeitschrift anzugeben. Zu diesem Zweck gibt es
+die Mglichkeit die zweite Fundstelle als sekundre Fundstelle anzugeben. Das ist aber optional.
+\item \texttt{officialpages} = Erste Seite der Entscheidung in der primren Fundstelle
+\item \texttt{pages} = Erste Seite des Urteils in der sekundren Fundstelle
+\item \texttt{journaltitle} = Zeitschriftenname in der sekundren Fundstelle
+\item \texttt{journalyear} = Zeitschriftenjahrgang in der sekundren Fundstelle
+\item \texttt{decisionname} = Entscheidungsname (zB. Centros oder Herrenreiter)
+\end{itemize}
-]{biblatex}
+Will man die obigen Feldnamen (also \texttt{decision} und \texttt{sign} usw.) in seiner
+Literaturdatenbank verwenden,
+so muss man \bib zwingend mit \texttt{biber} benutzen und nicht mit \texttt{bibtex}. Denn \bib
+bringt zwar von
+Hause aus den Eintragstyp \texttt{jurisdiction} mit, aber keine Felder die speziell fr diesen
+Eintragstyp
+bentigt werden, also Felder fr das Aktenzeichen, die primre und sekundre Fundstelle usw. Um
+benutzerdefinierte Felder verwenden zu knnen bietet \bib nur die Mglichkeit die Felder user[a-f]
+zu verwenden. Da der Typ \texttt{jurisdiction} fast nur aus benutzerdefinierten Feldern besteht,
+wrde das
+die Eingabe von Eintrgen in die Literaturdatenbank schwierig machen. \texttt{biber} bietet dafr die
+Mglichkeit in der Literaturdatenbank eigene Feldnamen zu verwenden, die dann bei Erstellung des
+\LaTeX"=Dokuments in die internen Feldnamen von \bib umbenannt werden. Intern arbeitet mein Stil
+daher mit user[a-f], in der Literaturdatenbank knnen aber die aussagekrftigen Namen verwendet
+werden.
-\end{lstlisting}
-
-Zudem muss man die Datei biber.conf in dem Ordner anlegen, in dem die .tex-Datei liegt. Diese hat dann folgenden Inhalt:
+Die Festlegung erfolgt durch:
\begin{lstlisting}
-
-<map>
- <bibtex>
- <globalfield>
- decision usera
- sign userb
- officialvolume userc
- officialpages userd
- journalyear usere
- decisionname userf
- </globalfield>
- </bibtex>
-</map>
-
+ \maps[datatype=bibtex]{%
+ \map{
+ \step[fieldsource=decision, fieldtarget=usera]
+ \step[fieldsource=sign, fieldtarget=userb]
+ \step[fieldsource=officialvolume, fieldtarget=userc]
+ \step[fieldsource=officialpages, fieldtarget=userd]
+ \step[fieldsource=journalyear, fieldtarget=usere]
+ \step[fieldsource=decisionname, fieldtarget=userf]
+ }
+ }
\end{lstlisting}
-Will man stattdessen bibtex verwenden, so ist dies ebenfalls mglich, statt der genannten Feldnamen, die biblatex nicht kennt muss man dann die Felder user[a-f] verwenden. Die Zuordnung kann man einfach aus dem Inhalt der biber.conf entnehmen (beispielsweise heit das Feld decision fr biblatex intern usera).
-\\
-Die Ausgabe als Funote erfolgt so:\footcite[3]{bverfg:jubilaeum}\\
-\\
-\cite[3]{bverfg:jubilaeum}\\
-\\
-Einen Eintrag fr das Literaturverzeichnis kann ich derzeit noch nicht prsentieren. Bisher habe ich nicht vor, ein eigenes Rechtsprechungsverzeichnis in meiner Promotion anzugeben. Daher habe ich bisher auch noch keine Energie in die Erstellung eines solchen Verzeichnisses investiert.
+Ausgabe als Funote\footcite[3]{bverfg:jubilaeum}, im laufenden Text als \cite[3]{bverfg:jubilaeum}
+oder am Ende eines Satzes.~\parencite[3]{bverfg:jubilaeum}
+
+Einen Eintrag fr das Literaturverzeichnis kann ich derzeit noch nicht prsentieren. Bisher habe ich nicht vor,
+ein eigenes Rechtsprechungsverzeichnis in meiner Promotion anzugeben. Daher habe ich bisher auch noch keine
+Energie in die Erstellung eines solchen Verzeichnisses investiert.
\label{nichtinslitverz}
-Damit die Rechtsprechungszitate nicht doch in komischer Form im Literaturverzeichnis auftauchen sollte man diese beim Aufruf des Literaturverzeichnisses durch die Option nottype=jurisdiction auen vor lassen. Das gleiche gilt fr den Eintragstyp legal:
+Damit die Rechtsprechungszitate nicht doch in komischer Form im Literaturverzeichnis auftauchen
+sollte man diese beim Aufruf des Literaturverzeichnisses durch die Option
+\texttt{nottype=jurisdiction} auen vor lassen. Das gleiche gilt fr den Eintragstyp \texttt{legal}:
Beispiel:
\begin{lstlisting}
\printbibliography[nottype=jurisdiction,nottype=legal]
\end{lstlisting}
+\begin{mdframed}[
+ leftmargin=0pt,
+ rightmargin=0pt,
+ linecolor=black,
+ backgroundcolor=black!10]
+\vspace{-\normalbaselineskip}
+\printbibliography[nottype=jurisdiction,nottype=legal]
+\end{mdframed}
-\subsection{Eintragstyp legal}
+\subsection{Eintragstyp \texttt{legal}}
-Zuletzt soll noch der Eintragstyp legal vorgestellt werden. Fr diesen gilt das gleiche, wie zum Eintragstyp jurisdiction. Nur eigene Feldnamen mssen hier nicht konvertiert werden, da ich hier in -- wie ich finde gerade noch vertretbarer Weise -- bestehende Felder verwende.
+Zuletzt soll noch der Eintragstyp \texttt{legal} vorgestellt werden. Fr diesen gilt das gleiche, wie
+zum Eintragstyp \texttt{jurisdiction}. Nur eigene Feldnamen mssen hier nicht konvertiert werden, da
+ich hier in -- wie ich finde gerade noch vertretbarer Weise -- bestehende Felder verwende.
-Das Feld journaltitle enthlt dabei die Bezeichnung der jeweiligen Verffentlichung, zB BT-Drs., oder BMF-Schreiben. Das Feld journalsubtitle enthlt dann die Bezeichnung des konkreten Dokuments, zB 16/12278 oder v.~5.~5.~2011.
+Das Feld \texttt{journaltitle} enthlt dabei die Bezeichnung der jeweiligen Verffentlichung, zB
+BT-Drs., oder BMF-Schreiben. Das Feld \texttt{journalsubtitle} enthlt dann die Bezeichnung des
+konkreten Dokuments, zB 16/12278 oder v.~5.~5.~2011.
Ein Eintrag in der Literaturdatenbank sieht dann beispielsweise so aus:
\begin{lstlisting}
-
@LEGAL{bt16-12278,
journalsubtitle = {16/12278},
journaltitle = {BT-Drs.},
title = {BT-Drucksache 16/12278}
}
-
\end{lstlisting}
-Da es das besondere von offiziellen Dokumenten ist, dass man keinen Autor angibt (denn dieser ergibt sich aus dem Namen des Dokuments) ist dieser auch nicht vorgesehen.
-\\
-Die Ausgabe als Funote erfolgt dann so:\footcite[3]{bt16-12278}\\
-\\
-\cite[3]{bt16-12278}\\
-\\
-Ein Verzeichnis der offiziellen Dokumente habe ich derzeit ebenfalls nicht fr meine Promotion geplant, dementsprechend gibt es hierfr auch noch keinen Stil.
+Da es das besondere von offiziellen Dokumenten ist, dass man keinen Autor angibt (denn dieser ergibt sich aus dem Namen des
+Dokuments) ist dieser auch nicht vorgesehen.
+
+Ausgabe als Funote\footcite[3]{bt16-12278}, im laufenden Text als \cite[3]{bt16-12278} oder
+am Ende eines Satzes.~\parencite[3]{bt16-12278}
-Auch hier ist zu beachten, dass der Eintragstyp beim Darstellen des Literaturverzeichnisses auen vor gelassen werden sollte.\footnote{Vgl. oben \qverweis{nichtinslitverz}.}
+Ein Verzeichnis der offiziellen Dokumente habe ich derzeit ebenfalls nicht fr meine Promotion geplant, dementsprechend gibt
+es hierfr auch noch keinen Stil.
+
+Auch hier ist zu beachten, dass der Eintragstyp beim Darstellen des Literaturverzeichnisses auen vor gelassen werden
+sollte.\footnote{Vgl. oben \qverweis{nichtinslitverz}.}
\section{Anleitung zur Anpassung der Stilvorgaben}
-Nun ist der Stil der Zitate sehr an meinen Vorstellungen orientiert. Hier spielt der individuelle Geschmack auch immer eine Rolle. Dieser Stil soll damit zunchst alles mitbringen, um \LaTeX{} fr juristische Texte verwenden zu knnen und der konkrete Stil soll hierfr als Beispiel dienen, was man damit machen kann. Gerade die Optik der Zitate und der Darstellung des Literaturverzeichnisses lsst sich aber mit sehr einfachen Mitteln anpassen.
+Nun ist der Stil der Zitate sehr an meinen Vorstellungen orientiert. Hier spielt der individuelle Geschmack auch immer eine Rolle. Dieser Stil soll damit zunchst alles mitbringen, um \LaTeX{} fr juristische Texte verwenden zu knnen und der konkrete Stil soll hierfr als Beispiel dienen, was man damit machen kann. Gerade die Optik der Zitate und der Darstellung des Literaturverzeichnisses lsst sich aber mit sehr einfachen Mitteln anpassen.
Hier ein kleines Beispiel:
-Mchte man beispielsweise, dass auch bei Zeitschriften stets ein in: zwischen Autor und Zeitschriftenname steht, so kopiert man den bisherigen Code fr die Darstellung von Zeitschriftenartikeln in die Prambel des eigenen Dokuments und passt diesen den eigenen Vorstellungen an:\\
-\\
-Schritt 1: Kopieren des entsprechenden Codes aus der biblatex-juradiss.cbx (die cbx-Dateien enthalten Code fr Zitate, die bbx-Dateien enthalten Code fr das Literaturverzeichnis)\\
-\\
-Schritt 2: Einfgen des Codes zwischen \textbackslash documentclass und \textbackslash begin\{document\}:
+Mchte man beispielsweise, dass auch bei Zeitschriften stets ein in: zwischen Autor und
+Zeitschriftenname steht, so kopiert man den bisherigen Code fr die Darstellung von
+Zeitschriftenartikeln in die Prambel des eigenen Dokuments und passt diesen den eigenen
+Vorstellungen an:
-\begin{lstlisting}
+Schritt 1: Kopieren des entsprechenden Codes aus der biblatex-juradiss.cbx (die cbx-Dateien
+enthalten Code fr Zitate, die bbx-Dateien enthalten Code fr das Literaturverzeichnis)
+Schritt 2: Einfgen des Codes zwischen \cs{documentclass} und \cs{begin\{document\}}:
+
+\begin{lstlisting}
\DeclareBibliographyDriver{cite:article}{%
\printfield{journaltitle}
\printfield{year}%
@@ -658,13 +840,12 @@
\printfield{pages}}%
{}%
}
-
\end{lstlisting}
-Schritt 3: Anpassen des Codes. Hier fgen wir einfach nur das in: vor dem Zeitschriftennamen ein. Da es hierfr bereits ein Bibmacro von biblatex gibt, verwenden wir dieses:
+Schritt 3: Anpassen des Codes. Hier fgen wir einfach nur das in: vor dem Zeitschriftennamen ein. Da
+es hierfr bereits ein Bibmacro von \bib gibt, verwenden wir dieses:
\begin{lstlisting}
-
\DeclareBibliographyDriver{cite:article}{%
\usebibmacro{in:}% <---
\printfield{journaltitle}
@@ -674,37 +855,52 @@
\printfield{pages}}%
{}%
}
-
\end{lstlisting}
-Das war es auch schon. Um Nheres ber die Mglichkeiten zu erfahren, wie man die Darstellung von Zitaten und des Literaturverzeichnisses anpassen kann, empfehle ich die Dokumentation von biblatex.
+Das war es auch schon. Um Nheres ber die Mglichkeiten zu erfahren, wie man die Darstellung von
+Zitaten und des Literaturverzeichnisses anpassen kann, empfehle ich die Dokumentation von \bib.
-Weitere Beispiele werde ich mglicherweise in einer weiteren Version dieser Doku zeigen. Wenn sich Mitstreiter fr dieses Projekt finden, sollte es in spteren Versionen mglich sein, Optionen in das Paket einzubauen, mit denen man die Darstellung steuern kann, ohne den Code hndisch anpassen zu mssen.
+Weitere Beispiele werde ich mglicherweise in einer weiteren Version dieser Doku zeigen. Wenn sich
+Mitstreiter fr dieses Projekt finden, sollte es in spteren Versionen mglich sein, Optionen in das
+Paket einzubauen, mit denen man die Darstellung steuern kann, ohne den Code hndisch anpassen zu mssen.
\section{Weitere Anpassungen}
-Neben der Anpassung und Neuentwicklung von Zitierstilen habe ich einige weitere Anpassungen vorgenommen. Die ich hier nun kurz darstellen will.
+Neben der Anpassung und Neuentwicklung von Zitierstilen habe ich einige weitere Anpassungen vorgenommen.
+Die ich hier nun kurz darstellen will.
\subsection{Darstellung mehrerer Personen mit gleichem Nachnamen}
+Zitiert man verschiedene Personen mit gleichem Nachnamen, so wird derjenige automatisch mit Initialien zitiert.
+Diese sind, wie alle Eigennamen kursiv gedruckt. Auerdem habe ich den Abstand zwischen den Initialen und dem Nachnamen ein wenig verkleinert.
+
+Beispiel: Wenn man Werke von Ferdinand und Paul Kirchhof zitiert, geht das als Funote\footcites[1167]{Kirchhof2000}[5]{Kirchhof2006},
+im laufenden Text als \cites[1167]{Kirchhof2000}[5]{Kirchhof2006} oder am Ende eines Satzes.~\parencites[1167]{Kirchhof2000}[5]{Kirchhof2006}
+
+\begin{lstlisting}[frame=single,xleftmargin=\fboxsep,xrightmargin=\fboxsep]
+Wenn man Werke von Ferdinand und Paul Kirchhof zitiert, geht das als
+Funote\footcites[1167]{Kirchhof2000}[5]{Kirchhof2006}, im laufenden Text als
+\cites[1167]{Kirchhof2000}[5]{Kirchhof2006} oder am Ende eines
+Satzes.~\parencites[1167]{Kirchhof2000}[5]{Kirchhof2006}
+\end{lstlisting}
+
+
-Zitiert man verschiedene Personen mit gleichem Nachnamen, so wird derjenige automatisch mit Initialien zitiert. Diese sind, wie alle Eigennamen kursiv gedruckt. Auerdem habe ich den Abstand zwischen den Initialen und dem Nachnamen ein wenig verkleinert.\\
-\\
-Beispiel: Wenn man Werke von Ferdinand und Paul Kirchhof zitiert, sieht das wie folgt aus:\footcites[1167]{Kirchhof2000}[5]{Kirchhof2006}\\
-\\
-\cites[1167]{Kirchhof2000}[5]{Kirchhof2006}\\
-\\
-Die Darstellung im Literaturverzeichnis ndert sich nicht.
+Die Darstellung im Literaturverzeichnis ndert sich nicht.
\subsection{Querverweis}
\label{querverweis}
-Zudem habe ich einen Kurzbefehl eingefhrt, den ich recht ntzlich finde. Mit \textbackslash qverweis\{\} kann man auf eine andere Stelle im Dokument verweisen. Die Stelle wird mit \textbackslash label\{Name\} markiert. Der Befehl \textbackslash qverweis\{Name\} fgt an der Stelle dann stets den jeweiligen Gliederungspunkt und die Seite ein, auf der sich die Markierung befindet.\footnote{Z.B. vgl. hierzu die das derzeitige Kapitel Querverweis, unter \qverweis{querverweis}.}
+Zudem habe ich einen Kurzbefehl eingefhrt, den ich recht ntzlich finde. Mit \cs{qverweis\{\}} kann
+man auf eine andere Stelle im Dokument verweisen. Die Stelle wird mit \cs{label\{Name\}} markiert.
+Der Befehl \cs{qverweis\{Name\}} fgt an der Stelle dann stets den jeweiligen Gliederungspunkt und
+die Seite ein, auf der sich die Markierung befindet.\footnote{Z.B. vgl. hierzu die das derzeitige Kapitel
+Querverweis, unter \qverweis{querverweis}.}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-juradiss.doc.tlpobj new/tlpkg/tlpobj/biblatex-juradiss.doc.tlpobj
--- old/tlpkg/tlpobj/biblatex-juradiss.doc.tlpobj 2019-02-28 03:20:29.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-juradiss.doc.tlpobj 2020-03-25 16:13:08.000000000 +0100
@@ -1,10 +1,10 @@
name biblatex-juradiss.doc
category Package
-revision 29252
+revision 54515
shortdesc doc files of biblatex-juradiss
relocated 1
-docfiles size=60
+docfiles size=38
+ RELOC/doc/latex/biblatex-juradiss/Changes
RELOC/doc/latex/biblatex-juradiss/README
- RELOC/doc/latex/biblatex-juradiss/biber.conf
RELOC/doc/latex/biblatex-juradiss/biblatex-juradiss.pdf
RELOC/doc/latex/biblatex-juradiss/biblatex-juradiss.tex
++++++ biblatex-juradiss.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-juradiss/biblatex-juradiss.bbx new/tex/latex/biblatex-juradiss/biblatex-juradiss.bbx
--- old/tex/latex/biblatex-juradiss/biblatex-juradiss.bbx 2012-07-27 20:20:57.000000000 +0200
+++ new/tex/latex/biblatex-juradiss/biblatex-juradiss.bbx 2020-03-24 21:50:17.000000000 +0100
@@ -1,7 +1,7 @@
-% biblatex-juradiss.bbx, Dr. Tobias Schwan 2012
-
-\ProvidesFile{biblatex-juradiss.bbx}[2012/07/17 v0.1f biblatex bibliography style]
-% Release Notes can be found in the README.txt
+% biblatex-juradiss.bbx, Tobias Schwan 2012
+% nderungen von Herbert Vo -- 2020-03-17
+\ProvidesFile{biblatex-juradiss.bbx}[2020/03/24 v0.21 biblatex bibliography style]
+% Release Notes can be found in the README
\RequireBibliographyStyle{authortitle-dw}%
@@ -12,7 +12,7 @@
% wg. Zusatz wie NJW oder FS X. Benoetigt backend=biber
\ExecuteBibliographyOptions[online,book]{singletitle=true}
-% Zustzlicher Abstand zwischen den LitVerz-Eintrgen
+% Zustzlicher Abstand zwischen den LitVerz-Eintrgen
\setlength{\bibitemsep}{3pt}%
% Trennzeichen hinter dem Namen im LitVerz
@@ -21,9 +21,9 @@
% Reihenfolge der Namen im LitVerz: Nachname, Vorname und Nachname, Vorname usw.
\DeclareNameFormat{sortname}{% Bibliographie
\mkbibemph{%
- \iffirstinits%
- {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}%
- {\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}}%
+ \ifgiveninits
+ {\usebibmacro{name:family-given}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffix}}%
+ {\usebibmacro{name:family-given}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}}%
\usebibmacro{name:andothers}%
}
}
@@ -111,6 +111,106 @@
{\printfield{shorthand}}%
\usebibmacro{finentry}}%
+% LitVerz-Format von Rechtsprechungszitaten
+\DeclareBibliographyDriver{jurisdiction}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{author/editor}%
+ \newunit
+ \usebibmacro{namex}% <-- Begr. u als Autoren
+ \usebibmacro{editorx}% <-- Begr. u als Hrsg.
+ \setunit{\labelnamepunct}\newblock
+ \usebibmacro{maintitle+title}%
+ \newunit
+% \printlist{language}%
+% \newunit\newblock
+ \usebibmacro{volumes+volume+part}%
+ \setunit{\addspace}%
+ \usebibmacro{series+number}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \printfield{edition}%
+ \newunit\newblock
+ \usebibmacro{publisher+location+date}%
+ \newunit\newblock
+ \usebibmacro{chapter+pages}%
+ \newunit
+% \printfield{pagetotal}
+% \newunit\newblock
+% \printfield{isbn}%
+% \newunit\newblock
+% \printfield{doi}%
+% \newunit\newblock
+ \usebibmacro{url+urldate}%
+ \newunit\newblock
+ \printfield{addendum}%
+ \newunit\newblock
+ \addcomma\addspace% <-- 'zitiert als: Bearbeiter in XYZ'
+ \mkbibemph{%
+ zitiert\addnbspace% <--
+ als\addcolon\addspace% <--
+ Bearbeiter\addcomma}% <--
+ \usebibmacro{in:}%
+ \iffieldundef{shorthand}%
+ {%
+ \setboolean{zitiertals}{true}%
+ \printnames{labelname}%
+ \setboolean{zitiertals}{false}%
+ }%
+ {\printfield{shorthand}}%
+ \usebibmacro{finentry}}%
+
+
+% LitVerz-Format von Parlaments- und Verwaltungsvorschriften
+\DeclareBibliographyDriver{legal}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{author/editor}%
+ \newunit
+ \usebibmacro{namex}% <-- Begr. u als Autoren
+ \usebibmacro{editorx}% <-- Begr. u als Hrsg.
+ \setunit{\labelnamepunct}\newblock
+ \usebibmacro{maintitle+title}%
+ \newunit
+% \printlist{language}%
+% \newunit\newblock
+ \usebibmacro{volumes+volume+part}%
+ \setunit{\addspace}%
+ \usebibmacro{series+number}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \printfield{edition}%
+ \newunit\newblock
+ \usebibmacro{publisher+location+date}%
+ \newunit\newblock
+ \usebibmacro{chapter+pages}%
+ \newunit
+% \printfield{pagetotal}
+% \newunit\newblock
+% \printfield{isbn}%
+% \newunit\newblock
+% \printfield{doi}%
+% \newunit\newblock
+ \usebibmacro{url+urldate}%
+ \newunit\newblock
+ \printfield{addendum}%
+ \newunit\newblock
+ \addcomma\addspace% <-- 'zitiert als: Bearbeiter in XYZ'
+ \mkbibemph{%
+ zitiert\addnbspace% <--
+ als\addcolon\addspace% <--
+ Bearbeiter\addcomma}% <--
+ \usebibmacro{in:}%
+ \iffieldundef{shorthand}%
+ {%
+ \setboolean{zitiertals}{true}%
+ \printnames{labelname}%
+ \setboolean{zitiertals}{false}%
+ }%
+ {\printfield{shorthand}}%
+ \usebibmacro{finentry}}%
+
+
% LitVerz-Format von Bchern
% Ein 'zitiert als:' bei Bchern, wenn vom gleichen Autor mehrere Werke zitiert werden
\DeclareBibliographyDriver{book}{%
@@ -346,16 +446,16 @@
\renewcommand*{\bibmultinamedelim}{%
\ifbool{zitiertals}%
{\ifnum\value{liststop}>2 \finalandcomma\fi
- \unspace\rm{\slash}\unspace}%
+ \unspace\rmfamily{\slash}\unspace}%
{\ifnum\value{liststop}>2 \finalandcomma\fi
- \addspace\rm{\slash}\addspace}}%
+ \addspace\rmfamily{\slash}\addspace}}%
\renewcommand*{\bibfinalnamedelim}{%
\ifbool{zitiertals}%
{\ifnum\value{liststop}>2 \finalandcomma\fi
- \unspace\rm{\slash}\unspace}%
+ \unspace\rmfamily{\slash}\unspace}%
{\ifnum\value{liststop}>2 \finalandcomma\fi
- \addspace\rm{\slash}\addspace}}%
+ \addspace\rmfamily{\slash}\addspace}}%
% Verschiedene Hrsg. u. Begr. etc fr einen Titel
\newbibmacro*{editorx}{%
@@ -397,7 +497,7 @@
\global\undef\bbx@lasthash}%
}%
-% Verschiedene Hrsg. u. Begr. etc fr ein Werk
+% Verschiedene Hrsg. u. Begr. etc fr ein Werk
\newbibmacro*{editorxstrg}[1]{%
\iffieldundef{#1type}
{\ifthenelse{\value{#1}>1\OR\ifandothers{#1}}
@@ -484,13 +584,18 @@
% Statt "besucht am" soll "abgerufen am" vor dem Datum des letzten Abrufs stehen
\DefineBibliographyStrings{german}{urlseen = {abgerufen am}}%
-% LitVerz-Format von Rechtsprechungszitaten
-% Bisher mangels Bedrfnis nicht erstellt
-\DeclareBibliographyDriver{jurisdiction}{}
-
-% LitVerz-Format von Parlaments- und Verwaltungsvorschriften
-% Bisher mangels Bedrfnis nicht erstellt
-\DeclareBibliographyDriver{legal}{}
+\DeclareStyleSourcemap{%
+ \maps[datatype=bibtex]{%
+ \map{
+ \step[fieldsource=decision, fieldtarget=usera]
+ \step[fieldsource=sign, fieldtarget=userb]
+ \step[fieldsource=officialvolume, fieldtarget=userc]
+ \step[fieldsource=officialpages, fieldtarget=userd]
+ \step[fieldsource=journalyear, fieldtarget=usere]
+ \step[fieldsource=decisionname, fieldtarget=userf]
+ }
+ }
+}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-juradiss/biblatex-juradiss.cbx new/tex/latex/biblatex-juradiss/biblatex-juradiss.cbx
--- old/tex/latex/biblatex-juradiss/biblatex-juradiss.cbx 2012-07-27 20:20:57.000000000 +0200
+++ new/tex/latex/biblatex-juradiss/biblatex-juradiss.cbx 2020-03-24 21:50:17.000000000 +0100
@@ -1,88 +1,79 @@
-% biblatex-juradiss.cbx, Dr. Tobias Schwan 2012
+% biblatex-juradiss.cbx, Tobias Schwan 2012
+% nderungen von Herbert Vo -- 2020-03-24
-\ProvidesFile{biblatex-juradiss.cbx}[2012/07/17 v0.1f biblatex citation style]
+\ProvidesFile{biblatex-juradiss.cbx}[2020/03/24 v0.21 biblatex citation style]
% Release Notes can be found in the README.txt
-\RequireCitationStyle{authortitle-dw}%
+\RequireCitationStyle{authortitle-dw}
\ExecuteBibliographyOptions{%
-%nopublisher=false,
-namefont=italic,% Format fr Nachnamen (biblatex-dw)
-firstnamefont=italic,% Format fr Vornamen (biblatex-dw)
-edstringincitations=false,% Kein (Hrsg) im Funoten-Zitat (biblatex-dw)
+ %nopublisher=false,
+ namefont=italic,% Format fr Nachnamen (biblatex-dw)
+ firstnamefont=italic,% Format fr Vornamen (biblatex-dw)
+ edstringincitations=false,% Kein (Hrsg) im Funoten-Zitat (biblatex-dw)
}%
-% Befehl fr Querverweise
-\newcommand{\qverweis}[1]{%
-\ref{#1}, %
-S.\ppspace\pageref{#1}}%
+% Befehl fr Querverweise
+\newcommand{\qverweis}[1]{\ref{#1}, S.\ppspace\pageref{#1}}
-% Kein S. fr die konkrete Fundstelle, dafr in Klammern:
+% Kein S. fr die konkrete Fundstelle, dafr in Klammern:
%\DeclareFieldFormat[article]{postnote}{\printfield{\mkfirstpage{pages}} \mkbibparens{#1}}
\DeclareFieldFormat[article]{postnote}{\printfield{pages} \mkbibparens{#1}}
\DeclareFieldFormat[periodical]{postnote}{\printfield{pages} \mkbibparens{#1}}
\DeclareFieldFormat[incollection]{postnote}{\printfield{pages} \mkbibparens{#1}}
-% Kein S. fr die konkrete Fundstelle
+% Kein S. fr die konkrete Fundstelle
\DeclareFieldFormat[legal]{postnote}{#1}
\DeclareFieldFormat[jurisdiction]{postnote}{#1}
% Trennzeichen zwischen Autor und Titel in Zitaten
\renewcommand*{\nametitledelim}{\addcomma\space}%
-% Weiche fr die unterschiedlichen Entrytypes
+% Weiche fr die unterschiedlichen Entrytypes
\renewbibmacro*{cite:title}{%
\iffieldundef{entrysubtype}%
- {%
- \usedriver
- {}%
- {cite:\thefield{entrytype}}%
- }%
- {\usedriver
- {}%
- {cite:\thefield{entrytype}:\thefield{entrysubtype}}%
- }%
+ {\usedriver{}{cite:\thefield{entrytype}}}%
+ {\usedriver{}{cite:\thefield{entrytype}:\thefield{entrysubtype}}}%
}
-
% Schmaler Abstand zwischen Initialen des Vor- und Nachnamens
\DeclareNameFormat{labelname}{%
\ifcase\value{uniquename}%
- {\usebibmacro{name:first-last}{#1}{#6}{}{#7}}%
+ \usebibmacro{name:given-family}{\namepartfamily}{\namepartprefixi}{\relax}{\namepartsuffix}%
\or
\ifuseprefix
- {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}}
- {\usebibmacro{name:first-last-init}{#1}{#4}{#6}{#8}}% <--- schmaler Abstand
+ {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffixi}}%
+ {\usebibmacro{name:given-family-init}{\namepartfamily}{\namepartgiveni}{\namepartprefixi}{\namepartsuffixi}}%
\or
- \usebibmacro{name:first-last-init}{#1}{#3}{#5}{#7}%
- \fi%
+ \usebibmacro{name:given-family-init}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}%
+ \fi
\usebibmacro{name:andothers}%
}%
% Schmaler Abstand zwischen Initialen des Vornamens und Nachnamens
-\newbibmacro*{name:first-last-init}[4]{%
+\newbibmacro*{name:given-family-init}[4]{%
\usebibmacro{name:delim}{#2#3#1}%
\usebibmacro{name:hook}{#2#3#1}%
- \ifblank{#2}{}{\mkbibnamefirst{#2}\isdot\addnbthinspace}% <--- schmaler Abstand
+ \ifblank{#2}{}{\mkbibnamegiven{#2}\isdot\addnbthinspace}% <--- schmaler Abstand
\ifblank{#3}{}{%
\mkbibnameprefix{#3}\isdot
- \ifpunctmark{'}
- {}
+ \ifpunctmark{'}%
+ {}%
{\ifuseprefix{\bibnamedelimc}{\bibnamedelimd}}}%
- \mkbibnamelast{#1}\isdot
- \ifblank{#4}{}{\bibnamedelimd\mkbibnameaffix{#4}\isdot}%
+ \mkbibnamefamily{#1}\isdot
+ \ifblank{#4}{}{\bibnamedelimd\mkbibnamesuffix{#4}\isdot}%
}%
% Schmaler Abstand zwischen Initialen des Vor- und Nachnamens
% Kursive Schrift inkl. hochgestellter Auflagenzahl bei Kommentaren
\DeclareNameFormat[commentary]{editor}{%
\iffootnote{%
- \ifcase\value{uniquename}%
- {\usebibmacro{name:first-last}{#1}{#6}{}{#7}}%
+ \ifcase\value{uniquename}
+ \usebibmacro{name:given-family}{\namepartfamily}{\namepartprefixi}{\relax}{\namepartsuffix}%
\or
\ifuseprefix
- {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}}
- {\usebibmacro{name:first-last-init}{#1}{#4}{#6}{#8}}% <--- schmaler Abstand
+ {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffixi}}%
+ {\usebibmacro{name:given-family-init}{\namepartfamily}{\namepartgiveni}{\namepartprefixi}{\namepartsuffixi}}%<--- schmaler Abstand
\or
- \usebibmacro{name:first-last-init}{#1}{#3}{#5}{#7}%
+ \usebibmacro{name:given-family-init}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}%
\fi%
\usebibmacro{name:andothers}%
\ifnumequal{\value{listcount}}{\value{listtotal}}% <--- nur nach dem letzten Namen
@@ -90,11 +81,11 @@
{\mkbibemph{\printfield[edition:super]{edition}}}% <--- Auflagenzahl hinzufgen
{}}%
{}%
- }
+ }%
{\mkbibemph{%
- \iffirstinits%
- {\usebibmacro{name:last-first}{#1}{#4}{#5}{#7}}%
- {\usebibmacro{name:last-first}{#1}{#3}{#5}{#7}}%
+ \ifgiveninits
+ {\usebibmacro{name:family-given}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffix}}%
+ {\usebibmacro{name:family-given}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}}%
\usebibmacro{name:andothers}%
}}%
}%
@@ -110,39 +101,39 @@
}%
}%
-% Shorthand ersetzt bei Kommentaren nicht den Autor, sondern
-% den Herausgeber
+% Shorthand ersetzt bei Kommentaren nicht den Autor, sondern den Herausgeber
\renewbibmacro*{cite:normal}{%
- \iffieldequalstr{entrytype}{commentary}{% <---
- {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
- {\usebibmacro{cite:ibid}}
- {\usebibmacro{cite:title}%
- \usebibmacro{cite:save}}}}%
- {\iffieldundef{shorthand}%
- {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}
- {\usebibmacro{cite:ibid}}
+ \iffieldequalstr{entrytype}{commentary}
+ {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
+ {\usebibmacro{cite:ibid}}%
+ {\usebibmacro{cite:title}\usebibmacro{cite:save}}%
+ }%
+ {\iffieldundef{shorthand}%
+ {\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
+ {\usebibmacro{cite:ibid}}%
{\ifthenelse{\ifciteidem\AND\NOT\boolean{cbx:noidem}%
\AND\NOT\iffirstonpage}%
{\usebibmacro{cite:idem}%
\usebibmacro{cite:title}%
- \usebibmacro{cite:save}}
- {\ifnameundef{labelname}
- {}
+ \usebibmacro{cite:save}}%
+ {\ifnameundef{labelname}%
+ {}%
{\usebibmacro{cite:name}}%
\usebibmacro{cite:title}}%
- \ifbool{cbx:omiteditor}
- {}
- {\ifnameundef{labelname}
+ \ifbool{cbx:omiteditor}%
+ {}%
+ {\ifnameundef{labelname}%
{\newunit
- \usebibmacro{cite:byeditor}}
+ \usebibmacro{cite:byeditor}}%
{}}%
- \usebibmacro{cite:save}}}
- {\ifbool{cbx:shorthandibid}%
+ \usebibmacro{cite:save}}%
+ }%
+ {\ifbool{cbx:shorthandibid}%
{\ifthenelse{\ifciteibid\AND\NOT\iffirstonpage}%
- {\usebibmacro{cite:ibid}}
+ {\usebibmacro{cite:ibid}}%
{\usebibmacro{cite:shorthand}}}%
{\usebibmacro{cite:shorthand}}}%
- }%
+ }%
}%
% Das Feld, in dem sich die Anfangsseite befindet, ohne fhrendes S.~
@@ -168,7 +159,7 @@
% Funotenformat fr Artikel:
\DeclareBibliographyDriver{cite:article}{%
\printfield{journaltitle}%
- \addspace%
+ \addspace
\printfield{year}%
\iffieldundef{postnote}%
{\iffieldundef{pages}{}%
@@ -188,14 +179,14 @@
{}%
}
-\DeclareBibliographyDriver{cite:article:newspaper}{
+\DeclareBibliographyDriver{cite:article:newspaper}{%
\printfield{journaltitle}%
- \addspace%
+ \addspace
v.\addspace
- \printdate%
+ \printdate
\addcomma\space
\iffieldundef{postnote}%
- {\addcomma\space%
+ {\addcomma\space
\printfield{pages}}%
{}%
}
@@ -220,14 +211,14 @@
% Darstellung der Kommentar-Herausgeber in den Funoten
\DeclareNameFormat[commentary]{labelname}{%
\ifcase\value{uniquename}%
- {\usebibmacro{name:first-last}{#1}{#6}{}{#7}}%
+ \usebibmacro{name:given-family}{\namepartfamily}{\namepartprefixi}{\relax}{\namepartsuffix}%
\or
\ifuseprefix
- {\usebibmacro{name:first-last}{#1}{#4}{#5}{#8}}
- {\usebibmacro{name:first-last-init}{#1}{#4}{#6}{#8}}% <--- schmaler Abstand
+ {\usebibmacro{name:given-family}{\namepartfamily}{\namepartgiveni}{\namepartprefix}{\namepartsuffixi}}%
+ {\usebibmacro{name:given-family-init}{\namepartfamily}{\namepartgiveni}{\namepartprefixi}{\namepartsuffixi}}% <--- schmaler Abstand
\or
- \usebibmacro{name:first-last-init}{#1}{#3}{#5}{#7}%
- \fi%
+ \usebibmacro{name:given-family-init}{\namepartfamily}{\namepartgiven}{\namepartprefix}{\namepartsuffix}%
+ \fi
\usebibmacro{name:andothers}%
\ifnumequal{\value{listcount}}{\value{listtotal}}% <--- nur nach dem letzten Namen
{\mkbibemph{\printfield[edition:super]{edition}}}% <--- Auflagenzahl hinzufgen
@@ -302,12 +293,12 @@
\DeclareBibliographyDriver{cite:jurisdiction}{%
\printfield{usera}\space%Urteil oder Beschluss
- v\adddot\addspace%
- \printdate\addspace%
+ v\adddot\addspace
+ \printdate\addspace
\printfield{userb}% Aktenzeichen
\iffieldundef{userc}%Primaere Fundstelle (Name und Jahr) vorhanden?
{\nopunct}%
- {\space%
+ {\space
\printfield{userc}}%
\iffieldundef{postnote}{%Angabe einer konkreten Fundstelle?
\iffieldundef{userc}{}{%
@@ -316,7 +307,7 @@
\printfield{userd}}}% Erste Seite der primren Fundstelle
\iffieldundef{journaltitle}{}{%Sekundre Fundstelle vorhanden?
\addspace\mkbibparens{%
- =\space%
+ =\space
\printfield{journaltitle}\space%Zeitschriftentitel
\printfield{usere}\addcomma\space%Zeitschriftenjahrgang
\printfield{pages}}%Erste Seite der Zeitschriftenfundstelle
@@ -327,15 +318,15 @@
}
\DeclareFieldFormat[jurisdiction]{postnote}{%
- \iffieldundef{userd}
+ \iffieldundef{userd}%
{#1}%Bei fehlender erster Seite, zB juris, keine Klammern um konkrete Fundstelle
{\printfield{userd}\addspace% Erste Seite des Urteils in der Entscheidungssammlung
\mkbibparens{#1}}%Seitenzahl der konkreten Fundstelle in Klammern
\iffieldundef{journaltitle}{}{%
\addspace\mkbibparens{%
- =\space%
- \printfield{journaltitle}\space%
- \printfield{usere}\addcomma\space%
+ =\space
+ \printfield{journaltitle}\space
+ \printfield{usere}\addcomma\space
\printfield{pages}%
}%
}%
@@ -347,11 +338,10 @@
\DeclareBibliographyDriver{cite:legal}{%
\unspace% Ntig, da sonst wegen des fehlenden Autors ein verwaistes Leerzeichen verbleibt
\printfield{journaltitle}%
- \addspace%
+ \addspace
\printfield{journalsubtitle}%
- \addcomma%
+ \addcomma
}%
\endinput
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-juradiss.tlpobj new/tlpkg/tlpobj/biblatex-juradiss.tlpobj
--- old/tlpkg/tlpobj/biblatex-juradiss.tlpobj 2019-02-28 03:20:29.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-juradiss.tlpobj 2020-03-25 16:13:09.000000000 +0100
@@ -1,16 +1,15 @@
name biblatex-juradiss
category Package
-revision 29252
-shortdesc BibLaTeX stylefiles for German law thesis
+revision 54515
+shortdesc BibLaTeX stylefiles for German law theses
relocated 1
-longdesc The package provides a style for use in typesetting a German
-longdesc law thesis with LaTeX. The package (using BibLaTeX) is based on
-longdesc biblatex-dw and uses biber.
-runfiles size=7
+longdesc The package provides a custom citation-style for typesetting a
+longdesc German law thesis with LaTeX. The package (using BibLaTeX) is
+longdesc based on biblatex-dw and uses biber.
+runfiles size=8
RELOC/tex/latex/biblatex-juradiss/biblatex-juradiss.bbx
RELOC/tex/latex/biblatex-juradiss/biblatex-juradiss.cbx
catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-juradiss
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics legal dissertation biblatex
-catalogue-version 0.1g
+catalogue-version 0.21
++++++ biblatex-manuscripts-philology.doc.tar.xz ++++++
Binary files old/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.pdf and new/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology-example.pdf differ
Binary files old/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.pdf and new/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex new/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex
--- old/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex 2018-09-29 23:25:33.000000000 +0200
+++ new/doc/latex/biblatex-manuscripts-philology/documentation/biblatex-manuscripts-philology.tex 2020-01-07 22:34:04.000000000 +0100
@@ -21,8 +21,8 @@
subtitle={New data types},
email={maieul <at> maieul <dot> net},
author={Maeul Rouquette},
- revision={2.1.0},
- date={30/09/2018},
+ revision={2.1.2},
+ date={07/01/2020},
url={https://github.com/maieul/biblatex-manuscripts-philology}}
@@ -415,6 +415,14 @@
\begin{changelog}
+\begin{release}{2.1.2}{2019-01-07}
+\item Fix bug when changing language in the middle of an handbook.
+\end{release}
+
+\begin{release}{2.1.1}{2019-10-02}
+\item Fix warning with sorting schemes.
+\end{release}
+
\begin{release}{2.1.0}{2018-09-30}
\item Add \cs{detailcite} and \cs{detailscites} commands.
\item Add \opt{env}=\cnt{details-noshorthand} option to \cs{printbibliography}.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-manuscripts-philology.doc.tlpobj new/tlpkg/tlpobj/biblatex-manuscripts-philology.doc.tlpobj
--- old/tlpkg/tlpobj/biblatex-manuscripts-philology.doc.tlpobj 2019-02-28 03:20:30.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-manuscripts-philology.doc.tlpobj 2020-01-08 01:54:31.000000000 +0100
@@ -1,6 +1,6 @@
name biblatex-manuscripts-philology.doc
category Package
-revision 48786
+revision 53344
shortdesc doc files of biblatex-manuscripts-philology
relocated 1
docfiles size=46
++++++ biblatex-manuscripts-philology.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx new/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx
--- old/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx 2018-09-29 23:25:33.000000000 +0200
+++ new/tex/latex/biblatex-manuscripts-philology/english-manuscripts.lbx 2020-01-07 22:34:04.000000000 +0100
@@ -9,14 +9,13 @@
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is Maeul Rouquette
% This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
-\ProvidesFile{english-manuscripts.lbx}[2018/09/30 v2.1.0 manuscripts biblatex localisation]%
+\ProvidesFile{english-manuscripts.lbx}[2020/01/07 v2.1.2 manuscripts biblatex localisation]%
\InheritBibliographyStrings{english}
\InheritBibliographyExtras{english}
-\RequirePackage{manuscripts-NewBibliographyString}
\DeclareBibliographyStrings{%
1column = {{one column}{1\addnbspace col\adddot}},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx new/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx
--- old/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx 2018-09-29 23:25:33.000000000 +0200
+++ new/tex/latex/biblatex-manuscripts-philology/french-manuscripts.lbx 2020-01-07 22:34:04.000000000 +0100
@@ -9,14 +9,13 @@
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is Maeul Rouquette
% This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
-\ProvidesFile{french-manuscripts.lbx}[2019/09/30 v2.1.0 manuscripts biblatex localisation]%
+\ProvidesFile{french-manuscripts.lbx}[2020/01/07 v2.1.2 manuscripts biblatex localisation]%
\InheritBibliographyStrings{french}
\InheritBibliographyExtras{french}
-\RequirePackage{manuscripts-NewBibliographyString}
\DeclareBibliographyStrings{%
1column = {{une colonne}{1\addnbspace col\adddot}},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx new/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx
--- old/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx 2018-09-29 23:25:33.000000000 +0200
+++ new/tex/latex/biblatex-manuscripts-philology/italian-manuscripts.lbx 2020-01-07 22:34:04.000000000 +0100
@@ -9,14 +9,13 @@
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is Maeul Rouquette
% This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
-\ProvidesFile{italian-manuscripts.lbx}[2018/09/30 v2.1.0 manuscripts biblatex localisation]%
+\ProvidesFile{italian-manuscripts.lbx}[2020/01/07 v2.1.2 manuscripts biblatex localisation]%
\InheritBibliographyStrings{italian}
\InheritBibliographyExtras{italian}
-\RequirePackage{manuscripts-NewBibliographyString}
\DeclareBibliographyStrings{%
1column = {{una colonna}{1\addnbspace col\adddot}},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx new/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx
--- old/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx 2018-09-29 23:25:33.000000000 +0200
+++ new/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.bbx 2020-01-07 22:34:04.000000000 +0100
@@ -9,11 +9,10 @@
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is Maeul Rouquette
% This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
-\ProvidesFile{manuscripts-noautoshorthand.bbx}
-[2018/09/30 v2.1.0 biblatex bibliography style (MR)]%
+\ProvidesFile{manuscripts-noautoshorthand.bbx}[2020/01/07 v2.1.2 biblatex bibliography style (MR)]%
\RequireBibliographyStyle{manuscripts-shared}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx new/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx
--- old/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx 2018-09-29 23:25:33.000000000 +0200
+++ new/tex/latex/biblatex-manuscripts-philology/manuscripts-noautoshorthand.dbx 2020-01-07 22:34:04.000000000 +0100
@@ -9,9 +9,8 @@
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is Maeul Rouquette
% This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
-\ProvidesFile{manuscripts-noautoshorthand.dbx}
-[2018/09/30 2.1.0 biblatex bibliography style (MR)]
+\ProvidesFile{manuscripts-noautoshorthand.dbx}[2020/01/07 v2.1.2 biblatex bibliography style (MR)]
\blx(a)inputonce{manuscripts-shared.dbx}{}{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx new/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx
--- old/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx 2018-09-29 23:25:33.000000000 +0200
+++ new/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.bbx 2020-01-07 22:34:04.000000000 +0100
@@ -9,12 +9,11 @@
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is Maeul Rouquette
% This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
-\ProvidesFile{manuscripts-commons}
-[2018/09/30 2.1.0 biblatex bibliography style (MR)]%
+\ProvidesFile{manuscripts-commons}[2020/01/07 v2.1.2 biblatex bibliography style (MR)]%
\ifdef{\biblatexmultipledm@bibstyle}
{\RequireBibliographyStyle{\biblatexmultipledm@bibstyle}}
@@ -107,7 +106,7 @@
\setunit{\librarycollectionpunct}%
\usebibmacro{manuscript:collection+shelfmark}%
}
-
+
\newbibmacro{manuscript:pages}{%
\printfield{pagetotal}%
\iffieldundef{pages}%
@@ -120,7 +119,7 @@
\printfield{pages}%
\usebibmacro{manuscript:layer}%
}%
-}
+}
\newbibmacro{manuscript:columns+layer}{%
\ifboolexpr{test {\iffieldundef{columns}} or test{\iffieldundef{layer}}}{%
@@ -324,7 +323,7 @@
}
\sort{
\field{collection}
- \field{0000}
+ \literal{0000}
}
\sort{
\field[padside=left,padwidth=50,padchar=0]{sortshelfmark}
@@ -457,4 +456,7 @@
\AtBeginDocument{%
\manuscriptaddshortened{cite:title,cite:short,cite:opcit}%
}
+
+% New bibliography string
+\RequirePackage{manuscripts-NewBibliographyString}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx new/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx
--- old/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx 2018-09-29 23:25:33.000000000 +0200
+++ new/tex/latex/biblatex-manuscripts-philology/manuscripts-shared.dbx 2020-01-07 22:34:04.000000000 +0100
@@ -9,11 +9,10 @@
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is Maeul Rouquette
% This work consists of the files manuscripts.dbx, manuscripts.bbx, french-manuscripts.lbx and english-manuscripts.lbx
-\ProvidesFile{manuscripts-shared.dbx}%
-[2018/09/30 v2.1.0 biblatex bibliography style (MR)]%
+\ProvidesFile{manuscripts-shared.dbx}[2020/01/07 v2.1.2 biblatex bibliography style (MR)]%
\DeclareDatamodelEntrytypes{manuscript}
\DeclareDatamodelFields[type=field,datatype=literal]{%
catalog,
@@ -41,7 +40,7 @@
shortlibrary,
shortcollection,
columns,
- languages,
+ languages,
collection,
usualtitle,
shelfmark,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx new/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx
--- old/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx 2018-09-29 23:25:33.000000000 +0200
+++ new/tex/latex/biblatex-manuscripts-philology/manuscripts.bbx 2020-01-07 22:34:04.000000000 +0100
@@ -9,11 +9,10 @@
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is Maeul Rouquette
% This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
-\ProvidesFile{manuscripts.bbx}%
-[2018/09/30 v2.1.0 biblatex bibliography style (MR)]%
+\ProvidesFile{manuscripts.bbx}[2020/01/07 v2.1.2 biblatex bibliography style (MR)]%
\RequireBibliographyStyle{manuscripts-shared}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx new/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx
--- old/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx 2018-09-29 23:25:33.000000000 +0200
+++ new/tex/latex/biblatex-manuscripts-philology/manuscripts.dbx 2020-01-07 22:34:04.000000000 +0100
@@ -9,9 +9,8 @@
% version 2005/12/01 or later.
%
% This work has the LPPL maintenance status `maintained'.
-%
+%
% The Current Maintainer of this work is Maeul Rouquette
% This work consists of the files manuscripts*.dbx, manuscripts*.bbx, manuscripts*.lbx
-\ProvidesFile{manuscripts.dbx}
-[2018/09/30 v2.1.0 biblatex bibliography style (MR)]
+\ProvidesFile{manuscripts.dbx}[2020/01/07 v2.1.2 biblatex bibliography style (MR)]
\blx(a)inputonce{manuscripts-shared.dbx}{}{}{}{}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-manuscripts-philology.tlpobj new/tlpkg/tlpobj/biblatex-manuscripts-philology.tlpobj
--- old/tlpkg/tlpobj/biblatex-manuscripts-philology.tlpobj 2019-02-28 03:20:30.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-manuscripts-philology.tlpobj 2020-01-08 01:54:32.000000000 +0100
@@ -1,6 +1,6 @@
name biblatex-manuscripts-philology
category Package
-revision 48786
+revision 53344
shortdesc Manage classical manuscripts with BibLaTeX
relocated 1
longdesc The package adds a new entry type: @manuscript to manage
@@ -20,7 +20,6 @@
catalogue-contact-bugs https://github.com/maieul/biblatex-manuscripts-philology/issues
catalogue-contact-repository https://github.com/maieul/biblatex-manuscripts-philology
catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-manuscripts-philology
-catalogue-date 2018-09-29 20:53:18 +0200
catalogue-license lppl1.3
catalogue-topics biblatex humanities
-catalogue-version 2.1.0
+catalogue-version 2.1.2
++++++ biblatex-oxref.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-oxref/README.md new/doc/latex/biblatex-oxref/README.md
--- old/doc/latex/biblatex-oxref/README.md 2019-02-19 23:19:07.000000000 +0100
+++ new/doc/latex/biblatex-oxref/README.md 2020-01-27 22:55:00.000000000 +0100
@@ -140,7 +140,7 @@
## Licence
-Copyright 20162019 Alex Ball.
+Copyright 20162020 Alex Ball.
This work consists of the documented LaTeX file oxref.dtx and a Makefile.
Binary files old/doc/latex/biblatex-oxref/oxalph-doc.pdf and new/doc/latex/biblatex-oxref/oxalph-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-oxref/oxalph-doc.tex new/doc/latex/biblatex-oxref/oxalph-doc.tex
--- old/doc/latex/biblatex-oxref/oxalph-doc.tex 2019-02-19 23:19:07.000000000 +0100
+++ new/doc/latex/biblatex-oxref/oxalph-doc.tex 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\ProvidesFile{oxalph-doc.tex}
[\Version\space Alphabetic biblatex style inspired by the Oxford Guide to Style]
\PassOptionsToPackage{style=oxalph,varissuedate,anon}{biblatex}
@@ -1550,6 +1550,36 @@
all in \S13.11.1). I am therefore choosing to ignore this unnecessary
complication.}
+\tip{You can alternatively use the standard \textsf{biblatex} relation type \code{multivolume}.
+}
+
+\begin{bibexbox}
+<OGS \S15.2.6*\textdagger>
+{ritter1838hap:mv}
+Ritter, H (1838-46). \emph{The History of Ancient Philosophy}, trans. A. J. W. Morrison, 4~vols., iiii (Oxford: Talboys, 18389), iv (London: Bohn, 1846).
+\tcblower
+\begin{Verbatim}
+@mvbook{ritter1838hap:mv,
+ author = {Heinrich Ritter},
+ title = {The History of Ancient Philosophy},
+ translator = {Alexander J. W. Morrison},
+ volumes = {4},
+ date = {1838/1846},
+ related = {ritter1838hap1-3,ritter1838hap4},
+ relatedtype = {multivolume}}
+@book{ritter1838hap1-3,
+ volume = {1-3},
+ location = {Oxford},
+ publisher = {Talboys},
+ date = {1838/1839}}
+@book{ritter1838hap4,
+ volume = {4},
+ location = {London},
+ publisher = {Bohn},
+ date = {1846}}
+\end{Verbatim}
+\end{bibexbox}
+
\subsection{One volume from several}
Where the volumes are merely numbered, the following form is used:
@@ -4688,6 +4718,6 @@
\printbibliography[notcategory=hidden]
\end{document}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxalph-doc.tex'.
Binary files old/doc/latex/biblatex-oxref/oxnotes-doc.pdf and new/doc/latex/biblatex-oxref/oxnotes-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-oxref/oxnotes-doc.tex new/doc/latex/biblatex-oxref/oxnotes-doc.tex
--- old/doc/latex/biblatex-oxref/oxnotes-doc.tex 2019-02-19 23:19:07.000000000 +0100
+++ new/doc/latex/biblatex-oxref/oxnotes-doc.tex 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\ProvidesFile{oxnotes-doc.tex}
[\Version\space Footnote-based biblatex style inspired by the Oxford Guide to Style]
\PassOptionsToPackage{style=oxnotes,scnames,varissuedate,anon}{biblatex}
@@ -723,7 +723,7 @@
If the contribution of the translators or revisers is so great they could be joint authors, Oxford style is to print them immediately after the actual author. The motivation comes from textbooks like this one:
\begin{egcite*}{}
-\cite{kuehner.blass1890ef}
+\textcite{kuehner.blass1890ef}
\end{egcite*}
\begin{bibexbox}
@@ -1543,30 +1543,30 @@
all in \S13.11.1). I am therefore choosing to ignore this unnecessary
complication.}
-\tip{You can alternatively use the standard \textsf{biblatex} relation type \code{multivolume}. Note that this construction is not portable to \textsf{oxyear}\slash\textsf{oxalph}.}
+\tip{You can alternatively use the standard \textsf{biblatex} relation type \code{multivolume}.
+Note that when you do so, the overall date is removed, so be sure that individual volume dates are provided.
+}
\begin{bibexbox}
<OGS \S15.2.6*>
-{ritter1838hap1-3}
+{ritter1838hap:mv}
Heinrich Ritter, \emph{The History of Ancient Philosophy}, trans. Alexander J. W. Morrison, 4~vols., iiii (Oxford: Talboys, 18389), iv (London: Bohn, 1846).
\tcblower
\begin{Verbatim}
-@mvbook{ritter1838hap1-3,
+@mvbook{ritter1838hap:mv,
author = {Heinrich Ritter},
title = {The History of Ancient Philosophy},
translator = {Alexander J. W. Morrison},
volumes = {4},
+ date = {1838/1846},
+ related = {ritter1838hap1-3,ritter1838hap4},
+ relatedtype = {multivolume}}
+@book{ritter1838hap1-3,
volume = {1-3},
location = {Oxford},
publisher = {Talboys},
- date = {1838/1839},
- related = {ritter1838hap4},
- relatedtype = {multivolume}}
-@mvbook{ritter1838hap4,
- author = {Heinrich Ritter},
- title = {The History of Ancient Philosophy},
- translator = {Alexander J. W. Morrison},
- volumes = {4},
+ date = {1838/1839}}
+@book{ritter1838hap4,
volume = {4},
location = {London},
publisher = {Bohn},
@@ -4681,6 +4681,6 @@
\printbibliography[notcategory=hidden]
\end{document}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-doc.tex'.
Binary files old/doc/latex/biblatex-oxref/oxnum-doc.pdf and new/doc/latex/biblatex-oxref/oxnum-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-oxref/oxnum-doc.tex new/doc/latex/biblatex-oxref/oxnum-doc.tex
--- old/doc/latex/biblatex-oxref/oxnum-doc.tex 2019-02-19 23:19:07.000000000 +0100
+++ new/doc/latex/biblatex-oxref/oxnum-doc.tex 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\ProvidesFile{oxnum-doc.tex}
[\Version\space Numeric biblatex style inspired by the Oxford Guide to Style]
\PassOptionsToPackage{style=oxnum,scnames,varissuedate,anon}{biblatex}
@@ -1518,30 +1518,30 @@
all in \S13.11.1). I am therefore choosing to ignore this unnecessary
complication.}
-\tip{You can alternatively use the standard \textsf{biblatex} relation type \code{multivolume}. Note that this construction is not portable to \textsf{oxyear}\slash\textsf{oxalph}.}
+\tip{You can alternatively use the standard \textsf{biblatex} relation type \code{multivolume}.
+Note that when you do so, the overall date is removed, so be sure that individual volume dates are provided.
+}
\begin{bibexbox}
<OGS \S15.2.6*>
-{ritter1838hap1-3}
+{ritter1838hap:mv}
Heinrich Ritter, \emph{The History of Ancient Philosophy}, trans. Alexander J. W. Morrison, 4~vols., iiii (Oxford: Talboys, 18389), iv (London: Bohn, 1846).
\tcblower
\begin{Verbatim}
-@mvbook{ritter1838hap1-3,
+@mvbook{ritter1838hap:mv,
author = {Heinrich Ritter},
title = {The History of Ancient Philosophy},
translator = {Alexander J. W. Morrison},
volumes = {4},
+ date = {1838/1846},
+ related = {ritter1838hap1-3,ritter1838hap4},
+ relatedtype = {multivolume}}
+@book{ritter1838hap1-3,
volume = {1-3},
location = {Oxford},
publisher = {Talboys},
- date = {1838/1839},
- related = {ritter1838hap4},
- relatedtype = {multivolume}}
-@mvbook{ritter1838hap4,
- author = {Heinrich Ritter},
- title = {The History of Ancient Philosophy},
- translator = {Alexander J. W. Morrison},
- volumes = {4},
+ date = {1838/1839}}
+@book{ritter1838hap4,
volume = {4},
location = {London},
publisher = {Bohn},
@@ -4621,6 +4621,6 @@
\printbibliography[notcategory=hidden]
\end{document}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnum-doc.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-oxref/oxref.bib new/doc/latex/biblatex-oxref/oxref.bib
--- old/doc/latex/biblatex-oxref/oxref.bib 2019-02-19 23:19:07.000000000 +0100
+++ new/doc/latex/biblatex-oxref/oxref.bib 2019-09-20 23:33:28.000000000 +0200
@@ -476,22 +476,20 @@
location = {Oxford and London},
publisher = {Talboys and Bohn},
date = {1838/1846}}
-@mvbook{ritter1838hap1-3,
+@mvbook{ritter1838hap:mv,
author = {Heinrich Ritter},
title = {The History of Ancient Philosophy},
translator = {Alexander J. W. Morrison},
volumes = {4},
+ date = {1838/1846},
+ related = {ritter1838hap1-3,ritter1838hap4},
+ relatedtype = {multivolume}}
+@book{ritter1838hap1-3,
volume = {1-3},
location = {Oxford},
publisher = {Talboys},
- date = {1838/1839},
- related = {ritter1838hap4},
- relatedtype = {multivolume}}
-@mvbook{ritter1838hap4,
- author = {Heinrich Ritter},
- title = {The History of Ancient Philosophy},
- translator = {Alexander J. W. Morrison},
- volumes = {4},
+ date = {1838/1839}}
+@book{ritter1838hap4,
volume = {4},
location = {London},
publisher = {Bohn},
Binary files old/doc/latex/biblatex-oxref/oxref.pdf and new/doc/latex/biblatex-oxref/oxref.pdf differ
Binary files old/doc/latex/biblatex-oxref/oxyear-doc.pdf and new/doc/latex/biblatex-oxref/oxyear-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-oxref/oxyear-doc.tex new/doc/latex/biblatex-oxref/oxyear-doc.tex
--- old/doc/latex/biblatex-oxref/oxyear-doc.tex 2019-02-19 23:19:07.000000000 +0100
+++ new/doc/latex/biblatex-oxref/oxyear-doc.tex 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\ProvidesFile{oxyear-doc.tex}
[\Version\space Author-year biblatex style inspired by the Oxford Guide to Style]
\PassOptionsToPackage{style=oxyear,varissuedate,anon}{biblatex}
@@ -1582,6 +1582,36 @@
all in \S13.11.1). I am therefore choosing to ignore this unnecessary
complication.}
+\tip{You can alternatively use the standard \textsf{biblatex} relation type \code{multivolume}.
+}
+
+\begin{bibexbox}
+<OGS \S15.2.6*\textdagger>
+{ritter1838hap:mv}
+Ritter, H (1838-46). \emph{The History of Ancient Philosophy}, trans. A. J. W. Morrison, 4~vols., iiii (Oxford: Talboys, 18389), iv (London: Bohn, 1846).
+\tcblower
+\begin{Verbatim}
+@mvbook{ritter1838hap:mv,
+ author = {Heinrich Ritter},
+ title = {The History of Ancient Philosophy},
+ translator = {Alexander J. W. Morrison},
+ volumes = {4},
+ date = {1838/1846},
+ related = {ritter1838hap1-3,ritter1838hap4},
+ relatedtype = {multivolume}}
+@book{ritter1838hap1-3,
+ volume = {1-3},
+ location = {Oxford},
+ publisher = {Talboys},
+ date = {1838/1839}}
+@book{ritter1838hap4,
+ volume = {4},
+ location = {London},
+ publisher = {Bohn},
+ date = {1846}}
+\end{Verbatim}
+\end{bibexbox}
+
\subsection{One volume from several}
Where the volumes are merely numbered, the following form is used:
@@ -4744,6 +4774,6 @@
\printbibliography[notcategory=hidden]
\end{document}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxyear-doc.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-oxref.doc.tlpobj new/tlpkg/tlpobj/biblatex-oxref.doc.tlpobj
--- old/tlpkg/tlpobj/biblatex-oxref.doc.tlpobj 2019-02-28 03:20:32.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-oxref.doc.tlpobj 2020-01-27 23:22:55.000000000 +0100
@@ -1,9 +1,9 @@
name biblatex-oxref.doc
category Package
-revision 50061
+revision 53571
shortdesc doc files of biblatex-oxref
relocated 1
-docfiles size=738
+docfiles size=737
RELOC/doc/latex/biblatex-oxref/README.md
RELOC/doc/latex/biblatex-oxref/oxalph-doc.pdf
RELOC/doc/latex/biblatex-oxref/oxalph-doc.tex
++++++ biblatex-oxref.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/american-oxref.lbx new/tex/latex/biblatex-oxref/american-oxref.lbx
--- old/tex/latex/biblatex-oxref/american-oxref.lbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/american-oxref.lbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{american-oxref.lbx}
[\Version\space American English conventions required by the biblatex-oxref styles]
@@ -21,6 +21,6 @@
\DeclareBibliographyExtras{\uspunctuation}
\InheritBibliographyStrings{english}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `american-oxref.lbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/british-oxref.lbx new/tex/latex/biblatex-oxref/british-oxref.lbx
--- old/tex/latex/biblatex-oxref/british-oxref.lbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/british-oxref.lbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{british-oxref.lbx}
[\Version\space British English conventions required by the biblatex-oxref styles]
@@ -40,6 +40,6 @@
pm = {{p\adddot m\adddot}{p\adddot m\adddot}},
}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `british-oxref.lbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/english-oxref.lbx new/tex/latex/biblatex-oxref/english-oxref.lbx
--- old/tex/latex/biblatex-oxref/english-oxref.lbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/english-oxref.lbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{english-oxref.lbx}
[\Version\space Generic English conventions required by the biblatex-oxref styles]
@@ -269,6 +269,6 @@
langswedish = {{Swedish}{Swed\adddot}},
}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `english-oxref.lbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxalph.bbx new/tex/latex/biblatex-oxref/oxalph.bbx
--- old/tex/latex/biblatex-oxref/oxalph.bbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxalph.bbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxalph.bbx}
[\Version\space Alphabetic bibliography style inspired by the Oxford Guide to Style]
@@ -98,6 +98,6 @@
}
}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxalph.bbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxalph.cbx new/tex/latex/biblatex-oxref/oxalph.cbx
--- old/tex/latex/biblatex-oxref/oxalph.cbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxalph.cbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxalph.cbx}
[\Version\space Alphabetic citation style inspired by the Oxford Guide to Style]
@@ -41,6 +41,6 @@
}%
}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxalph.cbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxalph.dbx new/tex/latex/biblatex-oxref/oxalph.dbx
--- old/tex/latex/biblatex-oxref/oxalph.dbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxalph.dbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,12 +13,13 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxalph.dbx}
[\Version\space Data model for the Oxref family of styles]
\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,title}
\DeclareDatamodelFields[type=field,datatype=literal]{datetype,origdatetype}
+\DeclareDatamodelEntrytypes{inaudio,inmusic,inmovie,invideo}
\DeclareDatamodelFields[type=list,datatype=name]{authoraddon,editoraddon,serieseditor}
\DeclareDatamodelFields[type=list,datatype=name]{jointauthor}
\DeclareDatamodelFields[type=field,datatype=literal]{jointauthortype}
@@ -42,6 +43,6 @@
\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,%
parvolume,parpages}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxalph.dbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-ibid.bbx new/tex/latex/biblatex-oxref/oxnotes-ibid.bbx
--- old/tex/latex/biblatex-oxref/oxnotes-ibid.bbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-ibid.bbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,12 +13,12 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-ibid.bbx}
[\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style]
\RequireBibliographyStyle{oxnotes}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-ibid.bbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-ibid.cbx new/tex/latex/biblatex-oxref/oxnotes-ibid.cbx
--- old/tex/latex/biblatex-oxref/oxnotes-ibid.cbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-ibid.cbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-ibid.cbx}
[\Version\space Footnote-based citation style inspired by the Oxford Guide to Style]
@@ -44,6 +44,6 @@
}%
}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-ibid.cbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-ibid.dbx new/tex/latex/biblatex-oxref/oxnotes-ibid.dbx
--- old/tex/latex/biblatex-oxref/oxnotes-ibid.dbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-ibid.dbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,12 +13,13 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-ibid.dbx}
[\Version\space Data model for the Oxref family of styles]
\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,title}
\DeclareDatamodelFields[type=field,datatype=literal]{datetype,origdatetype}
+\DeclareDatamodelEntrytypes{inaudio,inmusic,inmovie,invideo}
\DeclareDatamodelFields[type=list,datatype=name]{authoraddon,editoraddon,serieseditor}
\DeclareDatamodelFields[type=list,datatype=name]{jointauthor}
\DeclareDatamodelFields[type=field,datatype=literal]{jointauthortype}
@@ -42,6 +43,6 @@
\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,%
parvolume,parpages}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-ibid.dbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-inote.bbx new/tex/latex/biblatex-oxref/oxnotes-inote.bbx
--- old/tex/latex/biblatex-oxref/oxnotes-inote.bbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-inote.bbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,12 +13,12 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-inote.bbx}
[\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style]
\RequireBibliographyStyle{oxnotes}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-inote.bbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-inote.cbx new/tex/latex/biblatex-oxref/oxnotes-inote.cbx
--- old/tex/latex/biblatex-oxref/oxnotes-inote.cbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-inote.cbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-inote.cbx}
[\Version\space Footnote-based citation style inspired by the Oxford Guide to Style]
@@ -44,6 +44,6 @@
}%
}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-inote.cbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-inote.dbx new/tex/latex/biblatex-oxref/oxnotes-inote.dbx
--- old/tex/latex/biblatex-oxref/oxnotes-inote.dbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-inote.dbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,12 +13,13 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-inote.dbx}
[\Version\space Data model for the Oxref family of styles]
\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,title}
\DeclareDatamodelFields[type=field,datatype=literal]{datetype,origdatetype}
+\DeclareDatamodelEntrytypes{inaudio,inmusic,inmovie,invideo}
\DeclareDatamodelFields[type=list,datatype=name]{authoraddon,editoraddon,serieseditor}
\DeclareDatamodelFields[type=list,datatype=name]{jointauthor}
\DeclareDatamodelFields[type=field,datatype=literal]{jointauthortype}
@@ -42,6 +43,6 @@
\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,%
parvolume,parpages}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-inote.dbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-note.bbx new/tex/latex/biblatex-oxref/oxnotes-note.bbx
--- old/tex/latex/biblatex-oxref/oxnotes-note.bbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-note.bbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,12 +13,12 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-note.bbx}
[\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style]
\RequireBibliographyStyle{oxnotes}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-note.bbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-note.cbx new/tex/latex/biblatex-oxref/oxnotes-note.cbx
--- old/tex/latex/biblatex-oxref/oxnotes-note.cbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-note.cbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-note.cbx}
[\Version\space Footnote-based citation style inspired by the Oxford Guide to Style]
@@ -44,6 +44,6 @@
}%
}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-note.cbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-note.dbx new/tex/latex/biblatex-oxref/oxnotes-note.dbx
--- old/tex/latex/biblatex-oxref/oxnotes-note.dbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-note.dbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,12 +13,13 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-note.dbx}
[\Version\space Data model for the Oxref family of styles]
\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,title}
\DeclareDatamodelFields[type=field,datatype=literal]{datetype,origdatetype}
+\DeclareDatamodelEntrytypes{inaudio,inmusic,inmovie,invideo}
\DeclareDatamodelFields[type=list,datatype=name]{authoraddon,editoraddon,serieseditor}
\DeclareDatamodelFields[type=list,datatype=name]{jointauthor}
\DeclareDatamodelFields[type=field,datatype=literal]{jointauthortype}
@@ -42,6 +43,6 @@
\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,%
parvolume,parpages}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-note.dbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-trad1.bbx new/tex/latex/biblatex-oxref/oxnotes-trad1.bbx
--- old/tex/latex/biblatex-oxref/oxnotes-trad1.bbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-trad1.bbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,12 +13,12 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad1.bbx}
[\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style]
\RequireBibliographyStyle{oxnotes}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-trad1.bbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-trad1.cbx new/tex/latex/biblatex-oxref/oxnotes-trad1.cbx
--- old/tex/latex/biblatex-oxref/oxnotes-trad1.cbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-trad1.cbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad1.cbx}
[\Version\space Footnote-based citation style inspired by the Oxford Guide to Style]
@@ -44,6 +44,6 @@
}%
}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-trad1.cbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-trad1.dbx new/tex/latex/biblatex-oxref/oxnotes-trad1.dbx
--- old/tex/latex/biblatex-oxref/oxnotes-trad1.dbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-trad1.dbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,12 +13,13 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad1.dbx}
[\Version\space Data model for the Oxref family of styles]
\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,title}
\DeclareDatamodelFields[type=field,datatype=literal]{datetype,origdatetype}
+\DeclareDatamodelEntrytypes{inaudio,inmusic,inmovie,invideo}
\DeclareDatamodelFields[type=list,datatype=name]{authoraddon,editoraddon,serieseditor}
\DeclareDatamodelFields[type=list,datatype=name]{jointauthor}
\DeclareDatamodelFields[type=field,datatype=literal]{jointauthortype}
@@ -42,6 +43,6 @@
\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,%
parvolume,parpages}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-trad1.dbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-trad2.bbx new/tex/latex/biblatex-oxref/oxnotes-trad2.bbx
--- old/tex/latex/biblatex-oxref/oxnotes-trad2.bbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-trad2.bbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,12 +13,12 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad2.bbx}
[\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style]
\RequireBibliographyStyle{oxnotes}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-trad2.bbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-trad2.cbx new/tex/latex/biblatex-oxref/oxnotes-trad2.cbx
--- old/tex/latex/biblatex-oxref/oxnotes-trad2.cbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-trad2.cbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad2.cbx}
[\Version\space Footnote-based citation style inspired by the Oxford Guide to Style]
@@ -44,6 +44,6 @@
}%
}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-trad2.cbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-trad2.dbx new/tex/latex/biblatex-oxref/oxnotes-trad2.dbx
--- old/tex/latex/biblatex-oxref/oxnotes-trad2.dbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-trad2.dbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,12 +13,13 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad2.dbx}
[\Version\space Data model for the Oxref family of styles]
\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,title}
\DeclareDatamodelFields[type=field,datatype=literal]{datetype,origdatetype}
+\DeclareDatamodelEntrytypes{inaudio,inmusic,inmovie,invideo}
\DeclareDatamodelFields[type=list,datatype=name]{authoraddon,editoraddon,serieseditor}
\DeclareDatamodelFields[type=list,datatype=name]{jointauthor}
\DeclareDatamodelFields[type=field,datatype=literal]{jointauthortype}
@@ -42,6 +43,6 @@
\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,%
parvolume,parpages}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-trad2.dbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-trad3.bbx new/tex/latex/biblatex-oxref/oxnotes-trad3.bbx
--- old/tex/latex/biblatex-oxref/oxnotes-trad3.bbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-trad3.bbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,12 +13,12 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad3.bbx}
[\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style]
\RequireBibliographyStyle{oxnotes}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-trad3.bbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-trad3.cbx new/tex/latex/biblatex-oxref/oxnotes-trad3.cbx
--- old/tex/latex/biblatex-oxref/oxnotes-trad3.cbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-trad3.cbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad3.cbx}
[\Version\space Footnote-based citation style inspired by the Oxford Guide to Style]
@@ -44,6 +44,6 @@
}%
}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-trad3.cbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes-trad3.dbx new/tex/latex/biblatex-oxref/oxnotes-trad3.dbx
--- old/tex/latex/biblatex-oxref/oxnotes-trad3.dbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes-trad3.dbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,12 +13,13 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes-trad3.dbx}
[\Version\space Data model for the Oxref family of styles]
\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,title}
\DeclareDatamodelFields[type=field,datatype=literal]{datetype,origdatetype}
+\DeclareDatamodelEntrytypes{inaudio,inmusic,inmovie,invideo}
\DeclareDatamodelFields[type=list,datatype=name]{authoraddon,editoraddon,serieseditor}
\DeclareDatamodelFields[type=list,datatype=name]{jointauthor}
\DeclareDatamodelFields[type=field,datatype=literal]{jointauthortype}
@@ -42,6 +43,6 @@
\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,%
parvolume,parpages}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes-trad3.dbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes.bbx new/tex/latex/biblatex-oxref/oxnotes.bbx
--- old/tex/latex/biblatex-oxref/oxnotes.bbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes.bbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes.bbx}
[\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style]
@@ -31,6 +31,10 @@
\iftoggle{blx@ox@scnames}{\bibcplstring[\textsc]{anon}}{\bibcplstring{anon}}%
}%
}{}{\wlog{WARNING: biblatex-oxref (oxnotes) failed to patch author}}
+\xpretobibmacro{series+number+edition+publisher+location+date}{%
+ \iffieldequalstr{relatedtype}{multivolume}{%
+ \clearfield{year}\clearfield{month}\clearfield{day}%
+ }{}}{}{}
\DeclareStyleSourcemap{%
\maps[datatype=bibtex]{%
\map{
@@ -50,6 +54,6 @@
}%
}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes.bbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes.cbx new/tex/latex/biblatex-oxref/oxnotes.cbx
--- old/tex/latex/biblatex-oxref/oxnotes.cbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes.cbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes.cbx}
[\Version\space Footnote-based citation style inspired by the Oxford Guide to Style]
@@ -44,6 +44,6 @@
}%
}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes.cbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnotes.dbx new/tex/latex/biblatex-oxref/oxnotes.dbx
--- old/tex/latex/biblatex-oxref/oxnotes.dbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnotes.dbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,12 +13,13 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnotes.dbx}
[\Version\space Data model for the Oxref family of styles]
\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,title}
\DeclareDatamodelFields[type=field,datatype=literal]{datetype,origdatetype}
+\DeclareDatamodelEntrytypes{inaudio,inmusic,inmovie,invideo}
\DeclareDatamodelFields[type=list,datatype=name]{authoraddon,editoraddon,serieseditor}
\DeclareDatamodelFields[type=list,datatype=name]{jointauthor}
\DeclareDatamodelFields[type=field,datatype=literal]{jointauthortype}
@@ -42,6 +43,6 @@
\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,%
parvolume,parpages}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnotes.dbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnum.bbx new/tex/latex/biblatex-oxref/oxnum.bbx
--- old/tex/latex/biblatex-oxref/oxnum.bbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnum.bbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnum.bbx}
[\Version\space Numeric bibliography style inspired by the Oxford Guide to Style]
@@ -31,11 +31,15 @@
\iftoggle{blx@ox@scnames}{\bibcplstring[\textsc]{anon}}{\bibcplstring{anon}}%
}%
}{}{\wlog{WARNING: biblatex-oxref (oxnum) failed to patch author}}
+\xpretobibmacro{series+number+edition+publisher+location+date}{%
+ \iffieldequalstr{relatedtype}{multivolume}{%
+ \clearfield{year}\clearfield{month}\clearfield{day}%
+ }{}}{}{}
\ExecuteBibliographyOptions{labelnumber}
\providebool{bbx:subentry}
-\DeclareBibliographyOption[boolean]{subentry}[true]{%
+\DeclareBibliographyOption{subentry}[true]{%
\setbool{bbx:subentry}{#1}}
\DeclareFieldFormat{bibentrysetcount}{\mkbibparens{\mknumalph{#1}}}
@@ -81,6 +85,6 @@
\usebibmacro{setpageref}%
\finentry}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnum.bbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnum.cbx new/tex/latex/biblatex-oxref/oxnum.cbx
--- old/tex/latex/biblatex-oxref/oxnum.cbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnum.cbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnum.cbx}
[\Version\space Numeric citation style inspired by the Oxford Guide to Style]
@@ -41,6 +41,6 @@
}%
}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnum.cbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxnum.dbx new/tex/latex/biblatex-oxref/oxnum.dbx
--- old/tex/latex/biblatex-oxref/oxnum.dbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxnum.dbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,12 +13,13 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxnum.dbx}
[\Version\space Data model for the Oxref family of styles]
\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,title}
\DeclareDatamodelFields[type=field,datatype=literal]{datetype,origdatetype}
+\DeclareDatamodelEntrytypes{inaudio,inmusic,inmovie,invideo}
\DeclareDatamodelFields[type=list,datatype=name]{authoraddon,editoraddon,serieseditor}
\DeclareDatamodelFields[type=list,datatype=name]{jointauthor}
\DeclareDatamodelFields[type=field,datatype=literal]{jointauthortype}
@@ -42,6 +43,6 @@
\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,%
parvolume,parpages}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxnum.dbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxref.bbx new/tex/latex/biblatex-oxref/oxref.bbx
--- old/tex/latex/biblatex-oxref/oxref.bbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxref.bbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,7 +13,7 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxref.bbx}
[\Version\space Base settings for bibliography styles inspired by the Oxford Guide to Style]
@@ -59,15 +59,15 @@
\DeclareNameAlias{bookauthor}{default}
\DeclareNameAlias{bookeditor}{default}
\newtoggle{blx@ox@scnames}
-\DeclareBibliographyOption[boolean]{scnames}[true]{%
+\DeclareBibliographyOption{scnames}[true]{%
\settoggle{blx@ox@scnames}{#1}
}
\newtoggle{blx@ox@nametitle}\toggletrue{blx@ox@nametitle}%
-\DeclareBibliographyOption[boolean]{usenametitles}[true]{%
+\DeclareBibliographyOption{usenametitles}[true]{%
\settoggle{blx@ox@nametitle}{#1}}
-\DeclareTypeOption[boolean]{usenametitles}[true]{%
+\DeclareTypeOption{usenametitles}[true]{%
\settoggle{blx@ox@nametitle}{#1}}
-\DeclareEntryOption[boolean]{usenametitles}[true]{%
+\DeclareEntryOption{usenametitles}[true]{%
\settoggle{blx@ox@nametitle}{#1}}
\newbibmacro*{name:title-given-family}[5]{%
\usebibmacro{name:delim}{#2#3#1}%
@@ -507,13 +507,13 @@
{}{\wlog{WARNING: biblatex-oxref failed to patch translatorstrg}}%
\xpatchbibmacro{translator+othersstrg}%
{\bibstring}%
- {\bibstring[\mkbibparens]}{}{}%
+ {\bibstring[\mkbibparens]}%
+{}{\wlog{WARNING: biblatex-oxref failed to patch translator+othersstrg}}%
\renewbibmacro*{bybookauthor}{%
\ifnamesequal{author}{bookauthor}%
{\bibstring{idem\thefield{gender}}}%
{\printnames{bookauthor}}}
\newbibmacro*{bookeditor}{%
- \global\undef\bbx@lasthash
\ifboolexpr{
test \ifuseeditor
and
@@ -595,28 +595,28 @@
\iffieldundef{#2endmonth}%
{\blx@ox@compyear{\thefield{#2year}}{\thefield{#2endyear}}}%
{\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-oxref failed to patch mkdaterangefull}}
\patchcmd{\mkdaterangefullextra}{%
\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
}{%
\iffieldundef{#2endmonth}%
{\blx@ox@compyear{\thefield{#2year}}{\thefield{#2endyear}}}%
{\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
-}{}{}
-\patchcmd{\mkdaterangetrunc}{%
+}{}{\wlog{WARNING: biblatex-oxref failed to patch mkdaterangefullextra}}
+\patchcmd{\mkdaterangetrunc@i}{%
\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
}{%
\iffieldundef{#2endmonth}%
{\blx@ox@compyear{\thefield{#2year}}{\thefield{#2endyear}}}%
{\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
-}{}{}
-\patchcmd{\mkdaterangetruncextra}{%
+}{}{\wlog{WARNING: biblatex-oxref failed to patch mkdaterangetrunc@i}}
+\patchcmd{\mkdaterangetruncextra@i}{%
\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
}{%
\iffieldundef{#2endmonth}%
{\blx@ox@compyear{\thefield{#2year}}{\thefield{#2endyear}}}%
{\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
-}{}{}
+}{}{\wlog{WARNING: biblatex-oxref failed to patch mkdaterangetruncextra@i}}
\DeclareFieldFormat{datetype}{%
\ifbibstring{#1}{\bibstring{#1}}{#1\isdot}%
}
@@ -870,7 +870,7 @@
\setunit{\addspace}%
\usebibmacro{issue+date}%
\newunit}
-\DeclareBibliographyOption{issuestyle}[slash]{%
+\DeclareBibliographyOption[string]{issuestyle}[slash]{%
\ifcsdef{blx@ox@issuestyle@#1}{%
\csuse{blx@ox@issuestyle@#1}%
}{%
@@ -909,17 +909,17 @@
}
\ExecuteBibliographyOptions{issuestyle=slash}
\newtoggle{blx@ox@varissuedate}
-\DeclareBibliographyOption[boolean]{varissuedate}[true]{%
+\DeclareBibliographyOption{varissuedate}[true]{%
\settoggle{blx@ox@varissuedate}{#1}}
-\DeclareTypeOption[boolean]{varissuedate}[true]{%
+\DeclareTypeOption{varissuedate}[true]{%
\settoggle{blx@ox@varissuedate}{#1}}
-\DeclareEntryOption[boolean]{varissuedate}[true]{%
+\DeclareEntryOption{varissuedate}[true]{%
\settoggle{blx@ox@varissuedate}{#1}}
-\DeclareBibliographyOption[boolean]{issuedate-plain}[true]{%
+\DeclareBibliographyOption{issuedate-plain}[true]{%
\settoggle{blx@ox@varissuedate}{#1}}
-\DeclareTypeOption[boolean]{issuedate-plain}[true]{%
+\DeclareTypeOption{issuedate-plain}[true]{%
\settoggle{blx@ox@varissuedate}{#1}}
-\DeclareEntryOption[boolean]{issuedate-plain}[true]{%
+\DeclareEntryOption{issuedate-plain}[true]{%
\settoggle{blx@ox@varissuedate}{#1}}
\renewbibmacro*{issue+date}{%
\ifboolexpr{
@@ -1097,11 +1097,11 @@
\IfSubStr{#1}{-}{%
\StrCount{#1}{-}[\blx@ox@dashnum]%
\StrBefore{#1}{-}[\blx@ox@volnum]%
- \Rn{\blx@ox@volnum}\bibrangedash
+ \expandafter\ifinteger\blx@ox@volnum{\Rn{\blx@ox@volnum}}{\blx@ox@volnum}\bibrangedash
\StrBehind[\blx@ox@dashnum]{#1}{-}[\blx@ox@volnum]%
- \Rn{\blx@ox@volnum}%
+ \expandafter\ifinteger\blx@ox@volnum{\Rn{\blx@ox@volnum}}{\blx@ox@volnum}%
}{%
- \Rn{#1}}}
+ \ifinteger{#1}{\Rn{#1}}{#1}}}
\newbibmacro*{maintitle+volume}{%
\ifboolexpr{
test {\iffieldundef{maintitle}}
@@ -1978,7 +1978,7 @@
\newtoggle{blx@ox@plainthesis}
\DeclareFieldAlias{thesis:publication}{publication}
\DeclareFieldFormat{plain}{#1}
-\DeclareBibliographyOption[boolean]{altthesis}[true]{%
+\DeclareBibliographyOption{altthesis}[true]{%
\settoggle{blx@ox@altthesis}{#1}
}
\DeclareBibliographyOption[string]{thesis}[out]{%
@@ -2319,7 +2319,7 @@
\setunit{\addcomma\space}%
\usebibmacro{date+time}}}}
\newtoggle{blx@ox@endeditor}
-\DeclareEntryOption[boolean]{endeditor}[true]{%
+\DeclareEntryOption{endeditor}[true]{%
\settoggle{blx@ox@endeditor}{#1}}
\newbibmacro*{pre-byeditor+others}{%
\iftoggle{blx@ox@endeditor}{}{%
@@ -2649,7 +2649,38 @@
\DeclareFieldFormat[software]{version}{\mkbibparens{\bibstring{version}~#1}}
\DeclareFieldFormat[software]{urldate}{\bibstring{urldown}\space#1}
\DeclareBibliographyAlias{software}{manual}
-\DeclareBibliographyAlias{dataset}{manual}
+\DeclareBibliographyDriver{dataset}{%
+ \usebibmacro{bibindex}%
+ \usebibmacro{begentry}%
+ \usebibmacro{author/editor+others/translator+others}%
+ \setunit{\printdelim{nametitledelim}}\newblock
+ \usebibmacro{title}%
+ \newunit
+ \printlist{language}%
+ \setunit{\titlebyauthordelim}\newblock
+ \usebibmacro{byauthor}%
+ \newunit\newblock
+ \usebibmacro{byeditor+others}%
+ \newunit\newblock
+ \printfield{type}%
+ \newunit
+ \printfield{version}%
+ \newunit\newblock
+ \printfield{note}%
+ \newunit\newblock
+ \usebibmacro{type+series+number+edition+organization+publisher+location+date}%
+ \newunit\newblock
+ \usebibmacro{doi+eprint+url}%
+ \newunit\newblock
+ \usebibmacro{addendum+pubstate}%
+ \setunit{\bibpagerefpunct}\newblock
+ \usebibmacro{pageref}%
+ \newunit\newblock
+ \iftoggle{bbx:related}
+ {\usebibmacro{related:init}%
+ \usebibmacro{related}}
+ {}%
+ \usebibmacro{finentry}}
\newtoggle{bbx:scotstyle}
\DeclareEntryOption{scottish-style}[true]{%
\settoggle{bbx:scotstyle}{#1}}
@@ -2667,7 +2698,7 @@
\settoggle{bbx:altcourt}{#1}}
\newtoggle{bbx@ecliuse}
\newtoggle{bbx@eclionly}
-\DeclareBibliographyOption{ecli}[yes]{%
+\DeclareBibliographyOption[string]{ecli}[yes]{%
\ifstrequal{#1}{no}{%
\global\togglefalse{bbx@ecliuse}%
\global\togglefalse{bbx@eclionly}%
@@ -3739,7 +3770,7 @@
\setunit{\relatedtypepunct}\newblock
\iftoggle{bbx:related}
}{}{\wlog{WARNING: biblatex-oxref failed to patch misc}}
-\DeclareBibliographyOption{relationpunct}[semicolon]{%
+\DeclareBibliographyOption[string]{relationpunct}[semicolon]{%
\ifcsdef{add#1}{%
\ifstrequal{#1}{space}{%
\renewcommand*{\relatedtypepunct}{\addspace}%
@@ -3751,7 +3782,7 @@
}{%
Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak
'period', 'exclam', 'question', and 'space'.}}}
-\DeclareTypeOption{relationpunct}[semicolon]{%
+\DeclareTypeOption[string]{relationpunct}[semicolon]{%
\ifcsdef{add#1}{%
\ifstrequal{#1}{space}{%
\renewcommand*{\relatedtypepunct}{\addspace}%
@@ -3764,7 +3795,7 @@
Valid values are 'dot', 'comma', 'semicolon', 'colon',\MessageBreak
'period', 'exclam', 'question', and 'space'.}}}
\newtoggle{blx@ox@relpunctset}
-\DeclareEntryOption{relationpunct}[semicolon]{%
+\DeclareEntryOption[string]{relationpunct}[semicolon]{%
\ifcsdef{add#1}{%
\ifstrequal{#1}{space}{%
\renewcommand*{\relatedtypepunct}{\addspace}%
@@ -3790,7 +3821,8 @@
\iffieldequalstr{relatedtype}{multivolume}{%
\setunit{\addcomma\space}}{}%
}}{}{\wlog{WARNING: biblatex-oxref failed to append to begrelated}}
-\renewcommand*{\begrelateddelimmultivolume}{\newunitpunct}
+\DeclareDelimFormat{relateddelimmultivolume}{\newunitpunct}
+\DeclareDelimFormat{begrelateddelimmultivolume}{\newunitpunct}
\newbibmacro*{rellanguage}{%
\def\do##1{%
@@ -3918,9 +3950,23 @@
\entrydata*{#1}{%
\printtext{%
\printfield{volume}%
- \printfield{part}}%
+ \printfield{part}%
+ \iffieldsequal{savedtitle}{title}{}{%
+ \setunit{\addcolon\space}%
+ \usebibmacro{title}}%
+ }%
\setunit*{\addspace}%
- \usebibmacro{series+number+edition+publisher+location+date}}}
+ \iffieldsequal{savedseries}{series}{\clearfield{series}}{}%
+ \iffieldsequal{savednumber}{number}{\clearfield{number}}{}%
+ \iffieldsequal{savededition}{edition}{\clearfield{edition}}{}%
+ \ifboolexpr{
+ test {\iflistsequal{savedpublisher}{publisher}}
+ and
+ test {\iflistsequal{savedlocation}{location}}
+ }{\clearlist{publisher}\clearlist{location}}{}%
+ \iffieldsequal{saveddate}{date}{\clearfield{date}}{}%
+ \usebibmacro{series+number+edition+publisher+location+date}%
+ }}
\newbibmacro*{related:editedas}[1]{%
\entrydata{#1}{%
@@ -4355,6 +4401,6 @@
[proceedings,report,artwork,audio,image,music,movie,performance,video,%
manuscript,unpublished,review]{useeditor=false}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxref.bbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxyear.bbx new/tex/latex/biblatex-oxref/oxyear.bbx
--- old/tex/latex/biblatex-oxref/oxyear.bbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxyear.bbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,20 +13,13 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxyear.bbx}
[\Version\space Author-year bibliography style inspired by the Oxford Guide to Style]
\RequireBibliographyStyle{oxref}
\ExecuteBibliographyOptions{giveninits,labeldateparts,sorting=nyt,pagetracker,maxcitenames=2}
-\DeclareBibliographyOption{mergedate}[true]{%
- \ifcsdef{bbx@opt@mergedate@#1}
- {\csuse{bbx@opt@mergedate@#1}}
- {\PackageError{biblatex-oxref}
- {Invalid option 'mergedate=#1'}
- {Valid values are 'maximum', 'compact', 'basic', 'minimum',\MessageBreak
- 'year', 'true' (=year), and 'false'.}}}
-\DeclareTypeOption{mergedate}[true]{%
+\DeclareBiblatexOption{global,type,entry}{mergedate}[true]{%
\ifcsdef{bbx@opt@mergedate@#1}
{\csuse{bbx@opt@mergedate@#1}}
{\PackageError{biblatex-oxref}
@@ -74,11 +67,11 @@
not test {\iffieldundef{labeldatesource}}
and test {\iffieldequalstr{labeldatesource}{pubstate}}}}
\newtoggle{blx@ox@nonodate}
-\DeclareBibliographyOption[boolean]{nonodate}[true]{%
+\DeclareBibliographyOption{nonodate}[true]{%
\settoggle{blx@ox@nonodate}{#1}}
-\DeclareTypeOption[boolean]{nonodate}[true]{%
+\DeclareTypeOption{nonodate}[true]{%
\settoggle{blx@ox@nonodate}{#1}}
-\DeclareEntryOption[boolean]{nonodate}[true]{%
+\DeclareEntryOption{nonodate}[true]{%
\settoggle{blx@ox@nonodate}{#1}}
\newbibmacro*{labeldate}{%
\ifboolexpr{
@@ -241,21 +234,21 @@
}{%
\iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}%
}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangefull}}
-\xpatchcmd{\mkdaterangetrunc}{%
+\xpatchcmd{\mkdaterangetrunc@i}{%
\iffieldundef{#2year} {\blx@nounit}%
}{%
\iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}%
-}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetrunc}}
+}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetrunc@i}}
\xpatchcmd{\mkdaterangefullextra}{%
\iffieldundef{#2year} {\blx@nounit}%
}{%
\iffieldundef{#2year} {\mknoyeardaterangefull{#1}{#2}}%
}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangefullextra}}
-\xpatchcmd{\mkdaterangetruncextra}{%
+\xpatchcmd{\mkdaterangetruncextra@i}{%
\iffieldundef{#2year} {\blx@nounit}%
}{%
\iffieldundef{#2year} {\mknoyeardaterangetrunc{#1}{#2}}%
-}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetruncextra}}
+}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch mkdaterangetruncextra@i}}
\DeclareFieldFormat{shorthandwidth}{#1}
\xpretonameformat{family-given}{%
@@ -543,6 +536,14 @@
\addcomma\space
}%
}
+\renewbibmacro{manuscript:date}{%
+ \ifboolexpr{
+ test {\ifnameundef{author}}
+ and
+ not togl {blx@ox@clearedtitle}
+ and
+ test {\iffieldundef{label}}
+ }{}{\usebibmacro{date}}}
\DeclareLabeltitle{%
\field{shorttitle}
\field{title}
@@ -570,6 +571,6 @@
}}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxyear.bbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxyear.cbx new/tex/latex/biblatex-oxref/oxyear.cbx
--- old/tex/latex/biblatex-oxref/oxyear.cbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxyear.cbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,13 +13,13 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxyear.cbx}
[\Version\space Author-year citation style inspired by the Oxford Guide to Style]
\RequireCitationStyle{authoryear-comp}
\ExecuteBibliographyOptions{uniquename=init}
-\newbibmacro*{cite:labeldate+extradate}{%
+\renewbibmacro*{cite:labeldate+extradate}{%
\ifboolexpr{
test {\iffieldundef{labelyear}}
or
@@ -73,6 +73,6 @@
}%
}{}{\wlog{WARNING: biblatex-oxref failed to patch textcite}}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxyear.cbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-oxref/oxyear.dbx new/tex/latex/biblatex-oxref/oxyear.dbx
--- old/tex/latex/biblatex-oxref/oxyear.dbx 2019-02-19 23:19:07.000000000 +0100
+++ new/tex/latex/biblatex-oxref/oxyear.dbx 2020-01-27 22:55:00.000000000 +0100
@@ -13,12 +13,13 @@
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\Version{2019/02/19 v1.1}
+\def\Version{2020/01/27 v2.0.1}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesFile{oxyear.dbx}
[\Version\space Data model for the Oxref family of styles]
\DeclareDatamodelConstant[type=list]{nameparts}{prefix,family,suffix,given,title}
\DeclareDatamodelFields[type=field,datatype=literal]{datetype,origdatetype}
+\DeclareDatamodelEntrytypes{inaudio,inmusic,inmovie,invideo}
\DeclareDatamodelFields[type=list,datatype=name]{authoraddon,editoraddon,serieseditor}
\DeclareDatamodelFields[type=list,datatype=name]{jointauthor}
\DeclareDatamodelFields[type=field,datatype=literal]{jointauthortype}
@@ -42,6 +43,6 @@
\DeclareDatamodelEntryfields[jurisdiction]{pardate,parreporter,parseries,%
parvolume,parpages}
%%
-%% Copyright (C) 20162019 Alex Ball
+%% Copyright (C) 20162020 Alex Ball
%%
%% End of file `oxyear.dbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-oxref.tlpobj new/tlpkg/tlpobj/biblatex-oxref.tlpobj
--- old/tlpkg/tlpobj/biblatex-oxref.tlpobj 2019-02-28 03:20:33.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-oxref.tlpobj 2020-01-27 23:22:55.000000000 +0100
@@ -1,6 +1,6 @@
name biblatex-oxref
category Package
-revision 50061
+revision 53571
shortdesc BibLaTeX styles inspired by the Oxford Guide to Style
relocated 1
longdesc This bundle provides four BibLaTeX styles that implement (many
@@ -56,7 +56,6 @@
catalogue-contact-bugs https://github.com/alex-ball/biblatex-oxref/issues
catalogue-contact-home https://github.com/alex-ball/biblatex-oxref
catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-oxref
-catalogue-date 2019-02-19 19:47:43 +0100
catalogue-license lppl1.3c
catalogue-topics biblatex
-catalogue-version 1.1
+catalogue-version 2.0.1
++++++ biblatex-phys.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-phys/biblatex-phys.bib new/doc/latex/biblatex-phys/biblatex-phys.bib
--- old/doc/latex/biblatex-phys/biblatex-phys.bib 2013-02-16 23:45:26.000000000 +0100
+++ new/doc/latex/biblatex-phys/biblatex-phys.bib 2019-09-23 00:16:44.000000000 +0200
@@ -54,6 +54,28 @@
edition = {5},
}
+@Article{Arneodo2008,
+ title = {Universal Intermittent Properties of Particle Trajectories in
+ Highly Turbulent Flows},
+ author = {Arnodo, A. and Benzi, R. and Berg, J. and Biferale, L. and
+ Bodenschatz, E. and Busse, A. and Calzavarini, E. and
+ Castaing, B. and Cencini, M. and Chevillard, L. and Fisher,
+ R. T. and Grauer, R. and Homann, H. and Lamb, D. and
+ Lanotte, A. S. and Lvque, E. and Lthi, B. and Mann, J. and
+ Mordant, N. and Mller, W.-C. and Ott, S. and Ouellette, N.
+ T. and Pinton, J.-F. and Pope, S. B. and Roux, S. G. and
+ Toschi, F. and Xu, H. and Yeung, P. K.},
+ collaboration = {International Collaboration for Turbulence Research},
+ journal = {Phys. Rev. Lett.},
+ volume = {100},
+ issue = {25},
+ pages = {254504},
+ year = {2008},
+ month = {Jun},
+ publisher = {American Physical Society},
+ doi = {10.1103/PhysRevLett.100.254504},
+}
+
@Book{Augustine1995,
hyphenation = {american},
author = {Augustine, Robert L.},
@@ -401,9 +423,10 @@
%%
%% This work consists of the files biblatex-phys.bib,
%% biblatex-phys.tex,
-%% phys.bbx and
-%% phys.cbx,
+%% phys.bbx,
+%% phys.cbx and
+%% phys.dbx,
%% and the derived file biblatex-phys.pdf.
%%
%%
-%% End of file `biblatex-phys.bbx'.
\ No newline at end of file
+%% End of file `biblatex-phys.bbx'.
Binary files old/doc/latex/biblatex-phys/biblatex-phys.pdf and new/doc/latex/biblatex-phys/biblatex-phys.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-phys/biblatex-phys.tex new/doc/latex/biblatex-phys/biblatex-phys.tex
--- old/doc/latex/biblatex-phys/biblatex-phys.tex 2018-10-19 22:34:15.000000000 +0200
+++ new/doc/latex/biblatex-phys/biblatex-phys.tex 2019-12-03 23:04:55.000000000 +0100
@@ -25,8 +25,8 @@
{\texttt{joseph.wright(a)morningstar2.co.uk}}}}
\title{\pkg{biblatex-phys} -- A \pkg{biblatex} implementation of the
\textsc{aip} and \textsc{aps} bibliography style%
- \footnote{This file describes v1.1, last revised 2018/10/19.}}
-\date{Released 2018/10/19}
+ \footnote{This file describes v1.1b, last revised 2019/12/03.}}
+\date{Released 2019/12/03}
\providecommand*{\opt}[1]{\texttt{#1}}
\providecommand*{\pkg}[1]{\textsf{#1}}
@@ -200,13 +200,15 @@
\changes{v1.0c}{2018/10/19}{Update internals to follow standard \pkg{biblatex}
style changes}
\changes{v1.1}{2018/10/19}{Support for \texttt{collaboration} field}
+\changes{v1.1a}{2019-09-20}{Biber support for \texttt{collaboration} field}
+\changes{v1.1b}{2019-12-03}{Fix printing of DOI when pages are missing}
\PrintChanges
\end{document}
%%
-%% Copyright (C) 2012-2014,2016,2018 by
+%% Copyright (C) 2012-2014,2016,2018,2019 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
@@ -222,8 +224,9 @@
%% This work consists of the files biblatex-phys.bib,
%% biblatex-phys.tex,
%% biblatex-phys.tex,
-%% phys.bbx and
-%% phys.cbx,
+%% phys.bbx,
+%% phys.cbx and
+%% phys.dbx,
%% and the derived file biblatex-phys.pdf.
%%
%% End of file `biblatex-phys.tex'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-phys.doc.tlpobj new/tlpkg/tlpobj/biblatex-phys.doc.tlpobj
--- old/tlpkg/tlpobj/biblatex-phys.doc.tlpobj 2019-02-28 03:20:34.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-phys.doc.tlpobj 2019-12-04 01:54:24.000000000 +0100
@@ -1,6 +1,6 @@
name biblatex-phys.doc
category Package
-revision 48941
+revision 53013
shortdesc doc files of biblatex-phys
relocated 1
docfiles size=118
++++++ biblatex-phys.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-phys/phys.bbx new/tex/latex/biblatex-phys/phys.bbx
--- old/tex/latex/biblatex-phys/phys.bbx 2018-10-19 22:34:15.000000000 +0200
+++ new/tex/latex/biblatex-phys/phys.bbx 2019-12-03 23:04:55.000000000 +0100
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{phys.bbx}[2018/10/19 v1.1 biblatex bibliography style]
+\ProvidesFile{phys.bbx}[2019/12/03 v1.1b biblatex bibliography style]
% Load the standard style to avoid copy-pasting unnecessary material
\RequireBibliographyStyle{numeric-comp}
@@ -434,7 +434,9 @@
}%
\iffieldundef{collaboration}
{}
- {\printfield[parens]{collaboration}}}
+ {%
+ \setunit{\addspace}%
+ \printfield[parens]{collaboration}}}
{}%
}
@@ -456,6 +458,22 @@
}%
}
+\renewbibmacro*{note+pages}{%
+ \printfield{note}%
+ \setunit{\bibpagespunct}%
+ \printfield{pages}%
+ \iffieldundef{pages}
+ {%
+ \printfield{doi}%
+ \clearfield{doi}%
+ }%
+ {%
+ \iftoggle{bbx:doi}
+ {}
+ {\clearfield{doi}}%
+ }%
+}
+
\newbibmacro*{related:translatedas}[1]{%
\entrydata{#1}{%
\usebibmacro{journal+issuetitle}%
@@ -477,7 +495,7 @@
%%
-%% Copyright (C) 2012-2014,2016,2018 by
+%% Copyright (C) 2012-2014,2016,2018,2019 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
@@ -492,8 +510,9 @@
%%
%% This work consists of the files biblatex-phys.bib,
%% biblatex-phys.tex,
-%% phys.bbx and
-%% phys.cbx,
+%% phys.bbx,
+%% phys.cbx and
+%% phys.dbx,
%% and the derived file biblatex-phys.pdf.
%%
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-phys/phys.cbx new/tex/latex/biblatex-phys/phys.cbx
--- old/tex/latex/biblatex-phys/phys.cbx 2018-10-19 22:34:15.000000000 +0200
+++ new/tex/latex/biblatex-phys/phys.cbx 2019-12-03 23:04:55.000000000 +0100
@@ -8,7 +8,7 @@
%% ---------------------------------------------------------------
%%
-\ProvidesFile{phys.cbx}[2018/10/19 v1.1 biblatex citation style]
+\ProvidesFile{phys.cbx}[2019/12/03 v1.1b biblatex citation style]
\RequireCitationStyle{numeric-comp}
@@ -20,7 +20,7 @@
}
%%
-%% Copyright (C) 2012-2014,2016,2018 by
+%% Copyright (C) 2012-2014,2016,2018,2019 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
@@ -35,8 +35,9 @@
%%
%% This work consists of the files biblatex-phys.bib,
%% biblatex-phys.tex,
-%% phys.bbx and
-%% phys.cbx,
+%% phys.bbx,
+%% phys.cbx and
+%% phys.dbx,
%% and the derived file biblatex-phys.pdf.
%%
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/biblatex-phys/phys.dbx new/tex/latex/biblatex-phys/phys.dbx
--- old/tex/latex/biblatex-phys/phys.dbx 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/biblatex-phys/phys.dbx 2019-12-03 23:04:55.000000000 +0100
@@ -0,0 +1,37 @@
+%% ---------------------------------------------------------------
+%% biblatex-phys --- A biblatex implementation of the AIP and APS
+%% bibliography style
+%% Maintained by Joseph Wright
+%% E-mail: joseph.wright(a)morningstar2.co.uk
+%% Released under the LaTeX Project Public License v1.3c or later
+%% See http://www.latex-project.org/lppl.txt
+%% ---------------------------------------------------------------
+%%
+
+\ProvidesFile{phys.dbx}[2019/12/03 v1.1b biblatex database model extension]
+
+\DeclareDatamodelFields[type=field, datatype=literal]{collaboration}
+
+%%
+%% Copyright (C) 2012-2014,2016,2018,2019 by
+%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
+%%
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version. The latest
+%% version of this license is in the file:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% This work is "maintained" (as per LPPL maintenance status) by
+%% Joseph Wright.
+%%
+%% This work consists of the files biblatex-phys.bib,
+%% biblatex-phys.tex,
+%% phys.bbx,
+%% phys.cbx and
+%% phys.dbx,
+%% and the derived file biblatex-phys.pdf.
+%%
+%%
+%% End of file `phys.cbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-phys.tlpobj new/tlpkg/tlpobj/biblatex-phys.tlpobj
--- old/tlpkg/tlpobj/biblatex-phys.tlpobj 2019-02-28 03:20:35.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-phys.tlpobj 2019-12-04 01:54:24.000000000 +0100
@@ -1,6 +1,6 @@
name biblatex-phys
category Package
-revision 48941
+revision 53013
shortdesc A BibLaTeX implementation of the AIP and APS bibliography style
relocated 1
longdesc The biblatex-phys package provides an implementation of the
@@ -11,11 +11,12 @@
longdesc database is provided to show how to format input for the style.
longdesc Style options are provided to cover the minor formatting
longdesc variations between the AIP and APS bibliography styles.
-runfiles size=5
+runfiles size=6
RELOC/tex/latex/biblatex-phys/phys.bbx
RELOC/tex/latex/biblatex-phys/phys.cbx
+ RELOC/tex/latex/biblatex-phys/phys.dbx
catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-phys
-catalogue-date 2018-10-19 11:03:25 +0200
+catalogue-date 2019-12-03 13:45:33 +0100
catalogue-license lppl1.3
catalogue-topics physics biblatex
-catalogue-version 1.1
+catalogue-version 1.1b
++++++ biblatex-publist.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-publist/README new/doc/latex/biblatex-publist/README
--- old/doc/latex/biblatex-publist/README 2019-02-23 00:11:46.000000000 +0100
+++ new/doc/latex/biblatex-publist/README 2019-05-05 00:47:27.000000000 +0200
@@ -45,6 +45,9 @@
== CHANGES ==
+* V. 1.16 (2019-04-16):
+ - Major code cleanup.
+
* V. 1.15 (2019-02-22):
- Add support for omitting multiple authors.
- Fix documentation issues.
Binary files old/doc/latex/biblatex-publist/biblatex-publist.pdf and new/doc/latex/biblatex-publist/biblatex-publist.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/biblatex-publist/biblatex-publist.tex new/doc/latex/biblatex-publist/biblatex-publist.tex
--- old/doc/latex/biblatex-publist/biblatex-publist.tex 2019-02-23 00:11:46.000000000 +0100
+++ new/doc/latex/biblatex-publist/biblatex-publist.tex 2019-05-05 00:47:27.000000000 +0200
@@ -87,6 +87,8 @@
% Conditional page breaks
\def\condbreak#1{%
\vskip 0pt plus #1\pagebreak[3]\vskip 0pt plus -#1\relax}
+% \condbr{<number of lines>}
+\newcommand*\condbr[1]{\condbreak{#1\baselineskip}}
\renewcommand{\lstlistingname}{Example}
@@ -100,7 +102,7 @@
\thanks{Please report issues via \protect\url{https://github.com/jspitz/biblatex-publist}.}%
}
-\date{Version 1.15, 2019/02/22}
+\date{Version 1.16, 2019/04/16}
\maketitle
\begin{abstract}
@@ -244,7 +246,7 @@
\end{description}
-\subsection{Multiple authors and\slash or name variants}\label{sec:multiauthors}
+\subsection{Handling multiple authors and\slash or name variants}\label{sec:multiauthors}
If multiple \jcsmacro{plauthorname} specifications have been entered (or a \jcsmacro{plauthorname} specification
in addition to a specification via the options \joption{plauthorname}, \joption{plauthorname} and
@@ -254,9 +256,9 @@
list (for instance to mark contributions of a research team):
\begin{lstlisting}[moretexcs={[2]{plauthorname}}]
\usepackage[style=publist,plauthorhandling=highlight]{biblatex}
-\plauthorname[John]{Doe}
-\plauthorname[Mary][van]{Smith}
-\plauthorname{Wittgenstein}
+\plauthorname[Cristiano]{Ronaldo}
+\plauthorname[\'Angel][Di]{Mar\'ia}
+\plauthorname{Neymar}
\end{lstlisting}
%
Multiple specifications can also be used to deal with name variants:
@@ -273,8 +275,8 @@
which have to be adjusted accordingly if names are omitted). However, it does not strike me sensible to do so (in other words,
if you need to deal with a \emph{team} of authors, you should really consider to use \joption{plauthorhandling=highlight}).
-Note that this also applies to filtering (see sec.~\ref{sec:filtering}), i.\,e., the \joption{mine} filter considers
-entries authored by \emph{any} of the specified persons.
+Note that multiple specifications also affect filtering (see sec.~\ref{sec:filtering}), i.\,e., the \joption{mine} filter selects
+entries authored or edited by any and all specified persons.
\section{Customization}
@@ -532,11 +534,16 @@
\endrefcontext
\end{lstlisting}
-\clearpage
+\condbr{4}
\section{Revision Log}
\begin{description}
+ \item [{V. 1.16 (2019-04-16):}]~
+ \begin{itemize}
+ \item Major code cleanup.
+ \end{itemize}
+
\item [{V. 1.15 (2019-02-22):}]~
\begin{itemize}
\item Add support for omitting multiple authors. See sec.~\ref{sec:multiauthors}.
@@ -588,7 +595,7 @@
of the publication list items
\item Documentation improvements.
\end{itemize}
-\clearpage
+\condbr{3}
\item [{V.~1.8 (2017-11-14):}]~
\begin{itemize}
\item Adapt to \bibltx\ 3.8. This version is now required.
@@ -632,7 +639,7 @@
\item Assure the margin text always starts uppercased (relevant for pubstates).
\item Minor corrections to the manual.
\end{itemize}
-\clearpage
+\condbr{3}
\item [{V.~1.3 (2016-08-06):}]~
\begin{itemize}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biblatex-publist.doc.tlpobj new/tlpkg/tlpobj/biblatex-publist.doc.tlpobj
--- old/tlpkg/tlpobj/biblatex-publist.doc.tlpobj 2019-02-28 03:20:35.000000000 +0100
+++ new/tlpkg/tlpobj/biblatex-publist.doc.tlpobj 2019-05-05 01:38:53.000000000 +0200
@@ -1,6 +1,6 @@
name biblatex-publist.doc
category Package
-revision 50085
+revision 50989
shortdesc doc files of biblatex-publist
relocated 1
docfiles size=88
++++++ biblatex-publist.tar.xz ++++++
++++ 1916 lines of diff (skipped)
++++++ biblatex.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-c/biblatex.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-c.new.3606/biblatex.doc.tar.xz differ: char 26, line 1
++++++ biblatex.tar.xz ++++++
++++ 5809 lines of diff (skipped)
++++++ bibleref-french.doc.tar.xz ++++++
Binary files old/doc/latex/bibleref-french/bibleref-french.pdf and new/doc/latex/bibleref-french/bibleref-french.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibleref-french.doc.tlpobj new/tlpkg/tlpobj/bibleref-french.doc.tlpobj
--- old/tlpkg/tlpobj/bibleref-french.doc.tlpobj 2019-02-28 03:20:39.000000000 +0100
+++ new/tlpkg/tlpobj/bibleref-french.doc.tlpobj 2019-12-16 01:54:27.000000000 +0100
@@ -1,6 +1,6 @@
name bibleref-french.doc
category Package
-revision 50075
+revision 53138
shortdesc doc files of bibleref-french
relocated 1
docfiles size=191
++++++ bibleref-french.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bibleref-french/bibleref-french.sty new/tex/latex/bibleref-french/bibleref-french.sty
--- old/tex/latex/bibleref-french/bibleref-french.sty 2019-02-20 23:42:07.000000000 +0100
+++ new/tex/latex/bibleref-french/bibleref-french.sty 2019-12-15 23:17:46.000000000 +0100
@@ -19,8 +19,8 @@
%% version 2005/12/01 or later.
%%
\NeedsTeXFormat{LaTeX2e}
-\def\BRFfileversion{v2.3.2}%
-\def\BRFfiledate{2019/02/20}%
+\def\BRFfileversion{v2.3.3}%
+\def\BRFfiledate{2019/12/14}%
\def\BRFfileinfo{French translation of the bibleref package}%
\ProvidesPackage{bibleref-french}
[\BRFfiledate\space\BRFfileversion\space\BRFfileinfo]
@@ -262,7 +262,6 @@
\newcommand*\br@Da{\br@Daniel}%
\newcommand*\br@Os{\br@Hosea}%
\newcommand*\br@Jo{\br@Joel}%
-\newcommand*\br@Joe{\br@Joel}%
\newcommand*\br@Ab{\br@Obadiah}%
\newcommand*\br@Abd{\br@Obadiah}%
\newcommand*\br@Mich{\br@Micah}%
@@ -277,18 +276,13 @@
\newcommand*\br@Lu{\br@Luke}%
\newcommand*\br@Act{\br@Acts}%
\newcommand*\br@Ro{\br@Romans}%
-\newcommand*\br@ITi{\br@ITimothy}%
-\newcommand*\br@IITi{\br@IITimothy}%
\newcommand*\br@He{\br@Hebrews}%
\newcommand*\br@Hebr{\br@Hebrews}%
\newcommand*\br@Jc{\br@James}%
\newcommand*\br@Ja{\br@James}%
\newcommand*\br@Jacq{\br@James}%
-\newcommand*\br@IPe{\br@IPeter}%
\newcommand*\br@IPi{\br@IPeter}%
-\newcommand*\br@IIPe{\br@IIPeter}%
\newcommand*\br@IIPi{\br@IIPeter}%
-\newcommand*\br@IIIJn{\br@IIIJohn}%
\newcommand*\br@Ju{\br@Jude}%
\newcommand*\br@Jud{\br@Jude}%
\newcommand*\br@Ap{\br@Revelation}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibleref-french.tlpobj new/tlpkg/tlpobj/bibleref-french.tlpobj
--- old/tlpkg/tlpobj/bibleref-french.tlpobj 2019-02-28 03:20:40.000000000 +0100
+++ new/tlpkg/tlpobj/bibleref-french.tlpobj 2019-12-16 01:54:27.000000000 +0100
@@ -1,6 +1,6 @@
name bibleref-french
category Package
-revision 50075
+revision 53138
shortdesc French translations for bibleref
relocated 1
longdesc The package provides translations and alternative typesetting
@@ -8,7 +8,6 @@
runfiles size=8
RELOC/tex/latex/bibleref-french/bibleref-french.sty
catalogue-ctan /macros/latex/contrib/bibleref-french
-catalogue-date 2019-02-20 11:57:53 +0100
catalogue-license lppl1.3
catalogue-topics theology
-catalogue-version 2.3.2
+catalogue-version 2.3.3
++++++ bibleref.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bibleref/CHANGES new/doc/latex/bibleref/CHANGES
--- old/doc/latex/bibleref/CHANGES 2019-01-14 23:04:18.000000000 +0100
+++ new/doc/latex/bibleref/CHANGES 2019-12-10 23:17:52.000000000 +0100
@@ -1,3 +1,6 @@
+1.24
+ * Add more abbreviation
+ * Add more \brthreeabbrvname
1.23
* Add Tt abbreviation
1.22
Binary files old/doc/latex/bibleref/bibleref.pdf and new/doc/latex/bibleref/bibleref.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/bibleref/makefile new/doc/latex/bibleref/makefile
--- old/doc/latex/bibleref/makefile 2017-07-01 23:32:47.000000000 +0200
+++ new/doc/latex/bibleref/makefile 2019-12-10 23:17:52.000000000 +0100
@@ -3,7 +3,6 @@
mkdir bibleref
mkdir bibleref/samples
latexmk sample*tex
- ln sample*tex bibleref/samples
ln sample*pdf bibleref/samples
ln CHANGES *ins *dtx bibleref.pdf README makefile bibleref
@$(RM) ../bibleref.zip
Binary files old/doc/latex/bibleref/samples/sample-categories.pdf and new/doc/latex/bibleref/samples/sample-categories.pdf differ
Binary files old/doc/latex/bibleref/samples/sample-indextools.pdf and new/doc/latex/bibleref/samples/sample-indextools.pdf differ
Binary files old/doc/latex/bibleref/samples/sample-xidx.pdf and new/doc/latex/bibleref/samples/sample-xidx.pdf differ
Binary files old/doc/latex/bibleref/samples/sample.pdf and new/doc/latex/bibleref/samples/sample.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibleref.doc.tlpobj new/tlpkg/tlpobj/bibleref.doc.tlpobj
--- old/tlpkg/tlpobj/bibleref.doc.tlpobj 2019-02-28 03:20:39.000000000 +0100
+++ new/tlpkg/tlpobj/bibleref.doc.tlpobj 2019-12-11 01:54:30.000000000 +0100
@@ -1,9 +1,9 @@
name bibleref.doc
category Package
-revision 49699
+revision 53090
shortdesc doc files of bibleref
relocated 1
-docfiles size=96
+docfiles size=97
RELOC/doc/latex/bibleref/CHANGES
RELOC/doc/latex/bibleref/README
RELOC/doc/latex/bibleref/bibleref.pdf
++++++ bibleref.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/bibleref/bibleref.sty new/tex/latex/bibleref/bibleref.sty
--- old/tex/latex/bibleref/bibleref.sty 2019-01-14 23:04:18.000000000 +0100
+++ new/tex/latex/bibleref/bibleref.sty 2019-12-10 23:17:52.000000000 +0100
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{bibleref}[2019/01/13 1.23 (NLCT and MR)]
+\ProvidesPackage{bibleref}[2019/12/10 1.24 (NLCT and MR)]
\RequirePackage{ifthen}
\RequirePackage{fmtcount}
\RequirePackage{amsgen}
@@ -285,6 +285,80 @@
\def\br@IIIJohn{\BRepistlenumberstyle{3}John}%
\def\br@Jude{Jude}%
\def\br@Revelation{Rev\BRperiod}}
+\newcommand*{\brthreeabbrvname}{%
+\def\br@Genesis{Gen\BRperiod}%
+\def\br@Exodus{Exo\BRperiod}%
+\def\br@Leviticus{Lev\BRperiod}%
+\def\br@Numbers{Num\BRperiod}%
+\def\br@Deuteronomy{Deu\BRperiod}%
+\def\br@Joshua{Jos\BRperiod}%
+\def\br@Judges{Jdg\BRperiod}%
+\def\br@Ruth{Rut\BRperiod}%
+\def\br@ISamuel{\BRbooknumberstyle{1}Sa\BRperiod}%
+\def\br@IISamuel{\BRbooknumberstyle{2}Sa\BRperiod}%
+\def\br@IKings{\BRbooknumberstyle{1}Ki\BRperiod}%
+\def\br@IIKings{\BRbooknumberstyle{2}Ki\BRperiod}%
+\def\br@IChronicles{\BRbooknumberstyle{1}Ch\BRperiod}%
+\def\br@IIChronicles{\BRbooknumberstyle{2}Ch\BRperiod}%
+\def\br@Ezra{Ezr\BRperiod}%
+\def\br@Nehemiah{Neh\BRperiod}%
+\def\br@Tobit{Tob\BRperiod}%
+\def\br@Judith{Jdi\BRperiod}%
+\def\br@Esther{Est\BRperiod}%
+\def\br@IMaccabees{\BRbooknumberstyle{1}Ma\BRperiod}%
+\def\br@IIMaccabees{\BRbooknumberstyle{2}Ma\BRperiod}%
+\def\br@Job{Job}%
+\def\br@Psalms{Psa\BRperiod}%
+\def\br@Proverbs{Pro\BRperiod}%
+\def\br@Ecclesiastes{Ecc\BRperiod}%
+\def\br@SongofSongs{SoS\BRperiod}%
+\def\br@Wisdom{Wis\BRperiod}%
+\def\br@Ecclesiasticus{Ecu\BRperiod}%
+\def\br@Isaiah{Isa\BRperiod}%
+\def\br@Jeremiah{Jer\BRperiod}%
+\def\br@Lamentations{Lam\BRperiod}%
+\def\br@Baruch{Bar\BRperiod}%
+\def\br@Ezekiel{Eze\BRperiod}%
+\def\br@Daniel{Dan\BRperiod}%
+\def\br@Hosea{Hos\BRperiod}%
+\def\br@Joel{Joe\BRperiod}%
+\def\br@Amos{Amo\BRperiod}%
+\def\br@Obadiah{Oba\BRperiod}%
+\def\br@Jonah{Jon\BRperiod}%
+\def\br@Micah{Mic\BRperiod}%
+\def\br@Nahum{Nah\BRperiod}%
+\def\br@Habakkuk{Hab\BRperiod}%
+\def\br@Zephaniah{Zep\BRperiod}%
+\def\br@Haggai{Hag\BRperiod}%
+\def\br@Zechariah{Zec\BRperiod}%
+\def\br@Malachi{Mal\BRperiod}%
+\def\br@Matthew{Mat\BRperiod}%
+\def\br@Mark{Mar\BRperiod}%
+\def\br@Luke{Luk\BRperiod}%
+\def\br@John{Joh\BRperiod}%
+\def\br@Acts{Act\BRperiod}%
+\def\br@Romans{Rom\BRperiod}%
+\def\br@ICorinthians{\BRepistlenumberstyle{1}Co\BRperiod}%
+\def\br@IICorinthians{\BRepistlenumberstyle{2}Co\BRperiod}%
+\def\br@Galatians{Gal\BRperiod}%
+\def\br@Ephesians{Eph\BRperiod}%
+\def\br@Philippians{Php\BRperiod}%
+\def\br@Colossians{Col\BRperiod}%
+\def\br@IThessalonians{\BRepistlenumberstyle{1}Th\BRperiod}%
+\def\br@IIThessalonians{\BRepistlenumberstyle{2}Th\BRperiod}%
+\def\br@ITimothy{\BRepistlenumberstyle{1}Ti\BRperiod}%
+\def\br@IITimothy{\BRepistlenumberstyle{2}Ti\BRperiod}%
+\def\br@Titus{Tit\BRperiod}%
+\def\br@Philemon{Phm\BRperiod}%
+\def\br@Hebrews{Heb\BRperiod}%
+\def\br@James{Jam\BRperiod}%
+\def\br@IPeter{\BRepistlenumberstyle{1}Pe\BRperiod}%
+\def\br@IIPeter{\BRepistlenumberstyle{2}Pe\BRperiod}%
+\def\br@IJohn{\BRepistlenumberstyle{1}Jo}%
+\def\br@IIJohn{\BRepistlenumberstyle{2}Jo}%
+\def\br@IIIJohn{\BRepistlenumberstyle{3}Jo}%
+\def\br@Jude{Jde\BRperiod}%
+\def\br@Revelation{Rev\BRperiod}}
\newcommand*\br@Gn{\br@Genesis}%
\newcommand*\br@Ex{\br@Exodus}%
\newcommand*\br@Lv{\br@Leviticus}%
@@ -318,7 +392,6 @@
\newcommand*\br@Lm{\br@Lamentations}%
\newcommand*\br@Ba{\br@Baruch}%
\newcommand*\br@Bar{\br@Baruch}%
-\newcommand*\br@Ezk{\br@Ezekiel}%
\newcommand*\br@Dn{\br@Daniel}%
\newcommand*\br@Ho{\br@Hosea}%
\newcommand*\br@Jl{\br@Joel}%
@@ -336,14 +409,10 @@
\newcommand*\br@Mk{\br@Mark}%
\newcommand*\br@Lk{\br@Luke}%
\newcommand*\br@Jn{\br@John}%
-\newcommand*\br@Ac{\br@Acts}%
\newcommand*\br@Rm{\br@Romans}%
-\newcommand*\br@ICo{\br@ICorinthians}%
-\newcommand*\br@IICo{\br@IICorinthians}%
\newcommand*\br@Ga{\br@Galatians}%
\newcommand*\br@Ep{\br@Ephesians}%
\newcommand*\br@Ph{\br@Philippians}%
-\newcommand*\br@Col{\br@Colossians}%
\newcommand*\br@ITh{\br@IThessalonians}%
\newcommand*\br@IITh{\br@IIThessalonians}%
\newcommand*\br@ITm{\br@ITimothy}%
@@ -358,25 +427,45 @@
\newcommand*\br@IIJn{\br@IIJohn}%
\newcommand*\br@Rv{\br@Revelation}
\newcommand*\br@Gen{\br@Genesis}%
+\newcommand*\br@Exo{\br@Exodus}%
\newcommand*\br@Exod{\br@Exodus}%
\newcommand*\br@Lev{\br@Leviticus}%
+\newcommand*\br@Levit{\br@Leviticus}%
\newcommand*\br@Num{\br@Numbers}%
+\newcommand*\br@Deu{\br@Deuteronomy}%
\newcommand*\br@Deut{\br@Deuteronomy}%
\newcommand*\br@Josh{\br@Joshua}%
+\newcommand*\br@Jsh{\br@Joshua}%
\newcommand*\br@Judg{\br@Judges}%
+\newcommand*\br@Jdg{\br@Judges}%
+\newcommand*\br@Rut{\br@Ruth}%
\newcommand*\br@ISam{\br@ISamuel}%
+\newcommand*\br@ISa{\br@ISamuel}%
\newcommand*\br@IISam{\br@IISamuel}%
+\newcommand*\br@IISa{\br@IISamuel}%
\newcommand*\br@IKgs{\br@IKings}%
+\newcommand*\br@IKi{\br@IKings}%
+\newcommand*\br@IKin{\br@IKings}%
\newcommand*\br@IIKgs{\br@IIKings}%
+\newcommand*\br@IIKi{\br@IIKings}%
+\newcommand*\br@IIKin{\br@IIKings}%
\newcommand*\br@IChr{\br@IChronicles}%
\newcommand*\br@IIChr{\br@IIChronicles}%
\newcommand*\br@Neh{\br@Nehemiah}%
\newcommand*\br@Esth{\br@Esther}%
\newcommand*\br@IMacc{\br@IMaccabees}%
+\newcommand*\br@IMac{\br@IMaccabees}%
+\newcommand*\br@IIMac{\br@IIMaccabees}%
\newcommand*\br@IIMacc{\br@IIMaccabees}%
+\newcommand*\br@Psa{\br@Psalms}%
+\newcommand*\br@Psal{\br@Psalms}%
+\newcommand*\br@Pro{\br@Proverbs}%
\newcommand*\br@Prov{\br@Proverbs}%
\newcommand*\br@Eccl{\br@Ecclesiastes}%
\newcommand*\br@SofS{\br@SongofSongs}%
+\newcommand*\br@Son{\br@SongofSongs}%
+\newcommand*\br@Song{\br@SongofSongs}%
+\newcommand*\br@Songs{\br@SongofSongs}%
\newcommand*\br@Wis{\br@Wisdom}%
\newcommand*\br@Wisd{\br@Wisdom}%
\newcommand*\br@Ecclus{\br@Ecclesiasticus}%
@@ -384,32 +473,65 @@
\newcommand*\br@Jer{\br@Jeremiah}%
\newcommand*\br@Lam{\br@Lamentations}%
\newcommand*\br@Ezek{\br@Ezekiel}%
+\newcommand*\br@Ezk{\br@Ezekiel}%
+\newcommand*\br@Eze{\br@Ezekiel}%
\newcommand*\br@Dan{\br@Daniel}%
\newcommand*\br@Hos{\br@Hosea}%
+\newcommand*\br@Joe{\br@Joel}%
+\newcommand*\br@Amo{\br@Amos}%
\newcommand*\br@Obad{\br@Obadiah}%
+\newcommand*\br@Oba{\br@Obadiah}%
\newcommand*\br@Mic{\br@Micah}%
\newcommand*\br@Nah{\br@Nahum}%
\newcommand*\br@Zeph{\br@Zephaniah}%
+\newcommand*\br@Zep{\br@Zephaniah}%
\newcommand*\br@Hag{\br@Haggai}%
\newcommand*\br@Zech{\br@Zechariah}%
+\newcommand*\br@Zec{\br@Zechariah}%
\newcommand*\br@Mal{\br@Malachi}%
\newcommand*\br@Matt{\br@Matthew}%
+\newcommand*\br@Mat{\br@Matthew}%
+\newcommand*\br@Mar{\br@Mark}%
+\newcommand*\br@Luk{\br@Luke}%
+\newcommand*\br@Joh{\br@John}%
+\newcommand*\br@Ac{\br@Acts}%
\newcommand*\br@Rom{\br@Romans}%
+\newcommand*\br@ICo{\br@ICorinthians}%
\newcommand*\br@ICor{\br@ICorinthians}%
+\newcommand*\br@IICo{\br@IICorinthians}%
\newcommand*\br@IICor{\br@IICorinthians}%
\newcommand*\br@Gal{\br@Galatians}%
\newcommand*\br@Eph{\br@Ephesians}%
\newcommand*\br@Phil{\br@Philippians}%
+\newcommand*\br@Php{\br@Philippians}%
+\newcommand*\br@Col{\br@Colossians}%
+\newcommand*\br@IThe{\br@IThessalonians}%
+\newcommand*\br@IThes{\br@IThessalonians}%
\newcommand*\br@IThess{\br@IThessalonians}%
+\newcommand*\br@IIThe{\br@IIThessalonians}%
+\newcommand*\br@IIThes{\br@IIThessalonians}%
\newcommand*\br@IIThess{\br@IIThessalonians}%
+\newcommand*\br@ITi{\br@ITimothy}%
\newcommand*\br@ITim{\br@ITimothy}%
+\newcommand*\br@IITi{\br@IITimothy}%
\newcommand*\br@IITim{\br@IITimothy}%
\newcommand*\br@Tit{\br@Titus}%
\newcommand*\br@Ti{\br@Titus}%
\newcommand*\br@Philem{\br@Philemon}%
+\newcommand*\br@Hb{\br@Hebrews}%
\newcommand*\br@Jas{\br@James}%
+\newcommand*\br@Jam{\br@James}%
\newcommand*\br@IPet{\br@IPeter}%
+\newcommand*\br@IPe{\br@IPeter}%
\newcommand*\br@IIPet{\br@IIPeter}%
+\newcommand*\br@IIPe{\br@IIPeter}%
+\newcommand*\br@IJo{\br@IJohn}%
+\newcommand*\br@IJoh{\br@IJohn}%
+\newcommand*\br@IIJo{\br@IIJohn}%
+\newcommand*\br@IIJoh{\br@IIJohn}%
+\newcommand*\br@IIIJn{\br@IIIJohn}%
+\newcommand*\br@IIIJo{\br@IIIJohn}%
+\newcommand*\br@IIIJoh{\br@IIIJohn}%
\newcommand*\br@Rev{\br@Revelation}
\newcommand*{\brs@default}{%
\brfullname
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibleref.tlpobj new/tlpkg/tlpobj/bibleref.tlpobj
--- old/tlpkg/tlpobj/bibleref.tlpobj 2019-02-28 03:20:39.000000000 +0100
+++ new/tlpkg/tlpobj/bibleref.tlpobj 2019-12-11 01:54:30.000000000 +0100
@@ -1,18 +1,18 @@
name bibleref
category Package
-revision 49699
+revision 53090
shortdesc Format bible citations
relocated 1
longdesc The bibleref package offers consistent formatting of references
longdesc to parts of the Christian bible, in a number of well-defined
longdesc formats. It depends on ifthen, fmtcount, and amsgen.
-runfiles size=11
+runfiles size=12
RELOC/tex/latex/bibleref/bibleref-xidx.sty
RELOC/tex/latex/bibleref/bibleref.sty
catalogue-contact-bugs https://framagit.org/maieul/bibleref/issues
catalogue-contact-repository https://framagit.org/maieul/bibleref/
catalogue-ctan /macros/latex/contrib/bibleref
-catalogue-date 2019-01-14 15:10:52 +0100
+catalogue-date 2019-12-10 15:33:31 +0100
catalogue-license lppl1.3
catalogue-topics theology label-ref
-catalogue-version 1.23
+catalogue-version 1.24
++++++ bibtex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/bibtex.1 new/texmf-dist/doc/man/man1/bibtex.1
--- old/texmf-dist/doc/man/man1/bibtex.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/bibtex.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH BIBTEX 1 "23 February 2018" "bibtex 0.99d" "Web2C 2019"
+.TH BIBTEX 1 "23 February 2018" "bibtex 0.99d" "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/bibtex.man1.pdf and new/texmf-dist/doc/man/man1/bibtex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibtex.doc.tlpobj new/tlpkg/tlpobj/bibtex.doc.tlpobj
--- old/tlpkg/tlpobj/bibtex.doc.tlpobj 2019-03-27 02:24:02.000000000 +0100
+++ new/tlpkg/tlpobj/bibtex.doc.tlpobj 2020-03-04 23:49:30.000000000 +0100
@@ -1,6 +1,6 @@
name bibtex.doc
category Package
-revision 50602
+revision 54070
shortdesc doc files of bibtex
docfiles size=134
texmf-dist/doc/bibtex/base/README
++++++ bibtex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibtex.tlpobj new/tlpkg/tlpobj/bibtex.tlpobj
--- old/tlpkg/tlpobj/bibtex.tlpobj 2019-03-27 02:24:03.000000000 +0100
+++ new/tlpkg/tlpobj/bibtex.tlpobj 2020-03-04 23:49:31.000000000 +0100
@@ -1,6 +1,6 @@
name bibtex
category Package
-revision 50602
+revision 54070
shortdesc Process bibliographies for LaTeX, etc
longdesc BibTeX allows the user to store his citation data in generic
longdesc form, while printing citations in a document in the form
@@ -33,7 +33,6 @@
catalogue-contact-repository http://tug.org/svn/texlive/trunk/Build/source/texk/web2c/
catalogue-contact-support http://lists.tug.org/tex-k
catalogue-ctan /biblio/bibtex/base
-catalogue-date 2018-12-31 06:11:12 +0100
catalogue-license knuth
catalogue-topics biblio
catalogue-version 0.99d
++++++ bibtex8.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/bibtex8.man1.pdf and new/texmf-dist/doc/man/man1/bibtex8.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibtex8.doc.tlpobj new/tlpkg/tlpobj/bibtex8.doc.tlpobj
--- old/tlpkg/tlpobj/bibtex8.doc.tlpobj 2019-03-27 02:24:03.000000000 +0100
+++ new/tlpkg/tlpobj/bibtex8.doc.tlpobj 2019-11-19 01:55:38.000000000 +0100
@@ -1,6 +1,6 @@
name bibtex8.doc
category TLCore
-revision 50602
+revision 52851
shortdesc doc files of bibtex8
docfiles size=22
texmf-dist/doc/bibtex8/00readme.txt
++++++ bibtex8.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibtex8.tlpobj new/tlpkg/tlpobj/bibtex8.tlpobj
--- old/tlpkg/tlpobj/bibtex8.tlpobj 2019-03-27 02:24:03.000000000 +0100
+++ new/tlpkg/tlpobj/bibtex8.tlpobj 2019-11-19 01:55:38.000000000 +0100
@@ -1,6 +1,6 @@
name bibtex8
category TLCore
-revision 50602
+revision 52851
catalogue bibtex8bit
shortdesc BibTeX variant supporting 8-bit encodings
longdesc An enhanced, portable C version of BibTeX. Enhanced by
++++++ bibtexperllibs.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibtexperllibs.doc.tlpobj new/tlpkg/tlpobj/bibtexperllibs.doc.tlpobj
--- old/tlpkg/tlpobj/bibtexperllibs.doc.tlpobj 2019-02-28 03:20:50.000000000 +0100
+++ new/tlpkg/tlpobj/bibtexperllibs.doc.tlpobj 2020-03-24 01:56:39.000000000 +0100
@@ -1,6 +1,6 @@
name bibtexperllibs.doc
category Package
-revision 47520
+revision 54512
shortdesc doc files of bibtexperllibs
relocated 1
docfiles size=11
++++++ bibtexperllibs.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibtexperllibs.tlpobj new/tlpkg/tlpobj/bibtexperllibs.tlpobj
--- old/tlpkg/tlpobj/bibtexperllibs.tlpobj 2019-02-28 03:20:50.000000000 +0100
+++ new/tlpkg/tlpobj/bibtexperllibs.tlpobj 2020-03-24 01:56:39.000000000 +0100
@@ -1,6 +1,6 @@
name bibtexperllibs
category Package
-revision 47520
+revision 54512
shortdesc BibTeX Perl Libraries
relocated 1
longdesc This package provides BibTeX related Perl libraries by Gerhard
@@ -19,7 +19,6 @@
catalogue-contact-development https://github.com/borisveytsman/BibTeXPerlLibs/pulls
catalogue-contact-repository https://github.com/borisveytsman/BibTeXPerlLibs
catalogue-ctan /support/bibtexperllibs
-catalogue-date 2018-04-29 23:05:58 +0200
-catalogue-license gpl1artisticpd
+catalogue-license gpl1 artistic pd
catalogue-topics bibtex-supp
catalogue-version 1.5
++++++ bibtexu.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/bibtexu.man1.pdf and new/texmf-dist/doc/man/man1/bibtexu.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bibtexu.doc.tlpobj new/tlpkg/tlpobj/bibtexu.doc.tlpobj
--- old/tlpkg/tlpobj/bibtexu.doc.tlpobj 2019-04-01 02:24:55.000000000 +0200
+++ new/tlpkg/tlpobj/bibtexu.doc.tlpobj 2019-11-19 01:55:38.000000000 +0100
@@ -1,6 +1,6 @@
name bibtexu.doc
category TLCore
-revision 50655
+revision 52851
shortdesc doc files of bibtexu
docfiles size=23
texmf-dist/doc/bibtexu/README
++++++ bidi.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/bidi/README new/doc/xelatex/bidi/README
--- old/doc/xelatex/bidi/README 2019-03-03 23:15:37.000000000 +0100
+++ new/doc/xelatex/bidi/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-___________________
-The bidi package
-v35.7
-
-This package provides a convenient interface for typesetting
-bidirectional texts in Plain TeX and LaTeX, using XeTeX engine.
-
-If you want to report any bugs or typos and corrections in the
-documentation, or ask for any new features, or suggest any
-improvements, or ask any questions about the package, then
-please use the issue tracker:
-
- <https://github.com/vafa-ac/bidi/issues>
-
-In doing so, please always explain your issue well enough,
-and always include a minimal working example showing the
-issue.
-
-Current version release date: 2019/03/03
-
-___________________
-Vafa Khalighi
-
-Copyright (c) 2007--2019
-It may be distributed and/or modified under the LaTeX Project Public License,
-version 1.3c or higher (your choice). The latest version of
-this license is at: http://www.latex-project.org/lppl.txt
-
-This work is author-maintained (as per LPPL maintenance status)
-by Vafa Khalighi.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/bidi/README.txt new/doc/xelatex/bidi/README.txt
--- old/doc/xelatex/bidi/README.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/bidi/README.txt 2020-01-31 23:08:15.000000000 +0100
@@ -0,0 +1,31 @@
+___________________
+The bidi package
+v35.11
+
+This package provides a convenient interface for typesetting
+bidirectional texts in Plain TeX and LaTeX, using XeTeX engine.
+
+If you want to report any bugs or typos and corrections in the
+documentation, or ask for any new features, or suggest any
+improvements, or ask any questions about the package, then
+please use the issue tracker:
+
+ <https://github.com/bidi-tex/bidi/issues>
+
+In doing so, please always explain your issue well enough,
+and always include a minimal working example showing the
+issue.
+
+Current version release date: 2020-01-29
+
+___________________
+
+Copyright (c) Vafa Khalighi 2007-2019
+ bidi-tex GitHub Organisation 2018-2020
+
+It may be distributed and/or modified under the LaTeX Project Public License,
+version 1.3c or higher (your choice). The latest version of
+this license is at: http://www.latex-project.org/lppl.txt
+
+This work is author-maintained (as per LPPL maintenance status)
+by Vafa Khalighi.
Binary files old/doc/xelatex/bidi/bibitem.pdf and new/doc/xelatex/bidi/bibitem.pdf differ
Binary files old/doc/xelatex/bidi/bidi-doc.pdf and new/doc/xelatex/bidi/bidi-doc.pdf differ
Binary files old/doc/xelatex/bidi/bidi-logo.pdf and new/doc/xelatex/bidi/bidi-logo.pdf differ
Binary files old/doc/xelatex/bidi/bidi.pdf and new/doc/xelatex/bidi/bidi.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/bidi/test-bidi.tex new/doc/xelatex/bidi/test-bidi.tex
--- old/doc/xelatex/bidi/test-bidi.tex 2016-05-08 00:22:57.000000000 +0200
+++ new/doc/xelatex/bidi/test-bidi.tex 2020-01-31 23:08:15.000000000 +0100
@@ -1,7 +1,7 @@
\documentclass{article}
\usepackage{bidi}
\title{Testing Basic Bidi Direction Change}
-\author{Vafa Khalighi}
+\author{Vafa Khalighi\thanks{Maintained by bidi-tex \url{https://github.com/bidi-tex}}}
\begin{document}
\maketitle
In this document we test bidi direction change in \textsf{RTL} and \textsf{LTR}. These tests includes \texttt{flushleft}, \texttt{flushright} environments and \verb|\centerline{...}|, \verb|\leftline{...}|,\verb|\rightline{...}|,\verb|\raggedleft| and \verb|\raggedright| macros.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/bidi/test-supertabular.tex new/doc/xelatex/bidi/test-supertabular.tex
--- old/doc/xelatex/bidi/test-supertabular.tex 2016-05-08 00:22:57.000000000 +0200
+++ new/doc/xelatex/bidi/test-supertabular.tex 2020-01-31 23:08:15.000000000 +0100
@@ -2,7 +2,7 @@
\usepackage{supertabular}
\usepackage{bidi}
\title{Testing \textsf{supertabular} package in RTL and LTR}
-\author{Vafa Khalighi}
+\author{Vafa Khalighi\thanks{Maintained by bidi-tex \url{https://github.com/bidi-tex}}}
\begin{document}
\maketitle
\section{LTR}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/bidi/test-tabular.tex new/doc/xelatex/bidi/test-tabular.tex
--- old/doc/xelatex/bidi/test-tabular.tex 2016-05-08 00:22:57.000000000 +0200
+++ new/doc/xelatex/bidi/test-tabular.tex 2020-01-31 23:08:15.000000000 +0100
@@ -1,7 +1,7 @@
\documentclass{article}
\usepackage{bidi}
\title{Testing \LaTeX's Default Tabular in \textsf{RTL} and \textsf{LTR}}
-\author{Vafa Khalighi}
+\author{Vafa Khalighi\thanks{Maintained by bidi-tex \url{https://github.com/bidi-tex}}}
\newcommand{\rb}[1]{\raisebox{1.5ex}[0mm]{#1}}
\begin{document}
\maketitle
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/bidi/test-tabularx.tex new/doc/xelatex/bidi/test-tabularx.tex
--- old/doc/xelatex/bidi/test-tabularx.tex 2016-05-08 00:22:57.000000000 +0200
+++ new/doc/xelatex/bidi/test-tabularx.tex 2020-01-31 23:08:15.000000000 +0100
@@ -2,7 +2,7 @@
\usepackage{tabularx}
\usepackage{bidi}
\title{Testing \textsf{tabularx} Package in RTL and LTR}
-\author{Vafa Khalighi}
+\author{Vafa Khalighi\thanks{Maintained by bidi-tex \url{https://github.com/bidi-tex}}}
\begin{document}
\maketitle
\section{LTR}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/bidi/test-tabulary.tex new/doc/xelatex/bidi/test-tabulary.tex
--- old/doc/xelatex/bidi/test-tabulary.tex 2016-05-08 00:22:57.000000000 +0200
+++ new/doc/xelatex/bidi/test-tabulary.tex 2020-01-31 23:08:15.000000000 +0100
@@ -4,7 +4,7 @@
\setlength\tymax{\maxdimen}
\usepackage{bidi}
\title{Testing \textsf{tabulary} package in RTL and LTR}
-\author{Vafa Khalighi}
+\author{Vafa Khalighi\thanks{Maintained by bidi-tex \url{https://github.com/bidi-tex}}}
\begin{document}
\maketitle
\section{LTR}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/bidi.doc.tlpobj new/tlpkg/tlpobj/bidi.doc.tlpobj
--- old/tlpkg/tlpobj/bidi.doc.tlpobj 2019-03-04 02:24:03.000000000 +0100
+++ new/tlpkg/tlpobj/bidi.doc.tlpobj 2020-02-01 02:02:00.000000000 +0100
@@ -1,11 +1,13 @@
name bidi.doc
category Package
-revision 50218
+revision 53615
shortdesc doc files of bidi
relocated 1
-docfiles size=1016
- RELOC/doc/xelatex/bidi/README
+docfiles size=904
+ RELOC/doc/xelatex/bidi/README.txt
+ RELOC/doc/xelatex/bidi/bibitem.pdf
RELOC/doc/xelatex/bidi/bidi-doc.pdf
+ RELOC/doc/xelatex/bidi/bidi-logo.pdf
RELOC/doc/xelatex/bidi/bidi-logo.tex
RELOC/doc/xelatex/bidi/bidi.pdf
RELOC/doc/xelatex/bidi/bidisample2e.tex
++++++ bidi.tar.xz ++++++
++++ 3331 lines of diff (skipped)
++++++ biochemistry-colors.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biochemistry-colors.doc.tlpobj new/tlpkg/tlpobj/biochemistry-colors.doc.tlpobj
--- old/tlpkg/tlpobj/biochemistry-colors.doc.tlpobj 2019-02-28 03:23:10.000000000 +0100
+++ new/tlpkg/tlpobj/biochemistry-colors.doc.tlpobj 2020-03-24 01:56:39.000000000 +0100
@@ -1,6 +1,6 @@
name biochemistry-colors.doc
category Package
-revision 43960
+revision 54512
shortdesc doc files of biochemistry-colors
relocated 1
docfiles size=50
++++++ biochemistry-colors.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/biochemistry-colors.tlpobj new/tlpkg/tlpobj/biochemistry-colors.tlpobj
--- old/tlpkg/tlpobj/biochemistry-colors.tlpobj 2019-02-28 03:23:10.000000000 +0100
+++ new/tlpkg/tlpobj/biochemistry-colors.tlpobj 2020-03-24 01:56:39.000000000 +0100
@@ -1,6 +1,6 @@
name biochemistry-colors
category Package
-revision 43960
+revision 54512
shortdesc Colors used to display amino acids, nucleotides, sugars or atoms in biochemistry
relocated 1
longdesc Biochemistry-colors.sty defines the standard colors of
@@ -14,7 +14,6 @@
RELOC/tex/latex/biochemistry-colors/Biochemistry-colors.sty
catalogue-also css-colors
catalogue-ctan /macros/latex/contrib/biochemistry-colors
-catalogue-date 2017-06-05 06:44:00 +0200
-catalogue-license lpplgpl
+catalogue-license lppl gpl
catalogue-topics colour
catalogue-version 1.00
1
0
Hello community,
here is the log from the commit of package texlive-specs-b for openSUSE:Factory checked in at 2020-05-29 21:16:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-b (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-b.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-b"
Fri May 29 21:16:51 2020 rev:40 rq:806882 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-b/texlive-specs-b.changes 2019-11-07 23:09:47.336083852 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-b.new.3606/texlive-specs-b.changes 2020-05-29 21:21:54.003875337 +0200
@@ -1,0 +2,60 @@
+Mon May 18 08:47:10 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Wed May 6 11:27:35 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Scan *.def files as well for RequirePackage
+
+-------------------------------------------------------------------
+Tue May 5 13:55:07 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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 <werner(a)suse.de>
+
+- 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:
----
babel-spanglish.doc.tar.xz
babel-spanglish.tar.xz
New:
----
arraycols.doc.tar.xz
arraycols.tar.xz
askinclude.doc.tar.xz
askinclude.tar.xz
asmejour.doc.tar.xz
asmejour.tar.xz
atbegshi.doc.tar.xz
atbegshi.tar.xz
atenddvi.doc.tar.xz
atenddvi.tar.xz
attachfile2.doc.tar.xz
attachfile2.tar.xz
atveryend.doc.tar.xz
atveryend.tar.xz
authordate.doc.tar.xz
authordate.tar.xz
autofancyhdr.doc.tar.xz
autofancyhdr.tar.xz
auxhook.doc.tar.xz
auxhook.tar.xz
axessibility.doc.tar.xz
axessibility.tar.xz
barracuda.doc.tar.xz
barracuda.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-b.spec ++++++
++++ 11738 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-b/texlive-specs-b.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-b.new.3606/texlive-specs-b.spec
++++++ ascmac.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ascmac/LICENSE new/doc/latex/ascmac/LICENSE
--- old/doc/latex/ascmac/LICENSE 2018-03-09 23:47:18.000000000 +0100
+++ new/doc/latex/ascmac/LICENSE 2020-01-13 22:25:41.000000000 +0100
@@ -1,5 +1,5 @@
Copyright (c) 2010 ASCII MEDIA WORKS
-Copyright (c) 2016-2018 Japanese TeX Development Community
+Copyright (c) 2016-2020 Japanese TeX Development Community
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -12,9 +12,9 @@
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
-* Neither the name of platex nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
+* Neither the name of the copyright holder nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ascmac/README.md new/doc/latex/ascmac/README.md
--- old/doc/latex/ascmac/README.md 2018-03-09 23:47:18.000000000 +0100
+++ new/doc/latex/ascmac/README.md 2020-01-15 22:48:01.000000000 +0100
@@ -26,6 +26,6 @@
## Release Date
-2018-03-09
+2020-01-15
Japanese TeX Development Community
Binary files old/doc/latex/ascmac/ascmac.pdf and new/doc/latex/ascmac/ascmac.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ascmac.doc.tlpobj new/tlpkg/tlpobj/ascmac.doc.tlpobj
--- old/tlpkg/tlpobj/ascmac.doc.tlpobj 2019-02-28 03:15:51.000000000 +0100
+++ new/tlpkg/tlpobj/ascmac.doc.tlpobj 2020-01-16 01:55:17.000000000 +0100
@@ -1,9 +1,9 @@
name ascmac.doc
category Package
-revision 46904
+revision 53411
shortdesc doc files of ascmac
relocated 1
-docfiles size=40
+docfiles size=42
RELOC/doc/latex/ascmac/LICENSE
RELOC/doc/latex/ascmac/README.md
RELOC/doc/latex/ascmac/ascmac.pdf
++++++ ascmac.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/ascmac/ascmac.map new/fonts/map/dvips/ascmac/ascmac.map
--- old/fonts/map/dvips/ascmac/ascmac.map 1970-01-01 01:00:00.000000000 +0100
+++ new/fonts/map/dvips/ascmac/ascmac.map 2020-01-15 22:48:01.000000000 +0100
@@ -0,0 +1,3 @@
+ascgrp TeX-ascgrp <ascgrp.pfb
+ascii10 TeX-ascii10 <ascii10.pfb
+ascii36 TeX-ascii36 <ascii36.pfb
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ascmac/ascmac.sty new/tex/latex/ascmac/ascmac.sty
--- old/tex/latex/ascmac/ascmac.sty 2018-03-09 23:47:18.000000000 +0100
+++ new/tex/latex/ascmac/ascmac.sty 2020-01-15 22:48:01.000000000 +0100
@@ -7,7 +7,7 @@
%% ascmac.dtx (with options: `ascmac')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
%%
%% This file is part of ascmac community edition.
%% -------------------------------------------------------------
@@ -16,7 +16,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{ascmac}
- [2018/03/09 v2.0h
+ [2020/01/15 v2.1
ascmac wrapper (community edition)
]
\RequirePackage{tascmac}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ascmac/tascmac.sty new/tex/latex/ascmac/tascmac.sty
--- old/tex/latex/ascmac/tascmac.sty 2018-03-09 23:47:18.000000000 +0100
+++ new/tex/latex/ascmac/tascmac.sty 2020-01-15 22:48:01.000000000 +0100
@@ -7,7 +7,7 @@
%% ascmac.dtx (with options: `tascmac')
%%
%% Copyright (c) 2010 ASCII MEDIA WORKS
-%% Copyright (c) 2016-2018 Japanese TeX Development Community
+%% Copyright (c) 2016-2020 Japanese TeX Development Community
%%
%% This file is part of ascmac community edition.
%% -------------------------------------------------------------
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{tascmac}
- [2018/03/09 v2.0h
+ [2020/01/15 v2.1
ascmac package (community edition)
]
%%
@@ -50,22 +50,7 @@
\catcode`\Q=14\relax
\fi
%%
-%% Use Type1 font for ascgrp (pdfLaTeX, LuaLaTeX)
-\ifascmac@ptex\else
- \ifx\pdfextension\@undefined
- \ifx\pdfmapline\@undefined\else
- % pdfTeX, LuaTeX (<=0.81)
- \pdfmapline{+ascgrp <ascgrp.pfb}
- \pdfmapline{+ascii10 <ascii10.pfb}
- \pdfmapline{+ascii36 <ascii36.pfb}
- \fi
- \else
- % LuaTeX (>=0.85)
- \pdfextension mapline{+ascgrp <ascgrp.pfb}
- \pdfextension mapline{+ascii10 <ascii10.pfb}
- \pdfextension mapline{+ascii36 <ascii36.pfb}
- \fi
-\fi
+%% Use Type1 font for ascgrp: moved to an external map file
%%
%% ascmac.sty 10/28 '88
%% ASCII special macros
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ascmac.tlpobj new/tlpkg/tlpobj/ascmac.tlpobj
--- old/tlpkg/tlpobj/ascmac.tlpobj 2019-02-28 03:15:51.000000000 +0100
+++ new/tlpkg/tlpobj/ascmac.tlpobj 2020-01-16 01:55:17.000000000 +0100
@@ -1,6 +1,6 @@
name ascmac
category Package
-revision 46904
+revision 53411
shortdesc Boxes and picture macros with Japanese vertical writing support
relocated 1
longdesc The bundle provides boxes and picture macros with Japanese
@@ -8,7 +8,9 @@
longdesc and fonts for drawing boxes and is thus driver-independent.
longdesc Formerly part of the Japanese pLaTeX bundle, it now supports
longdesc all LaTeX engines.
-runfiles size=18
+execute addMap ascmac.map
+runfiles size=19
+ RELOC/fonts/map/dvips/ascmac/ascmac.map
RELOC/fonts/source/public/ascmac/ascgrp.mf
RELOC/fonts/source/public/ascmac/ascii.mf
RELOC/fonts/source/public/ascmac/ascii10.mf
@@ -23,7 +25,6 @@
RELOC/tex/latex/ascmac/tascmac.sty
catalogue-contact-repository https://github.com/texjporg/ascmac
catalogue-ctan /macros/latex/contrib/ascmac
-catalogue-date 2018-04-29 07:15:59 +0200
catalogue-license bsd3
catalogue-topics boxing japanese
-catalogue-version 2.0h
+catalogue-version 2.1
++++++ asmeconf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/asmeconf/README.md new/doc/latex/asmeconf/README.md
--- old/doc/latex/asmeconf/README.md 2019-04-07 23:26:15.000000000 +0200
+++ new/doc/latex/asmeconf/README.md 2020-04-15 23:33:36.000000000 +0200
@@ -1,47 +1,58 @@
+ #asmeconf: A template for ASME conference papers#
+
+ Version 1.18 dated 2020/04/14.
+
+ ####Overview####
This class provides a template to format ASME Conference papers according to
- the requirements on ASME's web pages (as posted in March 2019).
+ the requirements on ASME's web pages (as posted in early 2020).
+
+ [www.asme.org/publications-submissions/proceedings/formatting-the-paper](htt…
This work is not a publication of ASME itself.
Files in this distribution are:
- README.md -- this file
- asmeconf.cls -- the class file
- asmeconf.bst -- bibtex style for ASME conference format
- asmeconf-template.tex -- a latex template/example for this class
- asmeconf-template.pdf -- documentation/sample paper
- asmeconf-sample.bib -- a sample bibliography file
+ README.md -- this file
+ asmeconf.cls -- the class file
+ asmeconf.bst -- bibtex style for ASME conference format
+ asmeconf-template.tex -- a latex template/example for this class
+ asmeconf-template.pdf -- documentation/sample paper
+ asmeconf-sample.bib -- a sample bibliography file
*
- sample-figure-1.pdf, sample-figure-2a.pdf, sample-figure-2b.pdf -- figures for the example
+ sample-figure-1.pdf,
+ sample-figure-2a.pdf,
+ sample-figure-2b.pdf -- figures for the example
The .tex and .cls files are commented and should be self-explanatory.
- This is version 1.03 dated 2019/04/06.
This template was designed to approach the following aims:
- - match ASME's font current specifications and layout
-
- - match ASME's current citation formats
-
- - support use of hyperref package (hyperlink references to figures, tables, citations, and web)
-
- - support pdf bookmarks
-
- - use the newtxtext and newtxmath font packages, which enable a variety of text and math features
-
- - support math and footnotes in section headings
-
- - include sans serif greek font for use in captions and headings
-
- - provide automatic layout of author blocks for up to nine addresses
+- match ASME's font current specifications and layout, including the most recent author layout
+
+- match ASME's current citation formats
+
+- support hyperref package (hyperlinks to figures, tables, references, web)
+
+- support pdf bookmarks and metadata
+
+- enable various math and text features with newtxmath and newtxtext packages
+- support bold face, sans serif math in section headings
+- support footnotes in section headings
- Author:
+- provide automatic layout of author and addresses in one of two styles
+
+- provide line numbers for editing and review
+
+- support balancing of columns on last page
+
+
+ ####Author####
John H. Lienhard V
@@ -52,12 +63,42 @@
Cambridge, MA 02139-4307 USA
- =========================================================
-
+ ---
+
+ ####Change log####
+
+ v1.18 (2020/04/14): edit and expand documentation; revise sample .bib file; extensive edits to asmeconf.bst, to better support hyperlinks, to correct eid error, and for better conformance to ASME style (details listed in .bst file); add foreign language example.
+
+ v1.17: set T1 font encoding with utf-8 input, ensure LuaLaTeX compatibility; load hologo and metalogo packages; edit documentation.
+
+ v1.16: remove xpatch and comment packages from class file; disable \\( and \\) in pdf bookmarks to avoid warnings; edit documentation.
+
+ v1.15: correct extra space left by \\CorrespondingAuthor when that author is not last; correct breakage of \\ref in captions. Thanks to Bret Van Poppel for reporting these issues.
+
+ v1.14: edit documentation; use 2020 IMECE header in layout example
+
+ v1.13: add babel options for language support; minor text edits; adjust nomenclature list penalties
+
+ v1.12: add support for line numbers for editing; add support for final column balancing; edit skips in nomenclature; adjust \\tolerance and \\emergencystretch (for line breaking); improve support for equation tags in captions; adopt standard \\maketitle and \\title commands; include \\versionfootnote for tracking revisions of draft.
+
+ v1.11: minor adjustments to title, author, and affiliation layout
+
+ v1.1: revise several parts of the layout to match ASME's updated specifications from Summer 2019 (including author block, abstract font, placement of nomenclature, and minor spacings); add .bst support for online references and eprints; expand documentation significantly; guidance on fitting equations into columns.
+
+ v1.07: improve support for numbered section headings; allow omission of corresponding author email; edit documentation
+
+ v1.06: automate bold sans math in captions and headings; small adjustments to default spacings; adjust font of paper number to 18 pt; edit documentation
+
+ v1.05: minor code clean-up; change to keyvalue for to control font for superiors
+
+ v1.04: fix option passing for mathalfa package; adjust \\entry to create nomenclature subheadings efficiently.
+
+
+ ---
- LICENSE:
+ ####License####
- Copyright (c) 2019 John H. Lienhard
+ Copyright (c) 2020 John H. Lienhard
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
associated documentation files (the "Software"), to deal in the Software without restriction,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/asmeconf/asmeconf-sample.bib new/doc/latex/asmeconf/asmeconf-sample.bib
--- old/doc/latex/asmeconf/asmeconf-sample.bib 2019-04-02 23:11:08.000000000 +0200
+++ new/doc/latex/asmeconf/asmeconf-sample.bib 2020-04-15 23:33:36.000000000 +0200
@@ -1,198 +1,179 @@
+%% Revised 14 April 2020
+%% John H. Lienhard, MIT
+
@article{ning2002,
- title = {On the Sliding Friction Characteristics of Unidirectional Continuous FRP Deposits},
- journal = {ASME Journal of Tribology},
- year = {2002},
- volume = {48},
- number = {5},
- pages = {2000--2008},
- author = {Xiang Ning and Mary Rose Lovell},
- doi = {10.1115/1.4042912},
- URL = {https://doi.org/10.1115/1.4042912},
-}
-%% There's no need to give the URL if it is simply the DOI; the DOI itself will be hyperlinked.
+ author = {Xiang Ning and Mary Rose Lovell},
+ title = {On the Sliding Friction Characteristics of Unidirectional Continuous FRP Deposits},
+ journal = {ASME Journal of Tribology},
+ year = {2002},
+ volume = {48},
+ number = {5},
+ pages = {2000--2008},
+ doi = {10.1115/1.4042912},
+}
+%% article supports these fields: author, year, title, journal, volume, number, pages OR eid (and numpages),
+%% doi, url, eprint with archive, note.
+%% There's no need to give the URL if it is simply the DOI, since the DOI itself will be hyperlinked.
+%% url = {https://doi.org/10.1115/1.4042912}. ASME requests that a URL point to the abstract.
@BOOK{gibson2008,
- title = {The Big Book of Cellular Studies},
+ title = {The Big Book of Cellular Studies},
publisher = {John Wiley and Sons},
- year = {2008},
- author = {Tom A. Gibson and Matthew A. Tucker},
- address = {New York},
- doi = {10.1115/1.4042912},
- URL = {https://doi.org/10.1115/1.4042912},
+ year = {2008},
+ author = {Tom A. Gibson and Matthew A. Tucker},
+ address = {New York},
}
-%% There's no need to give the URL if it is simply the DOI; the DOI itself will be hyperlinked.
-
+%% book supports these fields: author OR editor, year, title, edition, series, volume OR number
+%% publisher, address, doi, url, eprint with archive, note.
@INCOLLECTION{stevens1999,
- title = {Stochastic Fields and Their Digital Simulation},
- publisher = {Martimius Publishers},
- pages = {22--36},
- year = {1999},
+ author = {Thomas T. Stevens},
+ title = {Stochastic Fields and Their Digital Simulation},
booktitle = {Stochastic Methods},
- author = {Thomas T. Stevens},
- address = {Dordrecht},
- doi = {10.1115/1.4042912},
- URL = {https://doi.org/10.1115/1.4042912},
-}
-%% There's no need to give the URL if it is simply the DOI; the DOI itself will be hyperlinked.
-
+ publisher = {Martimius Publishers},
+ address = {Dordrecht},
+ year = {1999},
+ pages = {22--36},
+}
+%% incollection supports these fields: author, year, title, booktitle, edition, editor, series,
+%% volume OR number, publisher, address, type,
+%% chapter, pages, doi, note, eprint with archive, url, urldate.
+%% type = { } changes default "Chap." to something else.
@inproceedings{wions2005,
- author = {Thomas Wions and Christopher D. Mills},
- title = {Structural Dynamics in Parallel Manipulation},
+ author = {Thomas Wions and Christopher D. Mills},
+ title = {Struct\-ur\-al Dynamics in Parallel Manipulation},
booktitle = {Proceedings of the ASME IDETC/CIE},
- year = {2005},
- pages = {777--798},
- number = {DETC2005-99532},
- doi = {10.1115/1.4042912},
- URL = {https://doi.org/10.1115/1.4042912},
- venue = {New Orleans, LA},
- confmonth = {September 10--13},
-}
-% Note that venue and confmonth are specific to this .bst style
-% There's no need to give the URL if it is simply the DOI; the DOI itself will be hyperlinked.
-
+ number = {DETC2005-99532},
+ venue = {New Orleans, LA},
+ eventdate = {September 10--13},
+ year = {2005},
+ pages = {777--798},
+ doi = {10.1115/1.4042912},
+ url = {https://doi.org/10.1115/1.4042912},
+}
+%% inproceedings supports these fields: author, year, title, booktitle, edition, editor, volume,
+%% organization OR publisher, address, venue, eventdate,
+%% [paper] number, pages, doi, note, eprint with archive, url, urldate.
+%% Note that venue and eventdate are specific to the asmeconf.bst style.
+%% There's really no need to give the URL if it is simply the DOI because the DOI itself will be hyperlinked.
+%% ASME requests that the URL point to the abstract.
@phdthesis{smith2002,
- author = {Robert Smith},
- title = {Conformal Lubricated Contact of Cylindrical Surfaces Involved in a Non-Steady Motion},
- school = {Rochester Institute of Technology},
- address = {Rochester, NY},
- year = {2002},
- doi = {10.1115/1.4042912},
- URL = {https://doi.org/10.1115/1.4042912},
-}
-% type = {Sc{D} Thesis}, could be added to change the type of thesis. See example below.
-% There's no need to give the URL if it is simply the DOI; the DOI itself will be hyperlinked.
-
-
-@techreport{watson1982,
- author = {David Watson},
- title = {Evaporative Heat Transfer in the Contact Line of a Mixture},
- year = {1982},
- number = {HTL-26, CFD-4},
- institution = {Iowa State University},
- address = {Ames, IA},
- doi = {10.1115/1.4042912},
- URL = {https://doi.org/10.1115/1.4042912},
-}
-% type can be changed here also, see example below
-% see example below.
+ author = {Robert Smith},
+ title = {Conformal Lubricated Contact of Cylindrical Surfaces Involved in a Non-Steady Motion},
+ school = {Rochester Institute of Technology},
+ address = {Rochester, NY},
+ year = {2002},
+ doi = {10.1115/1.4042912},
+ url = {https://doi.org/10.1115/1.4042912},
+}
+% type = {Sc{D} {T}hesis}, could be added to change the type of thesis. See two examples below.
+% There's no need to give the URL if it is simply the DOI; the DOI itself will be hyperlinked.
+% eprint with archive is also supported.
+%% ASME requests that the URL point to the abstract.
@mastersthesis{smith1998,
- author = {Robert Smith},
- title = {Conformal Lubricated Contact of Cylindrical Surfaces Involved in a Steady Motion},
- school = {Rochester Institute of Technology},
- address = {Rochester, NY},
- year = {1998},
-}
+ author = {Robert Smith},
+ title = {Conformal Lubricated Contact of Cylindrical Surfaces Involved in a Steady Motion},
+ school = {Rochester Institute of Technology},
+ address = {Rochester, NY},
+ year = {1998},
+}
+%% mastersthesis supports these fields: author, year, title, type, school, address, note.
+%% These fields are also supported, but don't use them all: doi, eprint with archive, url, urldate, urltype
+%% type={} can optionally be used to change the type of thesis. Default is "Master's thesis"
@mastersthesis{smith1996,
-author = {Robert Smith},
-title = {Cylindrical Surfaces Involved in a Steady Motion},
-type = {{BS} Thesis},
-school = {Rochester Institute of Technology},
-address = {Rochester, NY},
-year = {1996},
+ author = {Robert Smith},
+ title = {Cylindrical Surfaces Involved in a Steady Motion},
+ type = {{BS} {T}hesis},
+ school = {Rochester Institute of Technology},
+ address = {Rochester, NY},
+ year = {1996},
}
+%% To get a bachelor's thesis, use type = {} as above.
-
-@techreport{watson1981,
-author = {David Watson},
-title = {Evaporative Heat Transfer in the Contact Line of a Mixture},
-year = {1981},
-number = {TN-1234},
-institution = {National Aeronautics and Space Administration},
-address = {Washington, DC},
-URL = {https://doi.org/10.1115/1.4042912},
-type = {NASA Technical Memorandum No.}
-}
-
-@BOOK{bejan,
- title = {Advanced Engineering Thermodynamics},
- publisher = {John Wiley {\&} Sons, Inc.},
- year = {1988},
- author = {Adrian Bejan},
- address = {New York, NY},
+@techreport{watson1982,
+ author = {David Watson},
+ title = {Evaporative Heat Transfer in the Contact Line of a Mixture},
+ institution = {Iowa State University},
+ address = {Ames, IA},
+ number = {HTL-26, CFD-4},
+ year = {1982},
+ doi = {10.1115/1.4042912},
+ url = {https://doi.org/10.1115/1.4042912},
+}
+%% techreport supports the fields: author, title, number, institution, address, year, doi, url,
+%% eprint with archive, note.
+% if type = is omitted, it will default to "Tech. Rep." See the example below for changing this.
+
+@techreport{reynolds58,
+ author = {W. C. Reynolds and W. M. Kays and S. J. Kline},
+ title = {Heat Transfer in the Incompressible Turbulent Boundary Layer. {I}--{C}onstant Wall Temperature},
+ type = {Memorandum},
+ institution = {NASA},
+ address = {Washington, DC},
+ number = {12-1-58W},
+ year = {1958},
+ eprint = {2060/19980228020},
+ archive = hdl,
}
+% if type = is omitted, it will default to "Tech. Rep."
@incollection{DKE70,
- author = {Donald K. Edwards},
- title = {Thermal Radiation Measurements},
- editor = {Ernst R. G. Eckert and Richard J. Goldstein},
- booktitle = {Measurement Techniques in Heat Transfer},
- chapter = {9},
- pages = {353--396},
- volume ={130},
- series ={{AGARD}ograph},
- month = {November},
- type = {{C}hapter},
- publisher = {Technivision Services},
- address = {Slough, England},
- year ={1970},
- note ={Published by the Advisory Group for Aerospace Research and Development of {NATO}},
-}
-
-@incollection{Lienhard2017,
- author = {John H. Lienhard and Karan H. Mistry and Mostafa H. Sharqawy and Gregory P. Thiel},
- title ={Thermodynamics, Exergy, and Energy Efficiency in Desalination Systems},
- editor = {Hassan A. Arafat},
- booktitle = {Desalination Sustainability},
- chapter = 4,
- pages = {127--206},
- publisher ={Elsevier Publishing Co.},
- address = {Amsterdam},
- year =2017,
- month = {June},
- url = {https://www.elsevier.com/books/desalination-sustainability/unknown/978-0-12-809791-5},
+ author = {Donald K. Edwards},
+ title = {Thermal Radiation Measurements},
+ editor = {Ernst R. G. Eckert and Richard J. Goldstein},
+ booktitle = {Measurement Techniques in Heat Transfer},
+ chapter = {9},
+ pages = {353--396},
+ volume = {130},
+ series = {{AGARD}ograph},
+ publisher = {Technivision Services},
+ address = {Slough, England},
+ year = {1970},
+ note = {Published by the Advisory Group for Aerospace Research and Development of {NATO}},
}
+%% If you need to change "Chap." to something else, use for example: type = {{C}hapter},
+%% It's uncommon to have the "series" field as above.
@article{Lienhard2019b,
- title = "Exterior Shape Factors from Interior Shape Factors",
- journal = "ASME Journal of Heat Transfer",
- year = "2019",
- doi = "10.1115/1.4042912",
- author = {John H. Lienhard},
- note = {In press},
-}
-
-@misc{narayan2017,
- author = {Prakash Narayan Govindan and Steven Lam and Maximus G. {St. John}},
- title = {Systems including a condensing apparatus such as a bubble column condenser},
- year = {2017},
+ author = {Lienhard, V, John H.},
+ title = {Exterior Shape Factors from Interior Shape Factors},
+ journal = jht,
+ doi = {10.1115/1.4042912},
+ volume = {141},
+ number = {6},
+ eid = {061301},
+ year = {2019},
+}
+%% Note eid field rather than page numbers. Will not produce "pp." before the eid number.
+%% May include numpages = {} to get "eid (numpages pages)"
+%% Note use of jht macro for title title (produces "ASME J. Heat Transfer"). All ASME journals have macros.
+
+@misc{govindan2017,
+ author = {Prakash Narayan Govindan and Steven Lam and Maximus G. {St. John}},
+ title = {Systems Including a Condensing Apparatus Such As a Bubble Column Condenser},
howpublished = {US Patent {\#}9700811},
+ year = {2017},
+ url = {https://patents.google.com/patent/US9700811B2},
}
-@conference{Swaminathan2017IDABRO,
- Author = {Swaminathan, Jaichander and Stover, Richard L. and Tow, Emily W. and Warsinger, David M. and Lienhard, John H.},
- Booktitle = {Proceedings of IDA World Congress on Desalination and Water Reuse},
- Title = {Effect of practical losses on optimal design of batch {RO} systems},
- Year = {2017},
- Month = 10,
- Publisher = {International Desalination Association},
- address = {Topsfield, MA},
- venue ={S{\~a}o Paulo, Brazil},
- confmonth = {October 15--20},
- number = {IDA17WC-58334},
- url = {http://hdl.handle.net/1721.1/111971},
-}
-% number = {Paper No.\ IDA17WC-58334}, could be used instead.
-
@misc{Fong2015,
- title = {Analytical Methods for Squaring the Disc},
- author = {Chamberlain Fong},
+ title = {Analytical Methods for Squaring the Disc},
+ author = {Chamberlain Fong},
howpublished = {{\itshape ArXiv e-prints}},
- eprint = {1509.06344},
- year = {2015},
- month = {sep},
+ year = {2015},
+ eprint = {1509.06344},
+ archive = arxiv,
}
-% URL = {https://arxiv.org/abs/1509.06344v3},
+% eprint + arxiv produces the same result as: url = {https://arxiv.org/abs/1509.06344v3},
@manual{GSL,
- title = {{GNU} Scientific Library Release 2.4},
- URL = {https://www.gnu.org/software/gsl/},
- author = {Mark Galassi
+ title = {{GNU} Scientific Library Release 2.4},
+ author = {Mark Galassi
and Jim Davies
and James Theiler
and Brian Gough
@@ -201,43 +182,150 @@
and Michael Booth
and Fabrice Rossi
and Rhys Ulerich},
- year = 2017,
- organization = {Free Software Foundation},
- address = {Boston, MA},
- month = {June},
+ organization = {Free Software Foundation},
+ address = {Boston, MA},
+ year = 2017,
+ url = {https://www.gnu.org/software/gsl/},
}
+%% manual supports these fields: author, year, title, edition, organization, address, doi, eprint with archive, urldate, url, note.
-@manual{mpl,
- title={mpl colormaps},
- author={St{\'e}fan {van der Walt} and Nathaniel Smith},
- URL = {http://bids.github.io/colormap/},
- note = {Accessed 26 August 2018},
- year = 2015,
- organization = {GitHub},
- address = {San Francisco, CA},
- month = {September},
-}
-
+@online{mpl,
+ title = {mpl colormaps},
+ author = {St{\'e}fan {van der Walt} and Nathaniel Smith},
+ organization = {GitHub},
+ address = {San Francisco, CA},
+ year = 2015,
+ url = {http://bids.github.io/colormap/},
+ urldate = {August 26, 2018},
+}
+%% online supports these fields: author OR editor, year, title, organization, address,
+%% note, url OR eprint with archive, urldate, urltype
+%% You can change "Accessed" with "urltype", e.g., urltype = {retrieved},
@BOOK{johnson1980,
- title = {Title of edited book},
+ editor = {Howard Johnson},
+ title = {Title of Edited Book},
publisher = {John Wiley and Sons, Inc.},
- year = {1980},
- editor = {Howard Johnson},
- address = {New York, NY},
+ address = {New York, NY},
+ year = {1980},
}
@proceedings{proceedings,
- title = {The title of the proceedings},
- year = 2015,
- editor = {Howard Johnson},
- volume = 2,
- address = {Address of publisher},
- organization = {The organization},
- publisher = {Name of publisher},
- note = {Optional note}
+ title = {The Title of the Proceedings},
+ year = 2015,
+ editor = {Al Yankovich and Howard Stern},
+ volume = {15},
+ organization = {Organization},
+ venue = {Boston, MA},
+ eventdate = {April 27--28},
+ url = {http://web.mit.edu},
+ note = {Optional note},
+}
+%% proceedings supports these fields: author OR editor, year, title, edition, editor,
+%% series, volume OR number, organization, publisher,
+%% address [of organization or publisher], venue, eventdate,
+%% doi, url, eprint with archive.
+%% The organization will appear as author/editor if those fields are empty.
+%% In most instances, the publisher is the organization so only one should be given
+
+@online{amsmath,
+ author = {{American Mathematical Society} and {LATEX3 Project}},
+ title = {User's Guide for the \textsf{amsmath} Package, Version 2.1},
+ organization = {Comprehensive \TeX\ Archive Network},
+ year = {2018},
+ url = {https://ctan.org/tex-archive/macros/latex/required/amsmath/amsldoc.pdf},
+ urldate = {July 5, 2019},
+}
+
+@online{sharpe1,
+ author = {Michael Sharpe},
+ title = {New {TX} Font Package, Version 1.554},
+ organization = {Comprehensive \TeX\ Archive Network},
+ year = {2018},
+ url = {https://ctan.org/pkg/newtx},
+ urldate = {April 27, 2019},
+}
+
+@online{sharpe2,
+ author = {Michael Sharpe},
+ title = {The \textsf{mathalfa} Package, Version 1.10},
+ organization = {Comprehensive \TeX\ Archive Network},
+ year = {2018},
+ url = {https://ctan.org/pkg/mathalfa},
+ urldate = {April 27, 2019},
+}
+
+@online{tolusis,
+ author = {Sigitas Tolu{\v{s}}is},
+ title = {The \textsf{flushend} Package, Version 3.3},
+ organization = {Comprehensive \TeX\ Archive Network},
+ year = {2017},
+ url = {https://www.ctan.org/pkg/flushend},
+ urldate = {October 1, 2019},
+}
+
+@online{bottcher,
+ author = {Stephan I. B{\"o}ttcher and Uwe L{\"u}ck},
+ title = {\textsf{lineno.sty}: A {\LaTeX} Package to Attach Line Numbers to Paragraphs, Version 4.41},
+ organization = {Comprehensive \TeX\ Archive Network},
+ year = {2005},
+ url = {https://www.ctan.org/pkg/lineno},
+ urldate = {August 17, 2019},
+}
+
+@online{oostrum,
+ author = {Piet van Oostrum},
+ title = {The \textsf{fancyhdr} and \textsf{extramarks} Packages, Version 3.10},
+ organization = {Comprehensive \TeX\ Archive Network},
+ year = {2019},
+ url = {https://www.ctan.org/pkg/lineno},
+ urldate = {August 17, 2019},
+}
+
+@online{fairbairns,
+ author = {Robin Fairbairns and Sebastian Rahtz and Leonor Barroca},
+ title = {A Package for Rotated Objects in \LaTeX, Version 2.16d},
+ organization = {Comprehensive \TeX\ Archive Network},
+ year = {2016},
+ url = {https://www.ctan.org/pkg/rotating},
+ urldate = {October 2, 2019},
+}
+
+@BOOK{book,
+ author = {James Tiberius Kirk},
+ year = {2288},
+ title = {Decline and Fall of the Romulan Empire},
+ edition = {7},
+ series = {Humankind's Greatest Writings},
+ volume = {23},
+ url = {http://web.mit.edu},
+ publisher = {Vulcan Free Press},
+ address = {T'Paal},
+ note = {to appear},
+}
+
+@inbook{inbook,
+ author = {Winston S. Churchill},
+ year = {1948},
+ title = {The Gathering Storm},
+ edition = {1},
+ series = {The Second World War},
+ volume = {1},
+ chapter = {5},
+ pages = {66--89},
+ publisher = {Houghton Mifflin Co.},
+ address = {Boston},
+ note = {{``The Locust Years''}},
+}
+%% inbook supports these fields: author OR editor, year, title, edition, version, series, volume OR number, doi, url, eprint with archive, publisher, address, note. type={} field changes "Chap." to something else.
+
+@book{fourier1822,
+ author = {Jean Baptiste Joseph Fourier},
+ year = {1822},
+ title = {Th\'{e}orie Analytique de la Chaleur},
+ publisher = {Firmin Didot, P\`{e}re et Fils},
+ address = {Paris},
+ url = {https://archive.org/details/analyticaltheory00fourrich},
}
-% series = {Series A,
-
-
+
Binary files old/doc/latex/asmeconf/asmeconf-template.pdf and new/doc/latex/asmeconf/asmeconf-template.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/asmeconf/asmeconf-template.tex new/doc/latex/asmeconf/asmeconf-template.tex
--- old/doc/latex/asmeconf/asmeconf-template.tex 2019-04-07 23:26:15.000000000 +0200
+++ new/doc/latex/asmeconf/asmeconf-template.tex 2020-04-15 23:33:36.000000000 +0200
@@ -1,15 +1,21 @@
+% !TEX encoding = UTF-8 Unicode
%%
%% This file is asmeconf-template.tex, a template to format ASME Conference papers according to
-%% the requirements on ASME's conference web pages (as posted in March 2019).
+%% the requirements on ASME's conference web pages.
%%
-%% This file is version 1.03 dated 2019/04/06
+%% This file is version 1.18 dated 2020/04/14
+%%
+%% As of version 1.11, this template follows ASME's newer conference guidelines first posted July 2019.
+%% The new guidelines have changed the requested author block formatting to be inline.
+%% (This template supports the old grid format as a package option.)
+%% Nomenclature now follows the abstract. Abstract is in italics.
%%
%% Author: John H. Lienhard V
%% Department of Mechanical Engineering
%% Massachusetts Institute of Technology
%% Cambridge, MA 02139-4307 USA
%%
-%% Class options are described in the asmeconf.cls file. These include:
+%% Class options are set up in the asmeconf.cls file. These include:
%%
%% * Math options from M. Sharpe's newtxmath package: upright integrals [upint]; and
%% * varvw for a v and w that are better distinguished from greek nu; and also
@@ -17,14 +23,38 @@
%% * is recommended.
%%
%% * Many options for calligraphic, script, and fraktur fonts from the mathalfa package; the
-%% * default values are: scr=dutchcal,cal=euler
+%% * example value used is: mathalfa=cal=euler (use Euler font for \mathcal)
+%% * some other options for cal are: dutchcal, zapfc, cm (default), boondox,...
+%% * frak (fraktur), bb (blackboard bold), scr (script) may also be controlled.
%%
%% * An option to omit the ASME copyright footer: nofoot
%%
-%% * An option not to use newtxtext's superiors font for footnotes [nodefaultsups] and an option
+%% * An optional to use newtxtext's superiors font for footnotes [nodefaultsups] and an option
%% * for slightly larger small capitals, largesc
%%
-%% For details of newtxmath and mathalfa, refer to their documentation (available on CTAN: http://ctan.org)
+%% * An option to balance the heights of columns on the last page [balance].
+%% * This option is NOT compatible with the [lineno] option.
+%%
+%% * An option to include line numbers [lineno]. The lineno package does not number equation
+%% * lines, captions, tables, etc. You must run _twice_ for proper placement of the line numbers.
+%% * This option will disable balancing column height on final page if that option has been invoked.
+%% * The lineno package won't always number the lines preceding displayed math in a paragraph because
+%% * paragraph has not ended. See that package's documentation for macros to address this problem, or
+%% * just leave a blank line above the displayed equation while you are editing and then remove the
+%% * blank line and [lineno] option when you move to your final version.
+%%
+%% * An option to use the old grid arrangement of author names [oldauthors]. See Appendix B for usage,
+%% * because the authors and affiliations must be entered different in this case.
+%%
+%% * An option to allow hyphenation of the typewriter font [hyphenate]
+%% * Hyphenation is normally suppressed for typewriter mode because it is often used for code.
+%%
+%% * Options to set (for the babel package) a primary language [lang= ], and secondary or tertiary
+%% * languages, [lang-second] and [lang-third]. English is the default when no language is set.
+%% * If a secondary or tertiary language is set, the main language must also be set.
+%% * The spanish module makes "." active, clashing with some code; \spanishdeactivate{.} stops this.
+%%
+%% For details of newtxmath and mathalfa, refer to their documentation (available on CTAN: http://ctan.org).
%%
%% The use of commands defined or modified by the asmeconf class is illustrated below. In particular,
%% ASME requires capitalized, sans-serif section headings, and as a result some care is needed
@@ -34,7 +64,7 @@
%%
%% LICENSE:
%%
-%% Copyright (c) 2019 John Lienhard
+%% Copyright (c) 2020 John Lienhard
%%
%% Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
%% associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -54,36 +84,17 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%% Class options are described above.
-\documentclass[varvw,largesc,upint]{asmeconf}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% Editing tools, can delete if not using them
-
-\usepackage{lipsum} % Generates paragraphs of gibberish latin for checking layout ... e.g. \lipsum[2-4] produces
- % paragraphs 2 through 4 of the text.
-\usepackage{comment} % for commenting out passages. See package documentation for usage.
-
-%% Filler names for Author and affiliation blocks on title page
-\def\AuthorName{Name[s] of Author[s]}
-\long\def\Affiliation{Department of Mechanical Engineering\\
- Institution or Company Name\\
- Street address\\
- City, State, Country}
+\documentclass[varvw,largesc,upint,mathalfa=cal=euler,hyphenate,balance,lang-second=french,lang=english,colorlinks]{asmeconf} % <=== remove colorlinks before submission to ASME!
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%% Fields to be completed %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%% pdf metadata and colors %%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%%% The user should edit as desired %%%%%%%%%%%%
+%%%%% pdf metadata %%%%%%%%%%%%
+%%%%% The user should edit %%%%%%%%%%%%
\hypersetup{%
- colorlinks=true,% <=== change to false to get black type for links (ASME may request this)
- linkcolor=blue, %
- citecolor=blue, % SeaGreen4,
- urlcolor=blue, % Red3,
pdftitle={ASME Conference Paper Template}, % <=== change to YOUR pdf file title
pdfkeywords={ASME, Paper, Template, \LaTeX, Research}, % <=== change to YOUR pdf keywords
pdfauthor={John H. Lienhard}, % <=== change to YOUR name[s]!!!
@@ -93,36 +104,46 @@
\begin{document}
-% Change these fields to the right content for your conference!
+% Change these fields to the right content for your conference.
% You can comment these out if for some reason you don't want a header.
+% Use title case (first letters capitalized), not all capitals
+
+\ConfName{Proceedings of the ASME 2020\linebreak International Mechanical Engineering Congress and Exposition}
+\ConfAcronym{IMECE20}
+\ConfDate{November 14-19, 2020}
+\ConfCity{Portland, OR, USA}
+\PaperNo{IMECE2020-XXXX}
-\ConfName{Proceedings of the ASME 2018 \linebreak International Mechanical Engineering Congress and Exposition}
-\ConfAcronym{IMECE18}
-\ConfDate{November 9-15, 2018}
-\ConfCity{Pittsburgh, PA, USA}
-\PaperNo{IMECE2018-XXXX}
-\PaperTitle{Our research paper: the latest developments in cutting-edge engineering}
+% Units of measure and other specialty lowercase terms in the title should be
+% enclosed in \NoCaseChange{...} to maintain lower case type
+% LaTeX will automatically set the title in all capital letters.
+
+\title{Place Title Here: Place Subtitle After Colon} % <=== change to YOUR title
-% Change to your name[s] and addresses, in the desired order of authors. Up to nine author blocks.
-% Note usage below for joint first authors and for corresponding author.
-% (Most of the example names below are not real people, just very common names.)
-\SetAuthorBlock{Luis Hern\'{a}ndez\JointFirstAuthor}{\Affiliation}
-\SetAuthorBlock{Maria Silva\JointFirstAuthor}{\Affiliation}
+%% Put author names into the order you want. Use the same order for affiliations.
+%% \affil{#} tags the author's affiliation to the address in \SetAffiliation{#}.
+%% No space between last name and \affil{#}, separate names with commas.
+%%
+%% \CorrespondingAuthor{email} follows that author's affiliation, no spaces.
+%% If multiple corresponding authors, put both email addresses in the same command and place after both authors.
+%%
+%% \JointFirstAuthor, if applicable, follows the affiliation of the relevant authors, no spaces.
-\SetAuthorBlock{Henry Tudor, Catherine Parr}{Hampton Court Palace \\ Richmond, England}
-\SetAuthorBlock{Jinsoo Kim}{\Affiliation}
-\SetAuthorBlock{Yusuf Yilmaz}{\Affiliation}
-%\SetAuthorBlock{Amelia Smith}{\Affiliation}
-%\SetAuthorBlock{Aadhya Acharya}{\Affiliation}
-%\SetAuthorBlock{Omar Abu Bakr}{\Affiliation}
+\SetAuthors{Luis Hern\'andez\affil{1}\JointFirstAuthor , Maria Silva\affil{2}\JointFirstAuthor, Henry Tudor\affil{3}, Catherine~Parr\affil{3}, John H.\ Lienhard V\affil{4}\CorrespondingAuthor{lienhard(a)mit.edu}}
-\SetAuthorBlock{\CorrespondingAuthor{John H.\ Lienhard V}{lienhard(a)mit.edu}}{%
-Rohsenow Kendall Heat Transfer Lab \\ Department of Mechanical Engineering
-\\ Massachusetts Institute of Technology \\ Cambridge, MA 02139 USA}
+\SetAffiliation{1}{Institution or Company Name, City, State}
+\SetAffiliation{2}{Institution or Company Name, City, Province, Canada}
+\SetAffiliation{3}{Hampton Court Palace, Richmond, England}
+\SetAffiliation{4}{Massachusetts Institute of Technology, Cambridge, MA }
+
+\maketitle
-\MakeTitlePage
+%%% Use this footnote for tracking various versions of your draft. Change text to suit your own needs.
+%%% Remove from final version.
+%%% \date{..} calls the same command.
+\versionfootnote{Documentation for \texttt{asmeconf.cls}. Version \versionno; \today.}% <=== Delete before final submission.
%%% Change these to your keywords. Keywords are automatically printed at the end of the abstract.
@@ -134,34 +155,78 @@
%%%%%%%%%%%%%%%%%%%%% End of fields to be completed. Now write! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%% Abstract %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Abstract should be no more than 200 words
\begin{abstract}
-This paper is an example and template for the \texttt{asmeconf} class. Papers typeset in this class will follow ASME Conference guidelines for margins, fonts, headings, captions, and reference formats. Standard \LaTeX\ commands are used. The class is compatible with the \texttt{hyperref} package. The class defines new environments for abstract and nomenclature. The optional argument of \verb|\section| has been modified for manually setting pdf bookmarks when macros or complicated mathematics are included in section headings. The class is intended to be used with the \texttt{asmeconf.bst} \textsc{Bib}\negthinspace\TeX\ style, which is part of this distribution. The class may be invoked with several options, most of which address math fonts. The class calls a number of packages, all of which are in \TeX\textsc{live}\ and on CTAN (\href{http://ctan.org}{ctan.org}).
+This paper is an example of and a template for typesetting ASME Conference Papers in {\upshape\LaTeX} using the {\upshape\texttt{asmeconf}} class. This class follows ASME guidelines for margins, fonts, headings, captions, and reference formats as of early 2020. The class is intended to be used with the {\upshape\texttt{asmeconf.bst} \hologo{BibTeX}} style, which is part of this distribution. The class is compatible with the {\upshape\texttt{hyperref}} package, so that pdfs will contain internal and external hyperlinks, pdf bookmarks, and metadata. Links may be colored, for online use, or black, for publication. Section headers may contain mathematics, references, citations, and footnotes. The class enables inline author names, following ASME's current style, but is backward compatible to the traditional block style. The class includes many options, e.g., for math fonts. The class calls a number of packages, all of which are in {\upshape\TeX\ Live} and on CTAN. The class is compatible with {\upshape\hologo{pdfLaTeX}} or {\upshape\hologo{LuaLaTeX}}.
\end{abstract}
+%%%%%%%%% NOMENCLATURE (OPTIONAL) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% To change space between the symbols and definitions, use \begin{nomenclature}[Xcm] where X is a number
+%% The unit cm can be replaced by any LaTeX unit of dimension: pt, in, ex, em, pc, etc.
+%% Default is 2em.
+
+%% Leave off second argument of \entry to produce a subheading (e.g., \entry{Greek letters} )
+
+\begin{nomenclature}
+\entry{Roman letters}
+\entry{$k$}{Thermal conductivity [W m$^{-1}$ K$^{-1}$]}
+\entry{$\vec{q}$}{Heat flux vector [W m$^{-2}$]}
-\section*{Introduction}
-For ASME conference papers, the labels Figure and Equation should be abbreviated when they do not start a sentence, as in Fig.~\ref{fig:1} and Eq.~\eqref{eqn:dw}. Figure~\ref{fig:1} is spelled out when it starts a sentence. Equation~\eqref{eqn:dw} is spelled out when it starts a sentence.
+\entry{Greek letters}
+\entry{$\alpha$}{Thermal diffusivity [m$^2$ s$^{-1}$]}
+\entry{$\nu$}{Kinematic viscosity [m$^2$ s$^{-1}$]}
-References are automatically numbered \cite{ning2002}. They should be inserted at the appropriate point using a \verb|\cite{ref}| command~\cite{gibson2008,stevens1999}. The references will be automatically sorted and compressed as well if they are given in a set \cite{stevens1999,ning2002,gibson2008,wions2005,smith2002,watson1982,smith1998}. See the \texttt{asmeconf-sample.bib} file for examples of how to enter your references.
+\entry{Dimensionless groups}
+\entry{Pr}{Prandtl number, $\nu/\alpha$}
+\entry{Sc}{Schmidt number, $\nu/\mathcal{D}_{1,2}$}
-Equations are typeset in the usual way. The class file loads the \texttt{amsmath} and \texttt{mathtools} packages. Further, the \texttt{newtxmath} package used for the math fonts includes many additional features.
-\begin{equation}\label{eqn:fourier}
-\vec{q} = -k\nabla T
-\end{equation}
-ASME does not specify a standard nomenclature list. Be sure to put your symbols into the nomenclature list, including SI units.
+\entry{Superscripts and subscripts}
+\entry{b}{bulk value}
+\entry{$\infty$}{free stream value}
+\end{nomenclature}
-%% Use title case for subsections and subsubsections
-\subsection*{Section Headings and Captions}
-ASME requires that section headings and captions be set in an uppercase, bold face, sans serif font. The class will do this automatically. You can place \verb|\cite{..}|, \verb|\ref{..}|, \verb|\label{..}|, and into headings and captions directly, as you would in the main text. Do not enclose them braces, e.g.\ \verb|{\cite{..}}|, which will cause errors. You can place \verb|\footnote{..}| into headings, but not into captions.\footnote{See \texttt{tex-stackexchange} for various approaches to footnotes in captions, if you really want to have them.}
+%%%%%%%%% BODY OF PAPER %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{Introduction}
+The \texttt{asmeconf} class file will typeset papers with margins, fonts, headings, captions, and reference formats that follow those specified for conference papers of the American Society of Mechanical Engineers (ASME). Internal and external hyperlinks will be set automatically, and the pdf file will contain bookmarks and metadata. This class is not a publication of ASME.
+
+The \texttt{.tex} file may be written using standard \LaTeX\ commands, although some specific initial commands are needed to format the blocks containing the author[s], title, and abstract. This class loads a number of other packages, all of which are contained in up-to-date versions of \href{https://www.tug.org/texlive/}{\TeX\ Live}, \href{http://www.tug.org/mactex/}{Mac\TeX}, and similar distributions. If you find you are missing one of these packages, you may obtain it at no cost from CTAN (\href{http://ctan.org}{ctan.org}).
+
+\subsection{Essential Initial Commands}
+To begin, fill in the fields to be completed at top of the \texttt{asmeconf-template.tex} file. These fields include the headers for your conference and your paper number. Specified metadata will be placed into the pdf file itself.
+The title should be placed into \verb|\title{..}|.
-Simple math can be used in either captions or section headings, but see the \texttt{asmeconf.tex} source file for examples of how to deal with more complicated expressions.
+Put author names into the \verb|\SetAuthors{name, name,...}| command in the desired order; follow the syntax illustrated \texttt{asmeconf-template.tex} file. Put each distinct address sequentially into a separate \verb|\SetAffiliation{n}{address}|, where $n = 1,2,\ldots$ Tag each author with the right affiliation by putting \verb|\affil{n}| after that author's name inside the \verb|\SetAuthors{..| command.
-To get bold math, you can use the \verb|\bm{..}| macro from the \texttt{bm} package, which is loaded by the class. To get sans serif math, you can use \verb|\mathsf{..}|. So, you can write \verb|\bm{\mathsf{A+B}}| to put a bold, sans serif expression in a caption. The class file provides for sans serif greek letters by using \verb|\sfalpha| and similar expressions (e.g.\ $\sfalpha, \sfbeta, \sfgamma, \sfdelta \ldots$) for use in captions and headings (see Fig.\ \ref{fig:1}).
+Author addresses are to be kept short. List the author institution, and the City, State (US authors), City, Province, Canada (Canadian authors), or City, Country (for other international authors).
-For a section heading that includes more complicated math (and macros), you may use the optional argument of \verb|\section[..]{..}| to create a pdf bookmark without losing characters or producing warnings or errors. See the \texttt{asmeconf.tex} source file for examples of this. These bookmarks should usually be text expressions, although some math is supported.
+One author (or more) may be designated as the corresponding author by placing \verb|\CorrespondingAuthor{email}| after \verb|\affil{#}|. Two or more authors may be joint first authors by putting \verb|\JointFirstAuthor| after \verb|\affil{#}|.
+
+After setting up the headers, authors, and title, issue the \verb|\maketitle| command.
+
+The abstract text must be placed into \verb|\begin{abstract}| \ldots \verb|\end{abstract}|. The abstract will automatically be italicized. Keywords may be included using the \verb|\keywords{..}| command. The \texttt{keyword} command \textit{must} be issued before the abstract environment.
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{Referring to Citations, Figures, and Equations}
+Citations are automatically numbered \cite{ning2002}. They should be inserted at the appropriate point using a \verb|\cite{ref}| command~\cite{gibson2008,stevens1999}. The citations will be automatically sorted and compressed if they are given in a set \cite{stevens1999,ning2002,gibson2008,wions2005,smith2002,watson1982}.
+A specific reference may be named with an abbreviation, as in Ref.~\cite{watson1982}.
+See the \texttt{asmeconf-sample.bib} file and Sect.~\ref{sec:references} for examples of how to enter your references.
+
+For ASME conference papers, the labels Equation and Figure should be abbreviated when they do not start a sentence, as in Eq.~\eqref{eqn:dw} and Fig.~\ref{fig:1}. Figure~\ref{fig:1} is spelled out when it starts a sentence. Equation~\eqref{eqn:dw} is spelled out when it starts a sentence.
+
+Equations are typeset in the usual way and will be automatically numbered. The class file loads the \texttt{amsmath} and \texttt{mathtools} packages. Further, the \texttt{newtxmath} package used for the math fonts includes many additional features (see Sect.~\ref{sec:moremath}).
+\begin{equation}\label{eqn:fourier}
+\vec{q} = -k\nabla T
+\end{equation}
+
+ASME prefers SI units. (U.S.\ style units may follow in parentheses.) Be sure to put all symbols into the nomenclature list, including their units.
-Text in section headings and captions will not be capitalized if enclosed in a \verb|\NoCaseChange{...}| command.
%%%%%%%%%%%%% begin figure %%%%%%%%%%%%%%%%%
@@ -169,25 +234,29 @@
\begin{figure}
\centering\includegraphics[width=0.7\linewidth]{sample-figure-1.pdf}
-\caption{A figure caption with math, $\bm{\mathsf{z = (r,\sfphi)}}$ \cite{Lienhard2019b}\label{fig:1}}
-%% note: \sfphi is sans serif \phi, defined by the class file.
+\caption{Figure caption with math, eqn.~\eqref{eqn:fourier}: $z = (r,\phi)$ \cite{Lienhard2019b}\label{fig:1}}
\end{figure}
%%%%%%%%%%%%% end figure %%%%%%%%%%%%%%%%%%%
-\subsubsection*{Subsection Headings in Title Case}
-Subsections and sub-subsection headings should be in title case (first letter of primary words capitalized).
-The rest of this text uses Latin to show layout and usage. Refer to the \texttt{.tex} file for further details.
-\subsubsection*{Latin for Layout}
-\lipsum[4-5] % <=== This command generates paragraphs of fake Latin. Delete it here and elsewhere!
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Use title case for subsections and subsubsections
+
+\section{Section Headings and Captions}
+ASME requires that section headings and captions be set in an uppercase, sans serif font. The class will do this automatically. You can place \verb|\cite{..}|, \verb|\ref{..}|, \verb|\label{..}|, and mathematics into headings and captions directly, as you would in the main text. Do not enclose them braces, e.g.\ \verb|{\cite{..}}|, which will cause errors. You can place \verb|\footnote{..}| into headings, but not into captions.\footnote{See \texttt{tex-stackexchange} for various approaches to footnotes in captions, if they seem necessary. For footnotes in tables, use the \texttt{tablefootnote} package.}\footnote{Sequential footnotes are automatically separated by a comma.}
+Text in section headings and captions will not be capitalized if enclosed in a \verb|\NoCaseChange{..}| command.
-%% Dealing with complicated math in a section heading: optional argument provides the pdfbookmark
-%% without losing characters or producing warnings/errors.
-\section*[Math in a section heading: u\cdot\omega=0]{Math in a section heading: $\bm{\vec{\mathsf{u}}\cdot\vec{\sfomega}=\mathsf{0}}$}
+Sections may either be numbered or left unnumbered.
-\lipsum[6-7] % <=== This command generates paragraphs of fake Latin. Delete it here and elsewhere!
+Simple mathematical expressions can be used in either captions or section headings. For a section heading that includes more complicated math (and macros), you may use the optional argument of \verb|\section[..]{..}| to create a pdf bookmark without losing characters or producing warnings or errors. See the \texttt{asmeconf-template.tex} source file for examples of this procedure. These bookmarks should usually be text expressions, although some math is supported.
+
+If you wish to override the default math format in captions, put \verb|\mathversion{normal}| in the caption.
+
+\subsection{Subsection and Sub-subsection Headings}
+Subsections and sub-subsection headings should be entered in title case, with the first letter of primary words capitalized. Sub-subsections (i.e., paragraphs) are never numbered.
%%%%%%%%%%%%%%% begin simple table %%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -210,13 +279,12 @@
%%%%%%%%%%%%%%%% end table %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
%%%%%%%%%%%%%%% begin more complicated table %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{table}[t]
\caption{Table with more complicated columns}\label{tab:2}%
\centering{%
-\begin{tabular}{!{\hspace*{0.5cm}} >{\raggedright\hangindent=1em} p{3cm} d{3} @{\hspace*{1cm}} d{3} !{\hspace*{0.5cm}}}
+\begin{tabular}{!{\hspace*{0.5cm}} >{\raggedright\hangindent=1em} p{3cm} d{3.3} @{\hspace*{1cm}} d{3.3} !{\hspace*{0.5cm}}}
\toprule
Experiment & \multicolumn{1}{c@{\hspace*{1cm}}}{$u$ [m/s]} & \multicolumn{1}{c!{\hspace*{0.5cm}}}{$T$ [\textdegree C]} \\
\midrule
@@ -230,60 +298,19 @@
%%%%%%%%%%%%%%%% end table %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\section{Tables and Figures}
-%%%%%%%%%%%%%%%%% begin wide figure %%%%%%%%%%%%%%%%%%%%%%%%%%%
+Table \ref{tab:1} is an example of a simple table. Table captions should be placed above tables.
+The class loads the \texttt{booktabs} package (used for horizontal rules in both Table \ref{tab:1} and \ref{tab:2}), and the \texttt{array} and \texttt{dcolumn} packages which provide extended capabilities for columns in the \texttt{tabular} environment (used in Table \ref{tab:2}). Table \ref{tab:3} is an example of a table that spans two columns. Two column tables (and figures) will always float to the top of a later page.
-\begin{figure*}[t]
-\begin{minipage}[c]{0.5\textwidth}
-\centering{
- \includegraphics{sample-figure-2a.pdf}
-\subcaption{Interior region\label{fig:interior-region}}
-}\end{minipage}
-%%%%%%%%%%%%%
-\begin{minipage}[c]{0.5\textwidth}
-\centering{
-\includegraphics{sample-figure-2b.pdf}
-\subcaption{Exterior region\label{fig:exterior-region}}
-}\end{minipage}
-\caption{A figure with two subfigures \cite{Lienhard2019b}}
-\end{figure*}
+Figure captions go below figures. Figure~\ref{fig:2} is an example of a figure that spans two columns and includes subfigures. The text in figures (and tables) should be no smaller than 6~point type. Images in figures are handled by the standard \texttt{graphicx} package.
-%%%%%%%%%%%%%%%%%%% end wide figure %%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+Landscape figures and tables may be produced at full-page size by putting \verb|\usepackage[figuresright]{rotating}| in your \texttt{.tex} file's preamble and using the \texttt{sidewaystable*} and \texttt{sidewaysfigure*} environments~\cite{fairbairns}.
-
-
-\section*{Entropy generation\footnote{If you have text in a section heading or caption that you do not want to be capitalized, enclose it in a \texttt{\textbackslash NoCaseChange} command.} is always interesting and important \cite{bejan}}
-
-\lipsum[7-8] % <=== This command generates paragraphs of fake Latin. Delete it here and elsewhere!
-
-
-
-%% Subsections with math do not need any special handling because they are neither uppercased nor bookmarked
-%% Note that \dot or \vec must go outside of \mathsf{..}
-\subsection*{Subsection with Math: $\bm{\dot{\mathsf{S}}_{\textsf{gen}}}$ \cite{bejan}.}
-
-\lipsum[10] % <=== This command generates paragraphs of fake Latin. Delete it here and elsewhere!
-
-
-\subsubsection*{Sub-subsection\footnote{Another longer footnote to show the leading and line breaking, and how it will sit at the bottom of a column. Another longer footnote to show the leading and line breaking, and how it will sit at the bottom of a column.} Heading}
-
-\lipsum[12-13] % <=== This command generates paragraphs of fake Latin. Delete it here and elsewhere!
-\begin{equation}\label{eqn:dw}
-d\vec{w} =
- \begin{pmatrix}
- du \\ dv
- \end{pmatrix} =
- \underbrace{\begin{pmatrix}
- \partial u/\partial x & \partial u/\partial y \\
- \partial v/\partial x & \partial v/\partial y
- \end{pmatrix}}_{=\,\mathbf{J}_1} \begin{pmatrix}
- dx \\ dy
- \end{pmatrix}
-\end{equation}
-
-%%%%%%%%%%%%%%% begin table %%%%%%%%%%%%%%%%%%
-\begin{table*}[t]
-\caption{A table spanning two columns}\label{tab:3}%
+%%%%%%%%%%%%%%% begin two column table %%%%%%%%%%%%%%%%%%
+\begin{table*}
+\caption{A table spanning two columns\label{tab:3}}%
\centering{%
\begin{tabular*}{0.8\textwidth}{@{\hspace*{1.5em}}@{\extracolsep{\fill}}ccc!{\hspace*{3.em}}ccc@{\hspace*{1.5em}}}
\toprule
@@ -309,72 +336,252 @@
\bottomrule\end{tabular*}
}
\end{table*}
-%%%%%%%%%%%%%%%% end table %%%%%%%%%%%%%%%%%%%
-\lipsum[16] % <=== This command generates paragraphs of fake Latin. Delete it here and elsewhere!
+%%%%%%%%%%%%%%%%% end two column table %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{Reference Formatting with \NoCaseChange{\texttt{asmeconf.bst}}\footnote{If you have text in a section heading or caption that you do not want to be capitalized, such as an SI unit, enclose it in a \texttt{\textbackslash NoCaseChange} command.}}\label{sec:references}
+
+The {\upshape\texttt{asmeconf.bst}} \hologo{BibTeX} style follows the reference styles shown on ASME's conference web site in early 2020. Examples for these and many other cases are given in the \texttt{asmeconf-sample.bib} file, which is part of this distribution. Citations and references are managed by the standard \texttt{natbib} package. Nevertheless, a few comments are necessary.
+
+%% sub-subsections should *not* be numbered
+\subsubsection*{DOI, URL, and eprint} Include DOI numbers when they are available. URL's may alternatively be given. ASME requests that URLs point to a document's abstract.
-\section*{Acknowledgements}
-\lipsum[17] % <=== This command generates paragraphs of fake Latin. Delete it here and elsewhere!
+Elementary support for \texttt{eprint} numbers is also included, generating a url at the end of the citation. The \texttt{archive} type may be specified using the macros \texttt{arxiv, googlebooks, hdl, jstore, oclc}, or \texttt{pubmed} (e.g., \texttt{archive=hdl}, \textit{without} braces). Both \texttt{eprint} and \texttt{archive} fields \textit{must} be given. Other root urls may be invoked using \verb|archive = {http://another.url.org/}|.
+\subsubsection*{Online Sources} A bibliography field \verb|@online{..| is included for citation of online sources, such as web pages. A \texttt{url} or \texttt{eprint} with \texttt{archive} must be included. See the examples of use in the \texttt{asmeconf-sample.bib} file.
+\subsubsection*{Date Accessed} The \verb|urldate={..}| field may be used to provide the date on which a given url was accessed. By default, the text printed will be \texttt{Accessed `date',}. The word ``Accessed'' may be changed using the \verb|urltype={..}| field.
-%%% NOMENCLATURE %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsubsection*{Conference Location and Date} For the entry types \verb|@inproceeedings{..| and \verb|@proceeedings{..|, you may include \verb|venue={..}| and \verb|eventdate={..}| to specify the city and the date of a conference.
+
+\subsubsection*{Capitalization of Titles} ASME's bibliography style requires that document titles be in title case. The first letters of principal words are capitalized. Do this when writing the \texttt{.bib} file.
+
+
+
+%%%%%%%%%%%%%%%%% begin two column figure %%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\begin{figure*}
+\begin{subfigure}[t]{0.5\textwidth} %subfigure is basically the same as minipage
+\vbox{
+\vspace*{1.7em}
+\centering{
+ \includegraphics{sample-figure-2a.pdf}
+}
+\vspace*{1.7em}
+}
+\subcaption{Interior region\label{fig:interior-region}}
+\end{subfigure}%
+%%%%%%%%%%%%% no spaces or line breaks between these two subfigures
+\begin{subfigure}[t]{0.5\textwidth}
+\centering{%
+\includegraphics{sample-figure-2b.pdf}
+\subcaption{Exterior region\label{fig:exterior-region}}
+}\end{subfigure}
+\caption{A figure with two subfigures \cite{Lienhard2019b}}\label{fig:2}
+\end{figure*}
+
+%%%%%%%%%%%%%%%%%%% end two column figure %%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%%%%%%%%%%%%%%% MORE ON MATH %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%% Dealing with complicated math in a section or subsection heading:
+%% the optional argument to \section will provide the pdf bookmark
+%% without losing characters or producing warnings/errors.
%%
-%% To change space between the symbols and definitions, use \begin{nomenclature}[Xcm] where X is a number
-%% The unit cm can be replaced by any LaTeX unit of dimension: pt, in, ex, em, pc, etc.
-%% Default is 2em.
+%% In this heading, letter u is forced to be upright with \mathrm{u}
+%%
+\section[More on math: u\cdot\omega=0]{More on math: $\vec{\mathrm{u}}\cdot\vec{\omega}=0$}\label{sec:moremath}
-\begin{nomenclature}
-\entry{\textit{Roman letters}}{}
-\entry{$k$}{Thermal conductivity [W m$^{-1}$ K$^{-1}$]}
-\entry{$\vec{q}$}{Heat flux vector [W m$^{-2}$]}
+In most cases, the need for a wide equation can be eliminated by using one of the multiline equation environments defined by
+\texttt{amsmath}, such as \texttt{align}, \texttt{split}, or \texttt{multline}~\cite{amsmath}. The following equation is set with the
+\texttt{multline} environment:
+\begin{multline}\label{eqn:energy}
+\frac{\partial}{\partial t}\left[\rho\bigl(e + \lvert\vec{u}\rvert^2\big/2\bigr)\right] + \nabla\cdot\left[\rho\bigl(h + \lvert\vec{u}\rvert^2\big/2 \bigr)\vec{u}\right] \\
+ ={}-\nabla \cdot \vec{q} + \rho \vec{u}\cdot\vec{g}+ \frac{\partial}{\partial x_j}\bigl(d_{ji}u_i\bigr) + \dot{Q}_v
+\end{multline}
+An example using \texttt{align} appears in Appendix~\ref{appendix:a}.
-\entry{\textit{Greek letters}\rule{0pt}{13pt}}{}
-\entry{$\alpha$}{Thermal diffusivity [m$^2$ s$^{-1}$]}
-\entry{$\nu$}{Kinematic viscosity [m$^2$ s$^{-1}$]}
+An alternative solution may be to set large equations into two-column-wide tables or figures. While a package exists for setting equations that span two columns (\texttt{widetext.sty}), that code is erratic in relation to floats and page breaks.
-\entry{\textit{Dimensionless groups}\rule{0pt}{13pt}}{}
-\entry{Pr}{Prandtl number, $\nu/\alpha$}
+Math italics are used for roman and greek letters by default. If you want an upright letter in math, you can use the relevant math alphabet, e.g., \verb|\mathrm, \mathbf, \mathsf|:
+\begin{equation}\label{eqn:dw}
+\vec{F} = m \vec{a} \quad\textrm{or}\quad \vec{\mathrm{F}} = m \vec{\mathrm{a}} \quad\textrm{or}\quad \mathbf{F} = m \mathbf{a} \quad\textrm{or}\quad \vec{\mathsf{F}} = m \vec{\mathsf{a}}
+\end{equation}
+To get additional symbols in bold math, you can use the \verb|\bm{..}| macro from the \texttt{bm} package, which is loaded by the class.
-\entry{\textit{Superscripts and subscripts}\rule{0pt}{13pt}}{}
-\entry{b}{bulk value}
-\entry{$\infty$}{free stream value}
+The class file also provides upright sans-serif greek letters with \verb|\sfalpha| and similar expressions (e.g., $\sfalpha, \sfbeta, \sfgamma, \sfdelta$ \ldots $\bm{\sfalpha, \sfbeta, \sfgamma, \sfdelta \ldots}$), in case they are needed (but note that the \verb|newtxmath| options \verb|frenchmath| and \verb|slantedGreek| also affect how greek letters are presented).
+
+\subsection{The \texttt{newtxmath} and \texttt{mathalpha} Packages~\cite{sharpe1,sharpe2}} The \texttt{newtxmath} package~\cite{sharpe1}, loaded by default, includes a large number of options for mathematics, most of which can be called as options to \verb|\documentclass|. For example, the \texttt{upint} option of \texttt{newtxmath} selects upright integral signs (rather than slanted integral signs):
+\begin{quote}
+\verb|\documentclass[upint]{asmeconf}|.
+\end{quote}
+These math options are discussed further in the \texttt{asmejour-template.tex} file.
+
+In addition, many options for calligraphic, fraktur, and script fonts are available as options to the \texttt{mathalfa} package, which is also loaded. These may be invoked, for example, as
+\begin{center}
+\verb|\documentclass[mathalfa=cal=euler]{asmeconf}|
+\end{center}
+which selects the Euler font for \verb|\mathcal| (this is our default). To find all the font options, refer to the \texttt{mathalfa} package documentation \cite{sharpe2}.
+
+The typewriter font loaded is \texttt{inconsolata} (which is sans serif), as suggested by the \texttt{newtx} package documentation.
+
+The \texttt{asmeconf} class is not set up for use with the \texttt{fontspec} or \texttt{unicode-math} packages.
+
+
+%%%%%%%%%%%%%%% ADDITIONAL PACKAGE OPTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{Additional Options for \NoCaseChange{\texttt{asmeconf.cls}}}
+The class accepts a number of options in addition to those already described. These options are discussed next.
+
+\subsection{Colored hyperlinks}
+ASME requires that all text be \textbf{in black} when the paper is submitted for publication. For other uses, authors may
+obtain colored hyperlinks with the [\texttt{colorlinks}] option.
+
+\subsection{Final Column Balancing} The option \texttt{[balance]} invokes the the \texttt{flushend} package~\cite{tolusis}.
+This package will attempt to give equal height to the two columns on the last page. The performance of this package is sometimes inconsistent (with odd page layout or, very rarely, errors), so use this option with caution.
+
+\subsection{Line Numbers} The option \texttt{[lineno]} invokes the the \texttt{lineno} package~\cite{bottcher}. This option will produce line numbers in the margins. You must run \LaTeX\ \textit{twice} for proper placement of the numbers. Tables, captions, and footnotes will not be numbered. Line numbers can be helpful for review and editing, but should not be used in your final manuscript. See the documentation of the \texttt{lineno} package for further commands to control line numbering.
+
+The \texttt{lineno} package is not compatible with the \texttt{flushend} package that makes final short columns the same height. Balancing is automatically disabled when this option is called.
+
+\subsection{Changing the Footer Text} The option \texttt{[nofoot]} will omit the ASME copyright from the first page footer.
+The footers are generated with the \texttt{fancyhdr} package~\cite{oostrum}, so you can change them in any way you like using the commands of that package. Only the default arrangement of footers matches ASME's style, however.
+
+\subsection{Superiors Font} The \texttt{newtxtext} package includes a superiors font (both numbers and letters) for use in footnote markers and superscripts. To enable this font, use the option \texttt{[nodefaultsups]}.
+
+\subsection{Old-style Author Grid} The option \texttt{[oldauthors]} invokes ASME's old grid-style arrangement of author names. The authors and affiliations must be entered differently in this case. See Appendix \ref{appendix:b} for usage.
+
+\subsection{Hyphenation of Typewriter Font} The option \texttt{[hyphenate]} will allow hyphenation of the typewriter font.
+Hyphenation is normally suppressed for typewriter mode because this font is often used for code.
+
+\subsection{Support for Other Languages} The package can be adapted to incorporate (or entirely use) languages other than English. See Appendix \ref{appendix:c} for details.
+
+%%%%% Conclusions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section{Conclusion}
+Provide a brief conclusion (3-4 lines).
+
+
+%%%%% Acknowledgments %%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\section*{Acknowledgments}
+Place any acknowledgments here.
-\end{nomenclature}
%%% REFERENCES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
%% Put your references into your .bib file in the usual way. Run latex once, bibtex once, then latex twice.
-%% This specific .bst style allows: venue = {location of conference}, and confmonth = {Month days}
+%% The asmeconf.bst style allows: venue = {Location of Conference}, and eventdate = {Month, days}
+%% for @inproceedings and @proceedings
%%
-\nocite{*} %% <=== delete this line unless you want to typeset the entire contents of your .bib file.
-\bibliographystyle{asmeconf} %% .bst file following ASME conference format. Do not change.
-\bibliography{asmeconf-sample} %% <=== change this to name of your bib file
+\nocite{*} %% <=== Delete this line unless you want to typeset the entire contents of your .bib file!
+
+\bibliographystyle{asmeconf} %% .bst file following ASME conference format. Do not change.
+\bibliography{asmeconf-sample} %% <=== change this to name of your bib file
+
%%% APPENDICES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\appendix
%% Note that appendices will be "numbered" A, B, C, ... etc. Use \section, not \section*
-%% Equations should be numbered sequentially following those in the paper. Don't reset the counter.
+%% Equations will be numbered sequentially following those in the paper. Do not reset the equation counter.
%% Here we use the optional argument for the pdf bookmark.
-\section[The vector product A\times B]{The vector product $\bm{\vec{\mathsf A}\times\vec{\mathsf B}}$}
+\section[The vector product A\times B]{The vector product $\vec{A}\times\vec{B}$}\label{appendix:a}
-\lipsum[21] % <=== This command generates paragraphs of fake Latin. Delete it here and elsewhere!
+This brief illustration of an appendix shows the numbering of the appendix and equations. Equations are numbered
+consecutively, following those in the paper.
\begin{align}
\frac{d\Gamma}{dt} &{}= \int_{\mathcal{C}} \frac{D\mathbf{u}}{Dt} \cdot d\mathbf{r}\\
&{}= \iint_{\mathcal{S}} \nabla \times \frac{D\mathbf{u}}{Dt} \cdot d\mathbf{A}\\
&{}= \iint_{\mathcal{S}} \nabla p \times \nabla \left( \frac{1}{\rho}\right) \cdot d\mathbf{A}
\end{align}
-%% Subsection headings are no numbered in appendices
-\subsection*{Subsection Heading}
-\lipsum[22] % <=== This command generates paragraphs of fake Latin. Delete it here and elsewhere!
+\section{Option to use an author grid}\label{appendix:b}
+
+ASME's most recent templates place author names inline, with affiliations for all authors in rows below.
+This style is the default for this template.
+
+The historical style of authors with affiliation in a grid of blocks may be invoked with
+the option [\texttt{oldauthors}]. When using this form, the author names and addresses should be entered as below:
+
+\smallskip
+\noindent\verb|\SetAuthorBlock{Name\JointFirstAuthor}{%|
+ \hbox{}\hfil\verb|Institution \\ City, State}|
+\verb|\SetAuthorBlock{Name\JointFirstAuthor}{%|
+ \hbox{}\hfil\verb|Institution \\ City, Country}|
+\verb|\SetAuthorBlock{Name, Name}{%|\hfil\hbox{}
+ \noindent\hbox{}\hfil\verb|Institution \\ City, Country}|
+\verb|\SetAuthorBlock{\CorrespondingAuthor{John Lienhard%|
+ \hbox{}\hfil\verb|}{lienhard(a)mit.edu}}{Institution \\ City, State}|
+
+Directly usable code is contained at the very end of the \texttt{asmeconf-template.tex} file.
+
+%% directly usable code follows the \end{document} command below.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\section{Language Support}\label{appendix:c}
+
+ASME publishes in English, but the \texttt{babel} package is loaded for
+users who may wish to include other languages. Options are supported to load a primary language, \texttt{lang=},
+as well as a secondary and tertiary language, \texttt{lang-second} and \texttt{lang-third}.
+The primary language must be specified explicitly if a secondary language is loaded.
+If no language option is given, the package defaults to English. An example of use is
+shown in \selectlanguage{french}\appendixname\ \ref{app:fourier}.\selectlanguage{english}
+
+The standard caption and section names will follow \texttt{babel}'s dictionary for primary languages other than English. Users may additionally change ``Keywords'', ``Nomenclature'', ``Corresponding author'', and ``Joint first authors'' by renewing the commands \verb|\keywordname|, \verb|\nomname|, \verb|\CAwords|, and \verb|\JAwords|. Changes to the page footer were described earlier. The pdf bookmark for ``Appendices'' may be changed by renewing \verb|\appendicesname|.
+
+Font encoding is set to T1 with utf-8 input supported:
+%% If you have trouble with the next line, your file may not be saved in utf-8 format. You can delete that line to resolve the issue.
+\typeout{If you have trouble with the next line, your file may not be saved in utf-8 format. You can delete that line to resolve the issue.}
+àáâäæãåā èéęëêēė îïíīįì ôöòóœøōõ ûüùúū çćč ł ñń ßśš ÿ žźż.
+
+No effort has been made to support customization of language-specific fonts, although this is possible by modifying the class file (examples are given in the \texttt{newtx} documentation). The bibliography style, \texttt{asmeconf.bst}, is designed in English and aimed at \hologo{BibTeX}. Multilingual bibliographies can be supported using \texttt{BibLaTeX}.
+
+\selectlanguage{french}
+\section{Discours Préliminaire de Fourier}\label{app:fourier}
+
+Les causes primordiales ne nous sont point connues; mais elles sont assujetties à des lois simples et constantes, que l'on peut découvrir par l'observation, et dont l'étude est l'objet de la philosophie naturelle.
+
+La chale ur pénètre, comme la gravité, toutes les substances de l'univers, ses rayons occupent toutes les parties de l'espace. Le but de notre ouvrage est d'exposer les lois mathématiques que suit cet élément. Cette théorie formera désormais une des branches les plus importantes de la physique générale~\cite{fourier1822}.
+
+\selectlanguage{english}
\end{document}
+
+%%% This is the set-up for the old author block style, a grid of blocks.
+
+% Can also put multiple emails and use command more than once for multiple corresponding authors.
+% Change to your name[s] and addresses, in the desired order of authors. Up to nine author blocks.
+% Note usage below for joint first authors and for corresponding author.
+% First name, middle initial, last name
+% Use title case (upper and lower case letters)
+% (Most of the example names below are not real people, just very common names.)
+
+\SetAuthorBlock{Luis Hern\'{a}ndez\JointFirstAuthor}{Institution or Company Name, City, State}
+\SetAuthorBlock{Maria Silva\JointFirstAuthor}{Institution or Company Name, City, Province, Canada}
+
+\SetAuthorBlock{Henry Tudor, Catherine Parr}{Hampton Court Palace \\ Richmond, England}
+\SetAuthorBlock{Jinsoo Kim}{Institution or Company Name, City, Country}
+\SetAuthorBlock{Yusuf Yilmaz}{Institution or Company Name, City, Country}
+
+% Can omit second argument of \CorrespondingAuthor if putting email into address
+% i.e., can just use \CorrespondingAuthor{name}.
+% Can also put multiple emails in the command and use more than once for multiple corresponding authors.
+
+\SetAuthorBlock{\CorrespondingAuthor{John H.\ Lienhard V}{lienhard(a)mit.edu}}{%
+Massachusetts Institute of Technology \\ Cambridge, MA}
+
+
Binary files old/doc/latex/asmeconf/sample-figure-2a.pdf and new/doc/latex/asmeconf/sample-figure-2a.pdf differ
Binary files old/doc/latex/asmeconf/sample-figure-2b.pdf and new/doc/latex/asmeconf/sample-figure-2b.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/asmeconf.doc.tlpobj new/tlpkg/tlpobj/asmeconf.doc.tlpobj
--- old/tlpkg/tlpobj/asmeconf.doc.tlpobj 2019-04-08 01:39:21.000000000 +0200
+++ new/tlpkg/tlpobj/asmeconf.doc.tlpobj 2020-04-16 01:56:53.000000000 +0200
@@ -1,9 +1,9 @@
name asmeconf.doc
category Package
-revision 50845
+revision 54758
shortdesc doc files of asmeconf
relocated 1
-docfiles size=95
+docfiles size=170
RELOC/doc/latex/asmeconf/README.md
RELOC/doc/latex/asmeconf/asmeconf-sample.bib
RELOC/doc/latex/asmeconf/asmeconf-template.pdf
++++++ asmeconf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/asmeconf/asmeconf.bst new/bibtex/bst/asmeconf/asmeconf.bst
--- old/bibtex/bst/asmeconf/asmeconf.bst 2019-04-02 23:11:08.000000000 +0200
+++ new/bibtex/bst/asmeconf/asmeconf.bst 2020-04-15 23:33:36.000000000 +0200
@@ -1,10 +1,10 @@
%%%%%
%%%%% *** This .bst produces the reference format for ASME conference papers. ***
-%%%%% *** Follows the examples given on ASME's conference web pages in early 2019. ***
+%%%%% *** Follows the examples given on ASME's conference web pages in early 2020. ***
%%%%% *** https://www.asme.org/shop/proceedings/conference-publications/references ***
-%%%%% *** The examples given by ASME do not cover all possibilities ***
+%%%%% *** The examples given by ASME do *not* cover all possibilities ***
%%%%%
-%%%%% This file is version 1.0 dated 2019/03/24
+%%%%% This file is version 1.11 dated 2020/04/14
%%%%%
%%%%% Author: John H. Lienhard V
%%%%% Department of Mechanical Engineering
@@ -15,13 +15,32 @@
%%%%% conformance to ASME specifications. Two new fields have been introduced for ASME
%%%%% conference papers:
%%%%%
-%%%%% venue = {city of conference},
-%%%%% confmonth = {month, day[s] on which conference was held},
+%%%%% venue = {city of conference},
+%%%%% eventdate = {month, day[s] on which conference was held}, %% called confmonth in version 1.0
%%%%%
%%%%% This approach leaves the address field as publisher's address,
%%%%% and it leaves the notes field open for other uses.
%%%%%
-%%%%% A simple version of eprint can be used with @misc.
+%%%%% Added fields: eventdate, urldate, urltype, venue
+%%%%% Added: @online{...} for web publications (and aliased it to @www and @electronic)
+%%%%% Added: urlprefix = {}, format.web.urldate, bbl.urldate; urltype field changes "accessed" to something else.
+%%%%% Added: venue and eventdate to @inproceedings
+%%%%%
+%%%%% Edits in version 1.11, 2020/04/14:
+%%%%% correct error in journal eid code.
+%%%%% remove comma between Vol. and No. in article, per ASME style
+%%%%% capitalize "Thesis", per ASME style
+%%%%% insert "." after techreport number, per ASME style
+%%%%% edits to @inbook, @proceedings, @incollection related to chapter and series.
+%%%%% make punctuation after "(ed.)" consistent across entries.
+%%%%% adjust block breaks in @online.
+%%%%% allow for venue and eventdate in @proceedings
+%%%%% add macros for ASME journal titles. add hdl as an equivalent to hndl archive macro.
+%%%%% add numpages functionality for eid: "eid (numpages pages)"
+%%%%% remove "doi" field from @online (since doi is a digital object identifier, not a web page).
+%%%%% add "urldate" to eprint format, for optional use.
+%%%%% warn in @online not to use both eprint and url, and warn if neither is given.
+%%%%% remove series and add volume to @inproceedings.
%%%%%
%%%%% Feel free to edit this file to suit your own needs, but please make note of changes in this header.
%%%%%
@@ -29,7 +48,7 @@
%% LICENSE:
%% This file is a derivative work from the generated file, as envisioned by the LaTeX Project Public License.
%%
-%% Copyright (c) 2019 John Lienhard
+%% Copyright (c) 2020 John Lienhard
%%
%% Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
%% associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -89,17 +108,16 @@
ENTRY
{ address
archive
- archivePrefix
author
booktitle
chapter
collaboration
- confmonth
doi
edition
editor
eid
eprint
+ eventdate
howpublished
institution
journal
@@ -110,14 +128,15 @@
numpages
organization
pages
- primaryClass
publisher
school
series
title
type
url
- venue
+ urldate
+ urltype
+ venue
volume
year
}
@@ -316,6 +335,9 @@
FUNCTION {bbl.in}
{ "in" }
+FUNCTION {bbl.paperno}
+{ "" }
+
FUNCTION {bbl.pages}
{ "pp." }
@@ -332,10 +354,10 @@
{ "Technical Report" }
FUNCTION {bbl.mthesis}
-{ "Master's thesis" }
+{ "Master's Thesis" }
FUNCTION {bbl.phdthesis}
-{ "Ph.D. thesis" }
+{ "Ph.D. Thesis" }
FUNCTION {bbl.first}
{ "1st" }
@@ -364,6 +386,10 @@
FUNCTION {bbl.th}
{ "th" }
+FUNCTION {bbl.urldate}
+ { "Accessed" }
+
+
MACRO {jan} {"Jan."}
MACRO {feb} {"Feb."}
@@ -409,6 +435,79 @@
if$
}
+MACRO {arxiv} {"https://arxiv.org/abs/"}
+
+MACRO {googlebooks} {"http://books.google.com/books?id="}
+
+MACRO {hdl} {"http://hdl.handle.net/"}
+MACRO {hndl} {"http://hdl.handle.net/"}
+
+MACRO {jstor} {"http://www.jstor.org/stable/"}
+
+MACRO {oclc} {"http://www.worldcat.org/oclc/"}
+
+MACRO {pubmed} {"http://www.ncbi.nlm.nih.gov/pubmed/"}
+
+
+MACRO {amr} {"Appl. Mech. Rev."}
+
+MACRO {lds} {"ASME Letters Dynamic Systems"}
+
+MACRO {jru} {"ASME J. Risk Uncertainty"}
+
+MACRO {jsbc} {"ASME J. Sustainable Bldg. and Cities"}
+
+MACRO {jam} {"ASME J. Appl. Mech."}
+
+MACRO {jbe} {"ASME J. Biomed. Eng."}
+
+MACRO {jcnd} {"ASME J. Comput. Nonlin. Dyn."}
+
+MACRO {jcise} {"ASME J. Comput. Inf. Sci. Eng."}
+
+MACRO {jds} {"J. Dyn. Syst.-T. ASME"}
+
+MACRO {jep} {"ASME J. Electron. Packag."}
+
+MACRO {jert} {"ASME J. Energy Resour."}
+
+MACRO {jegtp} {"ASME J. Eng. Gas Turbines Power"}
+
+MACRO {jem} {"ASME J. Eng. Mater."}
+
+MACRO {jfe} {"ASME J. Fluids Eng."}
+
+MACRO {jfcst} {"ASME J. Fuel Cell Sci. Tech."}
+
+MACRO {jht} {"ASME J. Heat Transfer"}
+
+MACRO {jmse} {"ASME J. Manuf. Sci. E."}
+
+MACRO {jmd} {"ASME J. Mech. Des."}
+
+MACRO {jmr} {"ASME J. Mech. Robot."}
+
+MACRO {jmdv} {"ASME J. Med. Devices"}
+
+MACRO {jmnm} {"ASME J. Micro Nano-Manuf."}
+
+MACRO {jnem} {"ASME J. Nanotech Eng. Med."}
+
+MACRO {joma} {"ASME J. Offshore Mech. Arct."}
+
+MACRO {jpv} {"ASME J. Press. Vess."}
+
+MACRO {jse} {"ASME J. Sol. Energy"}
+
+MACRO {jtsea} {"ASME J. Therm. Sci. Eng. Appl."}
+
+MACRO {jtb} {"ASME J. Tribol."}
+
+MACRO {jtm} {"ASME J. Turbomach."}
+
+MACRO {jva} {"ASME J. Vib. Acoust."}
+
+
MACRO {acmcs} {"ACM Computing Surveys"}
MACRO {acta} {"Acta Informatica"}
@@ -486,24 +585,48 @@
if$
}
+FUNCTION {format.web.urldate}
+{ urldate empty$
+ {""}
+ {urldate "urldate" bibinfo.check
+ urltype duplicate$ empty$
+ { pop$ bbl.urldate }
+ 'skip$
+ if$
+ "urltype" bibinfo.check
+ swap$ duplicate$ empty$
+ { pop$ "t" change.case$ }
+ { tie.or.space.prefix * * }
+ if$
+ ", " *
+ }
+ if$
+}
FUNCTION {format.eprint}
-{ eprint empty$
- { ""}
- {"\href{http://arxiv.org/abs/" eprint * "}{" * eprint "}" * *}
- if$
+{ eprint duplicate$ empty$
+ 'skip$
+ { "\eprint"
+ archive empty$
+ { "there's an eprint but no archive in " cite$ * warning$ }
+ { "[" * archive * "]" * }
+ if$
+ "{" * swap$ * "}" *
+ format.web.urldate swap$ *
+ }
+ if$
}
-
FUNCTION {format.url}
{
url
duplicate$ empty$
{ pop$ "" }
- { "\urlprefix\url{" swap$ * "}" * }
+ { "\urlprefix\url{" swap$ * "}" *
+ format.web.urldate swap$ *
+ }
if$
}
-
INTEGERS { nameptr namesleft numnames }
@@ -573,7 +696,6 @@
FUNCTION {format.editors}
{ editor "editor" format.names duplicate$ empty$ 'skip$
{
- "," *
" " *
get.bbl.editor
"(" swap$ * ")" *
@@ -745,6 +867,20 @@
}
if$
}
+
+FUNCTION {format.paper.number}
+{ number "number" bibinfo.check
+ type duplicate$ empty$
+ { pop$ bbl.paperno }
+ 'skip$
+ if$
+ "type" bibinfo.check
+ swap$ duplicate$ empty$
+ { pop$ "t" change.case$ }
+ { tie.or.space.prefix * * }
+ if$
+}
+
FUNCTION {format.number.series}
{ volume empty$
{ number empty$
@@ -757,7 +893,7 @@
if$
number tie.or.space.prefix "number" bibinfo.check * *
bbl.in space.word *
- series "series" bibinfo.check *
+ series emphasize "series" bibinfo.check *
}
if$
}
@@ -896,19 +1032,21 @@
{ eid "eid" bibinfo.check
duplicate$ empty$ 'pop$
{ swap$ duplicate$ empty$ 'skip$
- {
+ {
" " *
- }
- if$
- swap$ *
- numpages empty$ 'skip$
- { bbl.eidpp numpages tie.or.space.prefix
- "numpages" bibinfo.check * *
- " (" swap$ * ")" * *
+ format.year * ": " *
+ swap$
+ *
+ numpages empty$ 'skip$
+ { numpages bbl.eidpp tie.or.space.prefix
+ "numpages" bibinfo.check * *
+ " (" swap$ * ")" * *
+ }
+ if$
}
if$
- }
- if$
+ }
+ if$
}
FUNCTION {format.vol.num.pages}
{ volume field.or.null
@@ -926,14 +1064,14 @@
'skip$
if$
swap$
- ", " bbl.nr * number tie.or.space.prefix pop$ * swap$ *
+ " " bbl.nr * number tie.or.space.prefix pop$ * swap$ *
}
if$ *
}
FUNCTION {format.chapter.pages}
{ chapter empty$
- { "" }
+ 'format.pages
{ type empty$
{ bbl.chapter }
{ type "l" change.case$
@@ -942,6 +1080,10 @@
if$
chapter tie.or.space.prefix
"chapter" bibinfo.check
+ pages empty$
+ 'skip$
+ { ", " * format.pages * }
+ if$
* *
}
if$
@@ -960,7 +1102,7 @@
"" *
" " *
get.bbl.editor
- "(" swap$ * ") " *
+ "(" swap$ * "). " *
* swap$
* }
if$
@@ -1150,7 +1292,6 @@
{ output.bibitem
author empty$
{ format.editors "author and editor" output.check
- add.blank
}
{ format.authors output.nonnull
crossref missing$
@@ -1184,6 +1325,7 @@
format.note output
fin.entry
}
+
FUNCTION {booklet}
{ output.bibitem
format.authors output
@@ -1220,22 +1362,23 @@
new.block
crossref missing$
{
+ format.bvolume output
format.number.series output
+ new.block
+ new.sentence
format.publisher.address output
- format.bvolume output
- format.chapter.pages "chapter and pages" output.check
new.block
new.sentence
}
{
- format.chapter.pages "chapter and pages" output.check
new.block
format.book.crossref output.nonnull
}
if$
format.date "year" output.check
date.block
- format.pages "pages" output.check
+ format.chapter.pages "chapter and pages" output.check
+ new.block
format.doi output
new.block
format.eprint output
@@ -1254,9 +1397,9 @@
crossref missing$
{ format.in.ed.booktitle "booktitle" output.check
format.edition output
+ new.block
format.number.series output
format.bvolume output
- format.chapter.pages output
new.sentence
format.publisher.address output
}
@@ -1266,7 +1409,7 @@
if$
format.date "year" output.check
conf.date.block
- format.pages "pages" output.check
+ format.chapter.pages "pages" output.check
format.doi output
new.block
format.eprint output
@@ -1284,13 +1427,18 @@
new.block
crossref missing$
{ format.in.ed.booktitle "booktitle" output.check
+ volume empty$ 'skip$
+ { bbl.volume volume tie.or.space.prefix
+ "volume" bibinfo.check * * output
+ }
+ if$
new.sentence
- format.number.series output
+ format.paper.number output
conf.date.block
format.pages "pages" output.check
new.sentence
venue output
- confmonth output
+ eventdate output
format.thesis.year "year" output.check
new.sentence
publisher empty$
@@ -1312,6 +1460,7 @@
fin.entry
}
FUNCTION {conference} { inproceedings }
+
FUNCTION {manual}
{ output.bibitem
author empty$
@@ -1392,6 +1541,46 @@
empty.misc.check
}
+FUNCTION {online}
+{ output.bibitem
+ author empty$
+ { format.editors "author and editor" output.check
+ }
+ { format.authors output.nonnull
+ crossref missing$
+ { "author and editor" editor either.or.check }
+ 'skip$
+ if$
+ }
+ if$
+ new.block
+ format.title
+ "title" output.check
+ new.block
+ organization "organization" bibinfo.warn output
+ address "address" bibinfo.check output
+ format.date "year" output.check
+ new.block
+ url empty$
+ { eprint empty$
+ { "missing url and eprint in" cite$ * warning$ }
+ { format.eprint output }
+ if$
+ }
+ { "url and eprint" eprint either.or.check
+ format.url "url" bibinfo.warn output
+ }
+ if$
+ new.block
+ format.note output
+ fin.entry
+}
+
+FUNCTION {electronic} { online }
+
+FUNCTION {www} { online }
+
+
FUNCTION {phdthesis}
{ output.bibitem
format.authors "author" output.check
@@ -1418,11 +1607,16 @@
editor empty$
{ organization "organization" bibinfo.check output
}
- { format.editors output.nonnull }
+ { format.editors output.nonnull
+ }
if$
new.block
format.btitle "title" output.check
format.bvolume output
+ new.block
+ venue "venue" output.check
+ eventdate "eventdate" output.check
+ new.block
editor empty$
{ publisher empty$
{ format.number.series output }
@@ -1447,7 +1641,7 @@
if$
}
if$
- format.date "year" output.check
+ format.date "year" output.check
format.doi output
new.block
format.eprint output
@@ -1465,6 +1659,7 @@
"title" output.check
new.block
format.tr.number output.nonnull
+ new.block
institution "institution" bibinfo.warn output
address "address" bibinfo.check output
new.block
@@ -1533,7 +1728,7 @@
write$ newline$
" \providecommand{\doi}{DOI \discretionary{}{}{}\begingroup \urlstyle{rm}\Url}\fi"
write$ newline$
- "\providecommand{\eprint}[2][]{\url{#2}}"
+ "\providecommand{\eprint}[2][]{\urlprefix\href{#1#2}{#1#2}}"
write$ newline$
}
EXECUTE {begin.bib}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/asmeconf/asmeconf.cls new/tex/latex/asmeconf/asmeconf.cls
--- old/tex/latex/asmeconf/asmeconf.cls 2019-04-07 23:26:15.000000000 +0200
+++ new/tex/latex/asmeconf/asmeconf.cls 2020-04-15 23:33:36.000000000 +0200
@@ -1,11 +1,13 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%
%% This file provides the asmeconf class for formatting conference papers according to
-%% ASME conference requirements as represented on ASME's conference web pages in March 2019.
+%% ASME conference requirements as represented on ASME's conference web pages in 2020.
%%
%% Please note that ASME's journals follow specifications different from ASME conference papers.
%%
-%% This file is version 1.03 dated 2019/04/06.
+%% This file is version 1.18 dated 2020/04/14.
+ \def\versionno{1.18}
+ \def\versiondate{2020/04/14\space}
%%
%% Author: John H. Lienhard V
%% Department of Mechanical Engineering
@@ -18,8 +20,8 @@
%% 2. With the associated amseconf.bst, match ASME's reference formats
%% 3. Maintain hyperref compatibility for pdf bookmarks and hyperlinks
%% 4. Use the newtxtext and newtxmath font packages, including relevant features
-%% 5. Provide automatic layout of author blocks for up to nine addresses
-%% 6. Provide sans serif Greek letters for use in section heading and captions
+%% 5. Provide automatic layout of author names and addresses
+%% 6. Support bold face, sans serif math in headings
%%
%% This class is compatible with either pdfLaTeX or LuaLaTeX. The class uses a number of packages,
%% many of which are part of the standard LaTeX distribution, and all of which are in TeXLive and
@@ -31,7 +33,7 @@
%% This class is not designed for unicode-math or fontspec, given that the ASME conference style is
%% specific with respect to the font selections.
%%
-%% Options for the class are described on lines 74-90.
+%% Options for the class are configured on lines 79-169.
%%
%% The class defines two environments: abstract and nomenclature. The latter has an optional argument to
%% control the space between the entries and the definitions.
@@ -39,12 +41,15 @@
%% New commands are described in the asmeconf-template.tex file. The \section[]{} command's optional
%% argument is changed to better support pdf bookmarks, and \section* is modified similarly.
%%
+%% Commands for entering conference headers and author names are specific to this class.
+%% See asmeconf-template.tex for details.
+%%
%%
% =========================================================
%%
%% LICENSE:
%%
-%% Copyright (c) 2019 John H. Lienhard
+%% Copyright (c) 2020 John H. Lienhard
%%
%% Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
%% associated documentation files (the "Software"), to deal in the Software without restriction,
@@ -64,7 +69,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{asmeconf}[2019/04/04 ASME Conference Paper Format]
+\ProvidesClass{asmeconf}[\versiondate ASME Conference Paper Format (JHL)]
\LoadClass[twoside,twocolumn,10pt]{article}
% Two-sided layout not used in ASME's specs, although that's how the papers are printed
@@ -72,37 +77,104 @@
%%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage{ifthen}
+\newboolean{DefaultSups}
+\setboolean{DefaultSups}{true}
+\newboolean{Oldauthors}
+\setboolean{Oldauthors}{false}
+\newboolean{Balance}
+\setboolean{Balance}{false}
+\newboolean{lineno}
+\setboolean{lineno}{false}
+
+
+\RequirePackage{kvoptions}
+%\RequirePackage{kvsetkeys} % already loaded by kvoptions
+\SetupKeyvalOptions{
+ family=asmeconf,
+ prefix=asmeconf@,
+ setkeys=\kvsetkeys,
+}
+
+%%% for mathalfa, we may now pass options in this format: mathalfa=cal=euler, mathalfa=frak=boondox
+\define@key{asmeconf}{mathalfa}{%
+ \PassOptionsToPackage{#1}{mathalfa}%
+}
+
+%%% set key [nodefaultsups] to obtain newtx superiors font for footnotes.
+\define@key{asmeconf}{nodefaultsups}[false]{%
+ \setboolean{DefaultSups}{#1}
+}
+
+%%% set key [nodefaultsups] to obtain newtx superiors font for footnotes.
+\define@key{asmeconf}{nodefaultsups}[false]{%
+ \setboolean{DefaultSups}{#1}
+}
+
+%%% set key [balance] to balance column height on last page.
+\define@key{asmeconf}{balance}[true]{%
+ \setboolean{Balance}{#1}
+ \ClassWarningNoLine{asmeconf}{Loading flushend package to balance column height on last page}%
+}
+
+%%% set key [lineno] to obtain linenumbers.
+\define@key{asmeconf}{lineno}[true]{%
+ \setboolean{lineno}{#1}
+}
+
+%%% set key [lang,lang-second,lang-third] to pass languages to babel.
+
+%% In case language options are dropped during editing, include this. Subsequent choice of lang= will override it.
+\PassOptionsToPackage{english}{babel}
+
+\define@key{asmeconf}{lang}[english]{%
+ \PassOptionsToPackage{main=#1}{babel}%
+}
+\define@key{asmeconf}{lang-second}[english]{%
+ \PassOptionsToPackage{#1}{babel}%
+}
+\define@key{asmeconf}{lang-third}[english]{%
+ \PassOptionsToPackage{#1}{babel}%
+}
+
+\ProcessKeyvalOptions*
+
+%% option to have colored hyperlinks
+\DeclareOption{colorlinks}{%
+ \PassOptionsToPackage{colorlinks=true}{hyperref}%
+ }
+
%% option to omit ASME footer
\DeclareOption{nofoot}{%
\AtBeginDocument{\pagestyle{plain}}%
}
-%% Access many options from newtxmath
-%% See newtxmath documentation for details
-\DeclareOption{upint,smallerops,varvw,varg,slantedGreek,frenchmath,varbb,cmbraces}{\PassOptionsToPackage{}{newtxmath}}
-
-%% Access many options for mathalpha; defaults are scr=dutchcal,cal=euler
-%% See mathalfa documentation for details
-\DeclareOption{scr,cal,frak,bb,scrscaled,calscaled,frakscaled,bbscaled,scaled}{\PassOptionsToPackage{}{mathalfa}}
+%% Access many options from newtxmath. See newtx documentation for details.
+\DeclareOption{upint,smallerops,varvw,varg,uprightGreek,slantedGreek,frenchmath,varbb,cmbraces}{\PassOptionsToPackage{}{newtxmath}}
%% Option for slightly larger small capitals font
\DeclareOption{largesc}{\PassOptionsToPackage{largesc}{newtxtext}}
%% Option not to use latex default superscripts, instead using the newtxtext superiors font [nodefaultsups]
-%% The following coding is used because newtxtext cannot process "defaultsups=false"
-\newcommand{\ignore}[1]{#1}
-\DeclareOption{nodefaultsups}{%
- \renewcommand{\ignore}[1]{}%
- \DeclareOption{supstyle}{}%
+\ifthenelse{\boolean{DefaultSups}}{\PassOptionsToPackage{defaultsups}{newtxtext}}{\relax}
+
+%% option to use old authors
+\DeclareOption{oldauthors}{%
+ \setboolean{Oldauthors}{true}%
+ \ClassWarningNoLine{asmeconf}{Selected option for a grid of author blocks}%
+ }
+
+%% Option to hyphenate the typewriter font [hyphenate]
+\DeclareOption{hyphenate}{%
+ \PassOptionsToPackage{hyphenate}{inconsolata}%
+ \ClassWarningNoLine{asmeconf}{Allowing hyphenation of typewriter font}%
}
-\ExecuteOptions{scr=dutchcal,cal=euler}
-\ProcessOptions\relax
-
-%% now that \ignore is def'd and other options declared, we can deal with newtxtext defaultsups command
-\ignore{\DeclareOption{supstyle}{\PassOptionsToPackage{defaultsups}{newtxtext}}}
-\ExecuteOptions{supstyle}
-\ProcessOptions\relax
+%% Suppress warnings about mathalfa keys as unused global options
+\DeclareOption*{}
+
+\ProcessOptions \relax
+
%%%%%%%%%%%%% end options %%%%%%%%%%%%%%%%%%%
@@ -113,45 +185,81 @@
\setlength\columnsep{0.38in}
\RequirePackage[sort&compress,numbers]{natbib}
-\setlength\bibsep{3pt plus 1pt minus 2pt}
+\setlength\bibsep{1pt plus 1pt minus 1pt}
\RequirePackage{graphicx}
\RequirePackage[hyperref,fixpdftex,dvipsnames,svgnames,x11names]{xcolor}
\RequirePackage{xparse}
+\RequirePackage{metalogo,hologo} % Access various LaTeX logos if needed
%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{booktabs}
\RequirePackage{array}
-\RequirePackage{dcolumn} %%% alignment on decimal places
-\newcolumntype{d}[1]{D{.}{.}{#1}}
+\RequirePackage{dcolumn} %%% alignment on decimal places
+\newcolumntype{d}[1]{D{.}{.}{#1}} %% conflicts with babel's spanish language option.
%%%% FONT related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\RequirePackage{mathtools} % extends amsmath
-\RequirePackage[utf8]{inputenc}
+\RequirePackage[T1]{fontenc}
+
+\RequirePackage{iftex} % check whether pdfTeX or a different engine is used
+\ifpdftex
+ \pdfminorversion=7 % This selection is not required.
+ \RequirePackage[utf8]{inputenc} % for backward compatibility with pre-2018 distributions
+\else
+ \relax
+\fi
+
+\RequirePackage{mathtools} % loads and extends amsmath
+
+\RequirePackage[]{babel}
\RequirePackage[]{newtxtext}
+\RequirePackage[varqu,varl]{inconsolata} % sans typewriter font
\RequirePackage[]{newtxmath}
% See package documentation
-\RequirePackage[]{mathalfa} % load optional fonts for Calligraphy, Script, etc.
-% See package documentation
+%% override \textsu if using default superiors
+\ifthenelse{\boolean{DefaultSups}}{\let\textsu\textsuperscript}{\relax}
+
+\RequirePackage[]{mathalfa} % load optional fonts for Calligraphy, Script, Fraktur
+% See mathalfa package documentation for capabilities of this package.
+% Option format: mathalfa=cal=euler (etc.)
\RequirePackage{bm} % load after all math to give access to bold math
+%% Ensure that the current font is used for equation tags, not \normalfont as set by amsmath
+\def\maketag@@@#1{\hbox{\m@th#1}}
-%%%% font size selection %%%%%%%%
-%%%% ASME's specs differ from latex standard article-10 class %%%
+% The article class calls \sloppy in two-column mode (\tolerance 9999, \emergencystretch 3em)
+% These adjustments affect line breaking; the values below are intended to produce
+% fewer lines with large spaces, without creating the problems of using \fussy in two-column mode.
+\tolerance 2500
+\emergencystretch 3em
-\renewcommand\LARGE{\@setfontsize\LARGE{15}{18}} %... default is 17
-\renewcommand\Large{\(a)setfontsize\Large{12}{14.5}} %... default is 14
-\renewcommand\large{\(a)setfontsize\large{11}{13.6}} %... default is 12
-\renewcommand\normalsize{\@setfontsize\normalsize{10}{12}}
-\renewcommand\small{\(a)setfontsize\small{9}{10.8}}
-\renewcommand\footnotesize{\(a)setfontsize\footnotesize{8}{9.6}}
+%%%% font size selection %%%%%%%%
+%%%% ASME's specs differ slightly from latex standard article-10 class %%%
+\renewcommand\LARGE{\(a)setfontsize\LARGE{16}{19.2}} %{18}{21.6}} updated 7/7/19 to match new ASME spec.
+ % ...default is 17.28/22 ... used for paper#
+\renewcommand\large{\(a)setfontsize\large{11}{13.6}} %... default is 12/14 ... used for headings
+
+%\renewcommand\Large{\(a)setfontsize\Large{14.4}{18}} % same as default
+%\renewcommand\normalsize{\@setfontsize\normalsize{10}{12}} % same as default
+%\renewcommand\small{\@setfontsize\small{9}{11}} % same as default
+%\renewcommand\footnotesize{\(a)setfontsize\footnotesize{8}{9.5}} % same as default
+
+
+%% This provides sans serif italic and sans serif bold italic math.
+%% It's intended only for use in the figure captions and section headings (recommend \bm{..} elsewhere).
+\DeclareMathVersion{sansbold}
+\SetSymbolFont{letters}{sansbold}{OML}{ntxsfmi}{b}{it}
+\SetSymbolFont{lettersA}{sansbold}{U}{ntxsfmia}{b}{it}
+\SetSymbolFont{symbols}{sansbold}{LMS}{ntxsy}{b}{n}
+\SetSymbolFont{operators}{sansbold}{\encodingdefault}{\sfdefault}{\bfdefault}{n}
+\SetMathAlphabet{\mathsf}{sansbold}{\encodingdefault}{\sfdefault}{b}{it}
%%%%%% footer %%%%%%%
@@ -165,12 +273,14 @@
\renewcommand{\headrulewidth}{0pt}
\renewcommand{\footrulewidth}{0pt}
-%%%%%% foonotes %%%%%%%
+%%%%%% footnotes %%%%%%%
\RequirePackage{fnpos}
\makeFNbottom
\makeFNbelow
+\setlength{\skip\footins}{\baselineskip} % <=== per ASME 1 extra line
+
\renewcommand{\footnoterule}{%
\kern -3pt
\hrule width 0.5in height 0.4pt
@@ -187,8 +297,10 @@
\RequirePackage[labelfont={sf,bf},hypcap=false]{caption}
\RequirePackage[hypcap=false,list=true]{subcaption}
-\captionsetup[figure]{name=FIGURE,labelfont={sf,bf,small},textfont={sf,bf,small},labelsep=period}
-\captionsetup[table]{name=TABLE,labelfont={sf,bf,small},textfont={sf,bf,small},labelsep=period}
+\DeclareCaptionLabelFormat{uppercase}{\MakeTextUppercase{#1} #2}
+\DeclareCaptionTextFormat{boldmath}{\mathversion{sansbold}#1}
+\captionsetup[figure]{labelformat=uppercase, labelfont={sf,bf,small},textfont={sf,bf,small},textformat=boldmath, labelsep=colon}
+\captionsetup[table]{labelformat=uppercase, labelfont={sf,bf,small},textfont={sf,bf,small},textformat=boldmath, labelsep=colon,skip=0.5\baselineskip} %name=TABLE,
%% This construction avoids a failure of hyperref in relation to uppercase caption
%% Discussion: https://tex.stackexchange.com/questions/375695/maketextuppercase-inside-tab…
@@ -197,7 +309,13 @@
\renewcommand*{\caption}[2][\shortcaption]{\def\shortcaption{#2}\scaption[#1]{\MakeTextUppercase{#2}}}%
}
-
+%%%%%% introduce some caption or section names %%%%%%%%%%%
+ \providecommand{\nomname}{Nomenclature}
+ \providecommand{\keywordname}{Keywords}
+ \providecommand{\appendicesname}{APPENDICES}
+ \providecommand{\JAwords}{Joint first authors}
+ \providecommand{\CAwords}{Corresponding author}
+
%%%%%%%%%%%%%%%%%% Section headings %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% wish to accommodate hyperref
@@ -206,23 +324,23 @@
\RequirePackage[raggedright,indentafter]{titlesec}
%% ASME specifies 10 pt headings
-\titleformat{\section}{\bfseries\sffamily\raggedright}{\thesection :}{0.5em}{\MakeTextUppercase}
-\titleformat{name=\section,numberless}{\bfseries\sffamily\raggedright}{}{0em}{\MakeTextUppercase}
+\titleformat{\section}{\mathversion{sansbold}\bfseries\sffamily\raggedright}{\thesection .}{0.5em}{\MakeTextUppercase}
-\titleformat{\subsection}{\bfseries\sffamily\raggedright}{}{0pt}{\indent}
-\titleformat{\subsubsection}[runin]{\bfseries\sffamily}{}{0pt}{\indent}[.\hspace*{0.5em}]
+\titleformat{\subsection}{\mathversion{sansbold}\bfseries\sffamily\raggedright}{\thesubsection}{0.5em}{}
+\titleformat{\subsubsection}[runin]{\mathversion{sansbold}\bfseries\sffamily}{\thesubsubsection}{0.5em}{}[.\hspace*{0.5em}]
-\titlespacing\section{0pt}{12pt plus 4pt minus 2pt}{2pt plus 2pt minus 1pt}
+\titlespacing\section{0pt}{12pt plus 4pt minus 2pt}{1pt plus 1pt minus 1pt} % from 2 pt 2 pt 1 pt, 7/7/19
\titlespacing\subsection{0pt}{12pt plus 4pt minus 2pt}{0pt plus 2pt minus 1pt}
-\titlespacing\subsubsection{0pt}{12pt plus 4pt minus 2pt}{0pt plus 2pt minus 1pt}
+\titlespacing\subsubsection{\parindent}{6pt plus 3pt minus 2pt}{0pt plus 2pt minus 1pt} % from 12 4 3, 7/7/19
%% Special handling of the appendices
%% Assumes that appendices are the last content in paper
\RenewDocumentCommand{\appendix}{}{%
- \pdfbookmark[0]{Appendices}{appendices}
+ \setcounter{section}{0}
+ \pdfbookmark[0]{\appendicesname}{appendices}
\renewcommand\thesection{\Alph{section}}
- \titleformat{\section}{\bfseries\sffamily\raggedright}{APPENDIX \thesection:}{0.5em}{\MakeTextUppercase}
+ \titleformat{\section}{\mathversion{sansbold}\bfseries\sffamily\raggedright}{\MakeTextUppercase{\appendixname}\ \thesection.}{0.5em}{\MakeTextUppercase}
}
%%%%%%%%%%%%% hyperref %%%%%%%%%%%%%%%%%%%
@@ -237,10 +355,10 @@
bookmarksnumbered=true,%
bookmarksopen=true,%
bookmarksopenlevel=1,%
- colorlinks=true,%%% <=== set false to get black type, but do so in .tex file
+% colorlinks=true,%%% <=== set true to get colored type, but do so via package options
linkcolor=blue, %
- citecolor=blue, % SeaGreen4,%
- urlcolor=blue, % Red3,%
+ citecolor=blue, %
+ urlcolor=blue, %
breaklinks=true,%
pdftitle={}, % <=== add in .tex file
pdfkeywords={}, % <=== add in .tex file
@@ -252,16 +370,22 @@
\urlstyle{same} % don't switch to typewriter font
-\RequirePackage{doi} % provides hyperlinks for doi in bibliography
+\RequirePackage{doi} % supports the nasty characters in some doi's
\renewcommand{\doitext}{DOI } % change the default value, {doi:}, to this per ASME specification
+\RequirePackage{bookmark} % improves handling of pdf bookmarks
-
-%% Since \bm is useful in headings, this fix will reduce frequency with which
-%% alternate pdfstrings must be given in revised section command as \section[pdfstring]{texstring}
+%% Since \bm may be useful in headings, this fix will reduce frequency with which
+%% alternate pdfstrings must be given in revised section command as \section[pdfstring]{texstring}
\pdfstringdefDisableCommands{%
\def\bm#1#{\relax}%
}
+%% Let's disable \( and \) in pdf bookmarks, 28/2/20
+\pdfstringdefDisableCommands{%
+ \def\({\relax}%
+ \def\){\relax}%
+}
+
%% Let's also make sure \NoCaseChange in section headings won't break pdf bookmarks
\pdfstringdefDisableCommands{%
\let\NoCaseChange\relax%
@@ -275,35 +399,65 @@
%% Let's make sure footnotes in section headings don't break pdf bookmarks.
\RequirePackage{etoolbox}
\robustify{\footnote}
+% \patchcmd{\section}{\sectionmark}{\let\footnote\@gobble\sectionmark}{}{} <== not really needed in this context 28/2/20
\pdfstringdefDisableCommands{%
\def\footnote#1{}%
}
-
%% Let's also add \footnote to the \TextUppercase exception list, so that footnote text won't be capitalized
-%% if given in section headings
-\RequirePackage{xpatch}
-\xpatchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\footnote}{}{}
+%% if given in section headings. Ditto for \eqref
+%
+\patchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\footnote}{}{}
+\patchcmd{\@uclcnotmath}{\@nonchangecase\ref}{\@nonchangecase\ref\@nonchangecase\eqref}{}{} %% corrected 24 Jan 2020
%%% Create an optional argument for unnumbered sections and set pdf bookmark (thru \addcontentsline).
%%% The optional argument will manually set the pdf bookmark for that section; can be used to avoid hyperref
%%% errors when macros are in section titles.
-%%% There should not be errors for $$, \cite, \ref, \label, \footnote, or \bm with current construction.
+%%% There should not be errors for $, \cite, \ref, \eqref, \label, \footnote, \NoCaseChange, or \bm with current constructions.
\let\svsection\section
\RenewDocumentCommand{\section}{s o m}{%
\IfBooleanTF {#1}
- {\svsection*{#3}\phantomsection
+ {\svsection*{#3}\phantomsection%
{\IfNoValueTF {#2}
- {\addcontentsline{toc}{section}{#3} }
- {\addcontentsline{toc}{section}{#2} }
- }
- }
+ {\addcontentsline{toc}{section}{#3}}
+ {\addcontentsline{toc}{section}{#2}}% removed trailing space 28/2/20
+ }%
+ }%
{\IfNoValueTF {#2}
{\svsection{#3}}
- {\svsection[#2]{#3}}
- }
+ {\svsection[#2]{#3}}%
+ }%
+}
+
+%%%%%%%%%%%%% Line numbering and balancing columns on last page %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\ifthenelse{\boolean{lineno}}{%
+ \RequirePackage[switch,mathlines]{lineno}
+ \renewcommand{\linenumberfont}{\normalfont\footnotesize\color{red}}
+ \AtBeginDocument{\linenumbers}
+ \ClassWarningNoLine{asmeconf}{Package lineno loaded, so final column balancing is disabled}
+%%% Allow line numbering in AMS math environments.
+%%% postdisplaypenalty adjusted to avoid extra line number at end, see discussion here: https://tex.stackexchange.com/a/461192/
+%%% multline has some problem that puts an extra line number above it.
+%%% Requires xparse and etoolbox
+\NewDocumentCommand{\losepostpenalty}{}{\patchcmd{\linenomathWithnumbers}{\advance\postdisplaypenalty\linenopenalty}{}{}{}}
+
+\NewDocumentCommand{\FixAMSMath}{m}{%
+ \AtBeginEnvironment{#1}{\losepostpenalty\linenomath}%
+ \AtEndEnvironment{#1}{\endlinenomath}%
+ \AtBeginEnvironment{#1*}{\losepostpenalty\linenomath}%
+ \AtEndEnvironment{#1*}{\endlinenomath}%
+}
+
+\NewDocumentCommand{\FixAll}{>{\SplitList{;}}m}{\ProcessList{#1}{\FixAMSMath}}
+\FixAll{align;alignat;gather;flalign;multline}
+
+ }{%
+ \ifthenelse{\boolean{Balance}}{\RequirePackage{flushend}}{\relax} % flushend is NOT compatible with lineno
}
+\providecommand{\@LN@col}[1]{\relax}
+\providecommand{\@LN}[2]{\relax}
%%%%%%%%%%%%% Define special environments %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -316,36 +470,50 @@
\DeclareDocumentCommand{\keywords}{m}{%
\IfNoValueTF{#1}{%
\relax}{%
- \long\def\@keywords{\par\medskip\noindent{\bfseries\sffamily Keywords:} #1}%
+ \long\def\@keywords{\par\smallskip\noindent{\bfseries\sffamily \keywordname:} #1}%
}
}
\DeclareDocumentEnvironment{abstract}{}{%
- \section*{Abstract}%
+ \section*{\abstractname}\itshape%
}
- {\@keywords\bigskip%
+ {\upshape\@keywords%\medskip%
}
-
-%% Nomenclature environment.
+%%%%%%%%%%%% Nomenclature environment %%%%%%%%%%%%%%%%%%
+%%
%% Increase first optional argument to a dimension > 2em if wide entries cause undesired misalignment of columns.
%% Second argument can be used to rename, e.g., to List of Symbols.
%%
-\newcommand\entry[2]{\item[#1\hfill]#2}
+
\newlength\nomenwidth
+\newlength\savitemsep
-\DeclareDocumentEnvironment{nomenclature}{O{2em} O{Nomenclature}}{%
+%% If second argument of \entry is omitted, will produce an italicized heading (e.g. "Greek letters")
+%%
+\DeclareDocumentCommand{\entry}{m g}{%
+ \IfNoValueTF{#2}{%
+ \itemsep3\p@ plus 1\p@ minus 1\p@%
+ \goodbreak\item[\itshape#1\hfill]\setlength\itemsep\savitemsep\@itempenalty=1000%\nopagebreak% \smallskip
+ }{%
+ \item[#1\hfill]#2%
+ \@itempenalty=-\@lowpenalty%
+ }%
+}
+
+\DeclareDocumentEnvironment{nomenclature}{O{2em} O{\nomname}}{%
\setlength\columnsep{2em}
\setlength{\nomenwidth}{#1}
\section*{#2}
\raggedright
\begin{list}{}{%
- \setlength{\itemsep}{0pt}
- \setlength{\parsep}{\itemsep}
+ \setlength{\itemsep}{0pt}%
+ \setlength{\parsep}{\itemsep}%
\setlength{\labelsep}{1em}%
\setlength{\labelwidth}{\nomenwidth}%
\setlength{\leftmargin}{\labelwidth}%
\addtolength{\leftmargin}{\labelsep}%
+ \setlength\savitemsep\itemsep%
}%
}{\end{list}}
@@ -376,7 +544,7 @@
\providecommand\(a)PaperNo{\protect\phantom{NO.}}
\newcommand{\paperno}{%
-\vspace*{0.5in}
+\vspace*{2\baselineskip}
\parbox{\linewidth}{\raggedleft\bfseries\sffamily\LARGE%
\MakeTextUppercase{\@PaperNo}%
}%
@@ -386,17 +554,28 @@
\providecommand\@PaperTitle{\hbox{ }}
\newcommand{\papertitle}{%
-\vspace*{0.5in}
-\parbox{\linewidth}{\centering{\bfseries\sffamily\large%
-\MakeTextUppercase{\@PaperTitle}\par}
+\vspace*{3\baselineskip}
+\parbox{\linewidth}{\mathversion{sansbold}\centering{\bfseries\sffamily\large%
+\MakeTextUppercase{\@PaperTitle}\par} %%% <=== extra \par to make leading stick. See adjustment in \MakeTitle
}%
}
-%%%%%%%%%%% Author block %%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%% Author and affiliation block %%%%%%%%%%%%%%%%%%%%%%%%%%%%
\RequirePackage{xcoffins}
+%% To maintain compatibility with newtxtext superiors option, if used, save the definition
+\let\savethefootnote\thefootnote
+\let\savemakefnmark\@makefnmark
+
+
+%%%% option to retain original grid layout of authors
+\ifthenelse{\boolean{Oldauthors}}{%
+
+%%%%%%%%%%%%%%%%%%%% Old author layout %%%%%%%%%%%%%%%%%%%%%%%%%
+
\NewCoffin{\authorblock}
%% Allows for up to nine author groups... if you need more authors, the edits should be obvious
@@ -459,41 +638,158 @@
\DeclareDocumentCommand{\ConstructAuthorBlock}{}{%
\ifnum\value{authorno}>3
- \JoinCoffins\firstrowauthorblock[hc,b]\secondrowauthorblock[hc,t](0pt, -2\baselineskip)
+ \JoinCoffins\firstrowauthorblock[hc,b]\secondrowauthorblock[hc,t](0pt, -1.5\baselineskip)
\fi
\ifnum\value{authorno}>6
- \JoinCoffins\firstrowauthorblock[hc,b]\thirdrowauthorblock[hc,t](0pt, -2\baselineskip)
+ \JoinCoffins\firstrowauthorblock[hc,b]\thirdrowauthorblock[hc,t](0pt, -1.5\baselineskip)
\fi
\centerline{\TypesetCoffin\firstrowauthorblock} %% in this instance, \centerline is better than \centering
}
-%% To maintain compatibility with newtxtext superiors option, if used, save the definition
-\let\savethefootnote\thefootnote
-
%% Flag for corresponding author (expecting just one, but if two enter both email addresses and flag both authors)
-
\newif\ifCA\CAfalse
-\newcommand{\CAemail}[1]{\gdef\@CAemail{#1}}
-\DeclareDocumentCommand{\CorrespondingAuthor}{m m}{%
-\global\CAtrue%
-\CAemail{#2}%
-\renewcommand*{\thefootnote}{\fnsymbol{footnote}}
-\ignorespaces#1\ignorespaces\footnotemark[1]%
+% allow for NO email address to be given by omitting second argument
+\DeclareDocumentCommand{\CorrespondingAuthor}{m g}{%
+ \global\CAtrue%
+ \IfNoValueTF{#2}{%
+ \gdef\@CAsep{\relax}%
+ \gdef\@CAemail{\relax}%
+ }{%
+ \gdef\@CAsep{:\space}%
+ \gdef\@CAemail{#2}%
+ }%
+ \renewcommand*{\thefootnote}{\fnsymbol{footnote}}%
+ \ignorespaces#1\ignorespaces\footnotemark[1]%
}
%% Flag for joint first authors (two or more)
+\newif\ifJA\JAfalse
+
+\DeclareDocumentCommand{\JointFirstAuthor}{}{%
+ \global\JAtrue%
+ \renewcommand*{\thefootnote}{\fnsymbol{footnote}}%
+ \ignorespaces\footnotemark[2]%
+}
+
+%%% otherwise use new compact layout of authors
+}{% i.e., this begins "else"
+
+%%%%%%%%%%%%%%%%%%%%%% New author layout %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\NewCoffin{\AuthorBlock}
+\NewCoffin{\AffiliationBlock}
+\NewCoffin{\AffiliationsBlock}
+
+%% NB: \parbox width to \textwidth (full page) not \linewidth (single column)
+\SetHorizontalCoffin\AffiliationsBlock{}
+\DeclareDocumentCommand{\SetAuthors}{m}{%
+ \SetHorizontalCoffin\AuthorBlock{%
+ \parbox{\textwidth}{\centering\sffamily\bfseries\ignorespaces#1\ignorespaces}%
+ }
+}
+
+\def\@makefnmark{\hbox{\@textsuperscript{\sffamily\@thefnmark}}}%
+
+\DeclareDocumentCommand{\SetAffiliation}{m m}{%
+ \SetVerticalCoffin\AffiliationBlock{\textwidth}{%
+ \centering\sffamily\footnotemark[#1]#2\ignorespaces%
+ }
+ \JoinCoffins\AffiliationsBlock[hc,b]\AffiliationBlock[hc,t](0pt,-1pt)
+}
+
+
+%%% flag for corresponding author (usually just one, although you can have two by putting both email addresses
+%%% into field and attaching to both authors -- footnote will only print only the email in the last occurrence)
+
+%% Flag for corresponding author (expecting just one, but if two enter both email addresses and flag both authors)
+\newif\ifCA\CAfalse
+
+% allow for NO email address to be given by omitting the argument (g argument is deprecated, seems to have trouble with \IfNoValueTF) %% corrected spacing error 24 Jan 2020
+\DeclareDocumentCommand{\CorrespondingAuthor}{g}{%
+ \ignorespaces$\bm{^\ast}$%
+ \global\CAtrue%
+ % \IfNoValueTF{#1}{%
+ \ifblank{#1}{%
+ \gdef\@CAsep{\relax}%
+ \gdef\@CAemail{\relax}%
+ }{%
+ \gdef\@CAsep{:\space}%
+ \gdef\@CAemail{#1}%
+ }%
+}
+
+%%% Flag for joint first authors (two or more)
\newif\ifJA\JAfalse
\DeclareDocumentCommand{\JointFirstAuthor}{}{%
\global\JAtrue%
-\renewcommand*{\thefootnote}{\fnsymbol{footnote}}%
-\ignorespaces\footnotemark[2]%
+ $\bm{^\dagger}$%
+}
+
+%%% Affiliation mark
+\DeclareDocumentCommand{\affil}{m}{%
+ {\bfseries\footnotemark[#1]}%
}
-%%%% Make the title section
+%%% to deal with sequential notes as, e.g., "1,*", or "1,2,*" %%%%%%%%%%
+\let\oldaffil\affil
+\newcommand\nextToken\relax
+\renewcommand\affil[1]{%
+ \oldaffil{#1}\futurelet\nextToken\isOthernote}
+
+\newcommand\isOthernote{%
+ \ifx\CorrespondingAuthor\nextToken\textsuperscript{\sffamily\bfseries,}%
+ \else%
+ \ifx\JointFirstAuthor\nextToken\textsuperscript{\sffamily\bfseries,}%
+ \else
+ \ifx\affil\nextToken\textsuperscript{\sffamily\bfseries,}%
+ \fi%
+ \fi%
+ \fi%
+ \ignorespaces%
+}
+
+\let\oldCorrespondingAuthor\CorrespondingAuthor
+\renewcommand\CorrespondingAuthor[1]{%
+ \oldCorrespondingAuthor{#1}\futurelet\nextToken\isOthernote}
+
+\let\oldJointFirstAuthor\JointFirstAuthor
+\renewcommand\JointFirstAuthor{%
+ \oldJointFirstAuthor\futurelet\nextToken\isOthernote}
+
+\let\oldfootnote\footnote
+\renewcommand\footnote[1]{%
+ \oldfootnote{#1}\futurelet\nextToken\isOtherfnote}
+
+\newcommand\isOtherfnote{%
+ \ifx\footnote\nextToken\textsu{\mdseries,}%
+ \fi%
+}
+
+%%%
+
+\DeclareDocumentCommand{\SetAuthorBlock}{}{%
+ \let\savethefootnote\thefootnote
+ \JoinCoffins\AuthorBlock[hc,b]\AffiliationsBlock[hc,t](0pt,-\baselineskip)
+ \centerline{\TypesetCoffin\AuthorBlock}
+ \renewcommand*{\thefootnote}{\fnsymbol{footnote}}
+ \ifJA
+ \footnotetext[2]{\JAwords}
+ \fi
+ \ifCA
+ \footnotetext[1]{\CAwords\@CAsep\@CAemail}
+ \fi
+ \let\thefootnote\savethefootnote
+}
+
+} %% end ifthenelse for Oldauthors
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+%%%% Make the title and author section
\DeclareDocumentCommand{\MakeTitlePage}{}{%
\twocolumn[
\begin{@twocolumnfalse}
@@ -501,28 +797,45 @@
\paperno
\papertitle
\vspace*{2\baselineskip}
-\ConstructAuthorBlock
- \vspace*{3\baselineskip}
+ \ifthenelse{\boolean{Oldauthors}}{%
+ \ConstructAuthorBlock}{%
+ \SetAuthorBlock}
+ \vspace*{3\baselineskip}
\end{@twocolumnfalse}
]
+\let\@makefnmark\savemakefnmark
\renewcommand*{\thefootnote}{\fnsymbol{footnote}}
\ifJA
- \footnotetext[2]{Joint first authors}
+ \footnotetext[2]{\JAwords}
\fi
\ifCA
- \footnotetext[1]{Corresponding author:\space\@CAemail}
+ \footnotetext[1]{\CAwords\@CAsep\@CAemail}
\fi
\let\thefootnote\savethefootnote
}
+%%%%%%%%%%
+
+%% Provide compatibility with titling commands from standard LaTeX article class
+
+\RenewDocumentCommand{\maketitle}{}{\MakeTitlePage}
+\RenewDocumentCommand{\title}{}{\PaperTitle}
+
+\RenewDocumentCommand{\thanks}{m}{\relax} %% disabling this standard command, as it is inconsistent with the format
+
+%% Produces an unmarked footnote about the version date, to replace "date"
+%% This is for editing and should note be used in the final draft
+\NewDocumentCommand{\versionfootnote}{m}{\begin{NoHyper}\gdef\@thefnmark{}\@footnotetext{#1}\end{NoHyper}}
+
+\RenewDocumentCommand{\date}{m}{\versionfootnote} %% in case someone wants to use \date this way.
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Provide sans serif upright Greek letters, following a suggestion
%% to the class author by Michael Sharpe (March 2019).
-%% Access sans serif Greek from STIX fonts.
+%% Access sans serif Greek from newtxsf implementation of STIX fonts.
%%
-%% These are for use in the sans serif captions and headings if needed.
\DeclareSymbolFont{lettersAB}{U}{ntxsfmia}{m}{it}
\SetSymbolFont{lettersAB}{bold}{U}{ntxsfmia}{b}{it}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/asmeconf.tlpobj new/tlpkg/tlpobj/asmeconf.tlpobj
--- old/tlpkg/tlpobj/asmeconf.tlpobj 2019-04-08 01:39:21.000000000 +0200
+++ new/tlpkg/tlpobj/asmeconf.tlpobj 2020-04-16 01:56:53.000000000 +0200
@@ -1,20 +1,17 @@
name asmeconf
category Package
-revision 50845
+revision 54758
shortdesc A template for ASME conference papers
relocated 1
-longdesc This package provides a LaTeX class, a BibTeX style, and a
-longdesc LaTeX template to format conference papers for the American
-longdesc Society of Mechanical Engineers (ASME) according to the
-longdesc requirements on ASME's conference web pages (as posted in March
-longdesc 2019). The .tex and .cls files are commented and should be
-longdesc self-explanatory. This work is not a publication of ASME
-longdesc itself.
-runfiles size=14
+longdesc This class provides a template to format ASME Conference papers
+longdesc according to the requirements on ASME's web pages (as posted in
+longdesc early 2020). The .tex and .cls files are commented and should
+longdesc be self-explanatory. The package depends on newtx. This work is
+longdesc not a publication of ASME itself.
+runfiles size=19
RELOC/bibtex/bst/asmeconf/asmeconf.bst
RELOC/tex/latex/asmeconf/asmeconf.cls
catalogue-ctan /macros/latex/contrib/asmeconf
-catalogue-date 2019-04-07 06:22:59 +0200
catalogue-license mit
-catalogue-topics class confproc
-catalogue-version 1.03
+catalogue-topics bibtex-sty class confproc engineering scientific-docs
+catalogue-version 1.18
++++++ asymptote.doc.tar.xz ++++++
++++ 67080 lines of diff (skipped)
++++++ asymptote.tar.xz ++++++
++++ 13395 lines of diff (skipped)
++++++ aucklandthesis.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/aucklandthesis/README.TEXLIVE new/doc/latex/aucklandthesis/README.TEXLIVE
--- old/doc/latex/aucklandthesis/README.TEXLIVE 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/aucklandthesis/README.TEXLIVE 2019-06-05 16:50:09.000000000 +0200
@@ -0,0 +1,7 @@
+The following files have been removed in the TeX Live installation of
+the current package, typically due to duplication, lack of space, or
+missing source code. You can find these files on CTAN at
+ http://mirror.ctan.org/macros/latex/contrib/aucklandthesis
+If questions or concerns, email tex-live(a)tug.org.
+
+ aucklandthesis_userguide.pdf
Binary files old/doc/latex/aucklandthesis/aucklandthesis_userguide.pdf and new/doc/latex/aucklandthesis/aucklandthesis_userguide.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aucklandthesis.doc.tlpobj new/tlpkg/tlpobj/aucklandthesis.doc.tlpobj
--- old/tlpkg/tlpobj/aucklandthesis.doc.tlpobj 2019-02-28 03:16:48.000000000 +0100
+++ new/tlpkg/tlpobj/aucklandthesis.doc.tlpobj 2019-06-06 01:38:55.000000000 +0200
@@ -1,9 +1,9 @@
name aucklandthesis.doc
category Package
-revision 41506
+revision 51323
shortdesc doc files of aucklandthesis
relocated 1
-docfiles size=177
+docfiles size=4
+ RELOC/doc/latex/aucklandthesis/README.TEXLIVE
RELOC/doc/latex/aucklandthesis/README.txt
- RELOC/doc/latex/aucklandthesis/aucklandthesis_userguide.pdf
RELOC/doc/latex/aucklandthesis/template.tex
++++++ aucklandthesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aucklandthesis.tlpobj new/tlpkg/tlpobj/aucklandthesis.tlpobj
--- old/tlpkg/tlpobj/aucklandthesis.tlpobj 2019-02-28 03:16:48.000000000 +0100
+++ new/tlpkg/tlpobj/aucklandthesis.tlpobj 2019-06-06 01:38:55.000000000 +0200
@@ -1,6 +1,6 @@
name aucklandthesis
category Package
-revision 41506
+revision 51323
shortdesc Memoir-based class for formatting University of Auckland masters' and doctors' theses
relocated 1
longdesc A memoir-based class for formatting University of Auckland
++++++ authorarchive.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/CHANGELOG.md new/doc/latex/authorarchive/CHANGELOG.md
--- old/doc/latex/authorarchive/CHANGELOG.md 2018-02-22 00:33:35.000000000 +0100
+++ new/doc/latex/authorarchive/CHANGELOG.md 2019-06-23 22:57:00.000000000 +0200
@@ -1,9 +1,37 @@
# Changelog
+
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
-## [1.0.0] - 2018-02-21
+## [1.1.1] - 2019-06-23
+
+- Added PDF versions of the examples to the CTAN upload.
+
+### Added
+
+## [1.1.0] - 2019-06-23
+
+### Added
+
+- The links to the embedded files (references) are typeset at the bottom of the paper.
+- Support for `a4paper` for LNCS papers.
+
+### Changed
+
+- Updated LNCS output to the requirements of [Springer's Consent to Publish v3](http://resource-cms.springer.com/springer-cms/rest/v1/content/731196/da….
+- If `nourl` is active, the DOI is used as link for the QR code.
+- File embedding is implemented using the [intopdf](https://www.ctan.org/pkg/intopdf) package. Links to the embedded files are shown in the generated PDF.
+- ACM format adapted to [acmart](https://github.com/borisveytsman/acmart) v1.50.
+- Use [lastpage](https://ctan.org/pkg/lastpage) package instead of custom label.
+
+## 1.0.0 - 2018-02-21
+
### Added
+
- Initial version uploaded to CTAN.
+
+[Unreleased]: https://github.com/adbrucker/authorarchive/compare/v1.1.1...HEAD
+[1.1.1]: https://github.com/adbrucker/authorarchive/compare/v1.1.0...v1.1.1
+[1.1.0]: https://github.com/adbrucker/authorarchive/compare/v1.0.0...v1.1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/LICENSE new/doc/latex/authorarchive/LICENSE
--- old/doc/latex/authorarchive/LICENSE 2018-02-22 00:33:35.000000000 +0100
+++ new/doc/latex/authorarchive/LICENSE 2019-06-23 22:57:00.000000000 +0200
@@ -1,4 +1,4 @@
-Copyright (c) 2008-2016 Achim D. Brucker
+Copyright (c) 2008-2019 Achim D. Brucker
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/authorarchive/README.md new/doc/latex/authorarchive/README.md
--- old/doc/latex/authorarchive/README.md 2018-02-22 00:33:35.000000000 +0100
+++ new/doc/latex/authorarchive/README.md 2019-06-23 22:57:00.000000000 +0200
@@ -5,30 +5,40 @@
<!-- toc -->
-- [Installation](#installation)
-- [Usage](#usage)
- * [Boolean Switches](#boolean-switches)
- * [Key/Value Options](#keyvalue-options)
-- [Embedding Bibliography Entries](#embedding-bibliography-entries)
-- [Development](#development)
-- [Alternative Packages](#alternative-packages)
-- [License](#license)
+- [authorarchive](#authorarchive)
+ - [Installation](#installation)
+ - [Usage](#usage)
+ - [Boolean Switches](#boolean-switches)
+ - [Key/Value Options](#key-value-options)
+ - [Embedding Bibliography Entries](#embedding-bibliography-entries)
+ - [Notes on Self-Archiving](#notes-on-self-archiving)
+ - [LNCS](#lncs)
+ - [Usage at arXiv.org](#usage-at-arxivorg)
+ - [Other publishers](#other-publishers)
+ - [Alternative Packages](#alternative-packages)
+ - [Authors](#authors)
+ - [Contributors](#contributors)
+ - [License](#license)
+ - [Master Repository](#master-repository)
<!-- tocstop -->
-## Installation
-Copy `authorarchive.sty` in a directory that is searched by LaTeX
-(e.g,. either your `texmf` tree or the local directory with your main
-LaTeX file.
+## Installation
+
+Copy `authorarchive.sty` and the directory `icons` in a directory that
+is searched by LaTeX (e.g., either your `texmf` tree or the local
+directory with your main LaTeX file).
## Usage
+
A simple use for LNCS-formatted papers is as follows:
+
```tex
\usepackage[LNCS,
key=brucker-authorarchive-2016,
year=2016,
- publication={Anonymous et al. (eds). Proceedings of the International
- Conference on LaTeX-Hacks, LNCS~42. Some Publisher, 2016.}
+ publication={Anonymous et al.\ (eds). Proceedings of the International
+ Conference on LaTeX-Hacks, LNCS~42. Some Publisher}
startpage={42},
doi={00/00_00},
doiText={0/00\_00},
@@ -37,33 +47,39 @@
```
The following layout-styles are pre-defined:
-* `ACM` for the two-column layout used by many ACM conferences
-* `IEEE` for the two-column layout used by many IEEE conferences
-* `LNCS` for the LNCS layout (as used by Springer)
-* `LNI` for the Lecture Notes in Informatics, published by the GI
-* `ENTCS` for the Elsevier ENTCS layout
+
+- `ACM` for the two-column layout used by many ACM conferences
+- `ENTCS` for the Elsevier ENTCS layout
+- `IEEE` for the two-column layout used by many IEEE conferences
+- `LNCS` for the LNCS layout (as used by Springer)
+- `LNI` for the Lecture Notes in Informatics, published by the GI
By re-defining the font command (`authorcrfont{}`) and the command that is
-used for positioning the copyright text (`\authorat{}`), the package can
+used for positioning the copyright text (`\authorat{}`), the package can
be adapted easily to other layouts. For example,
+
```tex
\renewcommand{\authorcrfont}{\scriptsize}
\renewcommand{\authorat}[1]{\put(25,56.5){#1}}
```
+
works nicely for Acta Informatica.
### Boolean Switches
-| Switch | Meaning |
-| -- | -- |
-| `nocopyright` | If present, no publisher's copyright notice is printed. Usual case for LNCS. |
-| `nourl` | If present, no link to the publication is inserted. |
-| `nobib` | If present, no embedding of bibliographic entries is made. |
+
+| Switch | Meaning |
+| -- | -- |
+| `nocopyright` | If present, no publisher's copyright notice is printed. Usual case for LNCS. |
+| `nourl` | If present, no link to the publication is inserted. |
+| `nobib` | If present, no embedding of bibliographic entries is made. |
+| `orcidicon` | For layouts displaying the author's ORCID identifiers as text, replace the ORCID identifier by the ORICD iD icon and a hyperlink (currently only supported for LNCS). |
### Key/Value Options
+
| Option | Default | Meaning |
| -- | -- | -- |
| `bibtexdir`| `.` | The directory where the bibliography entries are listed. |
-| `baseurl` | https://git.logicalhacking.com/adbrucker/authorarchive/src/master | The URL used as prefix for building the links. |
+| `baseurl` | <https://git.logicalhacking.com/adbrucker/authorarchive/src/master> | The URL used as prefix for building the links. |
| `suffix` | `.pdf` | The suffix to use at links. |
| `publisher` | `UNKOWN PUBLISHER` | The name of the publisher. Default values are set by the series (`LNCS`, ...). |
| `year` | `UNKOWN YEAR` | The year of the publication. |
@@ -81,6 +97,7 @@
baseurl) easily.
## Embedding Bibliography Entries
+
Mostly, it is hard for scientists to find the correct bibtex entry for
a paper. One solution to this issue is to embed the respective `.bib`
(BibTeX, for LaTeX users), `.enw` (Endnote), `.ris`, or `.word.xml`
@@ -88,12 +105,80 @@
file exist in `bibtexdir`, it gets embedded in the PDF.
You can use the
-[bibutils](https://sourceforge.net/p/bibutils/home/bib2xml/) for
+[bibutils](https://sourceforge.net/p/bibutils/home/Bibutils/) for
converting between these different formats for bibliographic
-references easily.
+references easily.
+
+## Notes on Self-Archiving
+Before using this package, please check with your signed copyright form,
+which rights you have. Especially whether you may self-archive the preprint
+or the postprint. For more information on that, read on at
+<https://blogs.scientificamerican.com/information-culture/understanding-your…>.
+
+None of the authors might be hold liable for copyright
+violations by using this package.
+
+### LNCS
+
+Sprinter states in his [Springer's Consent to Publish v3](http://resource-cms.springer.com/springer-cms/rest/v1/content/731196/da…:
+
+> Author may only post his/her own version, provided acknowledgment is given
+> to the original source of publication and a link is inserted to the published
+> article on Springer’s website.
+> The link must be provided by inserting the DOI number of the article in the
+> following sentence:
+> "The final publication is available at Springer via
+> `http://dx.doi.org/[insert DOI]`".
+
+The DOI (Digital Object Identifier) can be found at the bottom of the first
+page of the published paper.
+
+This package uses `https://doi.org` as `http://dx.doi.org`
+[is deprecated](https://www.doi.org/factsheets/DOIIdentifierSpecs.html).
+
+Thus, the proposed configuration for Springer is as follows:
+
+```latex
+\usepackage[LNCS,
+ key=brucker-authorarchive-2016,
+ year=2016,
+ publication={Anonymous et al.\ (eds). Proceedings of the International
+ Conference on LaTeX-Hacks, LNCS~42. Springer, 2016.}
+ startpage={42},
+ doi={10.1038/authorarchive},
+ nocopyright
+ ]{authorarchive}
+```
+
+## Usage at arXiv.org
+
+arXiv.org deletes bib files when submitting a pre print. As workaround, this package
+supports using the file suffix `.bibtex`. When no `.bib` is found, but a `.bibtex`
+file, this file is used and embedded as `.bib` file into the PDF.
+
+## Other publishers
+
+In general, one does not need to specify a certain publisher (or LaTeX document class).
+The default setting just prints the note centered at the bottom of the first page.
+
+```latex
+\usepackage[
+ key=brucker-authorarchive-2017,
+ year=2017,
+ publication={Anonymous et al.\ (eds). Proceedings of the International
+ Conference on LaTeX-Hacks, CEUR-WS Vol~42, 2017.}
+ startpage={42},
+ doi={10.1039/authorarchive},
+ nocopyright
+ ]{authorarchive}
+```
+
+Still, for some used document classes (e.g., `acmart`) there are specific
+package options available hat produce an alternative layout.
## Alternative Packages
+
The package [coverpage](https://ctan.org/pkg/coverpage) prepends a
separate PDF page before the first page of the paper. That page
contains the bibliographic information as BibTeX entry. One is forced
@@ -103,7 +188,7 @@
publisher are generated.
The package
-[llncsconf](https://git.logicalhacking.com/adbrucker/llncsconf) is a
+[llncsconf](https://ctan.org/pkg/llncsconf) is a
light-weight alternative to this package. It supports
[LNCS](http://www.springer.com/de/it-informatik/lncs) only. In
comparison to `authorarchive`, it provides support for the additional
@@ -111,14 +196,23 @@
code and links to the author's archive URL.
## Authors
+
Main author: [Achim D. Brucker](http://www.brucker.ch/)
### Contributors
-* [Oliver Kopp](https://github.com/koppor/)
-
+- [Oliver Kopp](https://github.com/koppor/)
## License
+
If not otherwise stated, all sub-projects are dual-licensed under a
-2-clause BSD-style license and/or the LPPL version 1 or any later
-version.
+2-clause BSD-style license and/or the LPPL version 1.3c or (at your
+opinion) any later version.
+
+SPDX-License-Identifier: LPPL-1.3c+ OR BSD-2-Clause
+
+## Master Repository
+
+The master git repository for this project is hosted by the [Software
+Assurance & Security Research Team](https://logicalhacking.com) at
+<https://git.logicalhacking.com/adbrucker/authorarchive>.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/authorarchive.config new/doc/latex/authorarchive/authorarchive.config
--- old/doc/latex/authorarchive/authorarchive.config 2018-02-22 00:33:35.000000000 +0100
+++ new/doc/latex/authorarchive/authorarchive.config 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-\authorsetup{%
- baseurl={https://git.logicalhacking.com/adbrucker/authorarchive/src/master}
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/brucker-authorarchive-2016.bib new/doc/latex/authorarchive/brucker-authorarchive-2016.bib
--- old/doc/latex/authorarchive/brucker-authorarchive-2016.bib 2018-02-22 00:33:35.000000000 +0100
+++ new/doc/latex/authorarchive/brucker-authorarchive-2016.bib 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-
-@InProceedings{ brucker-authorarchive-2016,
- year = 2016,
- page = {42--45},
- title = {A Simple Example of the \texttt{authorarchive} Package for
- \LaTeX},
- author = {Achim D. Brucker},
- booktitle = {Proceedings of the International Conference on
- \LaTeX-Hacks},
- series = {LNCS},
- number = 42
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/brucker-authorarchive-2016.enw new/doc/latex/authorarchive/brucker-authorarchive-2016.enw
--- old/doc/latex/authorarchive/brucker-authorarchive-2016.enw 2018-02-22 00:33:35.000000000 +0100
+++ new/doc/latex/authorarchive/brucker-authorarchive-2016.enw 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-%0 Conference Proceedings
-%T A Simple Example of the authorarchive Package for \LaTeX
-%A Brucker, Achim D.
-%B Proceedings of the International Conference on \LaTeX-Hacks
-%D 2016
-%N 42
-%F brucker-authorarchive-2016
-
Binary files old/doc/latex/authorarchive/brucker-authorarchive-2016.pdf and new/doc/latex/authorarchive/brucker-authorarchive-2016.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/brucker-authorarchive-2016.ris new/doc/latex/authorarchive/brucker-authorarchive-2016.ris
--- old/doc/latex/authorarchive/brucker-authorarchive-2016.ris 2018-02-22 00:33:35.000000000 +0100
+++ new/doc/latex/authorarchive/brucker-authorarchive-2016.ris 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-TY - CONF
-AU - Brucker, Achim D.
-PY - 2016//
-TI - A Simple Example of the authorarchive Package for \LaTeX
-BT - Proceedings of the International Conference on \LaTeX-Hacks
-T3 - LNCS
-IS - 42
-ID - brucker-authorarchive-2016
-ER -
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/brucker-authorarchive-2016.tex new/doc/latex/authorarchive/brucker-authorarchive-2016.tex
--- old/doc/latex/authorarchive/brucker-authorarchive-2016.tex 2018-02-22 00:33:35.000000000 +0100
+++ new/doc/latex/authorarchive/brucker-authorarchive-2016.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,36 +0,0 @@
-\documentclass[final, runningheads, USenglish, pdftex]{llncs}
-\usepackage[T1]{fontenc}
-\usepackage[LNCS,
- key=brucker-authorarchive-2016,
- year=2016,
- publication={Anonymous et al. (eds). Proceedings of the International
- Conference on LaTeX-Hacks, LNCS~42. Some Publisher, 2016.}
- startpage={42},
- doi={00/00_00},
- doiText={0/00\_00},
- nocopyright
- ]{authorarchive}
-
-\usepackage{lipsum}
-
-\title{A Simple Example of the \texttt{authorarchive} Package for \LaTeX}
-\author{\protect\href{http://www.brucker.ch/}{Achim D. Brucker}}
-\institute{Some Departement, Somewhere}
-
-\begin{document}
- \maketitle{}
-
- \begin{abstract}
- \lipsum[1-2]
- \end{abstract}
-
- \section{Introduction}
- \lipsum[1-4]
-
- \section{Contribution}
- \lipsum[5-10]
-
- \section{Conclusion}
- \lipsum[10-12]
-\end{document}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/brucker-authorarchive-2016.word.xml new/doc/latex/authorarchive/brucker-authorarchive-2016.word.xml
--- old/doc/latex/authorarchive/brucker-authorarchive-2016.word.xml 2018-02-22 00:33:35.000000000 +0100
+++ new/doc/latex/authorarchive/brucker-authorarchive-2016.word.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<b:Sources SelectedStyle="" xmlns:b="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" xmlns="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" >
-<b:Source>
-<b:Tag>brucker-authorarchive-2016</b:Tag>
-<b:SourceType>Proceedings</b:SourceType>
-<b:Year>2016</b:Year>
-<b:ConferenceName>Proceedings of the International Conference on \LaTeX-Hacks</b:ConferenceName>
-<b:Issue>42</b:Issue>
-<b:Author>
-<b:Author><b:NameList>
-<b:Person><b:Last>Brucker</b:Last><b:First>Achim</b:First><b:Middle>D</b:Middle></b:Person>
-</b:NameList></b:Author>
-</b:Author>
-<b:Title>A Simple Example of the authorarchive Package for \LaTeX</b:Title>
-</b:Source>
-</b:Sources>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/examples/authorarchive.config new/doc/latex/authorarchive/examples/authorarchive.config
--- old/doc/latex/authorarchive/examples/authorarchive.config 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/examples/authorarchive.config 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,4 @@
+\authorsetup{%
+ baseurl={https://git.logicalhacking.com/adbrucker/authorarchive/src/master/…
+ ,bibtexdir={bib}
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.bib new/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.bib
--- old/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.bib 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.bib 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,12 @@
+
+@InProceedings{ brucker-authorarchive-2016,
+ year = 2016,
+ page = {42--45},
+ title = {A Simple Example of the \texttt{authorarchive} Package for
+ \LaTeX},
+ author = {Achim D. Brucker},
+ booktitle = {Proceedings of the International Conference on
+ \LaTeX-Hacks},
+ series = {LNCS},
+ number = 42
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.enw new/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.enw
--- old/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.enw 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.enw 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,8 @@
+%0 Conference Proceedings
+%T A Simple Example of the authorarchive Package for \LaTeX
+%A Brucker, Achim D.
+%B Proceedings of the International Conference on \LaTeX-Hacks
+%D 2016
+%N 42
+%F brucker-authorarchive-2016
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.ris new/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.ris
--- old/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.ris 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.ris 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,9 @@
+TY - CONF
+AU - Brucker, Achim D.
+PY - 2016//
+TI - A Simple Example of the authorarchive Package for \LaTeX
+BT - Proceedings of the International Conference on \LaTeX-Hacks
+T3 - LNCS
+IS - 42
+ID - brucker-authorarchive-2016
+ER -
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.word.xml new/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.word.xml
--- old/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.word.xml 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.word.xml 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<b:Sources SelectedStyle="" xmlns:b="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" xmlns="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" >
+<b:Source>
+<b:Tag>brucker-authorarchive-2016</b:Tag>
+<b:SourceType>Proceedings</b:SourceType>
+<b:Year>2016</b:Year>
+<b:ConferenceName>Proceedings of the International Conference on \LaTeX-Hacks</b:ConferenceName>
+<b:Issue>42</b:Issue>
+<b:Author>
+<b:Author><b:NameList>
+<b:Person><b:Last>Brucker</b:Last><b:First>Achim</b:First><b:Middle>D</b:Middle></b:Person>
+</b:NameList></b:Author>
+</b:Author>
+<b:Title>A Simple Example of the authorarchive Package for \LaTeX</b:Title>
+</b:Source>
+</b:Sources>
Binary files old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-IEEEtran-nourl.pdf and new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-IEEEtran-nourl.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-IEEEtran-nourl.tex new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-IEEEtran-nourl.tex
--- old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-IEEEtran-nourl.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-IEEEtran-nourl.tex 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,22 @@
+\documentclass[conference]{IEEEtran}
+\usepackage[T1]{fontenc}
+\usepackage[IEEE,
+ key=brucker-authorarchive-2016,
+ year=2016,
+ publication={Anonymous et al.\ (eds). Proceedings of the International
+ Conference on LaTeX-Hacks. Some Publisher},
+ startpage={42},
+ nourl,
+ nocopyright
+ ]{../authorarchive}
+
+\usepackage{lipsum}
+
+\title{A Simple Example of the \texttt{authorarchive} Package for \LaTeX}
+\author{%
+ \IEEEauthorblockN{\protect\href{http://www.brucker.ch/}{Achim D. Brucker}}
+ \IEEEauthorblockA{Some Departement \\ Somewhere}
+}
+
+\input{input/body}
+
Binary files old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-IEEEtran.pdf and new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-IEEEtran.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-IEEEtran.tex new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-IEEEtran.tex
--- old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-IEEEtran.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-IEEEtran.tex 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,23 @@
+\documentclass[conference]{IEEEtran}
+\usepackage[T1]{fontenc}
+\usepackage[IEEE,
+ key=brucker-authorarchive-2016,
+ year=2016,
+ publication={Anonymous et al.\ (eds). Proceedings of the International
+ Conference on LaTeX-Hacks. Some Publisher},
+ startpage={42},
+ doi={00/00_00},
+ doiText={0/00\_00},
+ nocopyright
+ ]{../authorarchive}
+
+\usepackage{lipsum}
+
+\title{A Simple Example of the \texttt{authorarchive} Package for \LaTeX}
+\author{%
+ \IEEEauthorblockN{\protect\href{http://www.brucker.ch/}{Achim D. Brucker}}
+ \IEEEauthorblockA{Some Departement \\ Somewhere}
+}
+
+\input{input/body}
+
Binary files old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-acmart.pdf and new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-acmart.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-acmart.tex new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-acmart.tex
--- old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-acmart.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-acmart.tex 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,27 @@
+\documentclass[sigconf]{acmart}
+\copyrightyear{2017}
+\acmYear{2017}
+\setcopyright{acmlicensed}
+\acmConference[LHack '16]{1st International Conference on \LaTeX-Hacks}{December 4--6, 2017}{Salzburg, Austria}
+\acmBooktitle{LHack '16: The 1st International Conference on \LaTeX-Hacks, December 4--6, 2017, Salzburg, Austria}
+\acmPrice{15.00}
+\acmDOI{10.1145/000000.000000}
+\acmISBN{000-0-0000-0000-0/00/00}
+
+\usepackage[acmart,
+ key=brucker-authorarchive-2016,
+ year=2016,
+ publication={Anonymous et al. (eds). Proceedings of the International
+ Conference on LaTeX-Hacks, ACM, 2016},
+ startpage={42},
+ doi={00/0000},
+ nocopyright
+ ]{../authorarchive}
+
+\usepackage{lipsum}
+
+\title{A Simple Example of the \texttt{authorarchive} Package for \LaTeX}
+\author{\protect\href{http://www.brucker.ch/}{Achim D. Brucker}}
+
+\input{input/body}
+
Binary files old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-entcs.pdf and new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-entcs.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-entcs.tex new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-entcs.tex
--- old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-entcs.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-entcs.tex 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,38 @@
+\documentclass{entcs}
+\usepackage[T1]{fontenc}
+\usepackage[ENTCS,
+ key=brucker-authorarchive-2016,
+ year=2016,
+ publication={Anonymous et al.\ (eds). Proceedings of the International
+ Conference on LaTeX-Hacks, Some Publisher},
+ startpage={42},
+ doi={00/00_00},
+ doiText={0/00\_00},
+ nocopyright
+ ]{../authorarchive}
+
+\usepackage{lipsum}
+
+\def\lastname{A.D. Brucker}
+
+\begin{document}
+ \begin{frontmatter}
+ \title{A Simple Example of the \texttt{authorarchive} Package for \LaTeX}
+ \author{\protect\href{http://www.brucker.ch/}{Achim D. Brucker}}
+
+ \begin{abstract}
+ \lipsum[1-2]
+ \end{abstract}
+
+ \end{frontmatter}
+
+ \section{Introduction}
+ \lipsum[1-4]
+
+ \section{Contribution}
+ \lipsum[5-10]
+
+ \section{Conclusion}
+ \lipsum[11-12]
+\end{document}
+
Binary files old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-llncs-a4.pdf and new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-llncs-a4.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-llncs-a4.tex new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-llncs-a4.tex
--- old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-llncs-a4.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-llncs-a4.tex 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,20 @@
+\documentclass[final, runningheads, USenglish, a4paper, pdftex]{llncs}
+\usepackage[T1]{fontenc}
+\usepackage[LNCS,
+ key=brucker-authorarchive-2016,
+ year=2016,
+ publication={Anonymous et al.\ (eds). Proceedings of the International
+ Conference on LaTeX-Hacks, LNCS~42. Some Publisher},
+ startpage={42},
+ doi={00/00_00},
+ doiText={0/00\_00},
+ nocopyright
+ ]{../authorarchive}
+
+\usepackage{lipsum}
+
+\title{A Simple Example of the \texttt{authorarchive} Package for \LaTeX}
+\author{\protect\href{http://www.brucker.ch/}{Achim D. Brucker}}
+\institute{Some Departement, Somewhere}
+
+\input{input/body}
Binary files old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-llncs.pdf and new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-llncs.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-llncs.tex new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-llncs.tex
--- old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-llncs.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-llncs.tex 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,27 @@
+\documentclass[final, runningheads, USenglish, pdftex]{llncs}
+\usepackage[T1]{fontenc}
+
+% Quickly make vector_iD_icon.pdf available to authorarchive.
+% The global installation is described in ../README.md
+\usepackage{graphicx}
+\graphicspath{{../icons/}}
+
+\usepackage[LNCS,
+ key=brucker-authorarchive-2016,
+ year=2016,
+ publication={Anonymous et al.\ (eds). Proceedings of the International
+ Conference on LaTeX-Hacks, LNCS~42. Some Publisher},
+ startpage={42},
+ doi={00/00_00},
+ doiText={0/00\_00},
+ orcidicon,
+ nocopyright
+ ]{../authorarchive}
+
+\usepackage{lipsum}
+
+\title{A Simple Example of the \texttt{authorarchive} Package for \LaTeX}
+\author{\protect\href{http://www.brucker.ch/}{Achim D. Brucker}\orcidID{0000-0002-6355-1200}}
+\institute{Some Departement, Somewhere}
+
+\input{input/body}
Binary files old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-lni.pdf and new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-lni.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-lni.tex new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-lni.tex
--- old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-lni.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-lni.tex 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,24 @@
+\documentclass[english]{lni}
+\usepackage[T1]{fontenc}
+\usepackage[LNI,
+ key=brucker-authorarchive-2016,
+ year=2016,
+ publication={Anonymous et al.\ (eds). Proceedings of the International
+ Conference on LaTeX-Hacks. Some Publisher},
+ startpage={42},
+ doi={00/00_00},
+ doiText={0/00\_00},
+ nocopyright
+ ]{../authorarchive}
+
+\usepackage{lipsum}
+
+\title{A Simple Example of the \texttt{authorarchive} Package for \LaTeX}
+\author{%
+ \protect\href{http://www.brucker.ch/}{Achim D. Brucker}\\
+ Some Departement\\
+ Somewhere
+}
+
+\input{input/body}
+
Binary files old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-sig-alternate.pdf and new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-sig-alternate.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-sig-alternate.tex new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-sig-alternate.tex
--- old/doc/latex/authorarchive/examples/brucker-authorarchive-2016-sig-alternate.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/examples/brucker-authorarchive-2016-sig-alternate.tex 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,23 @@
+\documentclass[USenglish, pdftex, letterpaper]{sig-alternate}
+\usepackage[ACM,
+ key=brucker-authorarchive-2016,
+ year=2016,
+ publication={Anonymous et al.\ (eds). Proceedings of the International
+ Conference on LaTeX-Hacks, ACM, 2016},
+ startpage={42},
+ doi={00/0000},
+ nocopyright
+ ]{../authorarchive}
+
+\usepackage{lipsum}
+
+\title{A Simple Example of the \texttt{authorarchive} Package for \LaTeX}
+
+\numberofauthors{1}
+\author{
+ \alignauthor
+ \protect\href{http://www.brucker.ch/}{Achim D. Brucker}
+}
+
+\input{input/body}
+
Binary files old/doc/latex/authorarchive/examples/brucker-authorarchive-2016.pdf and new/doc/latex/authorarchive/examples/brucker-authorarchive-2016.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/examples/brucker-authorarchive-2016.tex new/doc/latex/authorarchive/examples/brucker-authorarchive-2016.tex
--- old/doc/latex/authorarchive/examples/brucker-authorarchive-2016.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/examples/brucker-authorarchive-2016.tex 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,18 @@
+\documentclass[a4paper]{article}
+
+\usepackage[
+ key=brucker-authorarchive-2016,
+ year=2016,
+ publication={Anonymous et al.\ (eds). Proceedings of the International
+ Workshop on LaTeX-Hacks},
+ startpage={42},
+ doi={00/0000},
+ nocopyright
+ ]{../authorarchive}
+
+\usepackage{lipsum}
+
+\title{A Simple Example of the \texttt{authorarchive} Package for \LaTeX}
+\author{\protect\href{http://www.brucker.ch/}{Achim D. Brucker}}
+
+\input{input/body}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/examples/input/body.tex new/doc/latex/authorarchive/examples/input/body.tex
--- old/doc/latex/authorarchive/examples/input/body.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/examples/input/body.tex 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,18 @@
+\begin{document}
+ \maketitle{}
+
+ \begin{abstract}
+ \lipsum[1-2]
+ \end{abstract}
+
+ \section{Introduction}
+ \lipsum[1-4]
+
+ \section{Contribution}
+ \lipsum[5-10]
+
+ \section{Conclusion}
+ \lipsum[11-12]
+
+\end{document}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/icons/README.md new/doc/latex/authorarchive/icons/README.md
--- old/doc/latex/authorarchive/icons/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/icons/README.md 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,21 @@
+# Icons for the use with authorarchive
+
+This directory contains icons that might be used together with
+the authorarchive LaTeX style. The use of these icons is
+restricted by the respective copyright holders.
+
+## ORCID iD Icon
+
+The iD icon ([vector_iD_icon.svg](vector_iD_icon.svg)) was obtained in
+SVG format from
+<https://orcid.org/trademark-and-id-display-guidelines> and converted
+to PDF ([vector_iD_icon.pdf](vector_iD_icon.pdf)) using
+[Inkscape](https://inkscape.org). According to the use and (display
+guidelines)[https://orcid.org/trademark-and-id-display-guidelines] of
+the ORCID iD icons, it can be used for displaying ORCID identifiers.
+
+An alternative to including the iD icon as PDF image is the
+[academicons](https://ctan.org/pkg/academicons) package. At the time
+of writing, this package requires xe(la)tex or lua(la)tex while the
+[authorarchive](https://ctan.org/pkg/authorarchive) packages requires
+pdf(la)tex.
Binary files old/doc/latex/authorarchive/icons/vector_iD_icon.pdf and new/doc/latex/authorarchive/icons/vector_iD_icon.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/authorarchive/icons/vector_iD_icon.svg new/doc/latex/authorarchive/icons/vector_iD_icon.svg
--- old/doc/latex/authorarchive/icons/vector_iD_icon.svg 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/authorarchive/icons/vector_iD_icon.svg 2019-06-23 22:57:00.000000000 +0200
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 256 256" style="enable-background:new 0 0 256 256;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#A6CE39;}
+ .st1{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M256,128c0,70.7-57.3,128-128,128C57.3,256,0,198.7,0,128C0,57.3,57.3,0,128,0C198.7,0,256,57.3,256,128z"/>
+<g>
+ <path class="st1" d="M86.3,186.2H70.9V79.1h15.4v48.4V186.2z"/>
+ <path class="st1" d="M108.9,79.1h41.6c39.6,0,57,28.3,57,53.6c0,27.5-21.5,53.6-56.8,53.6h-41.8V79.1z M124.3,172.4h24.5
+ c34.9,0,42.9-26.5,42.9-39.7c0-21.5-13.7-39.7-43.7-39.7h-23.7V172.4z"/>
+ <path class="st1" d="M88.7,56.8c0,5.5-4.5,10.1-10.1,10.1c-5.6,0-10.1-4.6-10.1-10.1c0-5.6,4.5-10.1,10.1-10.1
+ C84.2,46.7,88.7,51.3,88.7,56.8z"/>
+</g>
+</svg>
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/authorarchive.doc.tlpobj new/tlpkg/tlpobj/authorarchive.doc.tlpobj
--- old/tlpkg/tlpobj/authorarchive.doc.tlpobj 2019-02-28 03:16:51.000000000 +0100
+++ new/tlpkg/tlpobj/authorarchive.doc.tlpobj 2020-03-24 01:56:30.000000000 +0100
@@ -1,16 +1,36 @@
name authorarchive.doc
category Package
-revision 46704
+revision 54512
shortdesc doc files of authorarchive
relocated 1
-docfiles size=61
+docfiles size=408
RELOC/doc/latex/authorarchive/CHANGELOG.md
RELOC/doc/latex/authorarchive/LICENSE
RELOC/doc/latex/authorarchive/README.md
- RELOC/doc/latex/authorarchive/authorarchive.config
- RELOC/doc/latex/authorarchive/brucker-authorarchive-2016.bib
- RELOC/doc/latex/authorarchive/brucker-authorarchive-2016.enw
- RELOC/doc/latex/authorarchive/brucker-authorarchive-2016.pdf
- RELOC/doc/latex/authorarchive/brucker-authorarchive-2016.ris
- RELOC/doc/latex/authorarchive/brucker-authorarchive-2016.tex
- RELOC/doc/latex/authorarchive/brucker-authorarchive-2016.word.xml
+ RELOC/doc/latex/authorarchive/examples/authorarchive.config
+ RELOC/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.bib
+ RELOC/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.enw
+ RELOC/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.ris
+ RELOC/doc/latex/authorarchive/examples/bib/brucker-authorarchive-2016.word.xml
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016-IEEEtran-nourl.pdf
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016-IEEEtran-nourl.tex
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016-IEEEtran.pdf
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016-IEEEtran.tex
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016-acmart.pdf
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016-acmart.tex
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016-entcs.pdf
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016-entcs.tex
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016-llncs-a4.pdf
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016-llncs-a4.tex
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016-llncs.pdf
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016-llncs.tex
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016-lni.pdf
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016-lni.tex
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016-sig-alternate.pdf
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016-sig-alternate.tex
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016.pdf
+ RELOC/doc/latex/authorarchive/examples/brucker-authorarchive-2016.tex
+ RELOC/doc/latex/authorarchive/examples/input/body.tex
+ RELOC/doc/latex/authorarchive/icons/README.md
+ RELOC/doc/latex/authorarchive/icons/vector_iD_icon.pdf
+ RELOC/doc/latex/authorarchive/icons/vector_iD_icon.svg
++++++ authorarchive.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/authorarchive/authorarchive.sty new/tex/latex/authorarchive/authorarchive.sty
--- old/tex/latex/authorarchive/authorarchive.sty 2018-02-22 00:33:35.000000000 +0100
+++ new/tex/latex/authorarchive/authorarchive.sty 2019-06-23 22:57:00.000000000 +0200
@@ -1,25 +1,34 @@
-%% Copyright (C) 2008-2018 Achim D. Brucker, https://www.brucker.ch
+%% Copyright (C) 2008-2019 Achim D. Brucker, https://www.brucker.ch
%%
%% License:
%% This program can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License Distributed from CTAN
%% archives in directory macros/latex/base/lppl.txt; either
-%% version 1 of the License, or any later version.
+%% version 1.3c of the License, or (at your option) any later version.
%% OR
%% The 2-clause BSD-style license.
+%%
+%% SPDX-License-Identifier: LPPL-1.3c+ OR BSD-2-Clause
\NeedsTeXFormat{LaTeX2e}\relax
-\ProvidesClass{authorarchive}
- [2018/02/21 v1.0.0%
+\ProvidesPackage{authorarchive}
+ [2019/06/23 v1.1.1%
Self-archiving information for scientific publications.]
%
+\PassOptionsToPackage{hyphens}{url}
+%
\RequirePackage{ifthen}
+\RequirePackage[inline]{enumitem}
\RequirePackage{graphicx}
-\RequirePackage{hyperref}
\RequirePackage{eso-pic}
-\RequirePackage{embedfile}
+\RequirePackage{intopdf}
\RequirePackage{kvoptions}
+\RequirePackage{hyperref}
\RequirePackage{calc}
\RequirePackage{qrcode}
+\RequirePackage{dtk-logos}
+%
+%Better url breaking
+\g@addto@macro{\UrlBreaks}{\UrlOrds}
%
% Option declarations
% -------------------
@@ -27,27 +36,29 @@
family=AA,
prefix=AA@
}
-
+%
\DeclareStringOption[.]{bibtexdir}
\DeclareStringOption[https://duckduckgo.com/?q=]{baseurl}
\DeclareStringOption[.pdf]{suffix}
-\DeclareStringOption[UNKOWN PUBLISHER]{publisher}[]
-\DeclareStringOption[UNKOWN YEAR]{year}[]
+\DeclareStringOption[UNKNOWN PUBLISHER]{publisher}[]
+\DeclareStringOption[UNKNOWN YEAR]{year}[]
\DeclareStringOption[]{key}[]
\DeclareStringOption[]{doi}[]
\DeclareStringOption[]{doiText}[]
\DeclareStringOption[]{publisherurl}[]
-\DeclareStringOption[1]{startpage}[]
+\DeclareStringOption[UNKNOWN START PAGE]{startpage}[]
\DeclareStringOption[UNKNOWN PUBLICATION]{publication}[]
\DeclareBoolOption{ACM}
+\DeclareBoolOption{acmart}
+\DeclareBoolOption{ENTCS}
\DeclareBoolOption{IEEE}
\DeclareBoolOption{LNCS}
\DeclareBoolOption{LNI}
\DeclareBoolOption{nocopyright}
\DeclareBoolOption{nourl}
\DeclareBoolOption{nobib}
-\DeclareBoolOption{ENTCS}
+\DeclareBoolOption{orcidicon}
%\ProcessOptions\relax
@@ -80,39 +91,87 @@
\newlength\AA@y
\newlength\AA@width
+\def\AA@bibBibTeX{\AA@bibtexdir/\AA@key.bib}
+\def\AA@bibBibTeXLong{\AA@bibtexdir/\AA@key.bibtex}
+\def\AA@bibWord{\AA@bibtexdir/\AA@key.word.xml}
+\def\AA@bibEndnote{\AA@bibtexdir/\AA@key.enw}
+\def\AA@bibRIS{\AA@bibtexdir/\AA@key.ris}
+
+\newboolean{AA@bibExists}
+\setboolean{AA@bibExists}{false}
+\IfFileExists{\AA@bibBibTeX}{\setboolean{AA@bibExists}{true}}{}
+\IfFileExists{\AA@bibBibTeXLong}{\setboolean{AA@bibExists}{true}}{}
+\IfFileExists{\AA@bibWord}{\setboolean{AA@bibExists}{true}}{}
+\IfFileExists{\AA@bibEndnote}{\setboolean{AA@bibExists}{true}}{}
+\IfFileExists{\AA@bibRIS}{\setboolean{AA@bibExists}{true}}{}
+
+\setlength\AA@x{1in+\hoffset+\oddsidemargin}
+
\newcommand{\authorcrfont}{\footnotesize}
-\newcommand{\authorat}[1]{\put(100,100){#1}}
+\newcommand{\authorat}[1]{\AtPageUpperLeft{\put(\LenToUnit{\AA(a)x},\LenToUnit{.2cm-\paperheight}){#1}}}
\newcommand{\authorwidth}[1]{\setlength{\AA@width}{#1}}
\setlength{\AA@width}{\textwidth}
-\setcounter{page}{\AA@startpage}
+\def\AA@pageinfo{}
+\ifthenelse{\equal{\AA@startpage}{UNKNOWN START PAGE}}{%
+}{%
+ \setcounter{page}{\AA@startpage}%
+ \def\AA@pageinfo{pp. \thepage--\pageref{\aa@lastpage}, }
+}
+
+
+%%%% sig-alternate.cls
\ifAA@ACM%
- \setkeys{AA}{publisher=ACM}
+ \ifthenelse{\equal{\AA@publisher}{UNKNOWN PUBLISHER}}{%
+ \setkeys{AA}{publisher=ACM}
+ }{}
\global\boilerplate={}
\global\copyrightetc={}
\renewcommand{\conferenceinfo}[2]{}
- \renewcommand{\authorcrfont}{\crnotice}
+ \renewcommand{\authorcrfont}{\scriptsize}
\setlength\AA@x{1in+\hoffset+\oddsidemargin}
- \setlength\AA@y{-\textheight+\topmargin+\headheight} % -\voffset-\topmargin-\headheight-\footskip}
+ \setlength\AA@y{-\textheight+\topmargin+\headheight-\footskip} % -\voffset-\topmargin-\headheight-\footskip}
\renewcommand{\authorat}[1]{\put(\LenToUnit{\AA@x},\LenToUnit{\AA@y}){#1}}
\setlength{\AA@width}{\columnwidth}
\fi
+%
+%%%% acmart.cls
+\ifAA@acmart%
+ \ifthenelse{\equal{\AA@publisher}{UNKNOWN PUBLISHER}}{%
+ \setkeys{AA}{publisher=ACM}
+ }{}
+ \renewcommand{\authorat}[1]{\AtPageUpperLeft{\put(\LenToUnit{\AA(a)x},\LenToUnit{0.2cm-\paperheight}){#1}}}
+ \setlength{\AA@width}{\textwidth}
+\fi
+%
%%%% LNCS
\ifAA@LNCS%
- \setkeys{AA}{publisher=Springer-Verlag}
- \setlength\AA@x{1in+\hoffset+\oddsidemargin}
- \renewcommand{\authorat}[1]{\put(\LenToUnit{\AA@x},27){#1}}
+ \ifAA@orcidicon%
+ \renewcommand{\orcidID}[1]{\href{https://orcid.org/#1}{%
+ \textsuperscript{\,\includegraphics[height=2\fontcharht\font`A]{vector_iD_icon}}}}
+ \else\relax\fi%
+%
+ \ifthenelse{\equal{\AA@publisher}{UNKNOWN PUBLISHER}}{%
+ \setkeys{AA}{publisher=Springer-Verlag}
+ }{}
\renewcommand{\authorcrfont}{\scriptsize}
- \pdfpagesattr{/CropBox [92 65 523 731]}% LNCS page: 152x235 mm
+ \@ifclasswith{llncs}{a4paper}{%
+ \pdfpagesattr{/CropBox [92 114 523 780]}%
+ \renewcommand{\authorat}[1]{\put(\LenToUnit{\AA@x},40){#1}}%
+ }{%
+ \pdfpagesattr{/CropBox [92 65 523 731]}% LNCS page: 152x235 mm
+ \renewcommand{\authorat}[1]{\put(\LenToUnit{\AA@x},23){#1}}
+ }
\setlength{\AA@width}{\textwidth}
\setcounter{tocdepth}{2}
\fi
%
%%%% LNI
\ifAA@LNI%
- \setkeys{AA}{publisher=GI}
- \setlength\AA@x{1in+\hoffset+\oddsidemargin}
+ \ifthenelse{\equal{\AA@publisher}{UNKNOWN PUBLISHER}}{%
+ \setkeys{AA}{publisher=GI}
+ }{}
\renewcommand{\authorat}[1]{\put(\LenToUnit{\AA@x},35){#1}}
\renewcommand{\authorcrfont}{\scriptsize}
\pdfpagesattr{/CropBox [70 65 526.378 748.15]} % TODO
@@ -123,29 +182,20 @@
%%%% ENTCS
\ifAA@ENTCS%
\addtolength{\voffset}{1cm}
- \setkeys{AA}{publisher=Elsevier Science B.~V.}
- \setlength\AA@x{1in+\hoffset+\oddsidemargin}
- \renewcommand{\authorat}[1]{\put(\LenToUnit{\AA@x},-250){#1}}
+ \ifthenelse{\equal{\AA@publisher}{UNKNOWN PUBLISHER}}{%
+ \setkeys{AA}{publisher=Elsevier Science B.~V.}
+ }{}
+ \renewcommand{\authorat}[1]{\put(\LenToUnit{\AA@x},\LenToUnit{-.5cm-\the\ht\AA@authoratBox}){#1}}
\renewcommand{\authorcrfont}{\scriptsize}
- \def\@oddfoot{}
- \def\@evenfoot{}
- \def\firstfootline{}
- \headsep 8pt
- \renewcommand\rightheadline{\ifnum\value{page}=\hypergetpageref{FirstPage}\relax
- \else{\hfil\scriptsize\emph{\lastname / \AA@publication} \hfil {\rmfamily\thepage}}\fi}
- \renewcommand\leftheadline{\scriptsize{\rmfamily\thepage} \hfil \emph{\lastname /
- \AA@publication}\hfil}
- % 467.717 x 680.315 pts
- % \pdfpagesattr{/CropBox [70 110 535 850]}
- \pdfpagesattr{/CropBox [70 95 535 775]}
\setlength{\AA@width}{\textwidth}
\fi
%
%%%% IEEE
\ifAA@IEEE%
- \setkeys{AA}{publisher=IEEE Computer Society}
- \setlength\AA@x{1in+\hoffset+\oddsidemargin}
- \renewcommand{\authorat}[1]{\put(\LenToUnit{\AA@x},12){#1}}
+ \ifthenelse{\equal{\AA@publisher}{UNKNOWN PUBLISHER}}{%
+ \setkeys{AA}{publisher=IEEE}
+ }{}
+ \renewcommand{\authorat}[1]{\put(\LenToUnit{\AA@x},6){#1}}
\renewcommand{\authorcrfont}{\scriptsize}
\setlength{\AA@width}{\textwidth}
\setcounter{tocdepth}{2}
@@ -160,54 +210,35 @@
pdftitle = {\@title},
}
-\ifAA@nobib\relax\else%
- \AtBeginDocument{%
- \IfFileExists{\AA@bibtexdir/\AA@key.bib}{%
- \embedfile[filespec=\AA(a)key.bib,%
- desc={BibTeX entry of this paper.},%
- stringmethod=escape,%
- mimetype=plain/text,%
- ]{\AA@bibtexdir/\AA@key.bib}}{
- \typeout{No file \AA@bibtexdir/\AA@key.bib found. Not embedded reference in BibTeX format.}
- }%
- \IfFileExists{\AA@bibtexdir/\AA@key.enw}{%
- \embedfile[filespec=\AA(a)key.enw,%
- desc={Endnote entry of this paper.},%
- stringmethod=escape,%
- mimetype=plain/text,%
- ]{\AA@bibtexdir/\AA@key.enw}}{
- \typeout{No file \AA@bibtexdir/\AA@key.enw found. Not embedded reference in Endnote format.}
- }%
- \IfFileExists{\AA@bibtexdir/\AA@key.ris}{%
- \embedfile[filespec=\AA(a)key.ris,%
- desc={RIS entry of this paper.},%
- stringmethod=escape,%
- mimetype=plain/text,%
- ]{\AA@bibtexdir/\AA@key.ris}}{
- \typeout{No file \AA@bibtexdir/\AA@key.ris found. Not embedded reference in RIS format.}
- }%
- \IfFileExists{\AA@bibtexdir/\AA@key.word.xml}{%
- \embedfile[filespec=\AA(a)key.word.xml,%
- desc={XML entry of this paper (e.g., for Word 2007 and later).},%
- stringmethod=escape,%
- mimetype=plain/text,%
- ]{\AA@bibtexdir/\AA@key.word.xml}}{
- \typeout{No file \AA@bibtexdir/\AA@key.word.xml found. Not embedded reference for Word 2007 and later.}
- }%
- }%
-\fi
-\AtEndDocument{\label{LastPage}}
+\@ifpackageloaded{totpages}{%
+ \def\aa@lastpage{TotPages}
+}{%
+ \RequirePackage{lastpage}
+ \def\aa@lastpage{LastPage}
+}
+\newsavebox{\AA@authoratBox}
\AddToShipoutPicture*{%
\setlength{\unitlength}{1mm}%
- \authorat{%
- \ifAA@nourl\relax\else%
- \raisebox{.5cm}[.5cm]{\qrcode[hyperlink,height=1.17cm,padding]{\AA@baseurl/\AA@key\AA@suffix}}%
- \fi%
- \authorcrfont\parbox[b]{\AA(a)width-1.4cm}{
+ \savebox{\AA@authoratBox}{%
+ \parbox{1.4cm}{%
+ \bgroup%
+ \normallineskiplimit=0pt%
+ \ifAA@nourl%
+ \ifx\AA@doi\@empty\relax%
+ \else%
+ \qrcode[hyperlink,height=1.17cm,padding]{https://doi.org/\AA@doi}%
+ \fi%
+ \else%
+ \qrcode[hyperlink,height=1.17cm,padding]{\AA@baseurl/\AA@key\AA@suffix}%
+ \fi%
+ \egroup%
+ }%
+ \ifAA@nourl\ifx\AA@doi\@empty\addtolength{\AA@width}{1.4cm}\fi\fi
+ \parbox{\AA(a)width-1.4cm}{\authorcrfont%
\ifAA@LNCS%
- \AA@publication, pp. \thepage--\pageref{LastPage}, \AA(a)year.\\%
- \ifAA@nocopyright\relax\else
+ \AA@publication, \AA@pageinfo \AA@year. %
+ \ifAA@nocopyright\else
\textcopyright~\AA@year~\AA@publisher.
\fi
This is the author's
@@ -222,10 +253,9 @@
\ifx\AA@doi\@empty%
\relax
\else
- The definitive
- version was published with doi:
+ The final publication is available at Springer via
\ifx\AA@doiText\@empty%
- \href{https://doi.org/\AA@doi}{\AA@doi}.
+ \url{https://doi.org/\AA@doi}.
\else
\href{https://doi.org/\AA@doi}{\AA@doiText}.
\fi
@@ -243,7 +273,7 @@
by permission of \AA@publisher{} %
\fi
for your personal use. Not for redistribution. The definitive
- version was published in \emph{\AA@publication}, pp.~\thepage--\pageref{LastPage}, \AA@year%
+ version was published in \emph{\AA@publication}, \AA@pageinfo \AA@year%
\ifx\AA@doi\@empty%
\ifx\AA@publisherurl\@empty%
.%
@@ -258,6 +288,40 @@
\fi
\fi
\fi
+ \ifAA@nobib\relax\else%
+ \ifthenelse{\boolean{AA@bibExists}}{%
+ \hfill
+ \begin{itemize*}[label={}, itemjoin={,}]
+ \IfFileExists{\AA@bibBibTeX}{%
+ \item \attachandlink{\AA@bibBibTeX}[application/x-bibtex]{BibTeX entry of this paper}{\BibTeX}%
+ }{%
+ \IfFileExists{\AA@bibBibTeXLong}{%
+ \item \attachandlink[\AA@key.bib]{\AA@bibBibTeXLong}[application/x-bibtex]{BibTeX entry of this paper}{\BibTeX}%
+ }{%
+ \typeout{No file \AA@bibBibTeX{} (and no \AA@bibBibTeXLong) found. Not embedded reference in BibTeX format.}%
+ }%
+ }%
+ \IfFileExists{\AA@bibWord}{%
+ \item \attachandlink{\AA@bibWord}[application/xml]{XML entry of this paper (e.g., for Word 2007 and later)}{Word}%
+ }{%
+ \typeout{No file \AA@bibWord{} found. Not embedded reference for Word 2007 and later.}%
+ }%
+ \IfFileExists{\AA@bibEndnote}{%
+ \item \attachandlink{\AA@bibEndnote}[application/x-endnote-refer]{Endnote entry of this paper}{EndNote}%
+ }{%
+ \typeout{No file \AA@bibEndnote{} found. Not embedded reference in Endnote format.}%
+ }%
+ \IfFileExists{\AA@bibRIS}{%
+ \item \attachandlink{\AA@bibRIS}[application/x-research-info-systems]{RIS entry of this paper}{RIS}%
+ }{%
+ \typeout{No file \AA@bibRIS{} found. Not embedded reference in RIS format.}%
+ }%
+ \end{itemize*}\\
+ }{%
+ \PackageError{authorarchive}{No bibliographic files found. Specify option 'nobib' if this is intended.}
+ }
+ \fi
}
}
+ \authorat{\raisebox{\the\ht\AA@authoratBox}{\usebox{\AA@authoratBox}}}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/authorarchive.tlpobj new/tlpkg/tlpobj/authorarchive.tlpobj
--- old/tlpkg/tlpobj/authorarchive.tlpobj 2019-02-28 03:16:51.000000000 +0100
+++ new/tlpkg/tlpobj/authorarchive.tlpobj 2020-03-24 01:56:31.000000000 +0100
@@ -1,6 +1,6 @@
name authorarchive
category Package
-revision 46704
+revision 54512
shortdesc Adds self-archiving information to scientific papers
relocated 1
longdesc This is a LaTeX style for producing author self-archiving
@@ -14,9 +14,9 @@
RELOC/tex/latex/authorarchive/authorarchive.sty
catalogue-also coverpage
catalogue-contact-bugs https://github.com/adbrucker/authorarchive/issues
+catalogue-contact-home https://git.logicalhacking.com/adbrucker/authorarchive
catalogue-contact-repository https://github.com/adbrucker/authorarchive
catalogue-ctan /macros/latex/contrib/authorarchive
-catalogue-date 2018-02-26 08:27:22 +0100
-catalogue-license lppl1
+catalogue-license lppl1.3c bsd2
catalogue-topics archival journalpub
-catalogue-version 1.0.0
+catalogue-version 1.1.1
++++++ authorindex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/authorindex/NEWS new/texmf-dist/doc/latex/authorindex/NEWS
--- old/texmf-dist/doc/latex/authorindex/NEWS 2008-08-12 18:57:16.000000000 +0200
+++ new/texmf-dist/doc/latex/authorindex/NEWS 2019-07-27 23:07:02.000000000 +0200
@@ -1,3 +1,7 @@
+27 July 2019:
+
+- The package is no longer maintained.
+
August 2008:
- Describe workaround for bibunits (simplified from Sylwester Arabas's
Binary files old/texmf-dist/doc/latex/authorindex/authorindex.pdf and new/texmf-dist/doc/latex/authorindex/authorindex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/authorindex/authorindex.tex new/texmf-dist/doc/latex/authorindex/authorindex.tex
--- old/texmf-dist/doc/latex/authorindex/authorindex.tex 2008-08-12 18:57:16.000000000 +0200
+++ new/texmf-dist/doc/latex/authorindex/authorindex.tex 2019-07-27 23:07:02.000000000 +0200
@@ -5,12 +5,15 @@
\usepackage[T1]{fontenc}
\usepackage{textcomp}
-\renewcommand{\labelitemi}{\textbullet}
+\usepackage{charter}
+\usepackage[scaled=0.88]{beramono}
+\usepackage{microtype}
-\newcommand{\package}[1]{\textsf{#1}}
+\renewcommand{\labelitemi}{\textbullet}
+\newcommand{\package}[1]{\texttt{#1}}
\newcommand{\authorindex}{\package{authorindex}}
\newcommand{\mkindex}{\package{makeindex}}
-\newcommand{\perl}{\textsf{perl}}
+\newcommand{\perl}{\texttt{perl}}
\newcommand{\file}[1]{\texttt{#1}}
\newcommand{\fnext}[1]{\file{.#1}}
@@ -26,7 +29,7 @@
\renewcommand\descriptionlabel[1]{\hspace\labelsep\normalfont\texttt{#1}}
\title{The \authorindex\ Package}
-\author{Andreas Wettstein\\\texttt{wettstae(a)solnet.ch}}
+\author{Andreas Wettstein\\\texttt{wettstae(a)gmail.com}}
\date{August 2008}
\begin{document}
@@ -706,17 +709,17 @@
\begin{thebibliography}{3}
\bibitem{Patashnik88a}
-\textsc{O.~Patashnik}.
+O.~Patashnik.
\newblock \textit{{\BibTeX ing}} (1988).
\newblock Documentation for general {\BibTeX} users.
\bibitem{Beebe98}
-\textsc{N.~H.~F. Beebe}.
+N.~H.~F. Beebe.
\newblock \textit{{AUTHIDX}: An author/editor indexing package}.
\newblock TUGboat \textbf{19}(1):1001--1007 (1998).
\bibitem{Patashnik88b}
-\textsc{O.~Patashnik}.
+O.~Patashnik.
\newblock \textit{Designing {\BibTeX} styles} (1988).
\newblock The part of \BibTeX's documentation that's not meant for general
users.
@@ -724,3 +727,8 @@
\end{thebibliography}
\end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/authorindex.doc.tlpobj new/tlpkg/tlpobj/authorindex.doc.tlpobj
--- old/tlpkg/tlpobj/authorindex.doc.tlpobj 2019-02-28 03:16:51.000000000 +0100
+++ new/tlpkg/tlpobj/authorindex.doc.tlpobj 2019-07-28 01:54:32.000000000 +0200
@@ -1,8 +1,8 @@
name authorindex.doc
category Package
-revision 26313
+revision 51757
shortdesc doc files of authorindex
-docfiles size=43
+docfiles size=26
texmf-dist/doc/latex/authorindex/COPYING
texmf-dist/doc/latex/authorindex/NEWS
texmf-dist/doc/latex/authorindex/README
++++++ authorindex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/authorindex.tlpobj new/tlpkg/tlpobj/authorindex.tlpobj
--- old/tlpkg/tlpobj/authorindex.tlpobj 2019-02-28 03:16:51.000000000 +0100
+++ new/tlpkg/tlpobj/authorindex.tlpobj 2019-07-28 01:54:32.000000000 +0200
@@ -1,6 +1,6 @@
name authorindex
category Package
-revision 26313
+revision 51757
shortdesc Index citations by author names
longdesc This package allows the user to create an index of all authors
longdesc cited in a LaTeX document. Each author entry in the index
@@ -14,6 +14,6 @@
texmf-dist/scripts/authorindex/authorindex
texmf-dist/tex/latex/authorindex/authorindex.sty
catalogue-ctan /indexing/authorindex
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-07-27 18:23:09 +0200
catalogue-license lppl
catalogue-topics index cite-supp
++++++ auto-pst-pdf-lua.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/auto-pst-pdf-lua.doc.tlpobj new/tlpkg/tlpobj/auto-pst-pdf-lua.doc.tlpobj
--- old/tlpkg/tlpobj/auto-pst-pdf-lua.doc.tlpobj 2019-02-28 03:16:52.000000000 +0100
+++ new/tlpkg/tlpobj/auto-pst-pdf-lua.doc.tlpobj 2020-04-19 18:09:40.000000000 +0200
@@ -1,6 +1,6 @@
name auto-pst-pdf-lua.doc
category Package
-revision 49364
+revision 54779
shortdesc doc files of auto-pst-pdf-lua
relocated 1
docfiles size=20
++++++ auto-pst-pdf-lua.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/auto-pst-pdf-lua.tlpobj new/tlpkg/tlpobj/auto-pst-pdf-lua.tlpobj
--- old/tlpkg/tlpobj/auto-pst-pdf-lua.tlpobj 2019-02-28 03:16:52.000000000 +0100
+++ new/tlpkg/tlpobj/auto-pst-pdf-lua.tlpobj 2020-04-19 18:09:40.000000000 +0200
@@ -1,6 +1,6 @@
name auto-pst-pdf-lua
category Package
-revision 49364
+revision 54779
shortdesc Using LuaLaTeX together with PostScript code
relocated 1
longdesc This package is a slightly modified version of auto-pst-pdf by
@@ -8,10 +8,10 @@
longdesc Niepraschk. The package allows the use of LuaLaTeX together
longdesc with PostScript related code, eg. PSTricks. It depends on
longdesc ifpdf, ifluatex, ifplatform, and xkeyval.
+depend iftex
runfiles size=2
RELOC/tex/latex/auto-pst-pdf-lua/auto-pst-pdf-lua.sty
catalogue-ctan /macros/latex/contrib/auto-pst-pdf-lua
-catalogue-date 2018-12-09 17:51:00 +0100
catalogue-license lppl1.3c
catalogue-topics graphics-epspdf
catalogue-version 0.03
++++++ auto-pst-pdf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/auto-pst-pdf.doc.tlpobj new/tlpkg/tlpobj/auto-pst-pdf.doc.tlpobj
--- old/tlpkg/tlpobj/auto-pst-pdf.doc.tlpobj 2019-02-28 03:16:51.000000000 +0100
+++ new/tlpkg/tlpobj/auto-pst-pdf.doc.tlpobj 2019-11-18 01:54:56.000000000 +0100
@@ -1,6 +1,6 @@
name auto-pst-pdf.doc
category Package
-revision 23723
+revision 52849
shortdesc doc files of auto-pst-pdf
relocated 1
docfiles size=102
++++++ auto-pst-pdf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/auto-pst-pdf.tlpobj new/tlpkg/tlpobj/auto-pst-pdf.tlpobj
--- old/tlpkg/tlpobj/auto-pst-pdf.tlpobj 2019-02-28 03:16:52.000000000 +0100
+++ new/tlpkg/tlpobj/auto-pst-pdf.tlpobj 2019-11-18 01:54:56.000000000 +0100
@@ -1,6 +1,6 @@
name auto-pst-pdf
category Package
-revision 23723
+revision 52849
shortdesc Wrapper for pst-pdf (with some psfrag features)
relocated 1
longdesc The package uses --shell-escape to execute pst-pdf when
@@ -10,6 +10,9 @@
longdesc that Matlab figures via laprint, Mathematica figures via
longdesc MathPSfrag, and regular psfrag figures can all be input
longdesc consistently and easily.
+depend ifplatform
+depend iftex
+depend xkeyval
runfiles size=2
RELOC/tex/latex/auto-pst-pdf/auto-pst-pdf.sty
catalogue-ctan /macros/latex/contrib/auto-pst-pdf
++++++ autosp.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/autosp/README new/texmf-dist/doc/generic/autosp/README
--- old/texmf-dist/doc/generic/autosp/README 2019-01-09 23:56:43.000000000 +0100
+++ new/texmf-dist/doc/generic/autosp/README 2020-03-11 22:18:14.000000000 +0100
@@ -1,5 +1,5 @@
This is the README for the autosp package,
-version 2019-01-08.
+version 2020-03-11.
autosp is a preprocessor that generates note-spacing
commands for MusiXTeX scores. It simplifies the creation
@@ -64,6 +64,8 @@
and dots) is handled by expanding the sequence into a
sequence of individual note commands.
+autosp scales notes by the relevant instrument-size value.
+
Limitations
Appoggiaturas and grace notes are recognized by the use of
Binary files old/texmf-dist/doc/generic/autosp/barsant2.pdf and new/texmf-dist/doc/generic/autosp/barsant2.pdf differ
Binary files old/texmf-dist/doc/generic/autosp/geminiani.pdf and new/texmf-dist/doc/generic/autosp/geminiani.pdf differ
Binary files old/texmf-dist/doc/generic/autosp/kinder2.pdf and new/texmf-dist/doc/generic/autosp/kinder2.pdf differ
Binary files old/texmf-dist/doc/generic/autosp/quod2.pdf and new/texmf-dist/doc/generic/autosp/quod2.pdf differ
Binary files old/texmf-dist/doc/generic/autosp/quod2A.pdf and new/texmf-dist/doc/generic/autosp/quod2A.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/autosp.1 new/texmf-dist/doc/man/man1/autosp.1
--- old/texmf-dist/doc/man/man1/autosp.1 2019-01-09 23:56:43.000000000 +0100
+++ new/texmf-dist/doc/man/man1/autosp.1 2020-03-04 00:10:39.000000000 +0100
@@ -1,5 +1,5 @@
.\" This manpage is licensed under the GNU Public License
-.TH AUTOSP 1 2018-02-14 "" ""
+.TH AUTOSP 1 2019-12-22 "" ""
.SH NAME
autosp \- preprocessor to generate note-spacing commands for MusiXTeX scores
@@ -185,6 +185,9 @@
by expanding the sequence
into a sequence of individual note commands.
+
+.B autosp
+scales notes by the relevant instrument-size value.
.SH LIMITATIONS
Binary files old/texmf-dist/doc/man/man1/autosp.man1.pdf and new/texmf-dist/doc/man/man1/autosp.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/tex2aspc.man1.pdf and new/texmf-dist/doc/man/man1/tex2aspc.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/autosp.doc.tlpobj new/tlpkg/tlpobj/autosp.doc.tlpobj
--- old/tlpkg/tlpobj/autosp.doc.tlpobj 2019-03-27 02:24:02.000000000 +0100
+++ new/tlpkg/tlpobj/autosp.doc.tlpobj 2020-03-12 01:56:12.000000000 +0100
@@ -1,6 +1,6 @@
name autosp.doc
category Package
-revision 50602
+revision 54240
shortdesc doc files of autosp
docfiles size=106
texmf-dist/doc/generic/autosp/README
++++++ awesomebox.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/awesomebox/README.md new/doc/latex/awesomebox/README.md
--- old/doc/latex/awesomebox/README.md 2019-04-04 22:54:25.000000000 +0200
+++ new/doc/latex/awesomebox/README.md 2019-07-30 22:59:04.000000000 +0200
@@ -16,9 +16,10 @@
The following LaTeX packages are required (they should be already
included in your LaTeX distribution):
+- `array`
- `fontawesome5`
+- `ifthen`
- `xcolor`
-- `array`
- `xparse`
Installation
@@ -30,6 +31,25 @@
For system wide installation, please refer to the documentation of your
LaTeX distribution.
+Compatibility
+=============
+
+This repository also hosts the package `awesomebox-compat`, which
+depends on the `fontawesome` package, instead of `fontawesome5`. Apart
+from that, it has the exact same features set.
+
+This can be usefull for you if you want to use it with an old LaTeX
+distribution, which does not embed `fontawesome5` yet (like Overleaf
+system). To use it, download the file `awesomebox-compat.sty` in this
+repository, put it near your tex files and just replace your
+`\usepackage{awesomebox}` instruction by
+`\usepackage{awesomebox-compat}`.
+
+Be aware that icon names changes between FontAwesome and FontAwesome5
+and thus using the compatibility package may break your current files.
+FontAwesome also requires you to use XeLaTeX or LuaTeX: you cannot use
+PDFLaTeX with the compatibility package.
+
License
=======
Binary files old/doc/latex/awesomebox/awesomebox.pdf and new/doc/latex/awesomebox/awesomebox.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/awesomebox/awesomebox.tex new/doc/latex/awesomebox/awesomebox.tex
--- old/doc/latex/awesomebox/awesomebox.tex 2019-04-04 22:54:25.000000000 +0200
+++ new/doc/latex/awesomebox/awesomebox.tex 2019-07-30 22:59:04.000000000 +0200
@@ -19,7 +19,14 @@
%\usepackage[T1]{fontenc}
%\usepackage[english,frenchb]{babel}
-\usepackage[vmargin=2cm,hmargin=3cm,includeheadfoot=true]{geometry}
+\usepackage{geometry}
+\geometry{
+ xetex,
+ vmargin=2cm,
+ hmargin=3cm,
+ includeheadfoot,
+ nomarginpar
+}
\linespread{1.2}
\newcommand{\cf}[1]{(\emph{cf.} section \ref{#1}, %
@@ -29,7 +36,7 @@
\newcommand{\colophon}{
~\vfill
\begin{center}
- \scriptsize Prepared with \faHeart{} from Nantes,
+ \scriptsize Handcrafted with \faHeart{} from Nantes,
France\\
Awesome Box is released under the
\hrefcolor{http://www.wtfpl.net/txt/copying/}{WTFPL}. A copy of this
@@ -38,6 +45,10 @@
\end{center}
}
+\title{Awesome Boxes}
+\author{Étienne Deparis}
+\date{2019-07-27 v0.6}
+
% configuration de la transformation en PDF
\usepackage[pdfusetitle]{hyperref}
\hypersetup{
@@ -50,10 +61,6 @@
\newcommand\hrefcolor[2]{\textcolor{magenta}{\href{#1}{#2}}}
-\title{Awesome Boxes}
-\author{Étienne Deparis}
-\date{2019-04-04 v0.5}
-
\begin{document}
\maketitle
@@ -155,7 +162,6 @@
\end{noteblock}
\end{verbatim}
-
For the exactly same rendering:
\begin{noteblock}
@@ -188,7 +194,7 @@
command:
\begin{center}
-\verb!\awesomebox[vrulecolor][hrule][title]{vrulewidth}{icon}{iconcolor}{your text content}!
+\verb!\awesomebox[vrulecolor][hrule][title]{vrulewidth}{icon}{iconcolor}{content}!
\end{center}
Here are some examples of custom boxes:
@@ -205,6 +211,8 @@
dictum felis. Pellentesque tortor lacus, semper et neque vitae,
egestas commodo nisl.}
+\clearpage
+
\begin{center}
\verb!\awesomebox{0pt}{\faCogs}{black}{Lorem ipsum…}!
\end{center}
@@ -229,8 +237,9 @@
dictum felis. Pellentesque tortor lacus, semper et neque vitae,
egestas commodo nisl.}
+\vspace{2mm}
\begin{center}
-\verb!\awesomebox[white][\abShortLine]{0pt}{\faGrinBeam[regular]}{black}{Lorem ipsum…}!
+\small\verb!\awesomebox[white][\abShortLine]{0pt}{\faGrinBeam[regular]}{black}{Lorem ipsum…}!
\end{center}
\awesomebox[white][\abShortLine]{0pt}{\faGrinBeam[regular]}{black}{%
@@ -241,10 +250,9 @@
dictum felis. Pellentesque tortor lacus, semper et neque vitae,
egestas commodo nisl.}
-\clearpage
-
+\vspace{2mm}
\begin{center}
-\verb!\awesomebox[white][\abLongLine][\textbf{Watch out}]{0pt}{\faBomb}{black}{Lorem ipsum…}!
+\small\verb!\awesomebox[white][\abLongLine][\textbf{Watch out}]{0pt}{\faBomb}{black}{Lorem…}!
\end{center}
\awesomebox[white][\abLongLine][\textbf{Watch out}]{0pt}{\faBomb}{black}{%
@@ -291,40 +299,57 @@
\section{Other options}
-Finally, you can also modify some internal options in order to modify
-globally your awesome boxes (either the default ones or your new ones).
+Some internal options can be customized, in order to globally modify
+your awesome boxes (either the default ones or your new ones).
\subsection{Left margin}
-The left margin is the space left before the vertical rule to display
-the icon. You can change it with the following command
-(\verb!0.08\linewidth! is the default one):\\
-\verb!\setlength{\aweboxleftmargin}{0.08\linewidth}!.
+The left margin is the space left to display the icon before the
+vertical rule. You can change it with the following command
+(\verb!0.12\linewidth! is the default one):\\
+\verb!\setlength{\aweboxleftmargin}{0.12\linewidth}!.
+
+You must declare you new length \emph{after} the \verb!\begin{document}!
+instruction, or your custom length will be overriden by the default
+one.
\subsection{Content width}
The content width is the space used to insert the body of your
admonition block. You can change it with the following command
-(\verb!0.92\linewidth! is the default one):\\
-\verb!\setlength{\aweboxcontentwidth}{0.92\linewidth}!.
+(\verb!0.88\linewidth! is the default one):\\
+\verb!\setlength{\aweboxcontentwidth}{0.88\linewidth}!.
+
+You must declare you new length \emph{after} the \verb!\begin{document}!
+instruction, or your custom length will be overriden by the default
+one.
\subsection{Vertical skip}
This space is used before and after the awesome box. You can change it
with (5mm is the default): \verb!\setlength{\aweboxvskip}{5mm}!.
+You can put your new length either in the header or in the body of your
+document.
+
\subsection{Sign raise}
This length is used to raise (or lower) the left icon. Its default value
is -5mm and you can change it with:
\verb!\setlength{\aweboxsignraise}{-5mm}!.
+You can put your new length either in the header or in the body of your
+document.
+
\subsection{Vertical rule width}
This width is used for the vertical rule of our four default boxes. Its
default value is 2pt and you can change it with:
\verb!\setlength{\aweboxrulewidth}{2pt}!.
+You can put your new length either in the header or in the body of your
+document.
+
\subsection{Vertical rule default color}
The vertical rule color is an optional argument passed to the commands
@@ -340,7 +365,7 @@
\begin{verbatim}
\begin{itemize}
\item My first item
-\item My second item with \notebox{A note box!}
+\item Lorem ipsum… \notebox{Fusce aliquet…}
\item Last and finally
\end{itemize}
\end{verbatim}
@@ -349,7 +374,11 @@
\begin{itemize}
\item My first item
-\item My second item with \notebox{A note box!}
+\item Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam
+ aliquet libero quis lectus elementum fermentum. \notebox{Fusce aliquet
+ augue sapien, non efficitur mi ornare sed. Morbi at dictum
+ felis. Pellentesque tortor lacus, semper et neque vitae, egestas
+ commodo nisl.}
\item Last and finally
\end{itemize}
@@ -370,16 +399,12 @@
\begin{importantblock}
\begin{itemize}
- \vspace{-5mm}
\item My first item
\item My second item with \notebox{A note box!}
\item Last and finally
- \vspace{-5mm}
\end{itemize}
\end{importantblock}
-\clearpage
-
Or with a more complex example with minted environment:
\begin{verbatim}
@@ -402,9 +427,28 @@
\section{Breaking changes}
-Version 0.4 of this package introduced a way to customize the rule
-color. Thus, the commands and environments arguments have been
-reorganized to be in a more logical order.
+\subsection{Version 0.6}
+
+This version improved a lot block components rendering. Historically,
+awesome box used fixed length to display icon and content. This leads to
+admonition block to overflow or to be thinner than paragraphs around.
+
+Please note that we change default block components width in purpose. It
+used to be \verb!0.08\linewidth! for the margin and
+\verb!0.92\linewidth! for the content. It is now \verb!0.12\linewidth!
+for the margin and \verb!0.88\linewidth! for the content.
+
+We now compute the default \verb!\aweboxleftmargin! and
+\verb!\aweboxcontentwidth! value in a \verb!\AtBeginDocument!
+command. Thus, to avoid your custom lengths to be overriden by the
+default ones, you must declare them \emph{after} the
+\verb!\begin{document}! instruction.
+
+\subsection{Version 0.4}
+
+This version introduced a way to customize the rule color. Thus, the
+commands and environments arguments have been reorganized to be in a
+more logical order.
Historically, the \verb!\awesomebox! command used the following syntax:
@@ -413,7 +457,7 @@
\end{center}
This syntax now leads to compiling errors, as you must now write it
-as the following example shows you (and as explained in the Section
+as the following example shows you (and as explained in the section
\ref{sec:howtoown} "\nameref{sec:howtoown}"), to avoid an alternate
declaration of rule and icon options:
@@ -422,11 +466,11 @@
\end{center}
If you only use the provided boxes and environments (the
-\verb!\notebox!, \verb!\tipbox!, \verb!\warningbox!, \verb!\cautionbox!,
-and \verb!\importantbox! or the \texttt{noteblock}, \texttt{tipblock},
-\texttt{cautionblock}, \texttt{warningblock}, \texttt{importantblock}
-environment) you are not affected by this change and your documents will
-work without any change.
+\verb!\notebox!, \verb!\tipbox!, \texttt{\textbackslash warn\-ing\-box},
+\verb!\cautionbox!, \verb!\importantbox! commands or the
+\texttt{noteblock}, \texttt{tipblock}, \texttt{caution\-block},
+\texttt{warningblock}, \texttt{importantblock} environments) you are not
+affected by this change and your documents will work without any change.
\colophon
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/awesomebox.doc.tlpobj new/tlpkg/tlpobj/awesomebox.doc.tlpobj
--- old/tlpkg/tlpobj/awesomebox.doc.tlpobj 2019-04-06 23:32:27.000000000 +0200
+++ new/tlpkg/tlpobj/awesomebox.doc.tlpobj 2019-07-31 01:54:22.000000000 +0200
@@ -1,6 +1,6 @@
name awesomebox.doc
category Package
-revision 50757
+revision 51776
shortdesc doc files of awesomebox
relocated 1
docfiles size=19
++++++ awesomebox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/awesomebox/awesomebox.sty new/tex/latex/awesomebox/awesomebox.sty
--- old/tex/latex/awesomebox/awesomebox.sty 2019-04-04 22:54:25.000000000 +0200
+++ new/tex/latex/awesomebox/awesomebox.sty 2019-07-30 22:59:04.000000000 +0200
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{awesomebox}[2019/04/04 v0.5]
+\ProvidesPackage{awesomebox}[2019/07/27 v0.6]
% Awesome Box has been written by Étienne Deparis and is released under
% the WTFPL (http://www.wtfpl.net/txt/copying/).
@@ -15,6 +15,8 @@
% * Custom vertical rule color
% v0.5: Georger Araújo https://github.com/georgerbr
% * Horizontal rules at top and bottom, title
+% v0.6: Vincent Goulet https://github.com/vigou3
+% * Improving table cell rendering
% https://ctan.org/pkg/fontawesome5
\RequirePackage{fontawesome5}
@@ -42,10 +44,9 @@
\definecolor{abimportant}{RGB}{188,0,0}
\definecolor{abvrulecolor}{RGB}{221,221,216}
+% Customizable length
\newlength{\aweboxleftmargin}
-\setlength{\aweboxleftmargin}{0.08\linewidth}
\newlength{\aweboxcontentwidth}
-\setlength{\aweboxcontentwidth}{0.92\linewidth}
\newlength{\aweboxvskip}
\setlength{\aweboxvskip}{5mm}
\newlength{\aweboxsignraise}
@@ -53,6 +54,10 @@
\newlength{\aweboxrulewidth}
\setlength{\aweboxrulewidth}{2pt}
+\AtBeginDocument{%
+ \setlength{\aweboxleftmargin}{0.12\linewidth}%
+ \setlength{\aweboxcontentwidth}{0.88\linewidth}}
+
\RequirePackage{array}
% To allow for more than one optional argument
@@ -62,17 +67,35 @@
\def\abShortLine{\cline{2-2}}
\def\abLongLine{\hline}
+% The following commands are used to adjust and restore awesome boxes
+% content width in respect to the current environment (e.g. lists).
+\RequirePackage{ifthen}
+\newlength{\aweboxlinewidthvar}
+\setlength{\aweboxlinewidthvar}{0pt}
+\newlength{\aweboxlinewidthref}
+\AtBeginDocument{\setlength{\aweboxlinewidthref}{\linewidth}}
+\newcommand{\awesomeboxadjustcontentwidth}{%
+ \ifthenelse{\lengthtest{\linewidth=\aweboxlinewidthref}}{}{%
+ \setlength{\aweboxlinewidthvar}{\dimexpr\aweboxlinewidthref-\linewidth}%
+ \setlength{\aweboxcontentwidth}{\dimexpr\aweboxcontentwidth-\aweboxlinewidthvar}}}%
+ %\aweboxdebug}}
+\newcommand{\awesomeboxrestorecontentwidth}{%
+ \ifthenelse{\lengthtest{\linewidth=\textwidth}}{}{%
+ \setlength{\aweboxcontentwidth}{\dimexpr\aweboxcontentwidth+\aweboxlinewidthvar}%
+ \setlength{\aweboxlinewidthvar}{0pt}}}
+
% Commands API
% \awesomebox[vrulecolor][hrule][title]{vrulewidth}{icon}{iconcolor}{content}
\NewDocumentCommand \awesomebox { O{abvrulecolor} O{} o m m m +m }{%
- \vspace{\aweboxvskip}\noindent
+ {\vskip \aweboxvskip}\noindent\awesomeboxadjustcontentwidth%
\begin{tabular}%
- {p{\aweboxleftmargin}!{\color{#1}\vrule width #4}p{\aweboxcontentwidth}}
+ {@{}>{\centering\arraybackslash}%
+ p{\aweboxleftmargin}@{}!{\color{#1}\vrule width #4}%
+ p{\dimexpr\aweboxcontentwidth-#4-\tabcolsep}@{}}
\IfValueTF {#3}
{ & #3 \\ #2 \raisebox{\aweboxsignraise}{\textcolor{#6}{\Huge#5}} & #7 \\ #2}
{ #2 \raisebox{\aweboxsignraise}{\textcolor{#6}{\Huge#5}} & #7 \\ #2}
- \end{tabular}
- \vspace{\aweboxvskip}}
+ \end{tabular}{\vskip \aweboxvskip}\awesomeboxrestorecontentwidth}
\newcommand{\notebox}[1]{%
\awesomebox[abnote]{\aweboxrulewidth}{\abIconInfoCircle}{abnote}{#1}}
@@ -94,13 +117,15 @@
% content
% \end{awesomeblock}
\NewDocumentEnvironment{awesomeblock}{ O{abvrulecolor} O{} o m m m }
-{\vspace{\aweboxvskip}\noindent
+{{\vskip \aweboxvskip}\noindent\awesomeboxadjustcontentwidth%
\begin{tabular}%
- {p{\aweboxleftmargin}!{\color{#1}\vrule width #4}p{\aweboxcontentwidth}}
+ {@{}>{\centering\arraybackslash}%
+ p{\aweboxleftmargin}@{}!{\color{#1}\vrule width #4}%
+ p{\dimexpr\aweboxcontentwidth-#4-\tabcolsep}@{}}
\IfValueTF {#3}
{ & #3 \\ #2 \raisebox{\aweboxsignraise}{\textcolor{#6}{\Huge#5}} &}
{ #2 \raisebox{\aweboxsignraise}{\textcolor{#6}{\Huge#5}} &}}
-{\\ #2 \end{tabular}\vspace{\aweboxvskip}}
+{\\ #2 \end{tabular}{\vskip \aweboxvskip}\awesomeboxrestorecontentwidth}
\newenvironment{noteblock}%
{\begin{awesomeblock}[abnote]{\aweboxrulewidth}{\abIconInfoCircle}{abnote}}
@@ -122,4 +147,13 @@
{\begin{awesomeblock}[abimportant]{\aweboxrulewidth}{\abIconExclamationCircle}{abimportant}}
{\end{awesomeblock}}
+\newcommand{\aweboxdebug}{%
+ \typeout{**************************}%
+ \typeout{Line width: \the\linewidth}%
+ \typeout{Reference line width: \the\aweboxlinewidthref\space(text width: \the\textwidth)}%
+ \typeout{Width difference: \the\aweboxlinewidthvar}%
+ \typeout{Margin width: \the\aweboxleftmargin}%
+ \typeout{Content width: \the\aweboxcontentwidth}%
+ \typeout{**************************}}
+
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/awesomebox.tlpobj new/tlpkg/tlpobj/awesomebox.tlpobj
--- old/tlpkg/tlpobj/awesomebox.tlpobj 2019-04-06 23:32:27.000000000 +0200
+++ new/tlpkg/tlpobj/awesomebox.tlpobj 2019-07-31 01:54:22.000000000 +0200
@@ -1,6 +1,6 @@
name awesomebox
category Package
-revision 50757
+revision 51776
shortdesc Draw admonition blocks in your documents, illustrated with FontAwesome icons
relocated 1
longdesc Awesome Boxes is all about drawing admonition blocks around
@@ -13,7 +13,7 @@
catalogue-contact-home https://git.deparis.io/latex-awesomebox/about/
catalogue-contact-repository https://git.deparis.io/latex-awesomebox/
catalogue-ctan /graphics/awesomebox
-catalogue-date 2019-04-04 10:52:14 +0200
+catalogue-date 2019-07-29 21:17:07 +0200
catalogue-license other-free
catalogue-topics boxing
-catalogue-version 0.5
+catalogue-version 0.6
++++++ axodraw2.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/axodraw2/ChangeLog new/texmf-dist/doc/latex/axodraw2/ChangeLog
--- old/texmf-dist/doc/latex/axodraw2/ChangeLog 2018-02-21 00:38:47.000000000 +0100
+++ new/texmf-dist/doc/latex/axodraw2/ChangeLog 2020-03-04 00:11:02.000000000 +0100
@@ -30,3 +30,8 @@
axodraw2 package [v. 2.1.1 2018/02/20]
axodraw2.sty [v. 2.1.1 2018/02/15]
axohelp [v. 1.2 2018/02/20]
+2019/07/30
+ axohelp: Exit code on error is 1, not -1 (unsigned is more OS-independent)
+ axohelp: Clean up CleanupOutput subroutine
+ axohelp: Fix bug in use of identification line
+ axohelp: Fix stack overflow bugs in subroutine DoOneObject
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/axodraw2/README new/texmf-dist/doc/latex/axodraw2/README
--- old/texmf-dist/doc/latex/axodraw2/README 2018-09-13 22:58:57.000000000 +0200
+++ new/texmf-dist/doc/latex/axodraw2/README 2020-03-04 00:11:02.000000000 +0100
@@ -1,8 +1,8 @@
-Axodraw2 2.1.1a 2018/09/12
+Axodraw2 2.1.1b 2019/09/02
==========================
axodraw2.sty version is v2.1.1 2018/02/15
-axohelp.c version is 1.2 2018/02/14
+axohelp.c version is 1.3 2019/08/30
Axodraw2 is a package that defines macros for drawing Feynman graphs
in LaTeX documents.
@@ -30,7 +30,6 @@
axodraw2-man.tex Source for documentation
example.tex Example latex file for use of axodraw2
axohelp.c Source code of axohelp
- axohelp.exe MS-Windows executable for axohelp
axohelp.1 Man page for axohelp
axohelp.test Script for testing axohelp
test.ax1 Input file for test
@@ -49,7 +48,7 @@
Authors, copyright, license
---------------------------
-(C) 1994-2018 John Collins (jcc8 at psu dot edu) and Jos Vermaseren
+(C) 1994-2019 John Collins (jcc8 at psu dot edu) and Jos Vermaseren
(t68 at nikhef dot nl)
Axodraw2 is free software: you can redistribute it and/or modify it
Binary files old/texmf-dist/doc/latex/axodraw2/axodraw2-man.pdf and new/texmf-dist/doc/latex/axodraw2/axodraw2-man.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/axodraw2/axodraw2-man.tex new/texmf-dist/doc/latex/axodraw2/axodraw2-man.tex
--- old/texmf-dist/doc/latex/axodraw2/axodraw2-man.tex 2018-02-21 00:38:47.000000000 +0100
+++ new/texmf-dist/doc/latex/axodraw2/axodraw2-man.tex 2020-03-04 00:11:02.000000000 +0100
@@ -76,7 +76,7 @@
Science Park 105, 1098 XG Amsterdam, The Netherlands} \\
\texttt{t68 at nikhef dot nl} \\
\vspace{1.0cm}
-(15 February 2018)
+(2 September 2019)
\end{center}
\vspace{5mm}
@@ -397,22 +397,18 @@
At the moment that this document was updated (January 2018), axodraw2
was part of both the main \TeX{} distributions, TeXLive and MiKTeX.
The easiest way to install axodraw2 is therefore from the package
-manager of your \TeX{} distribution. (There is one complication
-concerning the \program{axohelp} program --- see below.)
+manager of your \TeX{} distribution.
You can also obtain axodraw2 from CTAN at
\url{http://ctan.org/pkg/axodraw2}, and install it manually, following
the instructions in Sec.\ \ref{sec:manual.install} below.
\paragraph{\program{axohelp} in TeXLive}
-In TeXLive 2017, a binary executable for the \program{axohelp} was not
-provided, even though the rest of the axodraw2 package was provided.
-Thus you could use axodraw2 with the \program{latex} but not with
-\program{pdflatex} unless you compiled and installed the program
-\program{axohelp} yourself following the instructions below. This is
-planned to be changed in TeXLive 2018, when \program{axohelp} should
-be provided as part of the distribution when the package axodraw2 is
-installed from the package manager.
+In TeXLive 2018 and later, a binary executable for the
+\program{axohelp} is provided, as part of the \program{axodraw2}
+package. So \program{axohelp} is available provided that the
+\program{axodraw2} package is installed..
+
\paragraph{\program{axohelp} in MiKTeX}
The axodraw2 package including an executable \program{axohelp.exe} was
@@ -454,44 +450,49 @@
supplemented by running the relevant commands with the \program{sudo}
program.
-But note that if you later install the axodraw2 package from the
-package manager of you \TeX{} distribution, it's a good idea to delete
-the files you installed manually. Otherwise when you use axodraw2 in
-a document, then the wrong version of \file{axodraw2.sty} may get
-used. This is a particularly important issue after possible future
-updates to axodraw2 get installed by the package manager.
+If you later install the axodraw2 package from the package manager of
+your \TeX{} distribution, it's a good idea to delete the files you
+installed manually. Otherwise when you use axodraw2 in a document,
+then the wrong version of \file{axodraw2.sty} may get used. This is a
+particularly important issue after possible future updates to axodraw2
+get installed by the package manager.
%--
\subsubsection{Helper program \program{axohelp}}
\label{sec:axohelp}
-If you wish to use axodraw2 with \program{pdflatex}, \program{lualatex},
-or \program{xelatex}., then you need to install the \program{axohelp}
-program.
-
-On a Unix-like system (e.g., linux or OS-X), you first need to compile
-the program by a C compiler. An appropriate shell command to do this
-is
+If you wish to use axodraw2 with \program{pdflatex},
+\program{lualatex}, or \program{xelatex}, then you need to install the
+\program{axohelp} program. \emph{(It is useful to reiterate here that
+ the standard distributions of \TeX{} currently supply the
+ \program{axohelp} program. So the steps described here are only
+ necessary if for some reason you wish to do a manual installation.
+ One possible reason is to use a recent update of \program{axohelp},
+ since TeXLive normally only supplies updated versions of binary
+ executable files with the initial release of one of TeXLive's yearly
+ versions.)}
+
+To install \program{axohelp} manually, you will first need to compile
+the program by a C compiler. Under a Unix-like operating system
+(linux or macOS) an appropriate shell command is
\begin{verbatim}
cc -o axohelp -O3 axohelp.c -lm
\end{verbatim}
(Note that this is a C compiler, \emph{not} a C++ compiler.) Most linux
systems have the program \program{cc} already installed. This also applies to
-OS-X at versions below 10.7. But on OS-X version 10.7 and higher, you
+macOS(OS-X) at versions below 10.7. But on macOS version 10.7 and higher, you
will need to install a compiler, which can be done by installing XCode
and the associated command-line utilities. If you have the GNU
compilers installed, you might need to use the command \program{gcc}
instead of \program{cc}.
-For Microsoft Windows, if you do not have a C compiler available, you
-can use the Windows binary \file{axohelp.exe} we have provided. It
-was compiled on Windows 10, and should work with at least that version
-of Windows.
-
-In any case once you have the executable (named \program{axohelp} on
-unix-like systems, or \program{axohelp.exe} on a Microsoft system), put
-it in a directory where it will be found when you run programs from
-the command line.
+For Microsoft Windows, you will need to have installed a C compiler,
+and use it to compile \file{axohelp.c}.
+
+Once you have the executable (named \program{axohelp} on Unix-like
+systems, or \program{axohelp.exe} on a Microsoft system), put it in a
+directory where it will be found when you run programs from the
+command line.
%--
Binary files old/texmf-dist/doc/man/man1/axohelp.man1.pdf and new/texmf-dist/doc/man/man1/axohelp.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/axodraw2.doc.tlpobj new/tlpkg/tlpobj/axodraw2.doc.tlpobj
--- old/tlpkg/tlpobj/axodraw2.doc.tlpobj 2019-03-27 02:24:02.000000000 +0100
+++ new/tlpkg/tlpobj/axodraw2.doc.tlpobj 2020-03-04 23:49:26.000000000 +0100
@@ -1,6 +1,6 @@
name axodraw2.doc
category Package
-revision 50602
+revision 54055
shortdesc doc files of axodraw2
docfiles size=167
texmf-dist/doc/latex/axodraw2/AUTHORS
++++++ axodraw2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/latex/axodraw2/axodraw2.sty new/texmf-dist/tex/latex/axodraw2/axodraw2.sty
--- old/texmf-dist/tex/latex/axodraw2/axodraw2.sty 2018-02-21 00:38:47.000000000 +0100
+++ new/texmf-dist/tex/latex/axodraw2/axodraw2.sty 2019-09-08 23:45:40.000000000 +0200
@@ -69,7 +69,7 @@
%
% #] About folds :
%
-\ProvidesPackage{axodraw2}[2018/02/15 v2.1.1]
+\ProvidesPackage{axodraw2}[2018/10/10 v2.1.2]
%
% axodraw.sty file, both for .tex -> .dvi -> .ps and for .tex -> .pdf
%
@@ -3127,7 +3127,12 @@
% Left on stack: dr = length of line
3 index 3 index translate
2 index sub exch 3 index sub
- 2 copy atan rotate
+% 2 copy atan rotate
+ 2 copy
+ 2 copy 0 ne exch 0 ne or
+ {atan rotate}
+ {pop pop}
+ ifelse
dup mul exch dup mul add sqrt
3 1 roll pop pop
} def
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/axodraw2.tlpobj new/tlpkg/tlpobj/axodraw2.tlpobj
--- old/tlpkg/tlpobj/axodraw2.tlpobj 2019-03-27 02:24:02.000000000 +0100
+++ new/tlpkg/tlpobj/axodraw2.tlpobj 2020-03-04 23:49:26.000000000 +0100
@@ -1,6 +1,6 @@
name axodraw2
category Package
-revision 50602
+revision 54055
shortdesc Feynman diagrams in a LaTeX document
longdesc This package defines macros for drawing Feynman graphs in LaTeX
longdesc documents. It is an important update of the axodraw package,
@@ -18,7 +18,6 @@
runfiles size=34
texmf-dist/tex/latex/axodraw2/axodraw2.sty
catalogue-ctan /graphics/axodraw2
-catalogue-date 2018-09-12 23:51:03 +0200
catalogue-license gpl3
catalogue-topics physics graphics-in-tex
-catalogue-version 2.1.1a
+catalogue-version 2.1.1b
++++++ babel-finnish.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-finnish/README.md new/doc/generic/babel-finnish/README.md
--- old/doc/generic/babel-finnish/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/generic/babel-finnish/README.md 2020-04-16 23:01:28.000000000 +0200
@@ -0,0 +1,14 @@
+Finnish 1.3r
+--------------
+
+This is the babel style for Finnish.
+
+**This package is NOT being actively maintained, but bugs might
+got fixed if you report them. If you want to take over maintenance
+of this language style, please contact me at
+http://www.texnia.com/contact.html .**
+
+Changes 1.3r
+------------
+
+Sisällys is the preferred form for contents name.
Binary files old/doc/generic/babel-finnish/finnish.pdf and new/doc/generic/babel-finnish/finnish.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-finnish.doc.tlpobj new/tlpkg/tlpobj/babel-finnish.doc.tlpobj
--- old/tlpkg/tlpobj/babel-finnish.doc.tlpobj 2019-02-28 03:17:03.000000000 +0100
+++ new/tlpkg/tlpobj/babel-finnish.doc.tlpobj 2020-04-17 01:55:22.000000000 +0200
@@ -1,7 +1,8 @@
name babel-finnish.doc
category Package
-revision 30267
+revision 54771
shortdesc doc files of babel-finnish
relocated 1
docfiles size=35
+ RELOC/doc/generic/babel-finnish/README.md
RELOC/doc/generic/babel-finnish/finnish.pdf
++++++ babel-finnish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-finnish/finnish.ldf new/tex/generic/babel-finnish/finnish.ldf
--- old/tex/generic/babel-finnish/finnish.ldf 2013-05-07 00:21:33.000000000 +0200
+++ new/tex/generic/babel-finnish/finnish.ldf 2020-04-16 23:01:28.000000000 +0200
@@ -7,11 +7,12 @@
%% finnish.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2007 Johannes L. Braams and any individual authors
-%% listed elsewhere in this file. All rights reserved.
+%% Copyright 1989-2020 Johannes L. Braams, Javier Bezos and any
+%% individual authors listed elsewhere in this file. All rights
+%% reserved.
%%
-%% This file was generated from file(s) of the Babel system.
-%% ---------------------------------------------------------
+%% This file is part of the Babel system.
+%% --------------------------------------
%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -23,27 +24,22 @@
%%
%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainer of this work is Johannes Braams.
+%% The Current Maintainer of this work is Javier Bezos
%%
-%% This file may only be distributed together with a copy of the Babel
-%% system. You may however distribute the Babel system without
-%% such generated files.
-%%
-%% The list of all files belonging to the Babel distribution is
-%% given in the file `manifest.bbl'. See also `legal.bbl for additional
+%% The list of all files belonging to the Babel system is
+%% given in the file `manifest.bbl. See also `legal.bbl' for additional
%% information.
%%
%% The list of derived (unpacked) files belonging to the distribution
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{finnish}
- [2007/10/20 v1.3q Finnish support from the babel system]
+ [2020/04/16 v1.3r Finnish support from the babel system]
%% File `finnish.dtx'
%% Babel package for LaTeX version 2e
-%% Copyright (C) 1989 - 2007
+%% Copyright (C) 1989 - 2020
%% by Johannes Braams, TeXniek
-%% Please report errors to: J.L. Braams
-%% babel at braams dot xs4all dot nl
+%% Javier Bezos
\LdfInit{finnish}\captionsfinnish
\ifx\l@finnish\@undefined
\@nopatterns{Finnish}
@@ -55,7 +51,7 @@
\def\bibname{Kirjallisuutta}%
\def\chaptername{Luku}%
\def\appendixname{Liite}%
- \def\contentsname{Sis\"alt\"o}% /* Could be "Sis\"allys" as well */
+ \def\contentsname{Sis\"allys}% /* Could be "Sis\"alt\"o" as well */
\def\listfigurename{Kuvat}%
\def\listtablename{Taulukot}%
\def\indexname{Hakemisto}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-finnish.tlpobj new/tlpkg/tlpobj/babel-finnish.tlpobj
--- old/tlpkg/tlpobj/babel-finnish.tlpobj 2019-02-28 03:17:03.000000000 +0100
+++ new/tlpkg/tlpobj/babel-finnish.tlpobj 2020-04-17 01:55:22.000000000 +0200
@@ -1,14 +1,13 @@
name babel-finnish
category Package
-revision 30267
-shortdesc Babel/Polyglossia support for Finnish
+revision 54771
+shortdesc Babel support for Finnish
relocated 1
longdesc The package provides a language description file that enables
-longdesc support of Finnish either with babel or with polyglossia.
+longdesc support of Finnish with babel.
runfiles size=2
RELOC/tex/generic/babel-finnish/finnish.ldf
catalogue-ctan /macros/latex/contrib/babel-contrib/finnish
-catalogue-date 2018-01-13 10:24:37 +0100
catalogue-license lppl1.3
catalogue-topics multilingual-addon
-catalogue-version 1.3q
+catalogue-version 1.3r
++++++ babel-french.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-french/README new/doc/generic/babel-french/README
--- old/doc/generic/babel-french/README 2019-01-31 00:08:02.000000000 +0100
+++ new/doc/generic/babel-french/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-=========================================================================
-The babel-french bundle (formerly known as `frenchb')
-
-French language support for the babel multilingual package
-
-Copyright 1996--2019 Daniel Flipo
-E-mail: daniel (dot) flipo (at) free (dot) fr
-
-Released under the LaTeX Project Public License v1.3 or later
-See http://www.latex-project.org/lppl.txt
-=========================================================================
-
-== PURPOSE ==
-
-This bundle is an extension to the babel package for multilingual
-typesetting. It provides all necessary macros, definitions and settings
-to typeset French documents. It is designed to work with the following
-engines: pdfTeX, XeTeX and LuaTeX.
-
-== CONTENTS ==
-
-The bundle consists of the following files:
-
-* frenchb.ins: installation file to unpack the language definition files,
-* frenchb.dtx: packed language definition files and documentation,
-* frenchb.pdf: unpacked documentation for babel-french,
-* frenchb-doc.pdf: comprehensive documentation in French,
-* frenchb-doc.tex: source file of frenchb-doc.pdf,
-* README (this file).
-
-== INSTALLATION ==
-
-If the latest version of this package is not included in your LaTeX
-distribution, do the following:
-
-* issue "luatex frenchb.ins" to unpack the language definition files;
-* copy the files frenchb.lua, french.ldf, frenchb.ldf, francais.ldf,
- acadian.ldf and canadien.ldf to a location where TeX can find them
- (default location: $TEXMF/tex/generic/babel-french/);
-* rebuild the database (mktexlsr or so).
-
-== DOCUMENTATION ==
-
-See the included manuals for usage instructions: frenchb.pdf in English or
-the French documentation frenchb-doc.pdf.
-
-== CHANGES ==
-
-See the included manual frenchb.pdf, section "Change History".
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-french/README.md new/doc/generic/babel-french/README.md
--- old/doc/generic/babel-french/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/generic/babel-french/README.md 2020-04-18 22:56:42.000000000 +0200
@@ -0,0 +1,54 @@
+The babel-french package (formerly known as `frenchb')
+======================================================
+
+Description
+-----------
+
+This package provides support for the French language for the babel
+multilingual system.
+
+It is designed to work with the following engines: pdfTeX, XeTeX and LuaTeX.
+Plain and LaTeX formats are supported.
+
+## Contents
+
+The bundle consists of the following files:
+
+* frenchb.ins: installation file to unpack the language definition files,
+* frenchb.dtx: packed language definition files and documentation,
+* frenchb.pdf: unpacked documentation for babel-french,
+* frenchb-doc.pdf: comprehensive documentation in French,
+* frenchb-doc.tex: source file of frenchb-doc.pdf,
+* README.md (this file).
+
+License
+-------
+
+Released under the LaTeX Project Public License v1.3 or later
+See http://www.latex-project.org/lppl.txt
+
+## Installation
+
+If the latest version of this package is not included in your LaTeX
+distribution, do the following:
+
+* issue "luatex frenchb.ins" to unpack the language definition files;
+* copy the files frenchb.lua, french.ldf, frenchb.ldf, francais.ldf,
+ acadian.ldf and canadien.ldf to a location where TeX can find them
+ (default location: $TEXMF/tex/generic/babel-french/);
+* rebuild the database (mktexlsr or so).
+
+Documentation
+-------------
+
+See the included manuals for usage instructions: frenchb.pdf in English or
+the French documentation frenchb-doc.pdf.
+
+Changes
+-------
+
+See the included manual frenchb.pdf, section "Change History".
+
+---
+Copyright 1996--2020 Daniel Flipo
+E-mail: daniel (dot) flipo (at) free (dot) fr
Binary files old/doc/generic/babel-french/frenchb-doc.pdf and new/doc/generic/babel-french/frenchb-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-french/frenchb-doc.tex new/doc/generic/babel-french/frenchb-doc.tex
--- old/doc/generic/babel-french/frenchb-doc.tex 2019-04-02 23:11:24.000000000 +0200
+++ new/doc/generic/babel-french/frenchb-doc.tex 2020-04-18 22:56:42.000000000 +0200
@@ -1,5 +1,9 @@
\documentclass[a4paper,12pt,german,english,french]{article}
+% LuaTeX ONLY!
+\usepackage{iftex}[2019/10/24]
+\RequireLuaTeX
+
\usepackage{xspace}
\usepackage{array,longtable}
\usepackage{varioref}
@@ -7,29 +11,26 @@
\usepackage{url,alltt,shortvrb}
\usepackage{graphics}
\usepackage[dvipsnames]{xcolor}
-\usepackage{luatexbase} %%% Provisoire : pour microtype
%%% Fontes OpenType avec moteur LuaTeX : Erewhon/Cabin/Inconsolata
-\usepackage[upright]{fourier} % Pour les maths seulement
\usepackage[no-math]{fontspec}
\usepackage{realscripts}
-\setmainfont{Erewhon}%
- [BoldFeatures = {SmallCapsFont={Erewhon-Bold}},
- ItalicFeatures={SmallCapsFont={Erewhon-RegularSlanted}},
- BoldItalicFeatures={SmallCapsFont={Erewhon-BoldSlanted}},
- ]
-\setsansfont{Cabin}[Scale=MatchLowercase]
+\setmainfont{erewhon}
+%\setsansfont{Cabin}[Scale=MatchLowercase]
\setmonofont{Inconsolatazi4}% voir inconsolata-doc.pdf
- [Scale=MatchLowercase,HyphenChar=None,StylisticSet={2,3},
- AutoFakeSlant=0.2 % XeTeX only, sans effet avec LuaTeX
- ]
+ [Scale=MatchLowercase, HyphenChar=None, StylisticSet={2,3},
+ ItalicFont = *-Regular, ItalicFeatures={FakeSlant=0.225}, % 13°
+ SlantedFont= *-Regular, SlantedFeatures={FakeSlant=0.225},
+ BoldItalicFont = *-Bold, BoldItalicFeatures={FakeSlant=0.225},
+ BoldSlantedFont= *-Bold, BoldSlantedFeatures={FakeSlant=0.225},
+ ]
%%% *** APRÈS fontspec ***
\usepackage{babel}
\frenchbsetup{og=«, fg=», AutoSpacePunctuation=false}
\frenchbsetup{ListItemsAsPar}
-\usepackage[babel=true,expansion=true,protrusion=true]{microtype}
+\usepackage{microtype}
% Mise en page
\usepackage[textwidth=160mm,textheight=247mm,hmarginratio=1:1
@@ -57,8 +58,7 @@
\def\verbatim@font{\ColorVerb\verbatim@fontORI}
\makeatother
% options de frenchb :
- \def\ColorArg{\color{Sepia}}
-% N.B. URL color = ForestGreen
+\def\ColorArg{\color{Sepia}}
%
\newcommand*{\file}[1]{\texttt{\ColorVerb #1}}
\newcommand*{\cls}[1]{\texttt{\ColorVerb #1}}
@@ -71,12 +71,13 @@
\newcommand*{\lang}[1]{\texttt{\ColorVerb #1}}
\newcommand*{\code}[1]{\texttt{\ColorVerb #1}}
\newcommand*{\argum}[1]{\textit{#1}}
-\newcommand*{\meta}[1]{\textit{\ColorArg #1}}
+\newcommand*{\meta}[1]{\textit{< #1 >}}
+\newcommand*{\LEFTmargin}{\texttt{<=}}
\providecommand\marg[1]{% % from ltxdoc.cls
- {\ttfamily\char`\{}\meta{#1}{\ttfamily\char`\}}}
+ {\ttfamily\char`\{}\textit{\ColorArg #1}{\ttfamily\char`\}}}
\providecommand\oarg[1]{%
- {\ttfamily[}\meta{#1}{\ttfamily]}}
+ {\ttfamily[}\textit{\ColorArg #1}{\ttfamily]}}
\DeclareRobustCommand\cs[1]{\texttt{\ColorVerb \char`\\#1}}% from ltxdoc.cls
\newcommand*\fbo[1]{\texttt{\ColorArg #1}}
@@ -112,8 +113,8 @@
unicode,
bookmarksopen,
colorlinks,
- urlcolor=ForestGreen,
- linkcolor=black, % appel note bas de page en noir
+ urlcolor=PineGreen,
+ linkcolor=Blue,
}
\newcommand*{\hlabel}[1]{\phantomsection\label{#1}}
% notes bas de page consécutives avec le même numéro
@@ -124,11 +125,11 @@
%
\title{Documentation sur le module \ext{babel-french}}
\author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}}
-\newcommand*{\latestversion}{3.5e}
+\newcommand*{\latestversion}{3.5h}
\date{Version {\latestversion} -- \today}
\begin{document}
-\def\today{30 avril 2019}
+\def\today{18 avril 2020}
\maketitle
\thispagestyle{empty}
@@ -197,7 +198,8 @@
\item[6 juillet 2018] Nouvelle option \fbo{ListItemsAsPar},
voir p.~\pageref{ListAsPar}.
\item[24 janvier 2019] L’option \fbo{StandardListSpacing=true} est à utiliser
- de préférence à \fbo{ReduceListSpacing=false}, voir p.~\pageref{ListAsPar}.
+ de préférence à \fbo{ReduceListSpacing=false},
+ voir p.~\pageref{listspacing}.
\item[14 mars 2019] Nouvelle commande |\NoEveryParQuote|, voir
p.~\pageref{frquote}.
\end{description}
@@ -212,7 +214,7 @@
\newpage
\section{Appel de l’extension Babel}
-Babel est installé en standard dans toutes distributions \LaTeXe,
+Babel est installé en standard dans toutes distributions LaTeX,
pour disposer des langues française et anglaise%
\footnote{En fait américaine (US-english), il existe une variante
\opt{british} pour l’anglais « britannique ».},
@@ -242,20 +244,25 @@
qui régit la présentation générale (listes, notes de bas de page,
retrait des premiers paragraphes) quelle que soit la langue courante.
+\ext{babel-french} propose une variante \opt{acadian}, par défaut identique
+à \opt{french}, mais qui peut être personnalisée indépendemment en termes de
+césures, d’espacement de la ponctuation haute, etc. Les deux variantes peuvent
+être utilisées en parallèle dans le même document.
+
Pour changer de langue en cours de document on utilise la commande standard
de \mbox{Babel} |\selectlanguage{|\argum{lang}|}|,
-par exemple |\selectlanguage{english}| et pour revenir en français
+par exemple |\selectlanguage{british}| et pour revenir en français
|\selectlanguage{french}|\footnote{Là encore, le nom de la langue
française est \opt{french}, pas \opt{frenchb} ou \opt{français}.}.
Pour passer \emph{localement} dans une autre langue on peut utiliser
l’environnement \\
|\begin{otherlanguage}{|\argum{langue}|}|\\
-\hspace*{1em}\argum{texte\dots}\\
+\hspace*{1em}\argum{texte…}\\
|\end{otherlanguage}|\\
ou pour une courte citation dans un paragraphe\\
|\foreignlanguage{|\argum{langue}%
-|}{|\argum{texte\dots}|}|.
+|}{|\argum{texte…}|}|.
Depuis la version~3.10 de Babel, une syntaxe allégée est proposée pour les
changements de langue : en ajoutant par exemple dans le préambule
@@ -335,7 +342,8 @@
document : celle-ci est imposée uniquement par la classe et les autres
extensions chargées.
-Lorsque le français est la langue principale, la présentation globale du
+\goodbreak
+Lorsque le français est la langue principale, la présentation du
document (ou maquette) est modifiée de la façon suivante%
\footnote{Il est possible, pour chacun des points suivants, de revenir aux
réglages standard de LaTeX, voir section~\ref{sec:Perso}.} :
@@ -435,7 +443,9 @@
supprimer l’espace qui suit (cet espace est gênant devant une
parenthèse par exemple\dots)%
\footnote{Certains auteurs préfèrent en français «...» (codé \code{...}
- sans espace) à «\dots» (codé \cs{dots}).}.
+ sans espace) à «\dots» (codé \cs{dots}). Le mieux est d’utiliser
+ directement le caractère … dans le texte source dès lors que celui-ci est
+ codé en utf-8.}.
\item La commande |\today| retourne la date en français.
@@ -475,6 +485,11 @@
au début de chaque paragraphe, sauf si \fbo{EveryParGuill=close} (guillemet
fermant dans ce cas) ou si \fbo{EveryParGuill=none} (aucun ajout).
+ Une commande |\NoEveryParQuote| permet de supprimer localement des guillemets
+ de début de paragraphe ajoutés inconsidérément par la commande |\frquote{}|
+ notamment dans les listes (après les labels) ; elle doit être utilisée dans
+ un environnement ou un groupe pour en limiter la portée.
+
Pour les citations imbriquées, plusieurs présentations sont proposées selon
les options choisies :
\begin{itemize}
@@ -497,6 +512,7 @@
ce faire, il suffit de coder la citation interne avec |\frquote*{}| au lieu
de |\frquote{}|.
+\pagebreak
Exemple de citation imbriquée :
\vspace{0.5\baselineskip}
@@ -540,11 +556,6 @@
{\ttfamily\ColorVerb Xavier raconte… |\frquote{|Au moment… l’hôtesse m’a
dit tout bonnement : |\frquote*{|Je suis désolée, … en anglais.|}}|}
- Une commande |\NoEveryParQuote| permet de supprimer localement des guillemets
- de début de paragraphe ajoutés inconsidérément par la commande |\frquote{}|
- notamment dans les listes (après les labels) ; elle doit être utilisée dans
- un environnement ou un groupe pour en limiter la portée.
-
\item La commande |\up| facilite la saisie des exposants en mode texte :
|M\up{me}| imprime M\up{me},
|1\up{er}| donne 1\up{er} ; % 1\ier ;
@@ -640,6 +651,7 @@
un message est affiché dans le fichier \file{.log} indiquant comment
charger \ext{numprint}. Le chargement de \ext{numprint} n’est pas fait
par \ext{babel-french} à cause du risque de conflit d’options.
+ Il doit se faire \emph{après} \ext{babel}.
Les utilisateurs devraient s’habituer progressivement à utiliser
|\numprint| (ou son raccourci |\np|) à la place de |\nombre|.
@@ -647,10 +659,11 @@
En ajoutant |\usepackage{xspace}| dans le préambule, les espaces suivant
les commandes
-|\ier|,\dots, |\ieres|,
+|\ier|,…, |\ieres|,
|\ieme|, |\iemes|,
|\fg| et |\dots| sont
-respectés sans avoir à les forcer par des |{}| ou des~\verb*+\ +.
+respectés sans avoir à les forcer par des |{}| ou
+des~\code{\boi\textvisiblespace}.
\section{Personnalisation}
\label{sec:Perso}
@@ -669,8 +682,7 @@
Le recours à un fichier de configuration \file{frenchb.cfg} a été supprimé en
version~3.0.
-\subsection[\textbackslash frenchsetup{}]
- {\fbsetup{\textsl{$\langle$options$\rangle$}}}
+\subsection[\textbackslash frenchsetup{}]{\fbsetup{\meta{options}}}
\label{ssec:frenchbsetup}
La commande \fbsetup{ShowOptions} affiche dans le fichier \file{.log} la liste
@@ -692,6 +704,7 @@
\subsubsection*{Inventaire des options}
\begin{description}
+ \setlength{\labelsep}{0.1666em}
\item [ShowOptions=true (false)]
affiche dans le fichier \file{.log} toutes les options
disponibles, ce qui permet de retrouver leurs noms facilement.
@@ -748,7 +761,7 @@
modifie (en général en les réduisant, sauf pour les classes SMF)
les espaces verticaux%
\footnote{Il s’agit de \cs{itemsep}, \cs{parsep}, \cs{topsep}
- et \cs{partopsep}.}
+ et \cs{partopsep}.} \label{listspacing}
dans \emph{toutes les listes} produites à partir de l’environnement
\env{list}, en particulier les listes \env{enumerate}, \env{itemize} et
\env{description} mais aussi \env{abstract}, \env{quote}, \env{quotation},
@@ -874,11 +887,12 @@
Le moteur LuaTeX permet un contrôle fin de l’ajout d’espace devant le
deux-points : si ce caractère n’est pas précédé d’un espace et que celui qui
- le suit est de type \textit{glyphe} (lettre, chiffre, /, \textbackslash, etc.)
- aucune espace n’est ajoutée en sortie, ce qui évite les espaces parasites
- dans les URLs (ftp://monsite), les chemins MSDOS (C:\textbackslash) et les
- horaires (10:55). Avec XeTeX ou pdfTeX |\textsf{http://truc}| donne
- \textsf{http~://truc} (espace parasite avant le «:»).
+ le suit est de type \textit{glyphe} (lettre, chiffre, /, \textbackslash,
+ etc.) aucune espace n’est ajoutée en sortie, ce qui évite les espaces
+ parasites dans les URLs (ftp://monsite), les chemins MSDOS
+ (C:\textbackslash), les horaires (10:55) et les ratios (1:1).
+ Avec XeTeX ou pdfTeX |http://truc| et |1:1| donnent http~://truc et 1~:1
+ (espace parasite avant le «:»).
Il y a une autre exception avec les moteurs LuaTeX et XeTeX :
si l’utilisateur code une espace insécable U+00A0 (\emph{pas}
@@ -947,7 +961,7 @@
utile pour recompiler à l’identique des anciens textes.
\item [UnicodeNoBreakSpaces=true (false)];\hlabel{ucs-nbsp} cette option
- expérimentale n’a d’effet qu’avec LuaLaTeX ; lorsqu’on la met à \fbo{true}
+ n’a d’effet qu’avec LuaLaTeX ; lorsqu’on la met à \fbo{true}
les espaces insécables ajoutées par \ext{babel-french} dans le fichier PDF
de sortie (ponctuation haute, guillemets, etc.) sont codées sous forme de
caractères Unicode (U+A0 ou U+202F fine) au lieu des pénalités et ressorts
@@ -956,8 +970,8 @@
version actuelle de \exe{pdftotext} ne les restitue pas correctement.
En revanche, \exe{lwarp} (v.~0.37 et suivantes) est totalement compatible
- avec \ext{babel-french} pour la conversion des fichiers PDF produits sous
- XeLaTeX et pdfLaTeX : les espaces insécables sont préservées.
+ avec \ext{babel-french} pour la conversion en HTML des fichiers PDF produits
+ sous XeLaTeX et pdfLaTeX : les espaces insécables sont préservées.
\end{description}
@@ -989,7 +1003,7 @@
produit \foreignlanguage{german}{(»Auf Deutsch«)}. %»
Ceci fonctionne en (pdf)LaTeX pour les codages d’entrée 8-bits (latin1,
- latin9, ansinew, applemac,\dots) et pour les codages sur plusieurs octets
+ latin9, ansinew, applemac,…) et pour les codages sur plusieurs octets
comme utf8 ou utf8x. Ceci fonctionne également avec LuaLaTeX et XeLaTeX ;
avec ces deux derniers toutefois, comme pour la ponctuation haute,
\ext{babel-french} respecte les espaces insécables U+00A0 et U+202F (fine).
@@ -1052,7 +1066,7 @@
des nombres, par une espace fine (par défaut c’est une espace mot
insécable et sans élasticité en français).
Cette option n’a d’effet que si l’extension \ext{numprint} est chargée
- avec l’option \opt{autolanguage} ;
+ (\emph{après} \ext{babel}) avec l’option \opt{autolanguage} ;
sans elle, \ext{numprint} formate les nombres indépendamment de la langue
courante et le séparateur des milliers est par défaut l’espace fine.
\par}
@@ -1156,7 +1170,7 @@
\name{part} & Première partie, Deuxième partie…\\
\name{encl} & P.~J.\\
\name{cc} & Copie à \\
-\name{headto} & $\langle$\textit{vide}$\rangle$\\
+\name{headto} & \meta{vide}\\
\name{page} & page\\
\name{see} & voir\\
\name{also} & voir aussi\\*
@@ -1177,7 +1191,7 @@
\emph{Attention}, dans les deux cas, le nom de la langue est
\emph{obligatoirement} \opt{french}, les variantes \opt{frenchb} ou
\opt{francais} seraient sans effet ! Les commandes
-|\acadianabstractname|, \dots, |\acadianproofname| sont, elles, définies
+|\acadianabstractname|, …, |\acadianproofname| sont, elles, définies
(comme leurs homologues françaises) et personnalisables pour le français du
Canada (option \lang{acadian}).
\par}
@@ -1217,15 +1231,15 @@
{\centering
\fbox{\begin{minipage}[t]{.40\textwidth}\raggedright
\FBListItemsAsParfalse \parindent=1.5em \listindentFB=1.5em
- \noindent$\Leftarrow$ Marge gauche\par
+ \noindent\LEFTmargin{} Marge gauche\par
Paragraphe précédant la liste
\begin{itemize}
- \item Premier élément sur plus d’une ligne\dots{}
+ \item Premier élément sur plus d’une ligne…
\begin{itemize}
\item Un élément niveau 2,
\item Second élément niveau 2,
\end{itemize}
- \item Second élément\dots
+ \item Second élément…
\end{itemize}
\end{minipage}}\par
}
@@ -1257,15 +1271,15 @@
\begin{minipage}[t]{.45\textwidth}
\fbox{\begin{minipage}[t]{0.9\textwidth}\raggedright
\FBListItemsAsParfalse \parindent=0pt \listindentFB=1.5em
- \noindent$\Leftarrow$ Marge gauche\par
+ \noindent\LEFTmargin{} Marge gauche\par
Paragraphe précédant la liste
\begin{itemize}
- \item Premier élément sur plus d’une ligne\dots{}
+ \item Premier élément sur plus d’une ligne…
\begin{itemize}
\item Un élément niveau 2,
\item Second élément niveau 2,
\end{itemize}
- \item Second élément\dots
+ \item Second élément…
\end{itemize}
\end{minipage}
}\\
@@ -1276,15 +1290,15 @@
\hspace*{\fill}
\fbox{\begin{minipage}[t]{.9\textwidth}\raggedright % .72
\FBListItemsAsParfalse \parindent=0em \listindentFB=0em
- \noindent$\Leftarrow$ Marge gauche\par
+ \noindent\LEFTmargin{} Marge gauche\par
Paragraphe précédant la liste
\begin{itemize}
- \item Premier élément sur plus d’une ligne\dots{}
+ \item Premier élément sur plus d’une ligne…
\begin{itemize}
\item Un élément niveau 2,
\item Second élément niveau 2,
\end{itemize}
- \item Second élément\dots
+ \item Second élément…
\end{itemize}
\end{minipage}
}\hspace*{\fill}\\
@@ -1304,15 +1318,15 @@
\begin{minipage}[t]{.45\textwidth}
\fbox{\begin{minipage}[t]{.9\textwidth}\raggedright
\FBListItemsAsParfalse \parindent=1.5em \listindentFB=1.5em
- \noindent$\Leftarrow$ Marge gauche\par
+ \noindent\LEFTmargin{} Marge gauche\par
Paragraphe précédant la liste
\begin{enumerate}
- \item Premier élément sur plus d’une ligne\dots{}
+ \item Premier élément sur plus d’une ligne…
\begin{enumerate}
\item Un élément niveau 2,
\item Second élément niveau 2,
\end{enumerate}
- \item Second élément\dots
+ \item Second élément…
\end{enumerate}
\end{minipage}
}\\
@@ -1326,16 +1340,16 @@
\hspace*{\fill}
\fbox{\begin{minipage}[t]{0.9\textwidth}\raggedright
\FBListItemsAsParfalse \parindent=1.5em \listindentFB=1.5em
- \noindent$\Leftarrow$ Marge gauche\par
+ \noindent\LEFTmargin{} Marge gauche\par
Paragraphe précédant la liste
\begin{enumerate}
- \item Premier élément sur plus d’une ligne\dots{}
+ \item Premier élément sur plus d’une ligne…
\settowidth{\labelwidthFB}{(a)}%
\begin{enumerate}
\item Un élément niveau 2,
\item Second élément niveau 2,
\end{enumerate}
- \item Second élément\dots
+ \item Second élément…
\end{enumerate}
\end{minipage}
}\hspace*{\fill}\\
@@ -1359,15 +1373,15 @@
\fbox{\begin{minipage}[t]{0.9\textwidth}\raggedright
\FBListItemsAsParfalse
\parindent=0pt \listindentFB=1.5em \descindentFB=1.5em
- \noindent$\Leftarrow$ Marge gauche\par
+ \noindent\LEFTmargin{} Marge gauche\par
Paragraphe précédant la liste
\begin{description}
- \item [Premier] élément occupant plus d’une ligne\dots{}
+ \item [Premier] élément occupant plus d’une ligne…
\begin{itemize}
\item Un élément niveau 2,
\item Second élément niveau 2,
\end{itemize}
- \item [Second] élément\dots
+ \item [Second] élément…
\end{description}
\end{minipage}
}\\
@@ -1379,15 +1393,15 @@
\fbox{\begin{minipage}[t]{.9\textwidth}\raggedright % .72
\FBListItemsAsParfalse
\parindent=0pt \listindentFB=1.5em \descindentFB=0pt
- \noindent$\Leftarrow$ Marge gauche\par
+ \noindent\LEFTmargin{} Marge gauche\par
Paragraphe précédant la liste
\begin{description}
- \item [Premier] élément occupant plus d’une ligne\dots{}
+ \item [Premier] élément occupant plus d’une ligne…
\begin{itemize}
\item Un élément niveau 2,
\item Second élément niveau 2,
\end{itemize}
- \item [Second] élément\dots
+ \item [Second] élément…
\end{description}
\end{minipage}
}\hspace*{\fill}\\
@@ -1416,7 +1430,7 @@
\begin{minipage}[t]{.45\textwidth}
\fbox{\begin{minipage}[t]{0.9\textwidth}\raggedright
\FBListItemsAsParfalse \parindent=1.5em \listindentFB=1.5em
- \noindent$\Leftarrow$ Marge gauche\par
+ \noindent\LEFTmargin{} Marge gauche\par
Paragraphe précédant la liste et qui s’étend sur deux lignes.
\begin{itemize}
\item Premier élément qui se prolonge sur plusieurs…
@@ -1424,7 +1438,7 @@
\item Un élément niveau 2,
\item Second élément niveau 2 sur plus d’une ligne…
\end{itemize}
- \item Second élément\dots
+ \item Second élément…
\end{itemize}
\end{minipage}
}\\
@@ -1435,7 +1449,7 @@
\hspace*{\fill}
\fbox{\begin{minipage}[t]{.9\textwidth}\raggedright % .72
\FBListItemsAsPartrue \parindent=1.5em \listindentFB=1.5em
- \noindent$\Leftarrow$ Marge gauche\par
+ \noindent\LEFTmargin{} Marge gauche\par
Paragraphe précédant la liste et qui s’étend sur deux lignes.
\begin{itemize}
\item Premier élément qui se prolonge sur plusieurs lignes…
@@ -1443,7 +1457,7 @@
\item Un élément niveau 2,
\item Second élément niveau 2 sur plus d’une ligne…
\end{itemize}
- \item Second élément\dots
+ \item Second élément…
\end{itemize}
\end{minipage}
}\hspace*{\fill}\\
@@ -1493,7 +1507,7 @@
}
%\newpage
-\section{Changements entre les versions 3.4 et 2.6}
+\section{Changements entre les versions 3.5 et 2.6}
\label{sec:changes-3.0}
\subsection{Changements entre les versions \latestversion{} et 3.4d}
@@ -1507,12 +1521,16 @@
Quelques bogues affectant la commande |\frquote{}| ont été corrigées dans les
versions 3.5b à 3.5d. Cette dernière introduit une nouvelle option
\fbo{StandardListSpacing} à utiliser à la place de \fbo{ReduceListSpacing},
-voir p.~\pageref{ListAsPar}. La présente documentation est maintenant
+voir p.~\pageref{listspacing}. La présente documentation est maintenant
incluse dans la distribution \ext{babel-french} sur CTAN.
La commande |\NoEveryParQuote| a été ajoutée en version~3.5e, voir
p.~\pageref{frquote}.
+La version 3.5g corrige une bogue ancienne affectant l’usage des polices
+type~1 avec Lua\-(La)TeX : tout crénage était supprimé pour ces polices depuis
+la version~3.1f (2015) ; les polices OpenType elles, n’ont jamais été affectées.
+
\subsection{Changements entre les versions 3.4d et 3.3d}
\label{ssec:changes-3.4}
@@ -1739,7 +1757,7 @@
cette section ne concerne \emph{que les vieux moteurs} TeX’82 et pdfTeX.
Normalement, le nécessaire est fait par Babel pour que les caractères rendus
-actifs ne perturbent pas les autres extensions\dots{} mais il y a hélas des
+actifs ne perturbent pas les autres extensions… mais il y a hélas des
exceptions (\ext{tikz}, \ext{xypic}, \ext{xcolor}, \ext{autonum}, \ext{arabtex},
\ext{cleveref} par exemple). Il faut savoir que les caractères
rendus actifs par une langue \emph{le restent dans tout le document}, repasser
Binary files old/doc/generic/babel-french/frenchb.pdf and new/doc/generic/babel-french/frenchb.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-french.doc.tlpobj new/tlpkg/tlpobj/babel-french.doc.tlpobj
--- old/tlpkg/tlpobj/babel-french.doc.tlpobj 2019-04-03 01:24:52.000000000 +0200
+++ new/tlpkg/tlpobj/babel-french.doc.tlpobj 2020-04-19 18:09:40.000000000 +0200
@@ -1,10 +1,10 @@
name babel-french.doc
category Package
-revision 50711
+revision 54787
shortdesc doc files of babel-french
relocated 1
-docfiles size=125
- RELOC/doc/generic/babel-french/README
+docfiles size=138
+ RELOC/doc/generic/babel-french/README.md
RELOC/doc/generic/babel-french/frenchb-doc.pdf
RELOC/doc/generic/babel-french/frenchb-doc.tex
RELOC/doc/generic/babel-french/frenchb.pdf
++++++ babel-french.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-french/acadian.ldf new/tex/generic/babel-french/acadian.ldf
--- old/tex/generic/babel-french/acadian.ldf 2019-04-02 23:11:24.000000000 +0200
+++ new/tex/generic/babel-french/acadian.ldf 2020-04-18 22:56:42.000000000 +0200
@@ -24,7 +24,7 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{acadian}
- [2019/03/30 v3.5e French support from the babel system]
+ [2020/04/18 v3.5h French support from the babel system]
\PackageInfo{acadian.ldf}%
{`acadian' dialect is currently\MessageBreak
*absolutely identical* to the\MessageBreak
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-french/canadien.ldf new/tex/generic/babel-french/canadien.ldf
--- old/tex/generic/babel-french/canadien.ldf 2019-04-02 23:11:24.000000000 +0200
+++ new/tex/generic/babel-french/canadien.ldf 2020-04-18 22:56:42.000000000 +0200
@@ -24,13 +24,16 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{canadien}
- [2019/03/30 v3.5e French support from the babel system]
+ [2020/04/18 v3.5h French support from the babel system]
\PackageWarning{canadien.ldf}%
{Option `canadien' for Babel is *deprecated*,\MessageBreak
it might be removed sooner or later. Please\MessageBreak
use `acadian' instead; reported}%
-\let\l@canadien\l@acadian
\def\CurrentOption{acadian}
+\def\datecanadien{\dateacadian}
+\def\captionscanadien{\captionsacadian}
+\def\extrascanadien{\extrasacadian}
+\def\noextrascanadien{\noextrasacadian}
\input french.ldf\relax
\let\extrasacadian\extrasfrench
\let\noextrasacadian\noextrasfrench
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-french/francais.ldf new/tex/generic/babel-french/francais.ldf
--- old/tex/generic/babel-french/francais.ldf 2019-04-02 23:11:24.000000000 +0200
+++ new/tex/generic/babel-french/francais.ldf 2020-04-18 22:56:42.000000000 +0200
@@ -24,12 +24,12 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{francais}
- [2019/03/30 v3.5e French support from the babel system]
+ [2020/04/18 v3.5h French support from the babel system]
\PackageWarning{francais.ldf}%
{Option `francais' for Babel is *deprecated*,\MessageBreak
it might be removed sooner or later. Please\MessageBreak
use `french' instead; reported}%
-\let\l@francais\l@french
+\chardef\l@francais\l@french
\def\CurrentOption{french}
\input french.ldf\relax
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-french/french.ldf new/tex/generic/babel-french/french.ldf
--- old/tex/generic/babel-french/french.ldf 2019-04-02 23:11:24.000000000 +0200
+++ new/tex/generic/babel-french/french.ldf 2020-04-18 22:56:42.000000000 +0200
@@ -24,10 +24,10 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{french}
- [2019/03/30 v3.5e French support from the babel system]
+ [2020/04/18 v3.5h French support from the babel system]
%%
%% Babel package for LaTeX version 2e
-%% Copyright © 1996-2019
+%% Copyright © 1996-2020
%% by Daniel Flipo <daniel (dot) flipo (at) free (dot) fr>
%%
\LdfInit\CurrentOption{FBclean@on@exit}
@@ -85,7 +85,12 @@
\fi
\@nopatterns{French}}
\ifdefined\l@french \else \FB@nopatterns \fi
-\ifdefined\l@acadian \else \adddialect\l@acadian\l@french \fi
+\ifdefined\l@acadian
+ \adddialect\l@canadien\l@acadian
+\else
+ \adddialect\l@acadian\l@french
+ \adddialect\l@canadien\l@french
+\fi
\providehyphenmins{french}{\tw@\thr@@}
\providehyphenmins{acadian}{\tw@\thr@@}
\newif\ifLaTeXe
@@ -294,9 +299,10 @@
LuaTeX,\\ use \noexpand\NoAutoSpacing
*inside a group* instead.}%
\else
- \PackageWarning{french.ldf}{\protect\shorthandoff{;:!?} is
- helpless with LuaTeX,\MessageBreak use \protect\NoAutoSpacing
- \space *inside a group* instead;\MessageBreak reported}%
+ \PackageWarning{french.ldf}{\protect\shorthandoff{;:!?}
+ is helpless with LuaTeX,\MessageBreak
+ use \protect\NoAutoSpacing \space *inside a group*
+ instead;\MessageBreak reported}%
\fi}%
\def\shorthandon##1{}%
}
@@ -321,9 +327,9 @@
\fi
\ifFB@xetex@punct
\ifLaTeXe
- \PackageInfo{french.ldf}{No need for active punctuation characters%
- \MessageBreak with this version of XeTeX!%
- \MessageBreak reported}
+ \PackageInfo{french.ldf}{No need for active punctuation
+ characters\MessageBreak with this
+ version of XeTeX!\MessageBreak reported}
\else
\fb@info{No need for active punctuation characters\\
with this version of XeTeX!}
@@ -353,9 +359,10 @@
XeTeX,\\ use \noexpand\NoAutoSpacing
*inside a group* instead.}%
\else
- \PackageWarning{french.ldf}{\protect\shorthandoff{;:!?} is
- helpless with XeTeX,\MessageBreak use \protect\NoAutoSpacing
- \space *inside a group* instead;\MessageBreak reported}%
+ \PackageWarning{french.ldf}{\protect\shorthandoff{;:!?}
+ is helpless with XeTeX,\MessageBreak
+ use \protect\NoAutoSpacing\space *inside a group*
+ instead;\MessageBreak reported}%
\fi}%
\def\shorthandon##1{}%
\XeTeXinterchartokenstate=1
@@ -560,7 +567,8 @@
\def\og{\textquotedblleft}
\def\fg{\ifdim\lastskip>\z@\unskip\fi\textquotedblright}
\fi
-\addto\extrasfrench{\babel@save\og \babel@save\fg \bbl@frenchguillemets}
+\addto\extrasfrench{\babel@save\og \babel@save\fg
+ \bbl@frenchguillemets}
\newcommand*{\ogi}{\FB@og}
\newcommand*{\fgi}{\FB@fg}
\newcommand*{\@ogi}{\ifmmode\hbox{\ogi}\else\ogi\fi}
@@ -825,23 +833,43 @@
\newcommand*{\std@math@comma}{\mathcode`\,=\std@mcc}
\fi
\newcommand*{\DecimalMathComma}{%
- \ifFBfrench\dec@math@comma\fi
- \ifFB@icomma\else\addto\extrasfrench{\dec@math@comma}\fi
+ \ifFB@icomma
+ \PackageWarning{french.ldf}{%
+ icomma package loaded, \protect\DecimalMathComma\MessageBreak
+ does nothing. Reported}%
+ \else
+ \ifFBfrench
+ \dec@math@comma
+ \expandafter\addto\csname extras\languagename\endcsname
+ {\dec@math@comma}%
+ \fi
+ \fi
}
\newcommand*{\StandardMathComma}{%
- \std@math@comma
- \ifFB@icomma\else\addto\extrasfrench{\std@math@comma}\fi
+ \ifFB@icomma
+ \PackageWarning{french.ldf}{%
+ icomma package loaded, \protect\StandardMathComma\MessageBreak
+ does nothing. Reported}%
+ \else
+ \std@math@comma
+ \expandafter\addto\csname extras\languagename\endcsname
+ {\std@math@comma}%
+ \fi
}
\ifLaTeXe
\AtBeginDocument{\@ifpackageloaded{icomma}%
{\FB@icommatrue}%
- {\addto\noextrasfrench{\std@math@comma}}%
+ {\addto\noextrasfrench{\std@math@comma}%
+ \ifdefined\noextrasacadian
+ \addto\noextrasacadian{\std@math@comma}%
+ \fi
+ }%
}
\else
\addto\noextrasfrench{\std@math@comma}
\fi
\newcommand*{\nombre}[1]{{#1}\fb@warning{*** \noexpand\nombre
- no longer formats numbers\string! ***}}
+ no longer formats numbers\string! ***}}
\ifFB@luatex@punct
\activate@luatexpunct
\fi
@@ -918,13 +946,13 @@
\SetString{\partsecond}{Deuxi\`eme}
\SetString{\partnameord}{partie}
\SetStringLoop{ordinal#1}{%
- \partfirst,\partsecond,Troisi\`eme,Quatri\`eme,%
- Cinqui\`eme,Sixi\`eme,Septi\`eme,Huiti\`eme,Neuvi\`eme,Dixi\`eme,%
+ \partfirst,\partsecond,Troisi\`eme,Quatri\`eme, Cinqui\`eme,%
+ Sixi\`eme,Septi\`eme,Huiti\`eme,Neuvi\`eme,Dixi\`eme,%
Onzi\`eme,Douzi\`eme,Treizi\`eme,Quatorzi\`eme,Quinzi\`eme,%
Seizi\`eme,Dix-septi\`eme,Dix-huiti\`eme,Dix-neuvi\`eme,%
Vingti\`eme}
\AfterBabelCommands{%
- \DeclareRobustCommand*{\FB@emptypart}{\def\thepart{}}%
+ \DeclareRobustCommand*{\FB@emptypart}{\def\thepart{\unskip}}%
\DeclareRobustCommand*{\FB@partname}{%
\ifFBPartNameFull
\csname ordinal\romannumeral\value{part}\endcsname\space
@@ -1535,19 +1563,19 @@
\fi
\ifFBShowOptions
\GenericWarning{* }{%
- ***** List of possible options for babel-french ****\MessageBreak
+ *** List of possible options for babel-french ***\MessageBreak
[Default values between brackets when french is loaded *LAST*]%
\MessageBreak
- ShowOptions=true [false]\MessageBreak
- StandardLayout=true [false]\MessageBreak
- GlobalLayoutFrench=false [true]\MessageBreak
- PartNameFull=false [true]\MessageBreak
- IndentFirst=false [true]\MessageBreak
- ListItemsAsPar=true [false]\MessageBreak
- StandardListSpacing=true [false]\MessageBreak
- StandardItemizeEnv=true [false]\MessageBreak
- StandardEnumerateEnv=true [false]\MessageBreak
- StandardItemLabels=true [false]\MessageBreak
+ ShowOptions [false]\MessageBreak
+ StandardLayout [false]\MessageBreak
+ GlobalLayoutFrench [true]\MessageBreak
+ PartNameFull [true]\MessageBreak
+ IndentFirst [true]\MessageBreak
+ ListItemsAsPar [false]\MessageBreak
+ StandardListSpacing [false]\MessageBreak
+ StandardItemizeEnv [false]\MessageBreak
+ StandardEnumerateEnv [false]\MessageBreak
+ StandardItemLabels [false]\MessageBreak
ItemLabels=\textemdash, \textbullet,
\protect\ding{43},... [\textendash]\MessageBreak
ItemLabeli=\textemdash, \textbullet,
@@ -1558,27 +1586,27 @@
\protect\ding{43},... [\textendash]\MessageBreak
ItemLabeliv=\textemdash, \textbullet,
\protect\ding{43},... [\textendash]\MessageBreak
- StandardLists=true [false]\MessageBreak
- ListOldLayout=true [false]\MessageBreak
- FrenchFootnotes=false [true]\MessageBreak
- AutoSpaceFootnotes=false [true]\MessageBreak
- AutoSpacePunctuation=false [true]\MessageBreak
- ThinColonSpace=true [false]\MessageBreak
- OriginalTypewriter=true [false]\MessageBreak
- UnicodeNoBreakSpaces=true [false]\MessageBreak
+ StandardLists [false]\MessageBreak
+ ListOldLayout [false]\MessageBreak
+ FrenchFootnotes [true]\MessageBreak
+ AutoSpaceFootnotes [true]\MessageBreak
+ AutoSpacePunctuation [true]\MessageBreak
+ ThinColonSpace [false]\MessageBreak
+ OriginalTypewriter [false]\MessageBreak
+ UnicodeNoBreakSpaces [false]\MessageBreak
og= <left quote character>, fg= <right quote character>%
- INGuillSpace=true [false]\MessageBreak
+ INGuillSpace [false]\MessageBreak
EveryParGuill=open, close, none [open]\MessageBreak
EveryLineGuill=open, close, none
[open in LuaTeX, none otherwise]\MessageBreak
- InnerGuillSingle=true [false]\MessageBreak
- ThinSpaceInFrenchNumbers=true [false]\MessageBreak
- SmallCapsFigTabCaptions=false [true]\MessageBreak
- CustomiseFigTabCaptions=false [true]\MessageBreak
- OldFigTabCaptions=true [false]\MessageBreak
- FrenchSuperscripts=false [true]\MessageBreak
- LowercaseSuperscripts=false [true]\MessageBreak
- SuppressWarning=true [false]\MessageBreak
+ InnerGuillSingle [false]\MessageBreak
+ ThinSpaceInFrenchNumbers [false]\MessageBreak
+ SmallCapsFigTabCaptions [true]\MessageBreak
+ CustomiseFigTabCaptions [true]\MessageBreak
+ OldFigTabCaptions [false]\MessageBreak
+ FrenchSuperscripts [true]\MessageBreak
+ LowercaseSuperscripts [true]\MessageBreak
+ SuppressWarning [false]\MessageBreak
\MessageBreak
*********************************************%
\MessageBreak\protect\frenchsetup{ShowOptions}}
@@ -1668,16 +1696,18 @@
\advance\itemindent by \labelsep
\leftmargini\z@
\bbl@for\FB@dp {2, 3, 4, 5, 6}%
- {\csname leftmargin\romannumeral\FB@dp\endcsname=\labelindentFB}%
+ {\csname leftmargin\romannumeral\FB@dp\endcsname =
+ \labelindentFB}%
\else
\leftmarginFB=\labelwidthFB
\advance\leftmarginFB by \labelsep
\bbl@for\FB@dp {1, 2, 3, 4, 5, 6}%
- {\csname leftmargin\romannumeral\FB@dp\endcsname=\leftmarginFB}%
+ {\csname leftmargin\romannumeral\FB@dp\endcsname =
+ \leftmarginFB}%
\advance\leftmargini by \listindentFB
\fi
- \leftmargin=\csname leftmargin\ifnum\@listdepth=\@ne i\else
- ii\fi\endcsname
+ \leftmargin=\csname leftmargin%
+ \ifnum\@listdepth=\@ne i\else ii\fi\endcsname
}
\def\FB@itemizesettings{%
\ifFBStandardListSpacing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-french/frenchb.ldf new/tex/generic/babel-french/frenchb.ldf
--- old/tex/generic/babel-french/frenchb.ldf 2019-04-02 23:11:24.000000000 +0200
+++ new/tex/generic/babel-french/frenchb.ldf 2020-04-18 22:56:42.000000000 +0200
@@ -24,10 +24,10 @@
%% Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
%%
\ProvidesLanguage{frenchb}
- [2019/03/30 v3.5e French support from the babel system]
+ [2020/04/18 v3.5h French support from the babel system]
\def\bbl@tempa{frenchb}
\ifx\CurrentOption\bbl@tempa
- \let\l@frenchb\l@french
+ \chardef\l@frenchb\l@french
\def\CurrentOption{french}
\PackageWarning{babel-french}%
{Option `frenchb' for Babel is *deprecated*,\MessageBreak
@@ -36,18 +36,17 @@
\else
\def\bbl@tempa{francais}
\ifx\CurrentOption\bbl@tempa
- \let\l@francais\l@french
+ \chardef\l@francais\l@french
\def\CurrentOption{french}
\ifx\magnification\@undefined
\PackageWarning{babel-french}%
{Option `francais' for Babel is *deprecated*,\MessageBreak
it might be removed sooner or later. Please\MessageBreak
- use `french' instead; reported}%
+ use `french' instead; reported}
\fi
\else
\def\bbl@tempa{canadien}
\ifx\CurrentOption\bbl@tempa
- \let\l@canadien\l@acadian
\def\CurrentOption{acadian}
\PackageWarning{babel-french}%
{Option `canadien' for Babel is *deprecated*,\MessageBreak
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-french/frenchb.lua new/tex/generic/babel-french/frenchb.lua
--- old/tex/generic/babel-french/frenchb.lua 2019-04-02 23:11:24.000000000 +0200
+++ new/tex/generic/babel-french/frenchb.lua 2020-04-18 22:56:42.000000000 +0200
@@ -1,7 +1,7 @@
--[[
File `frenchb.lua’ generated from frenchb.dtx
- [2019/03/30 v3.5e French support from the babel system]
- Copyright © 2014-2019 Daniel Flipo
+ [2020/04/18 v3.5h French support from the babel system]
+ Copyright © 2014-2020 Daniel Flipo
<daniel (dot) flipo (at) free (dot) fr>
License LPPL: see french.ldf.
--]]
@@ -42,6 +42,7 @@
local PENALTY = node_id("penalty")
local nobreak = new_node(PENALTY)
nobreak.penalty = 10000
+local nbspace = new_node(GLYPH)
local insert_node_before = node.insert_before
local insert_node_after = node.insert_after
local remove_node = node.remove
@@ -115,175 +116,189 @@
local FBucsNBSP = luatexbase.attributes['FB@ucsNBSP']
local FBdialect = luatexbase.attributes['FB@dialect']
local has_attribute = node.has_attribute
+-- Main function (to be added to the kerning callback).
local function french_punctuation (head)
+ node.kerning(head)
for item in node.traverse_id(GLYPH, head) do
local lang = item.lang
local char = item.char
- local fid = item.font
- local FRspacing = has_attribute(item, FBspacing)
- FRspacing = FRspacing and FRspacing > 0
- local FRucsNBSP = has_attribute(item, FBucsNBSP)
- FRucsNBSP = FRucsNBSP and FRucsNBSP > 0
- local FRdialect = has_attribute(item, FBdialect)
- FRdialect = FRdialect and FRdialect > 0
- local SIG = has_attribute(item, addGUILspace)
- SIG = SIG and SIG >0
- if lang ~= FR_fr and lang ~= FR_ca then
- FRspacing = nil
- end
- local nbspace = new_node("glyph")
- if FRspacing and FB_punct_left[char] and fid > 0 then
- local prev = item.prev
- local prev_id, prev_subtype, prev_char
- if prev then
- prev_id = prev.id
- prev_subtype = prev.subtype
- if prev_id == GLYPH then
- prev_char = prev.char
- end
- end
- local is_glue = prev_id == GLUE
- local glue_wd
- if is_glue then
- glue_wd = prev.width
- end
- local realglue = is_glue and glue_wd > 1
- if FB_punct_thin[char] or FB_punct_thick[char] then
- local SBDP = has_attribute(item, addDPspace)
- local auto = SBDP and SBDP > 0
- if FB_punct_thick[char] and auto then
+ if (lang == FR_fr or lang == FR_ca) and
+ (FB_punct_left[char] or FB_punct_right[char]) then
+ local fid = item.font
+ local attr = item.attr
+ local FRspacing = has_attribute(item, FBspacing)
+ FRspacing = FRspacing and FRspacing > 0
+ local FRucsNBSP = has_attribute(item, FBucsNBSP)
+ FRucsNBSP = FRucsNBSP and FRucsNBSP > 0
+ local FRdialect = has_attribute(item, FBdialect)
+ FRdialect = FRdialect and FRdialect > 0
+ local SIG = has_attribute(item, addGUILspace)
+ SIG = SIG and SIG >0
+ if FRspacing and fid > 0 then
+ if FB_punct_left[char] then
+ local prev = item.prev
+ local prev_id, prev_subtype, prev_char
+ if prev then
+ prev_id = prev.id
+ prev_subtype = prev.subtype
+ if prev_id == GLYPH then
+ prev_char = prev.char
+ end
+ end
+ local is_glue = prev_id == GLUE
+ local glue_wd
+ if is_glue then
+ glue_wd = prev.width
+ end
+ local realglue = is_glue and glue_wd > 1
+ if FB_punct_thin[char] or FB_punct_thick[char] then
+ local SBDP = has_attribute(item, addDPspace)
+ local auto = SBDP and SBDP > 0
+ if FB_punct_thick[char] and auto then
+ local next = item.next
+ local next_id
+ if next then
+ next_id = next.id
+ end
+ if next_id and next_id == GLYPH then
+ auto = false
+ end
+ end
+ if auto then
+ if (prev_char and FB_punct_null[prev_char]) or
+ (is_glue and glue_wd <= 1) or
+ (prev_id == HLIST and prev_subtype == 3) or
+ (prev_id == TEMP) then
+ auto = false
+ end
+ end
+ local fbglue
+ local t
+ if FB_punct_thick[char] then
+ if FRdialect then
+ t = FBsp.colon.gl.ac
+ nbspace.char = FBsp.colon.ch.ac
+ else
+ t = FBsp.colon.gl.fr
+ nbspace.char = FBsp.colon.ch.fr
+ end
+ else
+ if FRdialect then
+ t = FBsp.thin.gl.ac
+ nbspace.char = FBsp.thin.ch.ac
+ else
+ t = FBsp.thin.gl.fr
+ nbspace.char = FBsp.thin.ch.fr
+ end
+ end
+ fbglue = new_glue_scaled(fid, t)
+ if (realglue or auto) and fbglue then
+ if realglue then
+ head = remove_node(head,prev,true)
+ end
+ if (FRucsNBSP) then
+ nbspace.font = fid
+ nbspace.attr = attr
+ insert_node_before(head,item,copy_node(nbspace))
+ else
+ nobreak.attr = attr
+ fbglue.attr = attr
+ insert_node_before(head,item,copy_node(nobreak))
+ insert_node_before(head,item,copy_node(fbglue))
+ end
+ end
+ elseif SIG then
+ local addgl = (prev_char and
+ not FB_guil_null[prev_char])
+ or
+ (not prev_char and
+ prev_id ~= TEMP and
+ not (prev_id == HLIST and
+ prev_subtype == 3)
+ )
+ if is_glue and glue_wd <= 1 then
+ addgl = false
+ end
+ local t = FBsp.guill.gl.fr
+ nbspace.char = FBsp.guill.ch.fr
+ if FRdialect then
+ t = FBsp.guill.gl.ac
+ nbspace.char = FBsp.guill.ch.ac
+ end
+ local fbglue = new_glue_scaled(fid, t)
+ if addgl and fbglue then
+ if is_glue then
+ head = remove_node(head,prev,true)
+ end
+ if (FRucsNBSP) then
+ nbspace.font = fid
+ nbspace.attr = attr
+ insert_node_before(head,item,copy_node(nbspace))
+ else
+ nobreak.attr = attr
+ fbglue.attr = attr
+ insert_node_before(head,item,copy_node(nobreak))
+ insert_node_before(head,item,copy_node(fbglue))
+ end
+ end
+ end
+ elseif SIG then
local next = item.next
- local next_id
+ local next_id, next_subtype, next_char, nextnext, kern_wd
if next then
next_id = next.id
+ next_subtype = next.subtype
+ if next_id == GLYPH then
+ next_char = next.char
+ elseif next_id == KERN then
+ kern_wd = next.kern
+ if kern_wd == 0 then
+ nextnext = next.next
+ if nextnext then
+ next = nextnext
+ next_id = nextnext.id
+ next_subtype = nextnext.subtype
+ if next_id == GLYPH then
+ next_char = nextnext.char
+ end
+ end
+ end
+ end
end
- if next_id and next_id == GLYPH then
- auto = false
- end
- end
- if auto then
- if (prev_char and FB_punct_null[prev_char]) or
- (is_glue and glue_wd <= 1) or
- (prev_id == HLIST and prev_subtype == 3) or
- (prev_id == TEMP) then
- auto = false
+ local is_glue = next_id == GLUE
+ if is_glue then
+ glue_wd = next.width
end
- end
- local fbglue
- local t
- if FB_punct_thick[char] then
- if FRdialect then
- t = FBsp.colon.gl.ac
- nbspace.char = FBsp.colon.ch.ac
- else
- t = FBsp.colon.gl.fr
- nbspace.char = FBsp.colon.ch.fr
+ local addgl = (next_char and not FB_guil_null[next_char])
+ or (next and not next_char)
+ if is_glue and glue_wd == 0 then
+ addgl = false
end
- else
+ local fid = item.font
+ local t = FBsp.guill.gl.fr
+ nbspace.char = FBsp.guill.ch.fr
if FRdialect then
- t = FBsp.thin.gl.ac
- nbspace.char = FBsp.thin.ch.ac
- else
- t = FBsp.thin.gl.fr
- nbspace.char = FBsp.thin.ch.fr
- end
- end
- fbglue = new_glue_scaled(fid, t)
- if (realglue or auto) and fbglue then
- if realglue then
- head = remove_node(head,prev,true)
- end
- if (FRucsNBSP) then
- nbspace.font = fid
- insert_node_before(head, item, copy_node(nbspace))
- else
- insert_node_before(head, item, copy_node(nobreak))
- insert_node_before(head, item, copy_node(fbglue))
- end
- end
- elseif SIG then
- local addgl = (prev_char and not FB_guil_null[prev_char]) or
- (not prev_char and
- prev_id ~= TEMP and
- not (prev_id == HLIST and prev_subtype == 3)
- )
- if is_glue and glue_wd <= 1 then
- addgl = false
- end
- local t = FBsp.guill.gl.fr
- nbspace.char = FBsp.guill.ch.fr
- if FRdialect then
- t = FBsp.guill.gl.ac
- nbspace.char = FBsp.guill.ch.ac
- end
- local fbglue = new_glue_scaled(fid, t)
- if addgl and fbglue then
- if is_glue then
- head = remove_node(head,prev,true)
- end
- if (FRucsNBSP) then
- nbspace.font = fid
- insert_node_before(head, item, copy_node(nbspace))
- else
- insert_node_before(head, item, copy_node(nobreak))
- insert_node_before(head, item, copy_node(fbglue))
+ t = FBsp.guill.gl.ac
+ nbspace.char = FBsp.guill.ch.ac
end
- end
- end
- end
- if FRspacing and FB_punct_right[char]
- and fid > 0 and SIG then
- local next = item.next
- local next_id, next_subtype, next_char, nextnext, kern_wd
- if next then
- next_id = next.id
- next_subtype = next.subtype
- if next_id == GLYPH then
- next_char = next.char
- elseif next_id == KERN then
- kern_wd = next.kern
- if kern_wd == 0 then
- nextnext = next.next
- if nextnext then
- next = nextnext
- next_id = nextnext.id
- next_subtype = nextnext.subtype
- if next_id == GLYPH then
- next_char = nextnext.char
- end
+ local fbglue = new_glue_scaled(fid, t)
+ if addgl and fbglue then
+ if is_glue then
+ head = remove_node(head,next,true)
+ end
+ if (FRucsNBSP) then
+ nbspace.font = fid
+ nbspace.attr = attr
+ insert_node_after(head, item, copy_node(nbspace))
+ else
+ nobreak.attr = attr
+ fbglue.attr = attr
+ insert_node_after(head, item, copy_node(fbglue))
+ insert_node_after(head, item, copy_node(nobreak))
end
end
end
end
- local is_glue = next_id == GLUE
- if is_glue then
- glue_wd = next.width
- end
- local addgl = (next_char and not FB_guil_null[next_char]) or
- (next and not next_char)
- if is_glue and glue_wd == 0 then
- addgl = false
- end
- local fid = item.font
- local t = FBsp.guill.gl.fr
- nbspace.char = FBsp.guill.ch.fr
- if FRdialect then
- t = FBsp.guill.gl.ac
- nbspace.char = FBsp.guill.ch.ac
- end
- local fbglue = new_glue_scaled(fid, t)
- if addgl and fbglue then
- if is_glue then
- head = remove_node(head,next,true)
- end
- if (FRucsNBSP) then
- nbspace.font = fid
- insert_node_after(head, item, copy_node(nbspace))
- else
- insert_node_after(head, item, copy_node(fbglue))
- insert_node_after(head, item, copy_node(nobreak))
- end
- end
end
end
return head
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-french.tlpobj new/tlpkg/tlpobj/babel-french.tlpobj
--- old/tlpkg/tlpobj/babel-french.tlpobj 2019-04-03 01:24:52.000000000 +0200
+++ new/tlpkg/tlpobj/babel-french.tlpobj 2020-04-19 18:09:40.000000000 +0200
@@ -1,6 +1,6 @@
name babel-french
category Package
-revision 50711
+revision 54787
shortdesc Babel contributed support for French
relocated 1
longdesc The package, formerly known as frenchb, establishes French
@@ -15,7 +15,6 @@
RELOC/tex/generic/babel-french/frenchb.lua
catalogue-contact-home http://daniel.flipo.free.fr/babel-french
catalogue-ctan /macros/latex/contrib/babel-contrib/french
-catalogue-date 2019-04-01 22:16:31 +0200
catalogue-license lppl1.3
catalogue-topics french multilingual-addon
-catalogue-version 3.5e
+catalogue-version 3.5h
++++++ babel-greek.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-greek/README new/doc/generic/babel-greek/README
--- old/doc/generic/babel-greek/README 2016-09-07 23:47:53.000000000 +0200
+++ new/doc/generic/babel-greek/README 2020-03-23 23:23:08.000000000 +0100
@@ -61,6 +61,10 @@
(new in fontspec v2.5a).
1.9g 2016-09-07 Babel 3.9i deprecated ``\textlatin``
and fixed ``\latinencoding``.
+1.9h 2019-07-11 Move breathing composite commands to textalpha_.
+1.9i 2020-02-28 Update test for Unicode fonts.
+ Fix accent in ``\seename`` and ``\alsoname``.
+1.9j 2020/03/17 Fix ampersand in math.
===== ============ ============================================================
@@ -113,12 +117,22 @@
* Run ``tex`` or ``latex`` on the batch file ``babel-greek.ins``.
+ This will generate the files ``greek.ldf``, ``athnum.sty``, and
+ ``grmath.sty`` in the current directory. [#]_
+
* Move all files ending in ``.ldf`` or ``.sty`` into a directory searched by
TeX.
* To produce the documentation, run the file ``usage.tex`` and all files
ending in ``.dtx`` through LaTeX.
+.. [#] If these files already exist somewhere in the TeX-path, you will be
+ warned that they might be overwritten. You can ignore this
+ warning and answer `y` unless the *current directory* contains versions
+ of these files you want to keep.
+
+ This is done by docstrip_. Try ``texdoc docstrip`` for details.
+
Usage
-----
@@ -218,6 +232,7 @@
.. _LaTeX Project Public License: http://www.latex-project.org/lppl.txt
.. _babel: http://www.ctan.org/pkg/babel
+.. _docstrip: http://www.ctan.org/pkg/docstrip
.. _font encoding: http://mirror.ctan.org/macros/latex/doc/encguide.pdf
.. _fontspec: http://www.ctan.org/pkg/fontspec
.. _CB Fonts: http://www.ctan.org/pkg/cbgreek-complete
@@ -225,6 +240,7 @@
.. _Deja Vu: http://dejavu-fonts.org
.. _e-TeX: http://www.tex.ac.uk/cgi-bin/texfaq2html?label=etex
.. _grtimes: http://www.ctan.org/pkg/grtimes
+.. _textalpha:
.. _greek-fontenc: http://www.ctan.org/pkg/greek-fontenc
.. _greek-inputenc: http://www.ctan.org/pkg/greek-inputenc
.. _GFS font collection: http://www.ctan.org/pkg/gfs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-greek/README.html new/doc/generic/babel-greek/README.html
--- old/doc/generic/babel-greek/README.html 2016-09-07 23:47:53.000000000 +0200
+++ new/doc/generic/babel-greek/README.html 2020-03-23 23:23:08.000000000 +0100
@@ -2,14 +2,16 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta charset="utf-8"/>
-<meta name="generator" content="Docutils 0.13: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.17b.dev: http://docutils.sourceforge.net/" />
<title>babel-greek</title>
+<meta name="dcterms.rights" content="© 1997 Apostolos Syropoulos, Claudio Beccari, Johannes Brahms, © 2013 Günter Milde" />
+<link rel="schema.dcterms" href="http://purl.org/dc/terms/">
<style type="text/css">
/* Minimal style sheet for the HTML output of Docutils. */
/* */
/* :Author: Günter Milde, based on html4css1.css by David Goodger */
-/* :Id: $Id: minimal.css 7952 2016-07-26 18:15:59Z milde $ */
+/* :Id: $Id$ */
/* :Copyright: © 2015 Günter Milde. */
/* :License: Released under the terms of the `2-Clause BSD license`_, */
/* in short: */
@@ -40,10 +42,10 @@
h1.title, p.subtitle {
text-align: center;
}
-p.admonition-title,
p.topic-title,
p.sidebar-title,
p.rubric,
+p.admonition-title,
p.system-message-title {
font-weight: bold;
}
@@ -101,10 +103,11 @@
}
/* Table of Contents */
-div.topic.contents { margin: 0; }
-ul.auto-toc {
+div.topic.contents { margin: 0.5em 0; }
+div.topic.contents ul {
list-style-type: none;
- padding-left: 1.5em; }
+ padding-left: 1.5em;
+}
/* Enumerated Lists */
ol.arabic { list-style: decimal }
@@ -159,7 +162,7 @@
dd.authors > p { margin: 0; }
/* Option Lists */
-dl.option-list { margin-left: 40px; }
+dl.option-list { margin-left: 1.5em; }
dl.option-list > dt { font-weight: normal; }
span.option { white-space: nowrap; }
@@ -189,45 +192,54 @@
/* Figures, Images, and Tables */
.figure.align-left,
+figure.align-left,
img.align-left,
object.align-left,
table.align-left {
margin-right: auto;
}
.figure.align-center,
+figure.align-center,
img.align-center,
-object.align-center {
- margin-left: auto;
- margin-right: auto;
- display: block;
-}
+object.align-center,
table.align-center {
margin-left: auto;
margin-right: auto;
}
.figure.align-right,
+figure.align-right,
img.align-right,
object.align-right,
table.align-right {
margin-left: auto;
}
+.figure.align-center, .figure.align-right,
+figure.align-center, figure.align-right,
+img.align-center, img.align-right,
+object.align-center, object.align-right {
+ display: block;
+}
/* reset inner alignment in figures and tables */
-div.align-left, div.align-center, div.align-right,
-table.align-left, table.align-center, table.align-right
-{ text-align: inherit }
+.figure.align-left, .figure.align-right,
+figure.align-left, figure.align-right,
+table.align-left, table.align-center, table.align-right {
+ text-align: inherit;
+}
/* Admonitions and System Messages */
div.admonition,
div.system-message,
-div.sidebar{
- margin: 40px;
+aside.sidebar {
+ margin: 1em 1.5em;
border: medium outset;
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
padding-right: 1em;
padding-left: 1em;
}
/* Sidebar */
-div.sidebar {
+aside.sidebar {
width: 30%;
max-width: 26em;
float: right;
@@ -235,13 +247,14 @@
}
/* Text Blocks */
+blockquote,
div.topic,
pre.literal-block,
pre.doctest-block,
pre.math,
pre.code {
- margin-right: 40px;
- margin-left: 40px;
+ margin-left: 1.5em;
+ margin-right: 1.5em;
}
pre.code .ln { color: gray; } /* line numbers */
@@ -267,14 +280,23 @@
padding-right: 0.5em /* separate table cells */
}
+/* Document Header and Footer */
+header { border-bottom: 1px solid black; }
+footer { border-top: 1px solid black; }
+
+/* new HTML5 block elements: set display for older browsers */
+header, section, footer, aside, nav, main, article, figure {
+ display: block;
+}
+
</style>
<style type="text/css">
/* CSS31_ style sheet for the output of Docutils HTML writers. */
-/* Rules for easy reading and pre-defined style variants. */
+/* Rules for easy reading and pre-defined style variants. */
/* */
/* :Author: Günter Milde, based on html4css1.css by David Goodger */
-/* :Id: $Id: plain.css 7952 2016-07-26 18:15:59Z milde $ */
+/* :Id: $Id$ */
/* :Copyright: © 2015 Günter Milde. */
/* :License: Released under the terms of the `2-Clause BSD license`_, */
/* in short: */
@@ -282,11 +304,11 @@
/* Copying and distribution of this file, with or without modification, */
/* are permitted in any medium without royalty provided the copyright */
/* notice and this notice are preserved. */
-/* */
+/* */
/* This file is offered as-is, without any warranty. */
/* */
/* .. _2-Clause BSD license: http://www.spdx.org/licenses/BSD-2-Clause */
-/* .. _CSS3: http://www.w3.org/TR/CSS3 */
+/* .. _CSS3: http://www.w3.org/TR/CSS3 */
/* Document Structure */
@@ -294,17 +316,20 @@
/* "page layout" */
body {
- padding: 0 5%;
- margin: 8px 0;
+ margin: 0;
+ background-color: #dbdbdb;
}
-div.document {
+div.document,
+main {
line-height:1.3;
counter-reset: table;
/* counter-reset: figure; */
/* avoid long lines --> better reading */
/* OTOH: lines should not be too short because of missing hyphenation, */
max-width: 50em;
+ padding: 1px 2%; /* 1px on top avoids grey bar above title (mozilla) */
margin: auto;
+ background-color: white;
}
/* Sections */
@@ -318,32 +343,35 @@
clear: both;
}
-/* Paragraphs */
-/* ========== */
+/* Paragraphs */
+/* ========== */
/* vertical space (parskip) */
-p, ol, ul, dl,
+p, ol, ul, dl, li, dd,
div.line-block,
-table{
+div.topic,
+table {
margin-top: 0.5em;
margin-bottom: 0.5em;
}
+p:first-child { margin-top: 0; }
+/* (:last-child is new in CSS 3) */
+p:last-child { margin-bottom: 0; }
+
h1, h2, h3, h4, h5, h6,
dl > dd {
margin-bottom: 0.5em;
}
-/* Lists */
-/* ========== */
-
-/* Definition Lists */
+/* Lists */
+/* ===== */
-dl > dd p:first-child { margin-top: 0; }
-/* :last-child is not part of CSS 2.1 (introduced in CSS 3) */
-/* dl > dd p:last-child { margin-bottom: 0; } */
+/* Separate list entries in compound lists */
+dl > dd, ol > li,
-/* lists nested in definition lists */
-/* :only-child is not part of CSS 2.1 (introduced in CSS 3) */
+/* Definition Lists */
+/* Indent lists nested in definition lists */
+/* (:only-child is new in CSS 3) */
dd > ul:only-child, dd > ol:only-child { padding-left: 1em; }
/* Description Lists */
@@ -392,23 +420,20 @@
font-weight: normal;
}
-/* Text Blocks */
-/* ============ */
+/* Text Blocks */
+/* =========== */
-/* Literal Blocks */
-pre.literal-block, pre.doctest-block,
-pre.math, pre.code {
- margin-left: 1.5em;
- margin-right: 1.5em
+/* Literal Blocks */
+
+pre.literal-block,
+pre.doctest-block,
+pre.math,
+pre.code {
+ font-family: monospace;
}
-/* Block Quotes */
+/* Block Quotes */
-blockquote,
-div.topic {
- margin-left: 1.5em;
- margin-right: 1.5em
-}
blockquote > table,
div.topic > table {
margin-top: 0;
@@ -420,8 +445,8 @@
margin-left: 20%;
}
-/* Tables */
-/* ====== */
+/* Tables */
+/* ====== */
/* th { vertical-align: bottom; } */
@@ -448,11 +473,11 @@
font-weight: bold;
}
-/* Explicit Markup Blocks */
-/* ====================== */
+/* Explicit Markup Blocks */
+/* ====================== */
-/* Footnotes and Citations */
-/* ----------------------- */
+/* Footnotes and Citations */
+/* ----------------------- */
/* line on the left */
dl.footnote {
@@ -461,48 +486,52 @@
border-left-width: thin;
}
-/* Directives */
-/* ---------- */
+/* Directives */
+/* ---------- */
-/* Body Elements */
-/* ~~~~~~~~~~~~~ */
+/* Body Elements */
+/* ~~~~~~~~~~~~~ */
/* Images and Figures */
/* let content flow to the side of aligned images and figures */
.figure.align-left,
+figure.align-left,
img.align-left,
object.align-left {
display: block;
clear: left;
float: left;
- margin-right: 1em
+ margin-right: 1em;
}
.figure.align-right,
+figure.align-right,
img.align-right,
object.align-right {
display: block;
clear: right;
float: right;
- margin-left: 1em
+ margin-left: 1em;
}
/* Stop floating sidebars, images and figures at section level 1,2,3 */
h1, h2, h3 { clear: both; }
/* Sidebar */
-/* Move into the margin. In a layout with fixed margins, */
-/* it can be moved into the margin completely. */
-div.sidebar {
+/* Move right. In a layout with fixed margins, */
+/* it can be moved into the margin. */
+div.sidebar,
+aside.sidebar {
width: 30%;
max-width: 26em;
margin-left: 1em;
- margin-right: -5.5%;
- background-color: #ffffee ;
+ margin-right: -2%;
+ background-color: #ffffee;
}
-/* Code */
+/* Code */
+pre.code { padding: 0.7ex }
pre.code, code { background-color: #eeeeee }
pre.code .ln { color: gray; } /* line numbers */
/* basic highlighting: for a complete scheme, see */
@@ -514,57 +543,58 @@
pre.code .deleted, code .deleted { background-color: #DEB0A1}
pre.code .inserted, code .inserted { background-color: #A3D289}
-/* Math */
+/* Math */
/* styled separately (see math.css for math-output=HTML) */
-/* Epigraph */
-/* Highlights */
-/* Pull-Quote */
-/* Compound Paragraph */
-/* Container */
-
-/* can be styled in a custom stylesheet */
+/* Epigraph */
+/* Highlights */
+/* Pull-Quote */
+/* Compound Paragraph */
+/* Container */
/* Document Header and Footer */
-div.footer, div.header {
- clear: both;
+footer, header {
font-size: smaller;
-}
-
-/* Inline Markup */
-/* ============= */
+ clear: both;
+ padding: 0.5em 2%;
+ background-color: #ebebee;
+ border: none;
+}
+
+/* Inline Markup */
+/* ============= */
+
+/* Emphasis */
+/* em */
+/* Strong Emphasis */
+/* strong */
+/* Interpreted Text */
+/* span.interpreted */
+/* Title Reference */
+/* cite */
-/* Emphasis */
-/* em */
-/* Strong Emphasis */
-/* strong */
-/* Interpreted Text */
-/* span.interpreted */
-/* Title Reference */
-/* cite */
-/* Inline Literals */
+/* Inline Literals */
/* possible values: normal, nowrap, pre, pre-wrap, pre-line */
-/* span.docutils.literal { white-space: pre-wrap; } */
+/* span.docutils.literal { white-space: pre-wrap; } */
-/* Hyperlink References */
+/* Hyperlink References */
a { text-decoration: none; }
-/* External Targets */
-/* span.target.external */
-/* Internal Targets */
-/* span.target.internal */
-/* Footnote References */
-/* a.footnote-reference */
-/* Citation References */
-/* a.citation-reference */
+/* External Targets */
+/* span.target.external */
+/* Internal Targets */
+/* span.target.internal */
+/* Footnote References */
+/* a.footnote-reference */
+/* Citation References */
+/* a.citation-reference */
</style>
</head>
<body>
-<div class="document" id="babel-greek">
+<main id="babel-greek">
<h1 class="title">babel-greek</h1>
-
<p class="subtitle" id="babel-support-for-the-greek-language-and-script">Babel support for the Greek language and script</p>
<dl class="docinfo simple">
<dt class="copyright">Copyright</dt>
@@ -577,7 +607,7 @@
</dd>
</dl>
<div class="abstract topic">
-<p class="topic-title first">Abstract</p>
+<p class="topic-title">Abstract</p>
<p>Babel-greek is a contributed package providing support for the
Greek language and script via the <a class="reference external" href="http://www.ctan.org/pkg/babel">Babel</a> system.</p>
<p>The file <span class="docutils literal">greek.ldf</span> provides options for the monotonic
@@ -586,7 +616,7 @@
<p>Since 2013-07-19, babel-greek supports also Unicode-aware TeX
engines (XeTeX/LuaTeX).</p>
</div>
-<div class="section" id="news">
+<section id="news">
<h1>News</h1>
<table class="borderless">
<colgroup>
@@ -713,10 +743,23 @@
<td><p>Babel 3.9i deprecated <span class="docutils literal">\textlatin</span>
and fixed <span class="docutils literal">\latinencoding</span>.</p></td>
</tr>
+<tr><td><p>1.9h</p></td>
+<td><p>2019-07-11</p></td>
+<td><p>Move breathing composite commands to <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">textalpha</a>.</p></td>
+</tr>
+<tr><td><p>1.9i</p></td>
+<td><p>2020-02-28</p></td>
+<td><p>Update test for Unicode fonts.
+Fix accent in <span class="docutils literal">\seename</span> and <span class="docutils literal">\alsoname</span>.</p></td>
+</tr>
+<tr><td><p>1.9j</p></td>
+<td><p>2020/03/17</p></td>
+<td><p>Fix ampersand in math.</p></td>
+</tr>
</tbody>
</table>
-</div>
-<div class="section" id="files">
+</section>
+<section id="files">
<h1>Files</h1>
<dl class="simple">
<dt><a class="reference external" href="babel-greek.ins">babel-greek.ins</a>; <a class="reference external" href="babel-greek.pdf">babel-greek.pdf</a></dt>
@@ -741,30 +784,42 @@
<dd><p>Description of the <a class="reference internal" href="#lgr-latin-transliteration">LGR Latin transliteration</a>.</p>
</dd>
</dl>
-</div>
-<div class="section" id="requirements">
+</section>
+<section id="requirements">
<h1>Requirements</h1>
<p>The “babel-greek” package requires the <a class="reference external" href="http://www.ctan.org/pkg/babel">babel</a> base package and font
definition files from the <a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a> package. The <a class="reference external" href="http://www.ctan.org/pkg/greek-inputenc">greek-inputenc</a>
package is recommended when using 8-bit TeX engines.</p>
<p>Typesetting Greek texts requires <a class="reference internal" href="#greek-text-fonts">Greek text fonts</a>.</p>
<p>Plain TeX is currently not supported. Patches are welcome.</p>
-</div>
-<div class="section" id="installation">
+</section>
+<section id="installation">
<h1>Installation</h1>
<p>If possible, get this package from your distribution using its installation
manager.</p>
<p>Otherwise, make sure LaTeX can find the required files:</p>
-<ul class="simple">
+<ul>
<li><p>Download and unpack <cite>babel-greek.zip</cite>.</p></li>
-<li><p>Run <span class="docutils literal">tex</span> or <span class="docutils literal">latex</span> on the batch file <span class="docutils literal"><span class="pre">babel-greek.ins</span></span>.</p></li>
+<li><p>Run <span class="docutils literal">tex</span> or <span class="docutils literal">latex</span> on the batch file <span class="docutils literal"><span class="pre">babel-greek.ins</span></span>.</p>
+<p>This will generate the files <span class="docutils literal">greek.ldf</span>, <span class="docutils literal">athnum.sty</span>, and
+<span class="docutils literal">grmath.sty</span> in the current directory.<a class="footnote-reference superscript" href="#id2" id="id1">1</a></p>
+</li>
<li><p>Move all files ending in <span class="docutils literal">.ldf</span> or <span class="docutils literal">.sty</span> into a directory searched by
TeX.</p></li>
<li><p>To produce the documentation, run the file <span class="docutils literal">usage.tex</span> and all files
ending in <span class="docutils literal">.dtx</span> through LaTeX.</p></li>
</ul>
-</div>
-<div class="section" id="usage">
+<dl class="footnote superscript">
+<dt class="label" id="id2"><span class="superscript"><a class="fn-backref" href="#id1">1</a></span></dt>
+<dd><p>If these files already exist somewhere in the TeX-path, you will be
+warned that they might be overwritten. You can ignore this
+warning and answer <cite>y</cite> unless the <em>current directory</em> contains versions
+of these files you want to keep.</p>
+<p>This is done by <a class="reference external" href="http://www.ctan.org/pkg/docstrip">docstrip</a>. Try <span class="docutils literal">texdoc docstrip</span> for details.</p>
+</dd>
+</dl>
+</section>
+<section id="usage">
<h1>Usage</h1>
<p>Use the “greek” document option or pass the “greek” option to babel:</p>
<pre class="literal-block">\usepackage[greek]{babel}</pre>
@@ -789,8 +844,8 @@
<a class="reference external" href="http://www.ctan.org/pkg/greek-inputenc">greek-inputenc</a> package or with XeTeX or LuaTeX) or the <a class="reference internal" href="#lgr-latin-transliteration">LGR Latin
transliteration</a>. See <a class="reference external" href="usage.pdf">usage.pdf</a> and the example files provided with
<a class="reference external" href="http://www.ctan.org/pkg/greek-fontenc">greek-fontenc</a>.</p>
-</div>
-<div class="section" id="greek-text-fonts">
+</section>
+<section id="greek-text-fonts">
<h1>Greek text fonts</h1>
<p>A list of Greek text fonts for use with LaTeX is available at the CTAN
<a class="reference external" href="http://www.ctan.org/topic/font-greek">http://www.ctan.org/topic/font-greek</a></p>
@@ -804,8 +859,8 @@
<a class="reference external" href="http://www.ctan.org/pkg/grtimes">grtimes</a> (Greek Times), <a class="reference external" href="http://www.ctan.org/pkg/kerkis">Kerkis</a> (matching URW Bookman), and the <a class="reference external" href="http://www.ctan.org/pkg/gfs">GFS font
collection</a>. Setup of these fonts as Greek variant to matching Latin fonts
is facilitated by the <a class="reference external" href="http://www.ctan.org/pkg/substitutefont">substitutefont</a> package.</p>
-</div>
-<div class="section" id="lgr-latin-transliteration">
+</section>
+<section id="lgr-latin-transliteration">
<h1>LGR Latin Transliteration</h1>
<p>The LGR font encoding allows input of Greek characters via an ASCII
transliteration. This enables simple input with a Latin keyboard. Characters
@@ -1018,7 +1073,7 @@
Unicode (with XeTeX or LuaTeX).</p>
<!-- References
- - - - - - - - - - -->
-</div>
-</div>
+</section>
+</main>
</body>
</html>
Binary files old/doc/generic/babel-greek/babel-greek.pdf and new/doc/generic/babel-greek/babel-greek.pdf differ
Binary files old/doc/generic/babel-greek/test-greek.pdf and new/doc/generic/babel-greek/test-greek.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-greek/test-greek.tex new/doc/generic/babel-greek/test-greek.tex
--- old/doc/generic/babel-greek/test-greek.tex 2015-09-05 23:59:55.000000000 +0200
+++ new/doc/generic/babel-greek/test-greek.tex 2020-03-23 23:23:08.000000000 +0100
@@ -101,7 +101,7 @@
Switching to a font encoding supporting the Greek script is possible without
switching the Babel language using the declarations \verb|\greekscript| (no
switch if the current encoding supports Greek script (e.g. the Unicode font
-encodings EU1, EU2)) or \verb|\greektext| (always switch to LGR) and the
+encoding TU)) or \verb|\greektext| (always switch to LGR) and the
corresponding macros \verb|\ensuregreek| or \verb|\textgreek|. These
commands do not start a new paragraph:
@@ -109,28 +109,30 @@
\latintext Friends (\ensuregreek{F\'ilwn}) of TeX.
\texttt{greek.ldf} has some workarounds, so that macros relying on Latin
-characters in the ``right'' positions keep working. We test, that these
+characters in standard positions keep working. We test, that these
definitions do not overwrite the selection of pre-composed characters for
-``copyright'' and ``registered trade mark'' by ``textcomp'' (try copy and
+``copyright'' and ``registered trade mark'' by \emph{textcomp} (try copy and
paste from the PDF output):
-Greek (LGR): \ensuregreek{Α \& Ω, \textcopyright{} \textregistered{}
-\texttrademark{}, © ® ™ } \\
-Latin: A \& O.
+Latin: A \& O, © ® ™ \\
+Greek (LGR): \ensuregreek{Α \textampersand{} Ω,
+\textcopyright{} \textregistered{} \texttrademark{}, \& © ® ™ }.
+
+The ampersand should also work in mathematical mode: $ 1 \& 2 $
To prevent Roman numerals being typeset in Greek letters we need to adopt
the internal LaTeX commands. Note that this may cause errors when roman
numerals are used in a situation where the macros need to be expanded:
\makeatletter
-Greek: \ensuregreek{
+Latin:
\@roman{1}, \@roman{2}, \@roman{3}, \@roman{4}, \ldots, \@roman{1975}
\@Roman{1}, \@Roman{2}, \@Roman{3}, \@Roman{4}, \ldots, \@Roman{1975}
-}
-Latin:
+Greek: \ensuregreek{
\@roman{1}, \@roman{2}, \@roman{3}, \@roman{4}, \ldots, \@roman{1975}
\@Roman{1}, \@Roman{2}, \@Roman{3}, \@Roman{4}, \ldots, \@Roman{1975}
+}
\makeatother
\section{MakeUppercase, MakeLowercase}
Binary files old/doc/generic/babel-greek/test-unicode-greek.pdf and new/doc/generic/babel-greek/test-unicode-greek.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-greek/test-unicode-greek.tex new/doc/generic/babel-greek/test-unicode-greek.tex
--- old/doc/generic/babel-greek/test-unicode-greek.tex 2016-09-07 23:47:53.000000000 +0200
+++ new/doc/generic/babel-greek/test-unicode-greek.tex 2020-02-28 23:28:16.000000000 +0100
@@ -32,9 +32,9 @@
Typesetting Greek texts requires a font containing Greek letters. With the
XeTeX or LuaTeX engines, the user must ensure that the selected font
-contains the required glyphs (the default Latin Modern fonts miss them).
-Examples for suitable fonts are the «Deja Vu», «Linux Libertine», or
-«Free Serif» OpenType fonts.
+contains the required glyphs (the default Latin Modern fonts miss most of
+them). Examples for suitable fonts are the «Deja Vu», «Linux Libertine»,
+or «Free Serif» OpenType fonts.
\section{Language Switch}
@@ -55,9 +55,9 @@
Every language switch to \texttt{greek} calls the \verb|\extrasgreek|
command which in turn calls \verb|\greekscript| to ensure a Greek-supporting
-font encoding (LGR, TU, EU1, or EU2). Under XeTeX/LuaTeX the font encoding
-normally just remains Unicode (TU, EU1, or EU2). For customization, you can
-add to or redefine the \verb|\extrasgreek| command.
+font encoding (LGR, TU, EU1, or EU2). Under Xe/LuaTeX the font encoding
+normally just remains Unicode (TU). For customization, you can add to or
+redefine the \verb|\extrasgreek| command.
The LGR font encoding does not support Latin characters. Therefore, the
Babel core defines the declaration \verb|\latintext| and the command
@@ -70,7 +70,7 @@
For customization, you can
add to or redefine the \verb|\noextrasgreek| command.
-With the Unicode font encodings TU, EU1 (XeTeX), or EU2 (LuaTeX),
+With the Unicode font encoding TU, EU1, or EU2,
Latin characters can be used in Greek text parts and
input via the «LGR Latin transcription» is not possible.%
\footnote{%
@@ -88,7 +88,8 @@
\section{LICR Macros}
Babel defines macros for several autogenerated strings so that they may
-appear in the choosen language. \emph{babel-greek} uses LICR macros in
+appear in the choosen language. \emph{babel-greek} uses LICR%
+\footnote{LaTeX internal character representation} macros in
order to let the string macros work independent of the font encoding.
If \emph{fontspec} is loaded, \emph{babel-greek} loads Greek LICR
Binary files old/doc/generic/babel-greek/test-unicode-lgr.pdf and new/doc/generic/babel-greek/test-unicode-lgr.pdf differ
Binary files old/doc/generic/babel-greek/usage.pdf and new/doc/generic/babel-greek/usage.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-greek.doc.tlpobj new/tlpkg/tlpobj/babel-greek.doc.tlpobj
--- old/tlpkg/tlpobj/babel-greek.doc.tlpobj 2019-02-28 03:17:06.000000000 +0100
+++ new/tlpkg/tlpobj/babel-greek.doc.tlpobj 2020-03-24 01:56:31.000000000 +0100
@@ -1,9 +1,9 @@
name babel-greek.doc
category Package
-revision 42010
+revision 54512
shortdesc doc files of babel-greek
relocated 1
-docfiles size=282
+docfiles size=283
RELOC/doc/generic/babel-greek/README
RELOC/doc/generic/babel-greek/README.html
RELOC/doc/generic/babel-greek/athnum.pdf
++++++ babel-greek.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-greek/greek.ldf new/tex/generic/babel-greek/greek.ldf
--- old/tex/generic/babel-greek/greek.ldf 2016-09-07 23:47:53.000000000 +0200
+++ new/tex/generic/babel-greek/greek.ldf 2020-03-23 23:23:08.000000000 +0100
@@ -32,11 +32,11 @@
%% and covered by LPPL is defined by the unpacking script (babel-greek.ins)
%% which is part of the package.
\ProvidesLanguage{greek}
- [2016/09/07 v1.9g Greek support for the babel system]
+ [2020/03/17 v1.9j Greek support for the babel system]
%% File `babel-greek.dtx'
%% Greek language Definition File
%% Copyright © 1997, 2005 Apostolos Syropoulos, Johannes Braams
-%% Copyright © 2013-2014 Günter Milde
+%% Copyright © 2013, 2019 Günter Milde
%% Please report errors to: Günter Milde <milde(a)users.sf.net>
\LdfInit\CurrentOption{captions\CurrentOption}
\gdef\CurrentOption{greek}
@@ -71,23 +71,14 @@
\let\captionsgreek\captionsancientgreek
\let\gr@month\gr@c@month % (modern) polytonic month names
}
-\@ifl@aded{def}{tuenc}{
- \providecommand*{\greekfontencoding}{TU}
+\ifdefined \UTFencname % set by "fontspec.sty"
+ \providecommand*{\greekfontencoding}{\UTFencname} % TU, EU1, or EU2
\providecommand*{\bbl@greek@fontencdef}{greek-euenc}
- \renewcommand*{\LastDeclaredEncoding}{TU}
-}{}
-\@ifl@aded{def}{eu1enc}{
- \providecommand*{\greekfontencoding}{EU1}
- \providecommand*{\bbl@greek@fontencdef}{greek-euenc}
- \renewcommand*{\LastDeclaredEncoding}{EU1}
-}{}
-\@ifl@aded{def}{eu2enc}{
- \providecommand*{\greekfontencoding}{EU2}
- \providecommand*{\bbl@greek@fontencdef}{greek-euenc}
- \renewcommand{\LastDeclaredEncoding}{EU2}
-}{}
-\providecommand*{\greekfontencoding}{LGR}
-\providecommand*{\bbl@greek@fontencdef}{lgrenc}
+ \renewcommand*{\LastDeclaredEncoding}{\UTFencname}
+\else
+ \providecommand*{\greekfontencoding}{LGR}
+ \providecommand*{\bbl@greek@fontencdef}{lgrenc}
+\fi
\@ifl@aded{def}{\bbl@greek@fontencdef}{}{
\InputIfFileExists{\bbl@greek@fontencdef .def}{}{
\errhelp{I can't find the \bbl@greek@fontencdef .def file
@@ -109,8 +100,9 @@
\ProvideTextCommand{\textregistered}{LGR}{\ensureascii{\textregistered}}
\ProvideTextCommand{\texttrademark}{LGR}{\ensureascii{\texttrademark}}
\let\ltx@amp\&
- \DeclareTextCommandDefault{\&}{\ltx@amp}
- \DeclareTextCommand{\&}{LGR}{\ensureascii{\ltx@amp}}
+ \ProvideTextCommandDefault{\textampersand}{\ltx@amp}
+ \ProvideTextCommand{\textampersand}{LGR}{\ensureascii{\ltx@amp}}
+ \DeclareRobustCommand{\&}{\ifmmode\ltx@amp\else\textampersand\fi}
\ProvideTextCommand{\SS}{LGR}{\ensureascii{\SS}}
\def\@roman#1{\expandafter\ensureascii\expandafter{\romannumeral#1}}
\def\@Roman#1{\expandafter\ensureascii\expandafter{%
@@ -214,8 +206,8 @@
\textomicron\acctonos\textiota\texteta\textsigma\textiota\textvarsigma}%
\def\headtoname{\textPi\textrho\accvaria\textomicron\textvarsigma}%
\def\pagename{\textSigma\textepsilon\textlambda\accvaria\textiota\textvarsigma}%
- \def\seename{\accdasiavaria\textomicron\textrho\textalpha}%
- \def\alsoname{\accdasiavaria\textomicron\textrho\textalpha{} \accdasia\textomega\textsigma
+ \def\seename{\accdasiaoxia\textomicron\textrho\textalpha}%
+ \def\alsoname{\accdasiaoxia\textomicron\textrho\textalpha{} \accdasia\textomega\textsigma
\textalpha\acctonos\textupsilon\texttau\textomega\textvarsigma}%
\def\proofname{\accpsili\textAlpha\textpi\acctonos\textomicron\textdelta\textepsilon
\textiota\textxi\textiota\textvarsigma}%
@@ -411,8 +403,6 @@
\DeclareTextCompositeCommand{\"}{LGR}{^^9f}{\accdialytika}
\DeclareTextCompositeCommand{\'}{LGR}{^^9f}{\LGR@hiatus}
\DeclareTextCompositeCommand{\`}{LGR}{^^9f}{\LGR@hiatus}
- \DeclareTextCompositeCommand{\<}{LGR}{^^9f}{\LGR@hiatus}
- \DeclareTextCompositeCommand{\>}{LGR}{^^9f}{\LGR@hiatus}
\addto\extraspolutonikogreek{\languageshorthands{greek}}%
\declare@shorthand{greek}{~}{\greek@tilde}
}{} % End of LGR-specific code.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-greek.tlpobj new/tlpkg/tlpobj/babel-greek.tlpobj
--- old/tlpkg/tlpobj/babel-greek.tlpobj 2019-02-28 03:17:06.000000000 +0100
+++ new/tlpkg/tlpobj/babel-greek.tlpobj 2020-03-24 01:56:31.000000000 +0100
@@ -1,6 +1,6 @@
name babel-greek
category Package
-revision 42010
+revision 54512
shortdesc Babel support for documents written in Greek
relocated 1
longdesc The file provides modes for monotonic (single-diacritic) and
@@ -12,7 +12,6 @@
RELOC/tex/generic/babel-greek/greek.ldf
RELOC/tex/generic/babel-greek/grmath.sty
catalogue-ctan /macros/latex/contrib/babel-contrib/greek
-catalogue-date 2018-01-13 10:24:37 +0100
catalogue-license lppl1.3
catalogue-topics greek multilingual-addon
-catalogue-version 1.9g
+catalogue-version 1.9j
++++++ babel-icelandic.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-icelandic/README.md new/doc/generic/babel-icelandic/README.md
--- old/doc/generic/babel-icelandic/README.md 2016-01-15 00:38:17.000000000 +0100
+++ new/doc/generic/babel-icelandic/README.md 2019-07-04 23:13:39.000000000 +0200
@@ -1,19 +1,27 @@
-Icelandic 1.2b
+Icelandic 1.3
--------------
This is the babel style for Icelandic.
-Changes 1.2a
+**This package is NOT being actively maintained, but bugs might
+got fixed if you report them. If you want to take over maintenance of
+this language style, please contact me at
+http://www.texnia.com/contact.html .**
+
+Changes 1.3
------------
-* It now works with LuaTeX
-* UTF-8 encoded strings for XeTeX and LuaTeX
-* Old icelandic with inputenc utf8
+* Updated to TU (and therefore removed the warning with EUx).
Changes 1.2b
------------
* Warning with xe/lua without EUx (and documented)
-----------
-2016-01-14
\ No newline at end of file
+
+Changes 1.2a
+------------
+
+* It now works with LuaTeX
+* UTF-8 encoded strings for XeTeX and LuaTeX
+* Old icelandic with inputenc utf8
Binary files old/doc/generic/babel-icelandic/icelandic.pdf and new/doc/generic/babel-icelandic/icelandic.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-icelandic.doc.tlpobj new/tlpkg/tlpobj/babel-icelandic.doc.tlpobj
--- old/tlpkg/tlpobj/babel-icelandic.doc.tlpobj 2019-02-28 03:17:07.000000000 +0100
+++ new/tlpkg/tlpobj/babel-icelandic.doc.tlpobj 2019-07-05 01:53:50.000000000 +0200
@@ -1,8 +1,8 @@
name babel-icelandic.doc
category Package
-revision 39387
+revision 51551
shortdesc doc files of babel-icelandic
relocated 1
-docfiles size=79
+docfiles size=57
RELOC/doc/generic/babel-icelandic/README.md
RELOC/doc/generic/babel-icelandic/icelandic.pdf
++++++ babel-icelandic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-icelandic/icelandic.ldf new/tex/generic/babel-icelandic/icelandic.ldf
--- old/tex/generic/babel-icelandic/icelandic.ldf 2016-01-15 00:38:17.000000000 +0100
+++ new/tex/generic/babel-icelandic/icelandic.ldf 2019-07-04 23:13:39.000000000 +0200
@@ -37,13 +37,13 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{icelandic}
- [2016/01/14 v1.2b Icelandic support from the babel system]
+ [2019/07/04 v1.3 Icelandic support from the babel system]
%% File iceland.dtx
%% Icelandic Language Definition File
-%% Copyright (C) 1996--2016
+%% Copyright (C) 1996--2019
%% by Einar \'Arnason <einar(a)lif.hi.is>
%% Johannes Braams, TeXniek
-%% Javier Bezos (1.2a,b)
+%% Javier Bezos (>=1.2a)
%%
\def\bbl@tempa{icelandic}
\ifx\CurrentOption\bbl@tempa
@@ -63,7 +63,7 @@
\@FI@
\providehyphenmins{\CurrentOption}{\tw@\tw@}
\StartBabelCommands*{icelandic}{captions}
- [unicode, charset=utf8, fontenc=EU1 EU2]
+ [unicode, charset=utf8, fontenc=EU1 EU2 TU]
\SetString{\prefacename}{Formáli}
\SetString{\abstractname}{Útdráttur}
\SetString{\appendixname}{Viðauki}
@@ -77,9 +77,9 @@
\SetString{\proofname}{Sönnun}
\SetString{\glossaryname}{Orðalisti}
\StartBabelCommands*{icelandic}{date}
- [unicode, charset=utf8, fontenc=EU1 EU2]
+ [unicode, charset=utf8, fontenc=EU1 EU2 TU]
\SetStringLoop{month#1name}{%
- janúar,febrúar,mars,apríl,maí,júní,
+ janúar,febrúar,mars,apríl,maí,júní,%
júlí,ágúst,september,október,nóvember,desember}
\StartBabelCommands*{icelandic}{captions}
\SetString{\prefacename}{Form\'{a}li}
@@ -161,18 +161,14 @@
\declare@shorthand{icelandic}{"e}{\eob}
\declare@shorthand{icelandic}{"E}{\Eob}
\StartBabelCommands*{icelandic}{captions}
- [unicode, charset=utf8, fontenc=EU1 EU2]
+ [unicode, charset=utf8, fontenc=EU1 EU2 TU]
\AfterBabelCommands{%
\newcommand\icelandic@og{%
- \AtBeginDocument{%
- \@ifundefined{T@\ifcase\bbl@engine\or EU2\or EU1\fi}%
- {\PackageWarning{icelandic}%
- {With xetex/luatex EU1 or EU2 should be defined. Use\MessageBreak
- `fontspec' o `fontenc'. I'll proceed, but expect\MessageBreak
- some errors. Reported}}{}}%
- \edef\icelandic@tempa##1{%
- \noexpand\DeclareTextCommand
- {##1}{\ifcase\bbl@engine\or EU2\or EU1\fi}}%
+ \@ifundefined{T@\ifcase\bbl@engine\or EU2\or EU1\fi}%
+ {\edef\icelandic@tempa##1{\noexpand\DeclareTextCommand{##1}{TU}}}%
+ {\edef\icelandic@tempa##1{%
+ \noexpand\DeclareTextCommand
+ {##1}{\ifcase\bbl@engine\or EU2\or EU1\fi}}}%
\icelandic@tempa{\oob}{ǫ}%
\icelandic@tempa{\Oob}{Ǫ}%
\icelandic@tempa{\ooob}{\'{ǫ}}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-icelandic.tlpobj new/tlpkg/tlpobj/babel-icelandic.tlpobj
--- old/tlpkg/tlpobj/babel-icelandic.tlpobj 2019-02-28 03:17:07.000000000 +0100
+++ new/tlpkg/tlpobj/babel-icelandic.tlpobj 2019-07-05 01:53:50.000000000 +0200
@@ -1,6 +1,6 @@
name babel-icelandic
category Package
-revision 39387
+revision 51551
shortdesc Babel support for Icelandic
relocated 1
longdesc The package provides the language definition file for support
@@ -9,7 +9,7 @@
runfiles size=3
RELOC/tex/generic/babel-icelandic/icelandic.ldf
catalogue-ctan /macros/latex/contrib/babel-contrib/icelandic
-catalogue-date 2018-01-13 10:17:26 +0100
+catalogue-date 2019-07-04 17:26:05 +0200
catalogue-license lppl1.3
catalogue-topics icelandic
-catalogue-version 1.2b
+catalogue-version 1.3
++++++ babel-italian.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-italian/README.txt new/doc/generic/babel-italian/README.txt
--- old/doc/generic/babel-italian/README.txt 2019-01-05 23:38:02.000000000 +0100
+++ new/doc/generic/babel-italian/README.txt 2019-12-04 23:18:51.000000000 +0100
@@ -1,13 +1,18 @@
-The italian.dtx file has version number 1.4.01 dated 2019-01-05.
+The italian.dtx file has version number 1.4.03 dated 2019-11-16.
It is and update of a series fo files stating with the first one in 1990
Copyright (C) 1990-2019 Claudio Beccari
Maintainer Claudio Beccari
Contact: claudio dot beccari at gmail dot com
+This bundle containes the source file italian.dtx and this README.txt file. By running pdfLaTeX on thei italian.dtx file you obtain bith the documentation italian.pdf and the language description file italian.ldf.
+
Description
-This file contain the necessary and supplementary data for typesetting documents in Italiana with babel as the manager of the language management.
-It defines the infix words, the date in various formats. Optionally lets the user activate a number of shorthands to performe routine frequent tasks by means of the active character " that can be freely activated and deactivated. It defines an intelligent mathematical comma that recognises if it has to perform as a punctuation mark or as a decimal separator. Another user command activates or deactivates some commands to supply a minimum of performance that is fully provided by the siunitx package. The file allows using babel also when a document is typeset with XeLaTeX or LuaLaTeX, even if, according to the author, polyglossia is preferred when typesetting documents in Italian, even if the gloss-italian.ldf for polyglossia provides less facilities than the ones available with babel.
+This file contain the necessary and supplementary data for typesetting documents in Italian with babel as the manager of the language management.
+It defines the infix words, the date in various formats. Optionally lets the user activate a number of shorthands to performe routine frequent tasks by means of the active character " that can be freely activated and deactivated.
+It defines an intelligent mathematical comma that recognises if it has to perform as a punctuation mark or as a decimal separator. Another user command activates or deactivates some commands to supply a minimum of the performance that is fully provided by the siunitx package. The file allows using babel also when a document is typeset with XeLaTeX or LuaLaTeX, even if, according to the author, polyglossia is preferred when typesetting documents in Italian, in spite of the fact that gloss-italian.ldf for polyglossia provides less facilities than the ones available with babel.
+Supposedly since version 1.4.03 this file should be usable also with babel+uplatex
The documentation that is provided by running LaTeX on the italian.dtx file provides full documentation of every facility provided by the italian.ldf file.
+The documentation contains the licence clauses.
Binary files old/doc/generic/babel-italian/italian.pdf and new/doc/generic/babel-italian/italian.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-italian.doc.tlpobj new/tlpkg/tlpobj/babel-italian.doc.tlpobj
--- old/tlpkg/tlpobj/babel-italian.doc.tlpobj 2019-02-28 03:17:08.000000000 +0100
+++ new/tlpkg/tlpobj/babel-italian.doc.tlpobj 2019-12-05 01:53:41.000000000 +0100
@@ -1,6 +1,6 @@
name babel-italian.doc
category Package
-revision 49606
+revision 53019
shortdesc doc files of babel-italian
relocated 1
docfiles size=110
++++++ babel-italian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-italian/italian.ldf new/tex/generic/babel-italian/italian.ldf
--- old/tex/generic/babel-italian/italian.ldf 2019-01-05 23:38:02.000000000 +0100
+++ new/tex/generic/babel-italian/italian.ldf 2019-12-04 23:18:51.000000000 +0100
@@ -12,7 +12,7 @@
%%
%% License information appended.
\ProvidesLanguage{italian}
- [2019/01/05 v.1.4.01 Italian support for the babel system]
+ [2019/11/16 v.1.4.03 Italian support for the babel system]
%%
%% Please report errors to: claudio dot beccari at gmail dot com
%%
@@ -59,10 +59,10 @@
\finalhyphendemerits50000000}%
\addto\extrasitalian{%
-\lccode\string`'=`' \unless\ifcsname pdfmatch\endcsname
+\lccode\string`'=`' \ifcsname Umathcode\endcsname
\lccode\string"2019=\string"2019\fi}
\addto\noextrasitalian{%
-\lccode\string`'=0 \unless\ifcsname pdfmatch\endcsname
+\lccode\string`'=0 \ifcsname Umathcode\endcsname
\lccode\string"2019=0\fi}
\newcount\it@lettering \it@lettering=\@ne
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-italian.tlpobj new/tlpkg/tlpobj/babel-italian.tlpobj
--- old/tlpkg/tlpobj/babel-italian.tlpobj 2019-02-28 03:17:08.000000000 +0100
+++ new/tlpkg/tlpobj/babel-italian.tlpobj 2019-12-05 01:53:41.000000000 +0100
@@ -1,13 +1,13 @@
name babel-italian
category Package
-revision 49606
+revision 53019
shortdesc Babel support for Italian text
relocated 1
longdesc The package provides language definitions for use in babel.
runfiles size=3
RELOC/tex/generic/babel-italian/italian.ldf
catalogue-ctan /macros/latex/contrib/babel-contrib/italian
-catalogue-date 2019-01-05 20:06:26 +0100
+catalogue-date 2019-12-04 21:20:16 +0100
catalogue-license lppl1.3c
catalogue-topics italian multilingual-addon
-catalogue-version 1.4.01
+catalogue-version 1.4.03
++++++ babel-serbian.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-serbian/README.md new/doc/generic/babel-serbian/README.md
--- old/doc/generic/babel-serbian/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/generic/babel-serbian/README.md 2019-12-15 23:18:17.000000000 +0100
@@ -0,0 +1,31 @@
+----------------------------------------------------------------
+
+Serbian Latin language module for Babel, v2.0a
+
+Released under the LaTeX Project Public License v1.3c or later.
+See http://www.latex-project.org/lppl.txt
+
+The package provides support for use of Babel in documents written in Serbian Latin
+(in ekavian or ijekavian dialect). The support is adapted for use both
+under legacy TeX engines, and under XeTeX and LuaTeX.
+
+The Current Maintainer is Uroš Stefanović.
+
+USAGE
+
+Serbian language definition file can be used both with legacy 8-bit engines
+(such as latex.exe or pdflatex.exe) and Unicode compilers (xelatex.exe or
+lualatex.exe).
+
+Typesetting in ijekavian dialect:
+
+ \usepackage[english,serbianc]{babel}
+ \languageattribute{serbianc}{ijekav}
+or
+ \usepackage[english,serbianc.ijekav]{babel}
+
+Also, the attributes 'datei' and 'quotes' are defined.
+
+DOCUMENTATION
+
+See serbian.pdf for more information.
Binary files old/doc/generic/babel-serbian/serbian.pdf and new/doc/generic/babel-serbian/serbian.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-serbian.doc.tlpobj new/tlpkg/tlpobj/babel-serbian.doc.tlpobj
--- old/tlpkg/tlpobj/babel-serbian.doc.tlpobj 2019-02-28 03:17:10.000000000 +0100
+++ new/tlpkg/tlpobj/babel-serbian.doc.tlpobj 2019-12-16 01:54:27.000000000 +0100
@@ -1,7 +1,8 @@
name babel-serbian.doc
category Package
-revision 30290
+revision 53140
shortdesc doc files of babel-serbian
relocated 1
-docfiles size=32
+docfiles size=62
+ RELOC/doc/generic/babel-serbian/README.md
RELOC/doc/generic/babel-serbian/serbian.pdf
++++++ babel-serbian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-serbian/serbian.ldf new/tex/generic/babel-serbian/serbian.ldf
--- old/tex/generic/babel-serbian/serbian.ldf 2013-05-07 00:23:21.000000000 +0200
+++ new/tex/generic/babel-serbian/serbian.ldf 2019-12-15 23:18:17.000000000 +0100
@@ -7,11 +7,11 @@
%% serbian.dtx (with options: `code')
%% This is a generated file.
%%
-%% Copyright 1989-2005 Johannes L. Braams and any individual authors
+%% Copyright 2019 Uroš Stefanović and any individual authors
%% listed elsewhere in this file. All rights reserved.
%%
-%% This file was generated from file(s) of the Babel system.
-%% ---------------------------------------------------------
+%% This file is intended to be used with the Babel system.
+%% ------------------------------------------------------
%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -23,35 +23,59 @@
%%
%% This work has the LPPL maintenance status "maintained".
%%
-%% The Current Maintainer of this work is Johannes Braams.
-%%
-%% This file may only be distributed together with a copy of the Babel
-%% system. You may however distribute the Babel system without
-%% such generated files.
-%%
-%% The list of all files belonging to the Babel distribution is
-%% given in the file `manifest.bbl'. See also `legal.bbl for additional
-%% information.
+%% The Current Maintainer of this work is Uroš Stefanović.
%%
%% The list of derived (unpacked) files belonging to the distribution
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{serbian}
- [2005/03/31 v1.0d Serbocroatian support from the babel system]
-\LdfInit{serbian}\captionsserbian
+ [2019/12/15 2.0a Serbian Latin support for the Babel system]
+%% File `serbian.dtx'
+\LdfInit{serbian}{captionsserbian}
+\ifdefined\if@srb@uni@ode
+ \PackageError{babel}{if@srb@uni@ode already defined.}
+ \relax
+\fi
+\newif\if@srb@uni@ode
+\ifdefined\luatexversion \@srb@uni@odetrue \else
+\ifdefined\XeTeXrevision \@srb@uni@odetrue \fi\fi
\ifx\l@serbian\@undefined
- \@nopatterns{Serbian}
- \adddialect\l@serbian0\fi
+ \@nopatterns{Serbian}
+ \adddialect\l@serbian0
+\fi
+\initiate@active@char{"}
+\begingroup \catcode`\"12
+\def\reserved@a{\endgroup
+ \def\@SS{\mathchar"7019 }
+ \def\dq{"}}
+\reserved@a
+\declare@shorthand{serbian}{"c}{\textormath{\v c}{\check c}}
+\declare@shorthand{serbian}{"d}{\textormath{\dj}{\textnormal{\dj}}}
+\declare@shorthand{serbian}{"s}{\textormath{\v s}{\check s}}
+\declare@shorthand{serbian}{"z}{\textormath{\v z}{\check z}}
+\declare@shorthand{serbian}{"C}{\textormath{\v C}{\check C}}
+\declare@shorthand{serbian}{"D}{\textormath{\DJ}{\textnormal{\DJ}}}
+\declare@shorthand{serbian}{"S}{\textormath{\v S}{\check S}}
+\declare@shorthand{serbian}{"Z}{\textormath{\v Z}{\check Z}}
+\declare@shorthand{serbian}{"`}{\quotedblbase}
+\declare@shorthand{serbian}{"'}{\textquotedblleft}
+\declare@shorthand{serbian}{"<}{\guillemotleft}
+\declare@shorthand{serbian}{">}{\guillemotright}
+\declare@shorthand{serbian}{""}{\hskip\z@skip}
+\declare@shorthand{serbian}{"~}{\textormath{\leavevmode\hbox{-}}{-}}
+\declare@shorthand{serbian}{"=}{\nobreak-\hskip\z@skip}
+\declare@shorthand{serbian}{"|}{\textormath{\nobreak\discretionary{-}{}{\kern.03em}\allowhyphens}{}}
+\declare@shorthand{serbian}{"-}{\nobreak\discretionary{-}{-}{-}\bbl@allowhyphens}
\addto\captionsserbian{%
\def\prefacename{Predgovor}%
\def\refname{Literatura}%
- \def\abstractname{Sa\v{z}etak}%
+ \def\abstractname{Sa\v zetak}%
\def\bibname{Bibliografija}%
\def\chaptername{Glava}%
\def\appendixname{Dodatak}%
- \def\contentsname{Sadr\v{z}aj}%
- \def\listfigurename{Slike}%
- \def\listtablename{Tabele}%
+ \def\contentsname{Sadr\v zaj}%
+ \def\listfigurename{Spisak slika}%
+ \def\listtablename{Spisak tabela}%
\def\indexname{Indeks}%
\def\figurename{Slika}%
\def\tablename{Tabela}%
@@ -59,66 +83,108 @@
\def\enclname{Prilozi}%
\def\ccname{Kopije}%
\def\headtoname{Prima}%
- \def\pagename{Strana}%
- \def\seename{Vidi}%
- \def\alsoname{Vidi tako\dj e}%
+ \def\pagename{strana}%
+ \def\seename{vidi}%
+ \def\alsoname{vidi tako\dj e}%
\def\proofname{Dokaz}%
- \def\glossaryname{Glossary}% <-- Needs translation
+ \def\glossaryname{Re\v cnik}%
+}%
+\if@srb@uni@ode
+ \addto\captionsserbian{%
+ \def\abstractname{Sažetak}%
+ \def\contentsname{Sadržaj}%
+ \def\alsoname{vidi takođe}%
+ \def\glossaryname{Rečnik}%
}%
-\def\dateserbian{%
- \def\today{\number\day .~\ifcase\month\or
- januar\or februar\or mart\or april\or maj\or
- juni\or juli\or avgust\or septembar\or oktobar\or novembar\or
- decembar\fi \space \number\year}}
-\initiate@active@char{"}
+\fi
+\let\captionsserbian@ijekav=\captionsserbian
+\addto\captionsserbian@ijekav{%
+ \def\partname{Dio}%
+ \def\glossaryname{Rje\v cnik}%
+}
+\if@srb@uni@ode
+ \addto\captionsserbian@ijekav{%
+ \def\glossaryname{Rječnik}%
+ }
+\fi
+ \def\dateserbian{%
+ \def\month@serbian{\ifcase\month\or
+ januar\or
+ februar\or
+ mart\or
+ april\or
+ maj\or
+ jun\or
+ jul\or
+ avgust\or
+ septembar\or
+ oktobar\or
+ novembar\or
+ decembar\fi}%
+ \def\today{\number\day.~\month@serbian\ \number\year\(a)ifstar{}{.}}%
+ \def\todayRoman{\number\day.~\@Roman\month~\number\year\@ifstar{}{.}}}
+ \let\dateserbian@datei=\dateserbian
+ \addto\dateserbian@datei{
+ \def\month@serbian@datei{\ifnum\month=6 juni%
+ \else\ifnum\month=7 juli\else\month@serbian\fi\fi}%
+ \def\today{\number\day.~\month@serbian@datei\ \number\year\(a)ifstar{}{.}}
+}
+\providehyphenmins{\CurrentOption}{\tw@\tw@}
+\providehyphenmins{serbian}{\tw@\tw@}
\addto\extrasserbian{\languageshorthands{serbian}}
\addto\extrasserbian{\bbl@activate{"}}
\addto\noextrasserbian{\bbl@deactivate{"}}
-\declare@shorthand{serbian}{"c}{\textormath{\v c}{\check c}}
-\declare@shorthand{serbian}{"d}{\textormath{\dj}{\dj}}%%
-\declare@shorthand{serbian}{"s}{\textormath{\v s}{\check s}}
-\declare@shorthand{serbian}{"z}{\textormath{\v z}{\check z}}
-\declare@shorthand{serbian}{"C}{\textormath{\v C}{\check C}}
-\declare@shorthand{serbian}{"D}{\textormath{\DJ}{\DJ}}%%
-\declare@shorthand{serbian}{"S}{\textormath{\v S}{\check S}}
-\declare@shorthand{serbian}{"Z}{\textormath{\v Z}{\check Z}}
-\declare@shorthand{serbian}{"`}{%
- \textormath{\quotedblbase{}}{\mbox{\quotedblbase}}}
-\declare@shorthand{serbian}{"'}{%
- \textormath{\textquotedblleft{}}{\mbox{\textquotedblleft}}}
-\declare@shorthand{serbian}{"<}{%
- \textormath{\guillemotleft{}}{\mbox{\guillemotleft}}}
-\declare@shorthand{serbian}{">}{%
- \textormath{\guillemotright{}}{\mbox{\guillemotright}}}
-\declare@shorthand{serbian}{"-}{\nobreak-\bbl@allowhyphens}
-\declare@shorthand{serbian}{""}{\hskip\z@skip}
-\declare@shorthand{serbian}{"|}{%
- \textormath{\discretionary{-}{}{\kern.03em}}{}}
-\ifx\fmtname plain \else
- \let\@aifORI\@afterindentfalse
- \def\bbl@frenchindent{\let\@afterindentfalse\@afterindenttrue
- \@afterindenttrue}
- \def\bbl@nonfrenchindent{\let\@afterindentfalse\@aifORI
- \@afterindentfalse}
- \addto\extrasserbian{\bbl@frenchindent}
- \addto\noextrasserbian{\bbl@nonfrenchindent}
-\fi
-\def\sh{\mathop{\operator@font sh}\nolimits} % same as \sinh
-\def\ch{\mathop{\operator@font ch}\nolimits} % same as \cosh
-\def\th{\mathop{\operator@font th}\nolimits} % same as \tanh
-\def\cth{\mathop{\operator@font cth}\nolimits} % same as \coth
+\addto\extrasserbian{\bbl@frenchspacing}
+\addto\noextrasserbian{\bbl@nonfrenchspacing}
+\let\@aifORI\@afterindentfalse
+\def\bbl@serbianindent{\let\@afterindentfalse\@afterindenttrue\@afterindenttrue}
+\def\bbl@nonserbianindent{\let\@afterindentfalse\@aifORI\@afterindentfalse}
+\addto\extrasserbian{\bbl@serbianindent}
+\addto\noextrasserbian{\bbl@nonserbianindent}
+\bbl@declare@ttribute{serbian}{ijekav}{%
+ \PackageInfo{babel}{Serbian attribute set to ijekav}%
+ \let\captionsserbian=\captionsserbian@ijekav }
+\@onlypreamble\captionsserbian@ijekav
+\bbl@declare@ttribute{serbian}{quotes}{%
+ \PackageInfo{babel}{Serbian attribute set to quotes}%
+ \declare@shorthand{serbian}{"'}{\textquotedblright} }
+\bbl@declare@ttribute{serbian}{datei}{%
+ \PackageInfo{babel}{Serbian attribute set to datei}%
+ \let\dateserbian=\dateserbian@datei }
+\@onlypreamble\dateserbian@datei
+\def\sh{\mathop{\operator@font sh}\nolimits}
+\def\ch{\mathop{\operator@font ch}\nolimits}
+\def\tg{\mathop{\operator@font tg}\nolimits}
+\def\ctg{\mathop{\operator@font ctg}\nolimits}
+\def\arctg{\mathop{\operator@font arctg}\nolimits}
+\def\arcctg{\mathop{\operator@font arcctg}\nolimits}
+\addto\extrasserbian{%
+ \babel@save{\th}%
+ \let\ltx@th\th
+ \def\th{\textormath{\ltx@th}%
+ {\mathop{\operator@font th}\nolimits}}%
+ }
+\def\cth{\mathop{\operator@font cth}\nolimits}
\def\arsh{\mathop{\operator@font arsh}\nolimits}
\def\arch{\mathop{\operator@font arch}\nolimits}
\def\arth{\mathop{\operator@font arth}\nolimits}
\def\arcth{\mathop{\operator@font arcth}\nolimits}
-\def\tg{\mathop{\operator@font tg}\nolimits} % same as \tan
-\def\ctg{\mathop{\operator@font ctg}\nolimits} % same as \cot
-\def\arctg{\mathop{\operator@font arctg}\nolimits} % same as \arctan
-\def\arcctg{\mathop{\operator@font arcctg}\nolimits}
-\def\Prob{\mathop{\mathsf P\hskip0pt}\nolimits}
-\def\Expect{\mathop{\mathsf E\hskip0pt}\nolimits}
-\def\Variance{\mathop{\mathsf D\hskip0pt}\nolimits}
+\def\cosec{\mathop{\operator@font cosec}\nolimits}
+\def\arcsec{\mathop{\operator@font arcsec}\nolimits}
+\def\arccosec{\mathop{\operator@font arccosec}\nolimits}
+\def\sech{\mathop{\operator@font sech}\nolimits}
+\def\cosech{\mathop{\operator@font cosech}\nolimits}
+\def\arsech{\mathop{\operator@font arsech}\nolimits}
+\def\arcosech{\mathop{\operator@font arcosech}\nolimits}
+\def\Prob{\mathop{\kern\z@\mathsf{P}}\nolimits}
+\def\Expect{\mathop{\kern\z@\mathsf{E}}\nolimits}
+\def\Variance{\mathop{\kern\z@\mathsf{D}}\nolimits}
+\def\nzs{\mathop{\operator@font nzs}\nolimits}
+\def\nzd{\mathop{\operator@font nzd}\nolimits}
+\def\NZS{\mathop{\operator@font NZS}\nolimits}
+\def\NZD{\mathop{\operator@font NZD}\nolimits}
\ldf@finish{serbian}
+%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-serbian.tlpobj new/tlpkg/tlpobj/babel-serbian.tlpobj
--- old/tlpkg/tlpobj/babel-serbian.tlpobj 2019-02-28 03:17:10.000000000 +0100
+++ new/tlpkg/tlpobj/babel-serbian.tlpobj 2019-12-16 01:54:27.000000000 +0100
@@ -1,14 +1,13 @@
name babel-serbian
category Package
-revision 30290
+revision 53140
shortdesc Babel/Polyglossia support for Serbian
relocated 1
-longdesc The package provides a language description file that enables
-longdesc support of Serbian either with babel or with polyglossia.
+longdesc The package provides support for Serbian documents written in
+longdesc Latin, in babel.
runfiles size=2
RELOC/tex/generic/babel-serbian/serbian.ldf
catalogue-ctan /macros/latex/contrib/babel-contrib/serbian
-catalogue-date 2018-01-13 10:24:37 +0100
catalogue-license lppl1.3
-catalogue-topics multilingual-addon
-catalogue-version 1.0d
+catalogue-topics multilingual-addon serbian
+catalogue-version 2.0a
++++++ babel-serbianc.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-serbianc/README.md new/doc/generic/babel-serbianc/README.md
--- old/doc/generic/babel-serbianc/README.md 2019-01-14 00:32:52.000000000 +0100
+++ new/doc/generic/babel-serbianc/README.md 2019-12-15 23:18:05.000000000 +0100
@@ -1,6 +1,6 @@
----------------------------------------------------------------
-Serbian Cyrillic language module for Babel, v3.0
+Serbian Cyrillic language module for Babel, v3.0a
Released under the LaTeX Project Public License v1.3c or later.
See http://www.latex-project.org/lppl.txt
@@ -50,41 +50,3 @@
DOCUMENTATION
See serbianc.pdf for more information.
-
-CHANGES
-
- * Command \todayRoman is added;
-
- * Commands \today* and \todayRoman* print dates without dot after year;
-
- * Ijekavian dialect is now supported (if 'ijekav' attribute is used);
-
- * Shorthand "' prints '' quotes instead of traditional `` quotes (if 'quotes' attribute is used);
-
- * 'јуни' and 'јули' is printed instead of 'јун' and 'јул' (if 'datei' attribute is used);
-
- * Some captions strings are fixeds;
-
- * Cyrillic enumeration is added.
-
- * Encodings T2A, X2, OT2 (8-bit mode) and TU (Unicode mode) are supported.
-
-----------------------------------------------------------------
-
-%%
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
Binary files old/doc/generic/babel-serbianc/serbianc.pdf and new/doc/generic/babel-serbianc/serbianc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-serbianc.doc.tlpobj new/tlpkg/tlpobj/babel-serbianc.doc.tlpobj
--- old/tlpkg/tlpobj/babel-serbianc.doc.tlpobj 2019-02-28 03:17:11.000000000 +0100
+++ new/tlpkg/tlpobj/babel-serbianc.doc.tlpobj 2019-12-16 01:54:27.000000000 +0100
@@ -1,8 +1,8 @@
name babel-serbianc.doc
category Package
-revision 49693
+revision 53139
shortdesc doc files of babel-serbianc
relocated 1
-docfiles size=74
+docfiles size=73
RELOC/doc/generic/babel-serbianc/README.md
RELOC/doc/generic/babel-serbianc/serbianc.pdf
++++++ babel-serbianc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-serbianc/serbianc.ldf new/tex/generic/babel-serbianc/serbianc.ldf
--- old/tex/generic/babel-serbianc/serbianc.ldf 2019-01-14 00:32:52.000000000 +0100
+++ new/tex/generic/babel-serbianc/serbianc.ldf 2019-12-15 23:18:05.000000000 +0100
@@ -30,7 +30,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{serbianc}
- [2019/01/12 3.0 Serbian Cyrillic support for the Babel system]
+ [2019/12/15 3.0a Serbian Cyrillic support for the Babel system]
%% File `serbianc.dtx'
\LdfInit{serbianc}{captionsserbianc}
\ifdefined\if@srbc@uni@ode
@@ -130,7 +130,7 @@
\def\glossaryname{Речник}%
}%
\let\captionsserbianc@ijekav=\captionsserbianc
- \addto\captionsserbianc@ijekav{
+ \addto\captionsserbianc@ijekav{%
\def\partname{Дио}%
\def\glossaryname{Рjечник}%
}
@@ -159,7 +159,7 @@
\def\glossaryname{{\cyr\CYRR\cyre\cyrch\cyrn\cyri\cyrk}}%
}%
\let\captionsserbianc@ijekav=\captionsserbianc
- \addto\captionsserbianc@ijekav{
+ \addto\captionsserbianc@ijekav{%
\def\partname{{\cyr\CYRD\cyri\cyro}}%
\def\glossaryname{{\cyr\CYRR\cyrje\cyre\cyrch\cyrn\cyri\cyrk}}%
}
@@ -178,13 +178,13 @@
септембар\or
октобар\or
новембар\or
- децембар\fi}
- \def\today{\number\day.~\month@serbianc\ \number\year\(a)ifstar{}{.}}
+ децембар\fi}%
+ \def\today{\number\day.~\month@serbianc\ \number\year\(a)ifstar{}{.}}%
\def\todayRoman{\number\day.~\@Roman\month~\number\year\@ifstar{}{.}}}
\let\dateserbianc@datei=\dateserbianc
- \addto\dateserbianc@datei{
+ \addto\dateserbianc@datei{%
\def\month@serbianc@datei{\ifnum\month=6 јуни%
- \else\ifnum\month=7 јули\else\month@serbianc\fi\fi}
+ \else\ifnum\month=7 јули\else\month@serbianc\fi\fi}%
\def\today{\number\day.~\month@serbianc@datei\ \number\year\(a)ifstar{}{.}}}
\else
\def\dateserbianc{%
@@ -200,13 +200,13 @@
\cyrs\cyre\cyrp\cyrt\cyre\cyrm\cyrb\cyra\cyrr\or
\cyro\cyrk\cyrt\cyro\cyrb\cyra\cyrr\or
\cyrn\cyro\cyrv\cyre\cyrm\cyrb\cyra\cyrr\or
- \cyrd\cyre\cyrc\cyre\cyrm\cyrb\cyra\cyrr\fi}
- \def\today{\number\day.~\month@serbianc\ \number\year\(a)ifstar{}{.}}
+ \cyrd\cyre\cyrc\cyre\cyrm\cyrb\cyra\cyrr\fi}%
+ \def\today{\number\day.~\month@serbianc\ \number\year\(a)ifstar{}{.}}%
\def\todayRoman{\number\day.~\@Roman\month~\number\year\@ifstar{}{.}}}
\let\dateserbianc@datei=\dateserbianc
- \addto\dateserbianc@datei{
+ \addto\dateserbianc@datei{%
\def\month@serbianc@datei{\ifnum\month=6\cyrje\cyru\cyrn\cyri%
- \else\ifnum\month=7\cyrje\cyru\cyrl\cyri\else\month@serbianc\fi\fi}
+ \else\ifnum\month=7\cyrje\cyru\cyrl\cyri\else\month@serbianc\fi\fi}%
\def\today{\number\day.~\month@serbianc@datei\ \number\year\(a)ifstar{}{.}}
}
\fi
@@ -224,36 +224,36 @@
\def\bbl@nonserbiancindent{\let\@afterindentfalse\@aifORI\@afterindentfalse}
\addto\extrasserbianc{\bbl@serbiancindent}
\addto\noextrasserbianc{\bbl@nonserbiancindent}
-\addto\extrasserbianc{
+\addto\extrasserbianc{%
\babel@save\@Alph
\if@srbc@uni@ode
\def\@Alph#1{\ifcase#1\or
А\or Б\or В\or Г\or Д\or Ђ\or Е\or Ж\or З\or
И\or Ј\or К\or Л\or Љ\or М\or Н\or Њ\or О\or
П\or Р\or С\or Т\or Ћ\or У\or Ф\or Х\or Ц\or
- Ч\or Џ\or Ш\else\@ctrerr\fi}
+ Ч\or Џ\or Ш\else\@ctrerr\fi}%
\else
\def\@Alph#1{\ifcase#1\or
\CYRA\or\CYRB\or\CYRV\or\CYRG\or\CYRD\or\CYRDJE\or\CYRE\or\CYRZH\or\CYRZ\or
\CYRI\or\CYRJE\or\CYRK\or\CYRL\or\CYRLJE\or\CYRM\or\CYRN\or\CYRNJE\or\CYRO\or
\CYRP\or\CYRR\or\CYRS\or\CYRT\or\CYRTSHE\or\CYRU\or\CYRF\or\CYRH\or\CYRC\or
- \CYRCH\or\CYRDZHE\or\CYRSH\else\@ctrerr\fi}
+ \CYRCH\or\CYRDZHE\or\CYRSH\else\@ctrerr\fi}%
\fi
}
-\addto\extrasserbianc{
+\addto\extrasserbianc{%
\babel@save\@alph
\if@srbc@uni@ode
\def\@alph#1{\ifcase#1\or
а\or б\or в\or г\or д\or ђ\or е\or ж\or з\or
и\or ј\or к\or л\or љ\or м\or н\or њ\or о\or
п\or р\or с\or т\or ћ\or у\or ф\or х\or ц\or
- ч\or џ\or ш\else\@ctrerr\fi}
+ ч\or џ\or ш\else\@ctrerr\fi}%
\else
\def\@alph#1{\ifcase#1\or
\cyra\or\cyrb\or\cyrv\or\cyrg\or\cyrd\or\cyrdje\or\cyre\or\cyrzh\or\cyrz\or
\cyri\or\cyrje\or\cyrk\or\cyrl\or\cyrlje\or\cyrm\or\cyrn\or\cyrnje\or\cyro\or
\cyrp\or\cyrr\or\cyrs\or\cyrt\or\cyrtshe\or\cyru\or\cyrf\or\cyrh\or\cyrc\or
- \cyrch\or\cyrdzhe\or\cyrsh\else\@ctrerr\fi}
+ \cyrch\or\cyrdzhe\or\cyrsh\else\@ctrerr\fi}%
\fi
}
\bbl@declare@ttribute{serbianc}{ijekav}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-serbianc.tlpobj new/tlpkg/tlpobj/babel-serbianc.tlpobj
--- old/tlpkg/tlpobj/babel-serbianc.tlpobj 2019-02-28 03:17:11.000000000 +0100
+++ new/tlpkg/tlpobj/babel-serbianc.tlpobj 2019-12-16 01:54:27.000000000 +0100
@@ -1,6 +1,6 @@
name babel-serbianc
category Package
-revision 49693
+revision 53139
shortdesc Babel module to support Serbian Cyrillic
relocated 1
longdesc The package provides support for Serbian documents written in
@@ -8,7 +8,6 @@
runfiles size=4
RELOC/tex/generic/babel-serbianc/serbianc.ldf
catalogue-ctan /macros/latex/contrib/babel-contrib/serbianc
-catalogue-date 2019-01-13 09:59:25 +0100
catalogue-license lppl1.3
catalogue-topics serbian multilingual-addon
-catalogue-version 3.0
+catalogue-version 3.0a
++++++ babel-spanish.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-spanish.doc.tlpobj new/tlpkg/tlpobj/babel-spanish.doc.tlpobj
--- old/tlpkg/tlpobj/babel-spanish.doc.tlpobj 2019-02-28 03:17:12.000000000 +0100
+++ new/tlpkg/tlpobj/babel-spanish.doc.tlpobj 2020-03-04 23:49:27.000000000 +0100
@@ -1,6 +1,6 @@
name babel-spanish.doc
category Package
-revision 39920
+revision 54080
shortdesc doc files of babel-spanish
relocated 1
docfiles size=46
++++++ babel-spanish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-spanish.tlpobj new/tlpkg/tlpobj/babel-spanish.tlpobj
--- old/tlpkg/tlpobj/babel-spanish.tlpobj 2019-02-28 03:17:12.000000000 +0100
+++ new/tlpkg/tlpobj/babel-spanish.tlpobj 2020-03-04 23:49:27.000000000 +0100
@@ -1,6 +1,6 @@
name babel-spanish
category Package
-revision 39920
+revision 54080
shortdesc Babel support for Spanish
relocated 1
longdesc This bundle provides the means to typeset Spanish text, with
@@ -10,8 +10,8 @@
runfiles size=9
RELOC/tex/generic/babel-spanish/romanidx.sty
RELOC/tex/generic/babel-spanish/spanish.ldf
+catalogue-alias spanish
catalogue-ctan /macros/latex/contrib/babel-contrib/spanish
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics spanish multilingual-addon
catalogue-version 5.0p
++++++ babel-turkish.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-turkish/README new/doc/generic/babel-turkish/README
--- old/doc/generic/babel-turkish/README 2014-03-25 21:46:41.000000000 +0100
+++ new/doc/generic/babel-turkish/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-Turkish 1.3b
-------------
-
-This is the babel style for Turkish.
-
-Changes 1.3
------------
-* UTF-8 encoded strings for XeTeX and LuaTeX
-* Upper/Lowercase and hyphenation mappings for T1 and EUx (and
- incomplete for OT1).
-* Translation for Glossary.
-* The manual describes how to deal with the ligature fi and
- how to disable the = shorthand.
-
-----------
-2014-03-24
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/babel-turkish/README.md new/doc/generic/babel-turkish/README.md
--- old/doc/generic/babel-turkish/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/generic/babel-turkish/README.md 2019-07-05 22:51:26.000000000 +0200
@@ -0,0 +1,23 @@
+Turkish 1.4
+-----------
+
+This is the babel style for Turkish.
+
+**This package is NOT being actively maintained, but bugs might
+got fixed if you report them. If you want to take over maintenance of
+this language style, please contact me at
+http://www.texnia.com/contact.html .**
+
+Changes 1.4
+-----------
+* Added TU encoding
+
+
+Changes 1.3
+-----------
+* UTF-8 encoded strings for XeTeX and LuaTeX
+* Upper/Lowercase and hyphenation mappings for T1 and EUx (and
+ incomplete for OT1).
+* Translation for Glossary.
+* The manual describes how to deal with the ligature fi and
+ how to disable the = shorthand.
Binary files old/doc/generic/babel-turkish/turkish.pdf and new/doc/generic/babel-turkish/turkish.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-turkish.doc.tlpobj new/tlpkg/tlpobj/babel-turkish.doc.tlpobj
--- old/tlpkg/tlpobj/babel-turkish.doc.tlpobj 2019-02-28 03:17:12.000000000 +0100
+++ new/tlpkg/tlpobj/babel-turkish.doc.tlpobj 2019-07-06 01:54:55.000000000 +0200
@@ -1,8 +1,8 @@
name babel-turkish.doc
category Package
-revision 33284
+revision 51560
shortdesc doc files of babel-turkish
relocated 1
-docfiles size=67
- RELOC/doc/generic/babel-turkish/README
+docfiles size=74
+ RELOC/doc/generic/babel-turkish/README.md
RELOC/doc/generic/babel-turkish/turkish.pdf
++++++ babel-turkish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/babel-turkish/turkish.ldf new/tex/generic/babel-turkish/turkish.ldf
--- old/tex/generic/babel-turkish/turkish.ldf 2014-03-25 21:46:41.000000000 +0100
+++ new/tex/generic/babel-turkish/turkish.ldf 2019-07-05 22:51:26.000000000 +0200
@@ -37,7 +37,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
\ProvidesLanguage{turkish}
- [2014/03/22 v1.3b Turkish support from the babel system]
+ [2019/07/05 v1.4 Turkish support from the babel system]
%% File `turkish.dtx'
%% Turkish Language Definition File
%% Copyright (C) 1994 - 2005
@@ -80,7 +80,7 @@
\space\number\year}}
\ifx\BabelLower\@undefined\else
\StartBabelCommands*{turkish}{captions}
- [unicode, charset=utf8, fontenc=EU1 EU2]
+ [unicode, charset=utf8, fontenc=EU1 EU2 TU]
\SetString\prefacename{Önsöz}
\SetString\refname{Kaynaklar}
\SetString\abstractname{Özet}
@@ -112,7 +112,7 @@
\BabelLower{`İ}{`i}%
\BabelLower{`I}{`ı}}
\StartBabelCommands*{turkish}{date}
- [unicode, charset=utf8, fontenc=EU1 EU2]
+ [unicode, charset=utf8, fontenc=EU1 EU2 TU]
\SetStringLoop{month#1name}{%
Ocak,Şubat,Mart,Nisan,Mayıs,Haziran,%
Temmuz,Ağustos,Eylül,Ekim,Kasım,Aralık}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel-turkish.tlpobj new/tlpkg/tlpobj/babel-turkish.tlpobj
--- old/tlpkg/tlpobj/babel-turkish.tlpobj 2019-02-28 03:17:12.000000000 +0100
+++ new/tlpkg/tlpobj/babel-turkish.tlpobj 2019-07-06 01:54:55.000000000 +0200
@@ -1,6 +1,6 @@
name babel-turkish
category Package
-revision 33284
+revision 51560
shortdesc Babel support for Turkish documents
relocated 1
longdesc The package provides support, within babel, of the Turkish
@@ -8,7 +8,7 @@
runfiles size=2
RELOC/tex/generic/babel-turkish/turkish.ldf
catalogue-ctan /macros/latex/contrib/babel-contrib/turkish
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-07-05 18:43:14 +0200
catalogue-license lppl1.3
catalogue-topics turkish multilingual-addon
-catalogue-version 1.3b
+catalogue-version 1.4
++++++ babel.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/babel/README.md new/doc/latex/babel/README.md
--- old/doc/latex/babel/README.md 2019-04-03 23:42:12.000000000 +0200
+++ new/doc/latex/babel/README.md 2020-03-22 21:52:59.000000000 +0100
@@ -1,4 +1,4 @@
-## Babel 3.29
+## Babel 3.42
This package manages culturally-determined typographical (and other)
rules, and hyphenation patterns for a wide range of languages. Many
@@ -7,22 +7,15 @@
The latest stable version is available on <https://ctan.org/pkg/babel>.
-Languages are not part of the Babel core any more; in particular, it
-shall be no longer necessary to synchronize Babel core releases with
-releases of Babel language files. See CONTRIB for further details
-about contributing a language. You may also create an ini file or
-improve the existing ones -- it's a trivial task (no programming
-skills required at all), but don't hesitate to ask for help.
+Changes in version 3.42 are described in:
+
+https://github.com/latex3/babel/wiki/What's-new-in-babel-3.42
Included is a set of ini files for about 200 languages.
The best way to install and/or update it is with the help of package
managers.
-Changes are described in babel.pdf with the label "New <version>". The
-manual has been expanded to include some tips and tricks, but it will
-be improved in next releases.
-
### Reporting Bugs
If you wish to report a problem or bug in any of these packages please
@@ -41,7 +34,7 @@
If the bug turns out to be with third-party software then please
contact the developer, and not us!
-You may also report them to the author more informally on:
+You may also report them to the current maintainer more informally on:
http://www.texnia.com/contact.html
@@ -51,82 +44,131 @@
### Latest changes
```
-3.29 - The fix for boxes inside math is incompatible with ams.
+3.42 2020-03-22
+ - \getlocaleproperty, to get the value of a field from the loaded
+ ini files.
+ - Added ini files for Syriac, Coptic and Church Slavic. Improved
+ some others (Armenian, Sanskrit).
+ - Added a new field tag.bcp47.likely to many files.
+ - Improved line breaking with xetex.
+ - Fixes:
+ - Remove extra space with languages loaded on the fly (bug
+ introduced in 3.41).
+ - Line breaking was no always correct with languages loaded on
+ the fly.
+ - Avoid a harmless warning about redefining a protected command
+ (#52).
+ - Locale was not switched correctly with COMBINING characters
+ (#54).
+
+3.41 2020-02-27
+ - Counters and numerals added in some ini files, based on those
+ defined in CSS (Abjad, Alphabetic Hebrew, Japanese, etc.).
+ - Fix - A bug in the fix for #47, because \@elt was not reset
+ (#51).
+ - Fix - Error when french was loaded and an ini file read (#50).
+ - Fix - A typo in Greek files: Miriad must read Myriad.
+See https://github.com/latex3/babel/wiki/What's-new-in-babel-3.41
+
+3.40 2020-02-14
+ - New ini files for Latin and Greek (xe/lua).
+ - Add 'other' characters used in hyphenation patters (eg,
+ apostrophes).
+ - Fix - Old Plain TeX and Plain XeTeX raised an error.
+ - Fix - Option T1 in fontenc was not recognized to set
+ \latinencoding with LaTeX 2020-02-02 (#47)
+ - Fix - Locale names were hardcoded in some babel-...tex files.
+See https://github.com/latex3/babel/wiki/What's-new-in-babel-3.40
+
+3.39 2020-02-03
+ - Languages can now be loaded on the fly (via \babelprovide).
+ - With \babelposthyphenation captured chars can now be mapped in
+ the replacement (lua).
+ - \babelcharproperty can be used to assign specific chars to a
+ locale (lua).
+ - Fixes:
+ - Sichuan Yi: line breaking was not activated (lua).
+ - Hyphenation was not always applied with onchar (lua).
+ - bidi=basic-l/basic-r where not activated correctly (xe).
+ - Thai and turkish raised and error without import in
+ \babelprovide.
+ - Cleaned up some ini/tex locale files (de, zh, sa).
+See https://github.com/latex3/babel/wiki/What's-new-in-babel-3.39
+
+3.38 2020-01-15
+ - Automatic switching of ids (\language and \localeid), and fonts
+ based on script blocks (lua).
+ - New macro - \localeinfo, to access the basic data in the ini
+ file loaded by languages.
+See https://github.com/latex3/babel/wiki/What's-new-in-babel-3.38
+
+3.37 2019-12-08
+ - Preliminary code for non-standard hyphenation, like ff ->
+ ff-f (lua).
+ - \babelprovide now can be used to add or modify values for the
+ keys in ini files.
+ - Line breaking in South East Asian and CKJ is assimilated to
+ hyphenation, and it is activated even without 'import' (lua).
+See https://github.com/latex3/babel/wiki/What's-new-in-babel-3.37
+
+3.36 2019-11-14
+ - New - \babeladjust, with options: bidi.text, bidi.mirroring,
+ bidi.mapdigits, layout.tabular, layout.lists, linebreak.sea,
+ linebreak.cjk. There are still some limitations (lua).
+ - New - ini for Polytonic Greek, thanks to Claudio Beccari.
+ - Fix - Language and script set for Chinese Tradicional and
+ Chinese Simplified.
+See https://github.com/latex3/babel/wiki/What's-new-in-babel-3.36
+
+3.35 2019-10-15
+ - \markboth and \markright made robust with a recent LaTeX.
+ - Shorthands work in bibs and refs even with safe=none.
+ - Fix - Another issue related to \ensureascii and LGR (#30)
+ - A temporary hack for issue #25.
+
+3.34 2019-09-27
+ - Improved compatibility for \babelfont vs \setmainfont.
+ - Fix - active ' entered in an infinite loop with lua (#27).
+ - Fix - main in \babelprovide was not set until begin document.
+
+3.33 2019-07-19
+ - \prehyphenchar set to 0 in languages requiring it: kannada,
+ marathi, tamil, etc. (lua).
+ - \AddBabelHook can be set for specific languages.
+ - Fix - !\grq in T1 behaved like the ligature !` (#19).
+ - Minimal preliminary support for the experimental harftex.
+
+3.32 2019-06-03
+ - CJK line breaking is now disabled in verbatim (lua).
+ - New - \babelcharproperty, to change the direction, mirroring
+ glyph and line break properties (lua).
+ - Basic support for the picture environment (with pict2e) and pgf
+ (lua, somewhat experimental).
+ - Start support for harftex (just try - it may work).
+
+3.31 2019-05-04
+ - Basic support for line breaking with CJK scripts (lua)
+ - layout=tabular now works with the 'array' package (and some
+ others; lua).
+
+3.30 2019-04-22
+ - Fix - dir in boxes inside math (hopefully now it works; lua).
+ - Option mapdigits for \babelprovide, which converts European
+ digits to local ones (lua).
+
+3.29 2019-04-03
+ - The fix for boxes inside math is incompatible with ams.
Removed (a better fix is under study).
- - Options bidi-l and bidi-r (for the bidi package).
-3.28 - Fixes - wrong dir after math, in math inside tabular, in weak L
+ - Options bidi-l and bidi-r (for the bidi package; xe).
+
+3.28 2019-04-01
+ - Fixes - wrong dir after math, in math inside tabular, in weak L
inside R inside L, and in boxes inside math.
- \babelfont now takes into account \defaultfontfeatures. This
is a potential source of backwards incompatibilities, but
very likely the risks are very low, and it is, I think, the
expected behavior.
-3.27 - Preliminary support for bidi (by Vafa Khalighi) with xetex.
- - Fix for 3.23 - \ensureascii was redefined even when not
- necessary.
- - Minor improvements in babel-vi.ini.
-3.26 - Fix for 3.25 - \babelprovide raised an error with xetex.
-3.25 - Fixes for 3.23 - mapfont=direction could raise an error.
- Language and Script were not always defined correctly.
- - Improved tentative support for Thai, Lao and Khmer in both
- luatex and xetex.
-3.24 - Prelimimary support for Thai interword spacing with luatex.
-3.23 - After extensive tests and fixing some issues, bidi=basic is
- not experimental any longer.
- - import in \babelprovide does not require a language code if
- the language name is a recognized one.
- - New macro: \ifbabelshorthand.
- - TS1, T3 and TS3 have been added to the non-ascii list, to
- avoid problems in case no ASCII-savvy encoding is requested.
- - Define Language and Script if fontspec does not known them (eg,
- the Japanese script).
- - Set the \thepage bidi bahavior in foots/heads.
- - Fix - Undefined \bbl@stripslash in Plain.
-3.22 - Fix - Error with \chapter if empty in ini
- - Prelimimary support for Sanskrit
- - Unknown languages in aux files do not raise an error
- any more (only show a warning).
-3.21 - Fix - equation numbers raised an error.
- - Two minor changes: if no language is requested load nil
- instead of raising an error, and the message 'babel <x.x>...'
- is not printed to the log any more.
-3.20 - ini files with the field digits.native define
- \<language>digits and \<language>counters. \arabic can be
- redefined to use native digits.
- - Fix - mapfont in bidi=basic didn't take into account combining
- marks (eg, Arabic vowels).
- - Fix - A bug introduced in 3.19, which sometimes reversed text
- in \hbox'es.
- - Fix for luatex 1.07 - An internal change in luatex broke
- bidi at 'automatic' hyphens.
- - Fix for latest latex - babel.ins raised an error.
-3.19 - Most changes are for luatex:
- . The main new feature is a bidi method for both implicit L in
- R text, and implicit R in L text, with the possibility of
- switching the font automatically. Still somewhat
- experimental, but it should work in most cases.
- . layout=extras for a couple of miscellaneous readjustments.
- . bidi equation numbers.
- - Also, for all engines, new field in some ini files:
- digits.native (to be used in future releases).
-
-3.18 - More bidi in luatex: captions (required only in multilingual
- docs) and tabular (required for R tables). Also an experimental
- support for captions in xetex and pdftex (tabular is not yet
- supported).
- - New ini files: ar-DZ, ar-MA, ar-SY
- - Fix - \begin{hyphenrules} didn't work with polyglossia.
- - Fix - switch.def was loaded twice.
-
-3.17 - A tool for bidi footnotes.
- - Fix - \ragged... didn't work for bidi.
-
-3.16 - New package option layout for bidi documents.
- - Quotes in TU encoding
- - Fix - \<language>date did not work correctly
- - Fix - with some languages (eg, british), using
- \babelfont raised an error.
+
```
Javier Bezos
-2019/04/03
-
Binary files old/doc/latex/babel/babel.pdf and new/doc/latex/babel/babel.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/babel.doc.tlpobj new/tlpkg/tlpobj/babel.doc.tlpobj
--- old/tlpkg/tlpobj/babel.doc.tlpobj 2019-04-04 01:24:40.000000000 +0200
+++ new/tlpkg/tlpobj/babel.doc.tlpobj 2020-03-23 01:55:38.000000000 +0100
@@ -1,8 +1,8 @@
name babel.doc
category Package
-revision 50741
+revision 54487
shortdesc doc files of babel
relocated 1
-docfiles size=167
+docfiles size=190
RELOC/doc/latex/babel/README.md
RELOC/doc/latex/babel/babel.pdf
++++++ babel.tar.xz ++++++
++++ 27102 lines of diff (skipped)
++++++ backnaur.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/backnaur/README new/doc/latex/backnaur/README
--- old/doc/latex/backnaur/README 2012-12-13 01:23:24.000000000 +0100
+++ new/doc/latex/backnaur/README 2019-05-05 19:39:35.000000000 +0200
@@ -11,7 +11,7 @@
Comment out this files 'OnlyDescription' line to include the
implementation documentation.
-Copyright (C) 2012 by Adrian P Robson
+Copyright (C) 2019 by Adrian P Robson
adrian.robson(a)nepsweb.co.uk
This work may be distributed and/or modified under the
Binary files old/doc/latex/backnaur/backnaur.pdf and new/doc/latex/backnaur/backnaur.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/backnaur.doc.tlpobj new/tlpkg/tlpobj/backnaur.doc.tlpobj
--- old/tlpkg/tlpobj/backnaur.doc.tlpobj 2019-02-28 03:17:14.000000000 +0100
+++ new/tlpkg/tlpobj/backnaur.doc.tlpobj 2020-03-04 23:49:27.000000000 +0100
@@ -1,8 +1,8 @@
name backnaur.doc
category Package
-revision 28513
+revision 54080
shortdesc doc files of backnaur
relocated 1
-docfiles size=76
+docfiles size=64
RELOC/doc/latex/backnaur/README
RELOC/doc/latex/backnaur/backnaur.pdf
++++++ backnaur.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/backnaur/backnaur.sty new/tex/latex/backnaur/backnaur.sty
--- old/tex/latex/backnaur/backnaur.sty 2012-12-13 01:23:24.000000000 +0100
+++ new/tex/latex/backnaur/backnaur.sty 2019-06-29 23:06:31.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% backnaur.dtx (with options: `package')
%%
-%% Copyright (C) 2012 by Adrian P Robson
+%% Copyright (C) 2019 by Adrian P Robson
%% adrian.robson(a)nepsweb.co.uk
%%
%% This work may be distributed and/or modified under the
@@ -25,26 +25,32 @@
%%
\NeedsTeXFormat{LaTeX2e}[2011/06/27]
\ProvidesPackage{backnaur}
-[2012/12/12 1.1 Typesetting for Backus-Naur Form (BNF) definitions]
+[2019/06/18 3.1 Typesetting for Backus-Naur Form (BNF) definitions]
\newenvironment{bnf}%
{\begin{eqnarray}}%
{\end{eqnarray}\ignorespacesafterend}
\newenvironment{bnf*}%
{\begin{eqnarray*}}%
{\end{eqnarray*}\ignorespacesafterend}
-\newcommand{\bnfpn}[1]{\langle \textnormal{#1} \rangle}
+\newcommand{\bnfpn}[1]{\langle \textrm{#1} \rangle}
\newcommand{\bnfor}{\; \mid \;}
\newcommand{\bnfsp}{\;}
\newcommand{\bnfes}{\lambda}
-\newcommand\bnf@tsfont[1]{\textrm{#1}}
-\newcommand{\bnfts}[1]{\textnormal{\bnf@tsfont{#1}}}
-\newcommand{\bnftd}[1]{\textnormal{\it #1}}
+\newcommand{\bnf@tsfont}[1]{\texttt{#1}}
+\newcommand{\bnfts}[1]{\bnf@tsfont{#1}}
+\newcommand{\bnftd}[1]{\textit{#1}}
\newcommand{\bnfsk}{\dots}
\newcommand{\bnfpo}{\models}
-\newcommand{\bnfprod}[2]{\bnfpn{#1} & \bnfpo & #2}
-\DeclareOption{tstt}{\renewcommand\bnf@tsfont[1]{\texttt{#1}}}
+\newcommand{\bnfprod}{\@ifstar{\bnf@prodnn}{\bnf@prodyn}}
+\newcommand{\bnf@prodyn}[2]{\bnfpn{#1} & \bnfpo & #2}
+\newcommand{\bnf@prodnn}[2]{\nonumber \bnfpn{#1} & \bnfpo & #2}
+\newcommand{\bnfmore}{\@ifstar{\bnf@morenn}{\bnf@moreyn}}
+\newcommand{\bnf@moreyn}[1]{ & & #1}
+\newcommand{\bnf@morenn}[1]{\nonumber & & #1}
+\DeclareOption{tsrm}{\renewcommand{\bnf@tsfont}[1]{\textrm{#1}}}
\DeclareOption{perp}{\renewcommand{\bnfes}{\perp}}
\DeclareOption{epsilon}{\renewcommand{\bnfes}{\epsilon}}
+\DeclareOption{altpo}{\renewcommand{\bnfpo}{::=}}
\ProcessOptions\relax
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/backnaur.tlpobj new/tlpkg/tlpobj/backnaur.tlpobj
--- old/tlpkg/tlpobj/backnaur.tlpobj 2019-02-28 03:17:14.000000000 +0100
+++ new/tlpkg/tlpobj/backnaur.tlpobj 2020-03-04 23:49:27.000000000 +0100
@@ -1,15 +1,16 @@
name backnaur
category Package
-revision 28513
+revision 54080
shortdesc Typeset Backus Naur Form definitions
relocated 1
longdesc The package typesets Backus-Naur Form (BNF) definitions. It
-longdesc creates aligned lists of productions, with numbers if required.
-longdesc It can also print in-line BNF expressions using math mode.
+longdesc prints formatted lists of productions, with numbers if
+longdesc required. It can also print in-line BNF expressions using math
+longdesc mode.
runfiles size=1
RELOC/tex/latex/backnaur/backnaur.sty
+catalogue-also simplebnf
catalogue-ctan /macros/latex/contrib/backnaur
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
catalogue-topics formal-spec
-catalogue-version 1.1
+catalogue-version 3.1
++++++ baskervaldx.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/baskervaldx/README new/doc/fonts/baskervaldx/README
--- old/doc/fonts/baskervaldx/README 2017-03-12 00:06:26.000000000 +0100
+++ new/doc/fonts/baskervaldx/README 2020-02-01 23:12:43.000000000 +0100
@@ -12,7 +12,10 @@
http://www.ctan.org/license/lppl1.3
for the details of that license.
-Current version: 1.072, 2017/03/10
+Current version: 1.073, 2020/01/31
+
+Changes in version 1.073
+Modified Baskervaldx.sty to comply with changes to latex with respect to mweights and fontaxes packages.
Changes in version 1.072
Modified the sty file so that Baskervaldx text figure styles are selected always in the \AtEndPreamble hook. (Formerly, using babel would prevent this.)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/baskervaldx.doc.tlpobj new/tlpkg/tlpobj/baskervaldx.doc.tlpobj
--- old/tlpkg/tlpobj/baskervaldx.doc.tlpobj 2019-02-28 03:17:33.000000000 +0100
+++ new/tlpkg/tlpobj/baskervaldx.doc.tlpobj 2020-03-24 01:56:31.000000000 +0100
@@ -1,6 +1,6 @@
name baskervaldx.doc
category Package
-revision 43461
+revision 54512
shortdesc doc files of baskervaldx
relocated 1
docfiles size=66
++++++ baskervaldx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/baskervaldx/Baskervaldx.sty new/tex/latex/baskervaldx/Baskervaldx.sty
--- old/tex/latex/baskervaldx/Baskervaldx.sty 2017-03-12 00:06:26.000000000 +0100
+++ new/tex/latex/baskervaldx/Baskervaldx.sty 2020-02-01 23:12:43.000000000 +0100
@@ -1,8 +1,8 @@
%% Baskervaldx.sty
%%
\NeedsTeXFormat{LaTeX2e}
-\def\fileversion{1.072}
-\def\filedate{2017/03/10}
+\def\fileversion{1.073}
+\def\filedate{2020/01/31}
\ProvidesPackage{Baskervaldx}
[\filedate\space v\fileversion]
@@ -14,10 +14,11 @@
\RequirePackage{etoolbox}
\IfFileExists{fontaxes.sty}{
\RequirePackage{fontaxes}
- \DeclareRobustCommand\swshape{\not@math@alphabet\swshape\relax
- \fontprimaryshape\itdefault\fontsecondaryshape\swdefault\selectfont}
- \fa@naming@exception{shape}{{n}{sw}}{nw}
- \fa@naming@exception{shape}{{it}{sw}}{sw}
+% changed the following due to changes in pdflatex 2020-02-02
+% \DeclareRobustCommand\swshape{\not@math@alphabet\swshape\relax
+% \fontprimaryshape\itdefault\fontsecondaryshape\swdefault\selectfont}
+% \fa@naming@exception{shape}{{n}{sw}}{nw}
+% \fa@naming@exception{shape}{{it}{sw}}{sw}
\fa@naming@exception{figures}{{superior}{proportional}}{Sup}
\fa@naming@exception{figures}{{superior}{tabular}}{Sup}
\def\sufigures{\@nomath\sufigures
@@ -123,7 +124,7 @@
% \normalfont
%\else
\AtEndPreamble{%
- \renewcommand*{\swdefault}{sw}
+ %\renewcommand*{\swdefault}{sw}
\renewcommand*{\rmdefault}%
{Baskervaldx-\Baskervaldx@figurealign\Baskervaldx@figurestyle}
\normalfont}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/baskervaldx.tlpobj new/tlpkg/tlpobj/baskervaldx.tlpobj
--- old/tlpkg/tlpobj/baskervaldx.tlpobj 2019-02-28 03:17:33.000000000 +0100
+++ new/tlpkg/tlpobj/baskervaldx.tlpobj 2020-03-24 01:56:32.000000000 +0100
@@ -1,6 +1,6 @@
name baskervaldx
category Package
-revision 43461
+revision 54512
shortdesc Extension and modification of BaskervaldADF with LaTeX support
relocated 1
longdesc Extends and modifies the BaskervaldADF font (a Baskerville
@@ -8,7 +8,7 @@
longdesc oldstyle figures in all shapes. Includes OpenType and
longdesc PostScript fonts, as well as LaTeX support files.
execute addMap baskervaldx.map
-runfiles size=1150
+runfiles size=1151
RELOC/fonts/afm/public/baskervaldx/Baskervaldx-Bol.afm
RELOC/fonts/afm/public/baskervaldx/Baskervaldx-BolIta.afm
RELOC/fonts/afm/public/baskervaldx/Baskervaldx-Ita.afm
@@ -475,7 +475,6 @@
RELOC/tex/latex/baskervaldx/TS1Baskervaldx-TOsF.fd
RELOC/tex/latex/baskervaldx/baskervaldx.fontspec
catalogue-ctan /fonts/baskervaldx
-catalogue-date 2017-03-11 09:14:11 +0100
-catalogue-license gpl
-catalogue-topics font-otf font-type1 font-serif
-catalogue-version 1.072
+catalogue-license gpl2+ lppl1.3
+catalogue-topics font font-body font-proportional font-serif font-otf font-type1 font-supp font-t1enc
+catalogue-version 1.073
++++++ baskervillef.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/baskervillef/OFL-FAQ.txt new/doc/fonts/baskervillef/OFL-FAQ.txt
--- old/doc/fonts/baskervillef/OFL-FAQ.txt 2016-11-19 00:19:50.000000000 +0100
+++ new/doc/fonts/baskervillef/OFL-FAQ.txt 2019-05-14 23:37:40.000000000 +0200
@@ -1,11 +1,12 @@
OFL FAQ - Frequently Asked Questions about the SIL Open Font License (OFL)
-Version 1.1-update2 - 23 August 2010
+Version 1.1-update5 - April 2017
+The OFL FAQ is copyright (c) 2005-2017 SIL International.
(See http://scripts.sil.org/OFL for updates)
CONTENTS OF THIS FAQ
1 USING AND DISTRIBUTING FONTS LICENSED UNDER THE OFL
-2 USING OFL FONTS FOR WEB PAGES AND ONLINE WEBFONT SERVICES
+2 USING OFL FONTS FOR WEB PAGES AND ONLINE WEB FONT SERVICES
3 MODIFYING OFL-LICENSED FONTS
4 LICENSING YOUR ORIGINAL FONTS UNDER THE OFL
5 CHOOSING RESERVED FONT NAMES
@@ -15,14 +16,19 @@
9 ABOUT SIL INTERNATIONAL
APPENDIX A - FONTLOG EXAMPLE
-
1 USING AND DISTRIBUTING FONTS LICENSED UNDER THE OFL
-1.1 Can I use the fonts for a book or other print publication?
-Yes. You can mention the font and author in the book's colophon if you wish, but that is not required.
+1.1 Can I use the fonts for a book or other print publication, to create logos or other graphics or even to manufacture objects based on their outlines?
+Yes. You are very welcome to do so. Authors of fonts released under the OFL allow you to use their font software as such for any kind of design work. No additional license or permission is required, unlike with some other licenses. Some examples of these uses are: logos, posters, business cards, stationery, video titling, signage, t-shirts, personalised fabric, 3D-printed/laser-cut shapes, sculptures, rubber stamps, cookie cutters and lead type.
+
+1.1.1 Does that restrict the license or distribution of that artwork?
+No. You remain the author and copyright holder of that newly derived graphic or object. You are simply using an open font in the design process. It is only when you redistribute, bundle or modify the font itself that other conditions of the license have to be respected (see below for more details).
+
+1.1.2 Is any kind of acknowledgement required?
+No. Font authors may appreciate being mentioned in your artwork's acknowledgements alongside the name of the font, possibly with a link to their website, but that is not required.
-1.2 Can the fonts be included with Free/Libre and Open Source Software collections such as GNU/Linux and BSD distributions?
-Yes! Fonts licensed under the OFL can be freely included alongside other software under FLOSS (Free/Libre and Open Source Software) licenses. Since fonts are typically aggregated with, not merged into, existing software, there is little need to be concerned about incompatibility with existing software licenses. You may also repackage the fonts and the accompanying components in a .rpm or .deb package and include them in distribution CD/DVDs and online repositories. (Also see section 5.9 about rebuilding from source.)
+1.2 Can the fonts be included with Free/Libre and Open Source Software collections such as GNU/Linux and BSD distributions and repositories?
+Yes! Fonts licensed under the OFL can be freely included alongside other software under FLOSS (Free/Libre and Open Source Software) licenses. Since fonts are typically aggregated with, not merged into, existing software, there is little need to be concerned about incompatibility with existing software licenses. You may also repackage the fonts and the accompanying components in a .rpm or .deb package (or other similar package formats or installers) and include them in distribution CD/DVDs and online repositories. (Also see section 5.9 about rebuilding from source.)
1.3 I want to distribute the fonts with my program. Does this mean my program also has to be Free/Libre and Open Source Software?
No. Only the portions based on the Font Software are required to be released under the OFL. The intent of the license is to allow aggregation or bundling with software under restricted licensing as well.
@@ -40,7 +46,7 @@
You are very welcome to share open fonts with friends, family and colleagues through removable media. Just remember to include the full font package, including any copyright notices and licensing information as available in OFL.txt. In the case where you sell the font, it has to come bundled with software.
1.8 Can I host the fonts on a web site for others to use?
-Yes, as long as you make the full font package available. In most cases it may be best to point users to the main site that distributes the Original Version so they always get the most recent stable and complete version. See also discussion of webfonts in Section 2.
+Yes, as long as you make the full font package available. In most cases it may be best to point users to the main site that distributes the Original Version so they always get the most recent stable and complete version. See also discussion of web fonts in Section 2.
1.9 Can I host the fonts on a server for use over our internal network?
Yes. If the fonts are transferred from the server to the client computer by means that allow them to be used even if the computer is no longer attached to the network, the full package (copyright notices, licensing information, etc.) should be included.
@@ -58,10 +64,10 @@
No. Referencing or embedding an OFL font in any document does not change the license of the document itself. The requirement for fonts to remain under the OFL does not apply to any document created using the fonts and their derivatives. Similarly, creating any kind of graphic using a font under OFL does not make the resulting artwork subject to the OFL.
1.14 If OFL fonts are extracted from a document in which they are embedded (such as a PDF file), what can be done with them? Is this a risk to author(s)?
-The few utilities that can extract fonts embedded in a PDF will typically output limited amounts of outlines - not a complete font. To create a working font from this method is much more difficult and time consuming than finding the source of the original OFL font. So there is little chance that an OFL font would be extracted and redistributed inappropriately through this method. Even so, copyright laws address any misrepresentation of authorship. All Font Software released under the OFL and marked as such by the author(s) is intended to remain under this license regardless of the distribution method, and cannot be redistributed under any other license. We strongly discourage any font extraction - we recommend directly using the font sources instead - but if you extract font outlines from a document, please be considerate: use your common sense and respect the work of the author(s) and the licensing model.
+The few utilities that can extract fonts embedded in a PDF will typically output limited amounts of outlines - not a complete font. To create a working font from this method is much more difficult and time consuming than finding the source of the original OFL font. So there is little chance that an OFL font would be extracted and redistributed inappropriately through this method. Even so, copyright laws address any misrepresentation of authorship. All Font Software released under the OFL and marked as such by the author(s) is intended to remain under this license regardless of the distribution method, and cannot be redistributed under any other license. We strongly discourage any font extraction - we recommend directly using the font sources instead - but if you extract font outlines from a document, please be considerate: respect the work of the author(s) and the licensing model.
1.15 What about distributing fonts with a document? Within a compressed folder structure? Is it distribution, bundling or embedding?
-Certain document formats may allow the inclusion of an unmodified font within their file structure which consists of a compressed folder containing the various resources forming the document (such as pictures and thumbnails). Including fonts within such a structure is understood as being different from embedding but rather similar to bundling (or mere aggregation) which the license explicitly allows. In this case the font is conveyed unchanged whereas embedding a font usually transforms it from the original format. The OFL does not allow anyone to extract the font from such a structure to then redistribute it under another license. The explicit permission to redistribute and embed does not cancel the requirement for the Font Software to remain under the license chosen by its author(s).
+Certain document formats may allow the inclusion of an unmodified font within their file structure which may consist of a compressed folder containing the various resources forming the document (such as pictures and thumbnails). Including fonts within such a structure is understood as being different from embedding but rather similar to bundling (or mere aggregation) which the license explicitly allows. In this case the font is conveyed unchanged whereas embedding a font usually transforms it from the original format. The OFL does not allow anyone to extract the font from such a structure to then redistribute it under another license. The explicit permission to redistribute and embed does not cancel the requirement for the Font Software to remain under the license chosen by its author(s). Even if the font travels inside the document as one of its assets, it should not lose its authorship information and licensing.
1.16 What about ebooks shipping with open fonts?
The requirements differ depending on whether the fonts are linked, embedded or distributed (bundled or aggregated). Some ebook formats use web technologies to do font linking via @font-face, others are designed for font embedding, some use fonts distributed with the document or reading software, and a few rely solely on the fonts already present on the target system. The license requirements depend on the type of inclusion as discussed in 1.15.
@@ -70,19 +76,36 @@
Yes, but these issues are out-of-scope for the OFL. The license itself neither encourages their use nor prohibits them since such mechanisms are not implemented in the components of the Font Software but through external software. Such restrictions are put in place for many different purposes corresponding to various usage scenarios. One common example is to limit potentially dangerous cross-site scripting attacks. However, in the spirit of libre/open fonts and unrestricted writing systems, we strongly encourage open sharing and reuse of OFL fonts, and the establishment of an environment where such restrictions are unnecessary. Note that whether you wish to use such mechanisms or you prefer not to, you must still abide by the rules set forth by the OFL when using fonts released by their authors under this license. Derivative fonts must be licensed under the OFL, even if they are part of a service for which you charge fees and/or for which access to source code is restricted. You may not sell the fonts on their own - they must be part of a larger software package, bundle or subscription plan. For example, even if the OFL font is distributed in a software package or via an online service using a DRM mechanism, the user would still have the right to extract that font, use, study, modify and redistribute it under the OFL.
1.18 I've come across a font released under the OFL. How can I easily get more information about the Original Version? How can I know where it stands compared to the Original Version or other Modified Versions?
-Consult the copyright statement(s) in the license for ways to contact the original authors. Consult the FONTLOG for information on how the font differs from the Original Version, and get in touch with the various contributors via the information in the acknowledgement section. Please consider using the Original Versions of the fonts whenever possible.
+Consult the copyright statement(s) in the license for ways to contact the original authors. Consult the FONTLOG (see section 6 for more details and examples) for information on how the font differs from the Original Version, and get in touch with the various contributors via the information in the acknowledgement section. Please consider using the Original Versions of the fonts whenever possible.
-1.19 What do you mean in condition 4? Can you provide examples of abusive promotion / endorsement / advertisement vs. normal acknowledgement?
+1.19 What do you mean in condition 4 of the OFL's permissions and conditions? Can you provide examples of abusive promotion / endorsement / advertisement vs. normal acknowledgement?
The intent is that the goodwill and reputation of the author(s) should not be used in a way that makes it sound like the original author(s) endorse or approve of a specific Modified Version or software bundle. For example, it would not be right to advertise a word processor by naming the author(s) in a listing of software features, or to promote a Modified Version on a web site by saying "designed by ...". However, it would be appropriate to acknowledge the author(s) if your software package has a list of people who deserve thanks. We realize that this can seem to be a grey area, but the standard used to judge an acknowledgement is that if the acknowledgement benefits the author(s) it is allowed, but if it primarily benefits other parties, or could reflect poorly on the author(s), then it is not.
+1.20 I'm writing a small app for mobile platforms, do I need to include the whole package?
+If you bundle a font under the OFL with your mobile app you must comply with the terms of the license. At a minimum you must include the copyright statement, the license notice and the license text. A mention of this information in your About box or Changelog, with a link to where the font package is from, is good practice, and the extra space needed to carry these items is very small. You do not, however, need to include the full contents of the font package - only the fonts you use and the copyright and license that apply to them. For example, if you only use the regular weight in your app, you do not need to include the italic and bold versions.
+
+1.21 What about including OFL fonts by default in my firmware or dedicated operating system?
+Many such systems are restricted and turned into appliances so that users cannot study or modify them. Using open fonts to increase quality and language coverage is a great idea, but you need to be aware that if there is a way for users to extract fonts you cannot legally prevent them from doing that. The fonts themselves, including any changes you make to them, must be distributed under the OFL even if your firmware has a more restrictive license. If you do transform the fonts and change their formats when you include them in your firmware you must respect any names reserved by the font authors via the RFN mechanism and pick your own font name. Alternatively if you directly add a font under the OFL to the font folder of your firmware without modifying or optimizing it you are simply bundling the font like with any other software collection, and do not need to make any further changes.
+
+1.22 Can I make and publish CMS themes or templates that use OFL fonts? Can I include the fonts themselves in the themes or templates? Can I sell the whole package?
+Yes, you are very welcome to integrate open fonts into themes and templates for your preferred CMS and make them more widely available. Remember that you can only sell the fonts and your CMS add-on as part of a software bundle. (See 1.4 for details and examples about selling bundles).
+
+1.23 Can OFL fonts be included in services that deliver fonts to the desktop from remote repositories? Even if they contain both OFL and non-OFL fonts?
+Yes. Some foundries have set up services to deliver fonts to subscribers directly to desktops from their online repositories; similarly, plugins are available to preview and use fonts directly in your design tool or publishing suite. These services may mix open and restricted fonts in the same channel, however they should make a clear distinction between them to users. These services should also not hinder users (such as through DRM or obfuscation mechanisms) from extracting and using the OFL fonts in other environments, or continuing to use OFL fonts after subscription terms have ended, as those uses are specifically allowed by the OFL.
-2 USING OFL FONTS FOR WEBPAGES AND ONLINE WEBFONT SERVICES
+1.24 Can services that provide or distribute OFL fonts restrict my use of them?
+No. The terms of use of such services cannot replace or restrict the terms of the OFL, as that would be the same as distributing the fonts under a different license, which is not allowed. You are still entitled to use, modify and redistribute them as the original authors have intended outside of the sole control of that particular distribution channel. Note, however, that the fonts provided by these services may differ from the Original Versions.
+
+
+2 USING OFL FONTS FOR WEBPAGES AND ONLINE WEB FONT SERVICES
+
+NOTE: This section often refers to a separate paper on 'Web Fonts & RFNs'. This is available at http://scripts.sil.org/OFL_web_fonts_and_RFNs
2.1 Can I make webpages using these fonts?
-Yes! Go ahead! Using CSS (Cascading Style Sheets) is recommended. Your three best options:
+Yes! Go ahead! Using CSS (Cascading Style Sheets) is recommended. Your three best options are:
- referring directly in your stylesheet to open fonts which may be available on the user's system
- providing links to download the full package of the font - either from your own website or from elsewhere - so users can install it themselves
-- using @font-face to distribute the font directly to browsers. This is recommended and explicitly allowed by the licensing model because it is distribution. The font file itself is distributed with other components of the webpage. It is not embedded in the webpage but referenced through a web address which will cause the browser to retrieve and use the corresponding font to render the webpage (see 1.11 and 1.15 for details related to embedding fonts into documents). As you take advantage of the @font-face cross-platform standard, be aware that webfonts are often tuned for a web environment and not intended for installation and use outside a browser. The reasons in favour of using webfonts are to allow design of dynamic text elements instead of static graphics, to make it easier for content to be localized and translated, indexed and searched, and all this with cross-platform open standards without depending on restricted extensions or plugins. You should check the CSS cascade (the order in which fonts are being called or delivered to your users) when testing.
+- using @font-face to distribute the font directly to browsers. This is recommended and explicitly allowed by the licensing model because it is distribution. The font file itself is distributed with other components of the webpage. It is not embedded in the webpage but referenced through a web address which will cause the browser to retrieve and use the corresponding font to render the webpage (see 1.11 and 1.15 for details related to embedding fonts into documents). As you take advantage of the @font-face cross-platform standard, be aware that web fonts are often tuned for a web environment and not intended for installation and use outside a browser. The reasons in favour of using web fonts are to allow design of dynamic text elements instead of static graphics, to make it easier for content to be localized and translated, indexed and searched, and all this with cross-platform open standards without depending on restricted extensions or plugins. You should check the CSS cascade (the order in which fonts are being called or delivered to your users) when testing.
2.2 Can I make and use WOFF (Web Open Font Format) versions of OFL fonts?
Yes, but you need to be careful. A change in font format normally is considered modification, and Reserved Font Names (RFNs) cannot be used. Because of the design of the WOFF format, however, it is possible to create a WOFF version that is not considered modification, and so would not require a name change. You are allowed to create, use and distribute a WOFF version of an OFL font without changing the font name, but only if:
@@ -94,28 +117,52 @@
Please note that most WOFF conversion tools and online services do not meet the two requirements listed above, and so their output must be considered a Modified Version. So be very careful and check to be sure that the tool or service you're using is compressing unchanged data and completely and accurately reflecting the original font metadata.
-2.3 What about other webfont formats such as EOT/EOTLite/CWT/etc.?
-In most cases these formats alter the original font data more than WOFF, and do not completely support appropriate metadata, so their use must be considered modification and RFNs may not be used.
+2.3 What about other web font formats such as EOT/EOTLite/CWT/etc.?
+In most cases these formats alter the original font data more than WOFF, and do not completely support appropriate metadata, so their use must be considered modification and RFNs may not be used. However, there may be certain formats or usage scenarios that may allow the use of RFNs. See http://scripts.sil.org/OFL_web_fonts_and_RFNs
+
+2.4 Can I make OFL fonts available through web font online services?
+Yes, you are welcome to include OFL fonts in online web font services as long as you properly meet all the conditions of the license. The origin and open status of the font should be clear among the other fonts you are hosting. Authorship, copyright notices and license information must be sufficiently visible to your users or subscribers so they know where the font comes from and the rights granted by the author(s). Make sure the font file contains the needed copyright notice(s) and licensing information in its metadata. Please double-check the accuracy of every field to prevent contradictory information. Other font formats, including EOT/EOTLite/CWT and superior alternatives like WOFF, already provide fields for this information. Remember that if you modify the font within your library or convert it to another format for any reason the OFL restrictions apply and you need to change the names accordingly. Please respect the author's wishes as expressed in the OFL and do not misrepresent original designers and their work. Don't lump quality open fonts together with dubious freeware or public domain fonts. Consider how you can best work with the original designers and foundries, support their efforts and generate goodwill that will benefit your service. (See 1.17 for details related to URL-based access restrictions methods or DRM mechanisms).
+
+2.5 Some web font formats and services provide ways of "optimizing" the font for a particular website or web application; is that allowed?
+Yes, it is permitted, but remember that these optimized versions are Modified Versions and so must follow OFL requirements like appropriate renaming. Also you need to bear in mind the other important parameters beyond compression, speed and responsiveness: you need to consider the audience of your particular website or web application, as choosing some optimization parameters may turn out to be less than ideal for them. Subsetting by removing certain glyphs or features may seriously limit functionality of the font in various languages that your users expect. It may also introduce degradation of quality in the rendering or specific bugs on the various target platforms compared to the original font from upstream. In other words, remember that one person's optimized font may be another person's missing feature. Various advanced typographic features (OpenType, Graphite or AAT) are also available through CSS and may provide the desired effects without the need to modify the font.
+
+2.6 Is subsetting a web font considered modification?
+Yes. Removing any parts of the font when delivering a web font to a browser, including unused glyphs and smart font code, is considered modification. This is permitted by the OFL but would not normally allow the use of RFNs. Some newer subsetting technologies may be able to subset in a way that allows users to effectively have access to the complete font, including smart font behaviour. See 2.8 and http://scripts.sil.org/OFL_web_fonts_and_RFNs
-2.4 Can I make OFL fonts available through webfont online services?
-Yes, you are welcome to include OFL fonts in online webfont services as long as you properly meet all the conditions of the license. The origin and open status of the font should be clear among the other fonts you are hosting. Authorship, copyright notices and license information must be sufficiently visible to your users or subscribers so they know where the font comes from and the rights granted by the author(s). Make sure the font file contains the needed copyright notice(s) and licensing information in its metadata. Please double-check the accuracy of every field to prevent contradictory information. Other font formats, including EOT/EOTLite/CWT and superior alternatives like WOFF, already provide fields for this information. Remember that if you modify the font within your library or convert it to another format for any reason the OFL restrictions apply and you need to change the names accordingly. Please respect the author's wishes as expressed in the OFL and do not misrepresent original designers and their work. Don't lump quality open fonts together with dubious freeware or public domain fonts. Consider how you can best work with the original designers and foundries, support their efforts and generate goodwill that will benefit your service. (See 1.17 for details related to URL-based access restrictions methods or DRM mechanisms).
+2.7 Are there any situations in which a modified web font could use RFNs?
+Yes. If a web font is optimized only in ways that preserve Functional Equivalence (see 2.8), then it may use RFNs, as it reasonably represents the Original Version and respects the intentions of the author(s) and the main purposes of the RFN mechanism (avoids collisions, protects authors, minimizes support, encourages derivatives). However this is technically very difficult and often impractical, so a much better scenario is for the web font service or provider to sign a separate agreement with the author(s) that allows the use of RFNs for Modified Versions.
-2.5 Can I make and publish CMS themes or templates that use OFL fonts? Can I include the fonts themselves in the themes or templates? Can I sell the whole package?
-Yes, you are very welcome to integrate open fonts into themes and templates for your preferred CMS and make them more widely available. Be aware that you can only sell the fonts and your CMS add-on as part of a software bundle. (See 1.4 for details and examples about selling bundles).
+2.8 How do you know if an optimization to a web font preserves Functional Equivalence?
+Functional Equivalence is described in full in the 'Web fonts and RFNs' paper at http://scripts.sil.org/OFL_web_fonts_and_RFNs, in general, an optimized font is deemed to be Functionally Equivalent (FE) to the Original Version if it:
-2.6 Some webfont formats and services provide ways of "optimising" the font for a particular website or web application; is that allowed?
-Yes, it is permitted, but remember that these optimised versions are Modified Versions and so must follow OFL requirements like appropriate renaming. Also you need to bear in mind the other important parameters beyond compression, speed and responsiveness: you need to consider the audience of your particular website or web application, as choosing some optimisation parameters may turn out to be less than ideal for them. Subsetting by removing certain glyphs or features may seriously limit functionality of the font in various languages used by your users. It may also introduce degradation of quality in the rendering or specific bugs on the various platforms compared to the original font. In other words, remember that one person's optimised font may be another person's missing feature. Various advanced typographic features are also available through CSS and may provide the desired effects without the need to modify the font.
+- Supports the same full character inventory. If a character can be properly displayed using the Original Version, then that same character, encoded correctly on a web page, will display properly.
+- Provides the same smart font behavior. Any dynamic shaping behavior that works with the Original Version should work when optimized, unless the browser or environment does not support it. There does not need to be guaranteed support in the client, but there should be no forced degradation of smart font or shaping behavior, such as the removal or obfuscation of OpenType, Graphite or AAT tables.
+- Presents text with no obvious degradation in visual quality. The lettershapes should be equally (or more) readable, within limits of the rendering platform.
+- Preserves original author, project and license metadata. At a minimum, this should include: Copyright and authorship; The license as stated in the Original Version, whether that is the full text of the OFL or a link to the web version; Any RFN declarations; Information already present in the font or documentation that points back to the Original Version, such as a link to the project or the author's website.
+
+If an optimized font meets these requirements, and so is considered to be FE, then it's very likely that the original author would feel that the optimized font is a good and reasonable equivalent. If it falls short of any of these requirements, the optimized font does not reasonably represent the Original Version, and so should be considered to be a Modified Version. Like other Modified Versions, it would not be allowed to use any RFNs and you simply need to pick your own font name.
+
+2.9 Isn't use of web fonts another form of embedding?
+No. Unlike embedded fonts in a PDF, web fonts are not an integrated part of the document itself. They are not specific to a single document and are often applied to thousands of documents around the world. The font data is not stored alongside the document data and often originates from a different location. The ease by which the web fonts used by a document may be identified and downloaded for desktop use demonstrates that they are philosophically and technically separate from the web pages that specify them. See http://scripts.sil.org/OFL_web_fonts_and_RFNs
+
+2.10 So would it be better to not use RFNs at all if you want your font to be distributed by a web fonts service?
+No. Although the OFL does not require authors to use RFNs, the RFN mechanism is an important part of the OFL model and completely compatible with web font services. If that web font service modifies the fonts, then the best solution is to sign a separate agreement for the use of any RFNs. It is perfectly valid for an author to not declare any RFNs, but before they do so they need to fully understand the benefits they are giving up, and the overall negative effect of allowing many different versions bearing the same name to be widely distributed. As a result, we don't generally recommend it.
+
+2.11 What should an agreement for the use of RFNs say? Are there any examples?
+There is no prescribed format for this agreement, as legal systems vary, and no recommended examples. Authors may wish to add specific clauses to further restrict use, require author review of Modified Versions, establish user support mechanisms or provide terms for ending the agreement. Such agreements are usually not public, and apply only to the main parties. However, it would be very beneficial for web font services to clearly state when they have established such agreements, so that the public understands clearly that their service is operating appropriately.
+
+See the separate paper on 'Web Fonts & RFNs' for in-depth discussion of issues related to the use of RFNs for web fonts. This is available at http://scripts.sil.org/OFL_web_fonts_and_RFNs
3 MODIFYING OFL-LICENSED FONTS
3.1 Can I change the fonts? Are there any limitations to what things I can and cannot change?
-You are allowed to change anything, as long as such changes do not violate the terms of the license. In other words, you are not allowed to remove the copyright statement(s) from the font, but you could put additional information into it that covers your contribution.
+You are allowed to change anything, as long as such changes do not violate the terms of the license. In other words, you are not allowed to remove the copyright statement(s) from the font, but you could put additional information into it that covers your contribution. See the placeholders in the OFL header template for recommendations on where to add your own statements. (Remember that, when authors have reserved names via the RFN mechanism, you need to change the internal names of the font to your own font name when making your modified version even if it is just a small change.)
3.2 I have a font that needs a few extra glyphs - can I take them from an OFL licensed font and copy them into mine?
Yes, but if you distribute that font to others it must be under the OFL, and include the information mentioned in condition 2 of the license.
-3.3 Can I charge people for my additional work? In other words, if I add a bunch of special glyphs and/or OpenType/Graphite code, can I sell the enhanced font?
+3.3 Can I charge people for my additional work? In other words, if I add a bunch of special glyphs or OpenType/Graphite/AAT code, can I sell the enhanced font?
Not by itself. Derivative fonts must be released under the OFL and cannot be sold by themselves. It is permitted, however, to include them in a larger software package (such as text editors, office suites or operating systems), even if the larger package is sold. In that case, you are strongly encouraged, but not required, to also make that derived font easily and freely available outside of the larger package.
3.4 Can I pay someone to enhance the fonts for my use and distribution?
@@ -128,7 +175,10 @@
No, but please consider sharing your improvements with others. You may find that you receive in return more than what you gave.
3.7 If a trademark is claimed in the OFL font, does that trademark need to remain in modified fonts?
-Yes, any trademark notices must remain in any derivative fonts to respect trademark laws, but you may add any additional trademarks you claim, officially registered or not. For example if an OFL font called "Foo" contains a notice that "Foo is a trademark of Acme", then if you rename the font to "Bar" when creating a Modified Version, the new trademark notice could say "Foo is a trademark of Acme Inc. - Bar is a trademark of Roadrunner Technologies Ltd.". Trademarks work alongside the OFL and are not subject to the terms of the licensing agreement. Please refer to the appropriate trademark laws.
+Yes. Any trademark notices must remain in any derivative fonts to respect trademark laws, but you may add any additional trademarks you claim, officially registered or not. For example if an OFL font called "Foo" contains a notice that "Foo is a trademark of Acme", then if you rename the font to "Bar" when creating a Modified Version, the new trademark notice could say "Foo is a trademark of Acme Inc. - Bar is a trademark of Roadrunner Technologies Ltd.". Trademarks work alongside the OFL and are not subject to the terms of the licensing agreement. The OFL does not grant any rights under trademark law. Bear in mind that trademark law varies from country to country and that there are no international trademark conventions as there are for copyright. You may need to significantly invest in registering and defending a trademark for it to remain valid in the countries you are interested in. This may be costly for an individual independent designer.
+
+3.8 If I commit changes to a font (or publish a branch in a DVCS) as part of a public open source software project, do I have to change the internal font names?
+Only if there are declared RFNs. Making a public commit or publishing a public branch is effectively redistributing your modifications, so any change to the font will require that you do not use the RFNs. Even if there are no RFNs, it may be useful to change the name or add a suffix indicating that a particular version of the font is still in development and not released yet. This will clearly indicate to users and fellow designers that this particular font is not ready for release yet. See section 5 for more details.
4 LICENSING YOUR ORIGINAL FONTS UNDER THE OFL
@@ -139,35 +189,37 @@
4.2 What do I have to do to apply the OFL to my font?
If you want to release your fonts under the OFL, we recommend you do the following:
-4.2.1 Put your copyright and Reserved Font Names information at the beginning of the main OFL.txt file in place of the dedicated placeholders. Include this file in your release package.
+4.2.1 Put your copyright and Reserved Font Names information at the beginning of the main OFL.txt file in place of the dedicated placeholders (marked with the <> characters). Include this file in your release package.
-4.2.2 Put your copyright and the OFL text with Reserved Font Names into your font files (the copyright and license fields). A link to the OFL text on the OFL web site is an acceptable (but not recommended) alternative. Also add this information to any other components (build scripts, glyph databases, documentation, test files, etc). Depending on the format of your fonts and sources, you can use template human-readable headers or machine-readable metadata.
+4.2.2 Put your copyright and the OFL text with your chosen Reserved Font Name(s) into your font files (the copyright and license fields). A link to the OFL text on the OFL web site is an acceptable (but not recommended) alternative. Also add this information to any other components (build scripts, glyph databases, documentation, test files, etc). Accurate metadata in your font files is beneficial to you as an increasing number of applications are exposing this information to the user. For example, clickable links can bring users back to your website and let them know about other work you have done or services you provide. Depending on the format of your fonts and sources, you can use template human-readable headers or machine-readable metadata. You should also double-check that there is no conflicting metadata in the font itself contradicting the license, such as the fstype bits in the os2 table or fields in the name table.
-4.2.3 Write an initial FONTLOG.txt for your font and include it in the release package.
+4.2.3 Write an initial FONTLOG.txt for your font and include it in the release package (see Section 6 and Appendix A for details including a template).
-4.2.4 Include the relevant practical documentation on the license by including the OFL-FAQ.txt in your package.
+4.2.4 Include the relevant practical documentation on the license by adding the current OFL-FAQ.txt file in your package.
+
+4.2.5 If you wish you can use the OFL graphics (http://scripts.sil.org/OFL_logo) on your website.
4.3 Will you make my font OFL for me?
-We won't do the work for you. We can, however, try to answer your questions, unfortunately we do not have the resources to review and check your font packages for correct use of the OFL.
+We won't do the work for you. We can, however, try to answer your questions, unfortunately we do not have the resources to review and check your font packages for correct use of the OFL. We recommend you turn to designers, foundries or consulting companies with experience in doing open font design to provide this service to you.
4.4 Will you distribute my OFL font for me?
-No, although if the font is of sufficient quality and general interest we may include a link to it on our partial list of OFL fonts on the OFL web site. You may wish to consider other open font catalogs or hosting services, such as the Unifont Font Guide (http://unifont.org/fontguide), The League of Movable Type (http://theleagueofmovabletype.com), Kernest (http://kernest.com/) or the Open Font Library (http://openfontlibrary.org/), which despite the name has no direct relationship to the OFL or SIL. We do not endorse any particular catalog or hosting service - it is your responsibility to determine if the service is right for you.
+No, although if the font is of sufficient quality and general interest we may include a link to it on our partial list of OFL fonts on the OFL web site. You may wish to consider other open font catalogs or hosting services, such as the Unifont Font Guide (http://unifont.org/fontguide), The League of Movable Type (http://theleagueofmovabletype.com) or the Open Font Library (http://openfontlibrary.org/), which despite the name has no direct relationship to the OFL or SIL. We do not endorse any particular catalog or hosting service - it is your responsibility to determine if the service is right for you and if it treats authors with fairness.
4.5 Why should I use the OFL for my fonts?
-- to meet needs for fonts that can be modified to support minority languages
+- to meet needs for fonts that can be modified to support lesser-known languages
- to provide a legal and clear way for people to respect your work but still use it (and reduce piracy)
- to involve others in your font project
- to enable your fonts to be expanded with new weights and improved writing system/language support
-- to allow more technical font developers to add features to your design (such as OpenType and Graphite support)
+- to allow more technical font developers to add features to your design (such as OpenType, Graphite or AAT support)
- to renew the life of an old font lying on your hard drive with no business model
- to allow your font to be included in Libre Software operating systems like Ubuntu
- to give your font world status and wide, unrestricted distribution
- to educate students about quality typeface and font design
- to expand your test base and get more useful feedback
- to extend your reach to new markets when users see your metadata and go to your website
-- to get your font more easily into one of the webfont online services
+- to get your font more easily into one of the web font online services
- to attract attention for your commercial fonts
-- to make money through webfont services
+- to make money through web font services
- to make money by bundling fonts with applications
- to make money adjusting and extending existing open fonts
- to get a better chance that foundations/NGOs/charities/companies who commission fonts will pick you
@@ -190,28 +242,28 @@
You may not use individual words from the Reserved Font Names, but you would be allowed to use parts of words, as long as you do not use any word from the Reserved Font Names entirely. We do not recommend using parts of words because of potential confusion, but it is allowed. For example, if "Foobar" was a Reserved Font Name, you would be allowed to use "Foo" or "bar", although we would not recommend it. Such an unfortunate choice would confuse the users of your fonts as well as make it harder for other designers to contribute.
5.5 So what should I, as an author, identify as Reserved Font Names?
-Original authors are encouraged to name their fonts using clear, distinct names, and only declare the unique parts of the name as Reserved Font Names. For example, the author of a font called "Foobar Sans" would declare "Foobar" as a Reserved Font Name, but not "Sans", as that is a common typographical term, and may be a useful word to use in a derivative font name. Reserved Font Names should also be single words. A font called "Flowing River" should have Reserved Font Names "Flowing" and "River", not "Flowing River". You also need to be very careful about reserving font names which are already linked to trademarks (whether registered or not) which you do not own.
+Original authors are encouraged to name their fonts using clear, distinct names, and only declare the unique parts of the name as Reserved Font Names. For example, the author of a font called "Foobar Sans" would declare "Foobar" as a Reserved Font Name, but not "Sans", as that is a common typographical term, and may be a useful word to use in a derivative font name. Reserved Font Names should also be single words for simplicity and legibility. A font called "Flowing River" should have Reserved Font Names "Flowing" and "River", not "Flowing River". You also need to be very careful about reserving font names which are already linked to trademarks (whether registered or not) which you do not own.
5.6 Do I, as an author, have to identify any Reserved Font Names?
-No, but we strongly encourage you to do so. This is to avoid confusion between your work and Modified Versions.
+No. RFNs are optional and not required, but we encourage you to use them. This is primarily to avoid confusion between your work and Modified Versions. As an author you can release a font under the OFL and not declare any Reserved Font Names. There may be situations where you find that using no RFNs and letting your font be changed and modified - including any kind of modification - without having to change the original name is desirable. However you need to be fully aware of the consequences. There will be no direct way for end-users and other designers to distinguish your Original Version from many Modified Versions that may be created. You have to trust whoever is making the changes and the optimizations to not introduce problematic changes. The RFNs you choose for your own creation have value to you as an author because they allow you to maintain artistic integrity and keep some control over the distribution channel to your end-users. For discussion of RFNs and web fonts see section 2.
5.7 Are any names (such as the main font name) reserved by default?
No. That is a change to the license as of version 1.1. If you want any names to be Reserved Font Names, they must be specified after the copyright statement(s).
5.8 Is there any situation in which I can use Reserved Font Names for a Modified Version?
-The Copyright Holder(s) can give certain trusted parties the right to use any of the Reserved Font Names through separate written agreements. For example, even if "Foobar" is a RFN, you could write up an agreement to give company "XYZ" the right to distribute a modified version with a name that includes "Foobar". This allows for freedom without confusion.
+The Copyright Holder(s) can give certain trusted parties the right to use any of the Reserved Font Names through separate written agreements. For example, even if "Foobar" is a RFN, you could write up an agreement to give company "XYZ" the right to distribute a modified version with a name that includes "Foobar". This allows for freedom without confusion. The existence of such an agreement should be made as clear as possible to downstream users and designers in the distribution package and the relevant documentation. They need to know if they are a party to the agreement or not and what they are practically allowed to do or not even if all the details of the agreement are not public.
5.9 Do font rebuilds require a name change? Do I have to change the name of the font when my packaging workflow includes a full rebuild from source?
-Yes, all rebuilds which change the font data and the smart code are Modified Versions and the requirements of the OFL apply: you need to respect what the Author(s) have chosen in terms of Reserved Font Names. However if a package (or installer) is simply a wrapper or a compressed structure around the final font - leaving them intact on the inside - then no name change is required. Please get in touch with the author(s) and copyright holder(s) to inquire about the presence of font sources beyond the final font file(s) and the recommended build path. That build path may very well be non-trivial and hard to reproduce accurately by the maintainer. If a full font build path is made available by the upstream author(s) please be aware that any regressions and changes you may introduce when doing a rebuild for packaging purposes is your responsibility as a package maintainer since you are effectively creating a separate branch. You should make it very clear to your users that your rebuilt version is not the canonical one from upstream.
+Yes, all rebuilds which change the font data and the smart code are Modified Versions and the requirements of the OFL apply: you need to respect what the Author(s) have chosen in terms of Reserved Font Names. However if a package (or installer) is simply a wrapper or a compressed structure around the final font - leaving them intact on the inside - then no name change is required. Please get in touch with the author(s) and copyright holder(s) to inquire about the presence of font sources beyond the final font file(s) and the recommended build path. That build path may very well be non-trivial and hard to reproduce accurately by the maintainer. If a full font build path is made available by the upstream author(s) please be aware that any regressions and changes you may introduce when doing a rebuild for packaging purposes is your own responsibility as a package maintainer since you are effectively creating a separate branch. You should make it very clear to your users that your rebuilt version is not the canonical one from upstream.
5.10 Can I add other Reserved Font Names when making a derivative font?
-Yes. List your additional Reserved Font Names after your additional copyright statement, as indicated with example placeholders at the top of the OFL.txt file. Be sure you do not remove any exiting RFNs but only add your own.
+Yes. List your additional Reserved Font Names after your additional copyright statement, as indicated with example placeholders at the top of the OFL.txt file. Be sure you do not remove any existing RFNs but only add your own. RFN statements should be placed next to the copyright statement of the relevant author as indicated in the OFL.txt template to make them visible to designers wishing to make their separate version.
6 ABOUT THE FONTLOG
6.1 What is this FONTLOG thing exactly?
-It has three purposes: 1) to provide basic information on the font to users and other developers, 2) to document changes that have been made to the font or accompanying files, either by the original authors or others, and 3) to provide a place to acknowledge authors and other contributors. Please use it!
+It has three purposes: 1) to provide basic information on the font to users and other designers and developers, 2) to document changes that have been made to the font or accompanying files, either by the original authors or others, and 3) to provide a place to acknowledge authors and other contributors. Please use it!
6.2 Is the FONTLOG required?
It is not a requirement of the license, but we strongly recommend you have one.
@@ -239,7 +291,7 @@
It would benefit many people if you contributed back in response to what you've received. Your contributions and improvements to the fonts and other components could be a tremendous help and would encourage others to contribute as well and 'give back'. You will then benefit from other people's contributions as well. Sometimes maintaining your own separate version takes more effort than merging back with the original. Be aware that any contributions, however, must be either your own original creation or work that you own, and you may be asked to affirm that clearly when you contribute.
7.3 I've made some very nice improvements to the font. Will you consider adopting them and putting them into future Original Versions?
-Most authors would be very happy to receive such contributions. Keep in mind that it is unlikely that they would want to incorporate major changes that would require additional work on their end. Any contributions would likely need to be made for all the fonts in a family and match the overall design and style. Authors are encouraged to include a guide to the design with the fonts. It would also help to have contributions submitted as patches or clearly marked changes - the use of smart source revision control systems like subversion, svk, mercurial, git or bzr is a good idea. Please follow the recommendations given by the author(s) in terms of preferred source formats and configuration parameters for sending contributions. If this is not indicated in a FONTLOG or other documentation of the font, consider asking them directly. Examples of useful contributions are bug fixes, additional glyphs, stylistic alternates (and the smart font code to access them) or improved hinting. Keep in mind that some kinds of changes (esp. hinting) may be technically difficult to integrate.
+Most authors would be very happy to receive such contributions. Keep in mind that it is unlikely that they would want to incorporate major changes that would require additional work on their end. Any contributions would likely need to be made for all the fonts in a family and match the overall design and style. Authors are encouraged to include a guide to the design with the fonts. It would also help to have contributions submitted as patches or clearly marked changes - the use of smart source revision control systems like subversion, mercurial, git or bzr is a good idea. Please follow the recommendations given by the author(s) in terms of preferred source formats and configuration parameters for sending contributions. If this is not indicated in a FONTLOG or other documentation of the font, consider asking them directly. Examples of useful contributions are bug fixes, additional glyphs, stylistic alternates (and the smart font code to access them) or improved hinting. Keep in mind that some kinds of changes (esp. hinting) may be technically difficult to integrate.
7.4 How can I financially support the development of OFL fonts?
It is likely that most authors of OFL fonts would accept financial contributions - contact them for instructions on how to do this. Such contributions would support future development. You can also pay for others to enhance the fonts and contribute the results back to the original authors for inclusion in the Original Version.
@@ -251,15 +303,22 @@
Version 1.1 is the first minor revision of the OFL. We are confident that version 1.1 will meet most needs, but are open to future improvements. Any revisions would be for future font releases, and previously existing licenses would remain in effect. No retroactive changes are possible, although the Copyright Holder(s) can re-release the font under a revised OFL. All versions will be available on our web site: http://scripts.sil.org/OFL.
8.2 Does this license restrict the rights of the Copyright Holder(s)?
-No. The Copyright Holder(s) still retain(s) all the rights to their creation; they are only releasing a portion of it for use in a specific way. For example, the Copyright Holder(s) may choose to release a 'basic' version of their font under the OFL, but sell a restricted 'enhanced' version. Only the Copyright Holder(s) can do this.
+No. The Copyright Holder(s) still retain(s) all the rights to their creation; they are only releasing a portion of it for use in a specific way. For example, the Copyright Holder(s) may choose to release a 'basic' version of their font under the OFL, but sell a restricted 'enhanced' version under a different license. They may also choose to release the same font under both the OFL and some other license. Only the Copyright Holder(s) can do this, and doing so does not change the terms of the OFL as it applies to that font.
8.3 Is the OFL a contract or a license?
-The OFL is a license and not a contract and so does not require you to sign it to have legal validity. By using, modifying and redistributing components under the OFL you indicate that you accept the license.
+The OFL is a worldwide license based on international copyright agreements and conventions. It is not a contract and so does not require you to sign it to have legal validity. By using, modifying and redistributing components under the OFL you indicate that you accept the license.
8.4 I really like the terms of the OFL, but want to change it a little. Am I allowed to take ideas and actual wording from the OFL and put them into my own custom license for distributing my fonts?
-We strongly recommend against creating your very own unique open licensing model. Using a modified or derivative license will likely cut you off - along with the font(s) under that license - from the community of designers using the OFL, potentially expose you and your users to legal liabilities, and possibly put your work and rights at risk. The OFL went though a community and legal review process that took years of effort, and that review is only applicable to an unmodified OFL. The text of the OFL has been written by SIL (with review and consultation from the community) and is copyright (c) 2005-2010 SIL International. You may re-use the ideas and wording (in part, not in whole) in another non-proprietary license provided that you call your license by another unambiguous name, that you do not use the preamble, that you do not mention SIL and that you clearly present your license as different from the OFL so as not to cause confusion by being too similar to the original. If you feel the OFL does not meet your needs for an open license, please contact us.
+We strongly recommend against creating your very own unique open licensing model. Using a modified or derivative license will likely cut you off - along with the font(s) under that license - from the community of designers using the OFL, potentially expose you and your users to legal liabilities, and possibly put your work and rights at risk. The OFL went though a community and legal review process that took years of effort, and that review is only applicable to an unmodified OFL. The text of the OFL has been written by SIL (with review and consultation from the community) and is copyright (c) 2005-2017 SIL International. You may re-use the ideas and wording (in part, not in whole) in another non-proprietary license provided that you call your license by another unambiguous name, that you do not use the preamble, that you do not mention SIL and that you clearly present your license as different from the OFL so as not to cause confusion by being too similar to the original. If you feel the OFL does not meet your needs for an open license, please contact us.
+
+8.5 Can I quote from the OFL FAQ?
+Yes, SIL gives permission to quote from the OFL FAQ (OFL-FAQ.txt), in whole or in part, provided that the quoted text is:
+
+- unmodified,
+- used to help explain the intent of the OFL, rather than cause misunderstanding, and
+- accompanied with the following attribution: "From the OFL FAQ (OFL-FAQ.txt), copyright (c) 2005-2017 SIL International. Used by permission. http://scripts.sil.org/OFL-FAQ_web".
-8.5 Can I translate the license and the FAQ into other languages?
+8.6 Can I translate the license and the FAQ into other languages?
SIL certainly recognises the need for people who are not familiar with English to be able to understand the OFL and its use. Making the license very clear and readable has been a key goal for the OFL, but we know that people understand their own language best.
If you are an experienced translator, you are very welcome to translate the OFL and OFL-FAQ so that designers and users in your language community can understand the license better. But only the original English version of the license has legal value and has been approved by the community. Translations do not count as legal substitutes and should only serve as a way to explain the original license. SIL - as the author and steward of the license for the community at large - does not approve any translation of the OFL as legally valid because even small translation ambiguities could be abused and create problems.
@@ -274,6 +333,9 @@
If you start such a unofficial translation effort of the OFL and OFL-FAQ please let us know.
+8.7 Does the OFL have an explicit expiration term?
+No, the implicit intent of the OFL is that the permissions granted are perpetual and irrevocable.
+
9 ABOUT SIL INTERNATIONAL
@@ -311,6 +373,9 @@
ChangeLog
+10 December 2010 (Fred Foobar) GlobalFontFamily-devel version 1.4
+- fix new build and testing system (bug #123456)
+
1 August 2008 (Tom Parker) GlobalFontFamily version 1.2.1
- Tweaked the smart font code (Branch merged with trunk version)
- Provided improved build and debugging environment for smart behaviours
@@ -365,5 +430,6 @@
Fontstudio.org is an not-for-profit design group whose purpose is...
Foobar.org is a distributed community of developers...
Company.com is a small business who likes to support community designers...
-University.edu is a renowed educational institution with a strong design department...
+University.edu is a renowned educational institution with a strong design department...
-----
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/baskervillef/README new/doc/fonts/baskervillef/README
--- old/doc/fonts/baskervillef/README 2018-11-05 23:22:30.000000000 +0100
+++ new/doc/fonts/baskervillef/README 2020-02-01 23:13:24.000000000 +0100
@@ -13,13 +13,22 @@
part of all distributions of LaTeX version 2003/12/01 or later. Those files and
LaTeX support file baskervillef.sty are
- Copyright (c) 2016 Michael Sharpe
+ Copyright (c) 2016---2020 Michael Sharpe
Files provided "as is", with no warranties.
The support files are provided in encodings OT1, T1, TS1 and LY1 for users of Western scripts.
-Current version: 1.046 2018-11-04
+Current version: 1.049 2020-01-31
+
+Changes in version 1.049
+Modified baskervillef.sty to comply with changes to latex with respect to mweights and fontaxes packages.
+
+Changes in version 1.048
+Corrected errors in some of the OT1 fd files. (Thanks Frank Mittelbach.)
+
+Changes in version 1.047
+Corrected some spacing errors involving ligatures, the most egregious involving italic f_f_i.
Changes in version 1.046
Corrected some bad accented letters and accented small caps in BoldItalic. (Thanks to Ricardo Berlasso.)
Binary files old/doc/fonts/baskervillef/baskervillef-doc.pdf and new/doc/fonts/baskervillef/baskervillef-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/baskervillef.doc.tlpobj new/tlpkg/tlpobj/baskervillef.doc.tlpobj
--- old/tlpkg/tlpobj/baskervillef.doc.tlpobj 2019-02-28 03:17:34.000000000 +0100
+++ new/tlpkg/tlpobj/baskervillef.doc.tlpobj 2020-03-24 01:56:33.000000000 +0100
@@ -1,9 +1,9 @@
name baskervillef.doc
category Package
-revision 49084
+revision 54512
shortdesc doc files of baskervillef
relocated 1
-docfiles size=62
+docfiles size=66
RELOC/doc/fonts/baskervillef/FONTLOG.txt
RELOC/doc/fonts/baskervillef/OFL-FAQ.txt
RELOC/doc/fonts/baskervillef/OFL.txt
++++++ baskervillef.tar.xz ++++++
++++ 7662 lines of diff (skipped)
++++++ bath-bst.doc.tar.xz ++++++
++++ 1718 lines of diff (skipped)
++++++ bath-bst.tar.xz ++++++
++++ 1622 lines of diff (skipped)
1
0